spree_core 4.0.0.rc2 → 4.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60f1421b7468857f6c74fd7ab214f09a14c886b13e42110b53c6a22529691343
-  data.tar.gz: 5d64b1bb1fa0866edd1778e6e01f79d1af23391633faf8cc08afbead4d519fcc
+  metadata.gz: a92eeda37655c24a7921c434a9e7cef57121e16da3457279999d2011f898bea8
+  data.tar.gz: 85dc63ab6533ea10eb138804558df376e33f1bfe24e0345d5209665a76c3b724
 SHA512:
-  metadata.gz: 0cd4e217e4a314c1aafd05a682bd8e7b98107581e81d16419002b385f40ff633ee4c40ebd6b5a174e80e004c4b6aa0596b8d90bcc3ec5c09ae74da0850c8fd43
-  data.tar.gz: fee6d187478f871e2b3cccda29eae1410a2b67eb709cd584217c9e8eeaae95dce886f3a2eea8d421de2cf3276f7d4642986d7a2929194025558f24dd432e45e4
+  metadata.gz: 368d97922da6dbda108e121097efce68a7393b556a0f3c0d8504db6158be11a42a1177d5a85e77c43d01d29de224f45666928a00ab0e3865274e44c0cb50b4fa
+  data.tar.gz: 3298b2b794cae1e7c9b8653c581af1d7bb5077cc8a7b199644657b903597f807ec2c8cf2312f78a5a88f01d1c06905016dcd5948bdab77ec000b38ae7e0b79f0

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

@@ -4,15 +4,17 @@ module Spree
       def initialize(scope:, params:, current_currency:)
         @scope = scope
 
-        @ids          = String(params.dig(:filter, :ids)).split(',')
-        @skus         = String(params.dig(:filter, :skus)).split(',')
-        @price        = String(params.dig(:filter, :price)).split(',')
-        @currency     = params[:currency] || current_currency
-        @taxons       = String(params.dig(:filter, :taxons)).split(',')
-        @name         = params.dig(:filter, :name)
-        @options      = params.dig(:filter, :options).try(:to_unsafe_hash)
-        @deleted      = params.dig(:filter, :show_deleted)
-        @discontinued = params.dig(:filter, :show_discontinued)
+        @ids              = String(params.dig(:filter, :ids)).split(',')
+        @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(',')
+        @name             = params.dig(:filter, :name)
+        @options          = params.dig(:filter, :options).try(:to_unsafe_hash)
+        @option_value_ids = params.dig(:filter, :option_value_ids)
+        @sort_by          = params.dig(:sort_by)
+        @deleted          = params.dig(:filter, :show_deleted)
+        @discontinued     = params.dig(:filter, :show_discontinued)
       end
 
       def execute
@@ -22,15 +24,17 @@ module Spree
         products = by_taxons(products)
         products = by_name(products)
         products = by_options(products)
+        products = by_option_value_ids(products)
         products = include_deleted(products)
         products = include_discontinued(products)
+        products = ordered(products)
 
         products
       end
 
       private
 
-      attr_reader :ids, :skus, :price, :currency, :taxons, :name, :options, :scope, :deleted, :discontinued
+      attr_reader :ids, :skus, :price, :currency, :taxons, :name, :options, :option_value_ids, :scope, :sort_by, :deleted, :discontinued
 
       def ids?
         ids.present?
@@ -56,6 +60,14 @@ module Spree
         options.present?
       end
 
+      def option_value_ids?
+        option_value_ids.present?
+      end
+
+      def sort_by?
+        sort_by.present?
+      end
+
       def name_matcher
         Spree::Product.arel_table[:name].matches("%#{name}%")
       end
@@ -105,6 +117,27 @@ module Spree
         end.inject(:&)
       end
 
+      def by_option_value_ids(products)
+        return products unless option_value_ids?
+
+        products.joins(variants: :option_values).distinct.where(spree_option_values: { id: option_value_ids })
+      end
+
+      def ordered(products)
+        return products unless sort_by?
+
+        case sort_by
+        when 'default'
+          products
+        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)
+        when 'price-low-to-high'
+          products.select('spree_products.*, spree_prices.amount').reorder('').send(:ascend_by_master_price)
+        end
+      end
+
       def include_deleted(products)
         deleted ? products.with_deleted : products.not_deleted
       end

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

@@ -3,12 +3,11 @@ module Spree
     class Find
       def initialize(scope:, params:)
         @scope = scope
-
-        @ids      = String(params[:ids]).split(',')
-        @parent   = params[:parent_id]
-        @taxonomy = params[:taxonomy_id]
-        @name     = params[:name]
-        @roots    = params[:roots]
+        @ids      = String(params.dig(:filter, :ids)).split(',')
+        @parent   = params.dig(:filter, :parent_id)
+        @taxonomy = params.dig(:filter, :taxonomy_id)
+        @name     = params.dig(:filter, :name)
+        @roots    = params.dig(:filter, :roots)
       end
 
       def execute

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    '4.0.0.rc2'
+    '4.0.0.rc3'
   end
 end

data/spree_core.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'carmen', '>= 1.0', '< 1.2'
   s.add_dependency 'cancancan', '~> 3.0'
   s.add_dependency 'ffaker', '~> 2.9'
-  s.add_dependency 'friendly_id', '~> 5.2.1'
+  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 'money', '~> 6.13'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc2
+  version: 4.0.0.rc3
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-17 00:00:00.000000000 Z
+date: 2019-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -110,16 +110,22 @@ dependencies:
   name: friendly_id
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.2.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.2.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.4.0
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement