spree_core 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c3f728999034d676a7bade2faa38354f43b90e7
-  data.tar.gz: f4112e883677f3f9561afac00de040a5191141d5
+  metadata.gz: ba580156220b00d34fc3e53b377d8cc18c1b5e40
+  data.tar.gz: b1da5a7c06ce42c05cfd85b3f26d2b794fc8c6cd
 SHA512:
-  metadata.gz: abc9b0511722dada69919986af38a1c160ea1b4eae247936d57bc0e9bf9316e699e2dfb15469dcfec67ccd59a54fc1689cabb7a19960f00bedf2fbab38edb231
-  data.tar.gz: 6e515054c8250211a602f28d42dcc519502ca09f2928a755546ae44860fea1bc8499562fbf30a70300c75311095f7f69093d26805158d0d4c769eade5dd4247f
+  metadata.gz: 4f7cd56bd89e16dbe00265c7d2c61c26dd8740118afceff4716b08af953f8cadd2189c831c3411913802ab2799a80b3a8c29a3de2d8118b6f767fc09361515fd
+  data.tar.gz: a45727d4f2c709b5e072a92f6cd2098b0b95165c43b5039d3d7c2a6bed127d4a792e43a90a80ff060c45a18f332716bb2d94899c54c748a592980d62b67149c2

data/app/models/spree/line_item.rb

@@ -101,6 +101,8 @@ module Spree
     end
 
     def options=(options={})
+      return unless options.present?
+
       opts = options.dup # we will be deleting from the hash, so leave the caller's copy intact
 
       currency = opts.delete(:currency) || order.try(:currency)

data/app/models/spree/option_value.rb

@@ -4,7 +4,7 @@ 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, presence: true, uniqueness: true
+    validates :name, presence: true, uniqueness: { scope: :option_type_id }
     validates :presentation, presence: true
 
     after_touch :touch_all_variants

data/app/models/spree/stock_location.rb

@@ -18,7 +18,7 @@ module Spree
     def state_text
       state.try(:abbr) || state.try(:name) || state_name
     end
-    
+
     # Wrapper for creating a new stock item respecting the backorderable config
     def propagate_variant(variant)
       self.stock_items.create!(variant: variant, backorderable: self.backorderable_default)
@@ -31,12 +31,31 @@ module Spree
       self.stock_item(variant) || propagate_variant(variant)
     end
 
-    def stock_item(variant)
-      stock_items.where(variant_id: variant).order(:id).first
+    # Returns an instance of StockItem for the variant id.
+    #
+    # @param variant_id [String] The id of a variant.
+    #
+    # @return [StockItem] Corresponding StockItem for the StockLocation's variant.
+    def stock_item(variant_id)
+      stock_items.where(variant_id: variant_id).order(:id).first
     end
 
-    def stock_item_or_create(variant)
-      stock_item(variant) || stock_items.create(variant: variant)
+    # Attempts to look up StockItem for the variant, and creates one if not found.
+    # This method accepts an id or instance of the variant since it is used in
+    # multiple ways. Other methods in this model attempt to pass a variant,
+    # but controller actions can pass just the variant id as a parameter.
+    #
+    # @param variant_or_id [Variant|String] Variant instance or string id of a variant.
+    #
+    # @return [StockItem] Corresponding StockItem for the StockLocation's variant.
+    def stock_item_or_create(variant_or_id)
+      vid = if variant_or_id.is_a?(Variant)
+        variant_or_id.id
+      else
+        ActiveSupport::Deprecation.warn "Passing a Variant ID is deprecated, and will be removed in Spree 3. Please pass a variant instance instead.", caller
+        variant_or_id
+      end
+      stock_item(vid) || stock_items.create(variant_id: vid)
     end
 
     def count_on_hand(variant)

data/app/models/spree/taxon.rb

@@ -25,7 +25,7 @@ module Spree
       default_url: '/assets/default_taxon.png'
 
     validates_attachment :icon,
-      content_type: { content_type: ["image/jpg", "image/jpeg", "image/png"] }
+      content_type: { content_type: ["image/jpg", "image/jpeg", "image/png", "image/gif"] }
 
     # indicate which filters should be used for a taxon
     # this method should be customized to your own site

data/config/locales/en.yml

@@ -389,7 +389,7 @@ en:
     add_stock_management: Add Stock Management
     add_to_cart: Add To Cart
     add_variant: Add Variant
-    additional_item: Additional Item Cost
+    additional_item: Additional Item
     address1: Address
     address2: Address (contd.)
     adjustable: Adjustable
@@ -715,7 +715,7 @@ en:
     finalize: Finalize
     find_a_taxon: Find a Taxon
     finalized: Finalized
-    first_item: First Item Cost
+    first_item: First Item
     first_name: First Name
     first_name_begins_with: First Name Begins With
     flat_percent: Flat Percent
@@ -754,6 +754,8 @@ en:
     identifier: Identifier
     image: Image
     images: Images
+    implement_eligible_for_return: "Must implement #eligible_for_return? for your EligibilityValidator."
+    implement_requires_manual_intervention: "Must implement #requires_manual_intervention? for your EligibilityValidator."
     inactive: Inactive
     incl: incl.
     included_in_price: Included in Price
@@ -842,8 +844,6 @@ 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/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "2.4.1"
+    "2.4.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-22 00:00:00.000000000 Z
+date: 2014-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant