spree_core 1.1.0.rc1 → 1.1.0.rc2

data/app/models/spree/variant.rb

@@ -1,7 +1,9 @@
 module Spree
   class Variant < ActiveRecord::Base
     belongs_to :product
-    delegate_belongs_to :product, :name, :description, :permalink, :available_on, :tax_category_id, :shipping_category_id, :meta_description, :meta_keywords, :tax_category
+    delegate_belongs_to :product, :name, :description, :permalink, :available_on,
+                        :tax_category_id, :shipping_category_id, :meta_description,
+                        :meta_keywords, :tax_category
 
     attr_accessible :name, :presentation, :cost_price,
                     :position, :on_hand, :option_value_ids,
@@ -32,7 +34,7 @@ module Spree
 
     # Returns number of inventory units for this variant (new records haven't been saved to database, yet)
     def on_hand
-      Spree::Config[:track_inventory_levels] ? self.count_on_hand : (1.0/0) # Infinity
+      Spree::Config[:track_inventory_levels] ? count_on_hand : (1.0 / 0) # Infinity
     end
 
     # Adjusts the inventory units to match the given new level.
@@ -44,7 +46,7 @@ module Spree
         if new_level > on_hand
           # fill backordered orders before creating new units
           backordered_units = inventory_units.with_state('backordered')
-          backordered_units.slice(0, new_level).each &:fill_backorder
+          backordered_units.slice(0, new_level).each(&:fill_backorder)
           new_level -= backordered_units.length
         end
 
@@ -57,7 +59,7 @@ module Spree
     # strips all non-price-like characters from the price.
     def price=(price)
       if price.present?
-        self[:price] = price.to_s.gsub(/[^0-9\.-]/,'').to_f
+        self[:price] = price.to_s.gsub(/[^0-9\.-]/, '').to_f
       end
     end
 
@@ -74,24 +76,33 @@ module Spree
     alias in_stock in_stock?
 
     def self.additional_fields
+      ActiveSupport::Deprecation.warn("[SPREE] Spree::Variant.additional_fields will be deprecated in Spree 1.2. Please use Deface and decorators as an alternative to this functionality now.")
       @fields
     end
 
     def self.additional_fields=(new_fields)
+      ActiveSupport::Deprecation.warn("[SPREE] Spree::Variant.additional_fields= will be deprecated in Spree 1.2. Please use Deface and decorators as an alternative to this functionality now.")
+      attr_accessible *new_fields
       @fields = new_fields
     end
 
     # returns true if this variant is allowed to be placed on a new order
     def available?
-      Spree::Config[:track_inventory_levels] ? (Spree::Config[:allow_backorders] || self.in_stock?) : true
+      Spree::Config[:track_inventory_levels] ? (Spree::Config[:allow_backorders] || in_stock?) : true
     end
 
     def options_text
-      self.option_values.sort { |ov1, ov2| ov1.option_type.position <=> ov2.option_type.position }.map { |ov| "#{ov.option_type.presentation}: #{ov.presentation}" }.to_sentence({ :words_connector => ", ", :two_words_connector => ", " })
+      values = self.option_values.sort_by(&:position)
+
+      values.map! do |ov|
+        "#{ov.option_type.presentation}: #{ov.presentation}"
+      end
+
+      values.to_sentence({ :words_connector => ", ", :two_words_connector => ", " })
     end
 
     def gross_profit
-      self.cost_price.nil? ? 0 : (self.price - self.cost_price)
+      cost_price.nil? ? 0 : (price - cost_price)
     end
 
     # use deleted? rather than checking the attribute directly. this
@@ -104,7 +115,7 @@ module Spree
     private
       # Ensures a new variant takes the product master price when price is not supplied
       def check_price
-        if self.price.nil?
+        if price.nil?
           raise 'Must supply price for variant or master.price for product.' if self == product.master
           self.price = product.master.price
         end

data/app/models/spree/zone.rb

@@ -14,7 +14,7 @@ module Spree
     attr_accessible :name, :description, :default_tax, :kind, :zone_members, :zone_members_attributes
 
     def kind
-      member = self.members.last
+      member = members.last
 
       case member && member.zoneable_type
       when 'Spree::State' then 'state'
@@ -46,7 +46,7 @@ module Spree
     # Returns the matching zone with the highest priority zone type (State, Country, Zone.)
     # Returns nil in the case of no matches.
     def self.match(address)
-      return unless matches = self.order("created_at").select { |zone| zone.include? address }
+      return unless matches = self.order('created_at').select { |zone| zone.include? address }
 
       ['state', 'country'].each do |zone_kind|
         if match = matches.detect { |zone| zone_kind == zone.kind }
@@ -87,16 +87,16 @@ module Spree
     # Indicates whether the specified zone falls entirely within the zone performing
     # the check.
     def contains?(target)
-      return false if self.kind == "state" && target.kind == "country"
-      return false if self.zone_members.empty? || target.zone_members.empty?
+      return false if kind == 'state' && target.kind == 'country'
+      return false if zone_members.empty? || target.zone_members.empty?
 
-      if self.kind == target.kind
+      if kind == target.kind
         target.zoneables.each do |target_zoneable|
-          return false unless self.zoneables.include?(target_zoneable)
+          return false unless zoneables.include?(target_zoneable)
         end
       else
         target.zoneables.each do |target_state|
-          return false unless self.zoneables.include?(target_state.country)
+          return false unless zoneables.include?(target_state.country)
         end
       end
       true
@@ -105,15 +105,15 @@ module Spree
     private
       def remove_defunct_members
         zone_members.each do |zone_member|
-          zone_member.destroy if zone_member.zoneable_id.nil? || zone_member.zoneable_type != "Spree::#{self.kind.capitalize}"
+          zone_member.destroy if zone_member.zoneable_id.nil? || zone_member.zoneable_type != "Spree::#{kind.capitalize}"
         end
       end
 
       def remove_previous_default
-        return unless self.default_tax
+        return unless default_tax
 
         Zone.all.each do |zone|
-          zone.update_attribute "default_tax", false unless zone == self
+          zone.update_attribute 'default_tax', false unless zone == self
         end
       end
   end

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

@@ -17,7 +17,7 @@
   <tr data-hook="admin_products_index_headers">
     <th><%= t(:sku) %></th>
     <th><%= sort_link @search,:name, t(:name), { :default_order => "desc" }, {:title => 'admin_products_listing_name_title'} %></th>
-    <th><%= sort_link @search,:master_price, t(:master_price) %></th>
+    <th><%= sort_link @search,:master_price, t(:master_price), {}, {:title => 'admin_products_listing_price_title'} %></th>
     <th data-hook="admin_products_index_header_actions"></th>
   </tr>
 <% @collection.each do |product| %>

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

@@ -1,5 +1,5 @@
 <p>
-  <%= label controller.controller_name.singularize, field[:name], t('activerecord.attributes.variant.' + field[:name].downcase, :default => field[:name].titleize) %><br />
+  <%= label controller.controller_name.singularize, field[:name], t('activerecord.attributes.spree/variant.' + field[:name].downcase, :default => field[:name].titleize) %><br />
   <%= additional_field_for(controller, field) %>
   <%= error_message_on controller.controller_name.singularize, attribute_name_for(field[:name]) %>
 </p>

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

@@ -2,7 +2,6 @@
 <%= csrf_meta_tags %>
 <title><%= "Spree #{t('administration')}: " %>
 <%= t(controller.controller_name, :default => controller.controller_name.titleize) %></title>
-
 <%= javascript_tag do %>
   ajax_urls = <%== {
     :product_search_json       => spree.admin_products_url(:format => 'json'),

data/app/views/spree/admin/tax_rates/_form.html.erb

@@ -1,18 +1,18 @@
 <table data-hook="tax_rates">
   <tr data-hook="zone">
-    <td><%= t(:zone) %>:</td>
+    <td><%= f.label :zone, t(:zone) %></td>
     <td><%= f.collection_select(:zone_id, @available_zones, :id, :name) %></td>
   </tr>
   <tr data-hook="category">
-    <td><%= t(:tax_category) %>:</td>
+    <td><%= f.label :tax_category_id, t(:tax_category) %></td>
     <td><%= f.collection_select(:tax_category_id, @available_categories,:id, :name) %></td>
   </tr>
   <tr data-hook="included">
-    <td><%= t(:included_in_price) %></td>
+    <td><%= f.label :included_in_price, t(:included_in_price) %></td>
     <td><%= f.check_box :included_in_price %></td>
   </tr>
-  <tr="rate">
-    <td><%= t(:rate) %>:</td>
+  <tr data-hook="rate">
+    <td><%= f.label :amount, t(:rate) %></td>
     <td><%= f.text_field :amount %></td>
   </tr>
 </table>

data/app/views/spree/admin/variants/index.html.erb

@@ -8,7 +8,7 @@
     <th><%= t(:price) %></th>
     <th><%= t(:sku) %></th>
     <% Spree::Variant.additional_fields.select { |f| f[:only].nil? || f[:only].include?(:variant) }.each do |field| %>
-      <th><%= t('activerecord.attributes.variant.' + field[:name].downcase, :default => field[:name].titleize) %></th>
+      <th><%= t('activerecord.attributes.spree/variant.' + field[:name].downcase, :default => field[:name].titleize) %></th>
     <% end %>
     <th><%= t(:on_hand) %></th>
     <th><%= t(:action) %></th>

data/app/views/spree/layouts/spree_application.html.erb

@@ -66,4 +66,4 @@
 
   </body>
 
-</html>
+</html>

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

@@ -38,7 +38,7 @@
           <% if @product.has_stock? || Spree::Config[:allow_backorders] %>      
             <%= number_field_tag (@product.has_variants? ? :quantity : "variants[#{@product.master.id}]"),
               1, :class => 'title', :in => 1..@product.on_hand %>
-            <%= button_tag :class => 'large primary', :id => 'add-to-cart-button' do %>
+            <%= button_tag :class => 'large primary', :id => 'add-to-cart-button', :type => :submit do %>
               <%= t(:add_to_cart) %>
             <% end %>
           <% else %>

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

@@ -21,4 +21,4 @@
 <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
 <![endif]-->
 
-<%= yield :head %>
+<%= yield :head %>

data/config/locales/en.yml

@@ -24,9 +24,9 @@ en:
         city: City
         country: "Country"
         firstname: "First Name"
-        first_name_begins_with: "First Name Begins With"
+        first_name_start: "First Name Begins With"
         lastname: "Last Name"
-        last_name_begins_with: "Last Name Begins With"
+        last_name_start: "Last Name Begins With"
         phone: Phone
         state: "State"
         zipcode: "Zip Code"

data/db/migrate/20120315064358_migrate_images_from_products_to_variants.rb

@@ -18,7 +18,7 @@ class MigrateImagesFromProductsToVariants < ActiveRecord::Migration
     images = select_all("SELECT spree_assets.* FROM spree_assets
                          JOIN spree_variants
                          ON spree_variants.id = spree_assets.viewable_id
-                         AND spree_variants.is_master = #{quote_true}
+                         AND spree_variants.is_master = #{quoted_true}
                          WHERE spree_assets.type IN ('Spree::Image')
                          AND spree_assets.viewable_type = 'Spree::Variant'")
 

data/db/migrate/20120416233427_rename_attachment_size_to_attachment_file_size.rb

@@ -0,0 +1,5 @@
+class RenameAttachmentSizeToAttachmentFileSize < ActiveRecord::Migration
+  def change
+    rename_column :spree_assets, :attachment_size, :attachment_file_size
+  end
+end

data/lib/generators/spree/install/templates/app/assets/javascripts/admin/all.js

@@ -4,6 +4,8 @@
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
 // the compiled file.
 //
+//= require jquery
+//= require jquery_ujs
 <% if options[:lib_name] == 'spree' %>
 //= require admin/spree_core
 //= require admin/spree_auth

data/lib/generators/spree/install/templates/app/assets/javascripts/store/all.js

@@ -4,6 +4,8 @@
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
 // the compiled file.
 //
+//= require jquery
+//= require jquery_ujs
 <% if options[:lib_name] == 'spree' %>
 //= require store/spree_core
 //= require store/spree_auth

data/lib/spree/core/controller_helpers.rb

@@ -3,7 +3,6 @@ module Spree
     module ControllerHelpers
       def self.included(receiver)
         receiver.send :layout, :get_layout
-        receiver.send :helper, 'spree/hook'
         receiver.send :before_filter, 'instantiate_controller_and_action_names'
         receiver.send :before_filter, 'set_user_language'
 

data/lib/spree/core/engine.rb

@@ -71,7 +71,7 @@ module Spree
 
       # sets the manifests / assets to be precompiled
       initializer "spree.assets.precompile" do |app|
-        app.config.assets.precompile += ['store/all.*', 'admin/all.*', 'admin/orders/edit_form.js', 'admin/address_states.js', 'jqPlot/excanvas.min.js', 'admin/images/new.js', 'jquery.jstree/themes/apple/*']
+        Spree::Core::Engine.add_assets_to_precompile_list!(app)
       end
 
       initializer "spree.mail.settings" do |app|
@@ -80,6 +80,10 @@ module Spree
           Mail.register_interceptor(Spree::Core::MailInterceptor)
         end
       end
+
+      def self.add_assets_to_precompile_list!(app)
+        app.config.assets.precompile += ['store/all.*', 'admin/all.*', 'admin/orders/edit_form.js', 'admin/address_states.js', 'jqPlot/excanvas.min.js', 'admin/images/new.js', 'jquery.jstree/themes/apple/*']
+      end
     end
   end
 end

data/lib/spree/core/search/base.rb

@@ -11,7 +11,7 @@ module Spree
 
         def retrieve_products
           @products_scope = get_base_scope
-          curr_page = keywords ? 1 : page
+          curr_page = page || 1
 
           @products = @products_scope.includes([:master]).page(curr_page).per(per_page)
         end

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

@@ -0,0 +1,60 @@
+# Use this module to easily test Spree actions within Spree components
+# or inside your application to test routes for the mounted Spree engine.
+#
+# Inside your spec_helper.rb, include this module inside the RSpec.configure
+# block by doing this:
+#
+#   require 'spree/core/testing_support/controller_requests'
+#   RSpec.configure do |c|
+#     c.include Spree::Core::TestingSupport::ControllerRequests, :type => :controller
+#   end
+#
+# Then, in your controller tests, you can access spree routes like this:
+#
+#   require 'spec_helper'
+#
+#   describe Spree::ProductsController do
+#     it "can see all the products" do
+#       spree_get :index
+#     end
+#   end
+#
+# Use spree_get, spree_post, spree_put or spree_delete to make requests
+# to the Spree engine, and use regular get, post, put or delete to make
+# requests to your application.
+#
+module Spree
+  module Core
+    module TestingSupport
+      module ControllerRequests
+        def spree_get(action, parameters = nil, session = nil, flash = nil)
+          process_spree_action(action, parameters, session, flash, "GET")
+        end
+
+        # Executes a request simulating POST HTTP method and set/volley the response
+        def spree_post(action, parameters = nil, session = nil, flash = nil)
+          process_spree_action(action, parameters, session, flash, "POST")
+        end
+
+        # Executes a request simulating PUT HTTP method and set/volley the response
+        def spree_put(action, parameters = nil, session = nil, flash = nil)
+          process_spree_action(action, parameters, session, flash, "PUT")
+        end
+
+        # Executes a request simulating DELETE HTTP method and set/volley the response
+        def spree_delete(action, parameters = nil, session = nil, flash = nil)
+          process_spree_action(action, parameters, session, flash, "DELETE")
+        end
+
+        private
+
+        def process_spree_action(action, parameters = nil, session = nil, flash = nil, method = "GET")
+          parameters ||= {}
+          process(action, parameters.merge!(:use_route => :spree), session, flash, method)
+        end
+      end
+    end
+  end
+end
+
+

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

@@ -7,7 +7,6 @@ end
 require 'factory_girl'
 
 Dir["#{File.dirname(__FILE__)}/factories/**"].each do |f|
-  fp =  File.expand_path(f)
-  require fp
+  require File.expand_path(f)
 end
 

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "1.1.0.rc1"
+    "1.1.0.rc2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 1.1.0.rc1
+  version: 1.1.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-09 00:00:00.000000000 Z
+date: 2012-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70111187015640 !ruby/object:Gem::Requirement
+  requirement: &70210733556780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70111187015640
+  version_requirements: *70210733556780
 - !ruby/object:Gem::Dependency
   name: nested_set
-  requirement: &70111187015020 !ruby/object:Gem::Requirement
+  requirement: &70210733555720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 1.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *70111187015020
+  version_requirements: *70210733555720
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70111187014120 !ruby/object:Gem::Requirement
+  requirement: &70210733554680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70111187014120
+  version_requirements: *70210733554680
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70111187013620 !ruby/object:Gem::Requirement
+  requirement: &70210733553740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.11
   type: :runtime
   prerelease: false
-  version_requirements: *70111187013620
+  version_requirements: *70210733553740
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: &70111187013080 !ruby/object:Gem::Requirement
+  requirement: &70210733569000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,10 +65,10 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70111187013080
+  version_requirements: *70210733569000
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &70111187012380 !ruby/object:Gem::Requirement
+  requirement: &70210733568120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,21 +76,21 @@ dependencies:
         version: 1.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70111187012380
+  version_requirements: *70210733568120
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70111187011780 !ruby/object:Gem::Requirement
+  requirement: &70210733567180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '2.7'
   type: :runtime
   prerelease: false
-  version_requirements: *70111187011780
+  version_requirements: *70210733567180
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &70111187010620 !ruby/object:Gem::Requirement
+  requirement: &70210733565980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *70111187010620
+  version_requirements: *70210733565980
 - !ruby/object:Gem::Dependency
   name: ransack
-  requirement: &70111187009560 !ruby/object:Gem::Requirement
+  requirement: &70210733564060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,21 +109,21 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70111187009560
+  version_requirements: *70210733564060
 - !ruby/object:Gem::Dependency
   name: activemerchant
-  requirement: &70111187008720 !ruby/object:Gem::Requirement
+  requirement: &70210733562620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 1.20.1
+        version: 1.20.4
   type: :runtime
   prerelease: false
-  version_requirements: *70111187008720
+  version_requirements: *70210733562620
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70111187027200 !ruby/object:Gem::Requirement
+  requirement: &70210733576920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -134,10 +134,10 @@ dependencies:
         version: 3.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *70111187027200
+  version_requirements: *70210733576920
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70111187026120 !ruby/object:Gem::Requirement
+  requirement: &70210733575300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -145,10 +145,10 @@ dependencies:
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *70111187026120
+  version_requirements: *70210733575300
 - !ruby/object:Gem::Dependency
   name: deface
-  requirement: &70111187025480 !ruby/object:Gem::Requirement
+  requirement: &70210733573900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -156,10 +156,10 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70111187025480
+  version_requirements: *70210733573900
 - !ruby/object:Gem::Dependency
   name: stringex
-  requirement: &70111187024680 !ruby/object:Gem::Requirement
+  requirement: &70210733572420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -167,7 +167,7 @@ dependencies:
         version: 1.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70111187024680
+  version_requirements: *70210733572420
 description: Required dependency for Spree
 email: sean@spreecommerce.com
 executables: []
@@ -379,7 +379,6 @@ files:
 - app/helpers/spree/admin/zones_helper.rb
 - app/helpers/spree/base_helper.rb
 - app/helpers/spree/checkout_helper.rb
-- app/helpers/spree/hook_helper.rb
 - app/helpers/spree/orders_helper.rb
 - app/helpers/spree/products_helper.rb
 - app/helpers/spree/search_helper.rb
@@ -416,6 +415,7 @@ files:
 - app/models/spree/option_type.rb
 - app/models/spree/option_value.rb
 - app/models/spree/order.rb
+- app/models/spree/payment/processing.rb
 - app/models/spree/payment.rb
 - app/models/spree/payment_method/check.rb
 - app/models/spree/payment_method.rb
@@ -718,6 +718,7 @@ files:
 - lib/spree/core/ssl_requirement.rb
 - lib/spree/core/store_helpers.rb
 - lib/spree/core/testing_support/common_rake.rb
+- lib/spree/core/testing_support/controller_requests.rb
 - lib/spree/core/testing_support/env.rb
 - lib/spree/core/testing_support/factories/activator_factory.rb
 - lib/spree/core/testing_support/factories/address_factory.rb
@@ -866,6 +867,7 @@ files:
 - db/migrate/20120203001428_rename_state_events_to_state_changes.rb
 - db/migrate/20120203153759_add_deleted_at_to_tax_category.rb
 - db/migrate/20120315064358_migrate_images_from_products_to_variants.rb
+- db/migrate/20120416233427_rename_attachment_size_to_attachment_file_size.rb
 - db/sample/users.rb
 - db/seeds.rb
 - vendor/assets/images/datepicker/cal.gif

data/app/helpers/spree/hook_helper.rb

@@ -1,11 +0,0 @@
-module Spree
-  module HookHelper
-    # This method is deprecated, left in place
-    # to prevent views from breaking
-    def hook(hook_name, locals = {}, &block)
-      warn "[DEPRECATION] `hook` is deprecated"
-      content = block_given? ? capture(&block) : ''
-      content
-    end
-  end
-end