solidus_core 2.9.1 → 2.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2edabaa78d1ec9b196da1fe62c6597ea1fd392a37185f48c6786e6d00f4566a
-  data.tar.gz: fb268588d3df1204706a1d89026b9de2b5967f5b9d5c3bcce91c52e05280a0cd
+  metadata.gz: 482b41309b1c87feff6b32679da923ed2f6077ca241fd0d1bb358647f4261bb1
+  data.tar.gz: db5b3124cc3b7c29b916e037d0e1f16ba378aaa386282f59bb873225cee6c33d
 SHA512:
-  metadata.gz: 521bcc28081f5ad38b84736fa159e616fd22985b1ccf2022921945533dc00144b9688827fd1405b70212de8cc222b1482eac7f143f4b71f729c931a4bea319c4
-  data.tar.gz: e9a8edbd1fe694e5dd4d823d08dff30db1e036212c37837421702b9e31514db48fa1b5f58441b46a490c96d171dfe1964a776b13477826160b2f01ac24fbaa8e
+  metadata.gz: bc163558062f4da4c642a1946bfa1fc1d6dfc9a47dddf0fb3f3c3c44c06810e33fe02cbddca9ef007469eb594a19644ce1344d51cc5b04f6b5a039cf57dcc335
+  data.tar.gz: e70cf50bf8049770f9fa7ad1be437969dda338298f5dd62b0a44cf545a38f24a57a7d8ccb4e536c8cae5ec899ecd9e18cf40d177adf664bf104ea5d1990e286a

data/app/models/spree/order.rb

@@ -435,6 +435,13 @@ module Spree
       touch :completed_at
 
       Spree::Event.fire 'order_finalized', order: self
+
+      if method(:deliver_order_confirmation_email).owner != self.class
+        Spree::Deprecation.warn \
+          "deliver_order_confirmation_email has been deprecated and moved to " \
+          "Spree::MailerSubscriber#order_finalized, please move there any customizations.",
+          caller(1)
+      end
     end
 
     def fulfill!
@@ -443,6 +450,16 @@ module Spree
       save!
     end
 
+    def deliver_order_confirmation_email
+      Spree::Deprecation.warn \
+        "deliver_order_confirmation_email has been deprecated and moved to " \
+        "Spree::MailerSubscriber#order_finalized.",
+        caller(1)
+
+      Spree::Config.order_mailer_class.confirm_email(order).deliver_later
+      order.update_column(:confirmation_delivered, true)
+    end
+
     # Helper methods for checkout steps
     def paid?
       %w(paid credit_owed).include?(payment_state)

data/lib/generators/spree/install/install_generator.rb

@@ -58,6 +58,9 @@ module Spree
 
     def setup_assets
       @lib_name = 'spree'
+
+      empty_directory 'app/assets/images'
+
       %w{javascripts stylesheets images}.each do |path|
         empty_directory "vendor/assets/#{path}/spree/frontend" if defined? Spree::Frontend || Rails.env.test?
         empty_directory "vendor/assets/#{path}/spree/backend" if defined? Spree::Backend || Rails.env.test?

data/lib/spree/core/controller_helpers/strong_parameters.rb

@@ -31,16 +31,30 @@ module Spree
         end
 
         def permitted_checkout_attributes
-          permitted_attributes.checkout_attributes + [
-            bill_address_attributes: permitted_address_attributes,
-            ship_address_attributes: permitted_address_attributes,
-            payments_attributes: permitted_payment_attributes,
-            shipments_attributes: permitted_shipment_attributes
-          ]
+          permitted_attributes.checkout_attributes
+        end
+
+        def permitted_checkout_address_attributes
+          permitted_attributes.checkout_address_attributes
+        end
+
+        def permitted_checkout_delivery_attributes
+          permitted_attributes.checkout_delivery_attributes
+        end
+
+        def permitted_checkout_payment_attributes
+          permitted_attributes.checkout_payment_attributes
+        end
+
+        def permitted_checkout_confirm_attributes
+          permitted_attributes.checkout_confirm_attributes
         end
 
         def permitted_order_attributes
-          permitted_checkout_attributes + [
+          permitted_checkout_address_attributes +
+          permitted_checkout_delivery_attributes +
+          permitted_checkout_payment_attributes +
+          permitted_checkout_confirm_attributes + [
             line_items_attributes: permitted_line_item_attributes
           ]
         end

data/lib/spree/core/environment_extension.rb

@@ -22,6 +22,15 @@ module Spree
           end
         end
       end
+
+      def add_class(name)
+        Spree::Deprecation.warn(
+          'This method is deprecated. ' \
+          "Please use `#{self.class}.add_class_set(#{name.inspect})` instead.",
+          caller,
+        )
+        singleton_class.send(:add_class_set, name)
+      end
     end
   end
 end

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

@@ -133,7 +133,8 @@ module Spree
             # spree_wombat serializes payment state as status so imported orders should fall back to status field.
             payment.state = p[:state] || p[:status] || 'completed'
             payment.payment_method = Spree::PaymentMethod.find_by!(name: p[:payment_method])
-            payment.source = create_source_payment_from_params(p[:source], payment) if p[:source]
+            source_attributes = p[:source] || p[:source_attributes]
+            payment.source = create_source_payment_from_params(source_attributes, payment) if source_attributes
             payment.save!
           end
         end

data/lib/spree/core/version.rb

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

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]
@@ -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/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/environment_extension_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 require 'spree/core/environment_extension'
 
 RSpec.describe Spree::Core::EnvironmentExtension do
-  let(:base) { Class.new }
+  let(:base) { Class.new { def self.to_s; 'ExampleClass'; end } }
   subject! { base.include(described_class).new }
 
   describe '.add_class_set' do
@@ -32,4 +32,15 @@ RSpec.describe Spree::Core::EnvironmentExtension do
       end
     end
   end
+
+  describe '#add_class' do
+    it 'is deprecated' do
+      expect(Spree::Deprecation).to receive(:warn) do |message, _caller|
+        expect(message).to include('ExampleClass.add_class_set(:foo)')
+      end
+      expect(base).to receive(:add_class_set).with(:foo)
+
+      base.new.add_class(:foo)
+    end
+  end
 end

data/spec/lib/spree/permitted_attributes_spec.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+RSpec.describe Spree::PermittedAttributes do
+  describe ".checkout_attributes" do
+    subject(:permitted_attributes) { described_class }
+
+    it "when read emits a deprecation warning and return all steps attributes" do
+      expect(Spree::Deprecation).to receive(:warn)
+      all_attributes = permitted_attributes.checkout_attributes
+
+      expect(all_attributes).to include(*permitted_attributes.checkout_address_attributes)
+      expect(all_attributes).to include(*permitted_attributes.checkout_delivery_attributes)
+      expect(all_attributes).to include(*permitted_attributes.checkout_payment_attributes)
+    end
+
+    it "when changed emits a deprecation warning and push changes to all steps' attributes" do
+      expect(Spree::Deprecation).to receive(:warn).exactly(4).times
+      permitted_attributes.checkout_attributes.push :appended_attribute
+      permitted_attributes.checkout_attributes.append :appended_with_alias_attribute
+      permitted_attributes.checkout_attributes << :another_appended_attribute
+      permitted_attributes.checkout_attributes.prepend :prepended_attribute
+
+      checkout_steps_attributes = [
+        permitted_attributes.checkout_address_attributes,
+        permitted_attributes.checkout_delivery_attributes,
+        permitted_attributes.checkout_payment_attributes,
+        permitted_attributes.checkout_confirm_attributes
+      ]
+
+      checkout_steps_attributes.each do |step_attributes|
+        expect(step_attributes).to include(
+          :appended_attribute,
+          :appended_with_alias_attribute,
+          :another_appended_attribute,
+          :prepended_attribute)
+      end
+    end
+  end
+end

data/spec/models/spree/promotion/rules/taxon_spec.rb

@@ -101,6 +101,7 @@ RSpec.describe Spree::Promotion::Rules::Taxon, type: :model do
         before do
           taxon.children << taxon2
           taxon.save!
+          taxon.reload
           product.taxons = [taxon2, taxon3]
           rule.taxons = [taxon, taxon3]
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 2.9.1
+  version: 2.9.6
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-07 00:00:00.000000000 Z
+date: 2020-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -971,6 +971,7 @@ files:
 - spec/lib/spree/migrations_spec.rb
 - spec/lib/spree/money_spec.rb
 - spec/lib/spree/permission_sets/default_customer_spec.rb
+- spec/lib/spree/permitted_attributes_spec.rb
 - spec/lib/spree/promo/environment_spec.rb
 - spec/lib/tasks/dummy_task.rake
 - spec/lib/tasks/dummy_task_spec.rb
@@ -1229,8 +1230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Essential models, mailers, and classes for the Solidus e-commerce project.