spree_core 3.1.14 → 3.2.0.rc1

data/db/migrate/20150118212101_create_spree_store_credit_types.rb

@@ -1,4 +1,4 @@
-class CreateSpreeStoreCreditTypes < ActiveRecord::Migration
+class CreateSpreeStoreCreditTypes < ActiveRecord::Migration[4.2]
   def change
     create_table :spree_store_credit_types do |t|
       t.string :name

data/db/migrate/20150121022521_remove_environment_from_payment_method.rb

@@ -1,4 +1,4 @@
-class RemoveEnvironmentFromPaymentMethod < ActiveRecord::Migration
+class RemoveEnvironmentFromPaymentMethod < ActiveRecord::Migration[4.2]
   def up
     Spree::PaymentMethod.where('environment != ?', Rails.env).update_all(active: false)
     remove_column :spree_payment_methods, :environment

data/db/migrate/20150122145607_add_resellable_to_return_items.rb

@@ -1,4 +1,4 @@
-class AddResellableToReturnItems < ActiveRecord::Migration
+class AddResellableToReturnItems < ActiveRecord::Migration[4.2]
   def change
     add_column :spree_return_items, :resellable, :boolean, default: true, null: false
   end

data/db/migrate/20150122202432_add_code_to_spree_promotion_categories.rb

@@ -1,4 +1,4 @@
-class AddCodeToSpreePromotionCategories < ActiveRecord::Migration
+class AddCodeToSpreePromotionCategories < ActiveRecord::Migration[4.2]
   def change
     add_column :spree_promotion_categories, :code, :string
   end

data/db/migrate/20150128032538_remove_environment_from_tracker.rb

@@ -1,4 +1,4 @@
-class RemoveEnvironmentFromTracker < ActiveRecord::Migration
+class RemoveEnvironmentFromTracker < ActiveRecord::Migration[4.2]
   def up
     Spree::Tracker.where('environment != ?', Rails.env).update_all(active: false)
     remove_column :spree_trackers, :environment

data/db/migrate/20150128060325_remove_spree_configurations.rb

@@ -1,4 +1,4 @@
-class RemoveSpreeConfigurations < ActiveRecord::Migration
+class RemoveSpreeConfigurations < ActiveRecord::Migration[4.2]
   def up
     drop_table "spree_configurations"
   end

data/db/migrate/20150216173445_add_index_to_spree_stock_items_variant_id.rb

@@ -1,4 +1,4 @@
-class AddIndexToSpreeStockItemsVariantId < ActiveRecord::Migration
+class AddIndexToSpreeStockItemsVariantId < ActiveRecord::Migration[4.2]
   def up
     unless index_exists? :spree_stock_items, :variant_id
       add_index :spree_stock_items, :variant_id

data/db/migrate/20150309161154_ensure_payments_have_numbers.rb

@@ -1,4 +1,4 @@
-class EnsurePaymentsHaveNumbers < ActiveRecord::Migration
+class EnsurePaymentsHaveNumbers < ActiveRecord::Migration[4.2]
   def change
     add_index :spree_payments, :number unless index_exists?(:spree_payments, :number)
     Spree::Payment.where(number: nil).find_each do |payment|

data/db/migrate/20150314013438_add_missing_indexes_on_spree_tables.rb

@@ -1,4 +1,4 @@
-class AddMissingIndexesOnSpreeTables < ActiveRecord::Migration
+class AddMissingIndexesOnSpreeTables < ActiveRecord::Migration[4.2]
   def change
     if table_exists?(:spree_promotion_rules_users) && !index_exists?(:spree_promotion_rules_users,
                                                                      [:user_id, :promotion_rule_id],

data/db/migrate/20150317174308_remove_duplicated_indexes_from_multi_columns.rb

@@ -1,4 +1,4 @@
-class RemoveDuplicatedIndexesFromMultiColumns < ActiveRecord::Migration
+class RemoveDuplicatedIndexesFromMultiColumns < ActiveRecord::Migration[4.2]
   def change
     remove_index :spree_adjustments, name: "index_adjustments_on_order_id"
     remove_index :spree_option_types_prototypes, :prototype_id

data/db/migrate/20150324104002_remove_user_index_from_spree_state_changes.rb

@@ -1,4 +1,4 @@
-class RemoveUserIndexFromSpreeStateChanges < ActiveRecord::Migration
+class RemoveUserIndexFromSpreeStateChanges < ActiveRecord::Migration[4.2]
   def up
     if index_exists? :spree_state_changes, :user_id
       remove_index :spree_state_changes, :user_id

data/db/migrate/20150515211137_fix_adjustment_order_id.rb

@@ -1,4 +1,4 @@
-class FixAdjustmentOrderId < ActiveRecord::Migration
+class FixAdjustmentOrderId < ActiveRecord::Migration[4.2]
   def change
     say 'Populate order_id from adjustable_id where appropriate'
     execute(<<-SQL.squish)

data/db/migrate/20150522071831_add_position_to_spree_payment_methods.rb

@@ -1,4 +1,4 @@
-class AddPositionToSpreePaymentMethods < ActiveRecord::Migration
+class AddPositionToSpreePaymentMethods < ActiveRecord::Migration[4.2]
   def change
     add_column :spree_payment_methods, :position, :integer, default: 0
   end

data/db/migrate/20150522181728_add_deleted_at_to_friendly_id_slugs.rb

@@ -1,4 +1,4 @@
-class AddDeletedAtToFriendlyIdSlugs < ActiveRecord::Migration
+class AddDeletedAtToFriendlyIdSlugs < ActiveRecord::Migration[4.2]
   def change
     add_column :friendly_id_slugs, :deleted_at, :datetime
     add_index :friendly_id_slugs, :deleted_at

data/db/migrate/20150609093816_increase_scale_on_pre_tax_amounts.rb

@@ -1,4 +1,4 @@
-class IncreaseScaleOnPreTaxAmounts < ActiveRecord::Migration
+class IncreaseScaleOnPreTaxAmounts < ActiveRecord::Migration[4.2]
   def change
     # set pre_tax_amount on shipments to discounted_amount - included_tax_total
     # so that the null: false option on the shipment pre_tax_amount doesn't generate

data/db/migrate/20150626181949_add_taxable_adjustment_total_to_line_item.rb

@@ -1,4 +1,4 @@
-class AddTaxableAdjustmentTotalToLineItem < ActiveRecord::Migration
+class AddTaxableAdjustmentTotalToLineItem < ActiveRecord::Migration[4.2]
   def change
     add_column :spree_line_items, :taxable_adjustment_total, :decimal,
                precision: 10, scale: 2, default: 0.0, null: false

data/db/migrate/20150627090949_migrate_payment_methods_display.rb

@@ -1,4 +1,4 @@
-class MigratePaymentMethodsDisplay < ActiveRecord::Migration
+class MigratePaymentMethodsDisplay < ActiveRecord::Migration[4.2]
   def change
     Spree::PaymentMethod.all.each do |method|
       if method.display_on.blank?

data/db/migrate/20150707204155_enable_acts_as_paranoid_on_calculators.rb

@@ -1,4 +1,4 @@
-class EnableActsAsParanoidOnCalculators < ActiveRecord::Migration
+class EnableActsAsParanoidOnCalculators < ActiveRecord::Migration[4.2]
   def change
     add_column :spree_calculators, :deleted_at, :datetime
     add_index :spree_calculators, :deleted_at

data/db/migrate/20150714154102_spree_payment_method_store_credits.rb

@@ -1,4 +1,4 @@
-class SpreePaymentMethodStoreCredits < ActiveRecord::Migration
+class SpreePaymentMethodStoreCredits < ActiveRecord::Migration[4.2]
   def up
     # Reload to pick up new position column for acts_as_list
     Spree::PaymentMethod.reset_column_information

data/db/migrate/20150726141425_rename_has_and_belongs_to_associations_to_model_names.rb

@@ -1,4 +1,4 @@
-class RenameHasAndBelongsToAssociationsToModelNames < ActiveRecord::Migration
+class RenameHasAndBelongsToAssociationsToModelNames < ActiveRecord::Migration[4.2]
   def change
     {
       'spree_option_types_prototypes' => 'spree_option_type_prototypes',

data/db/migrate/20150727191614_spree_store_credit_types.rb

@@ -1,4 +1,4 @@
-class SpreeStoreCreditTypes < ActiveRecord::Migration
+class SpreeStoreCreditTypes < ActiveRecord::Migration[4.2]
   def up
     Spree::StoreCreditType.find_or_create_by(name: 'Expiring', priority: 1)
     Spree::StoreCreditType.find_or_create_by(name: 'Non-expiring', priority: 2)

data/db/migrate/20150819154308_add_discontinued_to_products_and_variants.rb

@@ -1,4 +1,4 @@
-class AddDiscontinuedToProductsAndVariants < ActiveRecord::Migration
+class AddDiscontinuedToProductsAndVariants < ActiveRecord::Migration[4.2]
   def up
     add_column :spree_products, :discontinue_on, :datetime, after: :available_on
     add_column :spree_variants, :discontinue_on, :datetime, after: :deleted_at

data/db/migrate/20151220072838_remove_shipping_method_id_from_spree_orders.rb

@@ -1,4 +1,4 @@
-class RemoveShippingMethodIdFromSpreeOrders < ActiveRecord::Migration
+class RemoveShippingMethodIdFromSpreeOrders < ActiveRecord::Migration[4.2]
   def up
     if column_exists?(:spree_orders, :shipping_method_id, :integer)
       remove_column :spree_orders, :shipping_method_id, :integer

data/db/migrate/20160207191757_add_id_column_to_earlier_habtm_tables.rb

@@ -1,4 +1,4 @@
-class AddIdColumnToEarlierHabtmTables < ActiveRecord::Migration
+class AddIdColumnToEarlierHabtmTables < ActiveRecord::Migration[4.2]
   def up
     add_column :spree_option_type_prototypes, :id, :primary_key
     add_column :spree_option_value_variants, :id, :primary_key

data/db/migrate/20160219165458_add_indexes.rb

@@ -1,4 +1,4 @@
-class AddIndexes < ActiveRecord::Migration
+class AddIndexes < ActiveRecord::Migration[4.2]
   def change
     add_index :spree_assets, :position
     add_index :spree_option_types, :name

data/db/migrate/20160509064646_remove_counter_cache_from_spree_variants_to_spree_stock_items.rb

@@ -0,0 +1,10 @@
+class RemoveCounterCacheFromSpreeVariantsToSpreeStockItems < ActiveRecord::Migration[4.2]
+  def up
+    if column_exists?(:spree_variants, :stock_items_count)
+      remove_column :spree_variants, :stock_items_count
+    end
+  end
+
+  def down
+  end
+end

data/db/migrate/20160511071954_acts_as_taggable_on_spree_migration.rb

@@ -0,0 +1,40 @@
+class ActsAsTaggableOnSpreeMigration < ActiveRecord::Migration[4.2]
+  def self.up
+    create_table :spree_tags do |t|
+      t.string :name
+      t.integer :taggings_count, default: 0
+    end
+
+    create_table :spree_taggings do |t|
+      t.references :tag
+
+      # You should make sure that the column created is
+      # long enough to store the required class names.
+      t.references :taggable, polymorphic: true
+      t.references :tagger, polymorphic: true
+
+      # Limit is created to prevent MySQL error on index
+      # length for MyISAM table type: http://bit.ly/vgW2Ql
+      t.string :context, limit: 128
+
+      t.datetime :created_at
+    end
+
+    add_index :spree_tags, :name, unique: true
+    add_index :spree_taggings,
+              [
+                :tag_id,
+                :taggable_id,
+                :taggable_type,
+                :context,
+                :tagger_id,
+                :tagger_type
+              ],
+              unique: true, name: "spree_taggings_idx"
+  end
+
+  def self.down
+    drop_table :spree_taggings
+    drop_table :spree_tags
+  end
+end

data/db/migrate/20160511072249_change_collation_for_spree_tag_names.rb

@@ -0,0 +1,9 @@
+# This migration is added to circumvent issue #623 and have special characters
+# work properly
+class ChangeCollationForSpreeTagNames < ActiveRecord::Migration[4.2]
+  def up
+    if ActsAsTaggableOn::Utils.using_mysql?
+      execute("ALTER TABLE spree_tags MODIFY name varchar(255) CHARACTER SET utf8 COLLATE utf8_bin;")
+    end
+  end
+end

data/db/migrate/20160511072335_add_missing_indexes_to_spree_taggings.rb

@@ -0,0 +1,14 @@
+class AddMissingIndexesToSpreeTaggings < ActiveRecord::Migration[4.2]
+  def change
+    add_index :spree_taggings, :tag_id
+    add_index :spree_taggings, :taggable_id
+    add_index :spree_taggings, :taggable_type
+    add_index :spree_taggings, :tagger_id
+    add_index :spree_taggings, :context
+
+    add_index :spree_taggings, [:tagger_id, :tagger_type]
+    add_index :spree_taggings,
+              [:taggable_id, :taggable_type, :tagger_id, :context],
+              name: "spree_taggings_idy"
+  end
+end

data/db/migrate/20160608090604_add_zipcode_required_to_spree_countries.rb

@@ -0,0 +1,7 @@
+class AddZipcodeRequiredToSpreeCountries < ActiveRecord::Migration[4.2]
+  def change
+    add_column :spree_countries, :zipcode_required, :boolean, default: true
+    Spree::Country.reset_column_information
+    Spree::Country.where(iso: Spree::Address::NO_ZIPCODE_ISO_CODES).update_all(zipcode_required: false)
+  end
+end

data/db/migrate/20161014145148_add_created_at_to_variant.rb

@@ -0,0 +1,8 @@
+class AddCreatedAtToVariant < ActiveRecord::Migration[5.0]
+  def change
+    add_column :spree_variants, :created_at, :datetime
+    Spree::Variant.reset_column_information
+    Spree::Variant.where.not(updated_at: nil).update_all('created_at = updated_at')
+    Spree::Variant.where(updated_at: nil).update_all(created_at: Time.current, updated_at: Time.current)
+  end
+end

data/db/migrate/20161014152814_add_null_false_to_spree_variants_timestamps.rb

@@ -0,0 +1,6 @@
+class AddNullFalseToSpreeVariantsTimestamps < ActiveRecord::Migration[5.0]
+  def change
+    change_column_null :spree_variants, :created_at, false
+    change_column_null :spree_variants, :updated_at, false
+  end
+end

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

@@ -8,8 +8,8 @@ Dummy::Application.configure do
   config.cache_classes = true
 
   # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_files = true
-  config.static_cache_control = "public, max-age=3600"
+  config.public_file_server.enabled = true
+  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
@@ -125,7 +125,11 @@ Spree::Auth::Engine.load_seed if defined?(Spree::Auth)
     def run_migrations
       if @run_migrations
         say_status :running, "migrations"
-        quietly { rake 'db:migrate' }
+        silence_stream(STDOUT) do
+          silence_stream(STDERR) do
+            silence_warnings { rake 'db:migrate' }
+          end
+        end
       else
         say_status :skipping, "migrations (don't forget to run rake db:migrate)"
       end
@@ -141,7 +145,11 @@ Spree::Auth::Engine.load_seed if defined?(Spree::Auth)
 
         cmd = lambda { rake("db:seed #{rake_options.join(' ')}") }
         if options[:auto_accept] || (options[:admin_email] && options[:admin_password])
-          quietly &cmd
+          silence_stream(STDOUT) do
+            silence_stream(STDERR) do
+              silence_warnings &cmd
+            end
+          end
         else
           cmd.call
         end
@@ -153,14 +161,18 @@ Spree::Auth::Engine.load_seed if defined?(Spree::Auth)
     def load_sample_data
       if @load_sample_data
         say_status :loading, "sample data"
-        quietly { rake 'spree_sample:load' }
+        silence_stream(STDOUT) do
+          silence_stream(STDERR) do
+            silence_warnings { rake 'spree_sample:load' }
+          end
+        end
       else
         say_status :skipping, "sample data (you can always run rake spree_sample:load)"
       end
     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.
@@ -205,5 +217,17 @@ Spree::Auth::Engine.load_seed if defined?(Spree::Auth)
         File.exists?("#{filename}#{extension}")
       end
     end
+
+    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

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

@@ -22,7 +22,7 @@ module Spree
             title_string = @title.present? ? @title : accurate_title
             if title_string.present?
               if Spree::Config[:always_put_site_name_in_title]
-                [title_string, default_title].join(' - ')
+                [title_string, default_title].join(" #{Spree::Config[:title_site_name_separator]} ")
               else
                 title_string
               end
@@ -42,8 +42,8 @@ module Spree
 
           def render_404(exception = nil)
             respond_to do |type|
-              type.html { render :status => :not_found, :file    => "#{::Rails.root}/public/404", :formats => [:html], :layout => nil}
-              type.all  { render :status => :not_found, :nothing => true }
+              type.html { render status: :not_found, file: "#{::Rails.root}/public/404", formats: [:html], layout: nil}
+              type.all  { head :not_found }
             end
           end
 

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

@@ -35,11 +35,8 @@ module Spree
           @current_order = find_order_by_token_or_user(options, true)
 
           if options[:create_order_if_necessary] && (@current_order.nil? || @current_order.completed?)
-            @current_order = Spree::Order.new(current_order_params)
-            @current_order.user ||= try_spree_current_user
-            # See issue #3346 for reasons why this line is here
-            @current_order.created_by ||= try_spree_current_user
-            @current_order.save!
+            @current_order = Spree::Order.create!(current_order_params)
+            @current_order.associate_user! try_spree_current_user if try_spree_current_user
           end
 
           if @current_order

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/engine.rb

@@ -89,7 +89,8 @@ module Spree
           Spree::Promotion::Rules::UserLoggedIn,
           Spree::Promotion::Rules::OneUsePerUser,
           Spree::Promotion::Rules::Taxon,
-          Spree::Promotion::Rules::OptionValue
+          Spree::Promotion::Rules::OptionValue,
+          Spree::Promotion::Rules::Country
         ]
       end
 
@@ -115,12 +116,12 @@ module Spree
       end
 
       config.to_prepare do
-        # Ensure spree locale paths are present before decorators
-        I18n.load_path.unshift(*(Dir.glob(
+        # Load spree locales before decorators
+        I18n.load_path += Dir.glob(
           File.join(
             File.dirname(__FILE__), '../../../config/locales', '*.{rb,yml}'
           )
-        ) - I18n.load_path))
+        )
 
         # Load application's model / class decorators
         Dir.glob(File.join(File.dirname(__FILE__), '../../../app/**/*_decorator*.rb')) do |c|

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