solidus_core 2.9.5 → 2.10.2

data/lib/spree/core/state_machines/shipment.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module Spree
+  module Core
+    class StateMachines
+      # Shipments' state machine
+      #
+      # for each event the following instance methods are dynamically implemented:
+      #   #<event_name>
+      #   #<event_name>!
+      #   #can_<event_name>?
+      #
+      # for each state the following instance methods are implemented:
+      #   #<state_name>?
+      #
+      module Shipment
+        extend ActiveSupport::Concern
+
+        included do
+          state_machine initial: :pending, use_transactions: false do
+            event :ready do
+              transition from: :pending, to: :shipped, if: :can_transition_from_pending_to_shipped?
+              transition from: :pending, to: :ready, if: :can_transition_from_pending_to_ready?
+            end
+
+            event :pend do
+              transition from: :ready, to: :pending
+            end
+
+            event :ship do
+              transition from: [:ready, :canceled], to: :shipped
+            end
+            after_transition to: :shipped, do: :after_ship
+
+            event :cancel do
+              transition to: :canceled, from: [:pending, :ready]
+            end
+            after_transition to: :canceled, do: :after_cancel
+
+            event :resume do
+              transition from: :canceled, to: :ready, if: :can_transition_from_canceled_to_ready?
+              transition from: :canceled, to: :pending
+            end
+            after_transition from: :canceled, to: [:pending, :ready, :shipped], do: :after_resume
+
+            after_transition do |shipment, transition|
+              shipment.state_changes.create!(
+                previous_state: transition.from,
+                next_state:     transition.to,
+                name:           'shipment'
+              )
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/spree/core/stock_configuration.rb

@@ -5,6 +5,7 @@ module Spree
     class StockConfiguration
       attr_writer :coordinator_class
       attr_writer :estimator_class
+      attr_writer :location_filter_class
       attr_writer :location_sorter_class
       attr_writer :allocator_class
 

data/lib/spree/core/validators/email.rb

@@ -15,16 +15,9 @@ module Spree
     EMAIL_REGEXP = /\A([^@\.]|[^@\.]([^@\s]*)[^@\.])@([^@\s]+\.)+[^@\s]+\z/
 
     def validate_each(record, attribute, value)
-      unless value =~ EMAIL_REGEXP
+      unless EMAIL_REGEXP.match? value
         record.errors.add(attribute, :invalid, { value: value }.merge!(options))
       end
     end
   end
 end
-
-# @private
-EmailValidator = ActiveSupport::Deprecation::DeprecatedConstantProxy.new(
-  'EmailValidator',
-  'Spree::EmailValidator',
-  message: "EmailValidator is deprecated! Use Spree::EmailValidator instead.\nChange `validates :email, email: true` to `validates :email, 'spree/email' => true`\n"
-)

data/lib/spree/core/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Spree
-  VERSION = "2.9.5"
+  VERSION = "2.10.2"
 
   def self.solidus_version
     VERSION

data/lib/spree/money.rb

@@ -82,9 +82,9 @@ module Spree
       # Maintain compatibility by checking html option renamed to html_wrap.
       if options[:html] || options[:html] == false
         Spree::Deprecation.warn <<-WARN.squish, caller
-          Spree::Money#to_html called with Spree::Money#to_html(html: #{options[:html]}),
+          Spree::Money#to_html called with Spree::Money#to_html(html: #{options[:html].inspect}),
           which will not be supported in the future.
-          Instead use :html_wrap e.g. Spree::Money#to_html(html_wrap: #{options[:html]})
+          Instead use :html_wrap e.g. Spree::Money#to_html(html_wrap: #{options[:html].inspect})
         WARN
       end
       if options[:html_wrap] || options[:html]

data/lib/spree/permission_sets/default_customer.rb

@@ -8,7 +8,7 @@ module Spree
         can :display, OptionType
         can :display, OptionValue
         can :create, Order
-        can [:read, :update], Order do |order, token|
+        can [:read, :update], Order, Order.where(user: user) do |order, token|
           order.user == user || (order.guest_token.present? && token == order.guest_token)
         end
         cannot :update, Order do |order|

data/lib/spree/permission_sets/user_management.rb

@@ -11,6 +11,9 @@ module Spree
         can :update_email, Spree.user_class do |user|
           user.spree_roles.none?
         end
+        can :update_password, Spree.user_class do |user|
+          user.spree_roles.none?
+        end
 
         cannot [:delete, :destroy], Spree.user_class
         can :manage, Spree::StoreCredit

data/lib/spree/permitted_attributes.rb

@@ -8,7 +8,10 @@ module Spree
     ATTRIBUTES = [
       :address_attributes,
       :address_book_attributes,
-      :checkout_attributes,
+      :checkout_address_attributes,
+      :checkout_delivery_attributes,
+      :checkout_payment_attributes,
+      :checkout_confirm_attributes,
       :credit_card_update_attributes,
       :customer_return_attributes,
       :image_attributes,
@@ -45,10 +48,6 @@ module Spree
 
     @@address_book_attributes = address_attributes + [:default]
 
-    @@checkout_attributes = [
-      :coupon_code, :email, :special_instructions, :use_billing
-    ]
-
     @@credit_card_update_attributes = [
       :month, :year, :expiry, :first_name, :last_name, :name
     ]
@@ -91,7 +90,7 @@ module Spree
       :number, :month, :year, :expiry, :verification_value,
       :first_name, :last_name, :cc_type, :gateway_customer_profile_id,
       :gateway_payment_profile_id, :last_digits, :name, :encrypted_data,
-      :existing_card_id, :wallet_payment_source_id
+      :existing_card_id, :wallet_payment_source_id, address_attributes: address_attributes
     ]
 
     @@stock_item_attributes = [:variant, :stock_location, :backorderable, :variant_id]
@@ -117,10 +116,10 @@ module Spree
       :meta_description, :meta_keywords, :meta_title, :child_index
     ]
 
-    # intentionally leaving off email here to prevent privilege escalation
+    # Intentionally leaving off email here to prevent privilege escalation
     # by changing a user with higher priveleges' email to one a lower-priveleged
-    # admin owns. creating a user with an email is handled separate at the
-    # controller level
+    # admin owns. Creating a user with an email is handled separate at the
+    # controller level.
     @@user_attributes = [:password, :password_confirmation]
 
     @@variant_attributes = [
@@ -129,5 +128,75 @@ module Spree
       :product_id, :product, :option_values_attributes, :price,
       :weight, :height, :width, :depth, :sku, :cost_currency, option_value_ids: [], options: [:name, :value]
     ]
+
+    @@checkout_address_attributes = [
+      :use_billing,
+      :email,
+      bill_address_attributes: address_attributes,
+      ship_address_attributes: address_attributes
+    ]
+
+    @@checkout_delivery_attributes = [
+      :special_instructions,
+      shipments_attributes: shipment_attributes
+    ]
+
+    @@checkout_payment_attributes = [
+      :coupon_code,
+      payments_attributes: payment_attributes + [
+        source_attributes: source_attributes
+      ]
+    ]
+
+    @@checkout_confirm_attributes = []
+
+    def self.checkout_attributes
+      Spree::Deprecation.warn <<-WARN.squish, caller
+        checkout_attributes is deprecated, please use the permitted
+        attributes set for the specific step that needs to be updated.
+
+        E.g. permitted_checkout_address_attributes
+      WARN
+
+      CheckoutAdditionalAttributes.new(
+        checkout_address_attributes +
+        checkout_delivery_attributes +
+        checkout_payment_attributes +
+        checkout_confirm_attributes
+      )
+    end
+  end
+
+  class CheckoutAdditionalAttributes < Array
+    def <<(*attributes)
+      super
+
+      inject_attributes_to_all_steps(attributes, :<<)
+    end
+
+    def push(*attributes)
+      super
+
+      inject_attributes_to_all_steps(attributes, :push)
+    end
+    alias append push
+
+    def prepend(*attributes)
+      super
+
+      inject_attributes_to_all_steps(attributes, :prepend)
+    end
+    alias unshift prepend
+
+    private
+
+    def inject_attributes_to_all_steps(attributes, method)
+      attributes.each do |attribute|
+        PermittedAttributes.checkout_address_attributes.send(method, attribute)
+        PermittedAttributes.checkout_delivery_attributes.send(method, attribute)
+        PermittedAttributes.checkout_payment_attributes.send(method, attribute)
+        PermittedAttributes.checkout_confirm_attributes.send(method, attribute)
+      end
+    end
   end
 end

data/lib/spree/preferences/static_model_preferences.rb

@@ -30,8 +30,8 @@ module Spree
       end
 
       def initialize
-        @store = Hash.new do |h, klass|
-          h[klass] = {}
+        @store = Hash.new do |data, klass|
+          data[klass] = {}
         end
       end
 

data/lib/spree/testing_support/dummy_app.rb

@@ -13,6 +13,7 @@ Rails.env = 'test'
 require 'solidus_core'
 
 RAILS_52_OR_ABOVE = Gem::Version.new(Rails.version) >= Gem::Version.new('5.2')
+RAILS_6_OR_ABOVE = Gem::Version.new(Rails.version) >= Gem::Version.new('6.0')
 
 # @private
 class ApplicationController < ActionController::Base
@@ -64,7 +65,9 @@ module DummyApp
 
     if RAILS_52_OR_ABOVE
       config.action_controller.default_protect_from_forgery = true
-      config.active_record.sqlite3.represent_boolean_as_integer = true
+      unless RAILS_6_OR_ABOVE
+        config.active_record.sqlite3.represent_boolean_as_integer = true
+      end
     end
 
     # Avoid issues if an old spec/dummy still exists

data/lib/spree/testing_support/dummy_app/rake_tasks.rb

@@ -38,8 +38,12 @@ namespace :db do
     # railties:install:migrations and then db:migrate.
     # Migrations should be run one directory at a time
     ActiveRecord::Migrator.migrations_paths.each do |path|
-      if defined?(ActiveRecord::MigrationContext)
-        # Rails >= 5.2
+      if Rails.gem_version >= Gem::Version.new('6.0.0')
+        ActiveRecord::MigrationContext.new(
+          [path],
+          ActiveRecord::SchemaMigration
+        ).migrate
+      elsif Rails.gem_version >= Gem::Version.new('5.2.0')
         ActiveRecord::MigrationContext.new([path]).migrate
       else
         ActiveRecord::Migrator.migrate(path)

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

@@ -9,6 +9,7 @@ FactoryBot.define do
   factory :inventory_unit, class: 'Spree::InventoryUnit' do
     transient do
       order { nil }
+      stock_location { nil }
     end
 
     variant
@@ -20,7 +21,13 @@ FactoryBot.define do
       end
     end
     state { 'on_hand' }
-    shipment { build(:shipment, state: 'pending', order: line_item.order) }
+    shipment do
+      if stock_location
+        build(:shipment, state: 'pending', order: line_item.order, stock_location: stock_location)
+      else
+        build(:shipment, state: 'pending', order: line_item.order)
+      end
+    end
     # return_authorization
   end
 end

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

@@ -27,8 +27,15 @@ FactoryBot.define do
         Spree::Promotion::Actions::CreateItemAdjustments.create!(calculator: calculator, promotion: promotion)
       end
     end
+
     factory :promotion_with_item_adjustment, traits: [:with_line_item_adjustment]
 
+    trait :with_free_shipping do
+      after(:create) do |promotion|
+        Spree::Promotion::Actions::FreeShipping.create!(promotion: promotion)
+      end
+    end
+
     trait :with_order_adjustment do
       transient do
         weighted_order_adjustment_amount { 10 }

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

@@ -17,7 +17,7 @@ FactoryBot.define do
 
     after(:build) do |package, evaluator|
       evaluator.variants_contents.each do |variant, count|
-        package.add_multiple build_list(:inventory_unit, count, variant: variant)
+        package.add_multiple build_list(:inventory_unit, count, variant: variant, stock_location: evaluator.stock_location)
       end
     end
 

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

@@ -17,7 +17,10 @@ FactoryBot.define do
     end
 
     factory :admin_user do
-      spree_roles { [Spree::Role.find_by(name: 'admin') || create(:role, name: 'admin')] }
+      after(:create) do |user, _|
+        admin_role = Spree::Role.find_by(name: 'admin') || create(:role, name: 'admin')
+        user.spree_roles << admin_role
+      end
     end
 
     factory :user_with_addresses do |_u|

data/solidus_core.gemspec

@@ -17,27 +17,27 @@ Gem::Specification.new do |s|
   s.files        = `git ls-files`.split("\n")
   s.require_path = 'lib'
 
-  s.required_ruby_version     = '>= 2.2.2'
+  s.required_ruby_version = '>= 2.4.0'
   s.required_rubygems_version = '>= 1.8.23'
 
   %w[
     actionmailer actionpack actionview activejob activemodel activerecord
     activesupport railties
   ].each do |rails_dep|
-    s.add_dependency rails_dep, ['>= 5.1', '< 5.3.x']
+    s.add_dependency rails_dep, ['>= 5.1', '< 7.0.x']
   end
 
   s.add_dependency 'activemerchant', '~> 1.66'
   s.add_dependency 'acts_as_list', '~> 0.3'
-  s.add_dependency 'awesome_nested_set', '~> 3.0', '>= 3.0.1'
-  s.add_dependency 'cancancan', '~> 2.2'
+  s.add_dependency 'awesome_nested_set', '~> 3.2'
+  s.add_dependency 'cancancan', ['>= 2.2', '< 4.0']
   s.add_dependency 'carmen', '~> 1.1.0'
   s.add_dependency 'discard', '~> 1.0'
   s.add_dependency 'friendly_id', '~> 5.0'
   s.add_dependency 'kaminari-activerecord', '~> 1.1'
   s.add_dependency 'monetize', '~> 1.8'
-  s.add_dependency 'paperclip', ['>= 4.2', '< 6']
+  s.add_dependency 'paperclip', '>= 4.2'
   s.add_dependency 'paranoia', '~> 2.4'
   s.add_dependency 'ransack', '~> 2.0'
-  s.add_dependency 'state_machines-activerecord', '~> 0.4'
+  s.add_dependency 'state_machines-activerecord', '~> 0.6'
 end

data/spec/lib/search/base_spec.rb

@@ -60,7 +60,11 @@ RSpec.describe Spree::Core::Search::Base do
                search: { "price_range_any" => ["Under $10.00", "$10.00 - $15.00"] } }
     searcher = Spree::Core::Search::Base.new(params)
     expect(searcher.send(:get_base_scope).to_sql).to match /<= 10/
-    expect(searcher.send(:get_base_scope).to_sql).to match /between 10 and 15/i
+    if Rails.gem_version >= Gem::Version.new('6.0.0')
+      expect(searcher.send(:get_base_scope).to_sql).to match /between 10\.0 and 15\.0/i
+    else
+      expect(searcher.send(:get_base_scope).to_sql).to match /between 10 and 15/i
+    end
     expect(searcher.retrieve_products.count).to eq(2)
   end
 

data/spec/lib/search/variant_spec.rb

@@ -85,7 +85,7 @@ module Spree
           example.run
           described_class.search_terms = search_terms
         end
-        before { variant.update_attributes!(weight: 5000) }
+        before { variant.update!(weight: 5000) }
 
         it { assert_found("5000", variant) }
       end

data/spec/lib/spree/core/controller_helpers/strong_parameters_spec.rb

@@ -23,7 +23,14 @@ RSpec.describe Spree::Core::ControllerHelpers::StrongParameters, type: :controll
 
   describe '#permitted_checkout_attributes' do
     it 'returns Array class' do
-      expect(controller.permitted_checkout_attributes.class).to eq Array
+      Spree::Deprecation.silence do
+        expect(controller.permitted_checkout_attributes.class).to eq Spree::CheckoutAdditionalAttributes
+      end
+    end
+
+    it 'is deprecated' do
+      expect(Spree::Deprecation).to receive(:warn)
+      controller.permitted_checkout_attributes
     end
   end
 

data/spec/lib/spree/core/stock_configuration_spec.rb

@@ -39,6 +39,24 @@ RSpec.describe Spree::Core::StockConfiguration do
     end
   end
 
+  describe '#location_filter_class' do
+    let(:stock_configuration) { described_class.new }
+    subject { stock_configuration.location_filter_class }
+
+    it "returns Spree::Stock::LocationFilter::Active" do
+      is_expected.to be ::Spree::Stock::LocationFilter::Active
+    end
+
+    context "with another constant name assiged" do
+      MyFilter = Class.new
+      before { stock_configuration.location_filter_class = MyFilter.to_s }
+
+      it "returns the constant" do
+        is_expected.to be MyFilter
+      end
+    end
+  end
+
   describe '#location_sorter_class' do
     let(:stock_configuration) { described_class.new }
     subject { stock_configuration.location_sorter_class }
@@ -56,4 +74,22 @@ RSpec.describe Spree::Core::StockConfiguration do
       end
     end
   end
+
+  describe '#allocator_class' do
+    let(:stock_configuration) { described_class.new }
+    subject { stock_configuration.allocator_class }
+
+    it "returns Spree::Stock::Allocator::OnHandFirst" do
+      is_expected.to be ::Spree::Stock::Allocator::OnHandFirst
+    end
+
+    context "with another constant name assiged" do
+      MyAllocator = Class.new
+      before { stock_configuration.allocator_class = MyAllocator.to_s }
+
+      it "returns the constant" do
+        is_expected.to be MyAllocator
+      end
+    end
+  end
 end