spree 0.11.0 → 0.11.1

data/lib/tasks/framework.rake

@@ -4,7 +4,7 @@ namespace :spree do
     task :gems do
       
       # Do not allow freeze and unfreeze tasks in instance mode
-      if File.directory? "#{RAILS_ROOT}/app"
+      if File.directory? "#{Rails.root}/app"
         puts "Spree cannot be frozen in instance mode.  Spree is meant to be frozen in a deployed Spree application only."
         return
       end

data/lib/tasks/instance.rake

@@ -1,26 +1,26 @@
 # Redefined standard Rails tasks only in instance mode
-unless File.directory? "#{RAILS_ROOT}/app"
+unless File.directory? "#{Rails.root}/app"
   require 'rake/testtask'
   
-  ENV['SPREE_ENV_FILE'] = File.join(RAILS_ROOT, 'config', 'environment')
+  ENV['SPREE_ENV_FILE'] = Rails.root.join('config', 'environment').to_s
   
   [Dir["#{SPREE_ROOT}/vendor/rails/railties/lib/tasks/*.rake"], Dir["#{SPREE_ROOT}/vendor/plugins/rspec_on_rails/tasks/*.rake"]].flatten.each do |rake|
     lines = IO.readlines(rake)
     lines.map! do |line|
-      line.gsub!('RAILS_ROOT', 'SPREE_ROOT') unless rake =~ /(misc|rspec)\.rake$/
+      line.gsub!('Rails.root', 'SPREE_ROOT') unless rake =~ /(misc|rspec)\.rake$/
       case rake
       when /testing\.rake$/
         line.gsub!(/t.libs << (["'])/, 't.libs << \1' + SPREE_ROOT + '/')
         line.gsub!(/t\.pattern = (["'])/, 't.pattern = \1' + SPREE_ROOT + '/')
       when /databases\.rake$/
         line.gsub!(/migrate\((["'])/, 'migrate(\1' + SPREE_ROOT + '/')
-        line.sub!("db/schema.rb", "#{RAILS_ROOT}/db/schema.rb")
+        line.sub!("db/schema.rb", "#{Rails.root}/db/schema.rb")
       when /rspec\.rake$/
-        line.gsub!('RAILS_ROOT', 'SPREE_ROOT') unless line =~ /:noop/
+        line.gsub!('Rails.root', 'SPREE_ROOT') unless line =~ /:noop/
         line.gsub!(/FileList\[(["'])/, "FileList[\\1#{SPREE_ROOT}/")
       end
       line
     end
     eval(lines.join("\n"), binding, rake)
   end
-end
+end

data/lib/validation_group.rb

@@ -1,4 +1,4 @@
-# This is a modified version of wizardly plugin (Jeff Patmon), which itself is based on the validationgroup 
+# This is a modified version of wizardly plugin (Jeff Patmon), which itself is based on the validationgroup
 # plugin (akira)
 module ValidationGroup
   module ActiveRecord
@@ -9,7 +9,7 @@ module ValidationGroup
         base.class_eval do
           cattr_accessor :validation_group_classes
           self.validation_group_classes = {}
- 
+
           def self.validation_group_order; @validation_group_order; end
           def self.validation_groups(all_classes = false)
             return (self.validation_group_classes[self] || {}) unless all_classes
@@ -22,7 +22,7 @@ module ValidationGroup
           end
         end
       end
- 
+
       def validation_group(name, options={})
         self_groups = (self.validation_group_classes[self] ||= {})
         self_groups[name.to_sym] = case options[:fields]
@@ -33,7 +33,7 @@ end
         # jeffp: capture the declaration order for this class only (no
         # superclasses)
         (@validation_group_order ||= []) << name.to_sym
- 
+
         unless included_modules.include?(InstanceMethods)
           # jeffp: added reader for current_validation_fields
           attr_reader :current_validation_group, :current_validation_fields
@@ -43,7 +43,7 @@ end
         end
       end
     end
- 
+
     module InstanceMethods # included in every model which calls validation_group
       #needs testing
 # def reset_fields_for_validation_group(group)
@@ -68,32 +68,32 @@ end
         if found
           @current_validation_group = group
           # jeffp: capture current fields for performance optimization
-          @current_validation_fields = group_classes[found][group]
+          @current_validation_fields = group_classes[found][group].clone
         end
       end
- 
+
       def disable_validation_group
         @current_validation_group = nil
         # jeffp: delete fields
         @current_validation_fields = nil
       end
- 
+
       def reject_non_validation_group_errors
         return unless validation_group_enabled?
         self.errors.remove_on(@current_validation_fields)
       end
- 
+
       # jeffp: optimizer for someone writing custom :validate method -- no need
       # to validate fields outside the current validation group note: could also
       # use in validation modules to improve performance
       def should_validate?(attribute)
         !self.validation_group_enabled? || (@current_validation_fields && @current_validation_fields.include?(attribute.to_sym))
       end
- 
+
       def validation_group_enabled?
         respond_to?(:current_validation_group) && !current_validation_group.nil?
       end
- 
+
       # eliminates need to use :enable_validation_group before :valid? call --
       # nice
       def valid_with_validation_group?(group=nil)
@@ -101,7 +101,7 @@ end
         valid_without_validation_group?
       end
     end
- 
+
     module Errors # included in ActiveRecord::Errors
       def add_with_validation_group(attribute,
           msg = @@default_error_messages[:invalid], *args,
@@ -110,13 +110,13 @@ end
         add_error = @base.respond_to?(:should_validate?) ? @base.should_validate?(attribute.to_sym) : true
         add_without_validation_group(attribute, msg, *args, &block) if add_error
       end
- 
+
       def remove_on(attributes)
         return unless attributes
         attributes = [attributes] unless attributes.is_a?(Array)
         @errors.reject!{|k,v| !attributes.include?(k.to_sym)}
       end
- 
+
       def self.included(base) #:nodoc:
         base.class_eval do
           alias_method_chain :add, :validation_group
@@ -124,7 +124,7 @@ end
       end
     end
   end
- 
+
   module Util
     # Return array consisting of current and its superclasses down to and
     # including base_class.
@@ -140,6 +140,6 @@ end
     end
   end
 end
- 
+
 # jeffp: moved from init.rb for gemification purposes --
 # require 'validation_group' loads everything now, init.rb requires 'validation_group' only

data/script/extension

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
-require 'commands/extension'
+require File.expand_path('../../config/boot',  __FILE__)
+require 'commands/extension'

data/test/functional/products_controller_test.rb

@@ -8,4 +8,17 @@ class ProductsControllerTest < ActionController::TestCase
     should_respond_with :success
     should_not_set_the_flash    
   end
+  
+  context "with a Taxonomy without a root Taxon" do
+    setup do
+      taxonomy = Factory(:taxonomy)
+      taxonomy2 = Factory(:taxonomy)
+      taxonomy2.root.destroy
+      get :index
+    end
+    should_respond_with :success
+    should "render only one Taxonomy" do
+      assert_select "#taxonomies .navigation-list li"
+    end
+  end
 end

data/test/test_helper.rb

@@ -67,7 +67,7 @@ Spork.prefork do
 
     @shipping_method = Factory(:shipping_method)
     @checkout = @order.checkout
-
+    @checkout.email = Faker::Internet.email
     @checkout.ship_address = Factory(:address)
     @checkout.shipping_method = @shipping_method
 

data/test/unit/checkout_test.rb

@@ -4,17 +4,26 @@ class CheckoutTest < ActiveSupport::TestCase
   fixtures :payment_methods
 
   should_belong_to :bill_address
-  should_not_allow_values_for :email, "blah", "b lah", "blah@blah"
-  
- context Checkout do 
+
+ context Checkout do
    setup do
      @order = Factory(:order_with_totals)
      @checkout = @order.checkout
+     @checkout.email = Faker::Internet.email
      @checkout.shipping_method = Factory(:shipping_method)
      @checkout.state = "confirm"
      @checkout.save!
    end
 
+   context "with :register as current validation group" do
+     setup do
+       @checkout.enable_validation_group(:register)
+     end
+     subject { @checkout }
+
+     should_not_allow_values_for :email, "blah", "b lah", "blah@blah"
+   end
+
    context "in confirm state w/no auto capture" do
      setup do
        Spree::Config.set(:auto_capture => false)
@@ -22,7 +31,7 @@ class CheckoutTest < ActiveSupport::TestCase
      end
      context "next" do
        setup do
-         @checkout.next! 
+         @checkout.next!
         end
        should_change("@checkout.state", :to => "complete") { @checkout.state }
        should_change("@checkout.order.completed_at", :from => nil) { @checkout.order.completed_at }
@@ -30,7 +39,7 @@ class CheckoutTest < ActiveSupport::TestCase
        should_change("CreditcardTxn.count", :by => 1) { CreditcardTxn.count }
      end
    end
-   
+
    context "in payment state w/no auto capture" do
     context "next with declineable creditcard" do
       setup do
@@ -46,7 +55,7 @@ class CheckoutTest < ActiveSupport::TestCase
       should_not_change("@checkout.state") { @checkout.state }
     end
    end
-   
+
    context "in confirm state w/auto capture" do
      setup do
        Spree::Config.set(:auto_capture => true)
@@ -55,7 +64,7 @@ class CheckoutTest < ActiveSupport::TestCase
        setup do
          @checkout.state = 'confirm'
          @payment = Factory(:payment, :payable => @checkout)
-         @checkout.next! 
+         @checkout.next!
        end
        should_change("@checkout.state", :to => "complete") { @checkout.state }
        should_change("@checkout.order.completed_at", :from => nil) { @checkout.order.completed_at }
@@ -102,9 +111,9 @@ class CheckoutTest < ActiveSupport::TestCase
        assert_equal [@country], Checkout.countries
      end
    end
- end       
+ end
  context "Checkout state machine with no Gateway configured" do
-   setup do 
+   setup do
      Gateway.stub!(:current, :return => nil)
      @order = Factory(:order_with_totals)
      @checkout = @order.checkout

data/vendor/extensions/README

@@ -1 +1 @@
-So-called "standard extensions" that ship with Spree go in this directory.  Application specific extensions go in #{RAILS_ROOT}/vendor/extensions.
+So-called "standard extensions" that ship with Spree go in this directory.  Application specific extensions go in #{Rails.root}/vendor/extensions.

data/vendor/extensions/api/Rakefile

@@ -67,7 +67,7 @@ namespace :spec do
   # desc "Translate specs from pre-0.9 to 0.9 style"
   # task :translate do
   #   translator = ::Spec::Translator.new
-  #   dir = RAILS_ROOT + '/spec'
+  #   dir = Rails.root + '/spec'
   #   translator.translate(dir, dir)
   # end
 
@@ -91,7 +91,7 @@ namespace :spec do
       task :load => :environment do
         require 'active_record/fixtures'
         ActiveRecord::Base.establish_connection(RAILS_ENV.to_sym)
-        (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(RAILS_ROOT, 'spec', 'fixtures', '*.{yml,csv}'))).each do |fixture_file|
+        (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(Rails.root.join('spec', 'fixtures', '*.{yml,csv}'))).each do |fixture_file|
           Fixtures.create_fixtures('spec/fixtures', File.basename(fixture_file, '.*'))
         end
       end

data/vendor/extensions/api/lib/tasks/api_extension_tasks.rake

@@ -8,8 +8,8 @@ namespace :spree do
           path = file.sub(ApiExtension.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/vendor/extensions/overview_dashboard/Rakefile

@@ -67,7 +67,7 @@ namespace :spec do
   # desc "Translate specs from pre-0.9 to 0.9 style"
   # task :translate do
   #   translator = ::Spec::Translator.new
-  #   dir = RAILS_ROOT + '/spec'
+  #   dir = Rails.root + '/spec'
   #   translator.translate(dir, dir)
   # end
 
@@ -91,7 +91,7 @@ namespace :spec do
       task :load => :environment do
         require 'active_record/fixtures'
         ActiveRecord::Base.establish_connection(RAILS_ENV.to_sym)
-        (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(RAILS_ROOT, 'spec', 'fixtures', '*.{yml,csv}'))).each do |fixture_file|
+        (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(Rails.root.join('spec', 'fixtures', '*.{yml,csv}'))).each do |fixture_file|
           Fixtures.create_fixtures('spec/fixtures', File.basename(fixture_file, '.*'))
         end
       end

data/vendor/extensions/overview_dashboard/app/views/admin/overview/index.html.erb

@@ -150,15 +150,15 @@
   <% hook :admin_dashboard_javascript do %>
     <% if @show_dashboard %>
        <script type="text/javascript">
-         var orders_by_day_points = [[<%= @orders_by_day.map { |day| "[\"#{day[0]}\",#{day[1]}]" }.join(",") %>]];
-        var best_selling_variants_points = [<%= @best_selling_variants.map { |v| "[\"#{v[0]}\",#{v[1]}]" }.join(",") %>];
-        var top_grossing_variants_points = [<%= @top_grossing_variants.map { |v| "[\"#{v[0]}\",#{v[1]}]" }.join(",") %>];
-        var best_selling_taxons_points = [<%= @best_selling_taxons.map { |t| "[\"#{t[0]}\",#{t[1]}]" }.join(",") %>];
+         var orders_by_day_points = [[<%= raw @orders_by_day.map { |day| "[\"#{day[0]}\",#{day[1]}]" }.join(",") %>]];
+        var best_selling_variants_points = [<%=  raw @best_selling_variants.map { |v| "[\"#{v[0]}\",#{v[1]}]" }.join(",") %>];
+        var top_grossing_variants_points = [<%= raw @top_grossing_variants.map { |v| "[\"#{v[0]}\",#{v[1]}]" }.join(",") %>];
+        var best_selling_taxons_points = [<%= raw @best_selling_taxons.map { |t| "[\"#{t[0]}\",#{t[1]}]" }.join(",") %>];
 
         var orders = "<%= t(:orders) %>";
         var by_day = "<%= t(:by_day) %>";
 
-        var pie_colors = [<%= @pie_colors.map{|c| "'#{c}'"}.join(",") %>];
+        var pie_colors = [<%= raw @pie_colors.map{|c| "'#{c}'"}.join(",") %>];
        </script>
     <% end %>
 

data/vendor/extensions/overview_dashboard/lib/tasks/overview_dashboard_extension_tasks.rake

@@ -19,8 +19,8 @@ namespace :spree do
           path = file.sub(OverviewDashboardExtension.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/vendor/extensions/payment_gateway/Rakefile

@@ -67,7 +67,7 @@ namespace :spec do
   # desc "Translate specs from pre-0.9 to 0.9 style"
   # task :translate do
   #   translator = ::Spec::Translator.new
-  #   dir = RAILS_ROOT + '/spec'
+  #   dir = Rails.root + '/spec'
   #   translator.translate(dir, dir)
   # end
 
@@ -91,7 +91,7 @@ namespace :spec do
       task :load => :environment do
         require 'active_record/fixtures'
         ActiveRecord::Base.establish_connection(RAILS_ENV.to_sym)
-        (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(RAILS_ROOT, 'spec', 'fixtures', '*.{yml,csv}'))).each do |fixture_file|
+        (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(Rails.root.join('spec', 'fixtures', '*.{yml,csv}'))).each do |fixture_file|
           Fixtures.create_fixtures('spec/fixtures', File.basename(fixture_file, '.*'))
         end
       end

data/vendor/extensions/payment_gateway/app/models/gateway/authorize_net_cim.rb

@@ -2,6 +2,7 @@ class Gateway::AuthorizeNetCim < Gateway
   preference :login, :string
   preference :password, :string
   preference :test_mode, :boolean, :default => false
+  preference :validate_on_profile_create, :boolean, :default => false
 
   ActiveMerchant::Billing::Response.class_eval do
     attr_writer :authorization
@@ -96,10 +97,13 @@ class Gateway::AuthorizeNetCim < Gateway
         info = { :bill_to => generate_address_hash(payment.order.bill_address),
                  :payment => { :credit_card => payment.source } }
       end
+
+      validation_mode = preferred_validate_on_profile_create ? preferred_server.to_sym : :none
+
       { :profile => { :merchant_customer_id => "#{Time.now.to_f}",
                       #:ship_to_list => generate_address_hash(creditcard.checkout.ship_address),
-                      :payment_profiles => info }
-      }
+                      :payment_profiles => info },
+        :validation_mode => validation_mode }
     end
 
     # As in PaymentGateway but with separate name fields

data/vendor/extensions/payment_gateway/app/models/gateway/braintree.rb

@@ -0,0 +1,88 @@
+class Gateway::Braintree < Gateway
+	preference :merchant_id, :string
+	preference :public_key, :string
+	preference :private_key, :string
+
+  def provider_class
+    ActiveMerchant::Billing::BraintreeGateway
+  end
+
+  def authorize(money, creditcard, options = {})
+    adjust_options_for_braintree(creditcard, options)
+    payment_method = creditcard.gateway_customer_profile_id || creditcard
+    provider.authorize(money, payment_method, options)
+  end
+
+  def capture(authorization, ignored_creditcard, ignored_options)
+    amount = (authorization.amount * 100).to_i
+    provider.capture(amount, authorization.response_code)
+  end
+
+  def create_profile(payment)
+    if payment.source.gateway_customer_profile_id.nil?
+      response = provider.store(payment.source)
+      if response.success?
+        payment.source.update_attributes!(:gateway_customer_profile_id => response.params["customer_vault_id"])
+      else
+        payment.source.gateway_error response.message
+      end
+    end
+  end
+
+  def credit(*args)
+    if args.size == 4
+      credit_with_payment_profiles(*args)
+    elsif args.size == 3
+      credit_without_payment_profiles(*args)
+    else
+      raise ArgumentError, "Expected 3 or 4 arguments, received #{args.size}"
+    end
+  end
+
+  def credit_with_payment_profiles(amount, payment, response_code, option)
+    provider.credit(amount, payment)
+  end
+
+  def credit_without_payment_profiles(amount, response_code, options)
+    transaction = ::Braintree::Transaction.find(response_code)
+    if BigDecimal.new(amount.to_s) == (transaction.amount * 100)
+      provider.refund(response_code)
+    else
+      raise NotImplementedError
+    end
+  end
+
+  def payment_profiles_supported?
+    true
+  end
+
+  def purchase(money, creditcard, options = {})
+    authorize(money, creditcard, options.merge(:submit_for_settlement => true))
+  end
+
+  def void(response_code, ignored_creditcard, ignored_options)
+    provider.void(response_code)
+  end
+
+  protected
+
+  def adjust_country_name(options)
+    [:billing_address, :shipping_address].each do |address|
+      if options[address] && options[address][:country] == "US"
+        options[address][:country] = "United States of America"
+      end
+    end
+  end
+
+  def adjust_billing_address(creditcard, options)
+    if creditcard.gateway_customer_profile_id
+      options.delete(:billing_address)
+    end
+  end
+
+  def adjust_options_for_braintree(creditcard, options)
+    adjust_country_name(options)
+    adjust_billing_address(creditcard, options)
+  end
+end
+