spree 0.4.0 → 0.4.1

data/CHANGELOG

@@ -1,3 +1,9 @@
+== 0.4.1
+
+* #94 - User must be logged in to empty cart
+* #89 - Cannot run specs for custom extensions
+* #88 - Gateway Configuration Gives Error
+
 == 0.4.0
 
 * Initial support for initialization

data/config/environment.rb

@@ -5,7 +5,7 @@
 # ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-SPREE_GEM_VERSION = '0.4.0' unless defined? SPREE_GEM_VERSION
+SPREE_GEM_VERSION = '0.4.1' unless defined? SPREE_GEM_VERSION
 RAILS_GEM_VERSION = "2.1.0" unless defined? RAILS_GEM_VERSION
           
 # Bootstrap the Rails environment, frameworks, and default configuration

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

@@ -9,23 +9,13 @@ module Spree
       base.class_eval do
         alias :draw_without_plugin_routes :draw
         alias :draw :draw_with_plugin_routes
-        alias :rails_reload :reload
-        alias :reload :force_reload
       end
     end
 
-    def force_reload
-      if RAILS_ENV == 'development'
-        load!
-      else
-        rails_reload
-      end
-    end  
-    
     def draw_with_plugin_routes   
       draw_without_plugin_routes do |mapper|
-        yield mapper
         add_extension_routes(mapper)
+        yield mapper
       end
     end
 

data/lib/spree.rb

@@ -9,7 +9,7 @@ unless defined? Spree::Version
     module Version
       Major = '0'
       Minor = '4'
-      Tiny  = '0'
+      Tiny  = '1'
 
       class << self
         def to_s

data/lib/tasks/extensions.rake

@@ -81,9 +81,22 @@ namespace :db do
 end
 
 namespace :spec do
-  desc "Runs specs on all available Spree extensions, pass EXT=extension_name to test a single extension"
+  desc "Runs specs on all available extensions in the current /vendor/extensions directory, pass EXT=extension_name to test a single extension"
   task :extensions => "db:test:prepare" do
-    extension_roots = Spree::Extension.descendants.map(&:root)
+    
+    current_extensions_path = File.join(File.expand_path(Dir.pwd), 'vendor/extensions')
+    all_extension_names = Spree::Extension.descendants
+    all_extension_names.collect!{ |x| x.extension_name.tr(' ', '').underscore }
+    verified_extension_paths = []
+
+    all_extension_names.each do |ext_name|
+      extension_path = File.join(current_extensions_path, ext_name)
+      if File.directory?(extension_path)
+         verified_extension_paths << extension_path
+      end
+    end
+
+    extension_roots = verified_extension_paths
     if ENV["EXT"]
       extension_roots = extension_roots.select {|x| /\/(\d+_)?#{ENV["EXT"]}$/ === x }
       if extension_roots.empty?

data/spec/spec_helper.rb

@@ -1,40 +1,65 @@
-# This file is copied to ~/spec when you run 'ruby script/generate rspec'
-# from the project root directory.
-ENV["RAILS_ENV"] = "test"
-require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
-require 'spec'
-require 'spec/rails'
-require File.expand_path(File.dirname(__FILE__) + "/preference_factory")
-
-Spec::Runner.configure do |config|
-  # If you're not using ActiveRecord you should remove these
-  # lines, delete config/database.yml and disable :active_record
-  # in your config/boot.rb
-  config.use_transactional_fixtures = true
-  config.use_instantiated_fixtures  = false
-  config.fixture_path = RAILS_ROOT + '/spec/fixtures/'
-
-  # == Fixtures
-  #
-  # You can declare fixtures for each example_group like this:
-  #   describe "...." do
-  #     fixtures :table_a, :table_b
-  #
-  # Alternatively, if you prefer to declare them only once, you can
-  # do so right here. Just uncomment the next line and replace the fixture
-  # names with your fixtures.
-  #
-  # config.global_fixtures = :table_a, :table_b
-  #
-  # If you declare global fixtures, be aware that they will be declared
-  # for all of your examples, even those that don't use them.
-  #
-  # == Mock Framework
-  #
-  # RSpec uses it's own mocking framework by default. If you prefer to
-  # use mocha, flexmock or RR, uncomment the appropriate line:
-  #
-  # config.mock_with :mocha
-  # config.mock_with :flexmock
-  # config.mock_with :rr
+unless defined? SPEC_ROOT
+  ENV["RAILS_ENV"] = "test"
+  
+  SPEC_ROOT = File.expand_path(File.dirname(__FILE__))
+  
+  unless defined? SPREE_ROOT
+    if env_file = ENV["SPREE_ENV_FILE"]
+      require env_file
+    else
+      require File.expand_path(SPEC_ROOT + "/../config/environment")
+    end
+  end
+  require 'spec'
+  require 'spec/rails'
+#  require 'scenarios'
+  require File.expand_path(File.dirname(__FILE__) + "/preference_factory")
+  
+  class Test::Unit::TestCase
+    class << self
+      # Class method for test helpers
+      def test_helper(*names)
+        names.each do |name|
+          name = name.to_s
+          name = $1 if name =~ /^(.*?)_test_helper$/i
+          name = name.singularize
+          first_time = true
+          begin
+            constant = (name.camelize + 'TestHelper').constantize
+            self.class_eval { include constant }
+          rescue NameError
+            filename = File.expand_path(SPEC_ROOT + '/../test/helpers/' + name + '_test_helper.rb')
+            require filename if first_time
+            first_time = false
+            retry
+          end
+        end
+      end    
+      alias :test_helpers :test_helper
+    end
+  end
+  
+  Dir[SPREE_ROOT + '/spec/matchers/*_matcher.rb'].each do |matcher|
+    require matcher
+  end
+  
+#  Scenario.load_paths.unshift "#{SPREE_ROOT}/spec/scenarios"
+  
+  Spec::Runner.configure do |config|
+    config.use_transactional_fixtures = true
+    config.use_instantiated_fixtures  = false
+    config.fixture_path = RAILS_ROOT + '/spec/fixtures/'
+    
+    # You can declare fixtures for each behaviour like this:
+    #   describe "...." do
+    #     fixtures :table_a, :table_b
+    #
+    # Alternatively, if you prefer to declare them only once, you can
+    # do so here, like so ...
+    #
+    #   config.global_fixtures = :table_a, :table_b
+    #
+    # If you declare global fixtures, be aware that they will be declared
+    # for all of your examples, even those that don't use them.
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spree
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Sean Schofield
@@ -9,7 +9,7 @@ autorequire: spree
 bindir: bin
 cert_chain: []
 
-date: 2008-10-02 00:00:00 -04:00
+date: 2008-10-14 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -2053,7 +2053,6 @@ files:
 - vendor/plugins/resource_controller/test/test/unit/something_test.rb
 - vendor/plugins/resource_controller/test/test/unit/tag_test.rb
 - vendor/plugins/resource_controller/test/test/unit/urligence_test.rb
-- vendor/plugins/resource_controller/test/tmp
 - vendor/plugins/resource_controller/test/vendor
 - vendor/plugins/resource_controller/test/vendor/plugins
 - vendor/plugins/resource_controller/test/vendor/plugins/shoulda
@@ -2809,6 +2808,8 @@ rdoc_options:
 - --exclude
 - log
 - --exclude
+- pkg
+- --exclude
 - public
 - --exclude
 - script