solidus_core 2.5.2 → 2.6.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1304e77d4149435f0abd255a49ce95760772c1d3b3a0a1145126816cee9104b7
-  data.tar.gz: 98964289a3bcb72e4a65d0b5e21cbed913e6be1ce47e0a39887244c82de78caf
+  metadata.gz: a99babd2f7ba0ce9cc0ae8f6f21bba430105cc6eb289116d7852e98b57c28e5b
+  data.tar.gz: 504c47416432e84d0daf84db72534da81d487765ea45e62cb614862dda1d6700
 SHA512:
-  metadata.gz: 1823f5f998ceadf734ff6be2c878626ba9d1f7933993e16e4e68db0e76521b54a203685371b7428de3350a2afada92fba083ef4015af1dbc00abd56fcfe54df3
-  data.tar.gz: 4015d521eacefc53bdae6c3aa4c97d89f1d13dba6815288ca00d0daeeafac694a46fbbd383e6a394c42e9336ff74db03001a8f58c9427f242ee8b829d2cd0321
+  metadata.gz: 1ce7aba812f60e019bebec6e4b778ffa5f98663958a4a5dffb6a6bc713b9e845ae79d28732988809cdc0a252ca5d21ae0e57a7a28f67bd7ae2f2278aab0b5453
+  data.tar.gz: f61e2fc9a474c34571147d4059c3ebc7407ebe9c9c875823e385aa7dce4fee52a798a615e9ea79c5b1b60e24410b985ff1d17f6d4c6245f2549b6dd033fa0ed8

data/.yardopts

@@ -0,0 +1 @@
+--no-private

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rubygems'
 require 'rake'
 require 'rake/testtask'
@@ -12,6 +14,9 @@ DummyApp::RakeTasks.new(
   lib_name: 'solidus_core'
 )
 
+require 'yard'
+YARD::Rake::YardocTask.new
+
 namespace :spec do
   task :isolated do
     spec_files = Dir['spec/**/*_spec.rb']

data/app/controllers/spree/base_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cancan'
 require_dependency 'spree/core/controller_helpers/strong_parameters'
 

data/app/helpers/spree/base_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'carmen'
 
 module Spree
@@ -18,8 +20,8 @@ module Spree
     end
 
     # human readable list of variant options
-    def variant_options(v, _options = {})
-      v.options_text
+    def variant_options(variant, _options = {})
+      variant.options_text
     end
 
     def meta_data
@@ -35,10 +37,12 @@ module Spree
         meta[:description] = truncate(strip_tags(object.description), length: 160, separator: ' ')
       end
 
-      meta.reverse_merge!({
-        keywords: current_store.meta_keywords,
-        description: current_store.meta_description
-      }) if meta[:keywords].blank? || meta[:description].blank?
+      if meta[:keywords].blank? || meta[:description].blank?
+        meta.reverse_merge!({
+          keywords: current_store.meta_keywords,
+          description: current_store.meta_description
+        })
+      end
       meta
     end
 
@@ -106,8 +110,8 @@ module Spree
       end
     end
 
-    def available_countries
-      checkout_zone = Zone.find_by(name: Spree::Config[:checkout_zone])
+    def available_countries(restrict_to_zone: Spree::Config[:checkout_zone])
+      checkout_zone = Zone.find_by(name: restrict_to_zone)
 
       if checkout_zone && checkout_zone.kind == 'country'
         countries = checkout_zone.country_list

data/app/helpers/spree/checkout_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module CheckoutHelper
     def checkout_states

data/app/helpers/spree/products_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module ProductsHelper
     # Returns the formatted price for the specified variant as a full price or

data/app/helpers/spree/store_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   # Methods added to this helper will be available to all templates in the
   # frontend.

data/app/helpers/spree/taxons_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module TaxonsHelper
     # Retrieves the collection of products to display when "previewing" a taxon.  This is abstracted into a helper so

data/app/jobs/spree/promotion_code_batch_job.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   class PromotionCodeBatchJob < ActiveJob::Base
     queue_as :default
@@ -12,7 +14,7 @@ module Spree
           .promotion_code_batch_finished(promotion_code_batch)
           .deliver_now
       end
-    rescue => e
+    rescue StandardError => e
       if promotion_code_batch.email?
         Spree::PromotionCodeBatchMailer
           .promotion_code_batch_errored(promotion_code_batch)

data/app/mailers/spree/base_mailer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   class BaseMailer < ActionMailer::Base
     def from_address(store)

data/app/mailers/spree/carton_mailer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   class CartonMailer < BaseMailer
     # Send an email to customers to notify that an individual carton has been
@@ -13,7 +15,7 @@ module Spree
     # Note: The signature of this method has changed. The new (non-deprecated)
     # signature is:
     #   def shipped_email(carton:, order:, resend: false)
-    def shipped_email(options, deprecated_options = {})
+    def shipped_email(options, _deprecated_options = {})
       @order = options.fetch(:order)
       @carton = options.fetch(:carton)
       @manifest = @carton.manifest_for_order(@order)

data/app/mailers/spree/order_mailer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   class OrderMailer < BaseMailer
     def confirm_email(order, resend = false)

data/app/mailers/spree/promotion_code_batch_mailer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   class PromotionCodeBatchMailer < Spree::BaseMailer
     def promotion_code_batch_finished(promotion_code_batch)

data/app/mailers/spree/reimbursement_mailer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   class ReimbursementMailer < BaseMailer
     def reimbursement_email(reimbursement, resend = false)

data/app/mailers/spree/test_mailer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   class TestMailer < BaseMailer
     def test_email(email)

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module AdjustmentSource
     def deals_with_adjustments_for_deleted_source

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module CalculatedAdjustments
     extend ActiveSupport::Concern

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module DefaultPrice
     extend ActiveSupport::Concern

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module DisplayMoney
     ##

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module NamedType
     extend ActiveSupport::Concern

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module OrderedPropertyValueList
     extend ActiveSupport::Concern

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree::RansackableAttributes
   extend ActiveSupport::Concern
   included do

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module UserAddressBook
     extend ActiveSupport::Concern

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module UserApiAuthentication
     def generate_spree_api_key!

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module UserMethods
     extend ActiveSupport::Concern

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module UserPaymentSource
     extend ActiveSupport::Concern

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module UserReporting
     extend DisplayMoney

data/app/models/spree/ability.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Implementation class for Cancan gem.  Instead of overriding this class, consider adding new permissions
 # using the special +register_ability+ method which allows extensions to add their own abilities.
 #

data/app/models/spree/address.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   # `Spree::Address` provides the foundational ActiveRecord model for recording and
   # validating address information for `Spree::Order`, `Spree::Shipment`,

data/app/models/spree/adjustment.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   # Adjustments represent a change to the +item_total+ of an Order. Each
   # adjustment has an +amount+ that can be either positive or negative.

data/app/models/spree/adjustment_reason.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   class AdjustmentReason < Spree::Base
     has_many :adjustments, inverse_of: :adjustment_reason

data/app/models/spree/asset.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   class Asset < Spree::Base
     belongs_to :viewable, polymorphic: true, touch: true

data/app/models/spree/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Spree::Base < ActiveRecord::Base
   include Spree::Preferences::Preferable
   serialize :preferences, Hash

data/app/models/spree/billing_integration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   class BillingIntegration < PaymentMethod
     validates :name, presence: true

data/app/models/spree/calculator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   class Calculator < Spree::Base
     belongs_to :calculable, polymorphic: true

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency 'spree/calculator'
 
 module Spree

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency 'spree/calculator'
 
 # This is a calculator for line item adjustment actions. It accepts a line item
@@ -11,13 +13,20 @@ module Spree
     preference :currency, :string, default: -> { Spree::Config[:currency] }
 
     def compute_line_item(line_item)
-      if line_item && preferred_currency.casecmp(line_item.currency).zero?
-        Spree::DistributedAmountsHandler.new(
-          line_item,
-          preferred_amount
-        ).amount
-      else
-        0
+      return 0 unless line_item
+      return 0 unless preferred_currency.casecmp(line_item.currency).zero?
+      return 0 unless calculable.promotion.line_item_actionable?(line_item.order, line_item)
+      Spree::DistributedAmountsHandler.new(
+        actionable_line_items(line_item.order),
+        preferred_amount
+      ).amount(line_item)
+    end
+
+    private
+
+    def actionable_line_items(order)
+      order.line_items.select do |line_item|
+        calculable.promotion.line_item_actionable?(order, line_item)
       end
     end
   end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency 'spree/calculator'
 
 module Spree

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency 'spree/calculator'
 
 module Spree

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency 'spree/calculator'
 
 module Spree

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency 'spree/calculator'
 
 module Spree

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency 'spree/calculator'
 
 module Spree

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency 'spree/calculator'
 
 module Spree

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency 'spree/calculator'
 
 module Spree

data/app/models/spree/calculator/returns/default_refund_amount.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency 'spree/calculator'
 require_dependency 'spree/returns_calculator'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency 'spree/calculator'
 require_dependency 'spree/shipping_calculator'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency 'spree/calculator'
 require_dependency 'spree/shipping_calculator'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency 'spree/calculator'
 require_dependency 'spree/shipping_calculator'