spree 0.5.1 → 0.6.0

data/lib/plugins/extension_patches/lib/routing_extension.rb

@@ -29,7 +29,30 @@ module Spree
         end
       end
     
-  end
-end
+  end # RoutingExtension
 
-ActionController::Routing::RouteSet.class_eval { include Spree::RoutingExtension }
+  module RoutingExtensionMapper
+  
+    def load_extension_routes
+      map = self
+      paths_to_routes = Spree::ExtensionLoader.instance.load_extension_roots
+      paths_to_routes.each do |routes_path|
+        source = "#{routes_path}/config/routes.rb"
+        if File.directory?("#{routes_path}/config")
+          begin
+            RAILS_DEFAULT_LOGGER.info "INFO: Loading routes from #{source}"
+            eval File.read(source) if File.file?(source)
+          rescue LoadError, NameError => e
+            $stderr.puts "Could not load routes from : #{source}.\n#{e.inspect}"
+            nil
+          end
+        end
+      end
+    end
+    
+  end # RoutingExtensionMapper
+
+end # Spree
+
+ActionController::Routing::RouteSet.class_eval { include Spree::RoutingExtension }
+ActionController::Routing::RouteSet::Mapper.class_eval { include Spree::RoutingExtensionMapper }

data/lib/spree.rb

@@ -8,8 +8,8 @@ unless defined? Spree::Version
   module Spree
     module Version
       Major = '0'
-      Minor = '5'
-      Tiny  = '1'
+      Minor = '6'
+      Tiny  = '0'
 
       class << self
         def to_s

data/lib/spree/extension_loader.rb

@@ -33,7 +33,7 @@ module Spree
     end
     
     def extension_load_paths
-      load_extension_roots.map { |extension| load_paths_for(extension) }.flatten.select { |d| File.directory?(d) }
+      load_extension_roots.map { |extension| load_paths_for(extension) }.flatten
     end
 
     def plugin_paths
@@ -59,6 +59,14 @@ module Spree
       configuration.controller_paths.concat(controller_paths)
     end
     
+    def locale_paths
+      load_extension_roots.map { |extension|  Dir[File.join("#{extension}/config/locales" , '*.{rb,yml}')]  }.flatten
+    end
+    
+    def add_locale_paths
+      configuration.i18n.load_path.concat(locale_paths)
+    end
+ 
     def view_paths
       extensions.map { |extension| "#{extension.root}/app/views" }.select { |d| File.directory?(d) }
     end
@@ -88,6 +96,14 @@ module Spree
     end
     alias :reactivate :activate_extensions
 
+    def load_extension_roots
+      @load_extension_roots ||= unless configuration.extensions.empty?
+        select_extension_roots
+      else
+        []
+      end
+    end
+
     private
 
       def load_paths_for(dir)
@@ -101,14 +117,6 @@ module Spree
         end
       end
       
-      def load_extension_roots
-        @load_extension_roots ||= unless configuration.extensions.empty?
-          select_extension_roots
-        else
-          []
-        end
-      end
-      
       def select_extension_roots
         all_roots = all_extension_roots.dup
         

data/lib/spree/initializer.rb

@@ -1,7 +1,7 @@
 # Add necessary Rails path
 #$LOAD_PATH.unshift "#{SPREE_ROOT}/vendor/rails/railties/lib"
 #require 'rubygems'
-#gem 'rails', '>=2.1.0'
+#gem 'rails', '>=2.2.2'
 
 require 'initializer'
 require 'spree/extension_loader'
@@ -108,7 +108,14 @@ module Spree
 
     def load_plugins
       super
-      extension_loader.load_extensions unless $rails_gem_installer
+      extension_loader.load_extensions
+
+      # Add extension gems.
+      Object.subclasses_of(Spree::Extension).each do |extension_class|
+        if extension_class.respond_to? :require_gems
+          extension_class.require_gems(@configuration)
+        end
+      end
     end
 
     def after_initialize
@@ -138,8 +145,15 @@ module Spree
       ActionMailer::Base.template_root = view_paths  if configuration.frameworks.include?(:action_mailer)        
       ActionController::Base.view_paths = view_paths if configuration.frameworks.include?(:action_controller)
     end
+    
+    def initialize_i18n
+      extension_loader.add_locale_paths
+      spree_locale_paths = Dir[File.join(SPREE_ROOT, 'config', 'locales', '*.{rb,yml}')]
+      extension_loader.configuration.i18n.load_path.concat(spree_locale_paths)
+      super
+    end
 
-    def initialize_routing
+    def initialize_routing #BQ - Don't this think method is needed anymore?
       extension_loader.add_controller_paths
       super
     end

data/lib/spree/setup.rb

@@ -13,6 +13,10 @@ module Spree
         setup = new
         setup.bootstrap(config)
         setup
+      end  
+      def create_admin_user
+        raise "Cannot create a second admin user." unless User.count == 0
+        new.create_admin_user
       end
     end
     
@@ -28,7 +32,7 @@ module Spree
       announce "Finished.\n\n"
     end
 
-    def create_admin_user(password, email)
+    def create_admin_user(password=nil, email=nil)
       unless email and password
         announce "Create the admin user (press enter for defaults)."
         #name = prompt_for_admin_name unless name
@@ -53,12 +57,12 @@ module Spree
     def load_sample_data
       # load initial database fixtures (in db/sample/*.yml) into the current environment's database
       ActiveRecord::Base.establish_connection(RAILS_ENV.to_sym)
-      Dir.glob(File.join(RAILS_ROOT, "db", 'sample', '*.{yml,csv}')).each do |fixture_file|
-        Fixtures.create_fixtures("#{RAILS_ROOT}/db/sample", File.basename(fixture_file, '.*'))
+      Dir.glob(File.join(SPREE_ROOT, "db", 'sample', '*.{yml,csv}')).each do |fixture_file|
+        Fixtures.create_fixtures("#{SPREE_ROOT}/db/sample", File.basename(fixture_file, '.*'))
       end
 
       # make product images available to the app
-      target = "#{RAILS_ROOT}/public/images/products/"
+      target = "#{RAILS_ROOT}/public/assets/products/"
       source = "#{SPREE_ROOT}/lib/tasks/sample/products/"
 
       Find.find(source) do |f|

data/lib/tasks/database.rake

@@ -1,9 +1,9 @@
 require 'activerecord'
+require 'highline/import'       
 
 namespace :db do
   desc "Migrate schema to version 0 and back up again. WARNING: Destroys all data in tables!!"
   task :remigrate => :environment do
-    require 'highline/import'
     if ENV['SKIP_NAG'] or ENV['OVERWRITE'].to_s.downcase == 'true' or agree("This task will destroy any data in the database. Are you sure you want to \ncontinue? [yn] ")
 
       # Drop all tables
@@ -19,12 +19,17 @@ namespace :db do
       exit
     end
   end
+        
+  namespace :admin do                       
+    desc "Create admin username and password"
+    task :create => :environment do
+      Spree::Setup.create_admin_user      
+    end
+  end     
   
   desc "Bootstrap your database for Spree."
   task :bootstrap  => :environment do
-    #return unless %w[development test].include? RAILS_ENV    
-    
-    require 'highline/import'
+    raise "Cannot bootstrap in production mode (for saftey reasons.)" unless %w[demo development test].include? RAILS_ENV    
     if ENV['AUTO_ACCEPT'] or agree("This task will destroy any data in the database. Are you sure you want to \ncontinue? [yn] ")
 
       ENV['SKIP_NAG'] = 'yes'

data/lib/tasks/extensions.rake

@@ -117,53 +117,6 @@ namespace :spec do
   end
 end
 
-namespace :extensions do
-  desc "List the gems that the extensions depends on"
-  task :gems => [ 'gems:base' ] do
-    config = create_config
-
-    config.gems.each do |gem|
-      gem.add_load_paths
-      gem.load
-      code = gem.loaded? ? (gem.frozen? ? "F" : "I") : " "
-      puts "[#{code}] #{gem.name} #{gem.requirement.to_s}"
-    end
-    puts
-    puts "I = Installed"
-    puts "F = Frozen"
-  end
-
-  namespace :gems do
-    task :base do
-      $rails_gem_installer = true
-      Rake::Task[:environment].invoke
-    end
-  
-    def create_config
-      config = Rails::Configuration.new
-  
-      Spree::Extension.descendants.each do |extension|
-        if extension.respond_to? :require_gems
-          extension.require_gems(config)
-        end
-      end
-      
-      config
-    end
-  
-    desc "Installs all required gems for the extensions."
-    task :install => :base do
-      require 'rubygems'
-      require 'rubygems/gem_runner'
-
-      config = create_config
-
-      config.gems.each { |gem| gem.install unless gem.loaded? }
-    end
-  end
-  
-end
-
 # Load any custom rakefiles from extensions
 [RAILS_ROOT, SPREE_ROOT].uniq.each do |root|
   Dir[root + '/vendor/extensions/*/lib/tasks/*.rake'].sort.each { |ext| load ext }

data/lib/tasks/release.rake

@@ -57,6 +57,7 @@ namespace 'spree' do
     #files.include 'log/.keep'
     files.exclude /^pkg/
     files.include 'public/.htaccess.example'
+    files.include 'vendor/gems/active_presenter-0.0.4/.specification'
     files.exclude 'public/images/products'
     files.exclude 'tmp/'
     s.files = files.to_a

data/lib/tasks/rspec.rake

@@ -0,0 +1,158 @@
+rspec_gem_dir = nil
+Dir["#{RAILS_ROOT}/vendor/gems/*"].each do |subdir|
+  rspec_gem_dir = subdir if subdir.gsub("#{RAILS_ROOT}/vendor/gems/","") =~ /^(\w+-)?rspec-(\d+)/ && File.exist?("#{subdir}/lib/spec/rake/spectask.rb")
+end
+rspec_plugin_dir = File.expand_path(File.dirname(__FILE__) + '/../../vendor/plugins/rspec')
+
+if rspec_gem_dir && (test ?d, rspec_plugin_dir)
+  raise "\n#{'*'*50}\nYou have rspec installed in both vendor/gems and vendor/plugins\nPlease pick one and dispose of the other.\n#{'*'*50}\n\n"
+end
+
+if rspec_gem_dir
+  $LOAD_PATH.unshift("#{rspec_gem_dir}/lib") 
+elsif File.exist?(rspec_plugin_dir)
+  $LOAD_PATH.unshift("#{rspec_plugin_dir}/lib")
+end
+
+begin
+  require 'spec/rake/spectask'
+  Rake.application.instance_variable_get('@tasks').delete('default')
+
+  spec_prereq = File.exist?(File.join(RAILS_ROOT, 'config', 'database.yml')) ? "db:test:prepare" : :noop
+  task :noop do
+  end
+
+  task :default => :spec
+  task :stats => "spec:statsetup"
+
+  desc "Run all specs in spec directory (excluding plugin specs)"
+  Spec::Rake::SpecTask.new(:spec => spec_prereq) do |t|
+    t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
+    t.spec_files = FileList['spec/**/*/*_spec.rb']
+  end
+
+  namespace :spec do
+    desc "Run all specs in spec directory with RCov (excluding plugin specs)"
+    Spec::Rake::SpecTask.new(:rcov) do |t|
+      t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
+      t.spec_files = FileList['spec/**/*/*_spec.rb']
+      t.rcov = true
+      t.rcov_opts = lambda do
+        IO.readlines("#{RAILS_ROOT}/spec/rcov.opts").map {|l| l.chomp.split " "}.flatten
+      end
+    end
+
+    desc "Print Specdoc for all specs (excluding plugin specs)"
+    Spec::Rake::SpecTask.new(:doc) do |t|
+      t.spec_opts = ["--format", "specdoc", "--dry-run"]
+      t.spec_files = FileList['spec/**/*/*_spec.rb']
+    end
+
+    desc "Print Specdoc for all plugin examples"
+    Spec::Rake::SpecTask.new(:plugin_doc) do |t|
+      t.spec_opts = ["--format", "specdoc", "--dry-run"]
+      t.spec_files = FileList['vendor/plugins/**/spec/**/*/*_spec.rb'].exclude('vendor/plugins/rspec/*')
+    end
+
+    [:models, :controllers, :views, :helpers, :lib].each do |sub|
+      desc "Run the code examples in spec/#{sub}"
+      Spec::Rake::SpecTask.new(sub => spec_prereq) do |t|
+        t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
+        t.spec_files = FileList["spec/#{sub}/**/*_spec.rb"]
+      end
+    end
+
+    desc "Run the code examples in vendor/plugins (except RSpec's own)"
+    Spec::Rake::SpecTask.new(:plugins => spec_prereq) do |t|
+      t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
+      t.spec_files = FileList['vendor/plugins/**/spec/**/*/*_spec.rb'].exclude('vendor/plugins/rspec/*').exclude("vendor/plugins/rspec-rails/*")
+    end
+
+    namespace :plugins do
+      desc "Runs the examples for rspec_on_rails"
+      Spec::Rake::SpecTask.new(:rspec_on_rails) do |t|
+        t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
+        t.spec_files = FileList['vendor/plugins/rspec-rails/spec/**/*/*_spec.rb']
+      end
+    end
+
+    # Setup specs for stats
+    task :statsetup do
+      require 'code_statistics'
+      ::STATS_DIRECTORIES << %w(Model\ specs spec/models) if File.exist?('spec/models')
+      ::STATS_DIRECTORIES << %w(View\ specs spec/views) if File.exist?('spec/views')
+      ::STATS_DIRECTORIES << %w(Controller\ specs spec/controllers) if File.exist?('spec/controllers')
+      ::STATS_DIRECTORIES << %w(Helper\ specs spec/helpers) if File.exist?('spec/helpers')
+      ::STATS_DIRECTORIES << %w(Library\ specs spec/lib) if File.exist?('spec/lib')
+      ::CodeStatistics::TEST_TYPES << "Model specs" if File.exist?('spec/models')
+      ::CodeStatistics::TEST_TYPES << "View specs" if File.exist?('spec/views')
+      ::CodeStatistics::TEST_TYPES << "Controller specs" if File.exist?('spec/controllers')
+      ::CodeStatistics::TEST_TYPES << "Helper specs" if File.exist?('spec/helpers')
+      ::CodeStatistics::TEST_TYPES << "Library specs" if File.exist?('spec/lib')
+      ::STATS_DIRECTORIES.delete_if {|a| a[0] =~ /test/}
+    end
+
+    namespace :db do
+      namespace :fixtures do
+        desc "Load fixtures (from spec/fixtures) into the current environment's database.  Load specific fixtures using FIXTURES=x,y. Load from subdirectory in test/fixtures using FIXTURES_DIR=z."
+        task :load => :environment do
+          ActiveRecord::Base.establish_connection(Rails.env)
+          base_dir = File.join(Rails.root, 'spec', 'fixtures')
+          fixtures_dir = ENV['FIXTURES_DIR'] ? File.join(base_dir, ENV['FIXTURES_DIR']) : base_dir
+          
+          (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/).map {|f| File.join(fixtures_dir, f) } : Dir.glob(File.join(fixtures_dir, '*.{yml,csv}'))).each do |fixture_file|
+            Fixtures.create_fixtures(File.dirname(fixture_file), File.basename(fixture_file, '.*'))
+          end
+        end
+      end
+    end
+
+    namespace :server do
+      daemonized_server_pid = File.expand_path("spec_server.pid", RAILS_ROOT + "/tmp")
+
+      desc "start spec_server."
+      task :start do
+        if File.exist?(daemonized_server_pid)
+          $stderr.puts "spec_server is already running."
+        else
+          $stderr.puts "Starting up spec server."
+          system("ruby", "script/spec_server", "--daemon", "--pid", daemonized_server_pid)
+        end
+      end
+
+      desc "stop spec_server."
+      task :stop do
+        unless File.exist?(daemonized_server_pid)
+          $stderr.puts "No server running."
+        else
+          $stderr.puts "Shutting down spec_server."
+          system("kill", "-s", "TERM", File.read(daemonized_server_pid).strip) && 
+          File.delete(daemonized_server_pid)
+        end
+      end
+
+      desc "reload spec_server."
+      task :restart do
+        unless File.exist?(daemonized_server_pid)
+          $stderr.puts "No server running."
+        else
+          $stderr.puts "Reloading down spec_server."
+          system("kill", "-s", "USR2", File.read(daemonized_server_pid).strip)
+        end
+      end
+    end
+  end
+rescue MissingSourceFile
+  # if rspec-rails is a configured gem, this will output helpful material and exit ...
+  require File.expand_path(File.dirname(__FILE__) + "/../../config/environment")
+
+  # ... otherwise, do this:
+  raise <<-MSG
+
+  You have rspec rake tasks installed in
+  #{__FILE__},
+  but rspec can not be found in vendor/gems, vendor/plugins or on the system.
+
+MSG
+end
+