spree_core 3.0.9 → 3.2.0

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

@@ -67,7 +67,7 @@ module Spree
         def redirect_unauthorized_access
           if try_spree_current_user
             flash[:error] = Spree.t(:authorization_failure)
-            redirect_to '/unauthorized'
+            redirect_to spree.forbidden_path
           else
             store_location
             if respond_to?(:spree_login_path)

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
 
@@ -51,9 +51,9 @@ module Spree
 
           def set_user_language
             locale = session[:locale]
-            locale ||= config_locale if respond_to?(:config_locale, true)
-            locale ||= Rails.application.config.i18n.default_locale
-            locale ||= I18n.default_locale unless I18n.available_locales.map(&:to_s).include?(locale)
+            locale = config_locale if respond_to?(:config_locale, true) && locale.blank?
+            locale = Rails.application.config.i18n.default_locale if locale.blank?
+            locale = I18n.default_locale unless I18n.available_locales.map(&:to_s).include?(locale.to_s)
             I18n.locale = locale
           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
@@ -81,11 +78,13 @@ module Spree
           options[:lock] ||= false
 
           # Find any incomplete orders for the guest_token
-          if with_adjustments
-            order = Spree::Order.incomplete.includes(:adjustments).lock(options[:lock]).find_by(current_order_params)
-          else
-            order = Spree::Order.incomplete.lock(options[:lock]).find_by(current_order_params)
-          end
+          incomplete_orders = Spree::Order.incomplete.includes(line_items: [variant: [:images, :option_values, :product]])
+          guest_token_order_params = current_order_params.except(:user_id)
+          order = if with_adjustments
+                    incomplete_orders.includes(:adjustments).lock(options[:lock]).find_by(guest_token_order_params)
+                  else
+                    incomplete_orders.lock(options[:lock]).find_by(guest_token_order_params)
+                  end
 
           # Find any incomplete orders for the current user
           if order.nil? && try_spree_current_user

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/controller_helpers/search.rb

@@ -2,7 +2,7 @@ module Spree
   module Core
     module ControllerHelpers
       module Search
-        def build_searcher params
+        def build_searcher(params)
           Spree::Config.searcher_class.new(params).tap do |searcher|
             searcher.current_user = try_spree_current_user
             searcher.current_currency = current_currency

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

@@ -7,6 +7,7 @@ module Spree
         included do
           helper_method :current_currency
           helper_method :current_store
+          helper_method :current_price_options
         end
 
         def current_currency
@@ -16,6 +17,34 @@ module Spree
         def current_store
           @current_store ||= Spree::Store.current(request.env['SERVER_NAME'])
         end
+
+        # Return a Hash of things that influence the prices displayed in your shop.
+        #
+        # By default, the only thing that influences prices that is the current order's +tax_zone+
+        # (to facilitate differing prices depending on VAT rate for digital products in Europe, see
+        # https://github.com/spree/spree/pull/6295 and https://github.com/spree/spree/pull/6662).
+        #
+        # If your prices depend on something else, overwrite this method and add
+        # more key/value pairs to the Hash it returns.
+        #
+        # Be careful though to also patch the following parts of Spree accordingly:
+        #
+        # * `Spree::VatPriceCalculation#gross_amount`
+        # * `Spree::LineItem#update_price`
+        # * `Spree::Stock::Estimator#taxation_options_for`
+        # * Subclass the `DefaultTax` calculator
+        #
+        def current_price_options
+          {
+            tax_zone: current_tax_zone
+          }
+        end
+
+        private
+
+        def current_tax_zone
+          current_order.try(:tax_zone) || Spree::Zone.default_tax
+        end
       end
     end
   end

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!
@@ -75,7 +75,7 @@ module DelegateBelongsTo
 
   def delegator_for(association, attr, *args)
     return if self.class.column_names.include?(attr.to_s)
-    send("#{association}=", self.class.reflect_on_association(association).klass.new) if send(association).nil?
+    send "build_#{association}" if send(association).nil?
     if args.empty?
       send(association).send(attr)
     else
@@ -85,11 +85,11 @@ module DelegateBelongsTo
 
   def delegator_for_setter(association, attr, val)
     return if self.class.column_names.include?(attr.to_s)
-    send("#{association}=", self.class.reflect_on_association(association).klass.new) if send(association).nil?
+    send "build_#{association}" if send(association).nil?
     send(association).send("#{attr}=", val)
   end
   protected :delegator_for
   protected :delegator_for_setter
 end
 
-ActiveRecord::Base.send :include, DelegateBelongsTo
+ActiveRecord::Base.include DelegateBelongsTo

data/lib/spree/core/engine.rb

@@ -5,38 +5,49 @@ module Spree
       engine_name 'spree'
 
       rake_tasks do
-        load File.join(root, "lib", "tasks", "exchanges.rake")
+        load File.join(root, 'lib', 'tasks', 'exchanges.rake')
       end
 
-      initializer "spree.environment", :before => :load_config_initializers do |app|
+      initializer 'spree.environment', before: :load_config_initializers do |app|
         app.config.spree = Spree::Core::Environment.new
-        Spree::Config = app.config.spree.preferences #legacy access
+        Spree::Config = app.config.spree.preferences # legacy access
       end
 
-      initializer "spree.register.calculators" do |app|
+      initializer 'spree.register.calculators' do |app|
         app.config.spree.calculators.shipping_methods = [
-            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 = [
-            Spree::Calculator::DefaultTax]
+          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 = [
+          Spree::Calculator::DefaultTax
+        ]
       end
 
-      initializer "spree.register.stock_splitters" do |app|
+      initializer 'spree.register.stock_splitters' do |app|
         app.config.spree.stock_splitters = [
           Spree::Stock::Splitter::ShippingCategory,
           Spree::Stock::Splitter::Backordered
         ]
       end
 
-      initializer "spree.register.payment_methods" do |app|
+      initializer 'spree.register.payment_methods', after: 'acts_as_list.insert_into_active_record' do |app|
         app.config.spree.payment_methods = [
-            Spree::Gateway::Bogus,
-            Spree::Gateway::BogusSimple,
-            Spree::PaymentMethod::Check ]
+          Spree::Gateway::Bogus,
+          Spree::Gateway::BogusSimple,
+          Spree::PaymentMethod::Check,
+          Spree::PaymentMethod::StoreCredit
+        ]
+      end
+
+      initializer 'spree.register.adjustable_adjusters' do |app|
+        app.config.spree.adjusters = [
+          Spree::Adjustable::Adjuster::Promotion,
+          Spree::Adjustable::Adjuster::Tax
+        ]
       end
 
       # We need to define promotions rules here so extensions and existing apps
@@ -78,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
 
@@ -91,7 +103,7 @@ module Spree
       end
 
       # filter sensitive information during logging
-      initializer "spree.params.filter" do |app|
+      initializer 'spree.params.filter' do |app|
         app.config.filter_parameters += [
           :password,
           :password_confirmation,
@@ -99,11 +111,18 @@ module Spree
           :verification_value]
       end
 
-      initializer "spree.core.checking_migrations" do |app|
+      initializer 'spree.core.checking_migrations' do
         Migrations.new(config, engine_name).check
       end
 
       config.to_prepare do
+        # Load spree locales before decorators
+        I18n.load_path += Dir.glob(
+          File.join(
+            File.dirname(__FILE__), '../../../config/locales', '*.{rb,yml}'
+          )
+        )
+
         # Load application's model / class decorators
         Dir.glob(File.join(File.dirname(__FILE__), '../../../app/**/*_decorator*.rb')) do |c|
           Rails.configuration.cache_classes ? require(c) : load(c)

data/lib/spree/core/environment.rb

@@ -4,7 +4,7 @@ module Spree
       include EnvironmentExtension
 
       attr_accessor :calculators, :payment_methods, :preferences,
-                    :stock_splitters
+                    :adjusters, :stock_splitters
 
       def initialize
         @calculators = Calculators.new

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

@@ -82,7 +82,7 @@ module Spree
                 shipment.shipped_at = s[:shipped_at]
                 shipment.state      = 'shipped'
               end
-
+ 
               shipment.save!
 
               shipping_method = Spree::ShippingMethod.find_by_name(s[:shipping_method]) || Spree::ShippingMethod.find_by_admin_name!(s[:shipping_method])
@@ -91,6 +91,8 @@ module Spree
               shipment.selected_shipping_rate_id = rate.id
               shipment.update_amounts
 
+              adjustments = s.delete(:adjustments_attributes)
+              create_adjustments_from_params(adjustments, order, shipment)
             rescue Exception => e
               raise "Order import shipments: #{e.message} #{s}"
             end
@@ -99,10 +101,10 @@ module Spree
 
         def self.create_line_items_from_params(line_items, order)
           return {} unless line_items
-          case line_items
+          iterator = case line_items
           when Hash
             ActiveSupport::Deprecation.warn(<<-EOS, caller)
-              Passing a hash is now deprecated and will be removed in Spree 3.1.
+              Passing a hash is now deprecated and will be removed in Spree 4.0.
               It is recommended that you pass it as an array instead.
 
               New Syntax:
@@ -127,53 +129,41 @@ module Spree
                 }
               }
             EOS
-
-            line_items.each_key do |k|
-              begin
-                extra_params = line_items[k].except(:variant_id, :quantity, :sku)
-                line_item = ensure_variant_id_from_params(line_items[k])
-                variant = Spree::Variant.find(line_item[:variant_id])
-                line_item = order.contents.add(variant, line_item[:quantity])
-                # Raise any errors with saving to prevent import succeeding with line items
-                # failing silently.
-                if extra_params.present?
-                  line_item.update_attributes!(extra_params)
-                else
-                  line_item.save!
-                end
-              rescue Exception => e
-                raise "Order import line items: #{e.message} #{line_item}"
-              end
-            end
+            :each_value
           when Array
-            line_items.each do |line_item|
-              begin
-                extra_params = line_item.except(:variant_id, :quantity, :sku)
-                line_item = ensure_variant_id_from_params(line_item)
-                variant = Spree::Variant.find(line_item[:variant_id])
-                line_item = order.contents.add(variant, line_item[:quantity])
-                # Raise any errors with saving to prevent import succeeding with line items
-                # failing silently.
-                if extra_params.present?
-                  line_item.update_attributes!(extra_params)
-                else
-                  line_item.save!
-                end
-              rescue Exception => e
-                raise "Order import line items: #{e.message} #{line_item}"
+            :each
+          end
+
+          line_items.send(iterator) do |line_item|
+            begin
+              adjustments = line_item.delete(:adjustments_attributes)
+              extra_params = line_item.except(:variant_id, :quantity, :sku)
+              line_item = ensure_variant_id_from_params(line_item)
+              variant = Spree::Variant.find(line_item[:variant_id])
+              line_item = order.contents.add(variant, line_item[:quantity])
+              # Raise any errors with saving to prevent import succeeding with line items
+              # failing silently.
+              if extra_params.present?
+                line_item.update_attributes!(extra_params)
+              else
+                line_item.save!
               end
+              create_adjustments_from_params(adjustments, order, line_item)
+            rescue Exception => e
+              raise "Order import line items: #{e.message} #{line_item}"
             end
           end
         end
 
-        def self.create_adjustments_from_params(adjustments, order)
+        def self.create_adjustments_from_params(adjustments, order, adjustable = nil)
           return [] unless adjustments
           adjustments.each do |a|
             begin
-              adjustment = order.adjustments.build(
-                order:  order,
+              adjustment = (adjustable || order).adjustments.build(
+                order: order,
                 amount: a[:amount].to_f,
-                label:  a[:label]
+                label: a[:label],
+                source_type: source_type_from_adjustment(a)
               )
               adjustment.save!
               adjustment.close!
@@ -281,6 +271,13 @@ module Spree
           end
         end
 
+        def self.source_type_from_adjustment(adjustment)
+          if adjustment[:tax]
+            'Spree::TaxRate'
+          elsif adjustment[:promotion]
+            'Spree::PromotionAction'
+          end
+        end
       end
     end
   end

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

@@ -0,0 +1,52 @@
+module Spree
+  module Core
+    class NumberGenerator < Module
+      BASE           = 10
+      DEFAULT_LENGTH = 9
+      NUMBERS        = (0..9).to_a.freeze
+      LETTERS        = ('A'..'Z').to_a.freeze
+
+      attr_accessor :prefix, :length
+
+      def initialize(options)
+        @random     = Random.new
+        @prefix     = options.fetch(:prefix)
+        @length     = options.fetch(:length, DEFAULT_LENGTH)
+        @candidates = NUMBERS + (options[:letters] ? LETTERS : [])
+      end
+
+      def included(host)
+        generator_method   = method(:generate_permalink)
+        generator_instance = self
+
+        host.class_eval do
+          validates(:number, presence: true, uniqueness: { allow_blank: true })
+
+          before_validation do |instance|
+            instance.number ||= generator_method.call(host)
+          end
+
+          define_singleton_method(:number_generator) { generator_instance }
+        end
+      end
+
+      private
+
+      def generate_permalink(host)
+        length = @length
+
+        loop do
+          candidate = new_candidate(length)
+          return candidate unless host.exists?(number: candidate)
+
+          # If over half of all possible options are taken add another digit.
+          length += 1 if host.count > Rational(BASE**length, 2)
+        end
+      end
+
+      def new_candidate(length)
+        @prefix + length.times.map { @candidates.sample(random: @random) }.join
+      end
+    end # Permalink
+  end # Core
+end # Spree

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

@@ -9,7 +9,7 @@ module Spree
     #   2) Add it to the config load path, or require it in an initializer, e.g...
     #
     #      # config/initializers/spree.rb
-    #      require 'spree/product_filters'
+    #      require 'spree/core/product_filters'
     #
 
     # set up some basic filters for use with products
@@ -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

@@ -17,7 +17,8 @@ module Spree
           curr_page = page || 1
 
           unless Spree::Config.show_products_without_price
-            @products = @products.where("spree_prices.amount IS NOT NULL").where("spree_prices.currency" => current_currency)
+            @products = @products.where("spree_prices.amount IS NOT NULL").
+                                  where("spree_prices.currency" => current_currency)
           end
           @products = @products.page(curr_page).per(per_page)
         end
@@ -32,7 +33,7 @@ module Spree
 
         protected
           def get_base_scope
-            base_scope = Spree::Product.active
+            base_scope = Spree::Product.spree_base_scopes.active
             base_scope = base_scope.in_taxon(taxon) unless taxon.blank?
             base_scope = get_products_conditions_for(base_scope, keywords)
             base_scope = add_search_scopes(base_scope)
@@ -69,7 +70,7 @@ module Spree
               else
                 base_scope = base_scope.merge(Spree::Product.ransack({scope_name => scope_attribute}).result)
               end
-            end if search
+            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.0.9'
+    "3.2.0"
   end
 end

data/lib/spree/core.rb

@@ -31,6 +31,21 @@ module Spree
     end
   end
 
+  def self.admin_path
+    Spree::Config[:admin_path]
+  end
+
+  # Used to configure admin_path for Spree
+  #
+  # Example:
+  #
+  # write the following line in `config/initializers/spree.rb`
+  #   Spree.admin_path = '/custom-path'
+
+  def self.admin_path=(path)
+    Spree::Config[:admin_path] = path
+  end
+
   # Used to configure Spree.
   #
   # Example:
@@ -59,6 +74,7 @@ require 'spree/core/version'
 require 'spree/core/environment_extension'
 require 'spree/core/environment/calculators'
 require 'spree/core/environment'
+require 'spree/core/number_generator'
 require 'spree/promo/environment'
 require 'spree/migrations'
 require 'spree/core/engine'