spree_core 3.3.6 → 3.4.0.rc1

data/app/models/spree/calculator/price_sack.rb

@@ -5,7 +5,7 @@ module Spree
     preference :minimal_amount, :decimal, default: 0
     preference :normal_amount, :decimal, default: 0
     preference :discount_amount, :decimal, default: 0
-    preference :currency, :string, default: ->{ Spree::Config[:currency] }
+    preference :currency, :string, default: -> { Spree::Config[:currency] }
 
     def self.description
       Spree.t(:price_sack)
@@ -13,16 +13,16 @@ module Spree
 
     # as object we always get line items, as calculable we have Coupon, ShippingMethod
     def compute(object)
-      if object.is_a?(Array)
-        base = object.map { |o| o.respond_to?(:amount) ? o.amount : BigDecimal(o.to_s) }.sum
-      else
-        base = object.respond_to?(:amount) ? object.amount : BigDecimal(object.to_s)
-      end
+      base = if object.is_a?(Array)
+               object.map { |o| o.respond_to?(:amount) ? o.amount : BigDecimal(o.to_s) }.sum
+             else
+               object.respond_to?(:amount) ? object.amount : BigDecimal(object.to_s)
+             end
 
-      if base < self.preferred_minimal_amount
-        self.preferred_normal_amount
+      if base < preferred_minimal_amount
+        preferred_normal_amount
       else
-        self.preferred_discount_amount
+        preferred_discount_amount
       end
     end
   end

data/app/models/spree/calculator/shipping/flat_percent_item_total.rb

@@ -14,7 +14,7 @@ module Spree
       end
 
       def compute_from_price(price)
-        value = price * BigDecimal(self.preferred_flat_percent.to_s) / 100.0
+        value = price * BigDecimal(preferred_flat_percent.to_s) / 100.0
         (value * 100).round.to_f / 100
       end
     end

data/app/models/spree/calculator/shipping/flat_rate.rb

@@ -4,14 +4,14 @@ module Spree
   module Calculator::Shipping
     class FlatRate < ShippingCalculator
       preference :amount, :decimal, default: 0
-      preference :currency, :string, default: ->{ Spree::Config[:currency] }
+      preference :currency, :string, default: -> { Spree::Config[:currency] }
 
       def self.description
         Spree.t(:shipping_flat_rate_per_order)
       end
 
-      def compute_package(package)
-        self.preferred_amount
+      def compute_package(_package)
+        preferred_amount
       end
     end
   end

data/app/models/spree/calculator/shipping/flexi_rate.rb

@@ -6,7 +6,7 @@ module Spree
       preference :first_item,      :decimal, default: 0.0
       preference :additional_item, :decimal, default: 0.0
       preference :max_items,       :integer, default: 0
-      preference :currency,        :string,  default: ->{ Spree::Config[:currency] }
+      preference :currency,        :string,  default: -> { Spree::Config[:currency] }
 
       def self.description
         Spree.t(:shipping_flexible_rate)
@@ -18,14 +18,14 @@ module Spree
 
       def compute_from_quantity(quantity)
         sum = 0
-        max = self.preferred_max_items.to_i
+        max = preferred_max_items.to_i
         quantity.times do |i|
           # check max value to avoid divide by 0 errors
-          if (max == 0 && i == 0) || (max > 0) && (i % max == 0)
-            sum += self.preferred_first_item.to_f
-          else
-            sum += self.preferred_additional_item.to_f
-          end
+          sum += if (max == 0 && i == 0) || (max > 0) && (i % max == 0)
+                   preferred_first_item.to_f
+                 else
+                   preferred_additional_item.to_f
+                 end
         end
 
         sum

data/app/models/spree/calculator/shipping/per_item.rb

@@ -4,7 +4,7 @@ module Spree
   module Calculator::Shipping
     class PerItem < ShippingCalculator
       preference :amount, :decimal, default: 0
-      preference :currency, :string, default: ->{ Spree::Config[:currency] }
+      preference :currency, :string, default: -> { Spree::Config[:currency] }
 
       def self.description
         Spree.t(:shipping_flat_rate_per_item)
@@ -15,7 +15,7 @@ module Spree
       end
 
       def compute_from_quantity(quantity)
-        self.preferred_amount * quantity
+        preferred_amount * quantity
       end
     end
   end

data/app/models/spree/calculator/shipping/price_sack.rb

@@ -6,7 +6,7 @@ module Spree
       preference :minimal_amount, :decimal, default: 0
       preference :normal_amount, :decimal, default: 0
       preference :discount_amount, :decimal, default: 0
-      preference :currency, :string, default: ->{ Spree::Config[:currency] }
+      preference :currency, :string, default: -> { Spree::Config[:currency] }
 
       def self.description
         Spree.t(:shipping_price_sack)
@@ -17,10 +17,10 @@ module Spree
       end
 
       def compute_from_price(price)
-        if price < self.preferred_minimal_amount
-          self.preferred_normal_amount
+        if price < preferred_minimal_amount
+          preferred_normal_amount
         else
-          self.preferred_discount_amount
+          preferred_discount_amount
         end
       end
     end

data/app/models/spree/calculator/tiered_flat_rate.rb

@@ -19,14 +19,15 @@ module Spree
     end
 
     def compute(object)
-      base, amount = preferred_tiers.sort.reverse.detect{ |b,_| object.amount >= b }
+      base, amount = preferred_tiers.sort.reverse.detect { |b, _| object.amount >= b }
       amount || preferred_base_amount
     end
 
     private
+
     def preferred_tiers_content
       if preferred_tiers.is_a? Hash
-        unless preferred_tiers.keys.all?{ |k| k.is_a?(Numeric) && k > 0 }
+        unless preferred_tiers.keys.all? { |k| k.is_a?(Numeric) && k > 0 }
           errors.add(:base, :keys_should_be_positive_number)
         end
       else

data/app/models/spree/calculator/tiered_percent.rb

@@ -23,17 +23,18 @@ module Spree
     end
 
     def compute(object)
-      base, percent = preferred_tiers.sort.reverse.detect{ |b,_| object.amount >= b }
+      base, percent = preferred_tiers.sort.reverse.detect { |b, _| object.amount >= b }
       (object.amount * (percent || preferred_base_percent) / 100).round(2)
     end
 
     private
+
     def preferred_tiers_content
       if preferred_tiers.is_a? Hash
-        unless preferred_tiers.keys.all?{ |k| k.is_a?(Numeric) && k > 0 }
+        unless preferred_tiers.keys.all? { |k| k.is_a?(Numeric) && k > 0 }
           errors.add(:base, :keys_should_be_positive_number)
         end
-        unless preferred_tiers.values.all?{ |k| k.is_a?(Numeric) && k >= 0 && k <= 100 }
+        unless preferred_tiers.values.all? { |k| k.is_a?(Numeric) && k >= 0 && k <= 100 }
           errors.add(:base, :values_should_be_percent)
         end
       else

data/app/models/spree/calculator.rb

@@ -1,7 +1,7 @@
 module Spree
   class Calculator < Spree::Base
     # Conditional check for backwards compatibilty since acts as paranoid was added late https://github.com/spree/spree/issues/5858
-    if connection.data_source_exists?(:spree_calculators) && connection.column_exists?(:spree_calculators, :deleted_at)
+    if ActiveRecord::Base.connected? && connection.data_source_exists?(:spree_calculators) && connection.column_exists?(:spree_calculators, :deleted_at)
       acts_as_paranoid
     end
 
@@ -16,7 +16,7 @@ module Spree
       method = "compute_#{computable_name}".to_sym
       calculator_class = self.class
       if respond_to?(method)
-        self.send(method, computable)
+        send(method, computable)
       else
         raise NotImplementedError, "Please implement '#{method}(#{computable_name})' in your calculator: #{calculator_class.name}"
       end
@@ -33,14 +33,14 @@ module Spree
     end
 
     def to_s
-      self.class.name.titleize.gsub("Calculator\/", "")
+      self.class.name.titleize.gsub("Calculator\/", '')
     end
 
     def description
       self.class.description
     end
 
-    def available?(object)
+    def available?(_object)
       true
     end
   end

data/app/models/spree/classification.rb

@@ -4,8 +4,8 @@ module Spree
     acts_as_list scope: :taxon
 
     with_options inverse_of: :classifications, touch: true do
-      belongs_to :product, class_name: "Spree::Product"
-      belongs_to :taxon, class_name: "Spree::Taxon"
+      belongs_to :product, class_name: 'Spree::Product'
+      belongs_to :taxon, class_name: 'Spree::Taxon'
     end
 
     validates :taxon, :product, presence: true

data/app/models/spree/credit_card.rb

@@ -154,7 +154,7 @@ module Spree
         year: year,
         verification_value: verification_value,
         first_name: first_name,
-        last_name: last_name,
+        last_name: last_name
       )
     end
 

data/app/models/spree/exchange.rb

@@ -10,11 +10,11 @@ module Spree
     def description
       @reimbursement_objects.map do |reimbursement_object|
         "#{reimbursement_object.variant.options_text} => #{reimbursement_object.exchange_variant.options_text}"
-      end.join(" | ")
+      end.join(' | ')
     end
 
     def display_amount
-      Spree::Money.new @reimbursement_objects.map(&:total).sum
+      Spree::Money.new @reimbursement_objects.sum(&:total)
     end
 
     def perform!
@@ -23,7 +23,7 @@ module Spree
       shipments_units = shipments.flat_map(&:inventory_units)
 
       if shipments_units.sum(&:quantity) != new_exchange_inventory_units.sum(&:quantity)
-        raise UnableToCreateShipments.new("Could not generate shipments for all items. Out of stock?")
+        raise UnableToCreateShipments, 'Could not generate shipments for all items. Out of stock?'
       end
 
       @order.shipments += shipments
@@ -40,12 +40,11 @@ module Spree
     end
 
     def self.param_key
-      "spree_exchange"
+      'spree_exchange'
     end
 
     def self.model_name
       Spree::Exchange
     end
-
   end
 end

data/app/models/spree/gateway/bogus.rb

@@ -1,9 +1,9 @@
 module Spree
   class Gateway::Bogus < Gateway
-    TEST_VISA = ['4111111111111111','4012888888881881','4222222222222']
-    TEST_MC   = ['5500000000000004','5555555555554444','5105105105105100','2223000010309703']
-    TEST_AMEX = ['378282246310005','371449635398431','378734493671000','340000000000009']
-    TEST_DISC = ['6011000000000004','6011111111111117','6011000990139424']
+    TEST_VISA = ['4111111111111111', '4012888888881881', '4222222222222']
+    TEST_MC   = ['5500000000000004', '5555555555554444', '5105105105105100', '2223000010309703']
+    TEST_AMEX = ['378282246310005', '371449635398431', '378734493671000', '340000000000009']
+    TEST_DISC = ['6011000000000004', '6011111111111117', '6011000990139424']
 
     VALID_CCS = ['1', TEST_VISA, TEST_MC, TEST_AMEX, TEST_DISC].flatten
 
@@ -25,38 +25,37 @@ module Spree
       end
     end
 
-    def authorize(money, credit_card, options = {})
+    def authorize(_money, credit_card, _options = {})
       profile_id = credit_card.gateway_customer_profile_id
-      if VALID_CCS.include? credit_card.number or (profile_id and profile_id.starts_with? 'BGS-')
+      if VALID_CCS.include?(credit_card.number) || (profile_id && profile_id.starts_with?('BGS-'))
         ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, test: true, authorization: '12345', avs_result: { code: 'D' })
       else
         ActiveMerchant::Billing::Response.new(false, 'Bogus Gateway: Forced failure', { message: 'Bogus Gateway: Forced failure' }, test: true)
       end
     end
 
-    def purchase(money, credit_card, options = {})
+    def purchase(_money, credit_card, _options = {})
       profile_id = credit_card.gateway_customer_profile_id
-      if VALID_CCS.include? credit_card.number  or (profile_id and profile_id.starts_with? 'BGS-')
+      if VALID_CCS.include?(credit_card.number) || (profile_id && profile_id.starts_with?('BGS-'))
         ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, test: true, authorization: '12345', avs_result: { code: 'M' })
       else
         ActiveMerchant::Billing::Response.new(false, 'Bogus Gateway: Forced failure', message: 'Bogus Gateway: Forced failure', test: true)
       end
     end
 
-    def credit(money, credit_card, response_code, options = {})
+    def credit(_money, _credit_card, _response_code, _options = {})
       ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, test: true, authorization: '12345')
     end
 
-    def capture(money, authorization, gateway_options)
+    def capture(_money, authorization, _gateway_options)
       if authorization == '12345'
         ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, test: true)
       else
         ActiveMerchant::Billing::Response.new(false, 'Bogus Gateway: Forced failure', error: 'Bogus Gateway: Forced failure', test: true)
       end
-
     end
 
-    def void(response_code, credit_card, options = {})
+    def void(_response_code, _credit_card, _options = {})
       ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, test: true, authorization: '12345')
     end
 
@@ -78,14 +77,15 @@ module Spree
     end
 
     private
-      def generate_profile_id(success)
-        record = true
-        prefix = success ? 'BGS' : 'FAIL'
-        while record
-          random = "#{ prefix }-#{ Array.new(6) { rand(6) }.join }"
-          record = CreditCard.find_by(gateway_customer_profile_id: random)
-        end
-        random
+
+    def generate_profile_id(success)
+      record = true
+      prefix = success ? 'BGS' : 'FAIL'
+      while record
+        random = "#{prefix}-#{Array.new(6) { rand(6) }.join}"
+        record = CreditCard.find_by(gateway_customer_profile_id: random)
       end
+      random
+    end
   end
 end

data/app/models/spree/gateway/bogus_simple.rb

@@ -1,12 +1,11 @@
 # Bogus Gateway that doesn't support payment profiles
 module Spree
   class Gateway::BogusSimple < Gateway::Bogus
-
     def payment_profiles_supported?
       false
     end
 
-    def authorize(money, credit_card, options = {})
+    def authorize(_money, credit_card, _options = {})
       if VALID_CCS.include? credit_card.number
         ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, test: true, authorization: '12345', avs_result: { code: 'A' })
       else
@@ -14,13 +13,12 @@ module Spree
       end
     end
 
-    def purchase(money, credit_card, options = {})
+    def purchase(_money, credit_card, _options = {})
       if VALID_CCS.include? credit_card.number
         ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, test: true, authorization: '12345', avs_result: { code: 'A' })
       else
         ActiveMerchant::Billing::Response.new(false, 'Bogus Gateway: Forced failure', message: 'Bogus Gateway: Forced failure', test: true)
       end
     end
-
   end
 end

data/app/models/spree/gateway.rb

@@ -15,7 +15,7 @@ module Spree
 
     def provider
       gateway_options = options
-      gateway_options.delete :login if gateway_options.has_key?(:login) and gateway_options[:login].nil?
+      gateway_options.delete :login if gateway_options.key?(:login) && gateway_options[:login].nil?
       if gateway_options[:server]
         ActiveMerchant::Billing::Base.mode = gateway_options[:server].to_sym
       end
@@ -23,7 +23,7 @@ module Spree
     end
 
     def options
-      self.preferences.inject({}){ |memo, (key, value)| memo[key.to_sym] = value; memo }
+      preferences.each_with_object({}) { |(key, value), memo| memo[key.to_sym] = value; }
     end
 
     def method_missing(method, *args)
@@ -61,7 +61,7 @@ module Spree
     end
 
     def sources_by_order(order)
-      source_ids = order.payments.where(source_type: payment_source_class.to_s, payment_method_id: self.id).pluck(:source_id).uniq
+      source_ids = order.payments.where(source_type: payment_source_class.to_s, payment_method_id: id).pluck(:source_id).uniq
       payment_source_class.where(id: source_ids).with_payment_profile
     end
 
@@ -70,7 +70,7 @@ module Spree
         sources_by_order order
       else
         if order.user_id
-          self.credit_cards.where(user_id: order.user_id).with_payment_profile
+          credit_cards.where(user_id: order.user_id).with_payment_profile
         else
           []
         end

data/app/models/spree/image.rb

@@ -13,14 +13,14 @@ module Spree
                       path: ':rails_root/public/spree/products/:id/:style/:basename.:extension',
                       convert_options: { all: '-strip -auto-orient -colorspace sRGB' }
     validates_attachment :attachment,
-      presence: true,
-      content_type: { content_type: accepted_image_types }
+                         presence: true,
+                         content_type: { content_type: accepted_image_types }
 
     # save the w,h of the original image (from which others can be calculated)
     # we need to look at the write-queue for images which have not been saved yet
     before_save :find_dimensions, if: :attachment_updated_at_changed?
 
-    #used by admin products autocomplete
+    # used by admin products autocomplete
     def mini_url
       attachment.url(:mini, false)
     end

data/app/models/spree/inventory_unit.rb

@@ -1,15 +1,15 @@
 module Spree
   class InventoryUnit < Spree::Base
     with_options inverse_of: :inventory_units do
-      belongs_to :variant, class_name: "Spree::Variant"
-      belongs_to :order, class_name: "Spree::Order"
-      belongs_to :shipment, class_name: "Spree::Shipment", touch: true, optional: true
-      belongs_to :return_authorization, class_name: "Spree::ReturnAuthorization"
-      belongs_to :line_item, class_name: "Spree::LineItem"
+      belongs_to :variant, class_name: 'Spree::Variant'
+      belongs_to :order, class_name: 'Spree::Order'
+      belongs_to :shipment, class_name: 'Spree::Shipment', touch: true, optional: true
+      belongs_to :return_authorization, class_name: 'Spree::ReturnAuthorization'
+      belongs_to :line_item, class_name: 'Spree::LineItem'
     end
 
     has_many :return_items, inverse_of: :inventory_unit
-    belongs_to :original_return_item, class_name: "Spree::ReturnItem"
+    belongs_to :original_return_item, class_name: 'Spree::ReturnItem'
 
     scope :backordered, -> { where state: 'backordered' }
     scope :on_hand, -> { where state: 'on_hand' }
@@ -17,11 +17,11 @@ module Spree
     scope :shipped, -> { where state: 'shipped' }
     scope :returned, -> { where state: 'returned' }
     scope :backordered_per_variant, ->(stock_item) do
-      includes(:shipment, :order)
-        .where.not(spree_shipments: { state: 'canceled' })
-        .where(variant_id: stock_item.variant_id)
-        .where.not(spree_orders: { completed_at: nil })
-        .backordered.order("spree_orders.completed_at ASC")
+      includes(:shipment, :order).
+        where.not(spree_shipments: { state: 'canceled' }).
+        where(variant_id: stock_item.variant_id).
+        where.not(spree_orders: { completed_at: nil }).
+        backordered.order('spree_orders.completed_at ASC')
     end
 
     validates :quantity, numericality: { greater_than: 0 }
@@ -60,7 +60,7 @@ module Spree
 
     def find_stock_item
       Spree::StockItem.where(stock_location_id: shipment.stock_location_id,
-        variant_id: variant_id).first
+                             variant_id: variant_id).first
     end
 
     def self.split(original_inventory_unit, extract_quantity)
@@ -104,11 +104,11 @@ module Spree
     def required_quantity
       return @required_quantity unless @required_quantity.nil?
 
-      if exchanged_unit?
-        @required_quantity = original_return_item.return_quantity
-      else
-        @required_quantity = line_item.quantity
-      end
+      @required_quantity = if exchanged_unit?
+                             original_return_item.return_quantity
+                           else
+                             line_item.quantity
+                           end
     end
 
     def exchanged_unit?
@@ -117,21 +117,21 @@ module Spree
 
     private
 
-      def allow_ship?
-        self.on_hand?
-      end
+    def allow_ship?
+      on_hand?
+    end
 
-      def fulfill_order
-        self.reload
-        order.fulfill!
-      end
+    def fulfill_order
+      reload
+      order.fulfill!
+    end
 
-      def percentage_of_line_item
-        quantity / BigDecimal.new(line_item.quantity)
-      end
+    def percentage_of_line_item
+      quantity / BigDecimal.new(line_item.quantity)
+    end
 
-      def current_return_item
-        return_items.not_cancelled.first
-      end
+    def current_return_item
+      return_items.not_cancelled.first
+    end
   end
 end

data/app/models/spree/line_item.rb

@@ -3,10 +3,10 @@ module Spree
     before_validation :ensure_valid_quantity
 
     with_options inverse_of: :line_items do
-      belongs_to :order, class_name: "Spree::Order", touch: true
-      belongs_to :variant, class_name: "Spree::Variant"
+      belongs_to :order, class_name: 'Spree::Order', touch: true
+      belongs_to :variant, class_name: 'Spree::Variant'
     end
-    belongs_to :tax_category, class_name: "Spree::TaxCategory"
+    belongs_to :tax_category, class_name: 'Spree::TaxCategory'
 
     has_one :product, through: :variant
 
@@ -23,7 +23,7 @@ module Spree
     validates_with Stock::AvailabilityValidator
     validate :ensure_proper_currency, if: -> { order.present? }
 
-    before_destroy :verify_order_inventory, if: -> { order.has_checkout_step?("delivery") }
+    before_destroy :verify_order_inventory, if: -> { order.has_checkout_step?('delivery') }
 
     before_destroy :destroy_inventory_units
 
@@ -54,9 +54,7 @@ module Spree
     end
 
     def copy_tax_category
-      if variant
-        self.tax_category = variant.tax_category
-      end
+      self.tax_category = variant.tax_category if variant
     end
 
     extend DisplayMoney
@@ -76,7 +74,7 @@ module Spree
     end
 
     alias discounted_money display_discounted_amount
-    alias_method :discounted_amount, :taxable_amount
+    alias discounted_amount taxable_amount
 
     def final_amount
       amount + adjustment_total
@@ -127,7 +125,7 @@ module Spree
     end
 
     def update_inventory
-      if (saved_changes? || target_shipment.present?) && order.has_checkout_step?("delivery")
+      if (saved_changes? || target_shipment.present?) && order.has_checkout_step?('delivery')
         verify_order_inventory
       end
     end

data/app/models/spree/option_type.rb

@@ -19,7 +19,7 @@ module Spree
 
     default_scope { order(:position) }
 
-    accepts_nested_attributes_for :option_values, reject_if: lambda { |ov| ov[:name].blank? || ov[:presentation].blank? }, allow_destroy: true
+    accepts_nested_attributes_for :option_values, reject_if: ->(ov) { ov[:name].blank? || ov[:presentation].blank? }, allow_destroy: true
 
     after_touch :touch_all_products
 

data/app/models/spree/order/checkout.rb

@@ -58,7 +58,7 @@ module Spree
 
               event :return do
                 transition to: :returned,
-                           from: [:complete, :awaiting_return, :canceled, :returned, :resumed],
+                           from: [:complete, :awaiting_return, :canceled, :resumed],
                            if: :all_inventory_units_returned?
               end
 
@@ -184,7 +184,7 @@ module Spree
               checkout_steps << step
             end).map(&:to_s)
             # Ensure there is always a complete step
-            steps << "complete" unless steps.include?("complete")
+            steps << 'complete' unless steps.include?('complete')
             steps
           end
 
@@ -226,7 +226,7 @@ module Spree
               if existing_card_id.present?
                 credit_card = CreditCard.find existing_card_id
                 if credit_card.user_id != user_id || credit_card.user_id.blank?
-                  raise Core::GatewayError.new Spree.t(:invalid_credit_card)
+                  raise Core::GatewayError, Spree.t(:invalid_credit_card)
                 end
 
                 credit_card.verification_value = params[:cvc_confirm] if params[:cvc_confirm].present?
@@ -253,7 +253,7 @@ module Spree
               clone_billing
               # Skip setting ship address if order doesn't have a delivery checkout step
               # to avoid triggering validations on shipping address
-              clone_shipping if checkout_steps.include?("delivery")
+              clone_shipping if checkout_steps.include?('delivery')
             end
           end
 
@@ -306,7 +306,7 @@ module Spree
             if @updating_params[:payment_source].present?
               source_params = @updating_params.
                               delete(:payment_source)[@updating_params[:order][:payments_attributes].
-                                                      first[:payment_method_id].to_s]
+                              first[:payment_method_id].to_s]
 
               if source_params
                 @updating_params[:order][:payments_attributes].first[:source_attributes] = source_params