solidus_core 2.4.2 → 2.5.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fedc5c2cdf1cb1e25f80a181af360d2250eb273c
-  data.tar.gz: 75df629b91496ec4e8d94f3624835237d7b0814a
+SHA256:
+  metadata.gz: 87afc5077e860c226c85bb1b65fef534eea82174295c6650225ec4d06b5d03ba
+  data.tar.gz: d13a7557dd557f3d285ef7734de1a427b7c256d9433f2752bcf69e8c9dae6e17
 SHA512:
-  metadata.gz: 96482c5df0535d60f3daaddba9efe951675e02c7ca38c7bbe3412c903b7020a5655eeafaa509d45af212c04c17161f26a759ab7ba587695929601c0f8f0f710c
-  data.tar.gz: f23eec90d1da8eb97d4ffe8efd47be92ca48de63b7821282c0f96dd8146626283a9646a504cbd2961b97d4da3fab86cdc5990a759d91c4c3273cd515819896ef
+  metadata.gz: 9fd697a0d3056759267af069b85c21e6c4d480858dbf29b8db4a3c61ebec6568e037c5b75901ca5f64a52eb74d8d3b64d93e444a4f50bde1bf58c6652d003b57
+  data.tar.gz: a874cdab7c718290bc92e7add51f3df2f13208888c8399b0d07ad4b5fd13e6fc6acc501839cf9ac53c543e9fc676e670577b38f37463d3e2c0b875cd9a460265

data/README.md

@@ -62,10 +62,6 @@ Developer Notes
 ---------------
 ## Testing
 
-Create the test site
-
-    bundle exec rake test_app
-
 Run the tests
 
-    bundle exec rake spec
+    bundle exec rspec

data/Rakefile

@@ -2,14 +2,31 @@ require 'rubygems'
 require 'rake'
 require 'rake/testtask'
 require 'rspec/core/rake_task'
-require 'spree/testing_support/common_rake'
+require 'spree/testing_support/dummy_app/rake_tasks'
 
 RSpec::Core::RakeTask.new
-
 task default: :spec
 
-desc "Generates a dummy app for testing"
-task :test_app do
-  ENV['LIB_NAME'] = 'spree/core'
-  Rake::Task['common:test_app'].invoke
+DummyApp::RakeTasks.new(
+  gem_root: File.dirname(__FILE__),
+  lib_name: 'solidus_core'
+)
+
+namespace :spec do
+  task :isolated do
+    spec_files = Dir['spec/**/*_spec.rb']
+    failed_specs =
+      spec_files.reject do |file|
+        puts "rspec #{file}"
+        system('rspec', file)
+      end
+
+    if !failed_specs.empty?
+      puts "Failed specs:"
+      puts failed_specs
+      exit 1
+    end
+  end
 end
+
+task test_app: 'db:reset'

data/app/helpers/spree/base_helper.rb

@@ -1,11 +1,13 @@
+require 'carmen'
+
 module Spree
   module BaseHelper
     def link_to_cart(text = nil)
-      text = text ? h(text) : Spree.t(:cart)
+      text = text ? h(text) : t('spree.cart')
       css_class = nil
 
       if current_order.nil? || current_order.item_count.zero?
-        text = "#{text}: (#{Spree.t(:empty)})"
+        text = "#{text}: (#{t('spree.empty')})"
         css_class = 'empty'
       else
         text = "#{text}: (#{current_order.item_count})  <span class='amount'>#{current_order.display_total.to_html}</span>"
@@ -69,14 +71,12 @@ module Spree
     def taxon_breadcrumbs(taxon, separator = '&nbsp;&raquo;&nbsp;', breadcrumb_class = 'inline')
       return '' if current_page?('/') || taxon.nil?
 
-      crumbs = [[Spree.t(:home), spree.root_path]]
+      crumbs = [[t('spree.home'), spree.root_path]]
 
+      crumbs << [t('spree.products'), products_path]
       if taxon
-        crumbs << [Spree.t(:products), products_path]
         crumbs += taxon.ancestors.collect { |a| [a.name, spree.nested_taxons_path(a.permalink)] } unless taxon.ancestors.empty?
         crumbs << [taxon.name, spree.nested_taxons_path(taxon.permalink)]
-      else
-        crumbs << [Spree.t(:products), products_path]
       end
 
       separator = raw(separator)
@@ -115,8 +115,14 @@ module Spree
         countries = Country.all
       end
 
+      country_names = Carmen::Country.all.map do |country|
+        [country.code, country.name]
+      end.to_h
+
+      country_names.update I18n.t('spree.country_names', default: {}).stringify_keys
+
       countries.collect do |country|
-        country.name = Spree.t(country.iso, scope: 'country_names', default: country.name)
+        country.name = country_names.fetch(country.iso, country.name)
         country
       end.sort_by { |c| c.name.parameterize }
     end
@@ -129,9 +135,8 @@ module Spree
       product_or_variant.price_for(current_pricing_options).to_html
     end
 
-    def pretty_time(time)
-      [I18n.l(time.to_date, format: :long),
-       time.strftime("%l:%M %p")].join(" ")
+    def pretty_time(time, format = :long)
+      I18n.l(time, format: :"solidus.#{format}")
     end
 
     def link_to_tracking(shipment, options = {})

data/app/helpers/spree/checkout_helper.rb

@@ -7,7 +7,7 @@ module Spree
     def checkout_progress
       states = checkout_states
       items = states.map do |state|
-        text = Spree.t("order_state.#{state}").titleize
+        text = I18n.t("spree.order_state.#{state}").titleize
 
         css_classes = []
         current_index = states.index(@order.state)

data/app/helpers/spree/products_helper.rb

@@ -23,7 +23,7 @@ module Spree
       difference = variant.price_difference_from_master(current_pricing_options)
       absolute_amount = Spree::Money.new(difference.to_d.abs, currency: difference.currency.iso_code)
       i18n_key = difference.to_d > 0 ? :price_diff_add_html : :price_diff_subtract_html
-      Spree.t(i18n_key, scope: [:helpers, :products], amount_html: absolute_amount.to_html)
+      t(i18n_key, scope: [:spree, :helpers, :products], amount_html: absolute_amount.to_html)
     end
 
     # Returns the formatted full price for the variant, if at least one variant
@@ -58,7 +58,7 @@ module Spree
       if description_text.present?
         truncate(strip_tags(description_text.gsub(' ', ' ')), length: 100)
       else
-        Spree.t(:product_has_no_description)
+        t('spree.product_has_no_description')
       end
     end
 

data/app/mailers/spree/carton_mailer.rb

@@ -19,8 +19,8 @@ module Spree
       @manifest = @carton.manifest_for_order(@order)
       options = { resend: false }.merge(options)
       @store = @order.store
-      subject = (options[:resend] ? "[#{Spree.t(:resend).upcase}] " : '')
-      subject += "#{@store.name} #{Spree.t('shipment_mailer.shipped_email.subject')} ##{@order.number}"
+      subject = (options[:resend] ? "[#{t('spree.resend').upcase}] " : '')
+      subject += "#{@store.name} #{t('spree.shipment_mailer.shipped_email.subject')} ##{@order.number}"
       mail(to: @order.email, from: from_address(@store), subject: subject)
     end
   end

data/app/mailers/spree/order_mailer.rb

@@ -3,7 +3,7 @@ module Spree
     def confirm_email(order, resend = false)
       @order = order
       @store = @order.store
-      subject = build_subject(Spree.t('order_mailer.confirm_email.subject'), resend)
+      subject = build_subject(t('.subject'), resend)
 
       mail(to: @order.email, from: from_address(@store), subject: subject)
     end
@@ -11,7 +11,7 @@ module Spree
     def cancel_email(order, resend = false)
       @order = order
       @store = @order.store
-      subject = build_subject(Spree.t('order_mailer.cancel_email.subject'), resend)
+      subject = build_subject(t('.subject'), resend)
 
       mail(to: @order.email, from: from_address(@store), subject: subject)
     end
@@ -19,7 +19,7 @@ module Spree
     def inventory_cancellation_email(order, inventory_units, resend = false)
       @order, @inventory_units = order, inventory_units
       @store = @order.store
-      subject = build_subject(Spree.t('order_mailer.inventory_cancellation.subject'), resend)
+      subject = build_subject(t('spree.order_mailer.inventory_cancellation.subject'), resend)
 
       mail(to: @order.email, from: from_address(@store), subject: subject)
     end
@@ -27,7 +27,7 @@ module Spree
     private
 
     def build_subject(subject_text, resend)
-      resend_text = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
+      resend_text = (resend ? "[#{t('spree.resend').upcase}] " : '')
       "#{resend_text}#{@order.store.name} #{subject_text} ##{@order.number}"
     end
   end

data/app/mailers/spree/reimbursement_mailer.rb

@@ -3,8 +3,8 @@ module Spree
     def reimbursement_email(reimbursement, resend = false)
       @reimbursement = reimbursement.respond_to?(:id) ? reimbursement : Spree::Reimbursement.find(reimbursement)
       store = @reimbursement.order.store
-      subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
-      subject += "#{store.name} #{Spree.t('reimbursement_mailer.reimbursement_email.subject')} ##{@reimbursement.order.number}"
+      subject = (resend ? "[#{t('spree.resend').upcase}] " : '')
+      subject += "#{store.name} #{t('.subject')} ##{@reimbursement.order.number}"
       mail(to: @reimbursement.order.email, from: from_address(store), subject: subject)
     end
   end

data/app/mailers/spree/test_mailer.rb

@@ -2,7 +2,7 @@ module Spree
   class TestMailer < BaseMailer
     def test_email(email)
       store = Spree::Store.default
-      subject = "#{store.name} #{Spree.t('test_mailer.test_email.subject')}"
+      subject = "#{store.name} #{t('.subject')}"
       mail(to: email, from: from_address(store), subject: subject)
     end
   end

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

@@ -1,19 +1,25 @@
 module Spree
   module AdjustmentSource
     def deals_with_adjustments_for_deleted_source
-      adjustment_scope = adjustments.joins(:order)
+      Spree::Deprecation.warn "AdjustmentSource#deals_with_adjustments_for_deleted_source is deprecated. Please use AdjustmentSource#remove_adjustments_from_incomplete_orders instead."
 
-      # For incomplete orders, remove the adjustment completely.
-      adjustment_scope.where(spree_orders: { completed_at: nil }).destroy_all
+      remove_adjustments_from_incomplete_orders
 
-      # For complete orders, the source will be invalid.
-      # Therefore we nullify the source_id, leaving the adjustment in place.
-      # This would mean that the order's total is not altered at all.
-      attrs = {
-        source_id: nil,
-        updated_at: Time.current
-      }
-      adjustment_scope.where.not(spree_orders: { completed_at: nil }).update_all(attrs)
+      # The following is deprecated. As source_type without a source_id isn't
+      # much better than a source_id that doesn't exist.  In Solidus itself the
+      # relevant classes use `acts_as_paranoid` so it is useful to keep the
+      # source_id around.
+      adjustments.
+        joins(:order).
+        merge(Spree::Order.complete).
+        update_all(source_id: nil, updated_at: Time.current)
+    end
+
+    def remove_adjustments_from_incomplete_orders
+      adjustments.
+        joins(:order).
+        merge(Spree::Order.incomplete).
+        destroy_all
     end
   end
 end

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

@@ -22,7 +22,7 @@ module Spree
       end
 
       def spree_calculators
-        Rails.application.config.spree.calculators
+        Spree::Config.environment.calculators
       end
     end
 
@@ -32,7 +32,7 @@ module Spree
 
     def calculator_type=(calculator_type)
       klass = calculator_type.constantize if calculator_type
-      self.calculator = klass.new if klass && !calculator.is_a?(klass)
+      self.calculator = klass.new if klass && !calculator.instance_of?(klass)
     end
   end
 end

data/app/models/spree/ability.rb

@@ -56,7 +56,7 @@ module Spree
     end
 
     def activate_permission_sets
-      Spree::RoleConfiguration.instance.activate_permissions! self, user
+      Spree::Config.roles.activate_permissions! self, user
     end
   end
 end

data/app/models/spree/address.rb

@@ -14,6 +14,7 @@ module Spree
     validates :phone, presence: true, if: :require_phone?
 
     validate :state_validate
+    validate :validate_state_matches_country
 
     alias_attribute :first_name, :firstname
     alias_attribute :last_name, :lastname
@@ -209,5 +210,11 @@ module Spree
       # ensure at least one state field is populated
       errors.add :state, :blank if state.blank? && state_name.blank?
     end
+
+    def validate_state_matches_country
+      if state && state.country != country
+        errors.add(:state, :does_not_match_country)
+      end
+    end
   end
 end

data/app/models/spree/adjustment.rb

@@ -101,8 +101,12 @@ module Spree
         return amount
       end
 
-      # If the adjustment has no source, do not attempt to re-calculate the amount.
-      # Chances are likely that this was a manually created adjustment in the admin backend.
+      # If the adjustment has no source, do not attempt to re-calculate the
+      # amount.
+      # Some scenarios where this happens:
+      #   - Adjustments that are manually created via the admin backend
+      #   - PromotionAction adjustments where the PromotionAction was deleted
+      #     after the order was completed.
       if source.present?
         self.amount = source.compute_amount(adjustable)
 

data/app/models/spree/calculator.rb

@@ -29,7 +29,7 @@ module Spree
     def self.calculators
       Spree::Deprecation.warn("Calling .calculators is deprecated. Please access through Rails.application.config.spree.calculators")
 
-      Rails.application.config.spree.calculators
+      Spree::Config.environment.calculators
     end
 
     def to_s

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

@@ -8,6 +8,7 @@ module Spree
     preference :currency,        :string,  default: ->{ Spree::Config[:currency] }
 
     def self.available?(_object)
+      Spree::Deprecation.warn('Spree::Calculator::FlexiRate::available is DEPRECATED. Use the instance method instead.')
       true
     end
 

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

@@ -1,3 +1,5 @@
+require_dependency 'spree/calculator'
+
 module Spree
   # @deprecated This calculator will be removed in future versions of Spree.
   #   The only case where it was used was for Free Shipping Promotions.  There is

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

@@ -1,11 +1,11 @@
+require_dependency 'spree/calculator'
+
 module Spree
-  class Calculator
-    class PercentOnLineItem < Calculator
-      preference :percent, :decimal, default: 0
+  class Calculator::PercentOnLineItem < Calculator
+    preference :percent, :decimal, default: 0
 
-      def compute(object)
-        (object.amount * preferred_percent) / 100
-      end
+    def compute(object)
+      (object.amount * preferred_percent) / 100
     end
   end
 end

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

@@ -1,3 +1,5 @@
+require_dependency 'spree/calculator'
+
 module Spree
   # A calculator for promotions that calculates a percent-off discount
   # for all matching products in an order. This should not be used as a

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

@@ -1,9 +1,9 @@
+require_dependency 'spree/calculator'
 require_dependency 'spree/returns_calculator'
 
 module Spree
   module Calculator::Returns
     class DefaultRefundAmount < ReturnsCalculator
-
       def compute(return_item)
         return 0.0.to_d if return_item.part_of_exchange?
         weighted_order_adjustment_amount(return_item.inventory_unit) + weighted_line_item_amount(return_item.inventory_unit)
@@ -16,7 +16,7 @@ module Spree
       end
 
       def weighted_line_item_amount(inventory_unit)
-        inventory_unit.line_item.total_before_tax * percentage_of_line_item(inventory_unit)
+        inventory_unit.line_item.total_before_tax / quantity_of_line_item(inventory_unit)
       end
 
       def percentage_of_order_total(inventory_unit)
@@ -24,8 +24,8 @@ module Spree
         weighted_line_item_amount(inventory_unit) / inventory_unit.order.item_total_before_tax
       end
 
-      def percentage_of_line_item(inventory_unit)
-        1 / BigDecimal(inventory_unit.line_item.quantity)
+      def quantity_of_line_item(inventory_unit)
+        BigDecimal(inventory_unit.line_item.quantity)
       end
     end
   end

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

@@ -1,3 +1,4 @@
+require_dependency 'spree/calculator'
 require_dependency 'spree/shipping_calculator'
 
 module Spree

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

@@ -1,3 +1,4 @@
+require_dependency 'spree/calculator'
 require_dependency 'spree/shipping_calculator'
 
 module Spree

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

@@ -1,3 +1,4 @@
+require_dependency 'spree/calculator'
 require_dependency 'spree/shipping_calculator'
 
 module Spree

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

@@ -1,3 +1,4 @@
+require_dependency 'spree/calculator'
 require_dependency 'spree/shipping_calculator'
 
 module Spree

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

@@ -1,3 +1,4 @@
+require_dependency 'spree/calculator'
 require_dependency 'spree/shipping_calculator'
 
 module Spree

data/app/models/spree/classification.rb

@@ -2,7 +2,7 @@ module Spree
   class Classification < Spree::Base
     self.table_name = 'spree_products_taxons'
     acts_as_list scope: :taxon
-    belongs_to :product, class_name: "Spree::Product", inverse_of: :classifications
+    belongs_to :product, class_name: "Spree::Product", inverse_of: :classifications, touch: true
     belongs_to :taxon, class_name: "Spree::Taxon", inverse_of: :classifications, touch: true
 
     # For https://github.com/spree/spree/issues/3494