spree_core 2.0.13 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a7abff523eebb24d6e7573a1276b2c68eac15b2
-  data.tar.gz: 59dd2a80a97247e186725cb8f0be540bf816ddf7
+  metadata.gz: 9cba2b6dea5945419319d944c119f1a1c74de1a8
+  data.tar.gz: b8f83cbeb8810e3436fcbe3221f671c8e60c95fc
 SHA512:
-  metadata.gz: 45e619b3362386a0fa401f357190c61d60c740064e68dc5a46802b60ddd41a0fe459d156eb59148e821d7573184a269260a838c16f045df11c5ae85c7a18c11a
-  data.tar.gz: 21e099c966c74e43758a2e3ef8c0864eefd5543f79c586d0d6354bcf923e695c7250d31d03b6bed10042800340634c1a0de657ffc1d9959aa198bd8bfa070bfa
+  metadata.gz: e83e8be4a6963a38ce47a7812363f43616ab10487d579dff3919480a9471df507bd8b2ee2434bbca5e1310eda105250d1c971f5132319504d13c588639c49532
+  data.tar.gz: eaf05a02e45b23144edbc3b478593b4263196147c2c19981a0208e80f66695486ebe07deb5068b8a6ffad7c4418820ec1e9e89bb41f09eb80d35673eabc74a79

data/app/controllers/spree/base_controller.rb

@@ -1,4 +1,5 @@
 require 'cancan'
+require_dependency 'spree/core/controller_helpers/strong_parameters'
 
 class Spree::BaseController < ApplicationController
   include Spree::Core::ControllerHelpers::Auth
@@ -6,6 +7,8 @@ class Spree::BaseController < ApplicationController
   include Spree::Core::ControllerHelpers::SSL
   include Spree::Core::ControllerHelpers::Common
   include Spree::Core::ControllerHelpers::Search
+  include Spree::Core::ControllerHelpers::StrongParameters
+  include Spree::Core::ControllerHelpers::Search
 
   respond_to :html
 end

data/app/helpers/spree/base_helper.rb

@@ -18,7 +18,7 @@ module Spree
       text = text ? h(text) : Spree.t('cart')
       css_class = nil
 
-      if current_order.nil? or current_order.line_items.empty?
+      if current_order.nil? or current_order.item_count.zero?
         text = "#{text}: (#{Spree.t('empty')})"
         css_class = 'empty'
       else
@@ -34,7 +34,7 @@ module Spree
       v.options_text
     end
 
-    def meta_data
+    def meta_data_tags
       object = instance_variable_get('@'+controller_name.singularize)
       meta = {}
 
@@ -51,11 +51,8 @@ module Spree
         keywords: Spree::Config[:default_meta_keywords],
         description: Spree::Config[:default_meta_description]
       })
-      meta
-    end
 
-    def meta_data_tags
-      meta_data.map do |name, content|
+      meta.map do |name, content|
         tag('meta', name: name, content: content)
       end.join("\n")
     end
@@ -109,7 +106,7 @@ module Spree
     end
 
     def available_countries
-      checkout_zone = Zone.find_by_name(Spree::Config[:checkout_zone])
+      checkout_zone = Zone.find_by(name: Spree::Config[:checkout_zone])
 
       if checkout_zone && checkout_zone.kind == 'country'
         countries = checkout_zone.country_list
@@ -120,7 +117,7 @@ module Spree
       countries.collect do |country|
         country.name = Spree.t(country.iso, scope: 'country_names', default: country.name)
         country
-      end.sort_by { |c| c.name.parameterize }
+      end.sort { |a, b| a.name <=> b.name }
     end
 
     def seo_url(taxon)
@@ -135,11 +132,6 @@ module Spree
        Gem.available?(name)
     end
 
-    def money(amount)
-      ActiveSupport::Deprecation.warn("[SPREE] Spree::BaseHelper#money will be deprecated.  It relies upon a single master currency.  You can instead create a Spree::Money.new(amount, { :currency => your_currency}) or see if the object you're working with returns a Spree::Money object to use.")
-      Spree::Money.new(amount)
-    end
-
     def display_price(product_or_variant)
       product_or_variant.price_in(current_currency).display_price.to_html
     end
@@ -169,10 +161,9 @@ module Spree
     end
 
     private
-
     # Returns style of image or nil
     def image_style_from_method_name(method_name)
-      if method_name.to_s.match(/_image$/) && style = method_name.to_s.sub(/_image$/, '')
+      if style = method_name.to_s.sub(/_image$/, '')
         possible_styles = Spree::Image.attachment_definitions[:attachment][:styles]
         style if style.in? possible_styles.with_indifferent_access
       end
@@ -201,6 +192,5 @@ module Spree
         end
       end
     end
-
   end
 end

data/app/helpers/spree/products_helper.rb

@@ -40,14 +40,9 @@ module Spree
     end
 
     def line_item_description(variant)
-      ActiveSupport::Deprecation.warn "line_item_description(variant) is deprecated and may be removed from future releases, use line_item_description_text(line_item.description) instead.", caller
-
-      line_item_description_text(variant.product.description)
-    end
-
-    def line_item_description_text description_text
-      if description_text.present?
-        truncate(strip_tags(description_text.gsub(' ', ' ')), length: 100)
+      description = variant.product.description
+      if description.present?
+        truncate(strip_tags(description.gsub(' ', ' ')), length: 100)
       else
         Spree.t(:product_has_no_description)
       end

data/app/helpers/spree/taxons_helper.rb

@@ -5,7 +5,7 @@ module Spree
     # to show the most popular products for a particular taxon (that is an exercise left to the developer.)
     def taxon_preview(taxon, max=4)
       products = taxon.active_products.limit(max)
-      if (products.size < max) && Spree::Config[:show_descendents]
+      if (products.size < max)
         taxon.descendants.each do |taxon|
           to_get = max - products.length
           products += taxon.active_products.limit(to_get)

data/app/mailers/spree/base_mailer.rb

@@ -8,10 +8,5 @@ module Spree
       Spree::Money.new(amount).to_s
     end
     helper_method :money
-
-    def mail(headers={}, &block)
-      super if Spree::Config[:send_core_emails]
-    end
-
   end
 end

data/app/models/spree/ability.rb

@@ -26,40 +26,43 @@ module Spree
       self.clear_aliased_actions
 
       # override cancan default aliasing (we don't want to differentiate between read and index)
+      alias_action :delete, to: :destroy
       alias_action :edit, to: :update
       alias_action :new, to: :create
       alias_action :new_action, to: :create
       alias_action :show, to: :read
-      alias_action :delete, to: :destroy
 
       user ||= Spree.user_class.new
+
       if user.respond_to?(:has_spree_role?) && user.has_spree_role?('admin')
         can :manage, :all
       else
-        #############################
-        can [:read,:update,:destroy], Spree.user_class, id: user.id
-        can :create, Spree.user_class
-        #############################
+        can [:index, :read], Country
+        can [:index, :read], OptionType
+        can [:index, :read], OptionValue
+        can :create, Order
         can :read, Order do |order, token|
           order.user == user || order.token && token == order.token
         end
         can :update, Order do |order, token|
           order.user == user || order.token && token == order.token
         end
-        can :create, Order
         can [:index, :read], Product
         can [:index, :read], ProductProperty
         can [:index, :read], Property
         can :create, Spree.user_class
         can [:read, :update, :destroy], Spree.user_class, id: user.id
         can [:index, :read], State
+        can [:index, :read], StockItem
+        can [:index, :read], StockLocation
+        can [:index, :read], StockMovement
         can [:index, :read], Taxon
         can [:index, :read], Taxonomy
         can [:index, :read], Variant
         can [:index, :read], Zone
       end
 
-      #include any abilities registered by extensions, etc.
+      # Include any abilities registered by extensions, etc.
       Ability.abilities.each do |clazz|
         ability = clazz.send(:new, user)
         @rules = rules + ability.send(:rules)

data/app/models/spree/address.rb

@@ -5,30 +5,18 @@ module Spree
 
     has_many :shipments
 
-    validates :firstname, :lastname, :address1, :city, :zipcode, :country, presence: true
+    validates :firstname, :lastname, :address1, :city, :country, presence: true
+    validates :zipcode, presence: true, if: :require_zipcode?
     validates :phone, presence: true, if: :require_phone?
 
     validate :state_validate
 
-    attr_accessible :firstname, :lastname, :address1, :address2,
-                    :city, :zipcode, :country_id, :state_id,
-                    :country, :state, :phone, :state_name,
-                    :company, :alternative_phone
-
     alias_attribute :first_name, :firstname
     alias_attribute :last_name, :lastname
 
-    # Disconnected since there's no code to display error messages yet OR matching client-side validation
-    def phone_validate
-      return if phone.blank?
-      n_digits = phone.scan(/[0-9]/).size
-      valid_chars = (phone =~ /^[-+()\/\s\d]+$/)
-      errors.add :phone, :invalid unless (n_digits > 5 && valid_chars)
-    end
-
     def self.default
       country = Spree::Country.find(Spree::Config[:default_country_id]) rescue Spree::Country.first
-      new({ country: country }, without_protection: true)
+      new(country: country)
     end
 
     # Can modify an address if it's not been used in an order (but checkouts controller has finer control)
@@ -87,11 +75,14 @@ module Spree
     end
 
     private
-
       def require_phone?
         true
       end
 
+      def require_zipcode?
+        true
+      end
+
       def state_validate
         # Skip state validation without country (also required)
         # or when disabled by preference
@@ -128,6 +119,5 @@ module Spree
         # ensure at least one state field is populated
         errors.add :state, :blank if state.blank? && state_name.blank?
       end
-
   end
 end

data/app/models/spree/adjustment.rb

@@ -24,8 +24,6 @@
 # it might be reinstated.
 module Spree
   class Adjustment < ActiveRecord::Base
-    attr_accessible :amount, :label
-
     belongs_to :adjustable, polymorphic: true
     belongs_to :source, polymorphic: true
     belongs_to :originator, polymorphic: true
@@ -55,8 +53,8 @@ module Spree
     scope :shipping, -> { where(originator_type: 'Spree::ShippingMethod') }
     scope :optional, -> { where(mandatory: false) }
     scope :eligible, -> { where(eligible: true) }
-    scope :charge, -> { where("#{quoted_table_name}.amount >= 0") }
-    scope :credit, -> { where("#{quoted_table_name}.amount < 0") }
+    scope :charge, -> { where('amount >= 0') }
+    scope :credit, -> { where('amount < 0') }
     scope :promotion, -> { where(originator_type: 'Spree::PromotionAction') }
     scope :return_authorization, -> { where(source_type: "Spree::ReturnAuthorization") }
 
@@ -68,7 +66,7 @@ module Spree
     # count towards the order's adjustment_total.
     def set_eligibility
       result = mandatory || ((amount != 0 || promotion?) && eligible_for_originator?)
-      update_attribute_without_callbacks(:eligible, result)
+      update_column(:eligible, result)
     end
 
     # Allow originator of the adjustment to perform an additional eligibility of the adjustment
@@ -82,17 +80,23 @@ module Spree
     # delegate updating of amount to their Originator when present, but only if
     # +locked+ is false. Adjustments that are +locked+ will never change their amount.
     #
-    # order#update_adjustments passes self as the src, this is so calculations can
-    # be performed on the # current values. If we used source it would load the old
-    # record from db for the association
-    def update!(calculable=nil)
+    # Adjustments delegate updating of amount to their Originator when present,
+    # but only if when they're in "open" state, closed or finalized adjustments
+    # are not recalculated.
+    #
+    # It receives +calculable+ as the updated source here so calculations can be
+    # performed on the current values of that source. If we used +source+ it 
+    # could load the old record from db for the association. e.g. when updating
+    # more than on line items at once via accepted_nested_attributes the order
+    # object on the association would be in a old state and therefore the
+    # adjustment calculations would not performed on proper values
+    def update!(calculable = nil)
       return if immutable?
       # Fix for #3381
       # If we attempt to call 'source' before the reload, then source is currently
       # the order object. After calling a reload, the source is the Shipment.
       reload
-      calculable = source unless calculable == source
-      originator.update_adjustment(self, calculable) if originator.present?
+      originator.update_adjustment(self, calculable || source) if originator.present?
       set_eligibility
     end
 

data/app/models/spree/app_configuration.rb

@@ -32,17 +32,14 @@ module Spree
     preference :allow_ssl_in_staging, :boolean, default: true
     preference :alternative_billing_phone, :boolean, default: false # Request extra phone for bill addr
     preference :alternative_shipping_phone, :boolean, default: false # Request extra phone for ship addr
-    preference :always_include_confirm_step, :boolean, default: false # Ensures confirmation step is always in checkout_progress bar, but does not force a confirm step if your payment methods do not support it.
     preference :always_put_site_name_in_title, :boolean, default: true
     preference :auto_capture, :boolean, default: false # automatically capture the credit card (as opposed to just authorize and capture later)
-    preference :cache_static_content, :boolean, default: true
     preference :check_for_spree_alerts, :boolean, default: true
     preference :checkout_zone, :string, default: nil # replace with the name of a zone if you would like to limit the countries
     preference :company, :boolean, default: false # Request company field for billing and shipping addr
     preference :currency, :string, default: "USD"
     preference :currency_decimal_mark, :string, default: "."
     preference :currency_symbol_position, :string, default: "before"
-    preference :currency_sign_before_symbol, :boolean, default: true
     preference :currency_thousands_separator, :string, default: ","
     preference :display_currency, :boolean, default: false
     preference :default_country_id, :integer
@@ -62,7 +59,6 @@ module Spree
     preference :require_master_price, :boolean, default: true
     preference :shipment_inc_vat, :boolean, default: false
     preference :shipping_instructions, :boolean, default: false # Request instructions/info for shipping
-    preference :show_descendents, :boolean, default: true
     preference :show_only_complete_orders_by_default, :boolean, default: true
     preference :show_variant_full_price, :boolean, default: false #Displays variant full price or difference with product price. Default false to be compatible with older behavior
     preference :show_products_without_price, :boolean, default: false
@@ -88,7 +84,6 @@ module Spree
 
     # Default mail headers settings
     preference :enable_mail_delivery, :boolean, :default => false
-    preference :send_core_emails, :boolean, :default => true
     preference :mails_from, :string, :default => 'spree@example.com'
     preference :mail_bcc, :string, :default => 'spree@example.com'
     preference :intercept_email, :string, :default => nil

data/app/models/spree/billing_integration.rb

@@ -8,7 +8,6 @@ module Spree
     def provider
       integration_options = options
       ActiveMerchant::Billing::Base.integration_mode = integration_options[:server].to_sym
-      integration_options = options
       integration_options[:test] = true if integration_options[:test_mode]
       @provider ||= provider_class.new(integration_options)
     end

data/app/models/spree/calculator/flat_percent_item_total.rb

@@ -2,9 +2,7 @@ require_dependency 'spree/calculator'
 
 module Spree
   class Calculator::FlatPercentItemTotal < Calculator
-    preference :flat_percent, :decimal, :default => 0
-
-    attr_accessible :preferred_flat_percent
+    preference :flat_percent, :decimal, default: 0
 
     def self.description
       Spree.t(:flat_percent)

data/app/models/spree/calculator/flat_rate.rb

@@ -2,10 +2,8 @@ require_dependency 'spree/calculator'
 
 module Spree
   class Calculator::FlatRate < Calculator
-    preference :amount, :decimal, :default => 0
-    preference :currency, :string, :default => Spree::Config[:currency]
-
-    attr_accessible :preferred_amount, :preferred_currency
+    preference :amount, :decimal, default: 0
+    preference :currency, :string, default: Spree::Config[:currency]
 
     def self.description
       Spree.t(:flat_rate_per_order)

data/app/models/spree/calculator/flexi_rate.rb

@@ -2,12 +2,10 @@ require_dependency 'spree/calculator'
 
 module Spree
   class Calculator::FlexiRate < Calculator
-    preference :first_item,      :decimal, :default => 0.0
-    preference :additional_item, :decimal, :default => 0.0
-    preference :max_items,       :integer, :default => 0
-    preference :currency,        :string,  :default => Spree::Config[:currency]
-
-    attr_accessible :preferred_first_item, :preferred_additional_item, :preferred_max_items, :preferred_currency
+    preference :first_item,      :decimal, default: 0.0
+    preference :additional_item, :decimal, default: 0.0
+    preference :max_items,       :integer, default: 0
+    preference :currency,        :string,  default: Spree::Config[:currency]
 
     def self.description
       Spree.t(:flexible_rate)
@@ -22,10 +20,9 @@ module Spree
       max = self.preferred_max_items.to_i
       items_count = object.line_items.map(&:quantity).sum
       items_count.times do |i|
-        # check max value to avoid divide by 0 errors
-        if (max == 0 && i == 0) || (max > 0) && (i % max == 0)
+        if i == 0
           sum += self.preferred_first_item.to_f
-        else
+        elsif ((max > 0) && (i <= (max - 1))) || (max == 0)
           sum += self.preferred_additional_item.to_f
         end
       end

data/app/models/spree/calculator/per_item.rb

@@ -2,10 +2,8 @@ require_dependency 'spree/calculator'
 
 module Spree
   class Calculator::PerItem < Calculator
-    preference :amount, :decimal, :default => 0
-    preference :currency, :string, :default => Spree::Config[:currency]
-
-    attr_accessible :preferred_amount, :preferred_currency
+    preference :amount, :decimal, default: 0
+    preference :currency, :string, default: Spree::Config[:currency]
 
     def self.description
       Spree.t(:flat_rate_per_item)

data/app/models/spree/calculator/percent_per_item.rb

@@ -6,9 +6,7 @@ module Spree
   # off the entire order.
 
   class Calculator::PercentPerItem < Calculator
-    preference :percent, :decimal, :default => 0
-
-    attr_accessible :preferred_percent
+    preference :percent, :decimal, default: 0
 
     def self.description
       Spree.t(:percent_per_item)

data/app/models/spree/calculator/price_sack.rb

@@ -4,15 +4,10 @@ require 'bigdecimal/util'
 
 module Spree
   class Calculator::PriceSack < Calculator
-    preference :minimal_amount, :decimal, :default => 0
-    preference :normal_amount, :decimal, :default => 0
-    preference :discount_amount, :decimal, :default => 0
-    preference :currency, :string, :default => Spree::Config[:currency]
-
-    attr_accessible :preferred_minimal_amount,
-                    :preferred_normal_amount,
-                    :preferred_discount_amount,
-                    :preferred_currency
+    preference :minimal_amount, :decimal, default: 0
+    preference :normal_amount, :decimal, default: 0
+    preference :discount_amount, :decimal, default: 0
+    preference :currency, :string, default: Spree::Config[:currency]
 
     def self.description
       Spree.t(:price_sack)

data/app/models/spree/calculator/shipping/flat_percent_item_total.rb

@@ -3,8 +3,7 @@ require_dependency 'spree/shipping_calculator'
 module Spree
   module Calculator::Shipping
     class FlatPercentItemTotal < ShippingCalculator
-      preference :flat_percent, :decimal, :default => 0
-      attr_accessible :preferred_flat_percent
+      preference :flat_percent, :decimal, default: 0
 
       def self.description
         Spree.t(:flat_percent)

data/app/models/spree/calculator/shipping/flat_rate.rb

@@ -3,10 +3,8 @@ require_dependency 'spree/shipping_calculator'
 module Spree
   module Calculator::Shipping
     class FlatRate < ShippingCalculator
-      preference :amount, :decimal, :default => 0
-      preference :currency, :string, :default => Spree::Config[:currency]
-
-      attr_accessible :preferred_amount, :preferred_currency
+      preference :amount, :decimal, default: 0
+      preference :currency, :string, default: Spree::Config[:currency]
 
       def self.description
         Spree.t(:shipping_flat_rate_per_order)

data/app/models/spree/calculator/shipping/flexi_rate.rb

@@ -3,15 +3,10 @@ require_dependency 'spree/shipping_calculator'
 module Spree
   module Calculator::Shipping
     class FlexiRate < ShippingCalculator
-      preference :first_item,      :decimal, :default => 0.0
-      preference :additional_item, :decimal, :default => 0.0
-      preference :max_items,       :integer, :default => 0
-      preference :currency,        :string,  :default => Spree::Config[:currency]
-
-      attr_accessible :preferred_first_item,
-                      :preferred_additional_item,
-                      :preferred_max_items,
-                      :preferred_currency
+      preference :first_item,      :decimal, default: 0.0
+      preference :additional_item, :decimal, default: 0.0
+      preference :max_items,       :integer, default: 0
+      preference :currency,        :string,  default: Spree::Config[:currency]
 
       def self.description
         Spree.t(:shipping_flexible_rate)

data/app/models/spree/calculator/shipping/per_item.rb

@@ -3,9 +3,8 @@ require_dependency 'spree/shipping_calculator'
 module Spree
   module Calculator::Shipping
     class PerItem < ShippingCalculator
-      preference :amount, :decimal, :default => 0
-      preference :currency, :string, :default => Spree::Config[:currency]
-      attr_accessible :preferred_amount, :preferred_currency
+      preference :amount, :decimal, default: 0
+      preference :currency, :string, default: Spree::Config[:currency]
 
       def self.description
         Spree.t(:shipping_flat_rate_per_item)

data/app/models/spree/calculator/shipping/price_sack.rb

@@ -5,15 +5,10 @@ require 'bigdecimal/util'
 module Spree
   module Calculator::Shipping
     class PriceSack < ShippingCalculator
-      preference :minimal_amount, :decimal, :default => 0
-      preference :normal_amount, :decimal, :default => 0
-      preference :discount_amount, :decimal, :default => 0
-      preference :currency, :string, :default => Spree::Config[:currency]
-
-      attr_accessible :preferred_minimal_amount,
-                      :preferred_normal_amount,
-                      :preferred_discount_amount,
-                      :preferred_currency
+      preference :minimal_amount, :decimal, default: 0
+      preference :normal_amount, :decimal, default: 0
+      preference :discount_amount, :decimal, default: 0
+      preference :currency, :string, default: Spree::Config[:currency]
 
       def self.description
         Spree.t(:shipping_price_sack)

data/app/models/spree/classification.rb

@@ -3,8 +3,5 @@ module Spree
     self.table_name = 'spree_products_taxons'
     belongs_to :product, class_name: "Spree::Product"
     belongs_to :taxon, class_name: "Spree::Taxon"
-
-    # For #3494
-    validates_uniqueness_of :taxon_id, :scope => :product_id, :message => :already_linked
   end
 end

data/app/models/spree/country.rb

@@ -1,11 +1,9 @@
 module Spree
   class Country < ActiveRecord::Base
-    has_many :states, order: "#{Spree::State.quoted_table_name}.name ASC"
+    has_many :states, -> { order('name ASC') }
 
     validates :name, :iso_name, presence: true
 
-    attr_accessible :name, :iso_name, :states_required
-
     def self.states_required_by_country_id
       states_required = Hash.new(true)
       all.each { |country| states_required[country.id.to_s]= country.states_required }