spree 0.11.0 → 0.11.1

data/lib/easy_role_requirement_system.rb

@@ -49,7 +49,7 @@ module EasyRoleRequirementSystem
   
   module ClassMethods        
     def role_permissions_file_path
-      @role_permissions_file_path ||= "#{RAILS_ROOT}/config/spree_permissions.yml"
+      @role_permissions_file_path ||= "#{Rails.root}/config/spree_permissions.yml"
     end
     
     def has_role_requirements?

data/lib/generators/extension/extension_generator.rb

@@ -1,6 +1,4 @@
 class ExtensionGenerator < Rails::Generator::NamedBase
-  default_options :with_test_unit => false
-
   attr_reader :extension_path, :extension_file_name
 
   def initialize(runtime_args, runtime_options = {})
@@ -25,27 +23,16 @@ class ExtensionGenerator < Rails::Generator::NamedBase
       m.template 'extension.rb',        "#{extension_path}/#{extension_file_name}.rb"
       m.template 'extension_hooks.rb',        "#{extension_path}/#{file_name}_hooks.rb"
       m.template 'tasks.rake',          "#{extension_path}/lib/tasks/#{extension_file_name}_tasks.rake"
-      m.template 'routes.rb',          "#{extension_path}/config/routes.rb"  
+      m.template 'routes.rb',          "#{extension_path}/config/routes.rb"
       m.template 'seeds.rb', "#{extension_path}/db/seeds.rb"
 
-      if options[:with_test_unit]
-        m.directory "#{extension_path}/test/fixtures"
-        m.directory "#{extension_path}/test/functional"
-        m.directory "#{extension_path}/test/unit"
-
-        m.template 'Rakefile',            "#{extension_path}/Rakefile"
-        m.template 'test_helper.rb',      "#{extension_path}/test/test_helper.rb"
-        m.template 'functional_test.rb',  "#{extension_path}/test/functional/#{extension_file_name}_test.rb"
-      else
-        m.directory "#{extension_path}/spec/controllers"
-        m.directory "#{extension_path}/spec/models"
-        m.directory "#{extension_path}/spec/views"
-        m.directory "#{extension_path}/spec/helpers"
+      m.directory "#{extension_path}/test/fixtures"
+      m.directory "#{extension_path}/test/functional"
+      m.directory "#{extension_path}/test/unit"
 
-        m.template 'RSpecRakefile',       "#{extension_path}/Rakefile"
-        m.template 'spec_helper.rb',      "#{extension_path}/spec/spec_helper.rb"
-        m.file     'spec.opts',           "#{extension_path}/spec/spec.opts"
-      end
+      m.template 'Rakefile',            "#{extension_path}/Rakefile"
+      m.template 'test_helper.rb',      "#{extension_path}/test/test_helper.rb"
+      m.template 'functional_test.rb',  "#{extension_path}/test/functional/#{extension_file_name}_test.rb"
     end
   end
 
@@ -60,7 +47,5 @@ class ExtensionGenerator < Rails::Generator::NamedBase
   def add_options!(opt)
     opt.separator ''
     opt.separator 'Options:'
-    opt.on("--with-test-unit",
-           "Use Test::Unit for this extension instead of RSpec") { |v| options[:with_test_unit] = v }
   end
 end

data/lib/generators/extension/templates/functional_test.rb

@@ -8,7 +8,7 @@ class <%= class_name %>Test < Test::Unit::TestCase
   end
   
   def test_initialization
-    assert_equal File.join(File.expand_path(RAILS_ROOT), 'vendor', 'extensions', '<%= file_name %>'), <%= class_name %>.root
+    assert_equal File.join(File.expand_path(Rails.root), 'vendor', 'extensions', '<%= file_name %>'), <%= class_name %>.root
     assert_equal '<%= extension_name %>', <%= class_name %>.extension_name
   end
   

data/lib/generators/extension/templates/tasks.rake

@@ -8,8 +8,8 @@ namespace :spree do
           path = file.sub(<%= class_name %>.root, '')
           directory = File.dirname(path)
           puts "Copying #{path}..."
-          mkdir_p RAILS_ROOT + directory
-          cp file, RAILS_ROOT + path
+          mkdir_p Rails.root + directory
+          cp file, Rails.root + path
         end
       end  
     end

data/lib/generators/extension_controller/extension_controller_generator.rb

@@ -67,7 +67,7 @@ class ExtensionControllerGenerator < ControllerGenerator
   end
 
   def destination_root
-    File.join(RAILS_ROOT, extension_path)
+    Rails.root.join(extension_path)
   end
 
   def extension_uses_rspec?

data/lib/generators/extension_model/extension_model_generator.rb

@@ -73,7 +73,7 @@ class ExtensionModelGenerator < ModelGenerator
   end
 
   def destination_root
-    File.join(RAILS_ROOT, extension_path)
+    Rails.root.join(extension_path)
   end
 
   def extension_uses_rspec?

data/lib/generators/instance/instance_generator.rb

@@ -11,9 +11,9 @@ require 'lib/plugins/string_extensions/lib/string_extensions'
 class InstanceGenerator < Rails::Generator::Base
   DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'],
                               Config::CONFIG['ruby_install_name'])
-  
+
   DATABASES = %w( mysql postgresql sqlite3 sqlserver )
-  
+
   MYSQL_SOCKET_LOCATIONS = [
     "/tmp/mysql.sock",                        # default
     "/var/run/mysqld/mysqld.sock",            # debian/gentoo
@@ -24,7 +24,7 @@ class InstanceGenerator < Rails::Generator::Base
     "/opt/local/var/run/mysql4/mysqld.sock",  # mac + darwinports + mysql4
     "/opt/local/var/run/mysql5/mysqld.sock"   # mac + darwinports + mysql5
   ]
-    
+
   default_options :db => "sqlite3", :shebang => DEFAULT_SHEBANG, :freeze => false
 
   def initialize(runtime_args, runtime_options = {})
@@ -32,11 +32,11 @@ class InstanceGenerator < Rails::Generator::Base
     usage if args.empty?
     usage("Databases supported for preconfiguration are: #{DATABASES.join(", ")}") if (options[:db] && !DATABASES.include?(options[:db]))
     @destination_root = args.shift
-    @app_name = File.basename(File.expand_path(@destination_root))  
+    @app_name = File.basename(File.expand_path(@destination_root))
   end
 
   def manifest
-    
+
     md5 = Digest::MD5.new
     now = Time.now
     md5 << now.to_s
@@ -44,34 +44,34 @@ class InstanceGenerator < Rails::Generator::Base
     md5 << String(rand(0))
     md5 << String($$)
     md5 << @app_name
- 
+
     # Do our best to generate a secure secret key for CookieStore
     secret = ActiveSupport::SecureRandom.hex(64)
-        
+
     # The absolute location of the Spree files
-    root = File.expand_path(SPREE_ROOT) 
-    
+    root = File.expand_path(SPREE_ROOT)
+
     # Use /usr/bin/env if no special shebang was specified
     script_options     = { :chmod => 0755, :shebang => options[:shebang] == DEFAULT_SHEBANG ? nil : options[:shebang] }
     dispatcher_options = { :chmod => 0755, :shebang => options[:shebang] }
-    
+
     record do |m|
       # Root directory
       m.directory ""
-      
+
       # Standard files and directories
       base_dirs = %w(config config/environments config/initializers db log script public vendor/plugins vendor/extensions)
-      text_files = %w(CHANGELOG CONTRIBUTORS LICENSE INSTALL README.markdown)
+      text_files = %w(CHANGELOG CONTRIBUTORS LICENSE INSTALL README.md)
       environments = Dir["#{root}/config/environments/*.rb"]
       scripts = Dir["#{root}/script/**/*"].reject { |f| f =~ /(destroy|generate)$/ }
       public_files = ["public/.htaccess.example"] + Dir["#{root}/public/**/*"]
       frozen_gems =  Dir["#{root}/vendor/gems/**/*"]
-      
+
       files = base_dirs + text_files + environments + scripts + public_files + frozen_gems
       files.map! { |f| f = $1 if f =~ %r{^#{root}/(.+)$}; f }
-      
+
       files.sort!
-      
+
       files.each do |file|
         case
         when File.directory?("#{root}/#{file}")
@@ -87,10 +87,10 @@ class InstanceGenerator < Rails::Generator::Base
           m.file spree_root(file), file
         end
       end
-      
+
       # script/generate
       m.file "instance_generate", "script/generate", script_options
-      
+
       # database.yml and .htaccess
       m.template "databases/#{options[:db]}.yml", "config/database.yml", :assigns => {
         :app_name => File.basename(File.expand_path(@destination_root)),
@@ -107,23 +107,23 @@ class InstanceGenerator < Rails::Generator::Base
       m.file "../../../../config/boot.rb", "config/boot.rb"
       m.template "session_store.rb", "config/initializers/session_store.rb", :assigns => { :app_name => @app_name, :app_secret_key_to_be_replaced_in_real_app_by_generator => secret }
       %w{backtrace_silencers inflections locales mime_types new_rails_defaults paperclip spree}.each do |initializer|
-        m.file "../../../../config/initializers/#{initializer}.rb", "config/initializers/#{initializer}.rb" 
+        m.file "../../../../config/initializers/#{initializer}.rb", "config/initializers/#{initializer}.rb"
       end
       m.file "../../../../config/spree_permissions.yml", "config/spree_permissions.yml"
-      
+
       # Demo Configuration
       if options[:demo]
         m.file "demo_mongrel_cluster.yml", "config/mongrel_cluster.yml"
         m.file "demo_robots.txt", "public/robots.txt"
       end
     end
-  end 
-  
+  end
+
   def after_generate
     Rails::Generator::Scripts::Generate.new.run(%w{extension site}, :destination => "#{@destination_root}/")
     File.rename("#{@destination_root}/config/initializers/session_store.rb", "#{@destination_root}/vendor/extensions/site/config/initializers/session_store.rb")
     puts File.read("#{@destination_root}/INSTALL") unless options[:pretend]
-  end  
+  end
 
   protected
 
@@ -141,7 +141,7 @@ class InstanceGenerator < Rails::Generator::Base
             "Preconfigure for selected database (options: #{DATABASES.join(", ")}).",
             "Default: mysql") { |v| options[:db] = v }
     end
-    
+
     def mysql_socket_location
       RUBY_PLATFORM =~ /mswin32/ ? MYSQL_SOCKET_LOCATIONS.find { |f| File.exists?(f) } : nil
     end
@@ -151,5 +151,5 @@ class InstanceGenerator < Rails::Generator::Base
     def spree_root(filename = '')
       File.join("..", "..", "..", "..", filename)
     end
-  
+
 end

data/lib/generators/instance/templates/instance_generate

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../config/boot'
-require "#{RAILS_ROOT}/config/environment"
+require "#{Rails.root}/config/environment"
 require 'rails_generator'
 require 'rails_generator/scripts/generate'
 

data/lib/generators/theme/theme_generator.rb

@@ -8,7 +8,7 @@ class ThemeGenerator < Rails::Generator::NamedBase
   end
 
   def manifest
-    
+
     record do |m|
       m.directory "#{theme_path}/app/views"
       m.directory "#{theme_path}/lib/tasks"
@@ -17,18 +17,14 @@ class ThemeGenerator < Rails::Generator::NamedBase
       m.directory "#{theme_path}/public/images"
 
       m.template 'README.markdown', "#{theme_path}/README.markdown"
-      
+
       # slight hack so we don't have to keep two copies (themes are extensions after all)
       m.template '../../extension/templates/extension.rb', "#{theme_path}/#{theme_file_name}.rb"
       m.template '../../extension/templates/extension_hooks.rb', "#{theme_path}/#{extension_name.downcase}_hooks.rb"
 
-      #if options[:with_test_unit]
-       
-       
-      #end
       theme_default = '../../../../vendor/extensions/theme_default'
 
-      # eventually we should make this optional plus include admin css etc. 
+      # eventually we should make this optional plus include admin css etc.
       m.template "#{theme_default}/public/stylesheets/screen.css", "#{theme_path}/public/stylesheets/screen.css"
     end
   end
@@ -45,12 +41,12 @@ class ThemeGenerator < Rails::Generator::NamedBase
     opt.separator ''
     opt.separator 'Generates a new theme with compiled CSS by default'
     opt.separator ''
-    
+
     # TODO - eventually implement these (tricky b/c manifest wants explicit list of files, not just directories)
-    
+
     # opt.separator 'Options:'
     # opt.on("--views", "Copy the views from default theme") { |v| options[:views] = v }
     # opt.on("--everything", "Complete copy of the default theme") { |v| options[:everything] = v }
-    # opt.on("--less", "Copy everything from the default theme") { |v| options[:views] = v }    
+    # opt.on("--less", "Copy everything from the default theme") { |v| options[:views] = v }
   end
 end

data/lib/plugins/extension_patches/lib/asset_copy.rb

@@ -1,5 +1,5 @@
-# copy the assets from extensions public dir into #{RAILS_ROOT}/public
-destination = "#{RAILS_ROOT}/public"
+# copy the assets from extensions public dir into #{Rails.root}/public
+destination = "#{Rails.root}/public"
 paths_to_mirror = Spree::ExtensionLoader.instance.load_extension_roots
 
 paths_to_mirror.each do |extension_path|

data/lib/spree.rb

@@ -9,7 +9,7 @@ unless defined? Spree::Version
     module Version
       Major = '0'
       Minor = '11'
-      Tiny  = '0'  
+      Tiny  = '1'
       Pre   = nil # 'beta'
 
       class << self

data/lib/spree/initializer.rb

@@ -15,7 +15,7 @@ module Spree
     attr_accessor :extensions
     attr_accessor :view_paths
 
-    def initialize   
+    def initialize
       self.view_paths = []
       self.extension_paths = default_extension_paths
       self.extensions = Spree::Extensions.load_order
@@ -24,7 +24,7 @@ module Spree
 
     def default_extension_paths
       env = ENV["RAILS_ENV"] || RAILS_ENV
-      paths = [SPREE_ROOT + '/vendor/extensions', RAILS_ROOT + '/vendor/extensions'].uniq
+      paths = [SPREE_ROOT + '/vendor/extensions', Rails.root.to_s + '/vendor/extensions'].uniq
       # There's no other way it will work, config/environments/test.rb loads too late
       # TODO: Should figure out how to include this extension path only for the tests that need it
       paths.unshift(SPREE_ROOT + "/test/fixtures/extensions") if env == "test"
@@ -37,12 +37,12 @@ module Spree
         Dir["#{SPREE_ROOT}/vendor/*/lib"]
       end
 
-      def framework_root_path   
-        RAILS_ROOT + '/vendor/rails'
+      def framework_root_path
+        File.join(Rails.root, '/vendor/extensions')
       end
 
       # Provide the load paths for the Spree installation
-      def default_load_paths       
+      def default_load_paths
         paths = ["#{SPREE_ROOT}/test/mocks/#{environment}"]
 
         # Add the app's controller directory
@@ -65,12 +65,12 @@ module Spree
         ).map { |dir| "#{SPREE_ROOT}/#{dir}" }.select { |dir| File.directory?(dir) }
 
         paths.concat builtin_directories
-        paths.concat library_directories 
+        paths.concat library_directories
       end
 
       def default_plugin_paths
         [
-          "#{RAILS_ROOT}/vendor/plugins",
+          "#{Rails.root}/vendor/plugins",
           "#{SPREE_ROOT}/lib/plugins",
           "#{SPREE_ROOT}/vendor/plugins"
         ]
@@ -97,7 +97,7 @@ module Spree
     def install_gem_spec_stubs
       #TODO - provide meaningful implementation (commented out for now so we can start server)
     end
-        
+
     def set_autoload_paths
       extension_loader.add_extension_paths
       super
@@ -135,18 +135,18 @@ module Spree
         # Add the default view paths
         arr.concat configuration.view_paths
         # Add the extension view paths
-        arr.concat extension_loader.view_paths     
+        arr.concat extension_loader.view_paths
         # Reverse the list so extensions come first
         arr.reverse!
       end
-    
-      ActionMailer::Base.template_root = view_paths  if configuration.frameworks.include?(:action_mailer)        
+
+      ActionMailer::Base.template_root = view_paths  if configuration.frameworks.include?(:action_mailer)
       ActionController::Base.view_paths = view_paths if configuration.frameworks.include?(:action_controller)
 
-			if defined?(ActionMailer::QueueMailer)
-			ActionMailer::QueueMailer.template_root = view_paths if configuration.frameworks.include?(:action_mailer) end
+      if defined?(ActionMailer::QueueMailer)
+      ActionMailer::QueueMailer.template_root = view_paths if configuration.frameworks.include?(:action_mailer) end
     end
-    
+
     def initialize_i18n
       extension_loader.add_locale_paths
       spree_locale_paths = Dir[File.join(SPREE_ROOT, 'config', 'locales', '*.{rb,yml}')]
@@ -174,7 +174,7 @@ module Spree
     def extension_loader
       ExtensionLoader.instance {|l| l.initializer = self }
     end
-    
+
   end
 
 end

data/lib/spree/search.rb

@@ -12,7 +12,7 @@ module Spree::Search
     params[:page] = 1 if (params[:page].to_i <= 0)
     
     # Prepare a search within the parameters
-    Spree::Config.searcher.prepare(params)
+    Spree::Config.searcher.prepare(params) unless @keywords.blank?
 
     if !params[:order_by_price].blank?
       @product_group = ProductGroup.new.from_route([params[:order_by_price]+"_by_master_price"])

data/lib/tasks/cucumber.rake

@@ -7,7 +7,7 @@
 
 unless ARGV.any? {|a| a =~ /^gems/} # Don't load anything when running the gems:* tasks
 
-vendored_cucumber_bin = Dir["#{RAILS_ROOT}/vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
+vendored_cucumber_bin = Dir["#{Rails.root}/vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
 $LOAD_PATH.unshift(File.dirname(vendored_cucumber_bin) + '/../lib') unless vendored_cucumber_bin.nil?
 
 begin

data/lib/tasks/extensions.rake

@@ -165,9 +165,9 @@ namespace :spec do
       if File.directory?(File.join(directory, 'spec'))
         chdir directory do
           if RUBY_PLATFORM =~ /win32/
-            system "rake.cmd spec SPREE_ENV_FILE=#{RAILS_ROOT}/config/environment"
+            system "rake.cmd spec SPREE_ENV_FILE=#{Rails.root}/config/environment"
           else
-            system "rake spec SPREE_ENV_FILE=#{RAILS_ROOT}/config/environment"
+            system "rake spec SPREE_ENV_FILE=#{Rails.root}/config/environment"
           end
           result += $?.exitstatus
         end
@@ -187,7 +187,7 @@ namespace :extensions do
       extension_roots.each do |directory|
         if File.directory?(File.join(directory, 'test/functional'))
           chdir directory do
-            system "rake test:functionals SPREE_ENV_FILE=#{RAILS_ROOT}/config/environment"
+            system "rake test:functionals SPREE_ENV_FILE=#{Rails.root}/config/environment"
             result += $?.exitstatus
           end
         end
@@ -202,7 +202,7 @@ namespace :extensions do
       extension_roots.each do |directory|
         if File.directory?(File.join(directory, 'test/unit'))
           chdir directory do
-            system "rake test:units SPREE_ENV_FILE=#{RAILS_ROOT}/config/environment"
+            system "rake test:units SPREE_ENV_FILE=#{Rails.root}/config/environment"
             result += $?.exitstatus
           end
         end
@@ -219,7 +219,7 @@ namespace :extensions do
       extension_roots.each do |directory|
         if File.directory?(File.join(directory, 'test'))
           chdir directory do
-            system "rake test SPREE_ENV_FILE=#{RAILS_ROOT}/config/environment"
+            system "rake test SPREE_ENV_FILE=#{Rails.root}/config/environment"
             result += $?.exitstatus
           end
         end
@@ -230,6 +230,6 @@ namespace :extensions do
 end
 
 # Load any custom rakefiles from extensions
-[RAILS_ROOT, SPREE_ROOT].uniq.each do |root|
+[Rails.root.to_s, SPREE_ROOT].uniq.each do |root|
   Dir[root + '/vendor/extensions/*/lib/tasks/*.rake'].sort.each { |ext| load ext }
 end