solidus_core 1.2.3 → 1.3.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c0fea50cb0031d9a121c7abfb25c015c86542f5
-  data.tar.gz: 9294f4effa7875921c5deef2e05c69c52d6abddf
+  metadata.gz: 8d35bbf151696ae5b75db7416fff2c8e284ca9b8
+  data.tar.gz: 8e522de0b131af298e20285e0538f9619f9f1319
 SHA512:
-  metadata.gz: 6e213a7266228cd8167cf8e1dab29442079d1bbb5a9eb885a9d30058b9110e95662b4984c4bb54248f1d9c98c7550e78b2483374b2895474b2ca38c2fbba94e9
-  data.tar.gz: 84b512524dc615c1803c2f4cd35039076f7e27b76bbe2a1ef8950a3a17d9423a21c64f0da75a4c177deff0db762cbbcc32bbdceb2b34c06e0ef09581ca98ea6f
+  metadata.gz: 0738f730422f1fab50ac319b097afb20c9839a67e9777fc4d2d8aa3eb36c5d5ea2c01e82858945e27e5f2f96d1eaf0525bad5a265d19ecfb4f5d214f268406c8
+  data.tar.gz: 841e663aa453b91bc9e7c2d01002c33270bbd628aaef244daf840e6410381eca2a0df8606a37c3bd45b690498c8706b673e609f85082773e0fe9047928ebe672

data/Gemfile

@@ -1,3 +1,3 @@
-eval(File.read(File.dirname(__FILE__) + '/../common_spree_dependencies.rb'))
+eval_gemfile File.expand_path('../../common_spree_dependencies.rb', __FILE__)
 
 gemspec

data/Rakefile

@@ -7,7 +7,7 @@ load 'lib/tasks/exchanges.rake'
 
 RSpec::Core::RakeTask.new
 
-task :default => :spec
+task default: :spec
 
 desc "Generates a dummy app for testing"
 task :test_app do

data/app/assets/javascripts/spree.js.coffee.erb

@@ -14,7 +14,7 @@ class window.Spree
   # Uses the JSUri library from here: https://github.com/derek-watson/jsUri
   # Thanks to Jake Moffat for the suggestion: https://twitter.com/jakeonrails/statuses/321776992221544449
   @url: (uri, query) ->
-    if Spree.env == 'development'
+    if Spree.env == 'development' || Spree.env == 'test'
       console.warn 'Spree.url is deprecated, please use Spree.ajax for your request instead.'
     if uri.path == undefined
       uri = new Uri(uri)

data/app/helpers/spree/base_helper.rb

@@ -1,22 +1,10 @@
 module Spree
   module BaseHelper
-
-    # Defined because Rails' current_page? helper is not working when Spree is mounted at root.
-    def current_spree_page?(url)
-      path = request.fullpath.gsub(/^\/\//, '/')
-      if url.is_a?(String)
-        return path == url
-      elsif url.is_a?(Hash)
-        return path == spree.url_for(url)
-      end
-      return false
-    end
-
     def link_to_cart(text = nil)
       text = text ? h(text) : Spree.t(:cart)
       css_class = nil
 
-      if simple_current_order.nil? or simple_current_order.item_count.zero?
+      if simple_current_order.nil? || simple_current_order.item_count.zero?
         text = "#{text}: (#{Spree.t(:empty)})"
         css_class = 'empty'
       else
@@ -24,31 +12,31 @@ module Spree
         css_class = 'full'
       end
 
-      link_to text.html_safe, spree.cart_path, :class => "cart-info #{css_class}"
+      link_to text.html_safe, spree.cart_path, class: "cart-info #{css_class}"
     end
 
     # human readable list of variant options
-    def variant_options(v, options={})
+    def variant_options(v, _options = {})
       v.options_text
     end
 
     def meta_data
-      object = instance_variable_get('@'+controller_name.singularize)
+      object = instance_variable_get('@' + controller_name.singularize)
       meta = {}
 
-      if object.kind_of? ActiveRecord::Base
+      if object.is_a? ActiveRecord::Base
         meta[:keywords] = object.meta_keywords if object[:meta_keywords].present?
         meta[:description] = object.meta_description if object[:meta_description].present?
       end
 
-      if meta[:description].blank? && object.kind_of?(Spree::Product)
-        meta[:description] = strip_tags(truncate(object.description, length: 160, separator: ' '))
+      if meta[:description].blank? && object.is_a?(Spree::Product)
+        meta[:description] = truncate(strip_tags(object.description), length: 160, separator: ' ')
       end
 
       meta.reverse_merge!({
         keywords: current_store.meta_keywords,
-        description: current_store.meta_description,
-      }) if meta[:keywords].blank? or meta[:description].blank?
+        description: current_store.meta_description
+      }) if meta[:keywords].blank? || meta[:description].blank?
       meta
     end
 
@@ -63,7 +51,7 @@ module Spree
       @body_class
     end
 
-    def logo(image_path=Spree::Config[:logo])
+    def logo(image_path = Spree::Config[:logo])
       link_to image_tag(image_path), spree.root_path
     end
 
@@ -72,13 +60,13 @@ module Spree
 
       flash.each do |msg_type, text|
         unless ignore_types.include?(msg_type)
-          concat(content_tag :div, text, class: "flash #{msg_type}")
+          concat(content_tag(:div, text, class: "flash #{msg_type}"))
         end
       end
       nil
     end
 
-    def breadcrumbs(taxon, separator=" » ", breadcrumb_class="inline")
+    def breadcrumbs(taxon, separator = " » ", breadcrumb_class = "inline")
       return "" if current_page?("/") || taxon.nil?
 
       crumbs = [[Spree.t(:home), spree.root_path]]
@@ -94,7 +82,7 @@ module Spree
       separator = raw(separator)
 
       crumbs.map! do |crumb|
-        content_tag(:li, itemscope:"itemscope", itemtype:"http://data-vocabulary.org/Breadcrumb") do
+        content_tag(:li, itemscope: "itemscope", itemtype: "http://data-vocabulary.org/Breadcrumb") do
           link_to(crumb.last, itemprop: "url") do
             content_tag(:span, crumb.first, itemprop: "title")
           end + (crumb == crumbs.last ? '' : separator)
@@ -111,7 +99,7 @@ module Spree
           css_class = (current_taxon && current_taxon.self_and_ancestors.include?(taxon)) ? 'current' : nil
           content_tag :li, class: css_class do
            link_to(taxon.name, seo_url(taxon)) +
-           taxons_tree(taxon, current_taxon, max_level - 1)
+             taxons_tree(taxon, current_taxon, max_level - 1)
           end
         end
         safe_join(taxons, "\n")
@@ -134,30 +122,22 @@ module Spree
     end
 
     def seo_url(taxon)
-      return spree.nested_taxons_path(taxon.permalink)
-    end
-
-    def gem_available?(name)
-       Gem::Specification.find_by_name(name)
-    rescue Gem::LoadError
-       false
-    rescue
-       Gem.available?(name)
+      spree.nested_taxons_path(taxon.permalink)
     end
 
     def display_price(product_or_variant)
-      product_or_variant.price_in(current_currency).display_price.to_html
+      product_or_variant.price_for(current_pricing_options).to_html
     end
 
     def pretty_time(time)
       [I18n.l(time.to_date, format: :long),
-        time.strftime("%l:%M %p")].join(" ")
+       time.strftime("%l:%M %p")].join(" ")
     end
 
     def method_missing(method_name, *args, &block)
       if image_style = image_style_from_method_name(method_name)
         define_image_method(image_style)
-        self.send(method_name, *args)
+        send(method_name, *args)
       else
         super
       end
@@ -195,12 +175,10 @@ module Spree
         if product.images.empty?
           if !product.is_a?(Spree::Variant) && !product.variant_images.empty?
             create_product_image_tag(product.variant_images.first, product, options, style)
+          elsif product.is_a?(Variant) && !product.product.variant_images.empty?
+            create_product_image_tag(product.product.variant_images.first, product, options, style)
           else
-            if product.is_a?(Variant) && !product.product.variant_images.empty?
-              create_product_image_tag(product.product.variant_images.first, product, options, style)
-            else
-              image_tag "noimage/#{style}.png", options
-            end
+            image_tag "noimage/#{style}.png", options
           end
         else
           create_product_image_tag(product.images.first, product, options, style)

data/app/helpers/spree/orders_helper.rb

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

data/app/helpers/spree/products_helper.rb

@@ -19,13 +19,11 @@ module Spree
     # @param variant [Spree::Variant] the variant
     # @return [String] formatted string with label and amount
     def variant_price_diff(variant)
-      variant_amount = variant.amount_in(current_currency)
-      product_amount = variant.product.amount_in(current_currency)
-      return if variant_amount == product_amount || product_amount.nil?
-      diff   = variant.amount_in(current_currency) - product_amount
-      amount = Spree::Money.new(diff.abs, currency: current_currency).to_html
-      label  = diff > 0 ? :add : :subtract
-      "(#{Spree.t(label)}: #{amount})".html_safe
+      return if variant.price_same_as_master?(current_pricing_options)
+      difference = variant.price_difference_from_master(current_pricing_options)
+      absolute_amount = Spree::Money.new(difference.to_d.abs, currency: difference.currency.iso_code)
+      i18n_key = difference.to_d > 0 ? :price_diff_add_html : :price_diff_subtract_html
+      Spree.t(i18n_key, scope: [:helpers, :products], amount_html: absolute_amount.to_html)
     end
 
     # Returns the formatted full price for the variant, if at least one variant
@@ -34,10 +32,10 @@ module Spree
     # @param variant [Spree::Variant] the variant
     # @return [Spree::Money] the full price
     def variant_full_price(variant)
-      product = variant.product
-      unless product.variants.active(current_currency).all? { |v| v.price == product.price }
-        Spree::Money.new(variant.price, { currency: current_currency }).to_html
-      end
+      return if variant.product.variants
+                  .with_prices(current_pricing_options)
+                  .all? { |v| v.price_same_as_master?(current_pricing_options) }
+      variant.price_for(current_pricing_options).to_html
     end
 
     # Converts line breaks in product description into <p> tags.
@@ -68,7 +66,7 @@ module Spree
     def cache_key_for_products
       count = @products.count
       max_updated_at = (@products.maximum(:updated_at) || Date.today).to_s(:number)
-      "#{I18n.locale}/#{current_currency}/spree/products/all-#{params[:page]}-#{max_updated_at}-#{count}"
+      "#{I18n.locale}/#{current_pricing_options.cache_key}/spree/products/all-#{params[:page]}-#{max_updated_at}-#{count}"
     end
   end
 end

data/app/helpers/spree/taxons_helper.rb

@@ -3,13 +3,13 @@ module Spree
     # Retrieves the collection of products to display when "previewing" a taxon.  This is abstracted into a helper so
     # that we can use configurations as well as make it easier for end users to override this determination.  One idea is
     # to show the most popular products for a particular taxon (that is an exercise left to the developer.)
-    def taxon_preview(taxon, max=4)
+    def taxon_preview(taxon, max = 4)
       products = taxon.active_products.select("DISTINCT (spree_products.id), spree_products.*, spree_products_taxons.position").limit(max)
-      if (products.size < max)
+      if products.size < max
         products_arel = Spree::Product.arel_table
-        taxon.descendants.each do |taxon|
+        taxon.descendants.each do |descendent_taxon|
           to_get = max - products.length
-          products += taxon.active_products.select("DISTINCT (spree_products.id), spree_products.*, spree_products_taxons.position").where(products_arel[:id].not_in(products.map(&:id))).limit(to_get)
+          products += descendent_taxon.active_products.select("DISTINCT (spree_products.id), spree_products.*, spree_products_taxons.position").where(products_arel[:id].not_in(products.map(&:id))).limit(to_get)
           break if products.size >= max
         end
       end

data/app/mailers/spree/base_mailer.rb

@@ -1,6 +1,5 @@
 module Spree
   class BaseMailer < ActionMailer::Base
-
     def from_address(store = nil)
       if store
         store.mail_from_address
@@ -15,9 +14,8 @@ module Spree
     end
     helper_method :money
 
-    def mail(headers={}, &block)
+    def mail(headers = {}, &block)
       super if Spree::Config[:send_core_emails]
     end
-
   end
 end

data/app/mailers/spree/carton_mailer.rb

@@ -13,7 +13,7 @@ module Spree
     # Note: The signature of this method has changed. The new (non-deprecated)
     # signature is:
     #   def shipped_email(carton:, order:, resend: false)
-    def shipped_email(options, deprecated_options={})
+    def shipped_email(options, deprecated_options = {})
       if options.is_a?(Integer)
         ActiveSupport::Deprecation.warn "Calling shipped_email with a carton_id is DEPRECATED. Instead use CartonMailer.shipped_email(order: order, carton: carton)"
         @carton = Carton.find(options)
@@ -25,7 +25,7 @@ module Spree
         @carton = options.fetch(:carton)
         @manifest = @carton.manifest_for_order(@order)
       end
-      options =  {resend: false}.merge(options)
+      options = { resend: false }.merge(options)
       @store = @order.store
       subject = (options[:resend] ? "[#{Spree.t(:resend).upcase}] " : '')
       subject += "#{@store.name} #{Spree.t('shipment_mailer.shipped_email.subject')} ##{@order.number}"

data/app/mailers/spree/order_mailer.rb

@@ -36,8 +36,8 @@ module Spree
     end
 
     def build_subject(subject_text, resend)
-      subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
-      subject += "#{Spree::Store.current.name} #{subject_text} ##{@order.number}"
+      resend_text = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
+      "#{resend_text}#{Spree::Store.current.name} #{subject_text} ##{@order.number}"
     end
   end
 end

data/app/models/concerns/spree/adjustment_source.rb

@@ -1,23 +1,19 @@
 module Spree
   module AdjustmentSource
-    extend ActiveSupport::Concern
+    def deals_with_adjustments_for_deleted_source
+      adjustment_scope = adjustments.joins(:order)
 
-    included do
-      def deals_with_adjustments_for_deleted_source
-        adjustment_scope = self.adjustments.joins(:order)
+      # For incomplete orders, remove the adjustment completely.
+      adjustment_scope.where(spree_orders: { completed_at: nil }).destroy_all
 
-        # For incomplete orders, remove the adjustment completely.
-        adjustment_scope.where(spree_orders: { completed_at: nil }).destroy_all
-
-        # For complete orders, the source will be invalid.
-        # Therefore we nullify the source_id, leaving the adjustment in place.
-        # This would mean that the order's total is not altered at all.
-        attrs = {
-          source_id: nil,
-          updated_at: Time.current
-        }
-        adjustment_scope.where.not(spree_orders: { completed_at: nil }).update_all(attrs)
-      end
+      # For complete orders, the source will be invalid.
+      # Therefore we nullify the source_id, leaving the adjustment in place.
+      # This would mean that the order's total is not altered at all.
+      attrs = {
+        source_id: nil,
+        updated_at: Time.current
+      }
+      adjustment_scope.where.not(spree_orders: { completed_at: nil }).update_all(attrs)
     end
   end
 end

data/app/models/concerns/spree/calculated_adjustments.rb

@@ -3,31 +3,34 @@ module Spree
     extend ActiveSupport::Concern
 
     included do
-      has_one   :calculator, class_name: "Spree::Calculator", as: :calculable, inverse_of: :calculable, dependent: :destroy, autosave: true
+      has_one :calculator, class_name: "Spree::Calculator", as: :calculable, inverse_of: :calculable, dependent: :destroy, autosave: true
       accepts_nested_attributes_for :calculator
       validates :calculator, presence: true
+    end
 
-      def self.calculators
+    class_methods do
+      def calculators
         spree_calculators.send model_name_without_spree_namespace
       end
 
-      def calculator_type
-        calculator.class.to_s if calculator
-      end
-
-      def calculator_type=(calculator_type)
-        klass = calculator_type.constantize if calculator_type
-        self.calculator = klass.new if klass && !self.calculator.is_a?(klass)
-      end
-
       private
-      def self.model_name_without_spree_namespace
-        self.to_s.tableize.gsub('/', '_').sub('spree_', '')
+
+      def model_name_without_spree_namespace
+        to_s.tableize.tr('/', '_').sub('spree_', '')
       end
 
-      def self.spree_calculators
+      def spree_calculators
         Rails.application.config.spree.calculators
       end
     end
+
+    def calculator_type
+      calculator.class.to_s if calculator
+    end
+
+    def calculator_type=(calculator_type)
+      klass = calculator_type.constantize if calculator_type
+      self.calculator = klass.new if klass && !calculator.is_a?(klass)
+    end
   end
 end

data/app/models/concerns/spree/default_price.rb

@@ -4,39 +4,23 @@ module Spree
 
     included do
       has_one :default_price,
-        -> { where currency: Spree::Config[:currency], is_default: true },
+        -> { with_deleted.currently_valid.with_default_attributes },
         class_name: 'Spree::Price',
         inverse_of: :variant,
         dependent: :destroy,
         autosave: true
+    end
 
-      def find_or_build_default_price
-        default_price || build_default_price
-      end
-
-      delegate :display_price, :display_amount,
-                :price, :price=, :currency, :currency=,
-                to: :find_or_build_default_price
-
-      after_save :save_default_price
-
-      def default_price
-        Spree::Price.unscoped { super }
-      end
-
-      def has_default_price?
-        !self.default_price.nil?
-      end
-
-      private
+    def find_or_build_default_price
+      default_price || build_default_price(Spree::Config.default_pricing_options.desired_attributes)
+    end
 
-      def default_price_changed?
-        default_price && (default_price.changed? || default_price.new_record?)
-      end
+    delegate :display_price, :display_amount, :price, :currency, to: :find_or_build_default_price
+    delegate :price=, :currency=, to: :find_or_build_default_price
+    deprecate :currency=, :currency, deprecator: Spree::Deprecation
 
-      def save_default_price
-        default_price.save if default_price_changed?
-      end
+    def has_default_price?
+      !default_price.nil?
     end
   end
 end

data/app/models/concerns/spree/display_money.rb

@@ -8,7 +8,7 @@ module Spree
     #
     #
     # ==== Examples
-    # Decorate a method, with the default option of using the base object's 
+    # Decorate a method, with the default option of using the base object's
     # currency
     #
     #     extend Spree::DisplayMoney

data/app/models/concerns/spree/ordered_property_value_list.rb

@@ -3,25 +3,23 @@ module Spree
     extend ActiveSupport::Concern
 
     included do
-      acts_as_list
-
       validates :property, presence: true
       validates_with Spree::Validations::DbMaximumLengthValidator, field: :value
 
       default_scope -> { order(:position) }
+    end
 
-      # virtual attributes for use with AJAX autocompletion
-      def property_name
-        property.name if property
-      end
+    # virtual attributes for use with AJAX autocompletion
+    def property_name
+      property.name if property
+    end
 
-      def property_name=(name)
-        unless name.blank?
-          unless property = Property.find_by(name: name)
-            property = Property.create(name: name, presentation: name)
-          end
-          self.property = property
+    def property_name=(name)
+      unless name.blank?
+        unless property = Property.find_by(name: name)
+          property = Property.create(name: name, presentation: name)
         end
+        self.property = property
       end
     end
   end

data/app/models/concerns/spree/ransackable_attributes.rb

@@ -6,14 +6,15 @@ module Spree::RansackableAttributes
 
     class_attribute :default_ransackable_attributes
     self.default_ransackable_attributes = %w[id name]
+  end
 
-    def self.ransackable_associations(*args)
-      self.whitelisted_ransackable_associations || []
+  class_methods do
+    def ransackable_associations(*_args)
+      whitelisted_ransackable_associations || []
     end
 
-    def self.ransackable_attributes(*args)
-      self.default_ransackable_attributes | (self.whitelisted_ransackable_attributes || [])
+    def ransackable_attributes(*_args)
+      default_ransackable_attributes | (whitelisted_ransackable_attributes || [])
     end
   end
-
 end