app/views/layout/merb_mart.html.erb config/init.rb config/router.rb lib/merb_mart.rb lib/merb_mart/merbtasks.rb lib/merb_mart/slicetasks.rb lib/merb_mart/spectasks.rb lib/merb_mart/upload_processor/static_file_processor.rb spec/merb_mart_spec.rb stubs/app/controllers/application.rb stubs/app/controllers/main.rb @@ -7,11 +7,11 @@ file: config/init.rb # add the slice as a regular dependency -dependency 'merb-E-mart' +dependency 'merb_mart' # if needed, configure which slices to load and in which order -Merb::Plugins.config[:merb_slices] = { :queue => ["MerbEMart", ...] } +Merb::Plugins.config[:merb_slices] = { :queue => ["MerbMart", ...] } # optionally configure the plugins in a before_app_loads callback @@ -23,21 +23,21 @@ end file: config/router.rb -# example: /merb-E-mart/:controller/:action/:id +# example: /merb_mart/:controller/:action/:id -r.add_slice(:MerbEMart) +r.add_slice(:MerbMart) # example: /foo/:controller/:action/:id -r.add_slice(:MerbEMart, 'foo') # same as :path => 'foo' +r.add_slice(:MerbMart, 'foo') # same as :path => 'foo' # example: /:lang/:controller/:action/:id (with :a param set) -r.add_slice(:MerbEMart, :path => ':lang', :params => { :a => 'b' }) +r.add_slice(:MerbMart, :path => ':lang', :params => { :a => 'b' }) # example: /:controller/:action/:id -r.slice(:MerbEMart) +r.slice(:MerbMart) Normally you should also run the following rake task: @@ -47,23 +47,23 @@ rake slices:merb_E_mart:install You can put your application-level overrides in: -host-app/slices/merb-E-mart/app - controllers, models, views ... +host-app/slices/merb_mart/app - controllers, models, views ... Templates are located in this order: -1. host-app/slices/merb-E-mart/app/views/* -2. gems/merb-E-mart/app/views/* +1. host-app/slices/merb_mart/app/views/* +2. gems/merb_mart/app/views/* 3. host-app/app/views/* You can use the host application's layout by configuring the -merb-E-mart slice in a before_app_loads block: +merb_mart slice in a before_app_loads block: Merb::Slices.config[:merb_E_mart] = { :layout => :application } By default :merb_E_mart is used. If you need to override stylesheets or javascripts, just specify your own files in your layout instead/in addition to the ones supplied (if any) in -host-app/public/slices/merb-E-mart. +host-app/public/slices/merb_mart. In any case don't edit those files directly as they may be clobbered any time rake merb_E_mart:install is run. @@ -71,11 +71,11 @@ rake merb_E_mart:install is run. Dependencies ------------ -Merb eMart master branch is being built on the cutting-edge Merb framework, and +MerbMart master branch is being built on the cutting-edge Merb framework, and the bleeding edge DataMapper framework. As such, you'll have to get yourself -setup with those gems before you get the chance to play with Merb eMart. +setup with those gems before you get the chance to play with MerbMart. -Dependencies for Merb eMart: +Dependencies for MerbMart: * **DataMapper 0.9** - 'edge' development * *DataObjects* INSTALL @@ -1,5 +1,5 @@ -MerbEMart -========= +MerbMart +======== -Merb eMart is an *open-source e-commerce engine* slice for the Merb framework. +MerbMart is an *open-source e-commerce engine* slice for the Merb framework. Please see README.markdown. README @@ -1,7 +1,7 @@ -Merb eMart README -================= +MerbMart README +=============== -Merb eMart is an *open-source e-commerce engine*, developed on top of the recent +MerbMart is an *open-source e-commerce engine*, developed on top of the recent Ruby-language, Merb MVC framework. It takes advantage of the Merb's slices plugin, allowing you to incorporate the engine into a customized e-commerce solution. @@ -11,11 +11,11 @@ Performance _Mom and Pop?.. or Big Box?_ -A key goal for the Merb eMart engine is performance. Although Merb eMart is -designed for e-commerce sites of all sizes, the speed and scalability of the +A key goal for the MerbMart engine is performance. Although MerbMart is +designed for e-commerce sites of all sizes, the speed and scalability of the Merb and DataMapper frameworks make it scalable even for large online vendors. -The following technologies and frameworks provide a foundation for Merb eMart: +The following technologies and frameworks provide a foundation for MerbMart: * **Merb**, for Model-View-Controller. * **DataMapper**, for object relation mapping (ORM) and persistence. @@ -25,9 +25,9 @@ The following technologies and frameworks provide a foundation for Merb eMart: See INSTALL or the project wiki for a full list of dependencies. -Merb eMart is inspired by other, Rails based e-commerce applications, including -[Substruct][substruct] and [Spree][spree]. Although Merb eMart started out as a -project to port Substruct to Merb, the initial 0.1 release of Merb eMart will +MerbMart is inspired by other, Rails based e-commerce applications, including +[Substruct][substruct] and [Spree][spree]. Although MerbMart started out as a +project to port Substruct to Merb, the initial 0.1 release of MerbMart will instead be a its own implementation of an e-commerce engine, trying to match the feature sets other e-commerce applications, but taking advantages of the unique features of Merb and DataMapper. @@ -70,21 +70,21 @@ Please see the INSTALL file for details on getting up and running with Merb eMar Developer Notes --------------- -**WARNING** : Merb eMart is at a very early development stages. At this stage, +**WARNING** : MerbMart is at a very early development stages. At this stage, the application should be considered only for consumption by advanced Ruby and Merb developers. If you're looking for something for production consumption, -or not yet ready to jump from Ruby on Rails, then we would strongly advise +or not yet ready to jump from Ruby on Rails, then we would strongly advise trying [Substruct][substruct] or [Spree][spree]. -**REQUEST** : Your development support is very much appreciated. Please -contact us below if you're interested in lending a hand with the development +**REQUEST** : Your development support is very much appreciated. Please +contact us below if you're interested in lending a hand with the development of this project. Or alternatively, clone the code, fork it, create some patches and let us know when you're done. Getting the Source ------------------ -Performing a git clone on either of the following repositories will get you +Performing a git clone on either of the following repositories will get you the latest source: git clone git://github.com/myabc/merb_mart.git @@ -98,7 +98,7 @@ The following additional mirrors are available: Copyright and License --------------------- -Merb eMart is licensed under the **GNU Public License (GPL)**: +MerbMart is licensed under the **GNU Public License (GPL)**: > Copyright (C) 2008 Alex Coles @@ -121,20 +121,20 @@ the distribution. Support ------- -**WARNING REPEATED** : Merb eMart is still at a very early stage of its -development. You should not use this code unless you're reasonably secure with -the Ruby language, and the DataMapper and Merb frameworks. That said, _please -do get involved_ - and if you're happy to contribute back with bug reports and +**WARNING REPEATED** : MerbMart is still at a very early stage of its +development. You should not use this code unless you're reasonably secure with +the Ruby language, and the DataMapper and Merb frameworks. That said, _please +do get involved_ - and if you're happy to contribute back with bug reports and patches, then we'll be happy to help you get the application up and running. Your best source for support currently is either the wiki, IRC or the mailing list: - * **Merb eMart Wiki** (this is its temporary residence): + * **MerbMart Wiki** (this is its temporary residence): http://github.com/myabc/merb_mart/wikis - * **Merb eMart mailing list**: + * **MerbMart mailing list**: <http://groups.google.com/group/merb_mart> - * **Merb eMart homepage**: _coming soon_ + * **MerbMart homepage**: _coming soon_ * Contact the developers directly: - <alex@alexcolesportfolio.com> | myabc on #datamapper, #merb IRC README.markdown @@ -1,38 +1,55 @@ +require 'rubygems' require 'rake/gempackagetask' -require 'spec/rake/spectask' -require 'merb-core/version' -require 'merb-core/test/tasks/spectasks' + +require 'merb-core' +require 'merb-core/tasks/merb' + +GEM_NAME = "merb_mart" +AUTHOR = "Alex Coles" +EMAIL = "alex@alexcolesportfolio.com" +HOMEPAGE = "http://github.com/myabc/merb_mart/tree/master" +SUMMARY = "An open-source e-commerce engine slice for the Merb framework'" +GEM_VERSION = "0.9.12" spec = Gem::Specification.new do |s| - s.name = 'merb_e_mart' - s.version = '0.0.1' - s.platform = Gem::Platform::RUBY - s.has_rdoc = true - s.extra_rdoc_files = ["README.markdown", "GPL-LICENSE", 'TODO'] - s.summary = 'An open-source e-commerce engine slice for the Merb framework' - s.description = s.summary - s.author = 'Alex Coles' - s.email = 'alex@alexcolesportfolio.com' - s.homepage = 'http://github.com/myabc/merb_mart/tree/master' - s.require_path = 'lib' - s.files = %w(GPL-LICENSE README.markdown Rakefile TODO) + Dir.glob("{lib,spec,app,public}/**/*") - s.add_dependency('merb-slices', '>= 0.9.4') + s.rubyforge_project = 'merb' + s.name = GEM_NAME + s.version = GEM_VERSION + s.platform = Gem::Platform::RUBY + s.has_rdoc = true + s.extra_rdoc_files = ["README.markdown", "GPL-LICENSE", 'TODO'] + s.summary = SUMMARY + s.description = s.summary + s.author = AUTHOR + s.email = EMAIL + s.homepage = HOMEPAGE + s.add_dependency('merb-slices', '>= 0.9.12') + s.require_path = 'lib' + s.files = %w(GPL-LICENSE README.markdown Rakefile TODO) + Dir.glob("{lib,spec,app,public,stubs}/**/*") end Rake::GemPackageTask.new(spec) do |pkg| pkg.gem_spec = spec end -desc "Install MerbEMart as a gem" -task :install => [:package] do - sh %{sudo gem install pkg/#{NAME}-#{VERSION} --no-update-sources --local} +desc "Install the gem" +task :install do + Merb::RakeHelper.install(GEM_NAME, :version => GEM_VERSION) end -namespace :jruby do +desc "Uninstall the gem" +task :uninstall do + Merb::RakeHelper.uninstall(GEM_NAME, :version => GEM_VERSION) +end - desc "Run :package and install the resulting .gem with jruby" - task :install => :package do - sh %{#{SUDO} jruby -S gem install pkg/#{NAME}-#{VERSION}.gem --no-rdoc --no-ri} +desc "Create a gemspec file" +task :gemspec do + File.open("#{GEM_NAME}.gemspec", "w") do |file| + file.puts spec.to_ruby end - end + +require 'spec/rake/spectask' +require 'merb-core/test/tasks/spectasks' +desc 'Default: run spec examples' +task :default => 'spec' Rakefile @@ -1,14 +1,15 @@ TODO: -- Fix MerbEMart.description and MerbEMart.version +- Fix MerbMart.description and MerbMart.version - Fix LICENSE with your name - Fix Rakefile with your name and contact info -- Add your code to lib/merb_e_mart.rb -- Add your Merb rake tasks to lib/merb_e_mart/merbtasks.rb +- Add your code to lib/merb_mart.rb +- Add your Merb rake tasks to lib/merb_mart/merbtasks.rb Remove anything that you don't need: -- app/controllers/main.rb MerbEMart::Main controller -- app/views/layout/merb_e_mart.html.erb +- app/controllers/main.rb MerbMart::Main controller +- app/views/layout/merb_mart.html.erb - spec/controllers/main_spec.rb controller specs - public/* any public files +- stubs/* any stub files TODO @@ -1,4 +1,4 @@ -class MerbEMart::Application < Merb::Controller +class MerbMart::Application < Merb::Controller controller_for_slice app/controllers/application.rb @@ -1,4 +1,4 @@ -class MerbEMart::Products < MerbEMart::Application +class MerbMart::Products < MerbMart::Application def index @products = Product.all app/controllers/products.rb @@ -1,5 +1,5 @@ module Merb - module MerbEMart + module MerbMart module ApplicationHelper # @param *segments<Array[#to_s]> Path segments to append. @@ -34,7 +34,7 @@ module Merb # @return <String> # A path relative to the public directory, with added segments. def public_path_for(type, *segments) - File.join(::MerbEMart.public_dir_for(type), *segments) + ::MerbMart.public_path_for(type, *segments) end # Construct an app-level path. @@ -45,7 +45,7 @@ module Merb # @return <String> # A path within the host application, with added segments. def app_path_for(type, *segments) - File.join(::MerbEMart.app_dir_for(type), *segments) + ::MerbMart.app_path_for(type, *segments) end # Construct a slice-level path. @@ -56,7 +56,7 @@ module Merb # @return <String> # A path within the slice source (Gem), with added segments. def slice_path_for(type, *segments) - File.join(::MerbEMart.dir_for(type), *segments) + ::MerbMart.slice_path_for(type, *segments) end end app/helpers/application_helper.rb @@ -28,5 +28,4 @@ class Address def name "#{self.first_name} #{self.last_name}" end - end app/models/address.rb @@ -11,5 +11,4 @@ class Country has n, :states alias :provinces :states - end app/models/country.rb @@ -6,4 +6,4 @@ Gem.path.unshift(Merb.root / "gems") require 'merb-haml' require 'merb-slices' -require "merb-E-mart" \ No newline at end of file +require "merb_mart" \ No newline at end of file examples/quick-E-mart/config/init.rb @@ -21,5 +21,5 @@ Merb.logger.info("Compiling routes...") Merb::Router.prepare do |r| - r.add_slice(:MerbEMart, 'admin') + r.add_slice(:MerbMart, 'admin') end \ No newline at end of file examples/quick-E-mart/config/router.rb @@ -1,23 +1,23 @@ require 'rubygems' require 'merb-core' +require 'merb-slices' require 'spec' -require 'data_mapper' require 'can_has_fixtures' -# Add the dependency in a before_app_loads hook -Merb::BootLoader.before_app_loads { require(File.join(File.dirname(__FILE__), '..', 'lib', 'merb-E-mart')) } +# Add merb_mart.rb to the search path +Merb::Plugins.config[:merb_slices][:auto_register] = true +Merb::Plugins.config[:merb_slices][:search_path] = File.join(File.dirname(__FILE__), '..', 'lib', 'merb_mart.rb') DataMapper.setup(:default, 'sqlite3::memory:') # Using Merb.root below makes sure that the correct root is set for # - testing standalone, without being installed as a gem and no host application # - testing from within the host application; its root will be used - Merb.start_environment( :testing => true, :adapter => 'runner', :environment => ENV['MERB_ENV'] || 'test', - :merb_root => Merb.root + :session_store => 'memory' ) module Merb @@ -31,7 +31,7 @@ module Merb # Whether the specs are being run from a host application or standalone def standalone? - not $SLICED_APP + Merb.root == ::MerbMart.root end end spec/spec_helper.rb app/models/abstract_upload.rb app/models/asset.rb app/models/orders/line_item.rb app/models/orders/status_code.rb app/models/store/product.rb app/models/store/product_image.rb app/models/tag.rb app/views/layout/merb_e_mart.html.erb lib/merb-E-mart.rb lib/merb-E-mart/exceptions/mixin_missing.rb lib/merb-E-mart/merbtasks.rb lib/merb-E-mart/upload_processor/static_file_processor.rb lib/merb-e-mart.rb spec/merb-E-mart_spec.rb 4a76b9902c4077eeb41a6ad2971a6e11e5a9ed41 Alex Coles alexbcoles@mac.com http://github.com/myabc/merb_mart/commit/42a37524004c92b1b0288bb5403f57bd855834c0 42a37524004c92b1b0288bb5403f57bd855834c0 2008-11-02T13:51:40-08:00 2008-11-02T13:51:40-08:00 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. bcd59fe46604d273951f0132248abcce75aacdce Alex Coles alexbcoles@mac.com