Consolidation of work on slicefiying application with original app
commit42a37524004c92b1b0288bb5403f57bd855834c0
authorAlex Coles <alexbcoles@mac.com>
Sun, 2 Nov 2008 21:51:40 +0000 (2 22:51 +0100)
committerAlex Coles <alexbcoles@mac.com>
Sun, 2 Nov 2008 21:51:40 +0000 (2 22:51 +0100)
treebcd59fe46604d273951f0132248abcce75aacdce
parent4a76b9902c4077eeb41a6ad2971a6e11e5a9ed41
Consolidation of work on slicefiying application with original app

* This should get us to a point where we have a slice
  named MerbMart. We still need to do a fair amount of
  work to clean things up to get stuff working properly.

Squashed commit of the following:

commit 9b19f8b36148cdd0a266136fa522851a8a966d12
Author: Alex Coles <alexbcoles@mac.com>
Date:   Sun Nov 2 22:48:21 2008 +0100

    Normalize name of slice. Further consolidation of slice-attempt.

    * Cleanup naming conventions: MerbMart and merb_mart
    * Adding init.rb and router.rb files to allow for standalone
      running.

commit b6257d682e71eb695f61561fe8f17453c20e77ce
Author: Alex Coles <alexbcoles@mac.com>
Date:   Sun Nov 2 22:33:40 2008 +0100

    Re-removing incompatible license

commit 137a488f76b17e4889eaec239b06d2855da47f00
Author: Alex Coles <alexbcoles@mac.com>
Date:   Sun Nov 2 22:32:51 2008 +0100

    Revert "Renaming project to Merb eMart"

    This reverts commit ec3649debc6349ee6e4e685c0578211147e8e639.

    Conflicts:

     README.markdown
     Rakefile

commit eddc44217b247531ef20226ae4d5a20f2a0d8b53
Author: Alex Coles <alexbcoles@mac.com>
Date:   Sun Nov 2 22:18:34 2008 +0100

    Consolidation of attempt to slicify app.

    * Removing model classes that overlap between Ben's sliceified
      app, and the original monolithic app.
    * Updated and added in slice code to make it look like, and work
      as a merb 0.9.12 slice.
    * Some renaming of directories/files to account for rename
      back to merb_mart/MerbMart.
36 files changed:
INSTALL
README
README.markdown
Rakefile
TODO
app/controllers/application.rb
app/controllers/products.rb
app/helpers/application_helper.rb
app/models/abstract_upload.rb [deleted file]
app/models/address.rb
app/models/asset.rb [deleted file]
app/models/country.rb
app/models/orders/line_item.rb [deleted file]
app/models/orders/status_code.rb [deleted file]
app/models/store/product.rb [deleted file]
app/models/store/product_image.rb [deleted file]
app/models/tag.rb [deleted file]
app/views/layout/merb_mart.html.erb [moved from app/views/layout/merb_e_mart.html.erb with 75% similarity]
config/init.rb [new file with mode: 0644]
config/router.rb [new file with mode: 0644]
examples/quick-E-mart/config/init.rb
examples/quick-E-mart/config/router.rb
lib/merb-E-mart.rb [deleted file]
lib/merb-E-mart/exceptions/mixin_missing.rb [deleted file]
lib/merb-E-mart/merbtasks.rb [deleted file]
lib/merb-e-mart.rb [deleted file]
lib/merb_mart.rb [new file with mode: 0644]
lib/merb_mart/merbtasks.rb [new file with mode: 0644]
lib/merb_mart/slicetasks.rb [new file with mode: 0644]
lib/merb_mart/spectasks.rb [new file with mode: 0644]
lib/merb_mart/upload_processor/static_file_processor.rb [moved from lib/merb-E-mart/upload_processor/static_file_processor.rb with 87% similarity]
spec/merb-E-mart_spec.rb [deleted file]
spec/merb_mart_spec.rb [new file with mode: 0644]
spec/spec_helper.rb
stubs/app/controllers/application.rb [new file with mode: 0644]
stubs/app/controllers/main.rb [new file with mode: 0644]