spree_core 0.60.6 → 0.70.0

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

@@ -1,54 +1,49 @@
 <%= form_for :order, :url => populate_orders_url do |f| %>
-<%= hook :inside_product_cart_form do %>
+  <div data-hook="inside_product_cart_form">
 
-  <% if product_price(@product) %>
-    <%= hook :product_price do %>
-      <p class="prices">
-        <%= t("price") %>
-        <br />
-        <span class="price selling"><%= product_price(@product) %></span>
-      </p>
+    <% if @product.price %>
+      <div data-hook="product_price">
+        <dl id="product-price">
+          <dt><%= t(:price) %></dt>
+          <dd><span class="price selling"><%= product_price(@product) %></span></dd>
+        </dl>
+      </div>
     <% end %>
-  <% end %>
 
-  <% if @product.has_variants? %>
-    <div id="product-variants">
-      <h2><%= t('variants') %></h2>
-      <ul>
-        <%  has_checked = false
-        @product.variants.active.each_with_index do |v,index|
-          next if v.option_values.empty? || (!v.in_stock && !Spree::Config[:show_zero_stock_products])
-          checked = !has_checked && (v.in_stock || Spree::Config[:allow_backorders])
-          has_checked = true if checked %>
-          <li>
-            <label>
+    <% if @product.has_variants? %>
+      <div id="product-variants">
+        <h2><%= t(:variants) %></h2>
+        <ul>
+          <% has_checked = false
+          @product.variants.active.each_with_index do |v,index|
+            next if v.option_values.empty? || (!v.in_stock && !Spree::Config[:show_zero_stock_products])
+            checked = !has_checked && (v.in_stock || Spree::Config[:allow_backorders])
+            has_checked = true if checked %>
+            <li>
               <%= radio_button_tag "products[#{@product.id}]", v.id, checked, :disabled => !v.in_stock && !Spree::Config[:allow_backorders] %>
-              <span class="variant-description">
-                <%= variant_options v %>
-              </span>
-              <% if variant_price_diff v %>
-                <span class="price diff"><%= variant_price_diff v %></span>
-              <% end %>
-            </label>
-          </li>
-        <% end%>
-      </ul>
-    </div>
-  <% end%>
-  <% if @product.has_stock? || Spree::Config[:allow_backorders] %>
-    <%= text_field_tag (@product.has_variants? ? :quantity : "variants[#{@product.master.id}]"),
-      1, :class => "title", :size => 3 %>
-    &nbsp;
-    <button type='submit' class='large primary'>
-      <%= image_tag('/images/add-to-cart.png') + t('add_to_cart') %>
-    </button>
-  <% else %>
-    <%= content_tag('strong', t('out_of_stock')) %>
-  <% end %>
-
-<% end %>
-<% end %>
+              <label for="<%= ['products', @product.id, v.id].join('_') %>">
+                <span class="variant-description">
+                  <%= variant_options v %>
+                </span>
+                <% if variant_price_diff v %>
+                  <span class="price diff"><%= variant_price_diff v %></span>
+                <% end %>
+              </label>
+            </li>
+          <% end%>
+        </ul>
+      </div>
+    <% end%>
+    <% if @product.has_stock? || Spree::Config[:allow_backorders] %>
+      <%= text_field_tag (@product.has_variants? ? :quantity : "variants[#{@product.master.id}]"),
+        1, :class => 'title', :size => 3 %>
+      &nbsp;
+      <%= button_tag :class => 'large primary', :id => 'add-to-cart-button' do %>
+        <%= image_tag('icons/add-to-cart.png') + t(:add_to_cart) %>
+      <% end %>
+    <% else %>
+      <%= content_tag('strong', t(:out_of_stock)) %>
+    <% end %>
 
-<% content_for :head do %>
-  <%= javascript_include_tag 'product' %>
+  </div>
 <% end %>

data/app/views/products/_properties.html.erb

@@ -1,8 +1,9 @@
 <% unless @product_properties.empty? %>
-<dl id="product-properties" class="table-display">
-<% for product_property in @product_properties %>
-  <dt><%= product_property.property.presentation %></dt>
-  <dd><%= product_property.value %></dd>
+<dl id="product-properties" class="table-display" data-hook>
+<% for product_property in @product_properties 
+    css_class = cycle('even', 'odd') %>
+  <dt class="<%= css_class %>"><%= product_property.property.presentation %></dt>
+  <dd class="<%= css_class %>"><%= product_property.value %></dd>
 <% end %>
 </dl>
 <% end %>

data/app/views/products/_taxons.html.erb

@@ -1,16 +1,14 @@
 <% if !@product.taxons.blank? %>
-<div id="taxon-crumbs">
-  <h3><%= t('look_for_similar_items') %></h3>
+  <div id="taxon-crumbs" data-hook>
+    <h3><%= t(:look_for_similar_items) %></h3>
 
-  <%= hook :product_taxons do %>
-  <div>
-    <ul id='similar_items_by_taxon'>
-    <% @product.taxons.each do |taxon| %>
-      <li><%= link_to taxon.name, "/t/#{taxon.permalink}" %></li>
-    <% end %>
-    </ul>
-  </div>
-  <% end %>
+    <div data-hook="product_taxons">
+      <ul id="similar_items_by_taxon" data-hook>
+      <% @product.taxons.each do |taxon| %>
+        <li><%= link_to taxon.name, seo_url(taxon) %></li>
+      <% end %>
+      </ul>
+    </div>
 
-</div>
+  </div>
 <% end %>

data/app/views/products/_thumbnails.html.erb

@@ -1,40 +1,19 @@
 <!-- no need for thumnails unless there is more then one image -->
 <% if product.images.size > 1 %>
-  <ul id="product-thumbnails" class="thumbnails">
-    <% product.images.each do |i| %>  
-      <li><%= link_to(image_tag(i.attachment.url(:mini)), i.attachment.url(:product)) %></li>
+  <ul id="product-thumbnails" class="thumbnails" data-hook>
+    <% product.images.each do |i| %>
+      <li class="tmb-all" id="tmb-<%= i.id.to_s %>"><%= link_to image_tag(i.attachment.url(:mini)), i.attachment.url(:product) %></li>
     <% end %>
+    <% if @product.has_variants?
+      @variants.each do |v|
+        if v.available?
+          v.images.each do |i| %>
+            <li class="vtmb-<%= v.id.to_s %> vtmb" id="tmb-<%= i.id.to_s %>"><%= link_to image_tag(i.attachment.url(:mini)), i.attachment.url(:product) %></li>
+          <%
+          end
+        end
+      end
+    end
+    %>
   </ul>
 <% end %>
-
-<% if @product.has_variants?
-  has_checked = false %>
-  <h4 id="variant-images">
-    <%= t('images_for') %>:
-    <span><%= @selected_variant.options_text %></span>
-  </h4>
-  <ul id="variant-thumbnails" class="thumbnails">
-    <% @variants.each do |v|
-        checked = !has_checked && (v.available?)
-        has_checked = true if checked
-        
-        if checked 
-          v.images.each do |i| %>  
-            <li><%= link_to(image_tag(i.attachment.url(:mini)), i.attachment.url(:product)) %></li>
-          <% end %>
-        <% end %>
-      <% end %>
-    </ul>
-<% end %>
-
-<% content_for :head do %>
-  <script type="text/javascript" charset="utf-8">
-    var images = new Array();
-    <% @variants.each do |v| %>
-      images[<%= v.id.to_s %>] = new Array();
-      <% v.images.each_with_index do |image, i| %>
-        images[<%= v.id.to_s %>][<%= i %>] = <%== link_to(image_tag(image.attachment.url(:mini)), image.attachment.url(:product)).to_json %>;
-      <% end %>
-    <% end %>
-  </script>
-<% end %>

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

@@ -1,30 +1,27 @@
 <% content_for :sidebar do %>
-  <%= hook :homepage_sidebar_navigation do %>
+  <div data-hook="homepage_sidebar_navigation">
     <% if "products" == @current_controller && @taxon %>
-      <%= render "shared/filters" %>
+      <%= render 'shared/filters' %>
     <% else %>
-      <%= render "shared/taxonomies" %>
+      <%= render 'shared/taxonomies' %>
     <% end %>
-  <% end %>
+  </div>
 <% end %>
 
 
 <% if params[:keywords] %>
 
-  <%= hook :search_results do %>
+  <div data-hook="search_results">
     <% if @products.empty? %>
       <%= t(:no_products_found) %>
     <% else %>
-      <%= render "shared/products", :products => @products, :taxon => @taxon %>
+      <%= render 'shared/products', :products => @products, :taxon => @taxon %>
     <% end %>
-  <% end %>
+  </div>
 
 <% else %>
 
-  <%= hook :homepage_products do %>
-    <%= render "shared/products", :products => @products, :taxon => @taxon %>
-  <% end %>
-
-
+  <div data-hook="homepage_products">
+    <%= render 'shared/products', :products => @products, :taxon => @taxon %>
+  </div>
 <% end %>
-

data/app/views/products/show.html.erb

@@ -1,31 +1,26 @@
-<% @body_id = 'product-details' %>
-<h1><%= accurate_title %></h1>
+<div data-hook="product_show">
+  <% @body_id = 'product-details' %>
+  <h1><%= accurate_title %></h1>
 
-<div id="product-images">
-  <%= hook :product_images do %>
-  <div id="main-image">
-    <%= render 'image' %>
+  <div id="product-images" data-hook="product_images">
+    <div id="main-image" data-hook>
+      <%= render 'image' %>
+    </div>
+    <div id="thumbnails" data-hook>
+      <%= render 'thumbnails', :product => @product %>
+    </div>
   </div>
-  <div id="thumbnails">
-    <%= render 'thumbnails', :product => @product %>
-  </div>
-  <% end %>
-</div>
-
-<div id="product-description">
-  <%= hook :product_description do %>
-    <%= product_description(@product) rescue t("product_has_no_description") %>
-  <% end %>
-  <%= hook :product_properties do %>
-    <%= render 'properties' %>
-  <% end %>
-</div>
 
-<%= hook :cart_form do %>
-  <div id="cart-form">
+  <div id="cart-form" data-hook="cart_form">
     <%= render 'cart_form' %>
   </div>
-<% end %>
 
-<%= render 'taxons' %>
+  <div id="product-description" data-hook="product_description">
+    <%= product_description(@product) rescue t(:product_has_no_description) %>
+    <div data-hook="product_properties">
+      <%= render 'properties' %>
+    </div>
+  </div>
+</div>
 
+<%= render 'taxons' %>

data/app/views/shared/_error_messages.html.erb

@@ -1,5 +1,5 @@
 <% if target && target.errors.any? %>
-  <div id="errorExplanation" class="errorExplanation">
+  <div id="errorExplanation" class="errorExplanation" data-hook>
     <h2><%= t(:errors_prohibited_this_record_from_being_saved, :count => target.errors.count) %>:</h2>
     <p><%= t(:there_were_problems_with_the_following_fields) %>:</p>
      <ul>

data/app/views/shared/_filters.html.erb

@@ -1,14 +1,13 @@
 <%= form_tag '', :method => :get, :id => 'sidebar_products_search' do  %>
   <% params[:search] ||= {} %>
-  <input type="hidden" name="per_page" value="<%= params[:per_page] %>"/>
-
+  <%= hidden_field_tag 'per_page', params[:per_page] %>
   <% filters = @taxon ? @taxon.applicable_filters : [ProductFilters.all_taxons] %>
   <% filters.each do |filter| %>
     <% labels = filter[:labels] || filter[:conds].map {|m,c| [m,m]} %>
     <% next if labels.empty? %>
-    <div class="navigation">
+    <div class="navigation" data-hook="navigation">
       <span class="category"> <%= filter[:name] %> </span>
-      <ul style="list-style-type:none; padding-left: 0px;" class="filter_choices">
+      <ul style="list-style-type:none; padding-left:0px;" class="filter_choices">
         <% labels.each do |nm,val| %>
           <% label = "#{filter[:name]}_#{nm}".gsub(/\s+/,'_') %>
           <li class="nowrap">

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

@@ -1,19 +1,19 @@
 <% if tracker = Tracker.current %>
 
-  <script type="text/javascript">
+  <%= javascript_tag do -%>
     var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
     document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-  </script>
+  <% end -%>
 
-  <script type="text/javascript">
+  <%= javascript_tag do -%>
     var pageTracker = _gat._getTracker("<%= tracker.analytics_id %>");
     pageTracker._initData();
     pageTracker._trackPageview();
-  </script>
+  <% end -%>
 
   <% if flash[:commerce_tracking] %>
 
-    <script type="text/javascript">
+    <%= javascript_tag do -%>
       // report e-commerce transaction information when applicable
       pageTracker._addTrans(
       "<%= @order.number %>",    //Order Number
@@ -30,7 +30,7 @@
           "" /*Product Category*/, "<%= line_item.price %>", "<%= line_item.quantity %>");
       <% end %>
       pageTracker._trackTrans();
-    </script>
+    <% end -%>
 
   <% end %>
 

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

@@ -1,10 +1,7 @@
 <title><%= title %></title>
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
 <%== meta_data_tags %>
-<%== stylesheet_tags %>
-<%= csrf_meta_tag %>
-<%= javascript_include_tag 'jquery-1.4.2.min', 'jquery.validate.min.js', 'rails', 'application', :cache => 'jquery-core' %>
-<% unless I18n.locale.to_s[0..1] == 'en' %>
-  <%= javascript_include_tag ['localization/messages_', I18n.locale.to_s[0..1], '.js'].join %>
-<% end %>
+<%= stylesheet_link_tag 'store/all', :media => 'screen' %>
+<%= csrf_meta_tags %>
+<%= javascript_include_tag 'store/all' %>
 <%= yield :head %>

data/app/views/shared/_nav_bar.html.erb

@@ -1,5 +1,6 @@
-<li><%= render 'shared/search' %></li>
-  <%= hook :shared_login_bar %>
+<li id="search-bar" data-hook>
+  <%= render 'shared/search' %>
+</li>
 <% if store_menu? %>
   <%= render 'shared/store_menu' %>
 <% end %>

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

@@ -1,50 +1,40 @@
-<table class="index">
-  <tbody id='line-items'>
-    <tr>
-      <%= hook :order_details_line_items_headers do %>
-        <th><%= t('item_description') %></th>
-        <th class="price"><%= t('price') %></th>
-        <th class="qty"><%= t('qty') %></th>
-        <th class="total"><span><%= t('total') %></span></th>
-      <% end %>
+<table class="index" data-hook="order_details">
+  <tbody id="line-items" data-hook>
+    <tr data-hook="order_details_line_items_headers">
+      <th><%= t(:item_description) %></th>
+      <th class="price"><%= t(:price) %></th>
+      <th class="qty"><%= t(:qty) %></th>
+      <th class="total"><span><%= t(:total) %></span></th>
     </tr>
 
     <% @order.line_items.each do |item| %>
-      <tr>
-        <%- locals = {:item => item} %>
-        <%= hook :order_details_line_item_row, locals do %>
-          <td width="300"><%=item.variant.product.name%> <%= "(" + variant_options(item.variant) + ")" unless item.variant .option_values.empty? %></td>
-          <td class="price"><%= number_to_currency item.price %></td>
-          <td class="qty"><%=item.quantity%></td>
-          <td class="total"><span><%= number_to_currency (item.price * item.quantity)%></span></td>
-        <% end %>
+      <tr data-hook="order_details_line_item_row">
+        <td width="300"><%= item.variant.product.name %> <%= "(" + variant_options(item.variant) + ")" unless item.variant .option_values.empty? %></td>
+        <td class="price"><%= number_to_currency item.price %></td>
+        <td class="qty"><%= item.quantity %></td>
+        <td class="total"><span><%= number_to_currency (item.price * item.quantity) %></span></td>
       </tr>
     <% end %>
   </tbody>
-  <%= hook :order_details_subtotal do %>
-    <tbody id='subtotal'>
-      <tr class="total" id="subtotal-row">
-        <td colspan="3"><b><%= t('subtotal') %>:</b></td>
-        <td class="total"><span><%= number_to_currency @order.item_total %></span></td>
-      </tr>
-    </tbody>
-  <% end %>
-  <%= hook :order_details_adjustments do %>
-    <tbody id="order-charges">
-      <% @order.adjustments.each do |adjustment| %>
-        <tr class="total">
-          <td colspan="3"><strong><%= adjustment.label %></strong></td>
-          <td class="total"><span><%= number_to_currency adjustment.amount %></span></td>
-        </tr>
-      <% end %>
-    </tbody>
-  <% end %>
-  <%= hook :order_details_total do %>
-    <tbody id='order-total'>
+  <tbody id="subtotal" data-hook="order_details_subtotal">
+    <tr class="total" id="subtotal-row">
+      <td colspan="3"><b><%= t(:subtotal) %>:</b></td>
+      <td class="total"><span><%= number_to_currency @order.item_total %></span></td>
+    </tr>
+  </tbody>
+  <tbody id="order-charges" data-hook="order_details_adjustments">
+    <% @order.adjustments.eligible.each do |adjustment| %>
+    <% next if (adjustment.originator_type == "TaxRate") and (adjustment.amount == 0) %>
       <tr class="total">
-        <td colspan="3"><b><%= t('order_total') %>:</b></td>
-        <td class="total"><span id="order_total"><%= number_to_currency @order.total %></span></td>
+        <td colspan="3"><strong><%= adjustment.label %></strong></td>
+        <td class="total"><span><%= number_to_currency adjustment.amount %></span></td>
       </tr>
-    </tbody>
-  <% end %>
+    <% end %>
+  </tbody>
+  <tbody id="order-total" data-hook="order_details_total">
+    <tr class="total">
+      <td colspan="3"><b><%= t(:order_total) %>:</b></td>
+      <td class="total"><span id="order_total"><%= number_to_currency @order.total %></span></td>
+    </tr>
+  </tbody>
 </table>

data/app/views/shared/_products.html.erb

@@ -7,31 +7,25 @@
 <% elsif params.key?(:keywords) %>
   <h3><%= t(:search_results, :keywords => h(params[:keywords])) %></h3>
 <% end %>
- 
+
 <% if products.any? %>
-<ul class="product-listing">
+<ul id="products" class="product-listing" data-hook>
   <% products.each do |product| %>
     <% if Spree::Config[:show_zero_stock_products] || product.has_stock? %>
-      <li id="product_<%= product.id %>">
-        <%= hook :products_list_item, {:product => product} do %>
-          <%= link_to small_image(product), product %>
-          <%= link_to raw(product.name + " <span class='price selling'>#{product_price(product)}</span>"), product, :class => 'info' %>
-        <% end %>
+      <li id="product_<%= product.id %>" data-hook="products_list_item">
+        <%= link_to product.name, product, :class => 'info' %>
+        <%= link_to small_image(product), product %>
+        <span class="price selling"><%= product_price(product) %></span>
       </li>
     <% end %>
   <% end %>
 </ul>
 <% end %>
- 
+
 <hr class="space" />
- 
-<% if paginated_products.respond_to?(:total_pages)
+
+<% if paginated_products.respond_to?(:num_pages)
       params.delete(:search)
       params.delete(:taxon)
-      
-%><%= will_paginate(paginated_products,
-                    :previous_label => "&#171; #{t('previous')}",
-                    :next_label => "#{t('next')} &#187;") %>
-<% end %>
- 
+%><%= paginate paginated_products %><% end %>
 <hr class="space" />

data/app/views/shared/_store_menu.html.erb

@@ -1,3 +1,3 @@
-<li><%= link_to t("home") , root_path %></li>
-<li class="cart-indicator"><%= link_to_cart %></li>
+<li id="home-link" data-hook><%= link_to t(:home), root_path %></li>
+<li id="link-to-cart" data-hook><%= link_to_cart %></li>
 

data/app/views/shared/_taxonomies.html.erb

@@ -1,17 +1,6 @@
-<div id="taxonomies" class="sidebar-item">
+<div id="taxonomies" class="sidebar-item" data-hook>
   <% get_taxonomies.each do |taxonomy| %>
-    <ul class="navigation-list">
-      <li<%== ' class="current"' if @taxon && @taxon == taxonomy.root %>>
-        <%= link_to t("shop_by_taxonomy", :taxonomy => taxonomy.name.singularize), seo_url(taxonomy.root),
-                                          :class => 'root' %>
-      </li>
-
-      <% taxonomy.root.children.each do |taxon| %>
-        <li<%== ' class="current"' if @taxon and ([@taxon] + @taxon.ancestors).include?(taxon) %>>
-          <%= link_to taxon.name, seo_url(taxon) %>
-        </li>
-	    <% end %>
-
-	  </ul>
+    <h3 class='taxonomy-root'><%= t(:shop_by_taxonomy, :taxonomy => taxonomy.name.singularize) %></h3>
+    <%= taxons_tree(taxonomy.root, @taxon, Spree::Config[:max_level_in_taxons_menu] || 1) %>
   <% end %>
 </div>

data/app/views/shipment_mailer/shipped_email.text.erb

@@ -5,8 +5,8 @@ Your order has been shipped
 ============================================================
 Shipment Summary
 ============================================================
-<% for item in @shipment.line_items %>
-<%=item.variant.sku %> <%=item.variant.product.name%> <%= variant_options(item.variant) %> (<%=item.quantity%>)
+<% @shipment.line_items.each do |item| %>
+  <%= item.variant.sku %> <%= item.variant.product.name %> <%= variant_options(item.variant) %> (<%= item.quantity %>)
 <% end %>
 ============================================================
 

data/app/views/taxons/_taxon.html.erb

@@ -1,4 +1,4 @@
-<div class="taxon">
+<div class="taxon" data-hook="taxon">
   <h2><%= link_to taxon.name, seo_url(taxon), :class => 'breadcrumbs' %></h2>
-  <%= render :partial => "shared/products", :locals => {:products => taxon_preview(taxon), :taxon => taxon} %>
+  <%= render :partial => 'shared/products', :locals => {:products => taxon_preview(taxon), :taxon => taxon} %>
 </div>

data/app/views/taxons/show.html.erb

@@ -1,19 +1,19 @@
 <h1><%= accurate_title %></h1>
 
 <% content_for :sidebar do %>
-  <%= hook :taxon_sidebar_navigation do %>
-    <%= render :partial => "shared/taxonomies" %>
-    <%= render(:partial => "shared/filters") if @taxon.children.empty? %>
-  <% end %>
+  <div data-hook="taxon_sidebar_navigation">
+    <%= render :partial => 'shared/taxonomies' %>
+    <%= render :partial => 'shared/filters' if @taxon.children.empty? %>
+  </div>
 <% end %>
 
 <% if @taxon.children.empty? || !params[:keywords].blank? %>
-  <%= hook :taxon_products do %>
-    <%= render :partial => "shared/products", :locals => {:products => @products, :taxon => @taxon } %>
-  <% end %>
+  <div data-hook="taxon_products">
+    <%= render :partial => 'shared/products', :locals => {:products => @products, :taxon => @taxon } %>
+  </div>
 <% else %>
-  <%= hook :taxon_children do %>
-    <%= render :partial => "taxon", :collection => @taxon.children %>
-  <% end %>
+  <div data-hook="taxon_children">
+    <%= render :partial => 'taxon', :collection => @taxon.children %>
+  </div>
 <% end %>
 

data/app/views/test_mailer/test_email.text.erb

@@ -0,0 +1,4 @@
+<%= t('test_mailer.test_email.greeting') %>
+================
+
+<%= t('test_mailer.test_email.message') %>

data/config/initializers/deprecation_checker.rb

@@ -0,0 +1,7 @@
+
+
+# check for incorect product assets path in public directory
+if File.exist?(Rails.root.join("public/assets/products")) ||  File.exist?(Rails.root.join("public/assets/taxons"))
+  puts %q{[DEPRECATION] Your applications public directory contains an assets/products and/or assets/taxons subdirectory. 
+    Run `rake spree:assets:relocate_images` to relocate the images.}
+end

data/config/initializers/form_builder.rb

@@ -9,10 +9,6 @@ class ActionView::Helpers::FormBuilder
   def error_message_on(method, options = {})
     @template.error_message_on(@object_name, method, objectify_options(options))
   end
-
-  def spree_date_picker(method, options = {}, html_options = {})
-    @template.spree_date_picker(@object_name, method, options, html_options)
-  end
 end
 
 ActionView::Base.field_error_proc = Proc.new{ |html_tag, instance| "<span class=\"field_with_errors\">#{html_tag}</span>".html_safe }

data/config/initializers/rails_3_1.rb

@@ -0,0 +1,12 @@
+module ActiveRecord
+  # = Active Record Named \Scopes
+  module NamedScope
+    module ClassMethods
+      protected
+
+      def valid_scope_name?(name)
+        respond_to?(name, true)
+      end
+    end
+  end
+end