spree_core 4.1.2 → 4.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b705f768f8ff59c9810f09dd3a99a68c2dc13811769a180069b9261009d9cdff
-  data.tar.gz: a64dba1a7bf10999d6e588a9411e39172f25c93f9a26876719b1d6da5940bb0a
+  metadata.gz: f9abe56060f0568926e082bc13e3984b3819c23f5e5658b14ff58e44589a9e51
+  data.tar.gz: ca29391589cf6bf06c8f20bfb248be16fae419b3fb683255803f01a355f0ddac
 SHA512:
-  metadata.gz: 0d49c78014b9a7899e754dbe299bb00b293939d7e25e5091cf3124a0951da7076303ce358da23e790f7efe626bce656b09d9cdf3a5a512cdefbff5cee739faa2
-  data.tar.gz: 6dbe8cdd4dd58cb1f8a8c5e9bd6b1d34344e119f8df0839a4824d9f3fc809f1215def97bec41b47732d2530c48e63a0c5e5f808c027353b551eb169b004ba013
+  metadata.gz: e2aea90e9694d9b2ac45d23e7a5ea5fd07bc25a7ba93a614328f740857c8c10b6c6d644ff3bc258c3a600f3ae8836e6ad5b1d9473799ffc1c672e7878afd3ff3
+  data.tar.gz: 423b46182c0785e1915315afa475f0125f9d832fcab13ff34abc83f7628681d24d555cc6513b4338c8f282b40f833825b8015502b73162946f908e6535ad5b46

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

@@ -8,7 +8,8 @@ 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))
+        @concat_taxons    = taxon_ids(params.dig(:filter, :concat_taxons))
         @name             = params.dig(:filter, :name)
         @options          = params.dig(:filter, :options).try(:to_unsafe_hash)
         @option_value_ids = params.dig(:filter, :option_value_ids)
@@ -22,6 +23,7 @@ module Spree
         products = by_skus(products)
         products = by_price(products)
         products = by_taxons(products)
+        products = by_concat_taxons(products)
         products = by_name(products)
         products = by_options(products)
         products = by_option_value_ids(products)
@@ -29,12 +31,13 @@ module Spree
         products = include_discontinued(products)
         products = ordered(products)
 
-        products
+        products.distinct
       end
 
       private
 
-      attr_reader :ids, :skus, :price, :currency, :taxons, :name, :options, :option_value_ids, :scope, :sort_by, :deleted, :discontinued
+      attr_reader :ids, :skus, :price, :currency, :taxons, :concat_taxons, :name, :options,
+                  :option_value_ids, :scope, :sort_by, :deleted, :discontinued
 
       def ids?
         ids.present?
@@ -52,6 +55,10 @@ module Spree
         taxons.present?
       end
 
+      def concat_taxons?
+        concat_taxons.present?
+      end
+
       def name?
         name.present?
       end
@@ -81,14 +88,13 @@ module Spree
       def by_skus(products)
         return products unless skus?
 
-        products.joins(:variants_including_master).distinct.where(spree_variants: { sku: skus })
+        products.joins(:variants_including_master).where(spree_variants: { sku: skus })
       end
 
       def by_price(products)
         return products unless price?
 
         products.joins(master: :default_price).
-          distinct.
           where(
             spree_prices: {
               amount: price.min..price.max,
@@ -100,7 +106,20 @@ module Spree
       def by_taxons(products)
         return products unless taxons?
 
-        products.joins(:taxons).distinct.where(spree_taxons: { id: taxons })
+        products.joins(:classifications).where(Classification.table_name => { taxon_id: taxons })
+      end
+
+      def by_concat_taxons(products)
+        return products unless concat_taxons?
+
+        product_ids = Spree::Product.
+                      joins(:classifications).
+                      where(Classification.table_name => { taxon_id: concat_taxons }).
+                      group("#{Spree::Product.table_name}.id").
+                      having("COUNT(#{Spree::Product.table_name}.id) = ?", concat_taxons.length).
+                      ids
+
+        products.where(id: product_ids)
       end
 
       def by_name(products)
@@ -112,9 +131,11 @@ module Spree
       def by_options(products)
         return products unless options?
 
-        options.map do |key, value|
-          products.with_option_value(key, value)
-        end.inject(:&)
+        products.where(
+          id: options.map do |key, value|
+            products.with_option_value(key, value).ids
+          end.flatten.compact.uniq
+        )
       end
 
       def by_option_value_ids(products)
@@ -143,13 +164,25 @@ module Spree
 
         case sort_by
         when 'default'
-          products
+          if taxons?
+            products.
+              select("#{Product.table_name}.*, #{Classification.table_name}.position").
+              order("#{Classification.table_name}.position" => :asc)
+          else
+            products
+          end
         when 'newest-first'
           products.order(available_on: :desc)
         when 'price-high-to-low'
-          products.select('spree_products.*, spree_prices.amount').reorder('').send(:descend_by_master_price)
+          products.
+            select("#{Product.table_name}.*, #{Spree::Price.table_name}.amount").
+            reorder('').
+            send(:descend_by_master_price)
         when 'price-low-to-high'
-          products.select('spree_products.*, spree_prices.amount').reorder('').send(:ascend_by_master_price)
+          products.
+            select("#{Product.table_name}.*, #{Spree::Price.table_name}.amount").
+            reorder('').
+            send(:ascend_by_master_price)
         end
       end
 
@@ -160,6 +193,13 @@ module Spree
       def include_discontinued(products)
         discontinued ? products : products.available
       end
+
+      def taxon_ids(taxons_ids)
+        return if taxons_ids.nil? || taxons_ids.to_s.blank?
+
+        taxons = Spree::Taxon.where(id: taxons_ids.to_s.split(','))
+        taxons.map(&:cached_self_and_descendants_ids).flatten.compact.uniq.map(&:to_s)
+      end
     end
   end
 end

data/app/helpers/spree/base_helper.rb

@@ -111,7 +111,9 @@ module Spree
     # we should always try to render image of the default variant
     # same as it's done on PDP
     def default_image_for_product(product)
-      if product.default_variant.images.any?
+      if product.images.any?
+        product.images.first
+      elsif product.default_variant.images.any?
         product.default_variant.images.first
       elsif product.variant_images.any?
         product.variant_images.first
@@ -136,6 +138,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/helpers/spree/products_helper.rb

@@ -58,13 +58,8 @@ module Spree
     end
 
     def cache_key_for_products(products = @products, additional_cache_key = nil)
-      ids = if products.is_a?(Array)
-              products.map(&:id)
-            else
-              products.ids
-            end.join('-')
       max_updated_at = (products.maximum(:updated_at) || Date.today).to_s(:number)
-      products_cache_keys = "spree/products/#{ids}-#{params[:page]}-#{params[:sort_by]}-#{max_updated_at}-#{@taxon&.id}"
+      products_cache_keys = "spree/products/#{products.map(&:id).join('-')}-#{params[:page]}-#{params[:sort_by]}-#{max_updated_at}-#{@taxon&.id}"
       (common_product_cache_keys + [products_cache_keys] + [additional_cache_key]).compact.join('/')
     end
 
@@ -72,7 +67,7 @@ module Spree
       cache_key_elements = common_product_cache_keys
       cache_key_elements += [
         product.cache_key_with_version,
-        product.possible_promotions
+        product.possible_promotions.map(&:cache_key)
       ]
 
       cache_key_elements.compact.join('/')
@@ -84,8 +79,9 @@ module Spree
       string.slice(0..449) + '...'
     end
 
-    def available_status(product) # will return a human readable string
-      return Spree.t(:discontinued)  if product.discontinued?
+    # will return a human readable string
+    def available_status(product)
+      return Spree.t(:discontinued) if product.discontinued?
       return Spree.t(:deleted) if product.deleted?
 
       if product.available?
@@ -121,16 +117,16 @@ module Spree
     def related_products
       return [] unless @product.respond_to?(:has_related_products?) && @product.has_related_products?(:related_products)
 
-      @_related_products ||= @product.
-                             related_products.
-                             includes(
-                               :tax_category,
-                               master: [
-                                 :prices,
-                                 images: { attachment_attachment: :blob },
-                               ]
-                             ).
-                             limit(Spree::Config[:products_per_page])
+      @related_products ||= @product.
+                            related_products.
+                            includes(
+                              :tax_category,
+                              master: [
+                                :prices,
+                                images: { attachment_attachment: :blob },
+                              ]
+                            ).
+                            limit(Spree::Config[:products_per_page])
     end
 
     def product_available_in_currency?
@@ -150,7 +146,7 @@ module Spree
     end
 
     def variants_option_types_presenter(variants, product)
-      @_variants_option_types_presenter ||= begin
+      @variants_option_types_presenter ||= begin
         option_types = Spree::Variants::OptionTypesFinder.new(variant_ids: variants.map(&:id)).execute
 
         Spree::Variants::OptionTypesPresenter.new(option_types, variants, product)

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

@@ -81,7 +81,7 @@ module Spree
       #   SELECT COUNT(*) ...
       add_search_scope :in_taxon do |taxon|
         includes(:classifications).
-          where('spree_products_taxons.taxon_id' => taxon.self_and_descendants.pluck(:id)).
+          where('spree_products_taxons.taxon_id' => taxon.cached_self_and_descendants_ids).
           order('spree_products_taxons.position ASC')
       end
 
@@ -221,7 +221,7 @@ module Spree
 
       # specifically avoid having an order for taxon search (conflicts with main order)
       def self.prepare_taxon_conditions(taxons)
-        ids = taxons.map { |taxon| taxon.self_and_descendants.pluck(:id) }.flatten.uniq
+        ids = taxons.map(&:cached_self_and_descendants_ids).flatten.uniq
         joins(:classifications).where(Classification.table_name => { taxon_id: ids })
       end
       private_class_method :prepare_taxon_conditions

data/app/models/spree/credit_card.rb

@@ -24,10 +24,9 @@ module Spree
     attribute :month, ActiveRecord::Type::Integer.new
     attribute :year,  ActiveRecord::Type::Integer.new
 
-    attr_reader :number
+    attr_reader :number, :verification_value
     attr_accessor :encrypted_data,
                   :imported,
-                  :verification_value,
                   :manual_entry
 
     with_options if: :require_card_numbers?, on: :create do
@@ -101,9 +100,11 @@ module Spree
                        end
     end
 
+    def verification_value=(value)
+      @verification_value = value.to_s.gsub(/\s/, '')
+    end
+
     def set_last_digits
-      number.to_s.gsub!(/\s/, '')
-      verification_value.to_s.gsub!(/\s/, '')
       self.last_digits ||= number.to_s.length <= 4 ? number : number.to_s.slice(-4..-1)
     end
 

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/preferences/preferable.rb

@@ -100,7 +100,7 @@ module Spree::Preferences::Preferable
       if value.is_a?(FalseClass) ||
           value.nil? ||
           value == 0 ||
-          value =~ /^(f|false|0)$/i ||
+          value&.to_s =~ /^(f|false|0)$/i ||
           (value.respond_to?(:empty?) && value.empty?)
         false
       else

data/app/models/spree/product.rb

@@ -111,7 +111,7 @@ module Spree
 
     alias options product_option_types
 
-    self.whitelisted_ransackable_associations = %w[stores variants_including_master master variants]
+    self.whitelisted_ransackable_associations = %w[taxons stores variants_including_master master variants]
     self.whitelisted_ransackable_attributes = %w[description name slug discontinue_on]
     self.whitelisted_ransackable_scopes = %w[not_discontinued]
 
@@ -341,7 +341,7 @@ module Spree
           price: master.price
         )
       end
-      throw(:abort) unless save
+      save
     end
 
     def ensure_master

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

@@ -23,7 +23,7 @@ module Spree
           order   = line_item.order
 
           # Prevent negative order totals
-          amounts << order.amount - order.adjustments.sum(:amount).abs if order.adjustments.any?
+          amounts << order.amount - order.adjustments.eligible.sum(:amount).abs if order.adjustments.eligible.any?
 
           amounts.min * -1
         end

data/app/models/spree/taxon.rb

@@ -74,6 +74,12 @@ module Spree
       ancestor_chain + name.to_s
     end
 
+    def cached_self_and_descendants_ids
+      Rails.cache.fetch("#{cache_key_with_version}/descendant-ids") do
+        self_and_descendants.ids
+      end
+    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

data/app/models/spree/variant.rb

@@ -102,6 +102,11 @@ module Spree
 
     self.whitelisted_ransackable_associations = %w[option_values product prices default_price]
     self.whitelisted_ransackable_attributes = %w[weight sku]
+    self.whitelisted_ransackable_scopes = %i(product_name_or_sku_cont)
+
+    def self.product_name_or_sku_cont(query)
+      joins(:product).where("#{Product.table_name}.name LIKE :query OR sku LIKE :query", query: "%#{query}%")
+    end
 
     def available?
       !discontinued? && product.available?

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/generators/spree/dummy/dummy_generator.rb

@@ -138,7 +138,7 @@ end
     end
 
     def gemfile_path
-      core_gems = ['spree/core', 'spree/api', 'spree/backend', 'spree/frontend']
+      core_gems = ['spree/core', 'spree/api', 'spree/backend', 'spree/frontend', 'spree/sample']
 
       if core_gems.include?(lib_name)
         '../../../../../Gemfile'

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.2'
+    '4.1.7'
   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

data/spree_core.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'ffaker', '~> 2.9'
   s.add_dependency 'friendly_id', '>= 5.2.1', '< 5.4.0'
   s.add_dependency 'highline', '~> 2.0.0' # Necessary for the install generator
-  s.add_dependency 'kaminari', '>= 1.0.1', '< 1.2.0'
+  s.add_dependency 'kaminari', '~> 1.2.1'
   s.add_dependency 'money', '~> 6.13'
   s.add_dependency 'monetize', '~> 1.9'
   s.add_dependency 'paranoia', '~> 2.4.2'
@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'state_machines-activerecord', '~> 0.6'
   s.add_dependency 'state_machines-activemodel', '~> 0.7'
   s.add_dependency 'stringex'
-  s.add_dependency 'twitter_cldr', '>= 4.3', '< 6.0'
+  s.add_dependency 'twitter_cldr', '>= 4.3', '< 7.0'
   s.add_dependency 'sprockets', '~> 3.7'
   s.add_dependency 'sprockets-rails'
   s.add_dependency 'mini_magick', '>= 4.9.4', '< 4.11.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 4.1.2
+  version: 4.1.7
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-27 00:00:00.000000000 Z
+date: 2020-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -144,22 +144,16 @@ dependencies:
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: money
   requirement: !ruby/object:Gem::Requirement
@@ -309,7 +303,7 @@ dependencies:
         version: '4.3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -319,7 +313,7 @@ dependencies:
         version: '4.3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
@@ -997,6 +991,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
@@ -1104,7 +1099,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: The bare bones necessary for Spree.