spree_core 0.30.0 → 0.30.1

data/app/controllers/checkout_controller.rb

@@ -68,6 +68,7 @@ class CheckoutController < Spree::BaseController
   end
 
   def before_delivery
+    return if params[:order].present?
     @order.shipping_method ||= (@order.rate_hash.first && @order.rate_hash.first[:shipping_method])
   end
 

data/app/controllers/content_controller.rb

@@ -1,13 +1,22 @@
 class ContentController < Spree::BaseController
 
+  before_filter :render_404, :if => :static_asset
+
   rescue_from ActionView::MissingTemplate, :with => :render_404
   caches_page :show, :index, :if => Proc.new { Spree::Config[:cache_static_content] }
 
   def show
     render params[:path]
   end
-  
+
   def cvv
     render "cvv", :layout => false
-  end  
+  end
+
+  private
+  # Determines if the requested resource has a path similar to that of a static asset.  In this case do not go through the
+  # overhead of trying to render a template or whatever.
+  def static_asset
+    params[:path] =~ /^\/([^.]+)$/
+  end
 end

data/app/models/order.rb

@@ -145,6 +145,11 @@ class Order < ActiveRecord::Base
       :total => total
     })
 
+    #ensure checkout payment always matches order total
+    if payment and payment.checkout? and payment.amount != total
+      payment.update_attributes_without_callbacks(:amount => total)
+    end
+
     update_hooks.each { |hook| self.send hook }
   end
 
@@ -309,18 +314,13 @@ class Order < ActiveRecord::Base
   end
 
   def rate_hash
-    begin
-      @rate_hash ||= available_shipping_methods(:front_end).collect do |ship_method|
-        { :id => ship_method.id,
-          :shipping_method => ship_method,
-          :name => ship_method.name,
-          :cost => ship_method.calculator.compute(self)
-        }
-      end.sort_by{|r| r[:cost]}
-    rescue Spree::ShippingError => ship_error
-      flash[:error] = ship_error.to_s
-      []
-    end
+    @rate_hash ||= available_shipping_methods(:front_end).collect do |ship_method|
+      { :id => ship_method.id,
+        :shipping_method => ship_method,
+        :name => ship_method.name,
+        :cost => ship_method.calculator.compute(self)
+      }
+    end.sort_by{|r| r[:cost]}
   end
 
   def payment

data/app/models/return_authorization.rb

@@ -14,7 +14,7 @@ class ReturnAuthorization < ActiveRecord::Base
       transition :to => 'received', :from => 'authorized', :if => :allow_receive?
     end
     event :cancel do
-      transition :to => 'cancelled', :from => 'authorized'
+      transition :to => 'canceled', :from => 'authorized'
     end
   end
 

data/app/views/admin/option_types/_available.html.erb

@@ -10,7 +10,7 @@
     <td><%=ot.name %></td>
     <td><%=ot.presentation %></td>
     <td class="actions"><%= link_to icon('add') + ' ' + t("select"),
-                           url_for (:controller => "admin/option_types",
+                            url_for(:controller => "admin/option_types",
                                     :id => ot,
                                     :product_id => @product.permalink,
                                     :action => "select",
@@ -24,4 +24,4 @@
     <td colspan="3"><%= t('none_available') %></td>
   </tr>
   <% end %>
-</table>
+</table>

data/app/views/admin/shared/_product_tabs.html.erb

@@ -8,22 +8,22 @@
   <ul class="sidebar product-menu">
     <%= hook :admin_product_tabs, {:current => current} do %>
 
-      <li<%= ' class="active"' if current == "Product Details" %>>
+      <li<%= raw(' class="active"') if current == "Product Details" %>>
         <%= link_to t("product_details"), edit_admin_product_url(@product) %>
       </li>
-      <li<%= ' class="active"' if current == "Images" %>>
+      <li<%= raw(' class="active"') if current == "Images" %>>
         <%= link_to t("images"), admin_product_images_url(@product) %>
       </li>
-      <li<%= ' class="active"' if current == "Variants" %>>
+      <li<%= raw(' class="active"') if current == "Variants" %>>
         <%= link_to t("variants"),  admin_product_variants_url(@product)  %>
       </li>
-      <li<%= ' class="active"' if current == "Option Types" %>>
+      <li<%= raw(' class="active"') if current == "Option Types" %>>
         <%= link_to t("option_types"), selected_admin_product_option_types_url(@product) %>
       </li>
-      <li<%= ' class="active"' if current == "Product Properties" %>>
+      <li<%= raw(' class="active"') if current == "Product Properties" %>>
         <%= link_to t("product_properties"), admin_product_product_properties_url(@product) %>
       </li>
-      <li<%= ' class="active"' if current == "Taxons" %>>
+      <li<%= raw(' class="active"') if current == "Taxons" %>>
         <%= link_to t("taxons"), selected_admin_product_taxons_url(@product) %>
       </li>
 

data/config/routes.rb

@@ -188,6 +188,6 @@ Rails.application.routes.draw do
 
   # a catchall route for "static" content (except paths with explicit extensions: .html, .ico, etc)
   #if Spree::Config.instance && Spree::Config.get(:use_content_controller)
-    match '/*path' => 'content#show', :constraints => { :fullpath => /^\/([^.]+)$/ }
+    match '/*path' => 'content#show'
   #end
 end

data/db/migrate/20091016174634_change_preference_value_type.rb

@@ -1,9 +1,10 @@
 class ChangePreferenceValueType < ActiveRecord::Migration
   def self.up
-		change_column :preferences, :value, :text
+    remove_index :preferences, :name => 'index_preferences_on_owner_and_attribute_and_preference'
+    change_column :preferences, :value, :text
   end
 
   def self.down
-		change_column :preferences, :value, :string
+    change_column :preferences, :value, :string
   end
 end

data/db/migrate/20101111133551_renamed_rma_cancelled_state.rb

@@ -0,0 +1,10 @@
+class RenamedRmaCancelledState < ActiveRecord::Migration
+  def self.up
+    ReturnAuthorization.where(:state => 'cancelled').each do |rma|
+      rma.update_attribute_without_callbacks(:state, 'canceled')
+    end
+  end
+
+  def self.down
+  end
+end

data/db/migrate/20101117031806_fix_problematic_index_names.rb

@@ -0,0 +1,13 @@
+class FixProblematicIndexNames < ActiveRecord::Migration
+  def self.up
+    begin
+      remove_index("preferences", "index_preferences_on_owner_and_attribute_and_preference")
+    rescue ArgumentError
+      # ignore - already remove then
+    end
+    add_index "preferences", ["owner_id", "owner_type", "name", "group_id", "group_type"], :name => "ix_prefs_on_owner_attr_pref", :unique => true
+  end
+
+  def self.down
+  end
+end

data/lib/spree_core.rb

@@ -65,7 +65,7 @@ end
 
 module Spree
   def self.version
-    "0.30.0"
+    "0.30.1"
   end
 end
 

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: spree_core
 version: !ruby/object:Gem::Version 
-  hash: 103
   prerelease: false
   segments: 
   - 0
   - 30
-  - 0
-  version: 0.30.0
+  - 1
+  version: 0.30.1
 platform: ruby
 authors: 
 - Sean Schofield
@@ -15,18 +14,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-09 00:00:00 -05:00
+date: 2010-11-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: acts_as_list
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
         segments: 
         - 0
         - 1
@@ -38,11 +35,9 @@ dependencies:
   name: rd_awesome_nested_set
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 1
         - 4
@@ -54,11 +49,9 @@ dependencies:
   name: rd_unobtrusive_date_picker
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
         segments: 
         - 0
         - 1
@@ -70,11 +63,9 @@ dependencies:
   name: highline
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
         segments: 
         - 1
         - 5
@@ -86,11 +77,9 @@ dependencies:
   name: stringex
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 17
         segments: 
         - 1
         - 0
@@ -102,11 +91,9 @@ dependencies:
   name: state_machine
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 51
         segments: 
         - 0
         - 9
@@ -118,11 +105,9 @@ dependencies:
   name: faker
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 17
         segments: 
         - 0
         - 3
@@ -134,11 +119,9 @@ dependencies:
   name: paperclip
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 113
         segments: 
         - 2
         - 3
@@ -151,11 +134,9 @@ dependencies:
   name: rd_resource_controller
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -165,11 +146,9 @@ dependencies:
   name: rd_searchlogic
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 977940604
         segments: 
         - 3
         - 0
@@ -182,11 +161,9 @@ dependencies:
   name: activemerchant
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
         segments: 
         - 1
         - 7
@@ -198,11 +175,9 @@ dependencies:
   name: will_paginate
   prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 961915916
         segments: 
         - 3
         - 0
@@ -214,11 +189,9 @@ dependencies:
   name: rails
   prerelease: false
   requirement: &id013 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
         segments: 
         - 3
         - 0
@@ -230,11 +203,9 @@ dependencies:
   name: jquery-rails
   prerelease: false
   requirement: &id014 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 0
         - 2
@@ -748,7 +719,6 @@ files:
 - db/migrate/20100820135707_response_code_and_avs_response_for_payments.rb
 - db/migrate/20100901171814_change_guest_flag_to_anonymous.rb
 - db/migrate/20100903203949_email_for_orders.rb
-- db/migrate/20100908170204_remove_unique_index_on_users_email.rb
 - db/migrate/20100923162011_create_mail_methods.rb
 - db/migrate/20100929151905_rename_frozen_to_locked.rb
 - db/migrate/20101008190536_move_special_instructions_to_orders.rb
@@ -765,6 +735,8 @@ files:
 - db/migrate/20101026192225_cleanup_legacy_tables.rb
 - db/migrate/20101028151745_remove_number_and_cvv_from_credicard.rb
 - db/migrate/20101103212716_drop_anonymous_field_for_user.rb
+- db/migrate/20101111133551_renamed_rma_cancelled_state.rb
+- db/migrate/20101117031806_fix_problematic_index_names.rb
 - db/sample/users.rb
 - db/seeds.rb
 - public/images/add-to-cart.png
@@ -1070,29 +1042,25 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 57
       segments: 
       - 1
       - 8
       - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: 
 - none
 rubyforge_project: spree_core
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Core e-commerce functionality for the Spree project.

data/db/migrate/20100908170204_remove_unique_index_on_users_email.rb

@@ -1,9 +0,0 @@
-class RemoveUniqueIndexOnUsersEmail < ActiveRecord::Migration
-  def self.up
-    remove_index :users, :email
-  end
-
-  def self.down
-    add_index :users, :email, :unique => true
-  end
-end