solidus_core 2.11.3 → 2.11.8

data/lib/tasks/migrations/migrate_default_billing_addresses_to_address_book.rake

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+namespace :solidus do
+  namespace :migrations do
+    namespace :migrate_default_billing_addresses_to_address_book do
+      task up: :environment do
+        print "Migrating default billing addresses to address book ... "
+        if Spree::UserAddress.where(default_billing: true).any?
+          Spree.user_class.joins(:bill_address).update_all(bill_address_id: nil) # rubocop:disable Rails/SkipsModelValidations
+        end
+        adapter_type = Spree::Base.connection.adapter_name.downcase.to_sym
+        if adapter_type == :mysql2
+          sql = <<~SQL
+            UPDATE spree_user_addresses
+            JOIN spree_users ON spree_user_addresses.user_id = spree_users.id
+              AND spree_user_addresses.address_id = spree_users.bill_address_id
+            SET spree_user_addresses.default_billing = true
+          SQL
+        else
+          sql = <<~SQL
+            UPDATE spree_user_addresses
+            SET default_billing = true
+            FROM spree_users
+            WHERE spree_user_addresses.address_id = spree_users.bill_address_id
+              AND spree_user_addresses.user_id = spree_users.id;
+          SQL
+        end
+        Spree::Base.connection.execute sql
+        puts "Success"
+      end
+
+      task down: :environment do
+        Spree::UserAddress.update_all(default_billing: false) # rubocop:disable Rails/SkipsModelValidations
+        puts "Rolled back default billing address migration to address book"
+      end
+    end
+  end
+end

data/lib/tasks/upgrade.rake

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+namespace :solidus do
+  namespace :upgrade do
+    desc "Upgrade Solidus to version 2.11"
+    task two_point_eleven: [
+        'solidus:migrations:migrate_default_billing_addresses_to_address_book:up',
+        'solidus:migrations:migrate_address_names:up'
+      ] do
+      puts "Your Solidus install is ready for Solidus 2.11"
+    end
+  end
+end

data/solidus_core.gemspec

@@ -25,12 +25,12 @@ Gem::Specification.new do |s|
     actionmailer actionpack actionview activejob activemodel activerecord
     activesupport railties
   ].each do |rails_dep|
-    s.add_dependency rails_dep, ['>= 5.2', '< 6.1.x']
+    s.add_dependency rails_dep, ['>= 5.2', '< 6.2.x']
   end
 
   s.add_dependency 'activemerchant', '~> 1.66'
   s.add_dependency 'acts_as_list', '< 2.0'
-  s.add_dependency 'awesome_nested_set', '~> 3.2'
+  s.add_dependency 'awesome_nested_set', '~> 3.3'
   s.add_dependency 'cancancan', ['>= 2.2', '< 4.0']
   s.add_dependency 'carmen', '~> 1.1.0'
   s.add_dependency 'discard', '~> 1.0'
@@ -43,4 +43,26 @@ Gem::Specification.new do |s|
   s.add_dependency 'paranoia', '~> 2.4'
   s.add_dependency 'ransack', '~> 2.0'
   s.add_dependency 'state_machines-activerecord', '~> 0.6'
+
+  s.post_install_message = <<-MSG
+-------------------------------------------------------------
+                Thank you for using Solidus
+-------------------------------------------------------------
+If this is a fresh install, don't forget to run the Solidus
+installer with the following command:
+
+$ bin/rails g solidus:install
+
+If you are updating Solidus from an older version, please run
+the following commands to complete the update:
+
+$ bin/rails railties:install:migrations
+$ bin/rails db:migrate
+$ bin/rails solidus:upgrade:two_point_eleven
+
+Please report any issues at:
+- https://github.com/solidusio/solidus/issues
+- http://slack.solidus.io/
+-------------------------------------------------------------
+MSG
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 2.11.3
+  version: 2.11.8
 platform: ruby
 authors:
 - Solidus Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-18 00:00:00.000000000 Z
+date: 2021-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -19,7 +19,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.1.x
+        version: 6.2.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.1.x
+        version: 6.2.x
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.1.x
+        version: 6.2.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.1.x
+        version: 6.2.x
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.1.x
+        version: 6.2.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -69,7 +69,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.1.x
+        version: 6.2.x
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
@@ -79,7 +79,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.1.x
+        version: 6.2.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -89,7 +89,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.1.x
+        version: 6.2.x
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -99,7 +99,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.1.x
+        version: 6.2.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.1.x
+        version: 6.2.x
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -119,7 +119,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.1.x
+        version: 6.2.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -129,7 +129,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.1.x
+        version: 6.2.x
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -139,7 +139,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.1.x
+        version: 6.2.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -149,7 +149,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.1.x
+        version: 6.2.x
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -159,7 +159,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.1.x
+        version: 6.2.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -169,7 +169,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.1.x
+        version: 6.2.x
 - !ruby/object:Gem::Dependency
   name: activemerchant
   requirement: !ruby/object:Gem::Requirement
@@ -204,14 +204,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: cancancan
   requirement: !ruby/object:Gem::Requirement
@@ -648,7 +648,6 @@ files:
 - app/models/spree/taxonomy.rb
 - app/models/spree/unit_cancel.rb
 - app/models/spree/user_address.rb
-- app/models/spree/user_class_handle.rb
 - app/models/spree/user_last_url_storer.rb
 - app/models/spree/user_last_url_storer/rules/authentication_rule.rb
 - app/models/spree/user_stock_location.rb
@@ -730,6 +729,7 @@ files:
 - db/migrate/20200320144521_add_default_billng_flag_to_user_addresses.rb
 - db/migrate/20200530111458_add_bcc_email_to_spree_stores.rb
 - db/migrate/20201008213609_add_discontinue_on_to_spree_products.rb
+- db/migrate/20210122110141_add_name_to_spree_addresses.rb
 - db/seeds.rb
 - lib/generators/solidus/install/install_generator.rb
 - lib/generators/solidus/install/templates/config/initializers/spree.rb.tt
@@ -752,7 +752,6 @@ files:
 - lib/solidus/migrations/rename_gateways.rb
 - lib/solidus_core.rb
 - lib/spree/app_configuration.rb
-- lib/spree/awesome_nested_set_override.rb
 - lib/spree/config.rb
 - lib/spree/core.rb
 - lib/spree/core/active_merchant_dependencies.rb
@@ -830,6 +829,7 @@ files:
 - lib/spree/permission_sets/user_management.rb
 - lib/spree/permitted_attributes.rb
 - lib/spree/preferences/configuration.rb
+- lib/spree/preferences/persistable.rb
 - lib/spree/preferences/preferable.rb
 - lib/spree/preferences/preferable_class_methods.rb
 - lib/spree/preferences/scoped_store.rb
@@ -837,6 +837,7 @@ files:
 - lib/spree/preferences/statically_configurable.rb
 - lib/spree/preferences/store.rb
 - lib/spree/promo/environment.rb
+- lib/spree/testing_support.rb
 - lib/spree/testing_support/ability_helpers.rb
 - lib/spree/testing_support/authorization_helpers.rb
 - lib/spree/testing_support/bar_ability.rb
@@ -851,6 +852,7 @@ files:
 - lib/spree/testing_support/dummy_app/assets/stylesheets/spree/backend/all.css
 - lib/spree/testing_support/dummy_app/assets/stylesheets/spree/frontend/all.css
 - lib/spree/testing_support/dummy_app/database.yml
+- lib/spree/testing_support/dummy_app/mailer_previews/test_mailer_preview.rb
 - lib/spree/testing_support/dummy_app/migrations.rb
 - lib/spree/testing_support/dummy_app/rake_tasks.rb
 - lib/spree/testing_support/dummy_app/routes.rb
@@ -915,6 +917,7 @@ files:
 - lib/spree/testing_support/factories/variant_property_rule_factory.rb
 - lib/spree/testing_support/factories/variant_property_rule_value_factory.rb
 - lib/spree/testing_support/factories/zone_factory.rb
+- lib/spree/testing_support/factory_bot.rb
 - lib/spree/testing_support/fixtures/blank.jpg
 - lib/spree/testing_support/flash.rb
 - lib/spree/testing_support/job_helpers.rb
@@ -927,14 +930,18 @@ files:
 - lib/spree/testing_support/shared_examples/gallery.rb
 - lib/spree/testing_support/translations.rb
 - lib/spree/testing_support/url_helpers.rb
+- lib/spree/user_class_handle.rb
 - lib/spree_core.rb
 - lib/tasks/core.rake
 - lib/tasks/email.rake
 - lib/tasks/migrations/copy_order_bill_address_to_credit_card.rake
+- lib/tasks/migrations/migrate_address_names.rake
+- lib/tasks/migrations/migrate_default_billing_addresses_to_address_book.rake
 - lib/tasks/migrations/migrate_shipping_rate_taxes.rake
 - lib/tasks/migrations/migrate_user_addresses.rake
 - lib/tasks/migrations/rename_gateways.rake
 - lib/tasks/order_capturing.rake
+- lib/tasks/upgrade.rake
 - solidus_core.gemspec
 - vendor/assets/javascripts/jquery.payment.js
 - vendor/assets/javascripts/jsuri.js
@@ -943,7 +950,26 @@ homepage: http://solidus.io
 licenses:
 - BSD-3-Clause
 metadata: {}
-post_install_message:
+post_install_message: |
+  -------------------------------------------------------------
+                  Thank you for using Solidus
+  -------------------------------------------------------------
+  If this is a fresh install, don't forget to run the Solidus
+  installer with the following command:
+
+  $ bin/rails g solidus:install
+
+  If you are updating Solidus from an older version, please run
+  the following commands to complete the update:
+
+  $ bin/rails railties:install:migrations
+  $ bin/rails db:migrate
+  $ bin/rails solidus:upgrade:two_point_eleven
+
+  Please report any issues at:
+  - https://github.com/solidusio/solidus/issues
+  - http://slack.solidus.io/
+  -------------------------------------------------------------
 rdoc_options: []
 require_paths:
 - lib

data/lib/spree/awesome_nested_set_override.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-module AwesomeNestedSetOvveride
-  # Add :polimorphic key option only when used to make it work with Rails 6.1+,
-  # required since rails/rails@2c008d9
-  # This can be removed when upgrading to an awesome_nested_set version
-  # compliant with Rails 6.1+, already addressed in
-  # collectiveidea/awesome_nested_set#421
-  module RelateParent
-    def acts_as_nested_set_relate_parent!
-      # Disable Rubocop to keep original code for diffs
-      # rubocop:disable
-      options = {
-        :class_name => self.base_class.to_s,
-        :foreign_key => parent_column_name,
-        :primary_key => primary_column_name,
-        :counter_cache => acts_as_nested_set_options[:counter_cache],
-        :inverse_of => (:children unless acts_as_nested_set_options[:polymorphic]),
-        :touch => acts_as_nested_set_options[:touch]
-      }
-      options[:polymorphic] = true if acts_as_nested_set_options[:polymorphic]
-      options[:optional] = true if ActiveRecord::VERSION::MAJOR >= 5
-      belongs_to :parent, options
-      # rubocop:enable
-    end
-
-    CollectiveIdea::Acts::NestedSet.prepend self
-  end
-
-  # Skip breaking model reload before update depth. Already addressed in
-  # collectiveidea/awesome_nested_set#413
-  # This can be removed when a new version of awesome_nested_set is released.
-  module Model
-    def set_depth!
-      return unless has_depth_column?
-
-      in_tenacious_transaction do
-        update_depth(level)
-      end
-    end
-
-    CollectiveIdea::Acts::NestedSet::Model.prepend self
-  end
-end