spree_core 4.4.0.rc2 → 4.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6068db45525230da41ca606788cebd91ab374323e4e74497da8be61f0078d708
-  data.tar.gz: 0d2d9dd7d2f9e100e410a71704e231f97e4be1fe7ada6f468ceb783d9780bcac
+  metadata.gz: c6f1530fed2a687bd1eb187fbc25fc58fcd257d498f9e9f641291f99991f0e46
+  data.tar.gz: fd670b73289d5515e3e27dd5f80451f3c866865ea278cfb8e8d9b43d3c650a46
 SHA512:
-  metadata.gz: db2b58e61632b424a69e058b882daef3713d05d39bd49d818432a3028eab14d8ee4817fa8ca94633b71c287cca77ef9b2ad40c959d34a1e978da5be1b0ad6a37
-  data.tar.gz: '08cc33ae6f5f6e8917d94b26831342bf9e7cc1db94db85923d1d01fd1c06ed323b983d64d90725697c42f938a952a0127799cf98b06937b74cb9416171dee0f6'
+  metadata.gz: d83b92fbf213054613dd642a968a6958c6a54dcdd4177c54385b3a82bf567de92cc5d0c21a18deda0768dfeafb2b955fcf508c1392ded7071e7c499c29afcb73
+  data.tar.gz: c4e3da90f798233259263b922a5ac32999d4e34c46a64b0731e316c5eada252b18bce0c53cc4651e977b3984aa343ef80570cdbf96378600f362d23d3bc2b320

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

@@ -3,8 +3,21 @@ module Spree
     extend ActiveSupport::Concern
 
     included do
-      store :public_metadata, coder: JSON
-      store :private_metadata, coder: JSON
+      attribute :public_metadata, default: {} if Rails.version.to_f >= 6.1
+      attribute :private_metadata, default: {} if Rails.version.to_f >= 6.1
+      serialize :public_metadata, HashSerializer
+      serialize :private_metadata, HashSerializer
+    end
+
+    # https://nandovieira.com/using-postgresql-and-jsonb-with-ruby-on-rails
+    class HashSerializer
+      def self.dump(hash)
+        hash
+      end
+
+      def self.load(hash)
+        (hash || {}).with_indifferent_access
+      end
     end
   end
 end

data/app/models/spree/fulfilment_changer.rb

@@ -92,7 +92,7 @@ module Spree
     end
 
     def get_desired_shipment_inventory_unit(state)
-      desired_shipment.inventory_units.find_or_create_by(state: state) do |unit|
+      desired_shipment.inventory_units.find_or_create_by(state: state, variant: variant) do |unit|
         current_shipment_unit = current_shipment_units.first
         unit.variant_id = current_shipment_unit.variant_id
         unit.order_id = current_shipment_unit.order_id

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

@@ -1,6 +1,14 @@
 module Spree
   class Order < Spree::Base
     module StoreCredit
+      def add_store_credit_payments(amount = nil)
+        Spree::Dependencies.checkout_add_store_credit_service.constantize.call(order: self, amount: amount)
+      end
+
+      def remove_store_credit_payments
+        Spree::Dependencies.checkout_remove_store_credit_service.constantize.call(order: self)
+      end
+
       def covered_by_store_credit?
         return false unless user
 

data/app/models/spree/order_contents.rb

@@ -0,0 +1,31 @@
+module Spree
+  class OrderContents
+    attr_accessor :order, :currency
+
+    def initialize(order)
+      @order = order
+    end
+
+    def add(variant, quantity = 1, options = {})
+      Spree::Dependencies.cart_add_item_service.constantize.call(order: order,
+                                                                 variant: variant,
+                                                                 quantity: quantity,
+                                                                 options: options).value
+    end
+
+    def remove(variant, quantity = 1, options = {})
+      Spree::Dependencies.cart_remove_item_service.constantize.call(order: order,
+                                                                    variant: variant,
+                                                                    quantity: quantity,
+                                                                    options: options).value
+    end
+
+    def remove_line_item(line_item, options = {})
+      Spree::Cart::RemoveLineItem.call(order: @order, line_item: line_item, options: options).value
+    end
+
+    def update_cart(params)
+      Spree::Dependencies.cart_update_service.constantize.call(order: order, params: params).value
+    end
+  end
+end

data/app/models/spree/preferences/preferable_class_methods.rb

@@ -19,6 +19,8 @@ module Spree::Preferences
         value = convert_preference_value(value, type)
         preferences[name] = value
 
+        ActiveSupport::Deprecation.warn("`#{name}` is deprecated. #{deprecated}") if deprecated
+
         # If this is an activerecord object, we need to inform
         # ActiveRecord::Dirty that this value has changed, since this is an
         # in-place update to the preferences hash.

data/lib/spree/core/engine.rb

@@ -134,13 +134,6 @@ module Spree
         Migrations.new(config, engine_name).check
       end
 
-      initializer 'spree.core.checking_deprecated_preferences' do
-        Spree::Config.deprecated_preferences.each do |pref|
-          # FIXME: we should only notify about deprecated preferences that are in use, not all of them
-          # warn "[DEPRECATION] Spree::Config[:#{pref[:name]}] is deprecated. #{pref[:message]}"
-        end
-      end
-
       config.to_prepare do
         # Ensure spree locale paths are present before decorators
         I18n.load_path.unshift(*(Dir.glob(

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
-  VERSION = '4.4.0.rc2'.freeze
+  VERSION = '4.4.1'.freeze
 
   def self.version
     VERSION

data/lib/spree/testing_support/metadata.rb

@@ -4,10 +4,13 @@ shared_examples_for 'metadata' do |factory: described_class.name.demodulize.unde
   it { expect(subject.has_attribute?(:public_metadata)).to be_truthy }
   it { expect(subject.has_attribute?(:private_metadata)).to be_truthy }
 
-  it { expect(subject.public_metadata.class).to eq(HashWithIndifferentAccess) }
-  it { expect(subject.private_metadata.class).to eq(HashWithIndifferentAccess) }
+  it { expect(subject.public_metadata).to eq({}) }
+  it { expect(subject.private_metadata).to eq({}) }
 
-  it do
+  it { expect(subject.public_metadata.class).to eq(ActiveSupport::HashWithIndifferentAccess) }
+  it { expect(subject.private_metadata.class).to eq(ActiveSupport::HashWithIndifferentAccess) }
+
+  it 'reads data as symbolized keys' do
     string = subject.public_metadata[:color] = 'red'
     number = subject.public_metadata[:priority] = 1
     array = subject.public_metadata[:keywords] = ['k1', 'k2']
@@ -20,4 +23,32 @@ shared_examples_for 'metadata' do |factory: described_class.name.demodulize.unde
     expect(subject.public_metadata[:keywords]).to eq(array)
     expect(subject.public_metadata[:additional_data]).to eq(hash.stringify_keys)
   end
+
+  it 'reads data as not symbolized keys' do
+    string = subject.public_metadata[:color] = 'red'
+    number = subject.public_metadata[:priority] = 1
+    array = subject.public_metadata[:keywords] = ['k1', 'k2']
+    hash = subject.public_metadata[:additional_data] = { size: 'big', material: 'wool' }
+
+    subject.save!
+
+    expect(subject.public_metadata['color']).to eq(string)
+    expect(subject.public_metadata['priority']).to eq(number)
+    expect(subject.public_metadata['keywords']).to eq(array)
+    expect(subject.public_metadata['additional_data']).to eq(hash.stringify_keys)
+  end
+
+  it 'can query records by metadata properties', skip: ENV['DB'] == 'mysql' do
+    subject.public_metadata[:color] = 'red'
+    subject.public_metadata[:priority] = 1
+    subject.public_metadata[:keywords] = ['k1', 'k2']
+    subject.public_metadata[:additional_data] = { size: 'big', material: 'wool' }
+
+    subject.save!
+
+    expect(described_class.where("public_metadata->>'color' = ?", 'red').count).to eq(1)
+    expect(described_class.where("public_metadata->>'priority' = ?", '1').count).to eq(1)
+    expect(described_class.where("public_metadata -> 'keywords' ? :keyword", keyword: 'k1').count).to eq(1)
+    expect(described_class.where("public_metadata -> 'additional_data' ->> 'size' = :size", size: 'big').count).to eq(1)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 4.4.0.rc2
+  version: 4.4.1
 platform: ruby
 authors:
 - Sean Schofield
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-10 00:00:00.000000000 Z
+date: 2024-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -583,6 +583,7 @@ files:
 - app/models/spree/order/emails.rb
 - app/models/spree/order/payments.rb
 - app/models/spree/order/store_credit.rb
+- app/models/spree/order_contents.rb
 - app/models/spree/order_inventory.rb
 - app/models/spree/order_merger.rb
 - app/models/spree/order_promotion.rb
@@ -977,9 +978,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v4.4.0.rc2
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.4.1
   documentation_uri: https://dev-docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.4.0.rc2
+  source_code_uri: https://github.com/spree/spree/tree/v4.4.1
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -995,7 +996,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: The bare bones necessary for Spree