spree_core 3.3.6 → 3.4.0.rc1

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

@@ -2,54 +2,52 @@ module Spree
   module Core
     module Importer
       class Order
-
         def self.import(user, params)
-          begin
-            ensure_country_id_from_params params[:ship_address_attributes]
-            ensure_state_id_from_params params[:ship_address_attributes]
-            ensure_country_id_from_params params[:bill_address_attributes]
-            ensure_state_id_from_params params[:bill_address_attributes]
 
-            create_params = params.slice :currency
-            order = Spree::Order.create! create_params
-            order.associate_user!(user)
+          ensure_country_id_from_params params[:ship_address_attributes]
+          ensure_state_id_from_params params[:ship_address_attributes]
+          ensure_country_id_from_params params[:bill_address_attributes]
+          ensure_state_id_from_params params[:bill_address_attributes]
 
-            shipments_attrs = params.delete(:shipments_attributes)
+          create_params = params.slice :currency
+          order = Spree::Order.create! create_params
+          order.associate_user!(user)
 
-            create_line_items_from_params(params.delete(:line_items_attributes),order)
-            create_shipments_from_params(shipments_attrs, order)
-            create_adjustments_from_params(params.delete(:adjustments_attributes), order)
-            create_payments_from_params(params.delete(:payments_attributes), order)
+          shipments_attrs = params.delete(:shipments_attributes)
 
-            if completed_at = params.delete(:completed_at)
-              order.completed_at = completed_at
-              order.state = 'complete'
-            end
+          create_line_items_from_params(params.delete(:line_items_attributes), order)
+          create_shipments_from_params(shipments_attrs, order)
+          create_adjustments_from_params(params.delete(:adjustments_attributes), order)
+          create_payments_from_params(params.delete(:payments_attributes), order)
 
-            params.delete(:user_id) unless user.try(:has_spree_role?, "admin") && params.key?(:user_id)
+          if completed_at = params.delete(:completed_at)
+            order.completed_at = completed_at
+            order.state = 'complete'
+          end
 
-            order.update_attributes!(params)
+          params.delete(:user_id) unless user.try(:has_spree_role?, 'admin') && params.key?(:user_id)
 
-            order.create_proposed_shipments unless shipments_attrs.present?
+          order.update_attributes!(params)
 
-            # Really ensure that the order totals & states are correct
-            order.updater.update
-            if shipments_attrs.present?
-              order.shipments.each_with_index do |shipment, index|
-                shipment.update_columns(cost: shipments_attrs[index][:cost].to_f) if shipments_attrs[index][:cost].present?
-              end
+          order.create_proposed_shipments unless shipments_attrs.present?
+
+          # Really ensure that the order totals & states are correct
+          order.updater.update
+          if shipments_attrs.present?
+            order.shipments.each_with_index do |shipment, index|
+              shipment.update_columns(cost: shipments_attrs[index][:cost].to_f) if shipments_attrs[index][:cost].present?
             end
-            order.reload
-          rescue Exception => e
-            order.destroy if order && order.persisted?
-            raise e.message
           end
+          order.reload
+        rescue Exception => e
+          order.destroy if order && order.persisted?
+          raise e.message
+
         end
 
         def self.create_shipments_from_params(shipments_hash, order)
           return [] unless shipments_hash
 
-
           shipments_hash.each do |s|
             begin
               shipment = order.shipments.build
@@ -90,7 +88,7 @@ module Spree
         end
 
         def self.create_inventory_units_from_order_and_params(order, inventory_unit_params)
-          inventory_unit_params.reduce([]) do |inventory_units, inventory_unit_param|
+          inventory_unit_params.each_with_object([]) do |inventory_unit_param, inventory_units|
             ensure_variant_id_from_params(inventory_unit_param)
             existing = inventory_units.detect { |unit| unit.variant_id == inventory_unit_param[:variant_id] }
             if existing
@@ -99,15 +97,15 @@ module Spree
               line_item = order.line_items.detect { |ln| ln.variant_id = inventory_unit_param[:variant_id] }
               inventory_units << InventoryUnit.new(line_item: line_item, order_id: order.id, variant: line_item.variant, quantity: 1)
             end
-            inventory_units
+
           end
         end
 
         def self.create_line_items_from_params(line_items, order)
           return {} unless line_items
           iterator = case line_items
-          when Hash
-            ActiveSupport::Deprecation.warn(<<-EOS, caller)
+                     when Hash
+                       ActiveSupport::Deprecation.warn(<<-EOS, caller)
               Passing a hash is now deprecated and will be removed in Spree 4.0.
               It is recommended that you pass it as an array instead.
 
@@ -133,9 +131,9 @@ module Spree
                 }
               }
             EOS
-            :each_value
-          when Array
-            :each
+                       :each_value
+                     when Array
+                       :each
           end
 
           line_items.send(iterator) do |line_item|
@@ -197,39 +195,39 @@ module Spree
         end
 
         def self.create_source_payment_from_params(source_hash, payment)
-          begin
-            Spree::CreditCard.create(
-              month: source_hash[:month],
-              year: source_hash[:year],
-              cc_type: source_hash[:cc_type],
-              last_digits: source_hash[:last_digits],
-              name: source_hash[:name],
-              payment_method: payment.payment_method,
-              gateway_customer_profile_id: source_hash[:gateway_customer_profile_id],
-              gateway_payment_profile_id: source_hash[:gateway_payment_profile_id],
-              imported: true
-            )
-          rescue Exception => e
-            raise "Order import source payments: #{e.message} #{source_hash}"
-          end
+
+          Spree::CreditCard.create(
+            month: source_hash[:month],
+            year: source_hash[:year],
+            cc_type: source_hash[:cc_type],
+            last_digits: source_hash[:last_digits],
+            name: source_hash[:name],
+            payment_method: payment.payment_method,
+            gateway_customer_profile_id: source_hash[:gateway_customer_profile_id],
+            gateway_payment_profile_id: source_hash[:gateway_payment_profile_id],
+            imported: true
+          )
+        rescue Exception => e
+          raise "Order import source payments: #{e.message} #{source_hash}"
+
         end
 
         def self.ensure_variant_id_from_params(hash)
-          begin
-            sku = hash.delete(:sku)
-            unless hash[:variant_id].present?
-              hash[:variant_id] = Spree::Variant.active.find_by!(sku: sku).id
-            end
-            hash
-          rescue ActiveRecord::RecordNotFound => e
-            raise "Ensure order import variant: Variant w/SKU #{sku} not found."
-          rescue Exception => e
-            raise "Ensure order import variant: #{e.message} #{hash}"
+
+          sku = hash.delete(:sku)
+          unless hash[:variant_id].present?
+            hash[:variant_id] = Spree::Variant.active.find_by!(sku: sku).id
           end
+          hash
+        rescue ActiveRecord::RecordNotFound => e
+          raise "Ensure order import variant: Variant w/SKU #{sku} not found."
+        rescue Exception => e
+          raise "Ensure order import variant: #{e.message} #{hash}"
+
         end
 
         def self.ensure_country_id_from_params(address)
-          return if address.nil? or address[:country_id].present? or address[:country].nil?
+          return if address.nil? || address[:country_id].present? || address[:country].nil?
 
           begin
             search = {}
@@ -245,14 +243,13 @@ module Spree
 
             address.delete(:country)
             address[:country_id] = Spree::Country.where(search).first!.id
-
           rescue Exception => e
             raise "Ensure order import address country: #{e.message} #{search}"
           end
         end
 
         def self.ensure_state_id_from_params(address)
-          return if address.nil? or address[:state_id].present? or address[:state].nil?
+          return if address.nil? || address[:state_id].present? || address[:state].nil?
 
           begin
             search = {}

data/lib/spree/core/importer/product.rb

@@ -44,18 +44,19 @@ module Spree
         end
 
         private
-          def set_up_options
-            options_attrs.each do |name|
-              option_type = Spree::OptionType.where(name: name).first_or_initialize do |option_type|
-                option_type.presentation = name
-                option_type.save!
-              end
 
-              unless product.option_types.include?(option_type)
-                product.option_types << option_type
-              end
+        def set_up_options
+          options_attrs.each do |name|
+            option_type = Spree::OptionType.where(name: name).first_or_initialize do |option_type|
+              option_type.presentation = name
+              option_type.save!
+            end
+
+            unless product.option_types.include?(option_type)
+              product.option_types << option_type
             end
           end
+        end
       end
     end
   end

data/lib/spree/core/product_filters.rb

@@ -53,7 +53,7 @@ module Spree
       # below scope would be something like ["$10 - $15", "$15 - $18", "$18 - $20"]
       #
       Spree::Product.add_search_scope :price_range_any do |*opts|
-        conds = opts.map {|o| Spree::Core::ProductFilters.price_filter[:conds][o]}.reject { |c| c.nil? }
+        conds = opts.map { |o| Spree::Core::ProductFilters.price_filter[:conds][o] }.reject(&:nil?)
         scope = conds.shift
         conds.each do |new_scope|
           scope = scope.or(new_scope)
@@ -61,26 +61,25 @@ module Spree
         Spree::Product.joins(master: :default_price).where(scope)
       end
 
-      def ProductFilters.format_price(amount)
+      def self.format_price(amount)
         Spree::Money.new(amount)
       end
 
-      def ProductFilters.price_filter
+      def self.price_filter
         v = Spree::Price.arel_table
-        conds = [ [ Spree.t(:under_price, price: format_price(10))     , v[:amount].lteq(10)],
-                  [ "#{format_price(10)} - #{format_price(15)}"        , v[:amount].in(10..15)],
-                  [ "#{format_price(15)} - #{format_price(18)}"        , v[:amount].in(15..18)],
-                  [ "#{format_price(18)} - #{format_price(20)}"        , v[:amount].in(18..20)],
-                  [ Spree.t(:or_over_price, price: format_price(20)) , v[:amount].gteq(20)]]
+        conds = [[Spree.t(:under_price, price: format_price(10)), v[:amount].lteq(10)],
+                 ["#{format_price(10)} - #{format_price(15)}", v[:amount].in(10..15)],
+                 ["#{format_price(15)} - #{format_price(18)}", v[:amount].in(15..18)],
+                 ["#{format_price(18)} - #{format_price(20)}", v[:amount].in(18..20)],
+                 [Spree.t(:or_over_price, price: format_price(20)), v[:amount].gteq(20)]]
         {
           name:   Spree.t(:price_range),
           scope:  :price_range_any,
           conds:  Hash[*conds.flatten],
-          labels: conds.map { |k,v| [k, k] }
+          labels: conds.map { |k, _v| [k, k] }
         }
       end
 
-
       # Example: filtering by possible brands
       #
       # First, we define the scope. Two interesting points here: (a) we run our conditions
@@ -94,7 +93,7 @@ module Spree
       #   being blank: note that this relies on with_property doing a left outer join
       #   rather than an inner join.
       Spree::Product.add_search_scope :brand_any do |*opts|
-        conds = opts.map {|o| ProductFilters.brand_filter[:conds][o]}.reject { |c| c.nil? }
+        conds = opts.map { |o| ProductFilters.brand_filter[:conds][o] }.reject(&:nil?)
         scope = conds.shift
         conds.each do |new_scope|
           scope = scope.or(new_scope)
@@ -102,7 +101,7 @@ module Spree
         Spree::Product.with_property('brand').where(scope)
       end
 
-      def ProductFilters.brand_filter
+      def self.brand_filter
         brand_property = Spree::Property.find_by(name: 'brand')
         brands = brand_property ? Spree::ProductProperty.where(property_id: brand_property.id).pluck(:value).uniq.map(&:to_s) : []
         pp = Spree::ProductProperty.arel_table
@@ -111,7 +110,7 @@ module Spree
           name:   I18n.t('spree.taxonomy_brands_name'),
           scope:  :brand_any,
           conds:  conds,
-          labels: (brands.sort).map { |k| [k, k] }
+          labels: brands.sort.map { |k| [k, k] }
         }
       end
 
@@ -138,12 +137,12 @@ module Spree
         Spree::Product.brand_any(*opts)
       end
 
-      def ProductFilters.selective_brand_filter(taxon = nil)
+      def self.selective_brand_filter(taxon = nil)
         taxon ||= Spree::Taxonomy.first.root
         brand_property = Spree::Property.find_by(name: 'brand')
         scope = Spree::ProductProperty.where(property: brand_property).
-          joins(product: :taxons).
-          where("#{Spree::Taxon.table_name}.id" => [taxon] + taxon.descendants)
+                joins(product: :taxons).
+                where("#{Spree::Taxon.table_name}.id" => [taxon] + taxon.descendants)
         brands = scope.pluck(:value).uniq
         {
           name:   'Applicable Brands',
@@ -164,7 +163,7 @@ module Spree
       #
       # This scope selects products in any of the active taxons or their children.
       #
-      def ProductFilters.taxons_below(taxon)
+      def self.taxons_below(taxon)
         return Spree::Core::ProductFilters.all_taxons if taxon.nil?
         {
           name:   'Taxons under ' + taxon.name,
@@ -180,7 +179,7 @@ module Spree
       # it uses one of the auto-generated scopes from Ransack.
       #
       # idea: expand the format to allow nesting of labels?
-      def ProductFilters.all_taxons
+      def self.all_taxons
         taxons = Spree::Taxonomy.all.map { |t| [t.root] + t.root.descendants }.flatten
         {
           name:   'All taxons',

data/lib/spree/core/routes.rb

@@ -14,17 +14,13 @@ module Spree
         # This is mainly why this whole file exists in the first place.
         #
         # Thus we need to make sure that the routes aren't drawn twice.
-        unless @spree_routes.include?(block)
-          @spree_routes << block
-        end
+        @spree_routes << block unless @spree_routes.include?(block)
       end
 
       def self.append_routes(&block)
         @append_routes ||= []
         # See comment in add_routes.
-        unless @append_routes.include?(block)
-          @append_routes << block
-        end
+        @append_routes << block unless @append_routes.include?(block)
       end
 
       def self.draw_routes(&block)

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

@@ -17,14 +17,14 @@ module Spree
           curr_page = page || 1
 
           unless Spree::Config.show_products_without_price
-            @products = @products.where("spree_prices.amount IS NOT NULL").
-                                  where("spree_prices.currency" => current_currency)
+            @products = @products.where('spree_prices.amount IS NOT NULL').
+                        where('spree_prices.currency' => current_currency)
           end
           @products = @products.page(curr_page).per(per_page)
         end
 
         def method_missing(name)
-          if @properties.has_key? name
+          if @properties.key? name
             @properties[name]
           else
             super
@@ -32,71 +32,74 @@ module Spree
         end
 
         protected
-          def get_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 = 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
-          end
+        def get_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 = add_search_scopes(base_scope)
+          base_scope = add_eagerload_scopes(base_scope)
+          base_scope
+        end
 
-          def add_search_scopes(base_scope)
+        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
+        end
+
+        def add_search_scopes(base_scope)
+          if search.is_a?(ActionController::Parameters)
             search.each do |name, scope_attribute|
               scope_name = name.to_sym
-              if base_scope.respond_to?(:search_scopes) && base_scope.search_scopes.include?(scope_name.to_sym)
-                base_scope = base_scope.send(scope_name, *scope_attribute)
-              else
-                base_scope = base_scope.merge(Spree::Product.ransack({scope_name => scope_attribute}).result)
-              end
-            end if search.is_a?(ActionController::Parameters)
-            base_scope
+              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
+                             base_scope.merge(Spree::Product.ransack(scope_name => scope_attribute).result)
+                           end
+            end
           end
+          base_scope
+        end
 
-          # 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)
-            end
-            base_scope
+        # 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)
           end
+          base_scope
+        end
 
-          def prepare(params)
-            @properties[:taxon] = params[:taxon].blank? ? nil : Spree::Taxon.find(params[:taxon])
-            @properties[:keywords] = params[:keywords]
-            @properties[:search] = params[:search]
-            @properties[:include_images] = params[:include_images]
+        def prepare(params)
+          @properties[:taxon] = params[:taxon].blank? ? nil : Spree::Taxon.find(params[:taxon])
+          @properties[:keywords] = params[:keywords]
+          @properties[:search] = params[:search]
+          @properties[:include_images] = params[:include_images]
 
-            per_page = params[:per_page].to_i
-            @properties[:per_page] = per_page > 0 ? per_page : Spree::Config[:products_per_page]
-            if params[:page].respond_to?(:to_i)
-              @properties[:page] = (params[:page].to_i <= 0) ? 1 : params[:page].to_i
-            else
-              @properties[:page] = 1
-            end
-          end
+          per_page = params[:per_page].to_i
+          @properties[:per_page] = per_page > 0 ? per_page : Spree::Config[:products_per_page]
+          @properties[:page] = if params[:page].respond_to?(:to_i)
+                                 params[:page].to_i <= 0 ? 1 : params[:page].to_i
+                               else
+                                 1
+                               end
+        end
       end
     end
   end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "3.3.6"
+    '3.4.0.rc1'
   end
 end

data/lib/spree/core.rb

@@ -19,12 +19,11 @@ require 'state_machines-activerecord'
 StateMachines::Machine.ignore_method_conflicts = true
 
 module Spree
-
   mattr_accessor :user_class
 
   def self.user_class
     if @@user_class.is_a?(Class)
-      raise "Spree.user_class MUST be a String or Symbol object, not a Class object."
+      raise 'Spree.user_class MUST be a String or Symbol object, not a Class object.'
     elsif @@user_class.is_a?(String) || @@user_class.is_a?(Symbol)
       @@user_class.to_s.constantize
     end
@@ -55,13 +54,13 @@ module Spree
   #
   # This method is defined within the core gem on purpose.
   # Some people may only wish to use the Core part of Spree.
-  def self.config(&block)
+  def self.config
     yield(Spree::Config)
   end
 
   module Core
-    autoload :ProductFilters, "spree/core/product_filters"
-    autoload :TokenGenerator, "spree/core/token_generator"
+    autoload :ProductFilters, 'spree/core/product_filters'
+    autoload :TokenGenerator, 'spree/core/token_generator'
 
     class GatewayError < RuntimeError; end
     class DestroyWithOrdersError < StandardError; end
@@ -83,7 +82,6 @@ require 'spree/localized_number'
 require 'spree/money'
 require 'spree/permitted_attributes'
 
-require 'spree/core/delegate_belongs_to'
 require 'spree/core/importer'
 require 'spree/core/product_duplicator'
 require 'spree/core/controller_helpers/auth'

data/lib/spree/i18n.rb

@@ -18,7 +18,7 @@ module Spree
       super(*args)
     end
 
-    alias_method :t, :translate
+    alias t translate
 
     def context
       Spree::ViewContext.context
@@ -26,11 +26,9 @@ module Spree
 
     def virtual_path
       if context
-        path = context.instance_variable_get("@virtual_path")
+        path = context.instance_variable_get('@virtual_path')
 
-        if path
-          path.gsub(/spree/, '')
-        end
+        path.gsub(/spree/, '') if path
       end
     end
   end

data/lib/spree/localized_number.rb

@@ -1,6 +1,5 @@
 module Spree
   class LocalizedNumber
-
     # Strips all non-price-like characters from the number, taking into account locale settings.
     def self.parse(number)
       return number unless number.is_a?(String)
@@ -20,6 +19,5 @@ module Spree
 
       number.to_d
     end
-
   end
 end

data/lib/spree/migrations.rb

@@ -4,7 +4,8 @@ module Spree
 
     # Takes the engine config block and engine name
     def initialize(config, engine_name)
-      @config, @engine_name = config, engine_name
+      @config = config
+      @engine_name = engine_name
     end
 
     # Puts warning when any engine migration is not present on the Rails app
@@ -23,7 +24,7 @@ module Spree
     def check
       if File.directory?(app_dir)
         engine_in_app = app_migrations.map do |file_name|
-          name, engine = file_name.split(".", 2)
+          name, engine = file_name.split('.', 2)
           next unless match_engine?(engine)
           name
         end.compact
@@ -44,15 +45,15 @@ module Spree
 
     def engine_migrations
       Dir.entries(engine_dir).map do |file_name|
-        name = file_name.split("_", 2).last.split(".", 2).first
+        name = file_name.split('_', 2).last.split('.', 2).first
         name.empty? ? next : name
       end.compact! || []
     end
 
     def app_migrations
       Dir.entries(app_dir).map do |file_name|
-        next if [".", ".."].include? file_name
-        name = file_name.split("_", 2).last
+        next if ['.', '..'].include? file_name
+        name = file_name.split('_', 2).last
         name.empty? ? next : name
       end.compact! || []
     end
@@ -66,9 +67,9 @@ module Spree
     end
 
     def match_engine?(engine)
-      if engine_name == "spree"
+      if engine_name == 'spree'
         # Avoid stores upgrading from 1.3 getting wrong warnings
-        ["spree.rb", "spree_promo.rb"].include? engine
+        ['spree.rb', 'spree_promo.rb'].include? engine
       else
         engine == "#{engine_name}.rb"
       end