goca-spree-core 3.1.14.rails.5.0 → 3.1.14.rails.5.0.1

data/app/models/spree/zone.rb

@@ -33,7 +33,7 @@ module Spree
         # Match zones of the same kind with similar countries
         joins(countries: :zones).
           where("zone_members_spree_countries_join.zone_id = ?", zone.id).
-          uniq
+          distinct
       else
         # Match zones of the same kind with similar states in AND match zones
         # that have the states countries in
@@ -44,7 +44,7 @@ module Spree
             spree_zone_members.zoneable_id IN (?))",
           zone.state_ids,
           zone.states.pluck(:country_id)
-        ).uniq
+        ).distinct
       end
     end
 

data/app/validators/db_maximum_length_validator.rb

@@ -2,7 +2,11 @@
 # Validates a field based on the maximum length of the underlying DB field, if there is one.
 class DbMaximumLengthValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    limit = record.class.columns_hash[attribute.to_s].limit
+    if defined?(Globalize)
+      limit = record.class.translation_class.columns_hash[attribute.to_s].limit
+    else
+      limit = record.class.columns_hash[attribute.to_s].limit
+    end
     value = record[attribute.to_sym]
     if value && limit && value.to_s.length > limit
       record.errors.add(attribute.to_sym, :too_long, count: limit)

data/config/initializers/friendly_id.rb

@@ -1,88 +1,7 @@
-# FriendlyId Global Configuration
-#
-# Use this to set up shared configuration options for your entire application.
-# Any of the configuration options shown here can also be applied to single
-# models by passing arguments to the `friendly_id` class method or defining
-# methods in your model.
-#
 # To learn more, check out the guide:
-#
 # http://norman.github.io/friendly_id/file.Guide.html
-
 FriendlyId.defaults do |config|
-  # ## Reserved Words
-  #
-  # Some words could conflict with Rails's routes when used as slugs, or are
-  # undesirable to allow as slugs. Edit this list as needed for your app.
   config.use :reserved
-
   config.reserved_words = %w(new edit index session login logout users admin
     stylesheets assets javascripts images)
-
-  #  ## Friendly Finders
-  #
-  # Uncomment this to use friendly finders in all models. By default, if
-  # you wish to find a record by its friendly id, you must do:
-  #
-  #    MyModel.friendly.find('foo')
-  #
-  # If you uncomment this, you can do:
-  #
-  #    MyModel.find('foo')
-  #
-  # This is significantly more convenient but may not be appropriate for
-  # all applications, so you must explicity opt-in to this behavior. You can
-  # always also configure it on a per-model basis if you prefer.
-  #
-  # Something else to consider is that using the :finders addon boosts
-  # performance because it will avoid Rails-internal code that makes runtime
-  # calls to `Module.extend`.
-  #
-  # config.use :finders
-  #
-  # ## Slugs
-  #
-  # Most applications will use the :slugged module everywhere. If you wish
-  # to do so, uncomment the following line.
-  #
-  # config.use :slugged
-  #
-  # By default, FriendlyId's :slugged addon expects the slug column to be named
-  # 'slug', but you can change it if you wish.
-  #
-  # config.slug_column = 'slug'
-  #
-  # When FriendlyId can not generate a unique ID from your base method, it appends
-  # a UUID, separated by a single dash. You can configure the character used as the
-  # separator. If you're upgrading from FriendlyId 4, you may wish to replace this
-  # with two dashes.
-  #
-  # config.sequence_separator = '-'
-  #
-  #  ## Tips and Tricks
-  #
-  #  ### Controlling when slugs are generated
-  #
-  # As of FriendlyId 5.0, new slugs are generated only when the slug field is
-  # nil, but if you're using a column as your base method can change this
-  # behavior by overriding the `should_generate_new_friendly_id` method that
-  # FriendlyId adds to your model. The change below makes FriendlyId 5.0 behave
-  # more like 4.0.
-  #
-  # config.use Module.new {
-  #   def should_generate_new_friendly_id?
-  #     slug.blank? || <your_column_name_here>_changed?
-  #   end
-  # }
-  #
-  # FriendlyId uses Rails's `parameterize` method to generate slugs, but for
-  # languages that don't use the Roman alphabet, that's not usually suffient. Here
-  # we use the Babosa library to transliterate Russian Cyrillic slugs to ASCII. If
-  # you use this, don't forget to add "babosa" to your Gemfile.
-  #
-  # config.use Module.new {
-  #   def normalize_friendly_id(text)
-  #     text.to_slug.normalize! :transliterations => [:russian, :latin]
-  #   end
-  # }
 end

data/db/default/spree/countries.rb

@@ -1,6 +1,6 @@
 require 'carmen'
 
-connection      = ActiveRecord::Base.connection
+connection      = ApplicationRecord.connection
 country_inserts = []
 
 country_values = -> do

data/db/default/spree/roles.rb

@@ -1,2 +1,2 @@
-Spree::Role.where(:name => "admin").first_or_create
-Spree::Role.where(:name => "user").first_or_create
+Spree::Role.where(name: "admin").first_or_create
+Spree::Role.where(name: "user").first_or_create

data/db/default/spree/states.rb

@@ -1,4 +1,4 @@
-connection = ActiveRecord::Base.connection
+connection = ApplicationRecord.connection
 state_inserts = []
 
 state_values = -> do

data/lib/generators/spree/custom_user/custom_user_generator.rb

@@ -35,7 +35,7 @@ module Spree
     end
 
     def self.next_migration_number(dirname)
-      if ActiveRecord::Base.timestamped_migrations
+      if ApplicationRecord.timestamped_migrations
         sleep 1 # make sure to get a different migration every time
         Time.new.utc.strftime("%Y%m%d%H%M%S")
       else

data/lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt

@@ -30,7 +30,7 @@ module Spree
   end
 end
 
-ApplicationController.send :include, Spree::AuthenticationHelpers
-ApplicationController.send :include, Spree::CurrentUserHelpers
+ApplicationController.include Spree::AuthenticationHelpers
+ApplicationController.include Spree::CurrentUserHelpers
 
-Spree::Api::BaseController.send :include, Spree::CurrentUserHelpers
+Spree::Api::BaseController.include Spree::CurrentUserHelpers

data/lib/generators/spree/custom_user/templates/migration.rb.tt

@@ -1,6 +1,6 @@
-class AddSpreeFieldsToCustomUserTable < ActiveRecord::Migration
+class AddSpreeFieldsToCustomUserTable < ActiveRecord::Migration[4.2]
   def up
-    add_column <%= table_name.inspect %>, :spree_api_key, :string, :limit => 48
+    add_column <%= table_name.inspect %>, :spree_api_key, :string, limit: 48
     add_column <%= table_name.inspect %>, :ship_address_id, :integer
     add_column <%= table_name.inspect %>, :bill_address_id, :integer
   end

data/lib/generators/spree/dummy/dummy_generator.rb

@@ -6,8 +6,8 @@ module Spree
   class DummyGenerator < Rails::Generators::Base
     desc "Creates blank Rails application, installs Spree and all sample data"
 
-    class_option :lib_name, :default => ''
-    class_option :database, :default => ''
+    class_option :lib_name, default: ''
+    class_option :database, default: ''
 
     def self.source_paths
       paths = self.superclass.source_paths
@@ -41,14 +41,14 @@ module Spree
       @lib_name = options[:lib_name]
       @database = options[:database]
 
-      template "rails/database.yml", "#{dummy_path}/config/database.yml", :force => true
-      template "rails/boot.rb", "#{dummy_path}/config/boot.rb", :force => true
-      template "rails/application.rb", "#{dummy_path}/config/application.rb", :force => true
-      template "rails/routes.rb", "#{dummy_path}/config/routes.rb", :force => true
-      template "rails/test.rb", "#{dummy_path}/config/environments/test.rb", :force => true
-      template "rails/script/rails", "#{dummy_path}/spec/dummy/script/rails", :force => true
-      template "initializers/custom_user.rb", "#{dummy_path}/config/initializers/custom_user.rb", :force => true
-      template "initializers/devise.rb", "#{dummy_path}/config/initializers/devise.rb", :force => true
+      template "rails/database.yml", "#{dummy_path}/config/database.yml", force: true
+      template "rails/boot.rb", "#{dummy_path}/config/boot.rb", force: true
+      template "rails/application.rb", "#{dummy_path}/config/application.rb", force: true
+      template "rails/routes.rb", "#{dummy_path}/config/routes.rb", force: true
+      template "rails/test.rb", "#{dummy_path}/config/environments/test.rb", force: true
+      template "rails/script/rails", "#{dummy_path}/spec/dummy/script/rails", force: true
+      template "initializers/custom_user.rb", "#{dummy_path}/config/initializers/custom_user.rb", force: true
+      template "initializers/devise.rb", "#{dummy_path}/config/initializers/devise.rb", force: true
     end
 
     def test_dummy_inject_extension_requirements
@@ -91,7 +91,7 @@ begin
 rescue LoadError
   # #{requirement} is not available.
 end
-      ], :before => /require '#{@lib_name}'/, :verbose => true
+      ], before: /require '#{@lib_name}'/, verbose: true
     end
 
     def dummy_path

data/lib/generators/spree/dummy/templates/rails/application.rb

@@ -2,7 +2,7 @@ require File.expand_path('../boot', __FILE__)
 
 require 'rails/all'
 
-Bundler.require(*Rails.groups(:assets => %w(development test)))
+Bundler.require(*Rails.groups(assets: %w(development test)))
 
 require '<%= lib_name %>'
 

data/lib/generators/spree/dummy/templates/rails/database.yml

@@ -1,6 +1,9 @@
 <% if agent_number = ENV['TC_AGENT_NUMBER']
 database_prefix = agent_number + '_'
 end %>
+<% if options[:lib_name]
+  lib_name = options[:lib_name].gsub('/', '_')
+end %>
 <% db_password = ENV['DB_PASSWORD'] %>
 <% db_username = ENV['DB_USERNAME'] %>
 <% case ENV['DB']
@@ -28,13 +31,13 @@ mysql: &mysql
 
 development:
   <<: *mysql
-  database: <%= database_prefix %><%= options[:lib_name] %>_spree_development
+  database: <%= database_prefix %><%= lib_name %>_spree_development
 test:
   <<: *mysql
-  database: <%= database_prefix %><%= options[:lib_name] %>_spree_test
+  database: <%= database_prefix %><%= lib_name %>_spree_test
 production:
   <<: *mysql
-  database: <%= database_prefix %><%= options[:lib_name] %>_spree_production
+  database: <%= database_prefix %><%= lib_name %>_spree_production
 <% when 'postgres' %>
 <% db_host = ENV['DB_HOST'] %>
 postgres: &postgres
@@ -52,13 +55,13 @@ postgres: &postgres
 
 development:
   <<: *postgres
-  database: <%= database_prefix %><%= options[:lib_name] %>_spree_development
+  database: <%= database_prefix %><%= lib_name %>_spree_development
 test:
   <<: *postgres
-  database: <%= database_prefix %><%= options[:lib_name] %>_spree_test
+  database: <%= database_prefix %><%= lib_name %>_spree_test
 production:
   <<: *postgres
-  database: <%= database_prefix %><%= options[:lib_name] %>_spree_production
+  database: <%= database_prefix %><%= lib_name %>_spree_production
 <% else %>
 development:
   adapter: sqlite3

data/lib/generators/spree/dummy/templates/rails/test.rb

@@ -9,7 +9,7 @@ Dummy::Application.configure do
 
   # Configure static asset server for tests with Cache-Control for performance
   config.public_file_server.enabled = true
-  config.public_file_server.headers = { 'Cache-Control' => "public, max-age=3600" }
+  config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true

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

@@ -5,15 +5,15 @@ require 'bundler/cli'
 
 module Spree
   class InstallGenerator < Rails::Generators::Base
-    class_option :migrate, :type => :boolean, :default => true, :banner => 'Run Spree migrations'
-    class_option :seed, :type => :boolean, :default => true, :banner => 'load seed data (migrations must be run)'
-    class_option :sample, :type => :boolean, :default => true, :banner => 'load sample data (migrations must be run)'
-    class_option :auto_accept, :type => :boolean
-    class_option :user_class, :type => :string
-    class_option :admin_email, :type => :string
-    class_option :admin_password, :type => :string
-    class_option :lib_name, :type => :string, :default => 'spree'
-    class_option :enforce_available_locales, :type => :boolean, :default => nil
+    class_option :migrate, type: :boolean, default: true, banner: 'Run Spree migrations'
+    class_option :seed, type: :boolean, default: true, banner: 'load seed data (migrations must be run)'
+    class_option :sample, type: :boolean, default: true, banner: 'load sample data (migrations must be run)'
+    class_option :auto_accept, type: :boolean
+    class_option :user_class, type: :string
+    class_option :admin_email, type: :string
+    class_option :admin_password, type: :string
+    class_option :lib_name, type: :string, default: 'spree'
+    class_option :enforce_available_locales, type: :boolean, default: nil
 
     def self.source_paths
       paths = self.superclass.source_paths
@@ -172,7 +172,7 @@ Spree::Auth::Engine.load_seed if defined?(Spree::Auth)
     end
 
     def notify_about_routes
-      insert_into_file File.join('config', 'routes.rb'), :after => "Rails.application.routes.draw do\n" do
+      insert_into_file File.join('config', 'routes.rb'), after: "Rails.application.routes.draw do\n" do
         %Q{
   # This line mounts Spree's routes at the root of your application.
   # This means, any requests to URLs such as /products, will go to Spree::ProductsController.

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

@@ -52,7 +52,7 @@ module Spree
               end
 
               if format_value.is_a?(Proc)
-                options = {action_name.to_sym => {format_name.to_sym => {:success => format_value}}}
+                options = {action_name.to_sym => {format_name.to_sym => {success: format_value}}}
               end
 
               self.spree_responders.deep_merge!(self.name.to_sym => options)

data/lib/spree/core/delegate_belongs_to.rb

@@ -29,7 +29,7 @@ module DelegateBelongsTo
     # @todo Integrate this with ActiveRecord::Dirty, so if you set a property through one of these setters and then call save on this object, it will save the associated object automatically.
     # delegate_belongs_to :contact
     # delegate_belongs_to :contact, [:defaults]  ## same as above, and useless
-    # delegate_belongs_to :contact, [:defaults, :address, :fullname], :class_name => 'VCard'
+    # delegate_belongs_to :contact, [:defaults, :address, :fullname], class_name: 'VCard'
     ##
     def delegate_belongs_to(association, *attrs)
       opts = attrs.extract_options!
@@ -92,4 +92,4 @@ module DelegateBelongsTo
   protected :delegator_for_setter
 end
 
-ActiveRecord::Base.send :include, DelegateBelongsTo
+ActiveRecord::Base.include DelegateBelongsTo

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

@@ -7,8 +7,8 @@ module Spree
         def initialize(product, product_params, options = {})
           @product = product || Spree::Product.new(product_params)
 
-          @product_attrs = product_params
-          @variants_attrs = options[:variants_attrs] || []
+          @product_attrs = product_params.to_h
+          @variants_attrs = (options[:variants_attrs] || []).map(&:to_h)
           @options_attrs = options[:options_attrs] || []
         end
 

data/lib/spree/core/product_duplicator.rb

@@ -58,7 +58,7 @@ module Spree
 
     def duplicate_image(image)
       new_image = image.dup
-      new_image.assign_attributes(:attachment => image.attachment.clone)
+      new_image.assign_attributes(attachment: image.attachment.clone)
       new_image
     end
 

data/lib/spree/core/product_filters.rb

@@ -108,7 +108,7 @@ module Spree
         pp = Spree::ProductProperty.arel_table
         conds = Hash[*brands.map { |b| [b, pp[:value].eq(b)] }.flatten]
         {
-          name:   'Brands',
+          name:   I18n.t('spree.taxonomy_brands_name'),
           scope:  :brand_any,
           conds:  conds,
           labels: (brands.sort).map { |k| [k, k] }

data/lib/spree/core/search/base.rb

@@ -70,7 +70,7 @@ module Spree
               else
                 base_scope = base_scope.merge(Spree::Product.ransack({scope_name => scope_attribute}).result)
               end
-            end if search.is_a?(Hash)
+            end if search.is_a?(ActionController::Parameters)
             base_scope
           end
 

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "3.1.14.rails.5.0"
+    "3.1.14.rails.5.0.1"
   end
 end

data/lib/spree/i18n/initializer.rb

@@ -1 +1 @@
-Spree::BaseController.send(:include, Spree::ViewContext)
+Spree::BaseController.include Spree::ViewContext

data/lib/spree/localized_number.rb

@@ -15,6 +15,9 @@ module Spree
       # then replace the locale-specific decimal separator with the standard separator if necessary
       number.gsub!(separator, '.') unless separator == '.'
 
+      # Returns 0 to avoid ArgumentError: invalid value for BigDecimal(): "" for empty string
+      return 0 unless number.present?
+
       number.to_d
     end
 

data/lib/spree/permitted_attributes.rb

@@ -45,7 +45,7 @@ module Spree
 
     @@image_attributes = [:alt, :attachment, :position, :viewable_type, :viewable_id]
 
-    @@inventory_unit_attributes = [:shipment, :variant_id]
+    @@inventory_unit_attributes = [:shipment, :shipment_id, :variant_id]
 
     @@line_item_attributes = [:id, :variant_id, :quantity]
 

data/lib/spree/testing_support/caching.rb

@@ -24,9 +24,9 @@ module Spree
 end
 
 RSpec.configure do |config|
-  config.include Spree::TestingSupport::Caching, :caching => true
+  config.include Spree::TestingSupport::Caching, caching: true
 
-  config.before(:each, :caching => true) do
+  config.before(:each, caching: true) do
     ActionController::Base.perform_caching = true
 
     ActiveSupport::Notifications.subscribe("read_fragment.action_controller") do |event, start_time, finish_time, _, details|
@@ -40,7 +40,7 @@ RSpec.configure do |config|
     end
   end
 
-  config.after(:each, :caching => true) do
+  config.after(:each, caching: true) do
     ActionController::Base.perform_caching = false
     Rails.cache.clear
   end

data/lib/spree/testing_support/controller_requests.rb

@@ -6,7 +6,7 @@
 #
 #   require 'spree/testing_support/controller_requests'
 #   RSpec.configure do |c|
-#     c.include Spree::TestingSupport::ControllerRequests, :type => :controller
+#     c.include Spree::TestingSupport::ControllerRequests, type: :controller
 #   end
 #
 # Then, in your controller tests, you can access spree routes like this:
@@ -80,13 +80,13 @@ module Spree
 
       def process_spree_action(action, parameters = nil, session = nil, flash = nil, method = "GET")
         parameters ||= {}
-        process(action, method, parameters, session, flash)
+        process(action, method: method, params: parameters, session: session, flash: flash)
       end
 
       def process_spree_xhr_action(action, parameters = nil, session = nil, flash = nil, method = :get)
         parameters ||= {}
-        parameters.reverse_merge!(:format => :json)
-        xml_http_request(method, action, parameters, session, flash)
+        parameters.reverse_merge!(format: :json)
+        process(action, method: method, params: parameters, session: session, flash: flash, xhr: true)
       end
     end
   end

data/lib/spree/testing_support/kernel.rb

@@ -0,0 +1,18 @@
+module Spree
+  module TestingSupport
+    module Kernel
+
+      private
+
+      def silence_stream(stream)
+        old_stream = stream.dup
+        stream.reopen(RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ ? 'NUL:' : '/dev/null')
+        stream.sync = true
+        yield
+      ensure
+        stream.reopen(old_stream)
+        old_stream.close
+      end
+    end
+  end
+end

data/lib/spree/testing_support/order_walkthrough.rb

@@ -13,8 +13,8 @@ class OrderWalkthrough
     # Need to create a valid zone too...
     zone = FactoryBot.create(:zone)
     country = FactoryBot.create(:country)
-    zone.members << Spree::ZoneMember.create(:zoneable => country)
-    country.states << FactoryBot.create(:state, :country => country)
+    zone.members << Spree::ZoneMember.create(zoneable: country)
+    country.states << FactoryBot.create(:state, country: country)
 
     # A shipping method must exist for rates to be displayed on checkout page
     unless Spree::ShippingMethod.exists?
@@ -45,8 +45,8 @@ class OrderWalkthrough
   end
 
   def self.address(order)
-    order.bill_address = FactoryBot.create(:address, :country_id => Spree::Zone.global.members.first.zoneable.id)
-    order.ship_address = FactoryBot.create(:address, :country_id => Spree::Zone.global.members.first.zoneable.id)
+    order.bill_address = FactoryBot.create(:address, country_id: Spree::Zone.global.members.first.zoneable.id)
+    order.ship_address = FactoryBot.create(:address, country_id: Spree::Zone.global.members.first.zoneable.id)
     order.next!
   end
 

data/lib/tasks/core.rake

@@ -32,7 +32,7 @@ use rake db:load_file[/absolute/path/to/sample/filename.rb]}
   end
 
   desc "Migrate schema to version 0 and back up again. WARNING: Destroys all data in tables!!"
-  task :remigrate => :environment do
+  task remigrate: :environment do
     require 'highline/import'
 
     if ENV['SKIP_NAG'] or ENV['OVERWRITE'].to_s.downcase == 'true' or agree("This task will destroy any data in the database. Are you sure you want to \ncontinue? [y/n] ")
@@ -101,7 +101,7 @@ use rake db:load_file[/absolute/path/to/sample/filename.rb]}
 
 
   desc "Fix orphan line items after upgrading to Spree 3.1: only needed if you have line items attached to deleted records with Slug (product) and SKU (variant) duplicates of non-deleted records."
-  task :fix_orphan_line_items => :environment do |t, args|
+  task fix_orphan_line_items: :environment do |t, args|
     def get_input
       STDOUT.flush
       input = STDIN.gets.chomp

data/spree_core.gemspec

@@ -3,12 +3,12 @@ require_relative 'lib/spree/core/version.rb'
 
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
-  s.name        = 'spree_core'
+  s.name        = 'goca-spree-core'
   s.version     = Spree.version
   s.summary     = 'The bare bones necessary for Spree.'
   s.description = 'The bare bones necessary for Spree.'
 
-  s.required_ruby_version     = '>= 2.1.0'
+  s.required_ruby_version     = '>= 2.2.2'
   s.required_rubygems_version = '>= 1.8.23'
 
   s.author      = 'Sean Schofield'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goca-spree-core
 version: !ruby/object:Gem::Version
-  version: 3.1.14.rails.5.0
+  version: 3.1.14.rails.5.0.1
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-02-05 00:00:00.000000000 Z
+date: 2025-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -369,6 +369,7 @@ files:
 - app/mailers/spree/reimbursement_mailer.rb
 - app/mailers/spree/shipment_mailer.rb
 - app/mailers/spree/test_mailer.rb
+- app/models/application_record.rb
 - app/models/concerns/spree/adjustment_source.rb
 - app/models/concerns/spree/calculated_adjustments.rb
 - app/models/concerns/spree/default_price.rb
@@ -925,6 +926,7 @@ files:
 - lib/spree/testing_support/factories/zone_member_factory.rb
 - lib/spree/testing_support/flash.rb
 - lib/spree/testing_support/i18n.rb
+- lib/spree/testing_support/kernel.rb
 - lib/spree/testing_support/microdata.rb
 - lib/spree/testing_support/order_walkthrough.rb
 - lib/spree/testing_support/preferences.rb
@@ -956,7 +958,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="