spree_core 2.4.0.rc3 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ad557fa8765c3b9bd3d6532c913962d33865e28
-  data.tar.gz: c424bb23636fd0889e52830a5905bb48069e2440
+  metadata.gz: 7ed979ffaeda61e053a4b98e9dc25390529f0f0e
+  data.tar.gz: 3d4c081a21a8f8a118066c765c0970aa18322c5d
 SHA512:
-  metadata.gz: bc7f1a23e33514c7b732f8c154dad4310c7bf3f2a617eabb5b138d97516d6ea0f67edfca2e4e20fc6d59a4bda1ff0a1d37aab2b1f1888b715a8d31ea617faa81
-  data.tar.gz: f5b67b3fe498f7e92d50cf242df7b9638304563348efd0ff6fbaeedd8bbe653fb971b566224b9d44763c71608d77edecdd652d00728c77face10db1f3aff2d75
+  metadata.gz: b919e8bca207687063f08ddda21b392381991e04f409b86d8d32c63e6ee38158a3b0ea5348158f662d52693dbe17b4af3e402cc99c6f1555b2fe61ed94f235d1
+  data.tar.gz: d9c59d21c2b5faece11d94a153cdb1bcee54adf364662b20d9b069550067b25629a9403fcf709b5b150633356b925bf41462a0252954951171d0f582c1f3d6e2

data/app/helpers/spree/base_helper.rb

@@ -48,7 +48,7 @@ module Spree
       meta.reverse_merge!({
         keywords: current_store.meta_keywords,
         description: current_store.meta_description,
-      })
+      }) if meta[:keywords].blank? or meta[:description].blank?
       meta
     end
 

data/app/models/concerns/spree/default_price.rb

@@ -0,0 +1,34 @@
+module Spree
+  module DefaultPrice
+    extend ActiveSupport::Concern
+
+    included do
+      has_one :default_price,
+        -> { where currency: Spree::Config[:currency] },
+        class_name: 'Spree::Price',
+        dependent: :destroy
+
+      delegate_belongs_to :default_price, :display_price, :display_amount, :price, :price=, :currency
+
+      after_save :save_default_price
+
+      def default_price
+        Spree::Price.unscoped { super }
+      end
+
+      def has_default_price?
+        !self.default_price.nil?
+      end
+
+      private
+
+      def default_price_changed?
+        default_price && (default_price.changed? || default_price.new_record?)
+      end
+
+      def save_default_price
+        default_price.save if default_price_changed?
+      end
+    end
+  end
+end

data/app/models/spree/asset.rb

@@ -1,6 +1,6 @@
 module Spree
   class Asset < Spree::Base
     belongs_to :viewable, polymorphic: true, touch: true
-    acts_as_list scope: :viewable
+    acts_as_list scope: [:viewable_id, :viewable_type]
   end
 end

data/app/models/spree/option_type.rb

@@ -5,7 +5,9 @@ module Spree
     has_many :products, through: :product_option_types
     has_and_belongs_to_many :prototypes, join_table: 'spree_option_types_prototypes'
 
-    validates :name, :presentation, presence: true
+    validates :name, presence: true, uniqueness: true 
+    validates :presentation, presence: true
+
     default_scope -> { order("#{self.table_name}.position") }
 
     accepts_nested_attributes_for :option_values, reject_if: lambda { |ov| ov[:name].blank? || ov[:presentation].blank? }, allow_destroy: true

data/app/models/spree/option_value.rb

@@ -4,7 +4,8 @@ module Spree
     acts_as_list scope: :option_type
     has_and_belongs_to_many :variants, join_table: 'spree_option_values_variants', class_name: "Spree::Variant"
 
-    validates :name, :presentation, presence: true
+    validates :name, presence: true, uniqueness: true
+    validates :presentation, presence: true
 
     after_touch :touch_all_variants
 

data/app/models/spree/order.rb

@@ -430,9 +430,26 @@ module Spree
       line_items.select(&:insufficient_stock?)
     end
 
+    ##
+    # Check to see if any line item variants are soft, deleted.
+    # If so add error and restart checkout.
+    def ensure_line_item_variants_are_not_deleted
+      if line_items.select{ |li| li.variant.destroyed? }.present?
+        errors.add(:base, Spree.t(:deleted_variants_present))
+        restart_checkout_flow
+        false
+      else
+        true
+      end
+    end
+
     def ensure_line_items_are_in_stock
       if insufficient_stock_lines.present?
-        errors.add(:base, Spree.t(:insufficient_stock_lines_present)) and return false
+        errors.add(:base, Spree.t(:insufficient_stock_lines_present))
+        restart_checkout_flow
+        false
+      else
+        true
       end
     end
 
@@ -446,7 +463,7 @@ module Spree
         current_line_item = self.line_items.detect { |my_li|
                       my_li.variant == other_order_line_item.variant &&
                       self.line_item_comparison_hooks.all? { |hook|
-                        self.send(hook, my_li, other_order_line_item)
+                        self.send(hook, my_li, other_order_line_item.serializable_hash)
                       }
                     }
         if current_line_item

data/app/models/spree/order/checkout.rb

@@ -99,8 +99,12 @@ module Spree
                 before_transition from: :delivery, do: :apply_free_shipping_promotions
               end
 
+              before_transition to: :resumed, do: :ensure_line_item_variants_are_not_deleted
               before_transition to: :resumed, do: :ensure_line_items_are_in_stock
 
+              before_transition to: :complete, do: :ensure_line_item_variants_are_not_deleted
+              before_transition to: :complete, do: :ensure_line_items_are_in_stock
+
               after_transition to: :complete, do: :finalize!
               after_transition to: :resumed,  do: :after_resume
               after_transition to: :canceled, do: :after_cancel

data/app/models/spree/order_contents.rb

@@ -47,9 +47,12 @@ module Spree
         filtered_params = params.symbolize_keys
         return filtered_params if filtered_params[:line_items_attributes].nil? || filtered_params[:line_items_attributes][:id]
 
+        line_item_ids = order.line_items.pluck(:id)
+
         params[:line_items_attributes].each_pair do |id, value|
-          line_item_id = value[:id]
-          filtered_params[:line_items_attributes].delete(id) unless Spree::LineItem.find_by_id(line_item_id.to_i)
+          unless line_item_ids.include?(value[:id].to_i) || value[:variant_id].present?
+            filtered_params[:line_items_attributes].delete(id)
+          end
         end
         filtered_params
       end

data/app/models/spree/payment_method.rb

@@ -16,14 +16,14 @@ module Spree
     end
 
     def provider_class
-      raise 'You must implement provider_class method for this gateway.'
+      raise ::NotImplementedError, 'You must implement provider_class method for this gateway.'
     end
 
     # The class that will process payments for this payment type, used for @payment.source
     # e.g. CreditCard in the case of a the Gateway payment type
     # nil means the payment method doesn't require a source e.g. check
     def payment_source_class
-      raise 'You must implement payment_source_class method for this gateway.'
+      raise ::NotImplementedError, 'You must implement payment_source_class method for this gateway.'
     end
 
     def self.available(display_on = 'both')
@@ -68,8 +68,8 @@ module Spree
       true
     end
 
-    def cancel
-      raise NotImplimentedError.new 'You must implement cancel method for this payment method.'
+    def cancel(response)
+      raise ::NotImplementedError, 'You must implement cancel method for this payment method.'
     end
   end
 end

data/app/models/spree/price.rb

@@ -21,7 +21,7 @@ module Spree
     end
 
     def price=(price)
-      self[:amount] = parse_price(price)
+      self[:amount] = Spree::LocalizedNumber.parse(price)
     end
 
     # Remove variant default_scope `deleted_at: nil`
@@ -32,23 +32,7 @@ module Spree
     private
 
     def check_price
-      raise "Price must belong to a variant" if variant.nil?
-
-      if currency.nil?
-        self.currency = Spree::Config[:currency]
-      end
-    end
-
-    # strips all non-price-like characters from the price, taking into account locale settings
-    def parse_price(price)
-      return price unless price.is_a?(String)
-
-      separator, delimiter = I18n.t([:'number.currency.format.separator', :'number.currency.format.delimiter'])
-      non_price_characters = /[^0-9\-#{separator}]/
-      price.gsub!(non_price_characters, '') # strip everything else first
-      price.gsub!(separator, '.') unless separator == '.' # then replace the locale-specific decimal separator with the standard separator if necessary
-
-      price.to_d
+      self.currency ||= Spree::Config[:currency]
     end
 
     def maximum_amount

data/app/models/spree/product.rb

@@ -64,32 +64,33 @@ module Spree
 
     delegate_belongs_to :master, :cost_price
 
+    delegate :images, to: :master, prefix: true
+    alias_method :images, :master_images
+
+    has_many :variant_images, -> { order(:position) }, source: :images, through: :variants_including_master
+
     after_create :set_master_variant_defaults
     after_create :add_associations_from_prototype
     after_create :build_variants_from_option_values_hash, if: :option_values_hash
 
+    after_destroy :punch_slug
+
+    after_initialize :ensure_master
+
     after_save :save_master
     after_save :run_touch_callbacks, if: :anything_changed?
     after_save :reset_nested_changes
     after_touch :touch_taxons
 
-    delegate :images, to: :master, prefix: true
-    alias_method :images, :master_images
-
-    has_many :variant_images, -> { order(:position) }, source: :images, through: :variants_including_master
+    before_validation :normalize_slug, on: :update
+    before_validation :validate_master
 
+    validates :meta_keywords, length: { maximum: 255 }
+    validates :meta_title, length: { maximum: 255 }
     validates :name, presence: true
     validates :price, presence: true, if: proc { Spree::Config[:require_master_price] }
     validates :shipping_category_id, presence: true
-    validates :slug, length: { minimum: 3 }
-
-    validates :slug, uniqueness: { allow_blank: true }
-    validates :meta_keywords, length: { maximum: 255 }
-    validates :meta_title, length: { maximum: 255 }
-
-    before_validation :normalize_slug, on: :update
-
-    after_destroy :punch_slug
+    validates :slug, length: { minimum: 3 }, uniqueness: { allow_blank: true }
 
     attr_accessor :option_values_hash
 
@@ -97,8 +98,6 @@ module Spree
 
     alias :options :product_option_types
 
-    after_initialize :ensure_master
-
     # the master variant is not a member of the variants array
     def has_variants?
       variants.any?
@@ -279,19 +278,21 @@ module Spree
     # when saving so we force a save using a hook
     # Fix for issue #5306
     def save_master
-      begin
-        if master && (master.changed? || master.new_record? || (master.default_price && (master.default_price.changed? || master.default_price.new_record?)))
-          master.save!
-          @nested_changes = true
-        end
+      if master && (master.changed? || master.new_record? || (master.default_price && (master.default_price.changed? || master.default_price.new_record?)))
+        master.save!
+        @nested_changes = true
+      end
+    end
 
-      # If the master cannot be saved, the Product object will get its errors
-      # and will be destroyed
-      rescue ActiveRecord::RecordInvalid
+    # If the master cannot be saved, the Product object will get its errors
+    # and will be destroyed
+    def validate_master
+      # We call master.default_price here to ensure price is initialized.
+      # Required to avoid Variant#check_price validation failing on create.
+      unless master.default_price && master.valid?
         master.errors.each do |att, error|
           self.errors.add(att, error)
         end
-        raise
       end
     end
 

data/app/models/spree/promotion/actions/create_item_adjustments.rb

@@ -64,7 +64,10 @@ module Spree
           end
 
           def line_items_to_adjust(promotion, order)
-            excluded_ids = self.adjustments.pluck(:adjustable_id)
+            excluded_ids = self.adjustments.
+              where(adjustable_id: order.line_items.pluck(:id), adjustable_type: 'Spree::LineItem').
+              pluck(:adjustable_id)
+
             order.line_items.where.not(id: excluded_ids).select do |line_item|
               promotion.line_item_actionable? order, line_item
             end

data/app/models/spree/promotion/rules/taxon.rb

@@ -26,6 +26,10 @@ module Spree
           eligibility_errors.empty?
         end
 
+        def actionable?(line_item)
+          taxon_product_ids.include? line_item.variant.product_id
+        end
+
         def taxon_ids_string
           taxons.pluck(:id).join(',')
         end
@@ -55,6 +59,10 @@ module Spree
         def taxons_in_order_including_parents(order)
           order_taxons_in_taxons_and_children(order).inject([]){ |taxons, taxon| taxons << taxon.self_and_ancestors }.flatten.uniq
         end
+
+        def taxon_product_ids
+          Spree::Product.joins(:taxons).where(spree_taxons: {id: taxons.pluck(:id)}).pluck(:id).uniq
+        end
       end
     end
   end

data/app/models/spree/reimbursement.rb

@@ -17,6 +17,8 @@ module Spree
 
     before_create :generate_number
 
+    scope :reimbursed, -> { where(reimbursement_status: 'reimbursed') }
+
     # The reimbursement_tax_calculator property should be set to an object that responds to "call"
     # and accepts a reimbursement object. Invoking "call" should update the tax fields on the
     # associated ReturnItems.

data/app/models/spree/return_item.rb

@@ -3,7 +3,7 @@ module Spree
     COMPLETED_RECEPTION_STATUSES = %w(received given_to_customer)
 
     class_attribute :return_eligibility_validator
-    self.return_eligibility_validator = ReturnItem::EligibilityValidator::DefaultEligibilityValidator
+    self.return_eligibility_validator = ReturnItem::EligibilityValidator::Default
 
     class_attribute :exchange_variant_engine
     self.exchange_variant_engine = ReturnItem::ExchangeVariantEligibility::SameProduct

data/app/models/spree/return_item/eligibility_validator/base_validator.rb

@@ -8,11 +8,11 @@ module Spree
     end
 
     def eligible_for_return?
-      raise 'Implement me'
+      raise NotImplementedError, Spree.t(:implement_eligible_for_return)
     end
 
     def requires_manual_intervention?
-      raise 'Implement me'
+      raise NotImplementedError, Spree.t(:implement_requires_manual_intervention)
     end
 
     private

data/app/models/spree/return_item/{default_eligibility_validator.rb → eligibility_validator/default.rb}

@@ -1,5 +1,5 @@
 module Spree
-  class ReturnItem::DefaultEligibilityValidator < Spree::ReturnItem::EligibilityValidator::BaseValidator
+  class ReturnItem::EligibilityValidator::Default < Spree::ReturnItem::EligibilityValidator::BaseValidator
     class_attribute :permitted_eligibility_validators
     self.permitted_eligibility_validators = [
                                               ReturnItem::EligibilityValidator::TimeSincePurchase,

data/app/models/spree/return_item/exchange_variant_eligibility/same_product.rb

@@ -3,7 +3,7 @@ module Spree
     class SameProduct
 
       def self.eligible_variants(variant)
-        Spree::Variant.where.not(id: variant.id).where(product_id: variant.product_id, is_master: false)
+        Spree::Variant.where(product_id: variant.product_id, is_master: false).in_stock
       end
     end
   end

data/app/models/spree/variant.rb

@@ -2,6 +2,8 @@ module Spree
   class Variant < Spree::Base
     acts_as_paranoid
 
+    include Spree::DefaultPrice
+
     belongs_to :product, touch: true, class_name: 'Spree::Product', inverse_of: :variants
     belongs_to :tax_category, class_name: 'Spree::TaxCategory'
 
@@ -20,31 +22,27 @@ module Spree
     has_and_belongs_to_many :option_values, join_table: :spree_option_values_variants
     has_many :images, -> { order(:position) }, as: :viewable, dependent: :destroy, class_name: "Spree::Image"
 
-    has_one :default_price,
-      -> { where currency: Spree::Config[:currency] },
-      class_name: 'Spree::Price', inverse_of: :variant
-      
-    delegate_belongs_to :default_price, :display_price, :display_amount, :price, :price=, :currency
-
     has_many :prices,
       class_name: 'Spree::Price',
       dependent: :destroy,
       inverse_of: :variant
 
+    before_validation :set_cost_currency
+
     validate :check_price
 
     validates :cost_price, numericality: { greater_than_or_equal_to: 0, allow_nil: true }
     validates :price,      numericality: { greater_than_or_equal_to: 0, allow_nil: true }
     validates_uniqueness_of :sku, allow_blank: true, conditions: -> { where(deleted_at: nil) }
 
-    before_validation :set_cost_currency
-    after_save :save_default_price
     after_create :create_stock_items
     after_create :set_position
-    after_create :set_master_out_of_stock, :unless => :is_master?
+    after_create :set_master_out_of_stock, unless: :is_master?
 
     after_touch :clear_in_stock_cache
 
+    scope :in_stock, -> { joins(:stock_items).where('count_on_hand > ? OR track_inventory = ?', 0, false) }
+
     def self.active(currency = nil)
       joins(:prices).where(deleted_at: nil).where('spree_prices.currency' => currency || Spree::Config[:currency]).where('spree_prices.amount IS NOT NULL')
     end
@@ -58,7 +56,11 @@ module Spree
     end
 
     def cost_price=(price)
-      self[:cost_price] = parse_price(price) if price.present?
+      self[:cost_price] = Spree::LocalizedNumber.parse(price) if price.present?
+    end
+
+    def weight=(weight)
+      self[:weight] = Spree::LocalizedNumber.parse(weight) if weight.present?
     end
 
     # returns number of units currently on backorder for this variant.
@@ -66,6 +68,10 @@ module Spree
       inventory_units.with_state('backordered').size
     end
 
+    def is_backorderable?
+      Spree::Stock::Quantifier.new(self).backorderable?
+    end
+
     def options_text
       values = self.option_values.sort do |a, b|
         a.option_type.position <=> b.option_type.position
@@ -92,10 +98,6 @@ module Spree
       Spree::Product.unscoped { super }
     end
 
-    def default_price
-      Spree::Price.unscoped { super }
-    end
-
     def options=(options = {})
       options.each do |option|
         set_option_value(option[:name], option[:value])
@@ -136,10 +138,6 @@ module Spree
       self.option_values.detect { |o| o.option_type.name == opt_name }.try(:presentation)
     end
 
-    def has_default_price?
-      !self.default_price.nil?
-    end
-
     def price_in(currency)
       prices.select{ |price| price.currency == currency }.first || Spree::Price.new(variant_id: self.id, currency: currency)
     end
@@ -167,7 +165,7 @@ module Spree
       options.keys.map { |key|
         m = "#{options[key]}_price_modifier_amount".to_sym
         if self.respond_to? m
-          self.send(m, options[key]) 
+          self.send(m, options[key])
         else
           0
         end
@@ -203,17 +201,6 @@ module Spree
     end
 
     private
-      # strips all non-price-like characters from the price, taking into account locale settings
-      def parse_price(price)
-        return price unless price.is_a?(String)
-
-        separator, delimiter = I18n.t([:'number.currency.format.separator', :'number.currency.format.delimiter'])
-        non_price_characters = /[^0-9\-#{separator}]/
-        price.gsub!(non_price_characters, '') # strip everything else first
-        price.gsub!(separator, '.') unless separator == '.' # then replace the locale-specific decimal separator with the standard separator if necessary
-
-        price.to_d
-      end
 
       def set_master_out_of_stock
         if product.master && product.master.in_stock?
@@ -234,14 +221,6 @@ module Spree
         end
       end
 
-      def default_price_changed?
-        default_price && (default_price.changed? || default_price.new_record?)
-      end
-
-      def save_default_price
-        default_price.save if default_price_changed?
-      end
-
       def set_cost_currency
         self.cost_currency = Spree::Config[:currency] if cost_currency.nil? || cost_currency.empty?
       end

data/config/locales/en.yml

@@ -528,6 +528,9 @@ en:
     choose_dashboard_locale: Choose Dashboard Locale
     choose_location: Choose location
     city: City
+    clear_cache: Clear Cache
+    clear_cache_ok: Cache was flushed
+    clear_cache_warning: Clearing cache will temporarily reduce the performance of your store.
     click_and_drag_on_the_products_to_sort_them: Click and drag on the products to sort them.
     clone: Clone
     close: Close
@@ -614,6 +617,7 @@ en:
     default_tax: Default Tax
     default_tax_zone: Default Tax Zone
     delete: Delete
+    deleted_variants_present: Some line items in this order have products that are no longer available.
     delivery: Delivery
     depth: Depth
     description: Description
@@ -833,6 +837,8 @@ en:
     month: Month
     more: More
     move_stock_between_locations: Move Stock Between Locations
+    must_implement_eligible_for_return: "Must implement #eligible_for_return? for your EligibilityValidator."
+    must_implement_requires_manual_intervention: "Must implement #requires_manual_intervention? for your EligibilityValidator."
     my_account: My Account
     my_orders: My Orders
     name: Name

data/db/migrate/20140530024945_move_order_token_from_tokenized_permission.rb

@@ -10,7 +10,7 @@ class MoveOrderTokenFromTokenizedPermission < ActiveRecord::Migration
       Spree::Order.includes(:tokenized_permission).each do |o|
         o.update_column :guest_token, o.tokenized_permission.token
       end
-    when 'Mysql2'
+    when 'Mysql2', 'MySQL'
       execute "UPDATE spree_orders, spree_tokenized_permissions
                SET spree_orders.guest_token = spree_tokenized_permissions.token
                WHERE spree_tokenized_permissions.permissable_id = spree_orders.id

data/db/migrate/20141120135441_add_guest_token_index_to_spree_orders.rb

@@ -0,0 +1,5 @@
+class AddGuestTokenIndexToSpreeOrders < ActiveRecord::Migration
+  def change
+    add_index :spree_orders, :guest_token
+  end
+end

data/lib/spree/core.rb

@@ -58,10 +58,12 @@ require 'spree/migrations'
 require 'spree/core/engine'
 
 require 'spree/i18n'
+require 'spree/localized_number'
 require 'spree/money'
-
 require 'spree/permitted_attributes'
+
 require 'spree/core/delegate_belongs_to'
+require 'spree/core/importer'
 require 'spree/core/permalinks'
 require 'spree/core/product_duplicator'
 require 'spree/core/controller_helpers/auth'
@@ -73,8 +75,6 @@ require 'spree/core/controller_helpers/ssl'
 require 'spree/core/controller_helpers/store'
 require 'spree/core/controller_helpers/strong_parameters'
 
-require 'spree/core/importer'
-
 # Hack waiting on https://github.com/pluginaweek/state_machine/pull/275
 module StateMachine
   module Integrations

data/lib/spree/core/controller_helpers/order.rb

@@ -22,13 +22,14 @@ module Spree
           if @simple_current_order
             @simple_current_order.last_ip_address = ip_address
             return @simple_current_order
+          else
+            @simple_current_order = Spree::Order.new
           end
         end
 
         # The current incomplete order from the guest_token for use in cart and during checkout
         def current_order(options = {})
           options[:create_order_if_necessary] ||= false
-          options[:lock] ||= false
 
           return @current_order if @current_order
 
@@ -82,6 +83,7 @@ module Spree
         end
 
         def find_order_by_token_or_user(options={}, with_adjustments = false)
+          options[:lock] ||= false
 
           # Find any incomplete orders for the guest_token
           if with_adjustments

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "2.4.0.rc3"
+    "2.4.0"
   end
 end

data/lib/spree/localized_number.rb

@@ -0,0 +1,20 @@
+module Spree
+  class LocalizedNumber
+
+    # Strips all non-price-like characters from the number, taking into account locale settings.
+    def self.parse(number)
+      return number unless number.is_a?(String)
+
+      separator, delimiter = I18n.t([:'number.currency.format.separator', :'number.currency.format.delimiter'])
+      non_number_characters = /[^0-9\-#{separator}]/
+
+      # strip everything else first
+      number.gsub!(non_number_characters, '')
+      # then replace the locale-specific decimal separator with the standard separator if necessary
+      number.gsub!(separator, '.') unless separator == '.'
+
+      number.to_d
+    end
+
+  end
+end

data/lib/spree/money.rb

@@ -6,7 +6,7 @@ module Spree
   class Money
     attr_reader :money
 
-    delegate :cents, :to => :money
+    delegate :cents, to: :money
 
     def initialize(amount, options={})
       @money = Monetize.parse([amount, (options[:currency] || Spree::Config[:currency])].join)
@@ -26,7 +26,7 @@ module Spree
       @money.format(@options)
     end
 
-    def to_html(options = { :html => true })
+    def to_html(options = { html: true })
       output = @money.format(@options.merge(options))
       if options[:html]
         # 1) prevent blank, breaking spaces

data/lib/spree/testing_support/factories/options_factory.rb

@@ -1,12 +1,13 @@
 FactoryGirl.define do
   factory :option_value, class: Spree::OptionValue do
-    name 'Size'
+    sequence(:name) { |n| "Size-#{n}" }
+
     presentation 'S'
     option_type
   end
 
   factory :option_type, class: Spree::OptionType do
-    name 'foo-size'
+    sequence(:name) { |n| "foo-size-#{n}" }
     presentation 'Size'
   end
 end

data/lib/spree/testing_support/factories/variant_factory.rb

@@ -4,7 +4,7 @@ FactoryGirl.define do
   factory :base_variant, class: Spree::Variant do
     price 19.99
     cost_price 17.00
-    sku    { generate(:sku)          }
+    sku    { generate(:sku) }
     weight { generate(:random_float) }
     height { generate(:random_float) }
     width  { generate(:random_float) }

data/lib/tasks/exchanges.rake

@@ -4,8 +4,8 @@ namespace :exchanges do
   task charge_unreturned_items: :environment do
 
     unreturned_return_items =  Spree::ReturnItem.awaiting_return.exchange_processed.joins(:exchange_inventory_unit).where([
-      "spree_inventory_units.created_at < :days_ago",
-      days_ago: Spree::Config[:expedited_exchanges_days_window].days.ago
+      "spree_inventory_units.created_at < :days_ago AND spree_inventory_units.state = :iu_state",
+      days_ago: Spree::Config[:expedited_exchanges_days_window].days.ago, iu_state: "shipped"
     ]).to_a
 
     # Determine that a return item has already been deemed unreturned and therefore charged

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 2.4.0.rc3
+  version: 2.4.0
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-07 00:00:00.000000000 Z
+date: 2014-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc.3
+        version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc.3
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: carmen
   requirement: !ruby/object:Gem::Requirement
@@ -260,14 +260,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.6
+        version: 4.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.6
+        version: 4.1.8
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
@@ -379,6 +379,7 @@ files:
 - app/mailers/spree/test_mailer.rb
 - app/models/concerns/spree/adjustment_source.rb
 - app/models/concerns/spree/calculated_adjustments.rb
+- app/models/concerns/spree/default_price.rb
 - app/models/concerns/spree/named_type.rb
 - app/models/concerns/spree/user_address.rb
 - app/models/concerns/spree/user_api_authentication.rb
@@ -489,8 +490,8 @@ files:
 - app/models/spree/return_authorization.rb
 - app/models/spree/return_authorization_reason.rb
 - app/models/spree/return_item.rb
-- app/models/spree/return_item/default_eligibility_validator.rb
 - app/models/spree/return_item/eligibility_validator/base_validator.rb
+- app/models/spree/return_item/eligibility_validator/default.rb
 - app/models/spree/return_item/eligibility_validator/rma_required.rb
 - app/models/spree/return_item/eligibility_validator/time_since_purchase.rb
 - app/models/spree/return_item/exchange_variant_eligibility/same_option_value.rb
@@ -560,7 +561,6 @@ files:
 - db/default/spree/states.rb
 - db/default/spree/stores.rb
 - db/default/spree/zones.rb
-- db/development.sqlite
 - db/migrate/20120831092320_spree_one_two.rb
 - db/migrate/20120831092359_spree_promo_one_two.rb
 - db/migrate/20120905145253_add_tax_rate_label.rb
@@ -750,6 +750,7 @@ files:
 - db/migrate/20141023005240_add_counter_cache_from_spree_variants_to_spree_stock_items.rb
 - db/migrate/20141101231208_fix_adjustment_order_presence.rb
 - db/migrate/20141105213646_update_classifications_positions.rb
+- db/migrate/20141120135441_add_guest_token_index_to_spree_orders.rb
 - db/seeds.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
 - lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt
@@ -797,6 +798,7 @@ files:
 - lib/spree/i18n.rb
 - lib/spree/i18n/base.rb
 - lib/spree/i18n/initializer.rb
+- lib/spree/localized_number.rb
 - lib/spree/migrations.rb
 - lib/spree/money.rb
 - lib/spree/permitted_attributes.rb
@@ -884,9 +886,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2