spree_core 4.1.3 → 4.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cba2996dac2e758ba562efcfc4e1bf1f99c873bcb0af1e878ce372339c86263e
-  data.tar.gz: 1404bec2819dc8872517d3d19a5f5faa2683e5b7c3265e4afeeaad6ff7f8476c
+  metadata.gz: 14259887630a60331633df140cfe4f7b9e94b9ecdf95342c5e8a31011dbfb807
+  data.tar.gz: 2801ca34a2ad369726b829ea9e3decf00ae64c9fcc4cc673cf04e0dc0aa826c5
 SHA512:
-  metadata.gz: 628cdea24cd029809e4e1d1861ffa5ac90e2de240f5b779d1cfa02e9d9c3728a8f251092ae345e741bd56d060aeecc71d9a8716e0c276a488065dc7169cb04af
-  data.tar.gz: 38ff19725ca382a75cc8735285be96d7f786832c86f36db0f8b1164b3914a280c57502df22db8c8e82f1fb84039b5f574454934a1596182a4a312f7355877118
+  metadata.gz: f644cd935bca9d371a3a558ffe76994143bc8af738ac9ff8621a778eef743d79339b3f5bda697e84a287c51e12e235bac989c500dd4923ca08f52a89ba8d80ac
+  data.tar.gz: 62203be51964aa4ccd9ea69a5e5fd47ea7408c6028e257a5c30a7769de7178127aecef002305731f58d5e676bd209c15b776d182246f23dc07a4a0679801d5d3

data/app/finders/spree/products/find.rb

@@ -8,7 +8,7 @@ module Spree
         @skus             = String(params.dig(:filter, :skus)).split(',')
         @price            = String(params.dig(:filter, :price)).split(',').map(&:to_f)
         @currency         = params[:currency] || current_currency
-        @taxons           = String(params.dig(:filter, :taxons)).split(',')
+        @taxons           = taxon_ids(params.dig(:filter, :taxons))
         @name             = params.dig(:filter, :name)
         @options          = params.dig(:filter, :options).try(:to_unsafe_hash)
         @option_value_ids = params.dig(:filter, :option_value_ids)
@@ -159,6 +159,12 @@ module Spree
       def include_discontinued(products)
         discontinued ? products : products.available
       end
+
+      def taxon_ids(taxon_id)
+        return unless (taxon = Spree::Taxon.find_by(id: taxon_id))
+
+        taxon.self_and_descendants.ids.map(&:to_s)
+      end
     end
   end
 end

data/app/helpers/spree/base_helper.rb

@@ -136,6 +136,10 @@ module Spree
       [I18n.locale, current_currency]
     end
 
+    def maximum_quantity
+      Spree::DatabaseTypeUtilities.maximum_value_for(:integer)
+    end
+
     private
 
     def create_product_image_tag(image, product, options, style)

data/app/models/spree/line_item.rb

@@ -17,7 +17,14 @@ module Spree
     before_validation :copy_tax_category
 
     validates :variant, :order, presence: true
-    validates :quantity, numericality: { only_integer: true, message: Spree.t('validation.must_be_int') }
+
+    # numericality: :less_than_or_equal_to validation is due to the restriction at the database level
+    #   https://github.com/spree/spree/issues/2695#issuecomment-143314161
+    validates :quantity, numericality: {
+      less_than_or_equal_to: DatabaseTypeUtilities.maximum_value_for(:integer),
+      only_integer: true, message: Spree.t('validation.must_be_int')
+    }
+
     validates :price, numericality: true
 
     validates_with Spree::Stock::AvailabilityValidator

data/app/models/spree/zone.rb

@@ -71,8 +71,8 @@ module Spree
     end
 
     def kind
-      if kind?
-        super
+      if self[:kind].present?
+        self[:kind]
       else
         not_nil_scope = members.where.not(zoneable_type: nil)
         zone_type = not_nil_scope.order('created_at ASC').pluck(:zoneable_type).last

data/lib/spree/core.rb

@@ -93,6 +93,7 @@ require 'spree/money'
 require 'spree/permitted_attributes'
 require 'spree/service_module'
 require 'spree/dependencies_helper'
+require 'spree/database_type_utilities'
 
 require 'spree/core/importer'
 require 'spree/core/query_filters'

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    '4.1.3'
+    '4.1.4'
   end
 end

data/lib/spree/database_type_utilities.rb

@@ -0,0 +1,12 @@
+module Spree
+  module DatabaseTypeUtilities
+    def self.maximum_value_for(data_type)
+      case data_type
+      when :integer
+        ActiveModel::Type::Integer.new.instance_eval { range.max }
+      else
+        raise ArgumentError, 'Currently only :integer argument is acceptable'
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 4.1.3
+  version: 4.1.4
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-31 00:00:00.000000000 Z
+date: 2020-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -997,6 +997,7 @@ files:
 - lib/spree/core/search/base.rb
 - lib/spree/core/token_generator.rb
 - lib/spree/core/version.rb
+- lib/spree/database_type_utilities.rb
 - lib/spree/dependencies_helper.rb
 - lib/spree/i18n.rb
 - lib/spree/i18n/base.rb