spree_core 0.60.0 → 0.60.1

data/app/controllers/admin/base_controller.rb

@@ -6,6 +6,13 @@ class Admin::BaseController < Spree::BaseController
   layout 'admin'
 
   protected
+  
+  def flash_message_for(object, event_sym)
+    resource_desc  = object.class.model_name.human
+    resource_desc += " \"#{object.name}\"" if object.respond_to?(:name)
+    I18n.t(event_sym, :resource => resource_desc)  
+  end
+  
   def render_js_for_destroy
     render :partial => "/admin/shared/destroy"
   end

data/app/controllers/admin/payments_controller.rb

@@ -30,7 +30,7 @@ class Admin::PaymentsController < Admin::BaseController
 
       if @order.completed?
         @payment.process!
-        flash[:notice] = I18n.t(:successfully_created, :resource => 'payment')
+        flash[:notice] = flash_message_for(@payment, :successfully_created)
 
         respond_with(@payment) { |format| format.html { redirect_to admin_order_payments_path(@order) } }
       else

data/app/controllers/admin/product_properties_controller.rb

@@ -5,6 +5,6 @@ class Admin::ProductPropertiesController < Admin::ResourceController
   private
 
   def find_properties
-    @properties = Property.all.map(&:name).join(" ")
+    @properties = Property.all.map(&:name)
   end
 end

data/app/controllers/admin/resource_controller.rb

@@ -24,9 +24,7 @@ class Admin::ResourceController < Admin::BaseController
     invoke_callbacks(:update, :before)
     if @object.update_attributes(params[object_name])
       invoke_callbacks(:update, :after)
-      resource_desc = I18n.t(object_name)
-      resource_desc += " \"#{@object.name}\"" if @object.respond_to?(:name)
-      flash[:notice] = I18n.t(:successfully_updated, :resource => resource_desc)
+      flash[:notice] = flash_message_for(@object, :successfully_updated)
       respond_with(@object) do |format|
         format.html { redirect_to location_after_save }
         format.js   { render :layout => false }
@@ -41,9 +39,7 @@ class Admin::ResourceController < Admin::BaseController
     invoke_callbacks(:create, :before)
     if @object.save
       invoke_callbacks(:create, :after)
-      resource_desc = I18n.t(object_name)
-      resource_desc += " \"#{@object.name}\"" if @object.respond_to?(:name)
-      flash[:notice] = I18n.t(:successfully_created, :resource => resource_desc)
+      flash[:notice] = flash_message_for(@object, :successfully_created)
       respond_with(@object) do |format|
         format.html { redirect_to location_after_save }
         format.js   { render :layout => false }
@@ -58,9 +54,7 @@ class Admin::ResourceController < Admin::BaseController
     invoke_callbacks(:destroy, :before)
     if @object.destroy
       invoke_callbacks(:destroy, :after)
-      resource_desc = I18n.t(object_name)
-      resource_desc += " \"#{@object.name}\"" if @object.respond_to?(:name)
-      flash[:notice] = I18n.t(:successfully_removed, :resource => resource_desc)
+      flash[:notice] = flash_message_for(@object, :successfully_removed)
       respond_with(@object) do |format|
         format.html { redirect_to collection_url }
         format.js   { render :partial => "/admin/shared/destroy" }

data/app/controllers/admin/shipments_controller.rb

@@ -22,7 +22,7 @@ class Admin::ShipmentsController < Admin::BaseController
     build_shipment
     assign_inventory_units
     if @shipment.save
-      flash[:notice] = I18n.t(:successfully_created, :resource => 'shipment')
+      flash[:notice] = flash_message_for(@shipment, :successfully_created)
       respond_with(@shipment) do |format|
         format.html { redirect_to edit_admin_order_shipment_path(@order, @shipment) }
       end
@@ -44,7 +44,7 @@ class Admin::ShipmentsController < Admin::BaseController
       @order.shipping_method = @order.shipment.shipping_method
       @order.save
 
-      flash[:notice] = I18n.t(:successfully_updated, :resource => I18n.t('shipment'))
+      flash[:notice] = flash_message_for(@shipment, :successfully_updated)
       return_path = @order.completed? ? edit_admin_order_shipment_path(@order, @shipment) : admin_order_adjustments_path(@order)
       respond_with(@object) do |format|
         format.html { redirect_to return_path }

data/app/controllers/admin/taxons_controller.rb

@@ -85,7 +85,7 @@ class Admin::TaxonsController < Admin::BaseController
     @update_children = true if params[:taxon][:name] != @taxon.name || params[:taxon][:permalink] != @taxon.permalink
 
     if @taxon.update_attributes(params[:taxon])
-      flash[:notice] = I18n.t(:successfully_updated, :resource => I18n.t(:taxon) + " \"#{@taxon.name}\"")
+      flash[:notice] = flash_message_for(@taxon, :successfully_updated)
     end
 
     #rename child taxons

data/app/controllers/checkout_controller.rb

@@ -16,7 +16,8 @@ class CheckoutController < Spree::BaseController
         state_callback(:after)
       else
         flash[:error] = I18n.t(:payment_processing_failed)
-        respond_with(@order, :location => checkout_state_path(@order.state)) and return
+        respond_with(@order, :location => checkout_state_path(@order.state))
+        return
       end
 
       if @order.state == "complete" || @order.completed?

data/app/models/order.rb

@@ -26,7 +26,8 @@ class Order < ActiveRecord::Base
   before_create :create_user
   before_create :generate_order_number
 
-  validates_presence_of :email, :if => :require_email
+  # TODO: validate the format of the email as well (but we can't rely on authlogic anymore to help with validation)
+  validates :email, :presence => true, :format => /^([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})$/i, :if => :require_email
   validate :has_available_shipment
 
   #delegate :ip_address, :to => :checkout

data/app/models/shipping_method.rb

@@ -2,6 +2,7 @@ class ShippingMethod < ActiveRecord::Base
   DISPLAY =  [:both, :front_end, :back_end]
   belongs_to :zone
   has_many :shipments
+  validates :name, :calculator, :zone, :presence => true
 
   calculated_adjustments
 

data/app/views/admin/product_properties/index.html.erb

@@ -42,7 +42,7 @@
 <% end %>
 
 <%= javascript_tag do %>
-  var properties = "<%=@properties%>".split(' ');
+  var properties = [<%= @properties.map{|id| "'#{id}'"}.join(', ') %>];
 
   $("#product_properties input.autocomplete").live("keydown", function(){
     already_auto_completed = $(this).is('ac_input');

data/app/views/checkout/_confirm.html.erb

@@ -1,6 +1,6 @@
 <fieldset id="order_details">
   <div class="clear"></div>
-  <legend><%= t("confirm") %></legend>
+  <legend><%= t(@order.state, :scope => :order_state).titleize %></legend>
   <%= render :partial => 'shared/order_details', :locals => {:order => @order} %>
 </fieldset>
 

data/app/views/checkout/edit.html.erb

@@ -7,9 +7,11 @@
   <br clear="left" />
   <%= render "shared/error_messages", :target => @order %>
   <%= hook :checkout_summary_box do %>
-    <div id="checkout-summary">
-      <%= render 'summary', :order => @order %>
-    </div>
+    <% if @order.state != 'confirm' %>
+      <div id="checkout-summary">
+        <%= render 'summary', :order => @order %>
+      </div>
+    <% end %>
   <% end %>
   <%= form_for @order, :url => update_checkout_path(@order.state), :html => { :id => "checkout_form_#{@order.state}" } do |form| %>
     <%= render @order.state, :form => form %>

data/lib/spree_core/railtie.rb

@@ -54,5 +54,10 @@ module SpreeCore
 
     config.to_prepare &method(:activate).to_proc
 
+    # filter sensitive information during logging
+    initializer "spree.params.filter" do |app|
+      app.config.filter_parameters += [:password, :password_confirmation, :number]
+    end
+
   end
 end

data/lib/spree_core/testing_support/factories/shipping_method_factory.rb

@@ -1,7 +1,11 @@
 Factory.define :shipping_method do |f|
   f.zone {|a| Zone.find_by_name("GlobalZone") || a.association(:global_zone) }
   f.name 'UPS Ground'
-  #f.display_on :back_end
-  f.after_create {|shipping_method| shipping_method.calculator = Factory(:calculator,
-                                                                         :calculable =>  shipping_method) }
+  f.calculator { |sm| Factory(:calculator, :calculable_id => sm.object_id, :calculable_type => "ShippingMethod") }
+end
+
+Factory.define :free_shipping_method, :class => ShippingMethod do |f|
+  f.zone {|a| Zone.find_by_name("GlobalZone") || a.association(:global_zone) }
+  f.name 'UPS Ground'
+  f.calculator { |sm| Factory(:no_amount_calculator, :calculable_id => sm.object_id, :calculable_type => "ShippingMethod") }
 end

data/lib/spree_core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "0.60.0"
+    "0.60.1"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spree_core
 version: !ruby/object:Gem::Version 
-  hash: 239
-  prerelease: false
+  hash: 237
+  prerelease: 
   segments: 
   - 0
   - 60
-  - 0
-  version: 0.60.0
+  - 1
+  version: 0.60.1
 platform: ruby
 authors: 
 - Sean Schofield
@@ -15,12 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-13 00:00:00 -04:00
+date: 2011-06-21 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: acts_as_list
-  prerelease: false
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -32,27 +31,27 @@ dependencies:
         - 1
         - 2
         version: 0.1.2
-  type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: nested_set
+  name: acts_as_list
   prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
         - 1
         - 6
-        - 4
-        version: 1.6.4
-  type: :runtime
+        - 6
+        version: 1.6.6
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rd_unobtrusive_date_picker
+  name: nested_set
   prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -64,11 +63,11 @@ dependencies:
         - 1
         - 0
         version: 0.1.0
-  type: :runtime
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rd_find_by_param
+  name: rd_unobtrusive_date_picker
   prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -80,11 +79,11 @@ dependencies:
         - 1
         - 1
         version: 0.1.1
-  type: :runtime
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: highline
+  name: rd_find_by_param
   prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -96,11 +95,11 @@ dependencies:
         - 5
         - 1
         version: 1.5.1
-  type: :runtime
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: stringex
+  name: highline
   prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -112,11 +111,11 @@ dependencies:
         - 0
         - 3
         version: 1.0.3
-  type: :runtime
   version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: state_machine
+  name: stringex
   prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -128,11 +127,11 @@ dependencies:
         - 9
         - 4
         version: 0.9.4
-  type: :runtime
   version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: faker
+  name: state_machine
   prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -144,27 +143,27 @@ dependencies:
         - 9
         - 5
         version: 0.9.5
-  type: :runtime
   version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: paperclip
+  name: faker
   prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 21
         segments: 
         - 2
         - 3
-        - 8
-        version: 2.3.8
-  type: :runtime
+        - 11
+        version: 2.3.11
   version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: rd_resource_controller
+  name: paperclip
   prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -174,11 +173,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
   version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: meta_search
+  name: rd_resource_controller
   prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -190,59 +189,60 @@ dependencies:
         - 0
         - 5
         version: 1.0.5
-  type: :runtime
   version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: activemerchant
+  name: meta_search
   prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 47
+        hash: 43
         segments: 
         - 1
-        - 14
+        - 15
         - 0
-        version: 1.14.0
-  type: :runtime
+        version: 1.15.0
   version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: will_paginate
+  name: activemerchant
   prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -1876988247
+        hash: 1923831917
         segments: 
         - 3
         - 0
-        - pre2
+        - pre
+        - 2
         version: 3.0.pre2
-  type: :runtime
   version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: rails
+  name: will_paginate
   prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 21
         segments: 
         - 3
         - 0
-        - 7
-        version: 3.0.7
-  type: :runtime
+        - 9
+        version: 3.0.9
   version_requirements: *id014
-- !ruby/object:Gem::Dependency 
-  name: jquery-rails
+  name: rails
   prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -254,8 +254,9 @@ dependencies:
         - 2
         - 6
         version: 0.2.6
-  type: :runtime
   version_requirements: *id015
+  name: jquery-rails
+  prerelease: false
 description: Required dependancy for Spree
 email: sean@railsdog.com
 executables: []
@@ -1142,7 +1143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - none
 rubyforge_project: spree_core
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Core e-commerce functionality for the Spree project.