spree_core 2.1.6 → 2.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4c8f9444abee12730e46a75f58276b4a89a54ce
-  data.tar.gz: 02d28150421a8deb02c47a16a514ceea6e6775ce
+  metadata.gz: ee66832489cf763d21c38a512e8b99392c104dba
+  data.tar.gz: 9e34bc2957303933d3b7ba62d043d27daac480c4
 SHA512:
-  metadata.gz: 94c500d3cba6d3c9388d64f5304dd43391ecd9fc8aabf0c694cec4f3678f7e808039e7dd082aa932623ddfbf200c1e3ca525e34861fc82a2302650f09c0db57e
-  data.tar.gz: 81aa93fc583a3eefaeea0804812ad174ecd359b4a1445f030a1ab40e54fb1290c8c9c570099b2e5ad5f8e12d46a0c91fda2a0682a07735a1883051a5c5da0276
+  metadata.gz: 9afb43b63ff91f6293536c6c3ab9bb451d8fefb01ab318e7efb401e1934b3e814a8796f53463271ad9a8f5d9588e53c748adce20ce89012dcbf1b4e8be0c2ec2
+  data.tar.gz: a845cd6990e60b712c0fa99e630ebe2b5c46d6abe7181e9e8f5508b4d8feb7f0f7c13736ff717fd258ecb749cfe8e5761bd963a3b3d5d1b3ef5881e9c740388a

data/app/models/spree/credit_card.rb

@@ -26,12 +26,18 @@ module Spree
     }
 
     def expiry=(expiry)
-      if expiry.present?
-        self[:month], self[:year] = expiry.delete(' ').split('/')
-        self[:year] = "20" + self[:year] if self[:year].length == 2
-        self[:year] = self[:year].to_i
-        self[:month] = self[:month].to_i
+      return unless expiry.present?
+
+      self[:month], self[:year] =
+      if expiry.match(/\d\s?\/\s?\d/) # will match mm/yy and mm / yyyy
+        expiry.delete(' ').split('/')
+      elsif match = expiry.match(/(\d{2})(\d{2,4})/) # will match mmyy and mmyyyy
+        [match[1], match[2]]
       end
+
+      self[:year] = "20" + self[:year] if self[:year].length == 2
+      self[:year] = self[:year].to_i
+      self[:month] = self[:month].to_i
     end
 
     def number=(num)

data/app/models/spree/line_item.rb

@@ -1,7 +1,7 @@
 module Spree
   class LineItem < ActiveRecord::Base
     before_validation :adjust_quantity
-    belongs_to :order, class_name: "Spree::Order"
+    belongs_to :order, class_name: "Spree::Order", touch: true
     belongs_to :variant, class_name: "Spree::Variant"
     belongs_to :tax_category, class_name: "Spree::TaxCategory"
 
@@ -63,7 +63,7 @@ module Spree
     end
 
     def sufficient_stock?
-      Stock::Quantifier.new(variant_id).can_supply? quantity
+      Stock::Quantifier.new(variant).can_supply? quantity
     end
 
     def insufficient_stock?

data/app/models/spree/order.rb

@@ -79,8 +79,12 @@ module Spree
       where(number: number)
     end
 
+    scope :created_between, ->(start_date, end_date) { where(created_at: start_date..end_date) }
+    scope :completed_between, ->(start_date, end_date) { where(completed_at: start_date..end_date) }
+
     def self.between(start_date, end_date)
-      where(created_at: start_date..end_date)
+      ActiveSupport::Deprecation.warn("Order#between will be deprecated in Spree 2.3, please use either Order#created_between or Order#completed_between instead.")
+      self.created_between(start_date, end_date)
     end
 
     def self.by_customer(customer)
@@ -572,7 +576,7 @@ module Spree
 
       def after_cancel
         shipments.each { |shipment| shipment.cancel! }
-        payments.completed.each { |payment| payment.credit! }
+        payments.completed.each { |payment| payment.cancel! }
 
         send_cancel_email
         self.update_column(:payment_state, 'credit_owed') unless shipped?

data/app/models/spree/payment.rb

@@ -102,8 +102,8 @@ module Spree
 
     # see https://github.com/spree/spree/issues/981
     def build_source
-      return if source_attributes.nil?
-      if payment_method and payment_method.payment_source_class
+      return unless new_record?
+      if source_attributes.present? && source.blank? && payment_method.try(:payment_source_class)
         self.source = payment_method.payment_source_class.new(source_attributes)
       end
     end

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

@@ -108,6 +108,14 @@ module Spree
         end
       end
 
+      def cancel!
+        if payment_method.respond_to?(:cancel)
+          payment_method.cancel(response_code)
+        else
+          credit!
+        end
+      end
+
       def partial_credit(amount)
         return if amount > credit_allowed
         started_processing!
@@ -115,6 +123,7 @@ module Spree
       end
 
       def gateway_options
+        order.reload
         options = { :email       => order.email,
                     :customer    => order.email,
                     :customer_id => order.user_id,

data/app/models/spree/stock/availability_validator.rb

@@ -10,7 +10,7 @@ module Spree
           quantity = line_item.quantity
         end
 
-        quantifier = Stock::Quantifier.new(line_item.variant_id)
+        quantifier = Stock::Quantifier.new(line_item.variant)
 
         unless quantifier.can_supply? quantity
           variant = line_item.variant

data/app/models/spree/stock/quantifier.rb

@@ -4,7 +4,7 @@ module Spree
       attr_reader :stock_items
 
       def initialize(variant)
-        @variant = resolve_variant_id(variant)
+        @variant = variant
         @stock_items = Spree::StockItem.joins(:stock_location).where(:variant_id => @variant, Spree::StockLocation.table_name =>{ :active => true})
       end
 
@@ -24,14 +24,6 @@ module Spree
         total_on_hand >= required || backorderable?
       end
 
-      private
-
-      # return variant when passed either variant object or variant id
-      def resolve_variant_id(variant)
-        variant = Spree::Variant.find_by_id(variant) unless variant.respond_to?(:should_track_inventory?)
-        variant
-      end
-
     end
   end
 end

data/app/models/spree/stock_item.rb

@@ -44,6 +44,10 @@ module Spree
       self.in_stock? || self.backorderable?
     end
 
+    def variant
+      Spree::Variant.unscoped { super }
+    end
+
     private
       def count_on_hand=(value)
         write_attribute(:count_on_hand, value)

data/app/models/spree/tax_rate.rb

@@ -23,8 +23,9 @@ module Spree
 
     # Gets the array of TaxRates appropriate for the specified order
     def self.match(order)
-      return [] unless order.tax_zone
-      all.select do |rate|
+      order_zone = order.tax_zone
+      return [] unless order_zone
+      includes(zone: { zone_members: :zoneable }).load.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
       end

data/app/models/spree/variant.rb

@@ -75,7 +75,7 @@ module Spree
     # allows extensions to override deleted? if they want to provide
     # their own definition.
     def deleted?
-      deleted_at
+      !!deleted_at
     end
 
     # Product may be created with deleted_at already set,
@@ -149,9 +149,13 @@ module Spree
       "#{sku} #{options_text}".strip
     end
 
-    def in_stock?(quantity=1)
-      puts %q{[DEPRECATION] In Spree 2.2, Variant#in_stock? will no longer take a quantity. Use Variant#can_supply? instead.}
-      can_stock?(quantity)
+    def in_stock?(quantity=:argument_here_is_deprecated)
+      if quantity == :argument_here_is_deprecated
+        can_stock?(1)
+      else
+        puts %q{[DEPRECATION] In Spree 2.2, Variant#in_stock? will no longer take a quantity. Use Variant#can_supply? instead.}
+        can_stock?(quantity)
+      end
     end
 
     def can_stock?(quantity=1)

data/db/migrate/20130830001159_migrate_old_shipping_calculators.rb

@@ -3,7 +3,7 @@ class MigrateOldShippingCalculators < ActiveRecord::Migration
     Spree::ShippingMethod.all.each do |shipping_method|
       old_calculator = shipping_method.calculator
       next if old_calculator.class < Spree::ShippingCalculator # We don't want to mess with new shipping calculators
-      new_calculator = eval("Spree::Calculator::Shipping::#{old_calculator.class.name.demodulize}").new
+      new_calculator = eval(old_calculator.class.name.sub("::Calculator::", "::Calculator::Shipping::")).new
       new_calculator.preferences.keys.each do |pref|
         # Preferences can't be read/set by name, you have to prefix preferred_
         pref_method = "preferred_#{pref}"

data/db/migrate/20140415041315_add_user_id_created_by_id_index_to_order.rb

@@ -0,0 +1,5 @@
+class AddUserIdCreatedByIdIndexToOrder < ActiveRecord::Migration
+  def change
+    add_index :spree_orders, [:user_id, :created_by_id]
+  end
+end

data/lib/spree/core.rb

@@ -5,6 +5,7 @@ require 'awesome_nested_set'
 require 'cancan'
 require 'kaminari'
 require 'mail'
+require 'monetize'
 require 'paperclip'
 require 'paranoia'
 require 'ransack'

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "2.1.6"
+    "2.1.7"
   end
 end

data/lib/spree/money.rb

@@ -30,7 +30,7 @@ module Spree
 
       # Check the first character for a currency symbol, alternatively get it
       # from the stated currency string
-      c = if ::Money.assume_from_symbol && i =~ /^(\$|€|£)/
+      c = if ::Monetize.assume_from_symbol && i =~ /^(\$|€|£)/
         case i
         when /^\$/ then "USD"
         when /^€/ then "EUR"

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

@@ -52,6 +52,8 @@ FactoryGirl.define do
 
         factory :shipped_order do
           after(:create) do |order|
+            order.update_totals # To ensure we have the right total
+            create(:payment, amount: order.total, order: order, state: 'completed')
             order.shipments.each do |shipment|
               shipment.inventory_units.each { |u| u.update_column('state', 'shipped') }
               shipment.update_column('state', 'shipped')

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

@@ -2,14 +2,15 @@ FactoryGirl.define do
   factory :shipment, class: Spree::Shipment do
     tracking 'U10000'
     number '100'
-    cost 100.00
     state 'pending'
     order
     address
     stock_location
 
     after(:create) do |shipment, evalulator|
-      shipment.add_shipping_method(create(:shipping_method), true)
+      shipping_method = create(:shipping_method)
+      shipping_method.calculator.preferred_amount = 100
+      shipment.add_shipping_method(shipping_method, true)
 
       shipment.order.line_items.each do |line_item|
         line_item.quantity.times { shipment.inventory_units.create(variant_id: line_item.variant_id) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.1.7
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -164,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.15.0
+- !ruby/object:Gem::Dependency
+  name: monetize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
@@ -514,6 +528,7 @@ files:
 - db/migrate/20140129024326_add_deleted_at_to_spree_prices.rb
 - db/migrate/20140204192230_add_auto_capture_to_payment_methods.rb
 - db/migrate/20140205181631_default_variant_weight_to_zero.rb
+- db/migrate/20140415041315_add_user_id_created_by_id_index_to_order.rb
 - db/seeds.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
 - lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt
@@ -663,7 +678,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: The bare bones necessary for Spree.