solidus_core 1.2.3 → 1.3.0.beta1

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

@@ -44,18 +44,19 @@ module Spree
         end
 
         private
-          def set_up_options
-            options_attrs.each do |name|
-              option_type = Spree::OptionType.where(name: name).first_or_initialize do |option_type|
-                option_type.presentation = name
-                option_type.save!
-              end
 
-              unless product.option_types.include?(option_type)
-                product.option_types << option_type
-              end
+        def set_up_options
+          options_attrs.each do |name|
+            option_type = Spree::OptionType.where(name: name).first_or_initialize do |ot|
+              ot.presentation = name
+              ot.save!
+            end
+
+            unless product.option_types.include?(option_type)
+              product.option_types << option_type
             end
           end
+        end
       end
     end
   end

data/lib/spree/core/permalinks.rb

@@ -10,19 +10,19 @@ module Spree
       end
 
       module ClassMethods
-        def make_permalink(options={})
+        def make_permalink(options = {})
           options[:field] ||= :permalink
           self.permalink_options = options
 
-          before_validation(:on => :create) { save_permalink }
+          before_validation(on: :create) { save_permalink }
         end
 
         def find_by_param(value, *args)
-          self.send("find_by_#{permalink_field}", value, *args)
+          send("find_by_#{permalink_field}", value, *args)
         end
 
         def find_by_param!(value, *args)
-          self.send("find_by_#{permalink_field}!", value, *args)
+          send("find_by_#{permalink_field}!", value, *args)
         end
 
         def permalink_field
@@ -44,22 +44,22 @@ module Spree
       end
 
       def generate_permalink
-        "#{self.class.permalink_prefix}#{Array.new(self.class.permalink_length){rand(9)}.join}"
+        "#{self.class.permalink_prefix}#{Array.new(self.class.permalink_length){ rand(9) }.join}"
       end
 
-      def save_permalink(permalink_value=self.to_param)
-        self.with_lock do
+      def save_permalink(permalink_value = to_param)
+        with_lock do
           permalink_value ||= generate_permalink
 
           field = self.class.permalink_field
-            # Do other links exist with this permalink?
-            other = self.class.where("#{self.class.table_name}.#{field} LIKE ?", "#{permalink_value}%")
-            if other.any?
-              # Find the existing permalink with the highest number, and increment that number.
-              # (If none of the existing permalinks have a number, this will evaluate to 1.)
-              number = other.map { |o| o.send(field)[/-(\d+)$/, 1].to_i }.max + 1
-              permalink_value += "-#{number.to_s}"
-            end
+          # Do other links exist with this permalink?
+          other = self.class.where("#{self.class.table_name}.#{field} LIKE ?", "#{permalink_value}%")
+          if other.any?
+            # Find the existing permalink with the highest number, and increment that number.
+            # (If none of the existing permalinks have a number, this will evaluate to 1.)
+            number = other.map { |o| o.send(field)[/-(\d+)$/, 1].to_i }.max + 1
+            permalink_value += "-#{number}"
+          end
           write_attribute(field, permalink_value)
         end
       end
@@ -68,4 +68,4 @@ module Spree
 end
 
 ActiveRecord::Base.send :include, Spree::Core::Permalinks
-ActiveRecord::Relation.send :include, Spree::Core::Permalinks
+ActiveRecord::Relation.send :include, Spree::Core::Permalinks

data/lib/spree/core/product_duplicator.rb

@@ -44,7 +44,6 @@ module Spree
         new_master.deleted_at = nil
         new_master.images = master.images.map { |image| duplicate_image image } if @include_images
         new_master.price = master.price
-        new_master.currency = master.currency
       end
     end
 
@@ -52,13 +51,13 @@ module Spree
       new_variant = variant.dup
       new_variant.sku = "COPY OF #{new_variant.sku}"
       new_variant.deleted_at = nil
-      new_variant.option_values = variant.option_values.map { |option_value| option_value}
+      new_variant.option_values = variant.option_values.map { |option_value| option_value }
       new_variant
     end
 
     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

@@ -53,7 +53,7 @@ module Spree
       # below scope would be something like ["$10 - $15", "$15 - $18", "$18 - $20"]
       #
       Spree::Product.add_search_scope :price_range_any do |*opts|
-        conds = opts.map {|o| Spree::Core::ProductFilters.price_filter[:conds][o]}.reject { |c| c.nil? }
+        conds = opts.map { |o| Spree::Core::ProductFilters.price_filter[:conds][o] }.reject(&:nil?)
         scope = conds.shift
         conds.each do |new_scope|
           scope = scope.or(new_scope)
@@ -61,26 +61,25 @@ module Spree
         Spree::Product.joins(master: :default_price).where(scope)
       end
 
-      def ProductFilters.format_price(amount)
+      def self.format_price(amount)
         Spree::Money.new(amount)
       end
 
-      def ProductFilters.price_filter
+      def self.price_filter
         v = Spree::Price.arel_table
-        conds = [ [ Spree.t(:under_price, price: format_price(10))     , v[:amount].lteq(10)],
-                  [ "#{format_price(10)} - #{format_price(15)}"        , v[:amount].in(10..15)],
-                  [ "#{format_price(15)} - #{format_price(18)}"        , v[:amount].in(15..18)],
-                  [ "#{format_price(18)} - #{format_price(20)}"        , v[:amount].in(18..20)],
-                  [ Spree.t(:or_over_price, price: format_price(20)) , v[:amount].gteq(20)]]
+        conds = [[Spree.t(:under_price, price: format_price(10)), v[:amount].lteq(10)],
+                 ["#{format_price(10)} - #{format_price(15)}", v[:amount].in(10..15)],
+                 ["#{format_price(15)} - #{format_price(18)}", v[:amount].in(15..18)],
+                 ["#{format_price(18)} - #{format_price(20)}", v[:amount].in(18..20)],
+                 [Spree.t(:or_over_price, price: format_price(20)), v[:amount].gteq(20)]]
         {
           name:   Spree.t(:price_range),
           scope:  :price_range_any,
           conds:  Hash[*conds.flatten],
-          labels: conds.map { |k,v| [k, k] }
+          labels: conds.map { |k, _v| [k, k] }
         }
       end
 
-
       # Example: filtering by possible brands
       #
       # First, we define the scope. Two interesting points here: (a) we run our conditions
@@ -94,7 +93,7 @@ module Spree
       #   being blank: note that this relies on with_property doing a left outer join
       #   rather than an inner join.
       Spree::Product.add_search_scope :brand_any do |*opts|
-        conds = opts.map {|o| ProductFilters.brand_filter[:conds][o]}.reject { |c| c.nil? }
+        conds = opts.map { |o| ProductFilters.brand_filter[:conds][o] }.reject(&:nil?)
         scope = conds.shift
         conds.each do |new_scope|
           scope = scope.or(new_scope)
@@ -102,7 +101,7 @@ module Spree
         Spree::Product.with_property('brand').where(scope)
       end
 
-      def ProductFilters.brand_filter
+      def self.brand_filter
         brand_property = Spree::Property.find_by(name: 'brand')
         brands = brand_property ? Spree::ProductProperty.where(property_id: brand_property.id).pluck(:value).uniq.map(&:to_s) : []
         pp = Spree::ProductProperty.arel_table
@@ -111,7 +110,7 @@ module Spree
           name:   'Brands',
           scope:  :brand_any,
           conds:  conds,
-          labels: (brands.sort).map { |k| [k, k] }
+          labels: brands.sort.map { |k| [k, k] }
         }
       end
 
@@ -138,7 +137,7 @@ module Spree
         Spree::Product.brand_any(*opts)
       end
 
-      def ProductFilters.selective_brand_filter(taxon = nil)
+      def self.selective_brand_filter(taxon = nil)
         taxon ||= Spree::Taxonomy.first.root
         brand_property = Spree::Property.find_by(name: 'brand')
         scope = Spree::ProductProperty.where(property: brand_property).
@@ -164,7 +163,7 @@ module Spree
       #
       # This scope selects products in any of the active taxons or their children.
       #
-      def ProductFilters.taxons_below(taxon)
+      def self.taxons_below(taxon)
         return Spree::Core::ProductFilters.all_taxons if taxon.nil?
         {
           name:   'Taxons under ' + taxon.name,
@@ -180,7 +179,7 @@ module Spree
       # it uses one of the auto-generated scopes from Ransack.
       #
       # idea: expand the format to allow nesting of labels?
-      def ProductFilters.all_taxons
+      def self.all_taxons
         taxons = Spree::Taxonomy.all.map { |t| [t.root] + t.root.descendants }.flatten
         {
           name:   'All taxons',

data/lib/spree/core/role_configuration.rb

@@ -35,7 +35,7 @@ module Spree
     #
     # @param ability [CanCan::Ability] the ability to invoke declarations on
     # @param user [#spree_roles] the user that holds the spree_roles association.
-    def activate_permissions! ability, user
+    def activate_permissions!(ability, user)
       spree_roles = ['default'] | user.spree_roles.map(&:name)
       applicable_permissions = Set.new
 
@@ -60,7 +60,7 @@ module Spree
     # @param role_name [Symbol, String] The name of the role to associate permissions with
     # @param permission_sets [Array<Spree::PermissionSets::Base>, Set<Spree::PermissionSets::Base>]
     #   A list of permission sets to activate if the user has the role indicated by role_name
-    def assign_permissions role_name, permission_sets
+    def assign_permissions(role_name, permission_sets)
       name = role_name.to_s
 
       roles[name].permission_sets |= permission_sets

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

@@ -1,29 +1,42 @@
+require 'spree/deprecation'
+
 module Spree
   module Core
     module Search
       class Base
         attr_accessor :properties
         attr_accessor :current_user
-        attr_accessor :current_currency
+        attr_accessor :pricing_options
 
         def initialize(params)
-          self.current_currency = Spree::Config[:currency]
+          self.pricing_options = Spree::Config.default_pricing_options
           @properties = {}
           prepare(params)
         end
 
+        def current_currency=(currency)
+          self.pricing_options = Spree::Config.pricing_options_class.new(
+            pricing_options.desired_attributes.merge(currency: currency)
+          )
+        end
+
+        def current_currency
+          pricing_options.currency
+        end
+        deprecate :current_currency, :current_currency=, deprecator: Spree::Deprecation
+
         def retrieve_products
           @products = get_base_scope
           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.joins(:prices).merge(Spree::Price.where(pricing_options.desired_attributes)).uniq
           end
           @products = @products.page(curr_page).per(per_page)
         end
 
         def method_missing(name)
-          if @properties.has_key? name
+          if @properties.key? name
             @properties[name]
           else
             super
@@ -31,66 +44,67 @@ module Spree
         end
 
         protected
-          def get_base_scope
-            base_scope = Spree::Product.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)
-            base_scope = add_eagerload_scopes(base_scope)
-            base_scope
-          end
 
-          def add_eagerload_scopes scope
-            # TL;DR Switch from `preload` to `includes` as soon as Rails starts honoring
-            # `order` clauses on `has_many` associations when a `where` constraint
-            # affecting a joined table is present (see
-            # https://github.com/rails/rails/issues/6769).
-            #
-            # Ideally this would use `includes` instead of `preload` calls, leaving it
-            # up to Rails whether associated objects should be fetched in one big join
-            # or multiple independent queries. However as of Rails 4.1.8 any `order`
-            # defined on `has_many` associations are ignored when Rails builds a join
-            # query.
-            #
-            # Would we use `includes` in this particular case, Rails would do
-            # separate queries most of the time but opt for a join as soon as any
-            # `where` constraints affecting joined tables are added to the search;
-            # which is the case as soon as a taxon is added to the base scope.
-            scope = scope.preload(master: :prices)
-            scope = scope.preload(master: :images) if include_images
-            scope
-          end
+        def get_base_scope
+          base_scope = Spree::Product.available
+          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)
+          base_scope = add_eagerload_scopes(base_scope)
+          base_scope
+        end
 
-          def add_search_scopes(base_scope)
-            search.each do |name, scope_attribute|
-              scope_name = name.to_sym
-              if base_scope.respond_to?(:search_scopes) && base_scope.search_scopes.include?(scope_name.to_sym)
-                base_scope = base_scope.send(scope_name, *scope_attribute)
-              else
-                base_scope = base_scope.merge(Spree::Product.ransack({scope_name => scope_attribute}).result)
-              end
-            end if search
-            base_scope
-          end
+        def add_eagerload_scopes(scope)
+          # TL;DR Switch from `preload` to `includes` as soon as Rails starts honoring
+          # `order` clauses on `has_many` associations when a `where` constraint
+          # affecting a joined table is present (see
+          # https://github.com/rails/rails/issues/6769).
+          #
+          # Ideally this would use `includes` instead of `preload` calls, leaving it
+          # up to Rails whether associated objects should be fetched in one big join
+          # or multiple independent queries. However as of Rails 4.1.8 any `order`
+          # defined on `has_many` associations are ignored when Rails builds a join
+          # query.
+          #
+          # Would we use `includes` in this particular case, Rails would do
+          # separate queries most of the time but opt for a join as soon as any
+          # `where` constraints affecting joined tables are added to the search;
+          # which is the case as soon as a taxon is added to the base scope.
+          scope = scope.preload(master: :prices)
+          scope = scope.preload(master: :images) if include_images
+          scope
+        end
 
-          # method should return new scope based on base_scope
-          def get_products_conditions_for(base_scope, query)
-            unless query.blank?
-              base_scope = base_scope.like_any([:name, :description], query.split)
+        def add_search_scopes(base_scope)
+          search.each do |name, scope_attribute|
+            scope_name = name.to_sym
+            if base_scope.respond_to?(:search_scopes) && base_scope.search_scopes.include?(scope_name.to_sym)
+              base_scope = base_scope.send(scope_name, *scope_attribute)
+            else
+              base_scope = base_scope.merge(Spree::Product.ransack({ scope_name => scope_attribute }).result)
             end
-            base_scope
+          end if search
+          base_scope
+        end
+
+        # method should return new scope based on base_scope
+        def get_products_conditions_for(base_scope, query)
+          unless query.blank?
+            base_scope = base_scope.like_any([:name, :description], query.split)
           end
+          base_scope
+        end
 
-          def prepare(params)
-            @properties[:taxon] = params[:taxon].blank? ? nil : Spree::Taxon.find(params[:taxon])
-            @properties[:keywords] = params[:keywords]
-            @properties[:search] = params[:search]
-            @properties[:include_images] = params[:include_images]
+        def prepare(params)
+          @properties[:taxon] = params[:taxon].blank? ? nil : Spree::Taxon.find(params[:taxon])
+          @properties[:keywords] = params[:keywords]
+          @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
-          end
+          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,21 +1,19 @@
 module Spree
   module Core
     module Search
-
       #
       # NOTE: Use Spree::Config.variant_search_class rather than referencing this
       # directly.
       #
 
       class Variant
-
         class_attribute :search_terms
         self.search_terms = [
           :sku_cont,
           :product_name_cont,
           :product_slug_cont,
           :option_values_presentation_cont,
-          :option_values_name_cont,
+          :option_values_name_cont
         ]
 
         def initialize(query_string, scope: Spree::Variant.all)
@@ -50,7 +48,7 @@ module Spree
         # @param word [String] One of the search words provided by the user.
         #   e.g. a SKU
         # @return [Array<Symbol>] the list of search terms to use for this word
-        def search_terms(word)
+        def search_terms(_word)
           self.class.search_terms
         end
 

data/lib/spree/core/unreturned_item_charger.rb

@@ -42,7 +42,7 @@ module Spree
 
       new_order.contents.approve(name: self.class.name)
       new_order.complete!
-      Spree::OrderCapturing.new(new_order).capture_payments if (Spree::Config[:auto_capture_exchanges] && !Spree::Config[:auto_capture])
+      Spree::OrderCapturing.new(new_order).capture_payments if Spree::Config[:auto_capture_exchanges] && !Spree::Config[:auto_capture]
 
       @return_items.each(&:expired!)
       create_new_rma if Spree::Config[:create_rma_for_unreturned_exchange]
@@ -52,7 +52,6 @@ module Spree
       elsif !new_order.valid?
         raise ChargeFailure.new('order not valid', new_order)
       end
-
     end
 
     private

data/lib/spree/core/validators/email.rb

@@ -1,7 +1,7 @@
 class EmailValidator < ActiveModel::EachValidator
-  def validate_each(record,attribute,value)
+  def validate_each(record, attribute, value)
     unless value =~ /\A([^@\.]|[^@\.]([^@\s]*)[^@\.])@([^@\s]+\.)+[^@\s]+\z/
-      record.errors.add(attribute, :invalid, {:value => value}.merge!(options))
+      record.errors.add(attribute, :invalid, { value: value }.merge!(options))
     end
   end
 end

data/lib/spree/core/version.rb

@@ -5,7 +5,7 @@ module Spree
   end
 
   def self.solidus_version
-    "1.2.3"
+    "1.3.0.beta1"
   end
 
   def self.solidus_gem_version

data/lib/spree/core.rb

@@ -4,7 +4,6 @@ require 'acts_as_list'
 require 'awesome_nested_set'
 require 'cancan'
 require 'friendly_id'
-require 'font-awesome-rails'
 require 'kaminari'
 require 'mail'
 require 'monetize'
@@ -20,7 +19,6 @@ require 'responders'
 StateMachines::Machine.ignore_method_conflicts = true
 
 module Spree
-
   mattr_accessor :user_class
 
   def self.user_class
@@ -41,7 +39,7 @@ module Spree
   #
   # This method is defined within the core gem on purpose.
   # Some people may only wish to use the Core part of Spree.
-  def self.config(&block)
+  def self.config(&_block)
     yield(Spree::Config)
   end
 
@@ -70,7 +68,6 @@ require 'spree/core/environment/calculators'
 require 'spree/core/environment'
 require 'spree/promo/environment'
 require 'spree/migrations'
-require 'spree/migration_helpers'
 require 'spree/core/engine'
 
 require 'spree/i18n'
@@ -87,6 +84,7 @@ require 'spree/core/controller_helpers/auth'
 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'

data/lib/spree/i18n.rb

@@ -9,7 +9,7 @@ module Spree
   class << self
     # Add spree namespace and delegate to Rails TranslationHelper for some nice
     # extra functionality. e.g return reasonable strings for missing translations
-    def translate(key, options={})
+    def translate(key, options = {})
       options[:scope] = [:spree, *options[:scope]]
       TranslationHelperWrapper.new.translate(key, options)
     end

data/lib/spree/localized_number.rb

@@ -10,7 +10,9 @@ module Spree
     def self.parse(number)
       return number unless number.is_a?(String)
 
-      separator, delimiter = I18n.t([:'number.currency.format.separator', :'number.currency.format.delimiter'])
+      # I18n.t('number.currency.format.delimiter') could be useful here, but is
+      # unnecessary as it is stripped by the non_number_characters gsub.
+      separator = I18n.t(:'number.currency.format.separator')
       non_number_characters = /[^0-9\-#{separator}]/
 
       # strip everything else first

data/lib/spree/migrations.rb

@@ -41,36 +41,37 @@ module Spree
     end
 
     private
-      def engine_migrations
-        Dir.entries(engine_dir).map do |file_name|
-          name = file_name.split("_", 2).last.split(".", 2).first
-          name.empty? ? next : name
-        end.compact! || []
-      end
 
-      def app_migrations
-        Dir.entries(app_dir).map do |file_name|
-          next if [".", ".."].include? file_name
-          name = file_name.split("_", 2).last
-          name.empty? ? next : name
-        end.compact! || []
-      end
+    def engine_migrations
+      Dir.entries(engine_dir).map do |file_name|
+        name = file_name.split("_", 2).last.split(".", 2).first
+        name.empty? ? next : name
+      end.compact! || []
+    end
 
-      def app_dir
-        "#{Rails.root}/db/migrate"
-      end
+    def app_migrations
+      Dir.entries(app_dir).map do |file_name|
+        next if [".", ".."].include? file_name
+        name = file_name.split("_", 2).last
+        name.empty? ? next : name
+      end.compact! || []
+    end
 
-      def engine_dir
-        "#{config.root}/db/migrate"
-      end
+    def app_dir
+      "#{Rails.root}/db/migrate"
+    end
 
-      def match_engine?(engine)
-        if engine_name == "spree"
-          # Avoid stores upgrading from 1.3 getting wrong warnings
-          ["spree.rb", "spree_promo.rb"].include? engine
-        else
-          engine == "#{engine_name}.rb"
-        end
+    def engine_dir
+      "#{config.root}/db/migrate"
+    end
+
+    def match_engine?(engine)
+      if engine_name == "spree"
+        # Avoid stores upgrading from 1.3 getting wrong warnings
+        ["spree.rb", "spree_promo.rb"].include? engine
+      else
+        engine == "#{engine_name}.rb"
       end
+    end
   end
 end

data/lib/spree/money.rb

@@ -8,6 +8,10 @@ module Spree
   class Money
     class <<self
       attr_accessor :default_formatting_rules
+
+      def from_money(money)
+        new(money.to_d, currency: money.currency.iso_code)
+      end
     end
     self.default_formatting_rules = {
       # Ruby money currently has this as false, which is wrong for the vast
@@ -17,7 +21,7 @@ module Spree
 
     attr_reader :money
 
-    delegate :cents, to: :money
+    delegate :cents, :currency, :to_d, :zero?, to: :money
 
     # @param amount [#to_s] the value of the money object
     # @param options [Hash] the options for creating the money object
@@ -32,7 +36,7 @@ module Spree
     #   value comes before the currency symbol
     # @option options [:before, :after] symbol_position the position of the
     #   currency symbol
-    def initialize(amount, options={})
+    def initialize(amount, options = {})
       @money = Monetize.parse([amount, (options[:currency] || Spree::Config[:currency])].join)
       @options = Spree::Money.default_formatting_rules.merge(options)
     end
@@ -65,8 +69,19 @@ module Spree
     # Delegates comparison to the internal ruby money instance.
     #
     # @see http://www.rubydoc.info/gems/money/Money/Arithmetic#%3D%3D-instance_method
-    def ==(obj)
-      @money == obj.money
+    def ==(other)
+      raise TypeError, "Can't compare #{other.class} to Spree::Money" if !other.respond_to?(:money)
+      @money == other.money
+    end
+
+    def -(other)
+      raise TypeError, "Can't subtract #{other.class} to Spree::Money" if !other.respond_to?(:money)
+      self.class.from_money(@money - other.money)
+    end
+
+    def +(other)
+      raise TypeError, "Can't add #{other.class} to Spree::Money" if !other.respond_to?(:money)
+      self.class.from_money(@money + other.money)
     end
   end
 end

data/lib/spree/permission_sets/base.rb

@@ -11,7 +11,7 @@ module Spree
       # @param ability [CanCan::Ability]
       #   The ability that will be extended with the current permission set.
       #   The ability passed in must respond to #user
-      def initialize ability
+      def initialize(ability)
         @ability = ability
       end