solidus_core 2.4.2 → 2.5.0.beta1

data/db/migrate/20170317035819_add_lft_and_rgt_indexes_to_taxons.rb

@@ -0,0 +1,6 @@
+class AddLftAndRgtIndexesToTaxons < ActiveRecord::Migration[5.0]
+  def change
+    add_index :spree_taxons, :lft
+    add_index :spree_taxons, :rgt
+  end
+end

data/db/migrate/20170319191942_remove_order_id_from_inventory_units.rb

@@ -0,0 +1,28 @@
+class RemoveOrderIdFromInventoryUnits < ActiveRecord::Migration[5.0]
+  class InconsistentInventoryUnitError < StandardError; end
+
+  class InventoryUnit < ActiveRecord::Base
+    self.table_name = "spree_inventory_units"
+    belongs_to :shipment
+  end
+
+  class Shipment < ActiveRecord::Base
+    self.table_name = "spree_shipments"
+    has_many :inventory_units
+  end
+
+  def up
+    if InventoryUnit.
+        joins(:shipment).
+        where.not(
+          'spree_inventory_units.order_id = spree_shipments.order_id'
+        ).exists?
+      raise InconsistentInventoryUnitError, "You have inventory units with inconsistent order references. Please fix those before running this migration"
+    end
+    remove_column :spree_inventory_units, :order_id
+  end
+
+  def down
+    add_reference :spree_inventory_units, :order, index: true
+  end
+end

data/db/migrate/20170608074534_rename_bogus_gateways.rb

@@ -1,13 +1,15 @@
 class RenameBogusGateways < ActiveRecord::Migration[5.0]
   def up
+    require 'solidus/migrations/rename_gateways'
     say_with_time 'Renaming bogus gateways into payment methods' do
-      Rake::Task['solidus:migrations:rename_gateways:up'].invoke
+      Solidus::Migrations::RenameGateways.new.up
     end
   end
 
   def down
+    require 'solidus/migrations/rename_gateways'
     say_with_time 'Renaming bogus payment methods into gateways' do
-      Rake::Task['solidus:migrations:rename_gateways:down'].invoke
+      Solidus::Migrations::RenameGateways.new.down
     end
   end
 end

data/db/migrate/20170831201542_remove_default_tax_from_spree_zones.rb

@@ -1,5 +1,5 @@
 class RemoveDefaultTaxFromSpreeZones < ActiveRecord::Migration[5.1]
   def change
-    remove_column :spree_zones, :default_tax, default: false
+    remove_column :spree_zones, :default_tax, :boolean, default: false
   end
 end

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

@@ -1,21 +1,18 @@
+require 'rails/generators/active_record/migration'
+
 module Spree
   class CustomUserGenerator < Rails::Generators::NamedBase
-    include Rails::Generators::ResourceHelpers
-    include Rails::Generators::Migration
+    include ActiveRecord::Generators::Migration
 
     desc "Set up a Solidus installation with a custom User class"
 
-    def self.source_paths
-      paths = superclass.source_paths
-      paths << File.expand_path('../templates', __FILE__)
-      paths.flatten
-    end
+    source_root File.expand_path('templates', File.dirname(__FILE__))
 
     def check_for_constant
-        klass
+      klass
     rescue NameError
-        @shell.say "Couldn't find #{class_name}. Are you sure that this class exists within your application and is loaded?", :red
-        exit(1)
+      @shell.say "Couldn't find #{class_name}. Are you sure that this class exists within your application and is loaded?", :red
+      exit(1)
     end
 
     def generate
@@ -24,22 +21,14 @@ module Spree
 
       file_action = File.exist?('config/initializers/spree.rb') ? :append_file : :create_file
       send(file_action, 'config/initializers/spree.rb') do
-        %{
-          Rails.application.config.to_prepare do
-            require_dependency 'spree/authentication_helpers'
-          end\n}
+        "Rails.application.config.to_prepare do\n  require_dependency 'spree/authentication_helpers'\nend\n"
       end
-    end
 
-    def self.next_migration_number(dirname)
-      if ActiveRecord::Base.timestamped_migrations
-        sleep 1 # make sure to get a different migration every time
-        Time.new.utc.strftime("%Y%m%d%H%M%S")
-      else
-        "%.3d" % (current_migration_number(dirname) + 1)
-      end
+      gsub_file 'config/initializers/spree.rb', /Spree\.user_class.?=.?.+$/, %{Spree.user_class = "#{class_name}"}
     end
 
+    private
+
     def klass
       class_name.constantize
     end

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

@@ -4,6 +4,8 @@ require 'bundler/cli'
 
 module Spree
   class InstallGenerator < Rails::Generators::Base
+    CORE_MOUNT_ROUTE = "mount Spree::Core::Engine"
+
     class_option :migrate, type: :boolean, default: true, banner: 'Run Solidus 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)'
@@ -149,23 +151,26 @@ Spree::Auth::Engine.load_seed if defined?(Spree::Auth)
     end
 
     def install_routes
-      insert_into_file File.join('config', 'routes.rb'), after: "Rails.application.routes.draw do\n" do
-        <<-ROUTES
+      routes_file_path = File.join('config', 'routes.rb')
+      unless File.read(routes_file_path).include? CORE_MOUNT_ROUTE
+        insert_into_file routes_file_path, after: "Rails.application.routes.draw do\n" do
+          <<-ROUTES
   # This line mounts Solidus's routes at the root of your application.
   # This means, any requests to URLs such as /products, will go to Spree::ProductsController.
   # If you would like to change where this engine is mounted, simply change the :at option to something different.
   #
   # We ask that you don't use the :as option here, as Solidus relies on it being the default of "spree"
-  mount Spree::Core::Engine, at: '/'
+  #{CORE_MOUNT_ROUTE}, at: '/'
 
-        ROUTES
+ROUTES
+        end
       end
 
       unless options[:quiet]
         puts "*" * 50
         puts "We added the following line to your application's config/routes.rb file:"
         puts " "
-        puts "    mount Spree::Core::Engine, at: '/'"
+        puts "    #{CORE_MOUNT_ROUTE}, at: '/'"
       end
     end
 

data/lib/spree/app_configuration.rb

@@ -18,13 +18,14 @@
 require "spree/core/search/base"
 require "spree/core/search/variant"
 require 'spree/preferences/configuration'
+require 'spree/core/environment'
 
 module Spree
   class AppConfiguration < Preferences::Configuration
     # Alphabetized to more easily lookup particular preferences
 
     # @!attribute [rw] address_requires_state
-    #   @return [Boolean] should state/state_name be required
+    #   @return [Boolean] should state/state_name be required (default: +true+)
     preference :address_requires_state, :boolean, default: true
 
     # @!attribute [rw] admin_interface_logo
@@ -68,11 +69,11 @@ module Spree
     #     and later capture has far superior error handing. VISA and MasterCard
     #     also require that shipments are sent within a certain time of the card
     #     being charged.
-    #   @return [Boolean] Perform a sale/purchase transaction at checkout instead of a authorize and capture.
+    #   @return [Boolean] Automatically capture the credit card (as opposed to just authorize and capture later) (default: +false+)
     preference :auto_capture, :boolean, default: false
 
     # @!attribute [rw] auto_capture_exchanges
-    # @return [Boolean] automatically capture the credit card (as opposed to just authorize and capture later) (default: +false+)
+    #   @return [Boolean] Automatically capture the credit card (as opposed to just authorize and capture later) (default: +false+)
     preference :auto_capture_exchanges, :boolean, default: false
 
     # @!attribute [rw] binary_inventory_cache
@@ -256,6 +257,15 @@ module Spree
     #   @return [Boolean] Indicates if stock management can be restricted by location
     preference :can_restrict_stock_management, :boolean, default: false
 
+    # Allows restricting what currencies will be available.
+    #
+    # @!attribute [r] available_currencies
+    #   @returns [Array] An array of available currencies from Money::Currency.all
+    attr_writer :available_currencies
+    def available_currencies
+      @available_currencies ||= ::Money::Currency.all
+    end
+
     # searcher_class allows spree extension writers to provide their own Search class
     class_name_attribute :searcher_class, default: 'Spree::Core::Search::Base'
 
@@ -287,8 +297,6 @@ module Spree
 
     class_name_attribute :shipping_rate_selector_class, default: 'Spree::Stock::ShippingRateSelector'
 
-    class_name_attribute :shipping_rate_taxer_class, default: 'Spree::Tax::ShippingRateTaxer'
-
     # Allows providing your own class for calculating taxes on a shipping rate.
     #
     # @!attribute [rw] shipping_rate_tax_calculator_class
@@ -364,6 +372,13 @@ module Spree
     #   Spree::CurrentStoreSelector
     class_name_attribute :current_store_selector_class, default: 'Spree::StoreSelector::ByServerName'
 
+    # Allows providing your own class for creating urls on taxons
+    #
+    # @!attribute [rw] taxon_url_parametizer_class
+    # @return [Class] a class that provides a `#parameterize` method that
+    # returns a String
+    class_name_attribute :taxon_url_parametizer_class, default: 'ActiveSupport::Inflector'
+
     # Allows providing your own class instance for generating order numbers.
     #
     # @!attribute [rw] order_number_generator
@@ -383,6 +398,89 @@ module Spree
       @stock_configuration ||= Spree::Core::StockConfiguration.new
     end
 
+    def roles
+      @roles ||= Spree::RoleConfiguration.new.tap do |roles|
+        roles.assign_permissions :default, ['Spree::PermissionSets::DefaultCustomer']
+        roles.assign_permissions :admin, ['Spree::PermissionSets::SuperUser']
+      end
+    end
+
+    def environment
+      @environment ||= Spree::Core::Environment.new(self).tap do |env|
+        env.calculators.shipping_methods = %w[
+          Spree::Calculator::Shipping::FlatPercentItemTotal
+          Spree::Calculator::Shipping::FlatRate
+          Spree::Calculator::Shipping::FlexiRate
+          Spree::Calculator::Shipping::PerItem
+          Spree::Calculator::Shipping::PriceSack
+        ]
+
+        env.calculators.tax_rates = %w[
+          Spree::Calculator::DefaultTax
+        ]
+
+        env.stock_splitters = %w[
+          Spree::Stock::Splitter::ShippingCategory
+          Spree::Stock::Splitter::Backordered
+        ]
+
+        env.payment_methods = %w[
+          Spree::PaymentMethod::BogusCreditCard
+          Spree::PaymentMethod::SimpleBogusCreditCard
+          Spree::PaymentMethod::StoreCredit
+          Spree::PaymentMethod::Check
+        ]
+
+        env.promotions = Spree::Promo::Environment.new.tap do |promos|
+          promos.rules = %w[
+            Spree::Promotion::Rules::ItemTotal
+            Spree::Promotion::Rules::Product
+            Spree::Promotion::Rules::User
+            Spree::Promotion::Rules::FirstOrder
+            Spree::Promotion::Rules::UserLoggedIn
+            Spree::Promotion::Rules::OneUsePerUser
+            Spree::Promotion::Rules::Taxon
+            Spree::Promotion::Rules::NthOrder
+            Spree::Promotion::Rules::OptionValue
+            Spree::Promotion::Rules::FirstRepeatPurchaseSince
+            Spree::Promotion::Rules::UserRole
+          ]
+
+          promos.actions = %w[
+            Spree::Promotion::Actions::CreateAdjustment
+            Spree::Promotion::Actions::CreateItemAdjustments
+            Spree::Promotion::Actions::CreateQuantityAdjustments
+            Spree::Promotion::Actions::FreeShipping
+          ]
+
+          promos.shipping_actions = %w[
+            Spree::Promotion::Actions::FreeShipping
+          ]
+        end
+
+        env.calculators.promotion_actions_create_adjustments = %w[
+          Spree::Calculator::FlatPercentItemTotal
+          Spree::Calculator::FlatRate
+          Spree::Calculator::FlexiRate
+          Spree::Calculator::TieredPercent
+          Spree::Calculator::TieredFlatRate
+        ]
+
+        env.calculators.promotion_actions_create_item_adjustments = %w[
+          Spree::Calculator::DistributedAmount
+          Spree::Calculator::FlatRate
+          Spree::Calculator::FlexiRate
+          Spree::Calculator::PercentOnLineItem
+          Spree::Calculator::TieredPercent
+        ]
+
+        env.calculators.promotion_actions_create_quantity_adjustments = %w[
+          Spree::Calculator::PercentOnLineItem
+          Spree::Calculator::FlatRate
+        ]
+      end
+    end
+
     # Default admin VAT location
     #
     # An object that responds to :state_id and :country_id so it can double as a Spree::Address in

data/lib/spree/core.rb

@@ -1,10 +1,9 @@
 require 'rails/all'
-require 'active_merchant'
 require 'acts_as_list'
 require 'awesome_nested_set'
 require 'cancan'
 require 'friendly_id'
-require 'kaminari'
+require 'kaminari/activerecord'
 require 'mail'
 require 'monetize'
 require 'paperclip'
@@ -13,6 +12,7 @@ require 'ransack'
 require 'state_machines-activerecord'
 
 require 'spree/deprecation'
+require 'spree/paranoia_deprecations'
 
 # This is required because ActiveModel::Validations#invalid? conflicts with the
 # invalid state of a Payment. In the future this should be removed.
@@ -53,6 +53,7 @@ end
 
 require 'spree/core/version'
 
+require 'spree/core/active_merchant_dependencies'
 require 'spree/core/class_constantizer'
 require 'spree/core/environment_extension'
 require 'spree/core/environment/calculators'

data/lib/spree/core/active_merchant_dependencies.rb

@@ -0,0 +1,11 @@
+require 'active_merchant/errors'
+
+require 'active_merchant/billing/base'
+
+require 'active_merchant/billing/avs_result'
+require 'active_merchant/billing/cvv_result'
+require 'active_merchant/billing/response'
+
+require 'active_merchant/billing/credit_card_methods'
+require 'active_merchant/billing/credit_card_formatting'
+require 'active_merchant/billing/credit_card'

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

@@ -1,3 +1,5 @@
+require 'cancan'
+
 module Spree
   module Core
     module ControllerHelpers
@@ -17,7 +19,7 @@ module Spree
 
           class_attribute :unauthorized_redirect
           self.unauthorized_redirect = -> do
-            flash[:error] = Spree.t(:authorization_failure)
+            flash[:error] = I18n.t('spree.authorization_failure')
             redirect_to "/unauthorized"
           end
 

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

@@ -1,3 +1,5 @@
+require 'carmen'
+
 module Spree
   module Core
     module ControllerHelpers
@@ -41,13 +43,6 @@ module Spree
           current_store.seo_title
         end
 
-        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 }
-          end
-        end
-
         private
 
         def set_user_language
@@ -56,6 +51,7 @@ module Spree
           locale ||= Rails.application.config.i18n.default_locale
           locale ||= I18n.default_locale
           I18n.locale = locale
+          Carmen.i18n_backend.locale = locale
         end
 
         # Returns which layout to render.

data/lib/spree/core/engine.rb

@@ -1,6 +1,11 @@
+require 'spree/config'
+
 module Spree
   module Core
     class Engine < ::Rails::Engine
+      CREDIT_CARD_NUMBER_PARAM = /payment.*source.*\.number$/
+      CREDIT_CARD_VERIFICATION_VALUE_PARAM = /payment.*source.*\.verification_value$/
+
       isolate_namespace Spree
       engine_name 'spree'
 
@@ -9,114 +14,27 @@ module Spree
       end
 
       initializer "spree.environment", before: :load_config_initializers do |app|
-        app.config.spree = Spree::Core::Environment.new
-      end
-
-      initializer "spree.default_permissions", before: :load_config_initializers do |_app|
-        Spree::RoleConfiguration.configure do |config|
-          config.assign_permissions :default, [Spree::PermissionSets::DefaultCustomer]
-          config.assign_permissions :admin, [Spree::PermissionSets::SuperUser]
-        end
+        app.config.spree = Spree::Config.environment
       end
 
-      initializer "spree.register.calculators", before: :load_config_initializers do |app|
-        app.config.spree.calculators.shipping_methods = %w[
-          Spree::Calculator::Shipping::FlatPercentItemTotal
-          Spree::Calculator::Shipping::FlatRate
-          Spree::Calculator::Shipping::FlexiRate
-          Spree::Calculator::Shipping::PerItem
-          Spree::Calculator::Shipping::PriceSack
-        ]
-
-        app.config.spree.calculators.tax_rates = %w[
-          Spree::Calculator::DefaultTax
-        ]
-      end
-
-      initializer "spree.register.stock_splitters", before: :load_config_initializers do |app|
-        app.config.spree.stock_splitters = %w[
-          Spree::Stock::Splitter::ShippingCategory
-          Spree::Stock::Splitter::Backordered
-        ]
-      end
-
-      initializer "spree.register.payment_methods", before: :load_config_initializers do |app|
-        app.config.spree.payment_methods = %w[
-          Spree::PaymentMethod::BogusCreditCard
-          Spree::PaymentMethod::SimpleBogusCreditCard
-          Spree::PaymentMethod::StoreCredit
-          Spree::PaymentMethod::Check
-        ]
-      end
-
-      # We need to define promotions rules here so extensions and existing apps
-      # can add their custom classes on their initializer files
-      initializer 'spree.promo.environment', before: :load_config_initializers do |app|
-        app.config.spree.promotions = Spree::Promo::Environment.new
-        app.config.spree.promotions.rules = []
-      end
-
-      initializer 'spree.promo.register.promotion.calculators', before: :load_config_initializers do |app|
-        app.config.spree.calculators.promotion_actions_create_adjustments = %w[
-          Spree::Calculator::FlatPercentItemTotal
-          Spree::Calculator::FlatRate
-          Spree::Calculator::FlexiRate
-          Spree::Calculator::TieredPercent
-          Spree::Calculator::TieredFlatRate
-        ]
-
-        app.config.spree.calculators.promotion_actions_create_item_adjustments = %w[
-          Spree::Calculator::DistributedAmount
-          Spree::Calculator::FlatRate
-          Spree::Calculator::FlexiRate
-          Spree::Calculator::PercentOnLineItem
-          Spree::Calculator::TieredPercent
-        ]
-
-        app.config.spree.calculators.promotion_actions_create_quantity_adjustments = %w[
-          Spree::Calculator::PercentOnLineItem
-          Spree::Calculator::FlatRate
-        ]
-      end
-
-      initializer 'spree.promo.register.promotion.rules', before: :load_config_initializers do |app|
-        app.config.spree.promotions.rules = %w[
-          Spree::Promotion::Rules::ItemTotal
-          Spree::Promotion::Rules::Product
-          Spree::Promotion::Rules::User
-          Spree::Promotion::Rules::FirstOrder
-          Spree::Promotion::Rules::UserLoggedIn
-          Spree::Promotion::Rules::OneUsePerUser
-          Spree::Promotion::Rules::Taxon
-          Spree::Promotion::Rules::NthOrder
-          Spree::Promotion::Rules::OptionValue
-          Spree::Promotion::Rules::FirstRepeatPurchaseSince
-          Spree::Promotion::Rules::UserRole
-        ]
-      end
-
-      initializer 'spree.promo.register.promotions.actions', before: :load_config_initializers do |app|
-        app.config.spree.promotions.actions = %w[
-          Spree::Promotion::Actions::CreateAdjustment
-          Spree::Promotion::Actions::CreateItemAdjustments
-          Spree::Promotion::Actions::CreateQuantityAdjustments
-          Spree::Promotion::Actions::FreeShipping
-        ]
-      end
-
-      initializer 'spree.promo.register.promotions.shipping_actions', before: :load_config_initializers do |app|
-        app.config.spree.promotions.shipping_actions = %w[
-          Spree::Promotion::Actions::FreeShipping
-        ]
-      end
+      # leave empty initializers for backwards-compatability. Other apps might still rely on these events
+      initializer "spree.default_permissions", before: :load_config_initializers do; end
+      initializer "spree.register.calculators", before: :load_config_initializers do; end
+      initializer "spree.register.stock_splitters", before: :load_config_initializers do; end
+      initializer "spree.register.payment_methods", before: :load_config_initializers do; end
+      initializer 'spree.promo.environment', before: :load_config_initializers do; end
+      initializer 'spree.promo.register.promotion.calculators', before: :load_config_initializers do; end
+      initializer 'spree.promo.register.promotion.rules', before: :load_config_initializers do; end
+      initializer 'spree.promo.register.promotions.actions', before: :load_config_initializers do; end
+      initializer 'spree.promo.register.promotions.shipping_actions', before: :load_config_initializers do; end
 
       # Filter sensitive information during logging
       initializer "spree.params.filter", before: :load_config_initializers do |app|
         app.config.filter_parameters += [
           %r{^password$},
           %r{^password_confirmation$},
-          %r{^number$}, # Credit Card number
-          %r{^verification_value$} # Credit Card verification value
+          CREDIT_CARD_NUMBER_PARAM,
+          CREDIT_CARD_VERIFICATION_VALUE_PARAM,
         ]
       end