spree_core 1.3.5 → 2.0.0.rc1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 1dc6551fae8388e2e554f586b98556214ddc7853
-  data.tar.gz: 172fdc171d09cf9cb196a0b1b10dc3447bc44dfb
-SHA512:
-  metadata.gz: c0bf787e475d0ac901befe43e5f800d318043e1326b42b2b66ec7bf70ca3a193d2758cbe3d8697a9f2ede3ae313ca712dcad61b4610b11eda8a7cf5a6b4ab5e7
-  data.tar.gz: 686846bad87532c1c6d0490a20e96ac8737563b0992020f3db17a9701e2288ea06630147ce81b77de564e54ac9718d45e7cb474897f0629904a7be4a2af3325d
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OGY5MGNlMTExNmVhYTBkOTNlN2Y4N2I1ZTdlNTA2MzdhY2NiODQzOQ==
+  data.tar.gz: !binary |-
+    YWQxNTc2MjAyNDM1NDk4MWViODEyZTY2MWYyYjdiNTdkYzgxM2Y5YQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    OGQxNGQ2MjU4MWY4NmQ1YzkzOTAyOGM1YjA4MTU3YzZkOGQ5ZjUxMDc2YjM0
+    ZDY3N2IyYTAyYjE5NjBmM2Q1MmI3YjU1YThkMjkxNjc2ZTFjYjRmNzc0OGY1
+    MGUwYzQyYTNhYjYyMzI2NDY5MGMzNzVhMTU2OWZkNDczZGUwODI=
+  data.tar.gz: !binary |-
+    YmExYjIxNTgwYzcxNzQyZTBlYmZiNWY2Yzk1ZDdmY2E4ZWY5YTY2OTQzMTJl
+    Yzc5YjZjODgzOGUyZmJlM2YyODA5MGM3YzUzYTU5OWJlM2Q1MWU4ZDc5YTNm
+    MDA5NmQ1NjQxZmNmOGQxMjJhNDU0NzU1NDkxZWJlOGJhMTJmODc=

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

@@ -1,5 +1,8 @@
 #= require jsuri
 class window.Spree
+  @ready: (callback) ->
+    jQuery(document).ready(callback)
+
   # 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

data/app/controllers/spree/base_controller.rb

@@ -3,6 +3,8 @@ require 'cancan'
 class Spree::BaseController < ApplicationController
   include Spree::Core::ControllerHelpers::Auth
   include Spree::Core::ControllerHelpers::RespondWith
+  include Spree::Core::ControllerHelpers::SSL
   include Spree::Core::ControllerHelpers::Common
 
+  respond_to :html
 end

data/app/helpers/spree/admin/adjustments_helper.rb

@@ -0,0 +1,26 @@
+module Spree
+  module Admin
+    module AdjustmentsHelper
+      def link_to_toggle_adjustment_state(order, adjustment, options={})
+        return if adjustment.finalized?
+        icon = { closed: 'icon-unlock', open: 'icon-lock' }
+        alt_text = adjustment.immutable? ? Spree.t(:open) : Spree.t(:close)
+        link_to_with_icon(icon[adjustment.state.to_sym], alt_text, toggle_state_admin_order_adjustment_url(order, adjustment), options)
+      end
+
+      def adjustment_state(adjustment)
+        state = adjustment.state.to_sym
+        if adjustment.finalized?
+          Spree.t(state)
+        else
+          icon_for(state)
+        end
+      end
+
+      def icon_for(adjustment_state)
+        icon = { closed: 'icon-lock', open: 'icon-unlock' }
+        content_tag(:span, '', class: icon[adjustment_state])
+      end
+    end
+  end
+end

data/app/helpers/spree/admin/images_helper.rb

@@ -4,12 +4,12 @@ module Spree
       def options_text_for(image)
         if image.viewable.is_a?(Spree::Variant)
           if image.viewable.is_master?
-            I18n.t(:all)
+            Spree.t(:all)
           else
             image.viewable.options_text
           end
         else
-          I18n.t(:all)
+          Spree.t(:all)
         end
       end
     end

data/app/helpers/spree/base_helper.rb

@@ -15,11 +15,11 @@ module Spree
     def link_to_cart(text = nil)
       return "" if current_spree_page?(spree.cart_path)
 
-      text = text ? h(text) : t('cart')
+      text = text ? h(text) : Spree.t('cart')
       css_class = nil
 
       if current_order.nil? or current_order.line_items.empty?
-        text = "#{text}: (#{t('empty')})"
+        text = "#{text}: (#{Spree.t('empty')})"
         css_class = 'empty'
       else
         text = "#{text}: (#{current_order.item_count})  <span class='amount'>#{current_order.display_total.to_html}</span>".html_safe
@@ -31,19 +31,7 @@ module Spree
 
     # human readable list of variant options
     def variant_options(v, options={})
-      list = v.options_text
-
-      # We shouldn't show out of stock if the product is infact in stock
-      # or when we're not allowing backorders.
-      unless v.in_stock?
-        list = if options[:include_style]
-          content_tag(:span, "(#{t(:out_of_stock)}) #{list}", :class => 'out-of-stock')
-        else
-          "#{t(:out_of_stock)} #{list}"
-        end
-      end
-
-      list
+      v.options_text
     end
 
     def meta_data_tags
@@ -56,16 +44,16 @@ module Spree
       end
 
       if meta[:description].blank? && object.kind_of?(Spree::Product)
-        meta[:description] = strip_tags(truncate(object.description, :length => 160, :separator => ' '))
+        meta[:description] = strip_tags(truncate(object.description, length: 160, separator: ' '))
       end
 
       meta.reverse_merge!({
-        :keywords => Spree::Config[:default_meta_keywords],
-        :description => Spree::Config[:default_meta_description]
+        keywords: Spree::Config[:default_meta_keywords],
+        description: Spree::Config[:default_meta_description]
       })
 
       meta.map do |name, content|
-        tag('meta', :name => name, :content => content)
+        tag('meta', name: name, content: content)
       end.join("\n")
     end
 
@@ -83,7 +71,7 @@ module Spree
 
       flash.each do |msg_type, text|
         unless opts[: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
@@ -92,24 +80,24 @@ module Spree
     def breadcrumbs(taxon, separator="&nbsp;&raquo;&nbsp;")
       return "" if current_page?("/") || taxon.nil?
       separator = raw(separator)
-      crumbs = [content_tag(:li, link_to(t(:home) , spree.root_path) + separator)]
+      crumbs = [content_tag(:li, link_to(Spree.t(:home), spree.root_path) + separator)]
       if taxon
-        crumbs << content_tag(:li, link_to(t(:products) , products_path) + separator)
+        crumbs << content_tag(:li, link_to(Spree.t(:products), products_path) + separator)
         crumbs << taxon.ancestors.collect { |ancestor| content_tag(:li, link_to(ancestor.name , seo_url(ancestor)) + separator) } unless taxon.ancestors.empty?
         crumbs << content_tag(:li, content_tag(:span, link_to(taxon.name , seo_url(taxon))))
       else
-        crumbs << content_tag(:li, content_tag(:span, t(:products)))
+        crumbs << content_tag(:li, content_tag(:span, Spree.t(:products)))
       end
-      crumb_list = content_tag(:ul, raw(crumbs.flatten.map{|li| li.mb_chars}.join), :class => 'inline')
-      content_tag(:nav, crumb_list, :id => 'breadcrumbs', :class => 'sixteen columns')
+      crumb_list = content_tag(:ul, raw(crumbs.flatten.map{|li| li.mb_chars}.join), class: 'inline')
+      content_tag(:nav, crumb_list, id: 'breadcrumbs', class: 'sixteen columns')
     end
 
     def taxons_tree(root_taxon, current_taxon, max_level = 1)
       return '' if max_level < 1 || root_taxon.children.empty?
-      content_tag :ul, :class => 'taxons-list' do
+      content_tag :ul, class: 'taxons-list' do
         root_taxon.children.map do |taxon|
           css_class = (current_taxon && current_taxon.self_and_ancestors.include?(taxon)) ? 'current' : nil
-          content_tag :li, :class => css_class do
+          content_tag :li, class: css_class do
            link_to(taxon.name, seo_url(taxon)) +
            taxons_tree(taxon, current_taxon, max_level - 1)
           end
@@ -127,7 +115,7 @@ module Spree
       end
 
       countries.collect do |country|
-        country.name = I18n.t(country.iso, :scope => 'country_names', :default => country.name)
+        country.name = Spree.t(country.iso, scope: 'country_names', default: country.name)
         country
       end.sort { |a, b| a.name <=> b.name }
     end
@@ -154,8 +142,8 @@ module Spree
     end
 
     def pretty_time(time)
-      [I18n.l(time.to_date, :format => :long),
-        time.strftime("%l:%m %p")].join(" ")
+      [I18n.l(time.to_date, format: :long),
+        time.strftime("%l:%M %p")].join(" ")
     end
 
     def method_missing(method_name, *args, &block)
@@ -167,6 +155,23 @@ module Spree
       end
     end
 
+    def link_to_tracking(shipment, options = {})
+      return unless shipment.tracking
+
+      if shipment.tracking_url
+        link_to(shipment.tracking, shipment.tracking_url, options)
+      else
+        content_tag(:span, shipment.tracking)
+      end
+    end
+
+    def t(*args)
+      puts "WARNING: Spree's translations are now scoped to a 'spree' namespace. Please use the Spree.t helper."
+      puts "Called from: #{caller[0]}"
+      I18n.t(*args)
+    end
+
+
     private
 
     # Returns style of image or nil
@@ -184,7 +189,7 @@ module Spree
           image_tag "noimage/#{style}.png", options
         else
           image = product.images.first
-          options.reverse_merge! :alt => image.alt.blank? ? product.name : image.alt
+          options.reverse_merge! alt: image.alt.blank? ? product.name : image.alt
           image_tag image.attachment.url(style), options
         end
       end

data/app/helpers/spree/checkout_helper.rb

@@ -7,7 +7,7 @@ module Spree
     def checkout_progress
       states = checkout_states
       items = states.map do |state|
-        text = t("order_state.#{state}").titleize
+        text = Spree.t("order_state.#{state}").titleize
 
         css_classes = []
         current_index = states.index(@order.state)
@@ -23,9 +23,9 @@ module Spree
         css_classes << 'first' if state_index == 0
         css_classes << 'last' if state_index == states.length - 1
         # It'd be nice to have separate classes but combining them with a dash helps out for IE6 which only sees the last class
-        content_tag('li', content_tag('span', text), :class => css_classes.join('-'))
+        content_tag('li', content_tag('span', text), class: css_classes.join('-'))
       end
-      content_tag('ol', raw(items.join("\n")), :class => 'progress-steps', :id => "checkout-step-#{@order.state}")
+      content_tag('ol', raw(items.join("\n")), class: 'progress-steps', id: "checkout-step-#{@order.state}")
     end
   end
 end

data/app/helpers/spree/products_helper.rb

@@ -14,11 +14,11 @@ module Spree
     def variant_price_diff(variant)
       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
+      amount = Spree::Money.new(diff.abs, { currency: current_currency }).to_html
       if diff > 0
-        "(#{t(:add)}: #{amount})".html_safe
+        "(#{Spree.t(:add)}: #{amount})".html_safe
       else
-        "(#{t(:subtract)}: #{amount})".html_safe
+        "(#{Spree.t(:subtract)}: #{amount})".html_safe
       end
     end
 
@@ -26,7 +26,7 @@ module Spree
     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
+        Spree::Money.new(variant.price, { currency: current_currency }).to_html
       end
     end
 
@@ -42,14 +42,14 @@ module Spree
     def line_item_description(variant)
       description = variant.product.description
       if description.present?
-        truncate(strip_tags(description.gsub(' ', ' ')), :length => 100)
+        truncate(strip_tags(description.gsub(' ', ' ')), length: 100)
       else
-        t(:product_has_no_description)
+        Spree.t(:product_has_no_description)
       end
     end
 
     def get_taxonomies
-      @taxonomies ||= Spree::Taxonomy.includes(:root => :children)
+      @taxonomies ||= Spree::Taxonomy.includes(root: :children)
     end
   end
 end

data/app/helpers/spree/promotion_rules_helper.rb

@@ -0,0 +1,13 @@
+module Spree
+  module PromotionRulesHelper
+
+    def options_for_promotion_rule_types(promotion)
+      existing = promotion.rules.map { |rule| rule.class.name }
+      rule_names = Rails.application.config.spree.promotions.rules.map(&:name).reject{ |r| existing.include? r }
+      options = rule_names.map { |name| [ Spree.t("promotion_rule_types.#{name.demodulize.underscore}.name"), name] }
+      options_for_select(options)
+    end
+
+  end
+end
+

data/app/helpers/spree/store_helper.rb

@@ -0,0 +1,11 @@
+# Methods added to this helper will be available to all templates in the frontend.
+module Spree
+  module StoreHelper
+
+    # helper to determine if its appropriate to show the store menu
+    def store_menu?
+      %w{thank_you}.exclude? params[:action]
+    end
+
+  end
+end

data/app/mailers/spree/base_mailer.rb

@@ -1,11 +1,7 @@
 module Spree
   class BaseMailer < ActionMailer::Base
     def from_address
-      if MailMethod.current
-        MailMethod.current.preferred_mails_from
-      else
-        Spree::Config.emails_sent_from
-      end
+      Spree::Config[:mails_from]
     end
 
     def money(amount)

data/app/mailers/spree/order_mailer.rb

@@ -1,22 +1,17 @@
 module Spree
   class OrderMailer < BaseMailer
     def confirm_email(order, resend = false)
-      find_order(order)
-      subject = (resend ? "[#{t(:resend).upcase}] " : '')
-      subject += "#{Spree::Config[:site_name]} #{t('order_mailer.confirm_email.subject')} ##{@order.number}"
-      mail(:to => @order.email, :from => from_address, :subject => subject)
+      @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}"
+      mail(to: @order.email, from: from_address, subject: subject)
     end
 
     def cancel_email(order, resend = false)
-      find_order(order)
-      subject = (resend ? "[#{t(:resend).upcase}] " : '')
-      subject += "#{Spree::Config[:site_name]} #{t('order_mailer.cancel_email.subject')} ##{@order.number}"
-      mail(:to => @order.email, :from => from_address, :subject => subject)
+      @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}"
+      mail(to: @order.email, from: from_address, subject: subject)
     end
-
-    private
-      def find_order(order)
-        @order = order.is_a?(Spree::Order) ? order : Spree::Order.find(order)
-      end
   end
 end

data/app/mailers/spree/shipment_mailer.rb

@@ -1,10 +1,10 @@
 module Spree
   class ShipmentMailer < BaseMailer
     def shipped_email(shipment, resend = false)
-      @shipment = shipment.is_a?(Spree::Shipment) ? shipment : Spree::Shipment.find(shipment)
-      subject = (resend ? "[#{t(:resend).upcase}] " : '')
-      subject += "#{Spree::Config[:site_name]} #{t('shipment_mailer.shipped_email.subject')} ##{@shipment.order.number}"
-      mail(:to => @shipment.order.email, :from => from_address, :subject => subject)
+      @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}"
+      mail(to: @shipment.order.email, from: from_address, subject: subject)
     end
   end
 end

data/app/mailers/spree/test_mailer.rb

@@ -1,9 +1,8 @@
 module Spree
   class TestMailer < BaseMailer
-    def test_email(mail_method, user)
-      @mail_method = mail_method
-      subject = "#{Spree::Config[:site_name]} #{t('test_mailer.test_email.subject')}"
-      mail(:to => user.email, :from =>from_address, :subject => subject)
+    def test_email(user)
+      subject = "#{Spree::Config[:site_name]} #{Spree.t('test_mailer.test_email.subject')}"
+      mail(to: user.email, from: from_address, subject: subject)
     end
   end
 end

data/app/models/spree/ability.rb

@@ -26,18 +26,18 @@ module Spree
       self.clear_aliased_actions
 
       # override cancan default aliasing (we don't want to differentiate between read and index)
-      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
+      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 [:read,:update,:destroy], Spree.user_class, id: user.id
         can :create, Spree.user_class
         #############################
         can :read, Order do |order, token|

data/app/models/spree/activator.rb

@@ -12,18 +12,18 @@ module Spree
       self.event_names << name
     end
 
-    scope :event_name_starts_with, lambda{ |name| where('event_name LIKE ?', "#{name}%") }
+    scope :event_name_starts_with, ->(name) { where('event_name LIKE ?', "#{name}%") }
 
     def self.active
-      where('(starts_at IS NULL OR starts_at < ?) AND (expires_at IS NULL OR expires_at > ?)', Time.now, Time.now)
+      where('starts_at IS NULL OR starts_at < ?', Time.now).
+        where('expires_at IS NULL OR expires_at > ?', Time.now)
     end
 
     def activate(payload)
     end
 
     def expired?
-      starts_at && Time.now < starts_at ||
-      expires_at && Time.now > expires_at
+      starts_at && Time.now < starts_at || expires_at && Time.now > expires_at
     end
   end
 end

data/app/models/spree/address.rb

@@ -1,12 +1,13 @@
 module Spree
   class Address < ActiveRecord::Base
-    belongs_to :country
-    belongs_to :state
+    belongs_to :country, class_name: "Spree::Country"
+    belongs_to :state, class_name: "Spree::State"
 
     has_many :shipments
 
-    validates :firstname, :lastname, :address1, :city, :zipcode, :country, :presence => true
-    validates :phone, :presence => true, :if => :require_phone?
+    validates :firstname, :lastname, :address1, :city, :zipcode, :country, presence: true
+    validates :phone, presence: true, if: :require_phone?
+
     validate :state_validate
 
     attr_accessible :firstname, :lastname, :address1, :address2,
@@ -14,6 +15,9 @@ module Spree
                     :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?
@@ -24,7 +28,7 @@ module Spree
 
     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 }, without_protection: true)
     end
 
     # Can modify an address if it's not been used in an order (but checkouts controller has finer control)
@@ -71,14 +75,14 @@ module Spree
     # Generates an ActiveMerchant compatible address hash
     def active_merchant_hash
       {
-        :name => full_name,
-        :address1 => address1,
-        :address2 => address2,
-        :city => city,
-        :state => state_text,
-        :zip => zipcode,
-        :country => country.try(:iso),
-        :phone => phone
+        name: full_name,
+        address1: address1,
+        address2: address2,
+        city: city,
+        state: state_text,
+        zip: zipcode,
+        country: country.try(:iso),
+        phone: phone
       }
     end