spree_core 4.0.8 → 4.1.0.rc1

data/lib/generators/spree/install/templates/config/spree_storefront.yml

@@ -0,0 +1,67 @@
+default:
+  navigation:
+    - title: Women
+      subtitle: Categories
+      url: /t/women
+      items:
+        - :title: Skirts
+          :url: /t/women/skirts
+        - :title: Dresses
+          :url: /t/women/dresses
+        - :title: Shirts and Blouses
+          :url: /t/women/shirts-and-blouses
+        - :title: Sweaters
+          :url: /t/women/sweaters
+        - :title: Tops and T-shirts
+          :url: /t/women/tops-and-t-shirts
+        - :title: Jackets and Coats
+          :url: /t/women/jackets-and-coats
+      promo_banners:
+        - subtitle: New collection
+          title: Summer 2019
+          url: /t/summer-collection
+          image: 'meganav/promo_banner_left-first-category.jpg'
+        - subtitle: Special Offers
+          title: Get up to 30% off
+          url: /t/special-offers
+          image: 'meganav/promo_banner_right-first-category.jpg'
+    - title: Men
+      subtitle: Categories
+      url: /t/men
+      items:
+        - :title: Shirts
+          :url: /t/men/shirts
+        - :title: T-shirts
+          :url: /t/men/t-shirts
+        - :title: Sweaters
+          :url: /t/men/sweaters
+        - :title: Jackets and Coats
+          :url: /t/men/jackets-and-coats
+      promo_banners:
+        - subtitle: New collection
+          title: Summer 2019
+          url: /t/summer-collection
+          image: 'meganav/promo_banner_left-second-category.jpg'
+        - subtitle: Special Offers
+          title: Get up to 30% off
+          url: /t/special-offers
+          image: 'meganav/promo_banner_right-second-category.jpg'
+    - title: Sportswear
+      subtitle: Categories
+      url: /t/sportswear
+      items:
+        - :title: Tops
+          :url: /t/sportswear/tops
+        - :title: Sweatshirts
+          :url: /t/sportswear/sweatshirts
+        - :title: Pants
+          :url: /t/sportswear/pants
+      promo_banners:
+        - subtitle: New collection
+          title: Summer 2019
+          url: /t/summer-collection
+          image: 'meganav/promo_banner_left-third-category.jpg'
+        - subtitle: Special Offers
+          title: Get up to 30% off
+          url: /t/special-offers
+          image: 'meganav/promo_banner_right-third-category.jpg'

data/lib/spree/core/controller_helpers/order.rb

@@ -5,8 +5,6 @@ module Spree
         extend ActiveSupport::Concern
 
         included do
-          before_action :set_current_order
-
           helper_method :current_order
           helper_method :simple_current_order
         end
@@ -28,6 +26,7 @@ module Spree
         # The current incomplete order from the token for use in cart and during checkout
         def current_order(options = {})
           options[:create_order_if_necessary] ||= false
+          options[:includes] ||= true
 
           if @current_order
             @current_order.last_ip_address = ip_address
@@ -66,8 +65,8 @@ module Spree
 
         private
 
-        def last_incomplete_order
-          @last_incomplete_order ||= try_spree_current_user.last_incomplete_spree_order(current_store)
+        def last_incomplete_order(includes = {})
+          @last_incomplete_order ||= try_spree_current_user.last_incomplete_spree_order(current_store, includes: includes)
         end
 
         def current_order_params
@@ -77,8 +76,15 @@ module Spree
         def find_order_by_token_or_user(options = {}, with_adjustments = false)
           options[:lock] ||= false
 
+          includes = if options[:includes]
+                       { line_items: [variant: [:images, :option_values, :product]] }
+                     else
+                       {}
+                     end
+
           # Find any incomplete orders for the token
-          incomplete_orders = Spree::Order.incomplete.includes(line_items: [variant: [:images, :option_values, :product]])
+          incomplete_orders = Spree::Order.incomplete.includes(includes)
+
           token_order_params = current_order_params.except(:user_id)
           order = if with_adjustments
                     incomplete_orders.includes(:adjustments).lock(options[:lock]).find_by(token_order_params)
@@ -87,7 +93,7 @@ module Spree
                   end
 
           # Find any incomplete orders for the current user
-          order = last_incomplete_order if order.nil? && try_spree_current_user
+          order = last_incomplete_order(includes) if order.nil? && try_spree_current_user
 
           order
         end

data/lib/spree/core/controller_helpers/store.rb

@@ -11,7 +11,7 @@ module Spree
         end
 
         def current_currency
-          Spree::Config[:currency]
+          current_store.default_currency
         end
 
         def current_store
@@ -43,7 +43,7 @@ module Spree
         private
 
         def current_tax_zone
-          @current_tax_zone ||= current_order.try(:tax_zone) || Spree::Zone.default_tax
+          @current_tax_zone ||= @current_order&.tax_zone || Spree::Zone.default_tax
         end
       end
     end

data/lib/spree/core/search/base.rb

@@ -13,7 +13,7 @@ module Spree
         end
 
         def retrieve_products
-          @products = get_base_scope
+          @products = extended_base_scope&.available
           curr_page = page || 1
 
           unless Spree::Config.show_products_without_price
@@ -33,34 +33,37 @@ module Spree
 
         protected
 
-        def get_base_scope
+        def extended_base_scope
           base_scope = Spree::Product.spree_base_scopes.active
-          base_scope = base_scope.in_taxon(taxon) unless taxon.blank?
           base_scope = get_products_conditions_for(base_scope, keywords)
+          base_scope = Spree::Products::Find.new(
+            scope: base_scope,
+            params: {
+              filter: {
+                price: price,
+                option_value_ids: option_value_ids,
+                taxons: taxon&.id
+              },
+              sort_by: sort_by
+            },
+            current_currency: current_currency
+          ).execute
           base_scope = add_search_scopes(base_scope)
           base_scope = add_eagerload_scopes(base_scope)
           base_scope
         end
 
         def add_eagerload_scopes(scope)
-          # TL;DR Switch from `preload` to `includes` as soon as Rails starts honoring
-          # `order` clauses on `has_many` associations when a `where` constraint
-          # affecting a joined table is present (see
-          # https://github.com/rails/rails/issues/6769).
-          #
-          # Ideally this would use `includes` instead of `preload` calls, leaving it
-          # up to Rails whether associated objects should be fetched in one big join
-          # or multiple independent queries. However as of Rails 4.1.8 any `order`
-          # defined on `has_many` associations are ignored when Rails builds a join
-          # query.
-          #
-          # Would we use `includes` in this particular case, Rails would do
-          # separate queries most of the time but opt for a join as soon as any
-          # `where` constraints affecting joined tables are added to the search;
-          # which is the case as soon as a taxon is added to the base scope.
-          scope = scope.preload(:tax_category)
-          scope = scope.preload(master: :prices)
-          scope = scope.preload(master: :images) if include_images
+          scope = scope.includes(
+            :tax_category,
+            variants: [
+              { images: { attachment_attachment: :blob } }
+            ],
+            master: [
+              :prices,
+              { images: { attachment_attachment: :blob } }
+            ]
+          )
           scope
         end
 
@@ -68,6 +71,7 @@ module Spree
           if search.is_a?(ActionController::Parameters)
             search.each do |name, scope_attribute|
               scope_name = name.to_sym
+
               base_scope = if base_scope.respond_to?(:search_scopes) && base_scope.search_scopes.include?(scope_name.to_sym)
                              base_scope.send(scope_name, *scope_attribute)
                            else
@@ -81,15 +85,48 @@ module Spree
         # method should return new scope based on base_scope
         def get_products_conditions_for(base_scope, query)
           unless query.blank?
-            base_scope = base_scope.like_any([:name, :description], query.split)
+            base_scope = base_scope.like_any([:name, :description], [query])
+          end
+          base_scope
+        end
+
+        def get_products_option_values_conditions(base_scope, option_value_ids)
+          unless option_value_ids.blank?
+            base_scope = base_scope.joins(variants: :option_values).where(spree_option_values: { id: option_value_ids })
           end
           base_scope
         end
 
+        def get_price_range(price_param)
+          return if price_param.blank?
+
+          less_than_string = I18n.t('activerecord.attributes.spree/product.less_than')
+
+          if price_param.include? less_than_string
+            low_price = 0
+            high_price = Monetize.parse(price_param.remove("#{less_than_string} ")).to_i
+          else
+            low_price, high_price = Monetize.parse_collection(price_param).map(&:to_i)
+          end
+
+          "#{low_price},#{high_price}"
+        end
+
+        def build_option_value_ids(params)
+          filter_params = Spree::OptionType.all.map(&:filter_param)
+
+          filter_params.reduce([]) do |acc, filter_param|
+            acc + params[filter_param].to_s.split(',')
+          end
+        end
+
         def prepare(params)
           @properties[:taxon] = params[:taxon].blank? ? nil : Spree::Taxon.find(params[:taxon])
           @properties[:keywords] = params[:keywords]
+          @properties[:option_value_ids] = build_option_value_ids(params)
+          @properties[:price] = get_price_range(params[:price])
           @properties[:search] = params[:search]
+          @properties[:sort_by] = params[:sort_by] || 'default'
           @properties[:include_images] = params[:include_images]
 
           per_page = params[:per_page].to_i

data/lib/spree/core/version.rb

@@ -1,7 +1,5 @@
 module Spree
-  VERSION = '4.0.8'.freeze
-
   def self.version
-    VERSION
+    '4.1.0.rc1'
   end
 end

data/lib/spree/core.rb

@@ -93,7 +93,6 @@ 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/money.rb

@@ -1,6 +1,7 @@
 require 'money'
 
 Money.locale_backend = :i18n
+Money.rounding_mode = BigDecimal::ROUND_HALF_UP
 
 module Spree
   class Money
@@ -18,6 +19,7 @@ module Spree
     delegate    :cents, :currency, to: :money
 
     def initialize(amount, options = {})
+      use_default_currency
       @money   = Monetize.parse([amount, (options[:currency] || Spree::Config[:currency])].join)
       @options = Spree::Money.default_formatting_rules.merge(options)
     end
@@ -27,7 +29,7 @@ module Spree
     end
 
     def to_s
-      money.format(options)
+      money&.format(options)
     end
 
     # 1) prevent blank, breaking spaces
@@ -62,6 +64,11 @@ module Spree
       money == obj.money
     end
 
+    def use_default_currency
+      currency = Spree::Store.default.default_currency || Spree::Config[:currency]
+      ::Money.default_currency = currency
+    end
+
     private
 
     attr_reader :options

data/lib/spree/permitted_attributes.rb

@@ -39,7 +39,7 @@ module Spree
     ]
 
     @@checkout_attributes = [
-      :coupon_code, :email, :shipping_method_id, :special_instructions, :use_billing, 
+      :coupon_code, :email, :shipping_method_id, :special_instructions, :use_billing,
       :user_id, :bill_address_id, :ship_address_id
     ]
 
@@ -97,7 +97,8 @@ module Spree
     ]
 
     @@store_attributes = [:name, :url, :seo_title, :code, :meta_keywords,
-                          :meta_description, :default_currency, :mail_from_address]
+                          :meta_description, :default_currency, :mail_from_address,
+                          :facebook, :twitter, :instagram]
 
     @@store_credit_attributes = %i[amount currency category_id memo]
 

data/lib/spree/testing_support/capybara_ext.rb

@@ -32,51 +32,6 @@ module CapybaraExt
     end
   end
 
-  def select2_search(value, options)
-    options[:from] = select2_from_label(options[:from])
-    targetted_select2_search(value, options)
-  end
-
-  def targetted_select2_search(value, options)
-    select2_el = find(:css, options[:from])
-    select2_el.click
-    page.document.find('.select2-search input.select2-input,
-                        .select2-search-field input.select2-input.select2-focused').send_keys(value)
-    select_select2_result(value)
-  end
-
-  def select2(value, options)
-    options[:from] = select2_from_label(options[:from])
-    targetted_select2(value, options)
-  end
-
-  def select2_from_label(from)
-    label = find(:label, from, class: '!select2-offscreen')
-    within label.first(:xpath, './/..') do
-      "##{find('.select2-container')['id']}"
-    end
-  end
-
-  def select2_no_label(value, options = {})
-    raise "Must pass a hash containing 'from'" if !options.is_a?(Hash) || !options.key?(:from)
-
-    placeholder = options[:from]
-    click_link placeholder
-
-    select_select2_result(value)
-  end
-
-  def targetted_select2(value, options)
-    # find select2 element and click it
-    find(options[:from]).find('a').click
-    select_select2_result(value)
-  end
-
-  def select_select2_result(value)
-    # results are in a div appended to the end of the document
-    page.document.find('div.select2-result-label', match: :first, text: %r{#{Regexp.escape(value)}}i).click
-  end
-
   # arg delay in seconds
   def wait_for_ajax(delay = Capybara.default_max_wait_time)
     Timeout.timeout(delay) do
@@ -108,13 +63,6 @@ rescue Selenium::WebDriver::Error::TimeOutError
   default_options[:error].nil? ? false : raise(default_options[:error])
 end
 
-# Usage examples:
-# fill_in_with_force 'CVC', with: 123
-def fill_in_with_force(locator, with:)
-  field_id = find_field(locator)[:id]
-  page.execute_script "document.getElementById('#{field_id}').value = '#{with}';"
-end
-
 Capybara.configure do |config|
   config.match = :smart
   config.ignore_hidden_elements = true

data/lib/spree/testing_support/common_rake.rb

@@ -15,7 +15,7 @@ namespace :common do
     Rails.env = 'test'
 
     Spree::DummyGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", '--quiet']
-    Spree::InstallGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", '--auto-accept', '--migrate=false', '--seed=false', '--sample=false', '--quiet', '--copy_views=false', "--user_class=#{args[:user_class]}"]
+    Spree::InstallGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", '--auto-accept', '--migrate=false', '--seed=false', '--sample=false', '--quiet', '--copy_storefront=false', "--user_class=#{args[:user_class]}"]
 
     puts 'Setting up dummy database...'
     system("bundle exec rake db:drop db:create > #{File::NULL}")

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

@@ -5,5 +5,8 @@ FactoryBot.define do
     url               { 'www.example.com' }
     mail_from_address { 'spree@example.org' }
     default_currency  { 'USD' }
+    facebook          { 'spreecommerce' }
+    twitter           { 'spreecommerce' }
+    instagram         { 'spreecommerce' }
   end
 end

data/lib/spree/testing_support/order_walkthrough.rb

@@ -1,7 +1,7 @@
 class OrderWalkthrough
   def self.up_to(state)
     # A default store must exist to provide store settings
-    FactoryBot.create(:store) unless Spree::Store.exists?
+    store = Spree::Store.default || FactoryBot.create(:store, default: true)
 
     # A payment method must exist for an order to proceed through the Address state
     unless Spree::PaymentMethod.exists?
@@ -18,7 +18,7 @@ class OrderWalkthrough
     unless Spree::ShippingMethod.exists?
       FactoryBot.create(:shipping_method).tap do |sm|
         sm.calculator.preferred_amount = 10
-        sm.calculator.preferred_currency = Spree::Config[:currency]
+        sm.calculator.preferred_currency = store.default_currency
         sm.calculator.save
       end
     end
@@ -53,7 +53,11 @@ class OrderWalkthrough
   end
 
   def self.payment(order)
-    order.payments.create!(payment_method: Spree::PaymentMethod.first, amount: order.total)
+    FactoryBot.create :payment,
+      order: order,
+      payment_method: Spree::PaymentMethod.first,
+      amount: order.total
+
     # TODO: maybe look at some way of making this payment_state change automatic
     order.payment_state = 'paid'
     order.next!

data/spree_core.gemspec

@@ -6,23 +6,17 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_core'
   s.version     = Spree.version
-  s.author      = 'Sean Schofield'
-  s.email       = 'sean@spreecommerce.com'
   s.summary     = 'The bare bones necessary for Spree.'
   s.description = 'The bare bones necessary for Spree.'
-  s.homepage    = 'http://spreecommerce.org'
-  s.license     = 'BSD-3-Clause'
-
-  s.metadata = {
-    "bug_tracker_uri"   => "https://github.com/spree/spree/issues",
-    "changelog_uri"     => "https://github.com/spree/spree/releases/tag/v#{s.version}",
-    "documentation_uri" => "https://guides.spreecommerce.org/",
-    "source_code_uri"   => "https://github.com/spree/spree/tree/v#{s.version}",
-  }
 
   s.required_ruby_version     = '>= 2.5.0'
   s.required_rubygems_version = '>= 1.8.23'
 
+  s.author      = 'Sean Schofield'
+  s.email       = 'sean@spreecommerce.com'
+  s.homepage    = 'http://spreecommerce.org'
+  s.license     = 'BSD-3-Clause'
+
   s.files        = `git ls-files`.split("\n").reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
   s.require_path = 'lib'
 
@@ -34,21 +28,21 @@ 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.2.1'
+  s.add_dependency 'kaminari', '>= 1.0.1', '< 1.2.0'
   s.add_dependency 'money', '~> 6.13'
   s.add_dependency 'monetize', '~> 1.9'
   s.add_dependency 'paranoia', '~> 2.4.2'
   s.add_dependency 'premailer-rails'
-  s.add_dependency 'rails', '>= 5.2', '< 6.1'
+  s.add_dependency 'rails', '~> 6.0.0'
   s.add_dependency 'ransack', '~> 2.3.0'
   s.add_dependency 'responders'
   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'
+  s.add_dependency 'twitter_cldr', '>= 4.3', '< 6.0'
   s.add_dependency 'sprockets', '~> 3.7'
   s.add_dependency 'sprockets-rails'
-  s.add_dependency 'mini_magick', '~> 4.9.4'
+  s.add_dependency 'mini_magick', '>= 4.9.4', '< 4.11.0'
   s.add_dependency 'image_processing', '~> 1.2'
 
   s.add_development_dependency 'email_spec', '~> 2.2'