solidus_core 2.3.1 → 2.4.0.beta1

data/db/migrate/20170831201542_remove_default_tax_from_spree_zones.rb

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

data/db/seeds.rb

@@ -1,5 +1,18 @@
 # Loads seed data out of default dir
 default_path = File.join(File.dirname(__FILE__), 'default')
 
-Rake::Task['db:load_dir'].reenable
-Rake::Task['db:load_dir'].invoke(default_path)
+%w(
+  stores
+  store_credit
+  countries
+  return_reasons
+  states
+  stock_locations
+  zones
+  refund_reasons
+  roles
+  shipping_categories
+).each do |seed|
+  puts "Loading seed file: #{seed}"
+  require_relative "default/spree/#{seed}"
+end

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

@@ -20,6 +20,10 @@ development:
   encoding: utf8
 test:
   adapter: mysql2
+  <% if ENV['TRAVIS'] %>
+  username: root
+  password:
+  <% end %>
   database: <%= database_prefix %><%= options[:lib_name] %>_solidus_test
   encoding: utf8
 production:

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

@@ -1,5 +1,4 @@
 require 'rails/generators'
-require 'highline/import'
 require 'bundler'
 require 'bundler/cli'
 

data/lib/generators/spree/install/templates/config/initializers/spree.rb

@@ -2,12 +2,6 @@
 # See http://docs.solidus.io/Spree/AppConfiguration.html for details
 
 Spree.config do |config|
-  # Without this preferences are loaded and persisted to the database. This
-  # changes them to be stored in memory.
-  # This will be the default in a future version.
-  # This line resets all preferences! It should be the first line in the block
-  config.use_static_preferences!
-
   # Core:
 
   # Default currency for new sites
@@ -54,24 +48,18 @@ end
 
 <% if defined?(Spree::Frontend::Engine) -%>
 Spree::Frontend::Config.configure do |config|
-  config.use_static_preferences!
-
   config.locale = 'en'
 end
 <% end -%>
 
 <% if defined?(Spree::Backend::Engine) -%>
 Spree::Backend::Config.configure do |config|
-  config.use_static_preferences!
-
   config.locale = 'en'
 end
 <% end -%>
 
 <% if defined?(Spree::Api::Engine) -%>
 Spree::Api::Config.configure do |config|
-  config.use_static_preferences!
-
   config.requires_authentication = true
 end
 <% end -%>

data/{app/models → lib}/spree/app_configuration.rb

@@ -17,6 +17,7 @@
 #
 require "spree/core/search/base"
 require "spree/core/search/variant"
+require 'spree/preferences/configuration'
 
 module Spree
   class AppConfiguration < Preferences::Configuration
@@ -256,20 +257,14 @@ module Spree
     preference :can_restrict_stock_management, :boolean, default: false
 
     # searcher_class allows spree extension writers to provide their own Search class
-    attr_writer :searcher_class
-    def searcher_class
-      @searcher_class ||= Spree::Core::Search::Base
-    end
+    class_name_attribute :searcher_class, default: 'Spree::Core::Search::Base'
 
     # Allows implementing custom pricing for variants
     # @!attribute [rw] variant_price_selector_class
     # @see Spree::Variant::PriceSelector
     # @return [Class] an object that conforms to the API of
     #   the standard variant price selector class Spree::Variant::PriceSelector.
-    attr_writer :variant_price_selector_class
-    def variant_price_selector_class
-      @variant_price_selector_class ||= Spree::Variant::PriceSelector
-    end
+    class_name_attribute :variant_price_selector_class, default: 'Spree::Variant::PriceSelector'
 
     # Shortcut for getting the variant price selector's pricing options class
     #
@@ -283,31 +278,16 @@ module Spree
       pricing_options_class.new
     end
 
-    attr_writer :variant_search_class
-    def variant_search_class
-      @variant_search_class ||= Spree::Core::Search::Variant
-    end
+    class_name_attribute :variant_search_class, default: 'Spree::Core::Search::Variant'
 
     # promotion_chooser_class allows extensions to provide their own PromotionChooser
-    attr_writer :promotion_chooser_class
-    def promotion_chooser_class
-      @promotion_chooser_class ||= Spree::PromotionChooser
-    end
+    class_name_attribute :promotion_chooser_class, default: 'Spree::PromotionChooser'
 
-    attr_writer :shipping_rate_sorter_class
-    def shipping_rate_sorter_class
-      @shipping_rate_sorter_class ||= Spree::Stock::ShippingRateSorter
-    end
+    class_name_attribute :shipping_rate_sorter_class, default: 'Spree::Stock::ShippingRateSorter'
 
-    attr_writer :shipping_rate_selector_class
-    def shipping_rate_selector_class
-      @shipping_rate_selector_class ||= Spree::Stock::ShippingRateSelector
-    end
+    class_name_attribute :shipping_rate_selector_class, default: 'Spree::Stock::ShippingRateSelector'
 
-    attr_writer :shipping_rate_taxer_class
-    def shipping_rate_taxer_class
-      @shipping_rate_taxer_class ||= Spree::Tax::ShippingRateTaxer
-    end
+    class_name_attribute :shipping_rate_taxer_class, default: 'Spree::Tax::ShippingRateTaxer'
 
     # Allows providing your own class for calculating taxes on a shipping rate.
     #
@@ -315,10 +295,7 @@ module Spree
     # @return [Class] a class with the same public interfaces as
     #   Spree::TaxCalculator::ShippingRate
     # @api experimental
-    attr_writer :shipping_rate_tax_calculator_class
-    def shipping_rate_tax_calculator_class
-      @shipping_rate_tax_calculator_class ||= Spree::TaxCalculator::ShippingRate
-    end
+    class_name_attribute :shipping_rate_tax_calculator_class, default: 'Spree::TaxCalculator::ShippingRate'
 
     # Allows providing your own Mailer for shipped cartons.
     #
@@ -326,20 +303,14 @@ module Spree
     # @return [ActionMailer::Base] an object that responds to "shipped_email"
     #   (e.g. an ActionMailer with a "shipped_email" method) with the same
     #   signature as Spree::CartonMailer.shipped_email.
-    attr_writer :carton_shipped_email_class
-    def carton_shipped_email_class
-      @carton_shipped_email_class ||= Spree::CartonMailer
-    end
+    class_name_attribute :carton_shipped_email_class, default: 'Spree::CartonMailer'
 
     # Allows providing your own class for merging two orders.
     #
     # @!attribute [rw] order_merger_class
     # @return [Class] a class with the same public interfaces
     #   as Spree::OrderMerger.
-    attr_writer :order_merger_class
-    def order_merger_class
-      @order_merger_class ||= Spree::OrderMerger
-    end
+    class_name_attribute :order_merger_class, default: 'Spree::OrderMerger'
 
     # Allows providing your own class for adding default payments to a user's
     # order from their "wallet".
@@ -347,9 +318,17 @@ module Spree
     # @!attribute [rw] default_payment_builder_class
     # @return [Class] a class with the same public interfaces as
     #   Spree::Wallet::DefaultPaymentBuilder.
-    attr_writer :default_payment_builder_class
-    def default_payment_builder_class
-      @default_payment_builder_class ||= Spree::Wallet::DefaultPaymentBuilder
+    class_name_attribute :default_payment_builder_class, default: 'Spree::Wallet::DefaultPaymentBuilder'
+
+    # Allows providing your own class for canceling payments.
+    #
+    # @!attribute [rw] payment_canceller
+    # @return [Class] a class instance that responds to `cancel!(payment)`
+    attr_writer :payment_canceller
+    def payment_canceller
+      @payment_canceller ||= Spree::Payment::Cancellation.new(
+        reason: Spree::Payment::Cancellation::DEFAULT_REASON
+      )
     end
 
     # Allows providing your own class for adding payment sources to a user's
@@ -358,10 +337,7 @@ module Spree
     # @!attribute [rw] add_payment_sources_to_wallet_class
     # @return [Class] a class with the same public interfaces
     #   as Spree::Wallet::AddPaymentSourcesToWallet.
-    attr_writer :add_payment_sources_to_wallet_class
-    def add_payment_sources_to_wallet_class
-      @add_payment_sources_to_wallet_class ||= Spree::Wallet::AddPaymentSourcesToWallet
-    end
+    class_name_attribute :add_payment_sources_to_wallet_class, default: 'Spree::Wallet::AddPaymentSourcesToWallet'
 
     # Allows providing your own class for calculating taxes on an order.
     #
@@ -371,10 +347,7 @@ module Spree
     # @return [Class] a class with the same public interfaces as
     #   Spree::Tax::OrderAdjuster
     # @api experimental
-    attr_writer :tax_adjuster_class
-    def tax_adjuster_class
-      @tax_adjuster_class ||= Spree::Tax::OrderAdjuster
-    end
+    class_name_attribute :tax_adjuster_class, default: 'Spree::Tax::OrderAdjuster'
 
     # Allows providing your own class for calculating taxes on an order.
     #
@@ -382,20 +355,14 @@ module Spree
     # @return [Class] a class with the same public interfaces as
     #   Spree::TaxCalculator::Default
     # @api experimental
-    attr_writer :tax_calculator_class
-    def tax_calculator_class
-      @tax_calculator_class ||= Spree::TaxCalculator::Default
-    end
+    class_name_attribute :tax_calculator_class, default: 'Spree::TaxCalculator::Default'
 
     # Allows providing your own class for choosing which store to use.
     #
     # @!attribute [rw] current_store_selector_class
     # @return [Class] a class with the same public interfaces as
     #   Spree::CurrentStoreSelector
-    attr_writer :current_store_selector_class
-    def current_store_selector_class
-      @current_store_selector_class ||= Spree::StoreSelector::ByServerName
-    end
+    class_name_attribute :current_store_selector_class, default: 'Spree::StoreSelector::ByServerName'
 
     # Allows providing your own class instance for generating order numbers.
     #

data/lib/spree/config.rb

@@ -0,0 +1,3 @@
+require 'spree/app_configuration'
+
+Spree::Config = Spree::AppConfiguration.new

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

@@ -8,8 +8,6 @@ module Spree
         include ControllerHelpers::Pricing
 
         included do
-          before_action :set_current_order
-
           helper_method :current_order
           helper_method :simple_current_order
         end

data/lib/spree/core/engine.rb

@@ -10,7 +10,6 @@ module Spree
 
       initializer "spree.environment", before: :load_config_initializers do |app|
         app.config.spree = Spree::Core::Environment.new
-        Spree::Config = app.config.spree.preferences # legacy access
       end
 
       initializer "spree.default_permissions", before: :load_config_initializers do |_app|
@@ -105,6 +104,12 @@ module Spree
         ]
       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
+
       # Filter sensitive information during logging
       initializer "spree.params.filter", before: :load_config_initializers do |app|
         app.config.filter_parameters += [

data/lib/spree/core/environment.rb

@@ -1,3 +1,5 @@
+require 'spree/config'
+
 module Spree
   module Core
     class Environment
@@ -10,7 +12,7 @@ module Spree
 
       def initialize
         @calculators = Calculators.new
-        @preferences = Spree::AppConfiguration.new
+        @preferences = Spree::Config
         @promotions = Spree::Promo::Environment.new
       end
     end

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

@@ -27,12 +27,15 @@ module Spree
 
         def retrieve_products
           @products = get_base_scope
-          curr_page = page || 1
 
           unless Spree::Config.show_products_without_price
             @products = @products.joins(:prices).merge(Spree::Price.where(pricing_options.search_arguments)).distinct
           end
-          @products = @products.page(curr_page).per(per_page)
+          if @properties[:page]
+            curr_page = @properties[:page] || 1
+            @products = @products.page(curr_page).per(@properties[:per_page])
+          end
+          @products
         end
 
         def method_missing(name)
@@ -101,9 +104,14 @@ module Spree
           @properties[:search] = params[:search]
           @properties[:include_images] = params[:include_images]
 
-          per_page = params[:per_page].to_i
-          @properties[:per_page] = per_page > 0 ? per_page : Spree::Config[:products_per_page]
-          @properties[:page] = (params[:page].to_i <= 0) ? 1 : params[:page].to_i
+          if params[:per_page].present? || params[:page].present?
+            Spree::Deprecation.warn "Pagination inside the searcher is no longer supported." \
+              "Please paginate the results of the searcher yourself."
+
+            per_page = params[:per_page].to_i
+            @properties[:per_page] = per_page > 0 ? per_page : Spree::Config[:products_per_page]
+            @properties[:page] = (params[:page].to_i <= 0) ? 1 : params[:page].to_i
+          end
         end
       end
     end

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

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/class/attribute'
+
 module Spree
   module Core
     module Search

data/lib/spree/core/stock_configuration.rb

@@ -5,7 +5,7 @@ module Spree
       attr_writer :estimator_class
 
       def coordinator_class
-        @coordinator_class ||= '::Spree::Stock::Coordinator'
+        @coordinator_class ||= '::Spree::Stock::SimpleCoordinator'
         @coordinator_class.constantize
       end
 

data/lib/spree/core/version.rb

@@ -1,6 +1,6 @@
 module Spree
   def self.solidus_version
-    "2.3.1"
+    "2.4.0.beta1"
   end
 
   def self.solidus_gem_version

data/lib/spree/core.rb

@@ -11,7 +11,8 @@ require 'paperclip'
 require 'paranoia'
 require 'ransack'
 require 'state_machines-activerecord'
-require 'responders'
+
+require 'spree/deprecation'
 
 # This is required because ActiveModel::Validations#invalid? conflicts with the
 # invalid state of a Payment. In the future this should be removed.
@@ -43,10 +44,10 @@ module Spree
   end
 
   module Core
-    autoload :ProductFilters, "spree/core/product_filters"
-
     class GatewayError < RuntimeError; end
-    class DestroyWithOrdersError < StandardError; end
+
+    include ActiveSupport::Deprecation::DeprecatedConstantAccessor
+    deprecate_constant 'DestroyWithOrdersError', ActiveRecord::DeleteRestrictionError, deprecator: Spree::Deprecation
   end
 end
 
@@ -75,13 +76,13 @@ require 'spree/core/controller_helpers/common'
 require 'spree/core/controller_helpers/order'
 require 'spree/core/controller_helpers/payment_parameters'
 require 'spree/core/controller_helpers/pricing'
-require 'spree/core/controller_helpers/respond_with'
 require 'spree/core/controller_helpers/search'
 require 'spree/core/controller_helpers/store'
 require 'spree/core/controller_helpers/strong_parameters'
 require 'spree/core/role_configuration'
 require 'spree/core/stock_configuration'
 require 'spree/permission_sets'
-require 'spree/deprecation'
 
-require 'spree/core/price_migrator'
+require 'spree/preferences/store'
+require 'spree/preferences/static_model_preferences'
+require 'spree/preferences/scoped_store'

data/lib/spree/deprecation.rb

@@ -1,3 +1,5 @@
+require 'active_support/deprecation'
+
 module Spree
   Deprecation = ActiveSupport::Deprecation.new('3.0', 'Solidus')
 end

data/lib/spree/i18n.rb

@@ -1,5 +1,6 @@
 require 'i18n'
 require 'active_support/core_ext/array/extract_options'
+require 'action_view'
 
 module Spree
   class TranslationHelperWrapper # :nodoc:

data/lib/spree/money.rb

@@ -1,6 +1,8 @@
 # encoding: utf-8
 
 require 'money'
+require 'monetize'
+require 'active_support/core_ext/string/output_safety'
 
 module Spree
   # Spree::Money is a relatively thin wrapper around Monetize which handles

data/lib/spree/permission_sets/product_management.rb

@@ -2,16 +2,17 @@ module Spree
   module PermissionSets
     class ProductManagement < PermissionSets::Base
       def activate!
-        can :manage, Spree::Product
+        can :manage, Spree::Classification
         can :manage, Spree::Image
-        can :manage, Spree::Variant
+        can :manage, Spree::OptionType
         can :manage, Spree::OptionValue
+        can :manage, Spree::Price
+        can :manage, Spree::Product
         can :manage, Spree::ProductProperty
-        can :manage, Spree::OptionType
         can :manage, Spree::Property
-        can :manage, Spree::Taxonomy
         can :manage, Spree::Taxon
-        can :manage, Spree::Classification
+        can :manage, Spree::Taxonomy
+        can :manage, Spree::Variant
       end
     end
   end