spree_core 1.2.4 → 1.2.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 16d58098294c8bf04bef89c6b99752f87946df0b
+  data.tar.gz: c4e00836ddc65709877257f29d4fd0f6f5bac591
+SHA512:
+  metadata.gz: 35394a723cf2c3d50c612fcc83616b966af998b53e26feaefb975045855baf63c7de18052bc0d4ba99185cd6d5943ef1c608af14588af091865a3bcc27353831
+  data.tar.gz: 9bff71faf94f7bcf0c192454e66327afe83a5db91368069d5b1e363837a73372bb2b7f7a6201e15e9b6090593e507a370397cabd6b113041ceedbcdde4c82526

data/app/assets/javascripts/admin/calculator.js

@@ -6,11 +6,11 @@ $(function() {
     if (calculator_select.attr('value') == original_calc_type) {
       $('div.calculator-settings').show();
       $('div#calculator-settings-warning').hide();
-      $('.calculator-settings input').prop("disabled", false);
+      $('.calculator-settings').find('input,textarea').prop("disabled", false);
     } else {
       $('div.calculator-settings').hide();
       $('div#calculator-settings-warning').show();
-      $('.calculator-settings input').prop("disabled", true);
+      $('.calculator-settings').find('input,textarea').prop("disabled", true);
     }
   });
 })

data/app/assets/javascripts/admin/checkouts/edit.js

@@ -49,7 +49,7 @@ $(document).ready(function(){
       source: function(request, response) {
         var params = { q: $('#customer_search').val(),
                        authenticity_token: AUTH_TOKEN }
-        $.get(Spree.routes.user_search + '&' + jQuery.param(params), function(data) {
+        $.get(Spree.routes.user_search + '?' + jQuery.param(params), function(data) {
           result = prep_user_autocomplete_data(data)
           response(result);
         });

data/app/assets/stylesheets/admin/admin.css.erb

@@ -675,3 +675,8 @@ span.handle{
 select.select2 {
   width: 30em;
 }
+
+.ui-widget-content .ui-menu-item .ui-state-focus {
+  color: #476D9B;
+  border: none;
+}

data/app/controllers/spree/admin/adjustments_controller.rb

@@ -5,9 +5,13 @@ module Spree
       destroy.after :reload_order
 
       private
-        def reload_order
-          @order.reload
-        end
+      def reload_order
+        @order.reload
+      end
+
+      def collection
+        parent.adjustments.eligible
+      end
     end
   end
 end

data/app/controllers/spree/admin/orders/customer_details_controller.rb

@@ -25,14 +25,15 @@ module Spree
                 @order.user_id = params[:user_id]
                 @order.user true
               end
-              @order.save
-              @order.create_shipment!
+
+              while @order.next; end 
               flash[:notice] = t('customer_details_updated')
               redirect_to edit_admin_order_shipment_path(@order, @order.shipment)
             else
               flash[:error] = t('errors.messages.no_shipping_methods_available')
               redirect_to admin_order_customer_path(@order)
             end
+
           else
             render :action => :edit
           end

data/app/controllers/spree/admin/orders_controller.rb

@@ -102,7 +102,7 @@ module Spree
       end
 
       def resend
-        OrderMailer.confirm_email(@order, true).deliver
+        OrderMailer.confirm_email(@order.id, true).deliver
         flash.notice = t(:order_email_resent)
 
         respond_with(@order) { |format| format.html { redirect_to :back } }

data/app/controllers/spree/checkout_controller.rb

@@ -76,7 +76,7 @@ module Spree
 
       def object_params
         # For payment step, filter order parameters to produce the expected nested attributes for a single payment and its source, discarding attributes for payment methods other than the one selected
-        if @order.payment?
+        if @order.has_checkout_step?("payment") && @order.payment?
           if params[:payment_source].present? && source_params = params.delete(:payment_source)[params[:order][:payments_attributes].first[:payment_method_id].underscore]
             params[:order][:payments_attributes].first[:source_attributes] = source_params
           end

data/app/controllers/spree/orders_controller.rb

@@ -78,7 +78,7 @@ module Spree
     private
 
       def accurate_title
-        @order && @order.completed? ? "#{Order.model_name.human} #{@order.number}" : t(:shopping_cart)
+        @order && @order.completed? ? "#{I18n.t(:order)} #{@order.number}" : t(:shopping_cart)
       end
   end
 end

data/app/helpers/spree/base_helper.rb

@@ -64,7 +64,7 @@ module Spree
       end
 
       if meta[:description].blank? && object.kind_of?(Spree::Product)
-        meta[:description] = strip_tags(object.description)
+        meta[:description] = strip_tags(truncate(object.description, :length => 160, :separator => ' '))
       end
 
       meta.reverse_merge!({
@@ -165,7 +165,7 @@ module Spree
     end
 
     def money(amount)
-      Spree::Money.new(amount)
+      Spree::Money.new(amount).to_html
     end
 
     def method_missing(method_name, *args, &block)

data/app/helpers/spree/products_helper.rb

@@ -6,15 +6,19 @@ module Spree
       diff = variant.price - variant.product.price
       return nil if diff == 0
       if diff > 0
-        "(#{t(:add)}: #{Spree::Money.new(diff.abs)})"
+        "(#{t(:add)}: #{Spree::Money.new(diff.abs).to_html})".html_safe
       else
-        "(#{t(:subtract)}: #{Spree::Money.new(diff.abs)})"
+        "(#{t(:subtract)}: #{Spree::Money.new(diff.abs).to_html})".html_safe
       end
     end
 
     # converts line breaks in product description into <p> tags (for html display purposes)
     def product_description(product)
-      raw(product.description.gsub(/(.*?)\r?\n\r?\n/m, '<p>\1</p>'))
+      if Spree::Config[:show_raw_product_description]
+        raw(product.description)
+      else
+        raw(product.description.gsub(/(.*?)\r?\n\r?\n/m, '<p>\1</p>'))
+      end
     end
 
     def line_item_description(variant)

data/app/mailers/spree/order_mailer.rb

@@ -2,20 +2,31 @@ module Spree
   class OrderMailer < ActionMailer::Base
     helper 'spree/base'
 
+    def from_address
+      MailMethod.current.preferred_mails_from
+    end
+
     def confirm_email(order, resend = false)
-      @order = order
+      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,
+      subject += "#{Spree::Config[:site_name]} #{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
+      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,
+      subject += "#{Spree::Config[:site_name]} #{t('order_mailer.cancel_email.subject')} ##{@order.number}"
+      mail(:to => @order.email,
+           :from => from_address,
            :subject => subject)
     end
+
+    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

@@ -2,11 +2,16 @@ module Spree
   class ShipmentMailer < ActionMailer::Base
     helper 'spree/base'
 
+    def from_address
+      MailMethod.current.preferred_mails_from
+    end
+
     def shipped_email(shipment, resend = false)
-      @shipment = shipment
+      @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,
+      subject += "#{Spree::Config[:site_name]} #{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

@@ -1,9 +1,14 @@
 module Spree
   class TestMailer < ActionMailer::Base
+    def from_address
+      MailMethod.current.preferred_mails_from
+    end
+
     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)
     end
   end

data/app/models/spree/adjustment.rb

@@ -66,7 +66,7 @@ module Spree
     end
 
     def display_amount
-      Spree::Money.new(amount).to_s
+      Spree::Money.new(amount)
     end
 
     private

data/app/models/spree/app_configuration.rb

@@ -50,6 +50,8 @@ module Spree
     preference :default_meta_keywords, :string, :default => 'spree, demo'
     preference :default_seo_title, :string, :default => ''
     preference :dismissed_spree_alerts, :string, :default => ''
+    preference :emails_sent_from, :string, :default => 'spree@example.com'
+    preference :hide_cents, :boolean, :default => false
     preference :last_check_for_spree_alerts, :string, :default => nil
     preference :layout, :string, :default => 'spree/layouts/spree_application'
     preference :logo, :string, :default => 'admin/bg/spree_50.png'
@@ -62,6 +64,7 @@ module Spree
     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_raw_product_description, :boolean, :default => false
     preference :show_zero_stock_products, :boolean, :default => true
     preference :site_name, :string, :default => 'Spree Demo Site'
     preference :site_url, :string, :default => 'demo.spreecommerce.com'

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

@@ -33,7 +33,11 @@ module Spree
 
       def compute_line_item(line_item)
         if line_item.product.tax_category == rate.tax_category
-          deduced_total_by_rate(line_item.total, rate)
+          if rate.included_in_price
+            deduced_total_by_rate(line_item.total, rate)
+          else
+            round_to_two_places(line_item.total * rate.amount)
+          end
         else
           0
         end

data/app/models/spree/credit_card.rb

@@ -60,7 +60,7 @@ module Spree
 
     # needed for some of the ActiveMerchant gateways (eg. SagePay)
     def brand
-      cc_type
+      spree_cc_type
     end
 
     scope :with_payment_profile, lambda { where('gateway_customer_profile_id IS NOT NULL') }

data/app/models/spree/gateway.rb

@@ -21,7 +21,9 @@ module Spree
     def provider
       gateway_options = options
       gateway_options.delete :login if gateway_options.has_key?(:login) and gateway_options[:login].nil?
-      ActiveMerchant::Billing::Base.gateway_mode = gateway_options[:server].to_sym
+      if gateway_options[:server]
+        ActiveMerchant::Billing::Base.gateway_mode = gateway_options[:server].to_sym
+      end
       @provider ||= provider_class.new(gateway_options)
     end
 

data/app/models/spree/order.rb

@@ -388,7 +388,7 @@ module Spree
 
     def deliver_order_confirmation_email
       begin
-        OrderMailer.confirm_email(self).deliver
+        OrderMailer.confirm_email(self.id).deliver
       rescue Exception => e
         logger.error("#{e.class.name}: #{e.message}")
         logger.error(e.backtrace * "\n")
@@ -637,7 +637,7 @@ module Spree
         restock_items!
 
         #TODO: make_shipments_pending
-        OrderMailer.cancel_email(self).deliver
+        OrderMailer.cancel_email(self.id).deliver
         unless %w(partial shipped).include?(shipment_state)
           self.payment_state = 'credit_owed'
         end

data/app/models/spree/order/checkout.rb

@@ -131,6 +131,10 @@ module Spree
             steps << "complete" unless steps.include?("complete")
             steps
           end
+
+          def has_checkout_step?(step)
+            step.present? ? self.checkout_steps.include?(step) : false
+          end
         end
       end
     end

data/app/models/spree/preferences/store.rb

@@ -64,6 +64,10 @@ module Spree::Preferences
       destroy(key)
     end
 
+    def clear_cache
+      @cache.clear
+    end
+
     private
 
     def persist(cache_key, value, type)

data/app/models/spree/product.rb

@@ -231,7 +231,7 @@ module Spree
     end
 
     def display_price
-      Spree::Money.new(price).to_s
+      Spree::Money.new(price)
     end
 
     private

data/app/models/spree/product/scopes.rb

@@ -64,8 +64,13 @@ module Spree
     #
     #   SELECT COUNT(*) ...
     add_search_scope :in_taxon do |taxon|
-      select("DISTINCT(spree_products.id), spree_products.*").
-      joins(:taxons).
+      if ActiveRecord::Base.connection.adapter_name == "PostgreSQL"
+        scope = select("DISTINCT ON (spree_products.id) spree_products.*")
+      else
+        scope = select("DISTINCT(spree_products.id), spree_products.*")
+      end
+
+      scope.joins(:taxons).
       where(Taxon.table_name => { :id => taxon.self_and_descendants.map(&:id) })
     end
 
@@ -206,14 +211,18 @@ module Spree
       group("spree_products.id").joins(:taxons).where(Taxon.arel_table[:name].eq(name))
     end
 
-    if (ActiveRecord::Base.connection.adapter_name == 'PostgreSQL')
-      if table_exists?
-        scope :group_by_products_id, { :group => column_names.map { |col_name| "#{table_name}.#{col_name}"} }
+    # This method needs to be defined *as a method*, otherwise it will cause the
+    # problem shown in #1247.
+    def self.group_by_products_id
+      if (ActiveRecord::Base.connection.adapter_name == 'PostgreSQL')
+        # Need to check, otherwise `column_names` will fail
+        if table_exists?
+          group(column_names.map { |col_name| "#{table_name}.#{col_name}"})
+        end
+      else
+        group("#{self.quoted_table_name}.id")
       end
-    else
-      scope :group_by_products_id, { :group => "#{self.quoted_table_name}.id" }
     end
-    search_scopes << :group_by_products_id
 
     private
 

data/app/models/spree/shipment.rb

@@ -144,7 +144,7 @@ module Spree
       end
 
       def send_shipped_email
-        ShipmentMailer.shipped_email(self).deliver
+        ShipmentMailer.shipped_email(self.id).deliver
       end
 
       def ensure_correct_adjustment

data/app/models/spree/taxon.rb

@@ -45,6 +45,11 @@ module Spree
       end
     end
 
+    # For #2759
+    def to_param
+      permalink
+    end
+
     def active_products
       scope = products.active
       scope = scope.on_hand unless Spree::Config[:show_zero_stock_products]

data/app/models/spree/variant.rb

@@ -22,7 +22,7 @@ module Spree
     validates :count_on_hand, :numericality => true
 
     after_save :process_backorders
-    after_save :recalculate_product_on_hand, :if => :is_master?
+    after_save :recalculate_product_on_hand
 
     # default variant scope only lists non-deleted variants
     scope :active, lambda { where(:deleted_at => nil) }

data/app/views/spree/admin/adjustments/_adjustments_table.html.erb

@@ -5,7 +5,8 @@
     <th><%= t(:amount) %></th>
     <th></th>
   </tr>
-  <% @order.adjustments.each do |adjustment|
+
+  <% @collection.each do |adjustment|
        @edit_url = edit_admin_order_adjustment_path(@order, adjustment)
        @delete_url = admin_order_adjustment_path(@order, adjustment)
   %>

data/app/views/spree/admin/general_settings/edit.html.erb

@@ -19,9 +19,9 @@
      <p>
        <strong><%= t(:currency_symbol_position) %></strong><br>
        <%= radio_button_tag :currency_symbol_position, "before" %>
-       <%= label_tag :currency_symbol_position_before, Spree::Money.new(10, :symbol_position => "before") %><br>
+       <%= label_tag :currency_symbol_position_before, Spree::Money.new(10, :symbol_position => "before").to_html %><br>
        <%= radio_button_tag :currency_symbol_position, "after" %>
-       <%= label_tag :currency_symbol_position_after, Spree::Money.new(10, :symbol_position => "after") %>
+       <%= label_tag :currency_symbol_position_after, Spree::Money.new(10, :symbol_position => "after").to_html %>
      </p>
   </fieldset>
 

data/app/views/spree/admin/general_settings/show.html.erb

@@ -11,7 +11,7 @@
   <% end %>
   <tr>
     <td colspan="2">
-      <%= t(:dollar_amounts_displayed_as, :example => Spree::Money.new(20.99)) %>
+      <%= t(:dollar_amounts_displayed_as, :example => Spree::Money.new(20.99).to_html) %>
     </td>
   </tr>
 

data/app/views/spree/admin/shared/_tabs.html.erb

@@ -1,4 +1,3 @@
-<%= tab :overview, :route => :admin %>
 <%= tab :orders, :payments, :creditcard_payments, :shipments, :credit_cards, :return_authorizations %>
 <%= tab :products , :option_types, :properties, :prototypes, :variants, :product_properties, :taxons %>
 <%= tab :reports %>

data/app/views/spree/admin/taxons/edit.html.erb

@@ -2,7 +2,7 @@
 
 <h1><%= t(:taxon_edit) %></h1>
 
-<%= form_for [:admin, @taxonomy, @taxon], :method => :put, :html => { :multipart => true } do |f| %>
+<%= form_for [:admin, @taxonomy, @taxon], :url => admin_taxonomy_taxon_path(@taxonomy, @taxon.id), :method => :put, :html => { :multipart => true } do |f| %>
   <%= render :partial => 'form', :locals => { :f => f } %>
 
   <p class="form-buttons" data-hook="buttons">

data/app/views/spree/order_mailer/confirm_email.text.erb

@@ -6,15 +6,15 @@
 <%= t('order_mailer.confirm_email.order_summary') %>
 ============================================================
 <% @order.line_items.each do |item| %>
-  <%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) @ <%= money item.price %> = <%= money(item.price * item.quantity) %>
+  <%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) @ <%= Spree::Money.new(item.price) %> = <%= Spree::Money.new(item.price * item.quantity) %>
 <% end %>
 ============================================================
-<%= t('order_mailer.confirm_email.subtotal') %>: <%= money @order.item_total %>
+<%= t('order_mailer.confirm_email.subtotal') %> <%= Spree::Money.new @order.item_total %>
 
 <% @order.adjustments.eligible.each do |adjustment| %>
-  <%= raw(adjustment.label) %> <%= money(adjustment.amount) %>
+  <%= raw(adjustment.label) %> <%= adjustment.display_amount %>
 <% end %>
 
-<%= t('order_mailer.confirm_email.total') %>: <%= money(@order.total) %>
+<%= t('order_mailer.confirm_email.total') %> <%= @order.display_total.to_s %>
 
 <%= t('order_mailer.confirm_email.thanks') %>

data/app/views/spree/products/index.html.erb

@@ -1,6 +1,6 @@
 <% content_for :sidebar do %>
   <div data-hook="homepage_sidebar_navigation">
-    <% if "products" == params[:controller] && @taxon %>
+    <% if "spree/products" == params[:controller] && @taxon %>
       <%= render :partial => 'spree/shared/filters' %>
     <% else %>
       <%= render :partial => 'spree/shared/taxonomies' %>

data/app/views/spree/shared/_google_analytics.html.erb

@@ -32,7 +32,7 @@
 
     (function() {
       var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-      ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+      ga.src = '//google-analytics.com/ga.js';
       var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
     })();
   <% end %>

data/app/views/spree/shared/_order_details.html.erb

@@ -48,14 +48,14 @@
 
 <hr />
 
-<table class="index columns alpha omega sixteen" data-hook="order_details">
+<table id='line-items' class="index columns alpha omega sixteen" data-hook="order_details">
   <col width="15%" valign="middle" halign="center">
   <col width="70%" valign="middle">
   <col width="5%" valign="middle" halign="center">
   <col width="5%" valign="middle" halign="center">
   <col width="5%" valign="middle" halign="center">
 
-  <thead id="line-items" data-hook>
+  <thead data-hook>
     <tr data-hook="order_details_line_items_headers">
       <th colspan="2"><%= t(:item) %></th>
       <th class="price"><%= t(:price) %></th>
@@ -64,7 +64,7 @@
     </tr>
   </thead>
 
-  <tbody id="line-items" data-hook>
+  <tbody data-hook>
     <% @order.line_items.each do |item| %>
       <tr data-hook="order_details_line_item_row">
         <td data-hook="order_item_image">

data/db/migrate/20130222032153_add_order_id_index_to_shipments.rb

@@ -0,0 +1,5 @@
+class AddOrderIdIndexToShipments < ActiveRecord::Migration
+  def change
+    add_index :spree_shipments, :order_id
+  end
+end

data/lib/generators/spree/dummy/templates/rails/database.yml

@@ -1,3 +1,6 @@
+<% if agent_number = ENV['TC_AGENT_NUMBER']
+database_prefix = agent_number + "_"
+end %>
 <% case ENV['DB']
   when 'sqlite' %>
 development:
@@ -12,33 +15,33 @@ production:
 <% when 'mysql' %>
 development:
   adapter: mysql2
-  database: spree_development
+  database: <%= database_prefix %>spree_development
   username:
   encoding: utf8
 test:
   adapter: mysql2
-  database: spree_test
+  database: <%= database_prefix %>spree_test
   username:
   encoding: utf8
 production:
   adapter: mysql2
-  database: spree_production
+  database: <%= database_prefix %>spree_production
   username:
   encoding: utf8
 <% when 'postgres' %>
 development:
   adapter: postgresql
-  database: spree_development
+  database: <%= database_prefix %>spree_development
   username: postgres
   min_messages: warning
 test:
   adapter: postgresql
-  database: spree_test
+  database: <%= database_prefix %>spree_test
   username: postgres
   min_messages: warning
 production:
   adapter: postgresql
-  database: spree_production
+  database: <%= database_prefix %>spree_production
   username: postgres
   min_messages: warning
 <% else %>

data/lib/spree/core/calculated_adjustments.rb

@@ -3,7 +3,7 @@ module Spree
     module CalculatedAdjustments
       module ClassMethods
         def calculated_adjustments
-          has_one   :calculator, :as => :calculable, :dependent => :destroy
+          has_one   :calculator, :class_name => "Spree::Calculator", :as => :calculable, :dependent => :destroy
           accepts_nested_attributes_for :calculator
           attr_accessible :calculator_type, :calculator_attributes
           validates :calculator, :presence => true

data/lib/spree/core/controller_helpers.rb

@@ -26,7 +26,7 @@ module Spree
         end
       end
       # can be used in views as well as controllers.
-      # e.g. <% title = 'This is a custom title for this view' %>
+      # e.g. <% self.title = 'This is a custom title for this view' %>
       attr_writer :title
 
       # proxy method to *possible* spree_current_user method

data/lib/spree/core/engine.rb

@@ -65,7 +65,11 @@ module Spree
 
       # filter sensitive information during logging
       initializer "spree.params.filter" do |app|
-        app.config.filter_parameters += [:password, :password_confirmation, :number]
+        app.config.filter_parameters += [
+          :password,
+          :password_confirmation,
+          :number,
+          :verification_value]
       end
 
       # sets the manifests / assets to be precompiled, even when initialize_on_precompile is false

data/lib/spree/core/testing_support/preferences.rb

@@ -2,17 +2,23 @@ module Spree
   module Core
     module TestingSupport
       module Preferences
-        # Resets all preferences to default values, you can
-        # pass a block to override the defaults with a block
+        def reset_spree_preferences(&config_block)
+          Spree::Preferences::Store.instance.persistence = false
+          Spree::Preferences::Store.instance.clear_cache
+
+          configure_spree_preferences &config_block if block_given?
+        end
+
+        # The preference cache is cleared before each test, so the
+        # default values will be used. You can define preferences
+        # for your spec with:
         #
-        # reset_spree_preferences do |config|
+        # configure_spree_preferences do |config|
         #   config.site_name = "my fancy pants store"
         # end
         #
-        def reset_spree_preferences
-          Spree::Preferences::Store.instance.persistence = false
+        def configure_spree_preferences
           config = Rails.application.config.spree.preferences
-          config.reset
           yield(config) if block_given?
         end
 

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

@@ -18,6 +18,6 @@ class EmailValidator < ActiveModel::EachValidator
     rescue Exception => e
       r = false
     end
-    record.errors[attribute] << (options[:message] || I18n.t("errors.messages.invalid")) unless r
+    record.errors.add(attribute, :invalid, {:value => value}.merge!(options)) unless r
   end
 end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "1.2.4"
+    "1.2.5"
   end
 end

data/lib/spree/money.rb

@@ -2,11 +2,14 @@ require 'money'
 
 module Spree
   class Money
+    attr_reader :money
+
     def initialize(amount, options={})
-      @money = ::Money.parse([amount, Spree::Config[:currency]].join)
+      @money = ::Money.parse([amount, (options[:currency] || Spree::Config[:currency])].join)
       @options = {}
-      @options[:with_currency] = true if Spree::Config[:display_currency]
+      @options[:with_currency] = Spree::Config[:display_currency]
       @options[:symbol_position] = Spree::Config[:currency_symbol_position].to_sym
+      @options[:no_cents] = Spree::Config[:hide_cents]
       @options.merge!(options)
       # Must be a symbol because the Money gem doesn't do the conversion
       @options[:symbol_position] = @options[:symbol_position].to_sym
@@ -15,5 +18,19 @@ module Spree
     def to_s
       @money.format(@options)
     end
+
+    def to_html(options = { :html => true })
+      output = @money.format(@options.merge(options))
+      if options[:html]
+        # 1) prevent blank, breaking spaces
+        # 2) prevent escaping of HTML character entities
+        output = output.gsub(" ", " ").html_safe
+      end
+      output
+    end
+
+    def ==(obj)
+      @money == obj.money
+    end
   end
 end

data/lib/spree/product_filters.rb

@@ -65,7 +65,7 @@ module Spree
     end
 
     def ProductFilters.format_price(amount)
-      Spree::Money.new(amount)
+      Spree::Money.new(amount).to_html
     end
 
     def ProductFilters.price_filter

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 1.2.4
-  prerelease: 
+  version: 1.2.5
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
+date: 2013-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: select2-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: select2-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: state_machine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ffaker
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -158,7 +139,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -166,7 +146,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -174,55 +153,62 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.7.2
 - !ruby/object:Gem::Dependency
   name: activemerchant
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.29.3
+        version: '1.31'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.29.3
+        version: '1.31'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.5
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.11
+        version: 3.2.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.11
+        version: 3.2.13
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -230,7 +216,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -238,23 +223,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: stringex
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -262,7 +244,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -270,7 +251,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cancan
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -278,7 +258,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -286,7 +265,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: money
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -294,7 +272,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -302,7 +279,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -310,11 +286,24 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.7.2
+- !ruby/object:Gem::Dependency
+  name: truncate_html
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.5
 description: Required dependency for Spree
 email: sean@spreecommerce.com
 executables: []
@@ -408,6 +397,7 @@ files:
 - app/assets/images/credit_cards/icons/american_express.png
 - app/assets/images/credit_cards/icons/cirrus.png
 - app/assets/images/credit_cards/icons/delta.png
+- app/assets/images/credit_cards/icons/diners_club.png
 - app/assets/images/credit_cards/icons/dinersclub.png
 - app/assets/images/credit_cards/icons/directdebit.png
 - app/assets/images/credit_cards/icons/discover.png
@@ -1035,6 +1025,7 @@ files:
 - db/migrate/20121017010007_remove_not_null_constraint_from_products_on_hand.rb
 - db/migrate/20121124203911_add_position_to_taxonomies.rb
 - db/migrate/20130203232234_add_identifier_to_spree_payments.rb
+- db/migrate/20130222032153_add_order_id_index_to_shipments.rb
 - db/seeds.rb
 - vendor/assets/images/datepicker/cal.gif
 - vendor/assets/images/jquery-ui/ui-bg_flat_0_aaaaaa_40x100.png
@@ -1117,30 +1108,26 @@ files:
 homepage: http://spreecommerce.com
 licenses:
 - BSD-3
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -97604365585348825
 requirements:
 - none
 rubyforge_project: spree_core
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Core e-commerce functionality for the Spree project.
 test_files: []