solidus_core 3.0.0.rc2 → 3.1.0

data/lib/spree/preferences/preferable_class_methods.rb

@@ -27,7 +27,7 @@ module Spree::Preferences
       end
 
       default = options[:default]
-      default = ->{ options[:default] } unless default.is_a?(Proc)
+      default = proc { options[:default] } unless default.is_a?(Proc)
 
       # The defined preferences on a class are all those defined directly on
       # that class as well as those defined on ancestors.
@@ -44,7 +44,7 @@ module Spree::Preferences
       # is a pending preference before going to default
       define_method preference_getter_method(name) do
         value = preferences.fetch(name) do
-          default.call
+          default.call(*context_for_default)
         end
         value = preference_encryptor.decrypt(value) if preference_encryptor.present?
         value
@@ -60,7 +60,9 @@ module Spree::Preferences
         preferences_will_change! if respond_to?(:preferences_will_change!)
       end
 
-      define_method preference_default_getter_method(name), &default
+      define_method preference_default_getter_method(name) do
+        default.call(*context_for_default)
+      end
 
       define_method preference_type_getter_method(name) do
         type

data/lib/spree/preferences/preference_differentiator.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Spree
+  module Preferences
+    class PreferenceDifferentiator
+      attr_reader :config_class
+
+      def initialize(config_class)
+        @config_class = config_class
+      end
+
+      def call(from:, to:)
+        preferences_from = config_class.new.load_defaults(from)
+        preferences_to = config_class.new.load_defaults(to)
+        preferences_from.reduce({}) do |changes, (pref_key, value_from)|
+          value_to = preferences_to[pref_key]
+          if value_from == value_to
+            changes
+          else
+            changes.merge(
+              pref_key => { from: value_from, to: value_to }
+            )
+          end
+        end
+      end
+    end
+  end
+end

data/lib/spree/testing_support/dummy_app/database.yml

@@ -1,34 +1,54 @@
-<%
-database_prefix = ENV['LIB_NAME'].presence || "solidus"
-%>
-<% case ENV['DB']
+<% db = case ENV['DB']
+        when 'mysql'
+          'mysql'
+        when 'postgres', 'postgresql'
+          'postgres'
+        when 'sqlite', '', nil
+          'sqlite'
+        else
+          raise "Invalid DB specified: #{ENV['DB']}"
+        end %>
+<% db_host = case db
+             when 'mysql'
+               ENV['DB_MYSQL_HOST'] || ENV['DB_HOST']
+             when 'postgres'
+               ENV['DB_POSTGRES_HOST'] || ENV['DB_HOST']
+             else
+               ENV['DB_HOST']
+             end %>
+<% db_prefix = ENV['LIB_NAME'].presence || "solidus" %>
+<% db_username = ENV['DB_USERNAME'] %>
+<% db_password = ENV['DB_PASSWORD'] %>
+<% case db
 when 'mysql' %>
 test:
   adapter: mysql2
-  <% if ENV['CI'] %>
-  username: root
-  password:
+  database: <%= db_prefix %>_test
+  <% unless db_username.blank? %>
+  username: <%= db_username %>
   <% end %>
-  database: <%= database_prefix %>_test
-  encoding: utf8
-  <% unless ENV['DB_HOST'].blank? %>
-  host: <%= ENV['DB_HOST'] %>
+  <% unless db_password.blank? %>
+  password: <%= db_password %>
+  <% end %>
+  <% unless db_host.blank? %>
+  host: <%= db_host %>
   <% end %>
-<% when 'postgres', 'postgresql' %>
-<% db_host = ENV['DB_HOST'] %>
+  encoding: utf8
+<% when 'postgres' %>
 test:
   adapter: postgresql
-  database: <%= database_prefix %>_test
-  username: postgres
-  min_messages: warning
-<% unless db_host.blank? %>
+  database: <%= db_prefix %>_test
+  username: <%= db_username.presence || "postgres" %>
+  <% unless db_password.blank? %>
+  password: <%= db_password %>
+  <% end %>
+  <% unless db_host.blank? %>
   host: <%= db_host %>
-<% end %>
-<% when 'sqlite', '', nil %>
+  <% end %>
+  min_messages: warning
+<% when 'sqlite' %>
 test:
   adapter: sqlite3
-  database: db/<%= database_prefix %>_test.sqlite3
+  database: db/<%= db_prefix %>_test.sqlite3
   timeout: 10000
-<% else %>
-  <% raise "Invalid DB specified: #{ENV['DB']}" %>
 <% end %>

data/lib/spree/testing_support/dummy_app.rb

@@ -46,34 +46,53 @@ module DummyApp
   end
 
   class Application < ::Rails::Application
-    config.eager_load = false
+    config.load_defaults("#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}")
+    # Make the test environment more production-like:
     config.cache_classes = true
-    config.cache_store = :memory_store
-    config.serve_static_assets = true
-    config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
-    config.whiny_nils = true
-    config.consider_all_requests_local = true
     config.action_controller.allow_forgery_protection = false
     config.action_controller.default_protect_from_forgery = false
+    config.action_mailer.perform_caching = false
+    config.i18n.fallbacks = true
+
+    # In the test environment, we use the `caching: true` RSpec metadata to
+    # enable caching on select specs. See
+    # core/lib/spree/testing_support/caching.rb. See also
+    # https://github.com/solidusio/solidus/issues/4110
     config.action_controller.perform_caching = false
+
+    # Make debugging easier:
+    config.consider_all_requests_local = true
     config.action_dispatch.show_exceptions = false
     config.active_support.deprecation = :stderr
+    config.log_level = :debug
+
+    # Improve test suite performance:
+    config.eager_load = false
+    config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
+    config.cache_store = :memory_store
+
+    # We don't use a web server, so we let Rails serve assets.
+    config.public_file_server.enabled = true
+
+    # We don't want to send email in the test environment.
     config.action_mailer.delivery_method = :test
-    config.active_support.deprecation = :stderr
+
+    # No need to use credentials file in a test environment.
     config.secret_key_base = 'SECRET_TOKEN'
 
-    config.action_mailer.delivery_job = "ActionMailer::MailDeliveryJob" if RAILS_6_OR_ABOVE
+    # Set the preview path within the dummy app:
     config.action_mailer.preview_path = File.expand_path('dummy_app/mailer_previews', __dir__)
-    config.active_record.sqlite3.represent_boolean_as_integer = true unless RAILS_6_OR_ABOVE
 
-    config.storage_path = Rails.root.join('tmp', 'storage')
+    config.active_record.sqlite3.represent_boolean_as_integer = true unless RAILS_6_OR_ABOVE
+    config.active_record.dump_schema_after_migration = false
 
+    # Configure active storage to use storage within tmp folder
     unless ENV['DISABLE_ACTIVE_STORAGE']
       initializer 'solidus.active_storage' do
         config.active_storage.service_configurations = {
           test: {
             service: 'Disk',
-            root: config.storage_path
+            root: Rails.root.join('tmp', 'storage')
           }
         }
         config.active_storage.service = :test
@@ -94,12 +113,8 @@ module DummyApp
     config.paths['db/migrate'] = migration_dirs
     ActiveRecord::Migrator.migrations_paths = migration_dirs
 
-    config.action_controller.include_all_helpers = false
-
-    if config.respond_to?(:assets)
-      config.assets.paths << File.expand_path('dummy_app/assets/javascripts', __dir__)
-      config.assets.paths << File.expand_path('dummy_app/assets/stylesheets', __dir__)
-    end
+    config.assets.paths << File.expand_path('dummy_app/assets/javascripts', __dir__)
+    config.assets.paths << File.expand_path('dummy_app/assets/stylesheets', __dir__)
 
     config.paths["config/database"] = File.expand_path('dummy_app/database.yml', __dir__)
     config.paths['app/views'] = File.expand_path('dummy_app/views', __dir__)
@@ -116,6 +131,7 @@ ActiveSupport.on_load(:action_controller) do
 end
 
 Spree.user_class = 'Spree::LegacyUser'
+Spree.load_defaults(Spree.solidus_version)
 Spree.config do |config|
   config.mails_from = "store@example.com"
 

data/lib/spree/testing_support/fixtures/file.txt

@@ -0,0 +1 @@
+This is a text file

data/lib/spree/testing_support.rb

@@ -25,7 +25,7 @@ module Spree
       factory_bot_paths: "Spree::TestingSupport::FactoryBot.definition_file_paths",
       check_factory_bot_version: "Spree::TestingSupport::FactoryBot.check_version",
       load_all_factories: "Spree::TestingSupport::FactoryBot.add_paths_and_load!",
-      deprecator: Spree::Deprecator
+      deprecator: Spree::Deprecation
     )
   end
 end

data/lib/tasks/solidus/delete_prices_with_nil_amount.rake

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+namespace :solidus do
+  desc "Delete Spree::Price records which amount field is NULL"
+  task delete_prices_with_nil_amount: :environment do
+    Spree::Price.where(amount: nil).delete_all
+  end
+end

data/solidus_core.gemspec

@@ -42,4 +42,24 @@ Gem::Specification.new do |s|
   s.add_dependency 'kt-paperclip', '~> 6.3'
   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 solidus:upgrade
+
+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: 3.0.0.rc2
+  version: 3.1.0
 platform: ruby
 authors:
 - Solidus Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-10 00:00:00.000000000 Z
+date: 2021-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -609,7 +609,6 @@ files:
 - app/models/spree/tax/item_tax.rb
 - app/models/spree/tax/order_adjuster.rb
 - app/models/spree/tax/order_tax.rb
-- app/models/spree/tax/shipping_rate_taxer.rb
 - app/models/spree/tax/tax_helpers.rb
 - app/models/spree/tax/tax_location.rb
 - app/models/spree/tax_calculator/default.rb
@@ -705,6 +704,7 @@ files:
 - 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/migrate/20210312061050_change_column_null_on_prices.rb
 - db/seeds.rb
 - lib/generators/solidus/install/install_generator.rb
 - lib/generators/solidus/install/templates/config/initializers/spree.rb.tt
@@ -712,6 +712,8 @@ files:
 - lib/generators/solidus/install/templates/vendor/assets/javascripts/spree/frontend/all.js
 - lib/generators/solidus/install/templates/vendor/assets/stylesheets/spree/backend/all.css
 - lib/generators/solidus/install/templates/vendor/assets/stylesheets/spree/frontend/all.css
+- lib/generators/solidus/update/templates/config/initializers/new_solidus_defaults.rb.tt
+- lib/generators/solidus/update/update_generator.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
 - lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt
 - lib/generators/spree/custom_user/templates/migration.rb.tt
@@ -765,6 +767,7 @@ files:
 - lib/spree/core/stock_configuration.rb
 - lib/spree/core/validators/email.rb
 - lib/spree/core/version.rb
+- lib/spree/core/versioned_value.rb
 - lib/spree/deprecation.rb
 - lib/spree/encryptor.rb
 - lib/spree/event.rb
@@ -801,8 +804,10 @@ 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/preference_differentiator.rb
 - lib/spree/preferences/scoped_store.rb
 - lib/spree/preferences/static_model_preferences.rb
 - lib/spree/preferences/statically_configurable.rb
@@ -888,6 +893,7 @@ files:
 - 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/fixtures/file.txt
 - lib/spree/testing_support/flash.rb
 - lib/spree/testing_support/job_helpers.rb
 - lib/spree/testing_support/order_walkthrough.rb
@@ -901,9 +907,7 @@ files:
 - lib/spree/testing_support/url_helpers.rb
 - lib/spree/user_class_handle.rb
 - lib/spree_core.rb
-- lib/tasks/migrations/migrate_address_names.rake
-- lib/tasks/migrations/migrate_default_billing_addresses_to_address_book.rake
-- lib/tasks/upgrade.rake
+- lib/tasks/solidus/delete_prices_with_nil_amount.rake
 - solidus_core.gemspec
 - vendor/assets/javascripts/jquery.payment.js
 - vendor/assets/javascripts/jsuri.js
@@ -912,7 +916,24 @@ 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 solidus:upgrade
+
+  Please report any issues at:
+  - https://github.com/solidusio/solidus/issues
+  - http://slack.solidus.io/
+  -------------------------------------------------------------
 rdoc_options: []
 require_paths:
 - lib
@@ -927,7 +948,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.20
 signing_key:
 specification_version: 4
 summary: Essential models, mailers, and classes for the Solidus e-commerce project.

data/app/models/spree/tax/shipping_rate_taxer.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module Spree
-  module Tax
-    # Used to build shipping rate taxes
-    class ShippingRateTaxer
-      # Build shipping rate taxes for a shipping rate
-      # Modifies the passed-in shipping rate with associated shipping rate taxes.
-      # @param [Spree::ShippingRate] shipping_rate The shipping rate to add taxes to.
-      #   This parameter will be modified.
-      # @return [Spree::ShippingRate] The shipping rate with associated tax objects
-      def tax(shipping_rate)
-        taxes = Spree::Config.shipping_rate_tax_calculator_class.new(shipping_rate.order).calculate(shipping_rate)
-        taxes.each do |tax|
-          shipping_rate.taxes.build(
-            amount: tax.amount,
-            tax_rate: tax.tax_rate
-          )
-        end
-        shipping_rate
-      end
-    end
-  end
-end

data/lib/tasks/migrations/migrate_address_names.rake

@@ -1,158 +0,0 @@
-# frozen_string_literal: true
-
-require 'thor'
-
-namespace :solidus do
-  namespace :migrations do
-    namespace :migrate_address_names do
-      desc 'Backfills Spree::Address name attribute using firstname and lastname
-        concatenation in order to retain historical data when upgrading to new
-        address name format'
-      task up: :environment do
-        puts "Combining addresses' firstname and lastname into name ... "
-        class Spree::AddressForMigration < ApplicationRecord
-          self.table_name = 'spree_addresses'
-        end
-
-        records = Spree::AddressForMigration.unscoped.where(name: [nil, ''])
-        count = records.count
-        connection = ActiveRecord::Base.connection
-        adapter_name = connection.adapter_name.downcase
-        shell = Thor::Shell::Basic.new
-        puts "  Your DB contains #{count} addresses that may be affected by this task."
-        # `trim` is not needed for pg or mysql when using `concat_ws`:
-        # select concat_ws('joinstring', 'foo', null);
-        #  concat_ws
-        # -----------
-        #  foo
-        # (1 row)
-        # select concat_ws('joinstring', 'foo', null) = trim(concat_ws('joinstring', 'foo', null));
-        #  ?column?
-        # ----------
-        #  t
-        # (1 row)
-        unless count.zero?
-          concat_statement = begin
-            case adapter_name
-            when /sqlite/
-              "name = TRIM(COALESCE(firstname, '') || ' ' || COALESCE(lastname, ''))"
-            when /postgres/, /mysql2/
-              "name = CONCAT_WS(' ', firstname, lastname)"
-            else
-              abort "  No migration path available for adapter #{adapter_name}. Please write your own."
-            end
-          end
-
-          # The batch size should be limited to avoid locking the table records for too long. These are
-          # the numbers I got with 1_000_000 records in `spree_addresses`, all with different name and
-          # surname, with postgresql:
-          #
-          # Updating 1000000 records in one shot
-          # batch took 178 seconds
-          #
-          # Updating 1000000 addresses in batches of 200000
-          # batch took 36 seconds
-          # batch took 31 seconds
-          # batch took 31 seconds
-          # batch took 31 seconds
-          # batch took 30 seconds
-          #
-          # Updating 1000000 addresses in batches of 150000
-          # batch took 29 seconds
-          # batch took 27 seconds
-          # batch took 27 seconds
-          # batch took 27 seconds
-          # batch took 26 seconds
-          # batch took 26 seconds
-          # batch took 19 seconds
-          #
-          # Updating 1000000 addresses in batches of 100000
-          # batch took 17 seconds
-          # batch took 15 seconds
-          # batch took 17 seconds
-          # batch took 17 seconds
-          # batch took 17 seconds
-          # batch took 17 seconds
-          # batch took 17 seconds
-          # batch took 17 seconds
-          # batch took 17 seconds
-          # batch took 17 seconds
-          #
-          # This is with mysql:
-          # Updating 1000000 records in one shot
-          # batch updated in 153 seconds
-          #
-          # Updating 1000000 records in batches of 200000, this may take a while...
-          # batch took 41 seconds
-          # batch took 37 seconds
-          # batch took 35 seconds
-          # batch took 28 seconds
-          # batch took 27 seconds
-          #
-          # Updating 1000000 records in batches of 150000, this may take a while...
-          # batch took 30 seconds
-          # batch took 29 seconds
-          # batch took 18 seconds
-          # batch took 18 seconds
-          # batch took 17 seconds
-          # batch took 29 seconds
-          # batch took 12 seconds
-          #
-          # Updating 1000000 records in batches of 100000, this may take a while...
-          # batch took 10 seconds
-          # batch took 11 seconds
-          # batch took 12 seconds
-          # batch took 13 seconds
-          # batch took 12 seconds
-          # batch took 12 seconds
-          # batch took 14 seconds
-          # batch took 19 seconds
-          # batch took 20 seconds
-          # batch took 21 seconds
-          #
-          # Please note that the migration will be much faster when there's no index
-          # on the `name` column. For example, with mysql each batch takes exactly
-          # the same time:
-          #
-          # Updating 1000000 records in batches of 200000, this may take a while...
-          # batch took 17 seconds
-          # batch took 17 seconds
-          # batch took 17 seconds
-          # batch took 16 seconds
-          # batch took 17 seconds
-          #
-          # So, if special need arise, one can drop the index added with migration
-          # 20210122110141_add_name_to_spree_addresses.rb and add the index later,
-          # in non blocking ways. For postgresql:
-          # add_index(:spree_addresses, :name, algorithm: :concurrently)
-          #
-          # For mysql 5.6:
-          # sql = "ALTER TABLE spree_addresses ADD INDEX index_spree_addresses_on_name (name), ALGORITHM=INPLACE, LOCK=NONE;"
-          # ActiveRecord::Base.connection.execute sql
-          #
-          puts '  Data migration will happen in batches. The default value is 100_000, which should take less than 20 seconds on mysql or postgresql.'
-          size = shell.ask('  Please enter a different batch size, or press return to confirm the default: ')
-          size = (size.presence || 100_000).to_i
-
-          abort "  Invalid batch size number #{size}, please run the task again." unless size.positive?
-
-          batches_total = (count / size).ceil
-          puts "  We're going to migrate #{count} records in #{batches_total} batches of #{size}."
-
-          answer = shell.ask('  Do you want to proceed?', limited_to: ['Y', 'N'], case_insensitive: true)
-          if answer == 'Y'
-            puts "  Updating #{count} records in batches of #{size}, this may take a while..."
-
-            records.in_batches(of: size).each.with_index(1) do |batch, index|
-              now = Time.zone.now
-              batch.update_all(concat_statement)
-              puts "  Batch #{index}/#{batches_total} done in #{(Time.zone.now - now).to_i} seconds."
-            end
-          else
-            puts "  Database not migrated. Please, make sure to fill address's name field on your own."
-          end
-        end
-      end
-    end
-  end
-end