solidus_core 1.2.3 → 1.3.0.beta1

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

@@ -5,18 +5,18 @@ 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
+      paths = superclass.source_paths
       paths << File.expand_path('../templates', "../../#{__FILE__}")
       paths << File.expand_path('../templates', "../#{__FILE__}")
       paths << File.expand_path('../templates', __FILE__)
@@ -39,7 +39,7 @@ module Spree
     end
 
     def additional_tweaks
-      return unless File.exists? 'public/robots.txt'
+      return unless File.exist? 'public/robots.txt'
       append_file "public/robots.txt", <<-ROBOTS
 User-agent: *
 Disallow: /checkout
@@ -134,14 +134,14 @@ Spree::Auth::Engine.load_seed if defined?(Spree::Auth)
     def populate_seed_data
       if @load_seed_data
         say_status :loading,  "seed data"
-        rake_options=[]
+        rake_options = []
         rake_options << "AUTO_ACCEPT=1" if options[:auto_accept]
         rake_options << "ADMIN_EMAIL=#{options[:admin_email]}" if options[:admin_email]
         rake_options << "ADMIN_PASSWORD=#{options[:admin_password]}" if options[:admin_password]
 
         cmd = lambda { rake("db:seed #{rake_options.join(' ')}") }
         if options[:auto_accept] || (options[:admin_email] && options[:admin_password])
-          quietly &cmd
+          quietly(&cmd)
         else
           cmd.call
         end
@@ -160,8 +160,8 @@ 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
-        %Q{
+      insert_into_file File.join('config', 'routes.rb'), after: "Rails.application.routes.draw do\n" do
+        %{
   # 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.
   # If you would like to change where this engine is mounted, simply change the :at option to something different.

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

@@ -5,6 +5,7 @@ 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:

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

@@ -22,7 +22,7 @@ module Spree
           end
 
           rescue_from CanCan::AccessDenied do
-            instance_exec &unauthorized_redirect
+            instance_exec(&unauthorized_redirect)
           end
         end
 
@@ -68,9 +68,7 @@ module Spree
           # This one will be defined by Devise
           elsif respond_to?(:current_spree_user)
             current_spree_user
-          else
-            nil
-          end
+                    end
         end
       end
     end

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

@@ -11,62 +11,61 @@ module Spree
           layout :get_layout
 
           before_filter :set_user_language
+        end
 
-          protected
+        protected
 
-          # can be used in views as well as controllers.
-          # e.g. <% self.title = 'This is a custom title for this view' %>
-          attr_writer :title
+        # can be used in views as well as controllers.
+        # e.g. <% self.title = 'This is a custom title for this view' %>
+        attr_writer :title
 
-          def title
-            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(' - ')
-              else
-                title_string
-              end
+        def title
+          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(' - ')
             else
-              default_title
+              title_string
             end
+          else
+            default_title
           end
+        end
 
-          def default_title
-            current_store.name
-          end
+        def default_title
+          current_store.name
+        end
 
-          # this is a hook for subclasses to provide title
-          def accurate_title
-            current_store.seo_title
-          end
+        # this is a hook for subclasses to provide title
+        def accurate_title
+          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
+        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
-            locale = session[:locale]
-            locale ||= config_locale if respond_to?(:config_locale, true)
-            locale ||= Rails.application.config.i18n.default_locale
-            locale ||= I18n.default_locale
-            I18n.locale = locale
-          end
+        private
 
-          # Returns which layout to render.
-          #
-          # You can set the layout you want to render inside your Spree configuration with the +:layout+ option.
-          #
-          # Default layout is: +app/views/spree/layouts/spree_application+
-          #
-          def get_layout
-            layout ||= Spree::Config[:layout]
-          end
+        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
+          I18n.locale = locale
+        end
 
+        # Returns which layout to render.
+        #
+        # You can set the layout you want to render inside your Spree configuration with the +:layout+ option.
+        #
+        # Default layout is: +app/views/spree/layouts/spree_application+
+        #
+        def get_layout
+          Spree::Config[:layout]
         end
       end
     end

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

@@ -1,20 +1,21 @@
+require 'spree/core/controller_helpers/pricing'
+
 module Spree
   module Core
     module ControllerHelpers
       module Order
         extend ActiveSupport::Concern
+        include ControllerHelpers::Pricing
 
         included do
           before_filter :set_current_order
 
-          helper_method :current_currency
           helper_method :current_order
           helper_method :simple_current_order
         end
 
         # Used in the link_to_cart helper.
         def simple_current_order
-
           return @simple_current_order if @simple_current_order
 
           @simple_current_order = find_order_by_token_or_user
@@ -64,10 +65,6 @@ module Spree
           end
         end
 
-        def current_currency
-          Spree::Config[:currency]
-        end
-
         def ip_address
           request.remote_ip
         end
@@ -79,10 +76,10 @@ module Spree
         end
 
         def current_order_params
-          { currency: current_currency, guest_token: cookies.signed[:guest_token], store_id: current_store.id, user_id: try_spree_current_user.try(:id) }
+          { currency: current_pricing_options.currency, guest_token: cookies.signed[:guest_token], store_id: current_store.id, user_id: try_spree_current_user.try(:id) }
         end
 
-        def find_order_by_token_or_user(options={}, with_adjustments = false)
+        def find_order_by_token_or_user(options = {}, with_adjustments = false)
           options[:lock] ||= false
 
           # Find any incomplete orders for the guest_token
@@ -99,7 +96,6 @@ module Spree
 
           order
         end
-
       end
     end
   end

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

@@ -44,8 +44,8 @@ module Spree
       return params if params[:payment_source].blank?
 
       payment_params = params[:order] &&
-        params[:order][:payments_attributes] &&
-        params[:order][:payments_attributes].first
+                       params[:order][:payments_attributes] &&
+                       params[:order][:payments_attributes].first
       return params if payment_params.blank?
 
       payment_method_id = payment_params[:payment_method_id]
@@ -105,9 +105,9 @@ module Spree
         {
           source_attributes: {
             existing_card_id: card_id,
-            verification_value: cvc_confirm,
+            verification_value: cvc_confirm
           }
-        },
+        }
       ]
 
       params[:order].delete(:existing_card)
@@ -161,6 +161,5 @@ module Spree
 
       params
     end
-
   end
 end

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

@@ -0,0 +1,27 @@
+require 'spree/deprecation'
+
+module Spree
+  module Core
+    module ControllerHelpers
+      module Pricing
+        extend ActiveSupport::Concern
+
+        included do
+          helper_method :current_currency
+          helper_method :current_pricing_options
+        end
+
+        def current_pricing_options
+          Spree::Config.pricing_options_class.new(
+            currency: current_store.try!(:default_currency).presence || Spree::Config[:currency]
+          )
+        end
+
+        def current_currency
+          current_pricing_options.currency
+        end
+        deprecate current_currency: :current_pricing_options, deprecator: Spree::Deprecation
+      end
+    end
+  end
+end

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

@@ -7,7 +7,7 @@ module ActionController
         # Checkout AS Array#extract_options! and original respond_with
         # implementation for a better picture of this hack
         if resources.last.is_a? Hash
-          resources.last.merge! action_name: action_name.to_sym
+          resources.last[:action_name] = action_name.to_sym
         else
           resources.push action_name: action_name.to_sym
         end
@@ -35,7 +35,7 @@ module Spree
             self.spree_responders = {}
           end
 
-          def respond_override(options={})
+          def respond_override(options = {})
             unless options.blank?
               action_name = options.keys.first
               action_value = options.values.first
@@ -52,10 +52,10 @@ 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)
+              spree_responders.deep_merge!(name.to_sym => options)
             end
           end
         end

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

@@ -2,10 +2,10 @@ 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
+            searcher.pricing_options = current_pricing_options
           end
         end
       end

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

@@ -13,12 +13,12 @@ module Spree
           class_attribute :current_store_class
           self.current_store_class = Spree::Core::CurrentStore
 
-          def current_store
-            @current_store ||= current_store_class.new(request).store
-          end
           helper_method :current_store
         end
 
+        def current_store
+          @current_store ||= current_store_class.new(request).store
+        end
       end
     end
   end

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

@@ -6,13 +6,13 @@ module Spree
           Spree::PermittedAttributes
         end
 
-        delegate *Spree::PermittedAttributes::ATTRIBUTES,
+        delegate(*Spree::PermittedAttributes::ATTRIBUTES,
                  to: :permitted_attributes,
-                 prefix: :permitted
+                 prefix: :permitted)
 
         def permitted_credit_card_update_attributes
           permitted_attributes.credit_card_update_attributes + [
-            address_attributes: permitted_address_attributes,
+            address_attributes: permitted_address_attributes
           ]
         end
 
@@ -24,7 +24,7 @@ module Spree
 
         def permitted_source_attributes
           permitted_attributes.source_attributes + [
-            address_attributes: permitted_address_attributes,
+            address_attributes: permitted_address_attributes
           ]
         end
 

data/lib/spree/core/current_store.rb

@@ -23,4 +23,4 @@ module Spree
       end
     end
   end
-end
+end

data/lib/spree/core/delegate_belongs_to.rb

@@ -19,8 +19,7 @@ module DelegateBelongsTo
   extend ActiveSupport::Concern
 
   module ClassMethods
-
-    @@default_rejected_delegate_columns = ['created_at','created_on','updated_at','updated_on','lock_version','type','id','position','parent_id','lft','rgt']
+    @@default_rejected_delegate_columns = ['created_at', 'created_on', 'updated_at', 'updated_on', 'lock_version', 'type', 'id', 'position', 'parent_id', 'lft', 'rgt']
     mattr_accessor :default_rejected_delegate_columns
 
     ##
@@ -50,28 +49,27 @@ module DelegateBelongsTo
 
     protected
 
-      def get_association_column_names(association, without_default_rejected_delegate_columns=true)
-        begin
-          association_klass = reflect_on_association(association).klass
-          methods = association_klass.column_names
-          methods.reject!{|x|default_rejected_delegate_columns.include?(x.to_s)} if without_default_rejected_delegate_columns
-          return methods
-        rescue
-          return []
-        end
-      end
+    def get_association_column_names(association, without_default_rejected_delegate_columns = true)
+        association_klass = reflect_on_association(association).klass
+        methods = association_klass.column_names
+        methods.reject!{ |x| default_rejected_delegate_columns.include?(x.to_s) } if without_default_rejected_delegate_columns
+        return methods
+    rescue
+        return []
+    end
 
-      ##
-      # initialize_association :belongs_to, :contact
-      def initialize_association(type, association, opts={})
-        raise 'Illegal or unimplemented association type.' unless [:belongs_to].include?(type.to_s.to_sym)
-        send type, association, opts if reflect_on_association(association).nil?
-      end
+    ##
+    # initialize_association :belongs_to, :contact
+    def initialize_association(type, association, opts = {})
+      raise 'Illegal or unimplemented association type.' unless [:belongs_to].include?(type.to_s.to_sym)
+      send type, association, opts if reflect_on_association(association).nil?
+    end
 
     private
-      def class_def(name, method=nil, &blk)
-        class_eval { method.nil? ? define_method(name, &blk) : define_method(name, method) }
-      end
+
+    def class_def(name, method = nil, &blk)
+      class_eval { method.nil? ? define_method(name, &blk) : define_method(name, method) }
+    end
   end
 
   def delegator_for(association, attr, *args)

data/lib/spree/core/engine.rb

@@ -8,12 +8,16 @@ module Spree
         load File.join(root, "lib", "tasks", "exchanges.rake")
       end
 
-      initializer "spree.environment", :before => :load_config_initializers do |app|
+      config.generators do |g|
+        g.test_framework :rspec
+      end
+
+      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.default_permissions" do |app|
+      initializer "spree.default_permissions" do |_app|
         Spree::RoleConfiguration.configure do |config|
           config.assign_permissions :default, [Spree::PermissionSets::DefaultCustomer]
           config.assign_permissions :admin, [Spree::PermissionSets::SuperUser]
@@ -28,8 +32,8 @@ module Spree
             Spree::Calculator::Shipping::PerItem,
             Spree::Calculator::Shipping::PriceSack]
 
-         app.config.spree.calculators.tax_rates = [
-            Spree::Calculator::DefaultTax]
+        app.config.spree.calculators.tax_rates = [
+           Spree::Calculator::DefaultTax]
       end
 
       initializer "spree.register.stock_splitters" do |app|
@@ -44,7 +48,7 @@ module Spree
             Spree::Gateway::Bogus,
             Spree::Gateway::BogusSimple,
             Spree::PaymentMethod::StoreCredit,
-            Spree::PaymentMethod::Check ]
+            Spree::PaymentMethod::Check]
       end
 
       # We need to define promotions rules here so extensions and existing apps
@@ -95,7 +99,7 @@ module Spree
           Spree::Promotion::Rules::Taxon,
           Spree::Promotion::Rules::NthOrder,
           Spree::Promotion::Rules::OptionValue,
-          Spree::Promotion::Rules::FirstRepeatPurchaseSince,
+          Spree::Promotion::Rules::FirstRepeatPurchaseSince
         ]
       end
 
@@ -116,7 +120,7 @@ module Spree
           :verification_value]
       end
 
-      initializer "spree.core.checking_migrations" do |app|
+      initializer "spree.core.checking_migrations" do |_app|
         Migrations.new(config, engine_name).check
       end
     end

data/lib/spree/core/environment/calculators.rb

@@ -9,4 +9,3 @@ module Spree
     end
   end
 end
-

data/lib/spree/core/environment_extension.rb

@@ -4,7 +4,7 @@ module Spree
       extend ActiveSupport::Concern
 
       def add_class(name)
-        self.instance_variable_set "@#{name}", Set.new
+        instance_variable_set "@#{name}", Set.new
 
         create_method( "#{name}=".to_sym ) { |val|
           instance_variable_set( "@" + name, val)
@@ -17,9 +17,9 @@ module Spree
 
       private
 
-        def create_method(name, &block)
-          self.class.send(:define_method, name, &block)
-        end
+      def create_method(name, &block)
+        self.class.send(:define_method, name, &block)
+      end
     end
   end
 end

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

@@ -2,9 +2,8 @@ module Spree
   module Core
     module Importer
       class Order
-
         def self.import(user, params)
-          begin
+          ActiveRecord::Base.transaction do
             ensure_country_id_from_params params[:ship_address_attributes]
             ensure_state_id_from_params params[:ship_address_attributes]
             ensure_country_id_from_params params[:bill_address_attributes]
@@ -19,7 +18,7 @@ module Spree
             shipments_attrs = params.delete(:shipments_attributes)
 
             create_shipments_from_params(shipments_attrs, order)
-            create_line_items_from_params(params.delete(:line_items_attributes),order)
+            create_line_items_from_params(params.delete(:line_items_attributes), order)
             create_adjustments_from_params(params.delete(:adjustments_attributes), order)
             create_payments_from_params(params.delete(:payments_attributes), order)
 
@@ -45,18 +44,14 @@ module Spree
               end
             end
             order.reload
-          rescue
-            order.destroy if order && order.persisted?
-            raise
           end
         end
 
         def self.create_shipments_from_params(shipments_hash, order)
           return [] unless shipments_hash
 
-          line_items = order.line_items
           shipments_hash.each do |s|
-            shipment = order.shipments.build
+            shipment = Shipment.new
             shipment.tracking       = s[:tracking]
             shipment.stock_location = Spree::StockLocation.find_by_admin_name(s[:stock_location]) || Spree::StockLocation.find_by_name!(s[:stock_location])
 
@@ -64,19 +59,19 @@ module Spree
             inventory_units.each do |iu|
               ensure_variant_id_from_params(iu)
 
-              unit = shipment.inventory_units.build
-              unit.order = order
+              unless line_item = order.line_items.find_by(variant_id: iu[:variant_id])
+                line_item = order.contents.add(Spree::Variant.find(iu[:variant_id]), 1)
+              end
 
               # Spree expects a Inventory Unit to always reference a line
               # item and variant otherwise users might get exceptions when
               # trying to view these units. Note the Importer might not be
               # able to find the line item if line_item.variant_id |= iu.variant_id
-              unit.variant_id = iu[:variant_id]
-              if line_item = order.line_items.find_by(variant_id: iu[:variant_id])
-                unit.line_item = line_item
-              else
-                unit.line_item = order.contents.add(Spree::Variant.find(iu[:variant_id]), 1)
-              end
+              shipment.inventory_units.new(
+                order: order,
+                variant_id: iu[:variant_id],
+                line_item: line_item
+              )
             end
 
             # Mark shipped if it should be.
@@ -88,11 +83,12 @@ module Spree
               end
             end
 
+            order.shipments << shipment
             shipment.save!
 
             shipping_method = Spree::ShippingMethod.find_by_name(s[:shipping_method]) || Spree::ShippingMethod.find_by_admin_name!(s[:shipping_method])
-            rate = shipment.shipping_rates.create!(:shipping_method => shipping_method,
-                                                   :cost => s[:cost])
+            rate = shipment.shipping_rates.create!(shipping_method: shipping_method,
+                                                   cost: s[:cost])
             shipment.selected_shipping_rate_id = rate.id
             shipment.update_amounts
           end
@@ -157,13 +153,13 @@ module Spree
         def self.ensure_variant_id_from_params(hash)
           sku = hash.delete(:sku)
           unless hash[:variant_id].present?
-            hash[:variant_id] = Spree::Variant.active.find_by_sku!(sku).id
+            hash[:variant_id] = Spree::Variant.with_prices.find_by_sku!(sku).id
           end
           hash
         end
 
         def self.ensure_country_id_from_params(address)
-          return if address.nil? or address[:country_id].present? or address[:country].nil?
+          return if address.nil? || address[:country_id].present? || address[:country].nil?
 
           search = {}
           if name = address[:country]['name']
@@ -181,7 +177,7 @@ module Spree
         end
 
         def self.ensure_state_id_from_params(address)
-          return if address.nil? or address[:state_id].present? or address[:state].nil?
+          return if address.nil? || address[:state_id].present? || address[:state].nil?
 
           search = {}
           if name = address[:state]['name']
@@ -199,7 +195,6 @@ module Spree
             address[:state_name] = search[:name] || search[:abbr]
           end
         end
-
       end
     end
   end