spree_core 2.2.14 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9abfcb6e2a1a2ca7ab2c85a969e20adf636c1d99
-  data.tar.gz: bc242bb55726abd8ade2e39ab0c916b8f55dcc0b
+  metadata.gz: f36768d9e812dac5278cad4d5d1ff827fbd70c0e
+  data.tar.gz: 89173525bdf6d17811cfa3f56d9171bed41ee706
 SHA512:
-  metadata.gz: 8a647ec37f24df8c6263501ef76128452751fb2afc06c5734b36fcb37732f4cbfe6bea13ae6f5ad3d4c33d1fcbe72aeb330252c8d412b9e6e816d045ec341f70
-  data.tar.gz: 8c39cb145273c64b9c6fc7f6f01b6222f3b6c235d151e85e2937bb217eab3861a4ec41bc7cebab3b1533eb03bfd89fe826f2096ea5df2ae93259fc3e2d2d59e4
+  metadata.gz: 736e2e5fe347e4bced168f0829d3122572c09c578796d106380714881bd596548968cac77646f40ae246740a5535b70e1c1f1a04446ebb120054ee1d43dccdd7
+  data.tar.gz: ec2a0650143117254b28401f5c24d0ca2514ff443d7536c7a16e80c450a92745d9f81be46632c6ab1d3cd5227cf9a95d0b9cb72db83f8eeac27386590c1785be

data/app/assets/javascripts/{spree.js.coffee → spree.js.coffee.erb}

@@ -3,6 +3,12 @@ class window.Spree
   @ready: (callback) ->
     jQuery(document).ready(callback)
 
+  @mountedAt: ->
+    "<%= Rails.application.routes.url_helpers.spree_path %>"
+
+  @pathFor: (path) ->
+    "#{window.location.origin}#{@mountedAt()}#{path}"
+
   # Helper function to take a URL and add query parameters to it
   # Uses the JSUri library from here: https://code.google.com/p/jsuri/
   # Thanks to Jake Moffat for the suggestion: https://twitter.com/jakeonrails/statuses/321776992221544449
@@ -12,8 +18,6 @@ class window.Spree
     if query
       $.each query, (key, value) ->
         uri.addQueryParam(key, value)
-    if Spree.api_key
-      uri.addQueryParam('token', Spree.api_key)
     return uri
 
   # Helper method in case people want to call uri rather than url
@@ -38,3 +42,8 @@ class window.Spree
       url = url_or_settings['url']
       delete url_or_settings['url']
       $.ajax(Spree.url(url).toString(), url_or_settings)
+
+  @routes:
+    states_search: @pathFor('api/states')
+    apply_coupon_code: (order_id) ->
+      Spree.pathFor("api/orders/#{order_id}/apply_coupon_code")

data/app/controllers/spree/base_controller.rb

@@ -7,6 +7,7 @@ class Spree::BaseController < ApplicationController
   include Spree::Core::ControllerHelpers::SSL
   include Spree::Core::ControllerHelpers::Common
   include Spree::Core::ControllerHelpers::Search
+  include Spree::Core::ControllerHelpers::Store
   include Spree::Core::ControllerHelpers::StrongParameters
 
   respond_to :html

data/app/helpers/spree/base_helper.rb

@@ -46,8 +46,8 @@ module Spree
       end
 
       meta.reverse_merge!({
-        keywords: Spree::Config[:default_meta_keywords],
-        description: Spree::Config[:default_meta_description]
+        keywords: current_store.meta_keywords,
+        description: current_store.meta_description,
       })
       meta
     end
@@ -68,7 +68,7 @@ module Spree
     end
 
     def flash_messages(opts = {})
-      opts[:ignore_types] = [:commerce_tracking].concat(Array(opts[:ignore_types]) || [])
+      opts[:ignore_types] = [:order_completed].concat(Array(opts[:ignore_types]) || [])
 
       flash.each do |msg_type, text|
         unless opts[:ignore_types].include?(msg_type)
@@ -118,7 +118,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.parameterize <=> b.name.parameterize }
     end
 
     def seo_url(taxon)
@@ -162,10 +162,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

data/app/helpers/spree/orders_helper.rb

@@ -8,6 +8,10 @@ module Spree
     def truncated_product_description(product)
       truncate_html(raw(product.description))
     end
+
+    def order_just_completed?(order)
+      flash[:order_completed] && order.present?
+    end
   end
 end
 

data/app/helpers/spree/products_helper.rb

@@ -11,13 +11,14 @@ module Spree
 
     # returns the formatted price for the specified variant as a difference from product price
     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
+      diff = variant.amount_in(current_currency) - variant.product.amount_in(current_currency)
+      return nil if diff == 0
+      amount = Spree::Money.new(diff.abs, { currency: current_currency }).to_html
+      if diff > 0
+        "(#{Spree.t(:add)}: #{amount})".html_safe
+      else
+        "(#{Spree.t(:subtract)}: #{amount})".html_safe
+      end
     end
 
     # returns the formatted full price for the variant, if at least one variant price differs from product price

data/app/mailers/spree/base_mailer.rb

@@ -4,8 +4,8 @@ module Spree
       Spree::Config[:mails_from]
     end
 
-    def money(amount)
-      Spree::Money.new(amount).to_s
+    def money(amount, currency = Spree::Config[:currency])
+      Spree::Money.new(amount, currency: currency).to_s
     end
     helper_method :money
 

data/app/mailers/spree/order_mailer.rb

@@ -3,14 +3,14 @@ module Spree
     def confirm_email(order, resend = false)
       @order = order.respond_to?(:id) ? order : Spree::Order.find(order)
       subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
-      subject += "#{Spree::Config[:site_name]} #{Spree.t('order_mailer.confirm_email.subject')} ##{@order.number}"
+      subject += "#{Spree::Store.current.name} #{Spree.t('order_mailer.confirm_email.subject')} ##{@order.number}"
       mail(to: @order.email, from: from_address, subject: subject)
     end
 
     def cancel_email(order, resend = false)
       @order = order.respond_to?(:id) ? order : Spree::Order.find(order)
       subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
-      subject += "#{Spree::Config[:site_name]} #{Spree.t('order_mailer.cancel_email.subject')} ##{@order.number}"
+      subject += "#{Spree::Store.current.name} #{Spree.t('order_mailer.cancel_email.subject')} ##{@order.number}"
       mail(to: @order.email, from: from_address, subject: subject)
     end
   end

data/app/mailers/spree/shipment_mailer.rb

@@ -3,7 +3,7 @@ module Spree
     def shipped_email(shipment, resend = false)
       @shipment = shipment.respond_to?(:id) ? shipment : Spree::Shipment.find(shipment)
       subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
-      subject += "#{Spree::Config[:site_name]} #{Spree.t('shipment_mailer.shipped_email.subject')} ##{@shipment.order.number}"
+      subject += "#{Spree::Store.current.name} #{Spree.t('shipment_mailer.shipped_email.subject')} ##{@shipment.order.number}"
       mail(to: @shipment.order.email, from: from_address, subject: subject)
     end
   end

data/app/mailers/spree/test_mailer.rb

@@ -2,7 +2,7 @@ module Spree
   class TestMailer < BaseMailer
     def test_email(user)
       recipient = user.respond_to?(:id) ? user : Spree.user_class.find(user)
-      subject = "#{Spree::Config[:site_name]} #{Spree.t('test_mailer.test_email.subject')}"
+      subject = "#{Spree::Store.current.name} #{Spree.t('test_mailer.test_email.subject')}"
       mail(to: recipient.email, from: from_address, subject: subject)
     end
   end

data/app/models/spree/ability.rb

@@ -31,36 +31,35 @@ module Spree
       alias_action :new, to: :create
       alias_action :new_action, to: :create
       alias_action :show, to: :read
+      alias_action :index, :read, to: :display
+
 
       user ||= Spree.user_class.new
 
       if user.respond_to?(:has_spree_role?) && user.has_spree_role?('admin')
         can :manage, :all
       else
-        can [:index, :read], Country
-        can [:index, :read], OptionType
-        can [:index, :read], OptionValue
+        can :display, Country
+        can :display, OptionType
+        can :display, 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
+        can [:read, :update], Order do |order, token|
+          order.user == user || order.guest_token && token == order.guest_token
         end
         can [:create, :read], Address
         can :update, Address do |address|
           user.bill_address == address || user.ship_address == address
         end
-        can [:index, :read], Product
-        can [:index, :read], ProductProperty
-        can [:index, :read], Property
+        can :display, Product
+        can :display, ProductProperty
+        can :display, Property
         can :create, Spree.user_class
         can [:read, :update, :destroy], Spree.user_class, id: user.id
-        can [:index, :read], State
-        can [:index, :read], Taxon
-        can [:index, :read], Taxonomy
-        can [:index, :read], Variant
-        can [:index, :read], Zone
+        can :display, State
+        can :display, Taxon
+        can :display, Taxonomy
+        can :display, Variant
+        can :display, Zone
       end
 
       # Include any abilities registered by extensions, etc.

data/app/models/spree/address.rb

@@ -1,5 +1,5 @@
 module Spree
-  class Address < ActiveRecord::Base
+  class Address < Spree::Base
     belongs_to :country, class_name: "Spree::Country"
     belongs_to :state, class_name: "Spree::State"
 
@@ -14,17 +14,14 @@ module Spree
     alias_attribute :first_name, :firstname
     alias_attribute :last_name, :lastname
 
-
-    self.whitelisted_ransackable_attributes = %w[firstname lastname]
-
     def self.build_default
       country = Spree::Country.find(Spree::Config[:default_country_id]) rescue Spree::Country.first
       new(country: country)
     end
 
     def self.default(user = nil, kind = "bill")
-      if user && user_address = user.send(:"#{kind}_address")
-        user_address.clone
+      if user
+        user.send(:"#{kind}_address") || build_default
       else
         build_default
       end

data/app/models/spree/adjustment.rb

@@ -21,8 +21,8 @@
 # total. This allows an adjustment to be preserved if it becomes ineligible so
 # it might be reinstated.
 module Spree
-  class Adjustment < ActiveRecord::Base
-    belongs_to :adjustable, polymorphic: true, touch: true
+  class Adjustment < Spree::Base
+    belongs_to :adjustable, polymorphic: true
     belongs_to :source, polymorphic: true
     belongs_to :order, class_name: "Spree::Order"
 

data/app/models/spree/alert.rb

@@ -5,7 +5,7 @@ module Spree
     def self.current(host)
       params = {
         version: Spree.version,
-        name: Spree::Config[:site_name],
+        name: Spree::Store.current.name,
         host: host,
         rails_env: Rails.env,
         rails_version: Rails.version

data/app/models/spree/app_configuration.rb

@@ -19,7 +19,6 @@ require "spree/core/search/base"
 
 module Spree
   class AppConfiguration < Preferences::Configuration
-
     # Alphabetized to more easily lookup particular preferences
     preference :address_requires_state, :boolean, default: true # should state/state_name be required
     preference :admin_interface_logo, :string, default: 'logo/spree_50.png'
@@ -46,9 +45,6 @@ module Spree
     preference :currency_thousands_separator, :string, default: ","
     preference :display_currency, :boolean, default: false
     preference :default_country_id, :integer
-    preference :default_meta_description, :string, default: 'Spree demo site'
-    preference :default_meta_keywords, :string, default: 'spree, demo'
-    preference :default_seo_title, :string, default: ''
     preference :dismissed_spree_alerts, :string, default: ''
     preference :hide_cents, :boolean, default: false
     preference :last_check_for_spree_alerts, :string, default: nil
@@ -56,7 +52,6 @@ module Spree
     preference :logo, :string, default: 'logo/spree_50.png'
     preference :max_level_in_taxons_menu, :integer, default: 1 # maximum nesting level in taxons menu
     preference :orders_per_page, :integer, default: 15
-    preference :prices_inc_tax, :boolean, default: false
     preference :properties_per_page, :integer, default: 15
     preference :products_per_page, :integer, default: 12
     preference :promotions_per_page, :integer, default: 15
@@ -68,27 +63,12 @@ module Spree
     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
     preference :show_raw_product_description, :boolean, :default => false
-    preference :site_name, :string, default: 'Spree Demo Site'
-    preference :site_url, :string, default: 'demo.spreecommerce.com'
     preference :tax_using_ship_address, :boolean, default: true
     preference :track_inventory_levels, :boolean, default: true # Determines whether to track on_hand values for variants / products.
 
     # 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
-
-    # Default smtp settings
-    preference :override_actionmailer_config, :boolean, :default => true
-    preference :mail_host, :string, :default => 'localhost'
-    preference :mail_domain, :string, :default => 'localhost'
-    preference :mail_port, :integer, :default => 25
-    preference :secure_connection_type, :string, :default => Core::MailSettings::SECURE_CONNECTION_TYPES[0]
-    preference :mail_auth_type, :string, :default => Core::MailSettings::MAIL_AUTH[0]
-    preference :smtp_username, :string
-    preference :smtp_password, :string
 
     # searcher_class allows spree extension writers to provide their own Search class
     def searcher_class
@@ -98,5 +78,22 @@ module Spree
     def searcher_class=(sclass)
       @searcher_class = sclass
     end
+
+    # all the following can be deprecated when store prefs are no longer supported
+    DEPRECATED_STORE_PREFERENCES = {
+      site_name: :name,
+      site_url: :url,
+      default_meta_description: :meta_description,
+      default_meta_keywords: :meta_keywords,
+      default_seo_title: :seo_title,
+    }
+
+    DEPRECATED_STORE_PREFERENCES.each do |old_preference_name, store_method|
+      # support all the old preference methods with a warning
+      define_method "preferred_#{old_preference_name}" do
+        ActiveSupport::Deprecation.warn("#{old_preference_name} is no longer supported on Spree::Config, please access it through #{store_method} on Spree::Store")
+        Store.default.send(store_method)
+      end
+    end
   end
 end

data/app/models/spree/asset.rb

@@ -1,6 +1,6 @@
 module Spree
-  class Asset < ActiveRecord::Base
+  class Asset < Spree::Base
     belongs_to :viewable, polymorphic: true, touch: true
-    acts_as_list scope: [:viewable_id, :viewable_type]
+    acts_as_list scope: :viewable
   end
 end

data/app/models/spree/base.rb

@@ -0,0 +1,9 @@
+class Spree::Base < ActiveRecord::Base
+  include Spree::Preferences::Preferable
+  serialize :preferences, Hash
+  after_initialize do
+    self.preferences = default_preferences.merge(preferences) if has_attribute?(:preferences)
+  end
+
+  self.abstract_class = true
+end

data/app/models/spree/calculator.rb

@@ -1,5 +1,5 @@
 module Spree
-  class Calculator < ActiveRecord::Base
+  class Calculator < Spree::Base
     belongs_to :calculable, polymorphic: true
 
     # This method calls a compute_<computable> method. must be overriden in concrete calculator.

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

@@ -3,7 +3,7 @@ require_dependency 'spree/calculator'
 module Spree
   class Calculator::FlatRate < Calculator
     preference :amount, :decimal, default: 0
-    preference :currency, :string, default: Spree::Config[:currency]
+    preference :currency, :string, default: ->{ Spree::Config[:currency] }
 
     def self.description
       Spree.t(:flat_rate_per_order)

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

@@ -5,7 +5,7 @@ module Spree
     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]
+    preference :currency,        :string,  default: ->{ Spree::Config[:currency] }
 
     def self.description
       Spree.t(:flexible_rate)

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

@@ -1,13 +1,11 @@
 require_dependency 'spree/calculator'
-# For #to_d method on Ruby 1.8
-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]
+    preference :currency, :string, default: ->{ Spree::Config[:currency] }
 
     def self.description
       Spree.t(:price_sack)

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

@@ -4,7 +4,7 @@ module Spree
   module Calculator::Shipping
     class FlatRate < ShippingCalculator
       preference :amount, :decimal, default: 0
-      preference :currency, :string, default: Spree::Config[:currency]
+      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

@@ -6,7 +6,7 @@ module Spree
       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]
+      preference :currency,        :string,  default: ->{ Spree::Config[:currency] }
 
       def self.description
         Spree.t(:shipping_flexible_rate)

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

@@ -4,7 +4,7 @@ module Spree
   module Calculator::Shipping
     class PerItem < ShippingCalculator
       preference :amount, :decimal, default: 0
-      preference :currency, :string, default: Spree::Config[:currency]
+      preference :currency, :string, default: ->{ Spree::Config[:currency] }
 
       def self.description
         Spree.t(:shipping_flat_rate_per_item)