spree_core 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ab1a9b77dfdfc7b40bb62c108eadc067ea71124
-  data.tar.gz: c2183c55225bf1d1d23c06e61807ee0c08690c39
+  metadata.gz: b8194bdbcc2f3d26d2662205e0deed23ed0bf800
+  data.tar.gz: 232ddcdb7e3b3b8cb25b1029f77015331b2b7043
 SHA512:
-  metadata.gz: 723eadefb8438e4953836ff989f6c95e12b2c5b4a677e38b2402994c58e346886f45c7c7389b888a9ad1fafc0bdf60d1d7788982df9296fbf9a155e929053f59
-  data.tar.gz: 664c6401e80f75ecac438efc557ac374578b933f5c453a439e075a8a9046b0c65abf9dcecfcfa1a8d0167a6d818f2f711273af5b5d108fd01991df6ac7f42994
+  metadata.gz: da652bb0512643d231a1826e0af01ea36fffc76b2b9f91bffe1ada65133b6ec8d2a6c365f38d88235209db209565816dc44fbfc5868f79dd1b7a111a5c9cc2de
+  data.tar.gz: 9db7c280e5907596695bdb35b9098611ff778b27cbb5fc8f10ca789b3cf86bc7e0aeeda0e6a62b01dc01da7d0fc88ba23ca74a193c301bec105f5f4bfe7805cd

data/app/helpers/spree/base_helper.rb

@@ -117,7 +117,7 @@ module Spree
       countries.collect do |country|
         country.name = Spree.t(country.iso, scope: 'country_names', default: country.name)
         country
-      end.sort { |a, b| a.name <=> b.name }
+      end.sort { |a, b| a.name.parameterize <=> b.name.parameterize }
     end
 
     def seo_url(taxon)

data/app/models/spree/adjustment.rb

@@ -27,6 +27,7 @@ module Spree
     belongs_to :adjustable, polymorphic: true
     belongs_to :source, polymorphic: true
     belongs_to :originator, polymorphic: true
+    belongs_to :order, :class_name => 'Spree::Order'
 
     validates :label, presence: true
     validates :amount, numericality: true
@@ -48,7 +49,7 @@ module Spree
       end
     end
 
-    scope :tax, -> { where(originator_type: 'Spree::TaxRate', adjustable_type: 'Spree::Order') }
+    scope :tax, -> { where(originator_type: 'Spree::TaxRate') }
     scope :price, -> { where(adjustable_type: 'Spree::LineItem') }
     scope :shipping, -> { where(originator_type: 'Spree::ShippingMethod') }
     scope :optional, -> { where(mandatory: false) }
@@ -58,6 +59,8 @@ module Spree
     scope :promotion, -> { where(originator_type: 'Spree::PromotionAction') }
     scope :manual, -> { where(originator_type: nil) }
     scope :return_authorization, -> { where(source_type: "Spree::ReturnAuthorization") }
+    scope :included, -> { where(included: true)  }
+    scope :additional, -> { where(included: false) }
 
     def promotion?
       originator_type == 'Spree::PromotionAction'
@@ -97,7 +100,8 @@ module Spree
       # If we attempt to call 'source' before the reload, then source is currently
       # the order object. After calling a reload, the source is the Shipment.
       reload
-      originator.update_adjustment(self, calculable || source) if originator.present?
+      calculable = source unless calculable == source
+      originator.update_adjustment(self, calculable) if originator.present?
       set_eligibility
     end
 

data/app/models/spree/app_configuration.rb

@@ -41,6 +41,7 @@ module Spree
     preference :currency, :string, default: "USD"
     preference :currency_decimal_mark, :string, default: "."
     preference :currency_symbol_position, :string, default: "before"
+    preference :currency_sign_before_symbol, :boolean, default: true
     preference :currency_thousands_separator, :string, default: ","
     preference :display_currency, :boolean, default: false
     preference :default_country_id, :integer

data/app/models/spree/credit_card.rb

@@ -6,7 +6,7 @@ module Spree
 
     attr_accessor :number, :verification_value
 
-    validates :month, :year, numericality: { only_integer: true }
+    validates :month, :year, numericality: { only_integer: true }, unless: :has_payment_profile?
     validates :number, presence: true, unless: :has_payment_profile?, on: :create
     validates :verification_value, presence: true, unless: :has_payment_profile?, on: :create
     validate :expiry_not_in_the_past
@@ -16,9 +16,20 @@ module Spree
     # needed for some of the ActiveMerchant gateways (eg. SagePay)
     alias_attribute :brand, :cc_type
 
+    CARD_TYPES = {
+      visa: /^4[0-9]{12}(?:[0-9]{3})?$/,
+      master: /(^5[1-5][0-9]{14}$)|(^6759[0-9]{2}([0-9]{10})$)|(^6759[0-9]{2}([0-9]{12})$)|(^6759[0-9]{2}([0-9]{13})$)/,
+      diners_club: /^3(?:0[0-5]|[68][0-9])[0-9]{11}$/,
+      american_express: /^3[47][0-9]{13}$/,
+      discover: /^6(?:011|5[0-9]{2})[0-9]{12}$/,
+      jcb: /^(?:2131|1800|35\d{3})\d{11}$/
+    }
+
     def expiry=(expiry)
-      self[:month], self[:year] = expiry.split(" / ")
-      self[:year] = "20" + self[:year]
+      if expiry.present?
+        self[:month], self[:year] = expiry.delete(' ').split('/')
+        self[:year] = "20" + self[:year] if self[:year].length == 2
+      end
     end
 
     def number=(num)
@@ -28,17 +39,13 @@ module Spree
     # cc_type is set by jquery.payment, which helpfully provides different
     # types from Active Merchant. Converting them is necessary.
     def cc_type=(type)
-      real_type = case type
-      when 'mastercard', 'maestro'
-        'master'
-      when 'amex'
-        'american_express'
-      when 'dinersclub'
-        'diners_club'
-      else
-        type
+      self[:cc_type] = case type
+      when 'mastercard', 'maestro' then 'master'
+      when 'amex' then 'american_express'
+      when 'dinersclub' then 'diners_club'
+      when '' then try_type_from_number
+      else type
       end
-      self[:cc_type] = real_type
     end
 
     def set_last_digits
@@ -47,6 +54,11 @@ module Spree
       self.last_digits ||= number.to_s.length <= 4 ? number : number.to_s.slice(-4..-1)
     end
 
+    def try_type_from_number
+      numbers = number.delete(' ') if number
+      CARD_TYPES.find{|type, pattern| return type.to_s if numbers =~ pattern}.to_s
+    end
+
     def name?
       first_name? && last_name?
     end
@@ -87,7 +99,7 @@ module Spree
     end
 
     def has_payment_profile?
-      gateway_customer_profile_id.present?
+      gateway_customer_profile_id.present? || gateway_payment_profile_id.present?
     end
 
     def to_active_merchant

data/app/models/spree/gateway/bogus_simple.rb

@@ -6,6 +6,14 @@ module Spree
       false
     end
 
+    def capture(money, response_code, options = {})
+      if response_code == '12345'
+        ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, :test => true, :authorization => '67890')
+      else
+        ActiveMerchant::Billing::Response.new(false, 'Bogus Gateway: Forced failure', :error => 'Bogus Gateway: Forced failure', :test => true)
+      end
+    end
+
     def authorize(money, credit_card, options = {})
       if VALID_CCS.include? credit_card.number
         ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, :test => true, :authorization => '12345', :avs_result => { :code => 'A' })

data/app/models/spree/option_type.rb

@@ -2,6 +2,7 @@ module Spree
   class OptionType < ActiveRecord::Base
     has_many :option_values, -> { order(:position) }, dependent: :destroy
     has_many :product_option_types, dependent: :destroy
+    has_many :products, through: :product_option_types
     has_and_belongs_to_many :prototypes, join_table: 'spree_option_types_prototypes'
 
     validates :name, :presentation, presence: true

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

@@ -42,8 +42,14 @@ module Spree
               klass.next_event_transitions.each { |t| transition(t.merge(:on => :next)) }
 
               # Persist the state on the order
-              after_transition do |order|
+              after_transition do |order, transition|
                 order.state = order.state
+                order.state_changes.create(
+                  previous_state: transition.from,
+                  next_state:     transition.to,
+                  name:           'order',
+                  user_id:        order.user_id
+                )
                 order.save
               end
 
@@ -160,7 +166,7 @@ module Spree
           end
 
           def has_checkout_step?(step)
-            step.present? ? self.checkout_steps.include?(step) : false
+            step.present? && self.checkout_steps.include?(step)
           end
 
           def checkout_step_index(step)
@@ -172,7 +178,7 @@ module Spree
           end
 
           def can_go_to_state?(state)
-            return false unless self.state.present? && has_checkout_step?(state) && has_checkout_step?(self.state)
+            return false unless has_checkout_step?(self.state) && has_checkout_step?(state)
             checkout_step_index(state) > checkout_step_index(self.state)
           end
         end

data/app/models/spree/order.rb

@@ -41,6 +41,7 @@ module Spree
     has_many :return_authorizations, dependent: :destroy
     has_many :adjustments, -> { order("#{Adjustment.table_name}.created_at ASC") }, as: :adjustable, dependent: :destroy
     has_many :line_item_adjustments, through: :line_items, source: :adjustments
+    has_many :all_adjustments, class_name: 'Spree::Adjustment'
     has_many :inventory_units
 
     has_many :shipments, dependent: :destroy do
@@ -283,10 +284,6 @@ module Spree
       adjustments.shipping.sum(:amount)
     end
 
-    def tax_total
-      adjustments.tax.sum(:amount)
-    end
-
     # Creates new tax charges if there are any applicable rates. If prices already
     # include taxes then price adjustments are created instead.
     def create_tax_charge!
@@ -336,13 +333,6 @@ module Spree
       updater.run_hooks
 
       deliver_order_confirmation_email
-
-      self.state_changes.create(
-        previous_state: 'cart',
-        next_state:     'complete',
-        name:           'order' ,
-        user_id:        self.user_id
-      )
     end
 
     def deliver_order_confirmation_email

data/app/models/spree/order_inventory.rb

@@ -65,10 +65,14 @@ module Spree
     end
 
     def add_to_shipment(shipment, variant, quantity)
-      on_hand, back_order = shipment.stock_location.fill_status(variant, quantity)
+      if Config.track_inventory_levels
+        on_hand, back_order = shipment.stock_location.fill_status(variant, quantity)
 
-      on_hand.times { shipment.set_up_inventory('on_hand', variant, order) }
-      back_order.times { shipment.set_up_inventory('backordered', variant, order) }
+        on_hand.times { shipment.set_up_inventory('on_hand', variant, order) }
+        back_order.times { shipment.set_up_inventory('backordered', variant, order) }
+      else
+        quantity.times { shipment.set_up_inventory('on_hand', variant, order) }
+      end
 
       # adding to this shipment, and removing from stock_location
       if order.completed?

data/app/models/spree/order_updater.rb

@@ -25,12 +25,11 @@ module Spree
         update_shipment_state
       end
       
-      update_promotion_adjustments
-      update_shipping_adjustments
+      update_adjustments
       # update totals a second time in case updated adjustments have an effect on the total
       update_totals
 
-      order.update_attributes_without_callbacks({
+      order.update_columns({
         payment_state: order.payment_state,
         shipment_state: order.shipment_state,
         item_total: order.item_total,
@@ -56,6 +55,7 @@ module Spree
       order.payment_total = payments.completed.map(&:amount).sum
       order.item_total = line_items.map(&:amount).sum
       order.adjustment_total = adjustments.eligible.map(&:amount).sum
+      order.tax_total = order.all_adjustments.tax.map(&:amount).sum
       order.total = order.item_total + order.adjustment_total
     end
 
@@ -125,17 +125,11 @@ module Spree
     #
     # Adjustments will check if they are still eligible. Ineligible adjustments
     # are preserved but not counted towards adjustment_total.
-    def update_promotion_adjustments
-      order.adjustments.reload.promotion.each { |adjustment| adjustment.update!(order) }
+    def update_adjustments
+      order.adjustments.reload.each { |adjustment| adjustment.update!(order) }
       choose_best_promotion_adjustment
     end
 
-    # Shipping adjustments don't receive order on update! because they calculated
-    # over a shipping / package object rather than an order object
-    def update_shipping_adjustments
-      order.adjustments.reload.shipping.each { |adjustment| adjustment.update! }
-    end
-
     private
 
       # Picks one (and only one) promotion to be eligible for this order

data/app/models/spree/payment/processing.rb

@@ -83,11 +83,12 @@ module Spree
 
           credit_amount ||= credit_allowed >= order.outstanding_balance.abs ? order.outstanding_balance.abs : credit_allowed.abs
           credit_amount = credit_amount.to_f
+          credit_cents = Spree::Money.new(credit_amount, currency: currency).money.cents
 
           if payment_method.payment_profiles_supported?
-            response = payment_method.credit((credit_amount * 100).round, source, response_code, gateway_options)
+            response = payment_method.credit(credit_cents, source, response_code, gateway_options)
           else
-            response = payment_method.credit((credit_amount * 100).round, response_code, gateway_options)
+            response = payment_method.credit(credit_cents, response_code, gateway_options)
           end
 
           record_response(response)
@@ -141,7 +142,7 @@ module Spree
         protect_from_connection_error do
           check_environment
 
-          response = payment_method.send(action, (amount * 100).round,
+          response = payment_method.send(action, money.money.cents,
                                          source,
                                          gateway_options)
           handle_response(response, success_state, :failure)

data/app/models/spree/product.rb

@@ -173,7 +173,12 @@ module Spree
 
     def set_property(property_name, property_value)
       ActiveRecord::Base.transaction do
-        property = Property.where(name: property_name).first_or_create!(presentation: property_name)
+        # Works around spree_i18n #301
+        property = if Property.exists?(name: property_name)
+          Property.where(name: property_name).first
+        else
+          Property.create(name: property_name, presentation: property_name)
+        end
         product_property = ProductProperty.where(product: self, property: property).first_or_initialize
         product_property.value = property_value
         product_property.save!

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

@@ -7,7 +7,7 @@ module Spree
           has_and_belongs_to_many :users, class_name: Spree.user_class.to_s, join_table: 'spree_promotion_rules_users', foreign_key: 'promotion_rule_id'
         else
           belongs_to :user
-          has_and_belongs_to_many :users, join_table: 'spree_promotion_rules_users', foreign_key: 'promotion_rule_id'
+          has_and_belongs_to_many :users, join_table: 'spree_promotion_rules_users', foreign_key: 'promotion_rule_id', :class_name => Spree.user_class
         end
 
         def eligible?(order, options = {})

data/app/models/spree/shipment.rb

@@ -64,9 +64,7 @@ module Spree
     end
 
     def to_param
-      number if number
-      generate_shipment_number unless number
-      number.to_s.to_url.upcase
+      number
     end
 
     def backordered?
@@ -102,6 +100,7 @@ module Spree
 
     def refresh_rates
       return shipping_rates if shipped?
+      return [] unless can_get_rates?
 
       # StockEstimator.new assigment below will replace the current shipping_method
       original_shipping_method_id = shipping_method.try(:id)
@@ -157,7 +156,7 @@ module Spree
     end
 
     def manifest
-      inventory_units.joins(:variant).includes(:variant).group_by(&:variant).map do |variant, units|
+      inventory_units.group_by(&:variant).map do |variant, units|
         states = {}
         units.group_by(&:state).each { |state, iu| states[state] = iu.count }
         OpenStruct.new(variant: variant, quantity: units.length, states: states)
@@ -256,12 +255,6 @@ module Spree
         "#{Spree.t(:shipping)} (#{shipping_method.name})"
       end
 
-      def validate_shipping_method
-        unless shipping_method.nil?
-          errors.add :shipping_method, Spree.t(:is_not_available_to_shipment_address) unless shipping_method.include?(address)
-        end
-      end
-
       def after_ship
         inventory_units.each &:ship!
         adjustment.finalize!
@@ -289,5 +282,9 @@ module Spree
       def update_order
         order.update!
       end
+
+      def can_get_rates?
+        order.ship_address && order.ship_address.valid?
+      end
   end
 end

data/app/models/spree/tax_rate.rb

@@ -26,7 +26,7 @@ module Spree
       return [] unless order.tax_zone
       all.select do |rate|
         (!rate.included_in_price && (rate.zone == order.tax_zone || rate.zone.contains?(order.tax_zone) || (order.tax_address.nil? && rate.zone.default_tax))) ||
-        (rate.included_in_price && !order.tax_address.nil? && !rate.zone.contains?(order.tax_zone) && rate.zone.default_tax)
+        rate.included_in_price
       end
     end
 
@@ -54,15 +54,31 @@ module Spree
 
     # Creates necessary tax adjustments for the order.
     def adjust(order)
+      # (rate.included_in_price && !order.tax_address.nil? && !rate.zone.contains?(order.tax_zone) && rate.zone.default_tax)
       label = create_label
       if included_in_price
         if Zone.default_tax.contains? order.tax_zone
-          order.line_items.each { |line_item| create_adjustment(label, line_item, line_item) }
+          order.line_items.each do |line_item|
+            amount = calculator.compute(line_item)
+            unless amount == 0
+              line_item.adjustments.create(
+                order: order,
+                amount: amount,
+                source: line_item,
+                originator: self,
+                label: label,
+                mandatory: false,
+                state: "closed",
+                included: true
+              )
+            end
+          end
         else
           amount = -1 * calculator.compute(order)
           label = Spree.t(:refund) + label
 
           order.adjustments.create(
+            order: order,
             amount: amount,
             source: order,
             originator: self,
@@ -71,7 +87,17 @@ module Spree
           )
         end
       else
-        create_adjustment(label, order, order)
+        amount = calculator.compute(order)
+        unless amount == 0
+          order.adjustments.create(
+            order: order,
+            amount: amount,
+            source: order,
+            originator: self,
+            state: "closed",
+            label: label
+          )
+        end
       end
     end
 

data/app/models/spree/taxon.rb

@@ -16,7 +16,7 @@ module Spree
       url: '/spree/taxons/:id/:style/:basename.:extension',
       path: ':rails_root/public/spree/taxons/:id/:style/:basename.:extension',
       default_url: '/assets/default_taxon.png'
-
+      
     include Spree::Core::S3Support
     supports_s3 :icon
 
@@ -69,5 +69,14 @@ module Spree
       ancestor_chain + "#{name}"
     end
 
+    # awesome_nested_set sorts by :lft and :rgt. This call re-inserts the child
+    # node so that its resulting position matches the observable 0-indexed position.
+    # ** Note ** no :position column needed - a_n_s doesn't handle the reordering if
+    #  you bring your own :order_column.
+    #
+    #  See #3390 for background.
+    def child_index=(idx)
+      move_to_child_with_index(parent, idx.to_i)
+    end
   end
 end

data/app/views/spree/payments/_payment.html.erb

@@ -4,7 +4,9 @@
     <% unless (cc_type = source.cc_type).blank? %>
       <%= image_tag "credit_cards/icons/#{cc_type}.png" %>
     <% end %>
-    <%= Spree.t(:ending_in) %> <%= source.last_digits %>
+    <% if source.last_digits %>
+      <%= Spree.t(:ending_in) %> <%= source.last_digits %>
+    <% end %>
   </span>
   <br />
   <span class="full-name">

data/config/initializers/user_class_extensions.rb

@@ -1,7 +1,6 @@
 Spree::Core::Engine.config.to_prepare do
   if Spree.user_class
     Spree.user_class.class_eval do
-      include Spree::Core::UserBanners
       has_and_belongs_to_many :spree_roles,
                               :join_table => 'spree_roles_users',
                               :foreign_key => "user_id",

data/config/locales/en.yml

@@ -646,6 +646,15 @@ en:
     look_for_similar_items: Look for similar items
     mail_method_settings: Mail Method Settings
     mail_methods: Mail Methods
+    mail_settings:
+      auth:
+        none: "None"
+        plain: "Plain"
+        login: "Login"
+        cram_md5: "cram_md5"
+      security:
+        ssl: "SSL"
+        tls: "TLS"
     make_refund: Make refund
     master_price: Master Price
     match_choices:
@@ -666,6 +675,7 @@ en:
     new: New
     new_adjustment: New Adjustment
     new_customer: New Customer
+    new_country: New Country
     new_image: New Image
     new_option_type: New Option Type
     new_order: New Order

data/db/migrate/20131113035136_add_channel_to_spree_orders.rb

@@ -0,0 +1,5 @@
+class AddChannelToSpreeOrders < ActiveRecord::Migration
+  def change
+    add_column :spree_orders, :channel, :string, default: "spree"
+  end
+end

data/db/migrate/20131118041203_add_tax_total_to_spree_orders.rb

@@ -0,0 +1,5 @@
+class AddTaxTotalToSpreeOrders < ActiveRecord::Migration
+  def change
+    add_column :spree_orders, :tax_total, :decimal, precision: 10, scale: 2, default: 0.0, null: false
+  end
+end

data/db/migrate/20131118043021_add_order_id_to_spree_adjustments.rb

@@ -0,0 +1,6 @@
+class AddOrderIdToSpreeAdjustments < ActiveRecord::Migration
+  def change
+    add_column :spree_adjustments, :order_id, :integer
+    add_index :spree_adjustments, :order_id
+  end
+end

data/db/migrate/20131118074808_add_included_to_spree_adjustments.rb

@@ -0,0 +1,5 @@
+class AddIncludedToSpreeAdjustments < ActiveRecord::Migration
+  def change
+    add_column :spree_adjustments, :included, :boolean, :default => false
+  end
+end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "2.1.2"
+    "2.1.3"
   end
 end

data/lib/spree/core.rb

@@ -16,9 +16,9 @@ module Spree
 
   def self.user_class
     if @@user_class.is_a?(Class)
-      raise "Spree.user_class MUST be a String object, not a Class object."
-    elsif @@user_class.is_a?(String)
-      @@user_class.constantize
+      raise "Spree.user_class MUST be a String or Symbol object, not a Class object."
+    elsif @@user_class.is_a?(String) || @@user_class.is_a?(Symbol)
+      @@user_class.to_s.constantize
     end
   end
 
@@ -45,7 +45,6 @@ require 'spree/money'
 require 'spree/promo/coupon_applicator'
 
 require 'spree/core/delegate_belongs_to'
-require 'spree/core/ext/active_record'
 require 'spree/core/permalinks'
 require 'spree/core/token_resource'
 require 'spree/core/calculated_adjustments'

data/lib/spree/money.rb

@@ -14,6 +14,7 @@ module Spree
       @options[:no_cents] = Spree::Config[:hide_cents]
       @options[:decimal_mark] = Spree::Config[:currency_decimal_mark]
       @options[:thousands_separator] = Spree::Config[:currency_thousands_separator]
+      @options[:sign_before_symbol] = Spree::Config[:currency_sign_before_symbol]
       @options.merge!(options)
       # Must be a symbol because the Money gem doesn't do the conversion
       @options[:symbol_position] = @options[:symbol_position].to_sym

data/lib/spree/permitted_attributes.rb

@@ -29,7 +29,10 @@ module Spree
     @@address_attributes = [
       :firstname, :lastname, :address1, :address2,
       :city, :country_id, :state_id, :zipcode, :phone,
-      :state_name, :alternative_phone, :company]
+      :state_name, :alternative_phone, :company,
+      :country => [:iso, :name, :iso3, :iso_name],
+      :state => [:name, :abbr]
+    ]
 
     @@checkout_attributes = [:email, :use_billing, :shipping_method_id, :coupon_code, :special_instructions]
 
@@ -43,7 +46,7 @@ module Spree
 
     @@option_value_attributes = [:name, :presentation]
 
-    @@payment_attributes = [:amount, :payment_method_id]
+    @@payment_attributes = [:amount, :payment_method_id, :payment_method]
 
     @@product_properties_attributes = [:property_name, :value, :position]
 
@@ -65,7 +68,8 @@ module Spree
     # month / year may be provided by some sources, or others may elect to use one field
     @@source_attributes = [
       :number, :month, :year, :expiry, :verification_value,
-      :first_name, :last_name, :cc_type]
+      :first_name, :last_name, :cc_type, :gateway_customer_profile_id, 
+      :gateway_payment_profile_id, :last_digits]
 
     @@stock_item_attributes = [:variant, :stock_location, :backorderable, :variant_id]
 

data/lib/spree/testing_support/capybara_ext.rb

@@ -13,11 +13,19 @@ module CapybaraExt
   end
 
   def within_row(num, &block)
-    within("table.index tbody tr:nth-child(#{num})", &block)
+    if example.metadata[:js]
+      within("table.index tbody tr:nth-child(#{num})", &block)
+    else
+      within(:xpath, all("table.index tbody tr")[num-1].path, &block)
+    end
   end
 
   def column_text(num)
-    find("td:nth-child(#{num})").text
+    if example.metadata[:js]
+      find("td:nth-child(#{num})").text
+    else
+      all("td")[num-1].text
+    end
   end
 
   def set_select2_field(field, value)
@@ -94,7 +102,7 @@ module CapybaraExt
 
   def wait_for_ajax
     counter = 0
-    while page.execute_script("return $.active").to_i > 0
+    while page.evaluate_script("$.active").to_i > 0
       counter += 1
       sleep(0.1)
       raise "AJAX request took longer than 5 seconds." if counter >= 50

data/lib/spree/testing_support/controller_requests.rb

@@ -4,9 +4,9 @@
 # Inside your spec_helper.rb, include this module inside the RSpec.configure
 # block by doing this:
 #
-#   require 'spree/core/testing_support/controller_requests'
+#   require 'spree/testing_support/controller_requests'
 #   RSpec.configure do |c|
-#     c.include Spree::Core::TestingSupport::ControllerRequests, :type => :controller
+#     c.include Spree::TestingSupport::ControllerRequests, :type => :controller
 #   end
 #
 # Then, in your controller tests, you can access spree routes like this:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-15 00:00:00.000000000 Z
+date: 2013-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.39.2
+        version: 1.42.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.39.2
+        version: 1.42.2
 - !ruby/object:Gem::Dependency
   name: acts_as_list
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.11.1
+        version: 1.27.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.11.1
+        version: 1.27.0
 - !ruby/object:Gem::Dependency
   name: cancan
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +84,16 @@ dependencies:
   name: deface
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc3
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc3
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: ffaker
   requirement: !ruby/object:Gem::Requirement
@@ -112,14 +112,14 @@ dependencies:
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.18
 - !ruby/object:Gem::Dependency
@@ -140,16 +140,16 @@ dependencies:
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.7
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.7
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -168,16 +168,16 @@ dependencies:
   name: money
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 5.1.1
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 5.1.1
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
@@ -226,14 +226,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: state_machine
   requirement: !ruby/object:Gem::Requirement
@@ -455,7 +455,6 @@ files:
 - lib/spree/core/environment/calculators.rb
 - lib/spree/core/environment.rb
 - lib/spree/core/environment_extension.rb
-- lib/spree/core/ext/active_record.rb
 - lib/spree/core/gateway_error.rb
 - lib/spree/core/mail_interceptor.rb
 - lib/spree/core/mail_settings.rb
@@ -467,7 +466,6 @@ files:
 - lib/spree/core/s3_support.rb
 - lib/spree/core/search/base.rb
 - lib/spree/core/token_resource.rb
-- lib/spree/core/user_banners.rb
 - lib/spree/core/validators/email.rb
 - lib/spree/core/version.rb
 - lib/spree/core.rb
@@ -625,6 +623,10 @@ files:
 - db/migrate/20130909115621_change_states_required_for_countries.rb
 - db/migrate/20130915032339_add_deleted_at_to_spree_stock_items.rb
 - db/migrate/20131001013410_remove_unused_credit_card_fields.rb
+- db/migrate/20131113035136_add_channel_to_spree_orders.rb
+- db/migrate/20131118041203_add_tax_total_to_spree_orders.rb
+- db/migrate/20131118043021_add_order_id_to_spree_adjustments.rb
+- db/migrate/20131118074808_add_included_to_spree_adjustments.rb
 - db/seeds.rb
 - vendor/assets/javascripts/jquery-migrate-1.0.0.js
 - vendor/assets/javascripts/jquery.payment.js

data/lib/spree/core/ext/active_record.rb

@@ -1,8 +0,0 @@
-module ActiveRecord::Persistence
-
-  # Update attributes of a record in the database without callbacks, validations etc.
-  def update_attributes_without_callbacks(attributes)
-    self.assign_attributes(attributes)
-    self.class.where(:id => id).update_all(attributes)
-  end
-end

data/lib/spree/core/user_banners.rb

@@ -1,25 +0,0 @@
-# Utility methods for dealing with user banners and saving
-# an array of dismissed banners per user
-# use symbols as banner id
-module Spree
-  module Core
-    module UserBanners
-      def self.included(base)
-        base.preference :dismissed_banners, :string, :default => ''
-      end
-
-      def dismissed_banner_ids
-        dismissed = self.preferred_dismissed_banners
-        dismissed.split(',').map(&:to_sym)
-      end
-
-      def dismiss_banner(banner_id)
-        self.preferred_dismissed_banners = dismissed_banner_ids.push(banner_id.to_sym).uniq.join(',')
-      end
-
-      def dismissed_banner?(banner_id)
-        dismissed_banner_ids.include? banner_id.to_sym
-      end
-    end
-  end
-end