spree_frontend 3.0.0.rc1 → 3.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27ddec8bb47e07dad6aef735b0b2f8490a8abd56
-  data.tar.gz: c488a041981c0b4624925feffeeb75d84b7b1c99
+  metadata.gz: 21c4d3d6e5618eab61604b1b12a95fd8cdde9891
+  data.tar.gz: 148499f4d495b915912a7ce7cd5d41ef409a92ee
 SHA512:
-  metadata.gz: 39ab773f3d7bffa2287c021567583de9c020eff79449d7d9e2ba69dc0af774543c05dec32198e4200bdc87b5820e7f7b46a79942698dc465062d3fec397ddc8d
-  data.tar.gz: 27fbeb3df1cf2972dede8537ba8ec37f5811a45a9c6f01e833b770433d8c535dfd3cc41371276fadb13ac4cb898d07fa8be46a19214cf6a5dfb3747f190a1efb
+  metadata.gz: 65bcce2469d7125984737b17d7a5367df1bb15eb1bedac13856f42492429923d94377510a5475a1fcc457681badbf2dd5d65c03bd5743daaa1e193deaa5a9227
+  data.tar.gz: ea10c019574ae8d23cc7e5c58b42f87899cb8a64f311d00a84e20c40fecf3efac36d682a34aa7fd30a31657ec1268a32a17a25996c7ee1448600c7c150205fe0

data/app/controllers/spree/orders_controller.rb

@@ -81,7 +81,6 @@ module Spree
     end
 
     def check_authorization
-      cookies.permanent.signed[:guest_token] = params[:token] if params[:token]
       order = Spree::Order.find_by_number(params[:id]) || current_order
 
       if order

data/app/helpers/spree/frontend_helper.rb

@@ -10,7 +10,7 @@ module Spree
       separator = raw(separator)
       crumbs = [content_tag(:li, content_tag(:span, link_to(Spree.t(:home), spree.root_path, itemprop: "url") + separator, itemprop: "title"), itemscope: "itemscope", itemtype: "http://data-vocabulary.org/Breadcrumb")]
       if taxon
-        crumbs << content_tag(:li, content_tag(:span, link_to(Spree.t(:products), products_path, itemprop: "url") + separator, itemprop: "title"), itemscope: "itemscope", itemtype: "http://data-vocabulary.org/Breadcrumb")
+        crumbs << content_tag(:li, content_tag(:span, link_to(Spree.t(:products), spree.products_path, itemprop: "url") + separator, itemprop: "title"), itemscope: "itemscope", itemtype: "http://data-vocabulary.org/Breadcrumb")
         crumbs << taxon.ancestors.collect { |ancestor| content_tag(:li, content_tag(:span, link_to(ancestor.name , seo_url(ancestor), itemprop: "url") + separator, itemprop: "title"), itemscope: "itemscope", itemtype: "http://data-vocabulary.org/Breadcrumb") } unless taxon.ancestors.empty?
         crumbs << content_tag(:li, content_tag(:span, link_to(taxon.name , seo_url(taxon), itemprop: "url"), itemprop: "title"), class: 'active', itemscope: "itemscope", itemtype: "http://data-vocabulary.org/Breadcrumb")
       else

data/app/views/kaminari/twitter-bootstrap-3/_first_page.html.erb

@@ -7,7 +7,7 @@
     remote:        data-remote
 -%>
 <% unless current_page.first? %>
-<li class="first">
-  <%= link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, :remote => remote %>
-</li>
-<% end %>
+  <li class="first">
+    <%= link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, :remote => remote %>
+  </li>
+<% end %>

data/app/views/kaminari/twitter-bootstrap-3/_last_page.html.erb

@@ -7,7 +7,7 @@
     remote:        data-remote
 -%>
 <% unless current_page.last? %>
-<li class="last next"><%# "next" class present for border styling in twitter bootstrap %>
-  <%= link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, {:remote => remote} %>
-</li>
+  <li class="last next"><%# "next" class present for border styling in twitter bootstrap %>
+    <%= link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, {:remote => remote} %>
+  </li>
 <% end %>

data/app/views/kaminari/twitter-bootstrap-3/_next_page.html.erb

@@ -7,7 +7,7 @@
     remote:        data-remote
 -%>
 <% unless current_page.last? %>
-<li class="next_page">
-  <%= link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote %>
-</li>
+  <li class="next_page">
+    <%= link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote %>
+  </li>
 <% end %>

data/app/views/kaminari/twitter-bootstrap-3/_paginator.html.erb

@@ -6,19 +6,20 @@
     remote:        data-remote
     paginator:     the paginator that renders the pagination tags inside
 -%>
-<%- pagination_class ||= '' %>
-<%= paginator.render do -%>
-<ul class="pagination <%= pagination_class %>">
-  <%= first_page_tag unless current_page.first? %>
-  <%= prev_page_tag unless current_page.first? %>
-  <% each_page do |page| -%>
-    <% if page.left_outer? || page.right_outer? || page.inside_window? -%>
-      <%= page_tag page %>
-    <% elsif !page.was_truncated? -%>
-      <%= gap_tag %>
-    <% end -%>
-  <% end -%>
-  <%= next_page_tag unless current_page.last? %>
-  <%= last_page_tag unless current_page.last? %>
-</ul>
-<% end -%>
+<% pagination_class ||= '' %>
+
+<%= paginator.render do %>
+  <ul class="pagination <%= pagination_class %>">
+    <%= first_page_tag unless current_page.first? %>
+    <%= prev_page_tag unless current_page.first? %>
+    <% each_page do |page| %>
+      <% if page.left_outer? || page.right_outer? || page.inside_window? %>
+        <%= page_tag page %>
+      <% elsif !page.was_truncated? %>
+        <%= gap_tag %>
+      <% end %>
+    <% end %>
+    <%= next_page_tag unless current_page.last? %>
+    <%= last_page_tag unless current_page.last? %>
+  </ul>
+<% end %>

data/app/views/kaminari/twitter-bootstrap-3/_prev_page.html.erb

@@ -7,7 +7,7 @@
     remote:        data-remote
 -%>
 <% unless current_page.first? %>
-<li class="prev">
-  <%= link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote %>
-</li>
+  <li class="prev">
+    <%= link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote %>
+  </li>
 <% end %>

data/app/views/spree/address/_form.html.erb

@@ -1,4 +1,5 @@
 <% address_id = address_type.chars.first %>
+
 <div class="inner" data-hook=<%="#{address_type}_inner" %>>
   <p class="form-group" id=<%="#{address_id}firstname" %>>
     <%= form.label :firstname, Spree.t(:first_name) %><span class="required">*</span><br />
@@ -49,7 +50,7 @@
                             :disabled => have_states)
          ].join.gsub('"', "'").gsub("\n", "")
       %>
-      <%= javascript_tag do -%>
+      <%= javascript_tag do %>
         $('#<%="#{address_id}state" %>').append("<%== state_elements %>");
       <% end %>
     </p>

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

@@ -3,7 +3,7 @@
     <h3 class="panel-title"><%= Spree.t(:confirm) %></h3>
   </div>
   <div class="panel-body">
-	<%= render :partial => 'spree/shared/order_details', :locals => { :order => @order } %>
+    <%= render :partial => 'spree/shared/order_details', :locals => { :order => @order } %>
   </div>
 </div>
 

data/app/views/spree/checkout/_delivery.html.erb

@@ -5,7 +5,6 @@
   <div class="panel-body" data-hook="shipping_method_inner">
     <div id="methods">
       <%= form.fields_for :shipments do |ship_form| %>
-
         <div class="shipment">
           <h4 class="stock-location" data-hook="stock-location">
             <%= Spree.t(:package_from) %>
@@ -52,7 +51,6 @@
             <% end %>
           </ul>
         </div>
-
       <% end %>
 
       <% if @differentiator.try(:missing?) %>
@@ -86,7 +84,6 @@
           </table>
         </div>
       <% end %>
-
     </div>
     <% if Spree::Config[:shipping_instructions] %>
       <p id="minstrs" data-hook>

data/app/views/spree/checkout/_payment.html.erb

@@ -3,7 +3,6 @@
     <h3 class="panel-title"><%= Spree.t(:payment_information) %></h3>
   </div>
   <div class="panel-body" data-hook="checkout_payment_step">
-
     <% if @payment_sources.present? %>
       <div class="card_options">
         <%= radio_button_tag 'use_existing_card', 'yes', true %>
@@ -39,12 +38,12 @@
 
     <ul class="list-group" id="payment-method-fields" data-hook>
       <% @order.available_payment_methods.each do |method| %>
-      <li class="list-group-item">
-        <label>
-          <%= radio_button_tag "order[payments_attributes][][payment_method_id]", method.id, method == @order.available_payment_methods.first %>
-          <%= Spree.t(method.name, :scope => :payment_methods, :default => method.name) %>
-        </label>
-      </li>
+        <li class="list-group-item">
+          <label>
+            <%= radio_button_tag "order[payments_attributes][][payment_method_id]", method.id, method == @order.available_payment_methods.first %>
+            <%= Spree.t(method.name, :scope => :payment_methods, :default => method.name) %>
+          </label>
+        </li>
       <% end %>
     </ul>
 

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

@@ -1,6 +1,7 @@
 <% content_for :google_analytics do %>
   <%= render partial: 'spree/shared/google_checkout.js', locals: { order: @order, step_number: (@order.checkout_steps.index(@order.state) + 1) } %>
 <% end %>
+
 <div id="checkout" data-hook>
   <%= render partial: 'spree/shared/error_messages', locals: { target: @order } %>
 

data/app/views/spree/checkout/payment/_gateway.html.erb

@@ -31,5 +31,4 @@
   </div>
 
   <%= hidden_field_tag "#{param_prefix}[cc_type]", '', :id => "cc_type", :class => 'ccType' %>
-
 </div>

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

@@ -12,9 +12,7 @@
     <%= render partial: 'spree/shared/header' %>
 
     <div class="container">
-
       <div class="row" data-hook>
-
         <%= breadcrumbs(@taxon) %>
 
         <%= render partial: 'spree/shared/sidebar' if content_for? :sidebar %>

data/app/views/spree/orders/_line_item.html.erb

@@ -1,5 +1,6 @@
-<% variant = line_item.variant -%>
-<%= order_form.fields_for :line_items, line_item do |item_form| -%>
+<% variant = line_item.variant %>
+
+<%= order_form.fields_for :line_items, line_item do |item_form| %>
   <tr class="line-item">
     <td class="cart-item-image" data-hook="cart_item_image">
       <% if variant.images.length == 0 %>
@@ -33,4 +34,4 @@
       <%= link_to content_tag(:span, '', class: 'glyphicon glyphicon-minus-sign'), '#', class: 'delete', id: "delete_#{dom_id(line_item)}" %>
     </td>
   </tr>
-<% end -%>
+<% end %>

data/app/views/spree/orders/edit.html.erb

@@ -3,14 +3,11 @@
   <h1><%= Spree.t(:shopping_cart) %></h1>
 
   <% if @order.line_items.empty? %>
-
     <div data-hook="empty_cart">
       <div class="alert alert-info"><%= Spree.t(:your_cart_is_empty) %></div>
       <p><%= link_to Spree.t(:continue_shopping), products_path, class: 'btn btn-default' %></p>
     </div>
-
   <% else %>
-
     <div data-hook="outside_cart_form">
       <%= form_for @order, url: update_cart_path, html: { id: 'update-cart' } do |order_form| %>
         <div data-hook="inside_cart_form">

data/app/views/spree/orders/show.html.erb

@@ -3,6 +3,7 @@
     <%= render partial: 'spree/shared/google_purchase.js', locals: { order: @order } %>
   <% end %>
 <% end %>
+
 <fieldset id="order_summary" data-hook>
   <legend><%= Spree.t(:order_number, number: @order.number) %></legend>
   <h1><%= accurate_title %></h1>

data/app/views/spree/payments/_payment.html.erb

@@ -1,4 +1,5 @@
 <% source = payment.source %>
+
 <% if source.is_a?(Spree::CreditCard) %>
   <span class="cc-type">
     <% unless (cc_type = source.cc_type).blank? %>

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

@@ -1,6 +1,5 @@
 <%= form_for :order, :url => populate_orders_path do |f| %>
   <div class="row" id="inside-product-cart-form" data-hook="inside_product_cart_form" itemprop="offers" itemscope itemtype="http://schema.org/Offer">
-
     <% if @product.variants_and_option_values(current_currency).any? %>
       <div id="product-variants" class="col-md-6">
         <h3 class="product-section-title"><%= Spree.t(:variants) %></h3>
@@ -29,7 +28,6 @@
 
     <% if @product.price_in(current_currency) and !@product.price.nil? %>
       <div data-hook="product_price" class="col-md-5">
-
         <div id="product-price">
           <h6 class="product-section-title"><%= Spree.t(:price) %></h6>
           <div>
@@ -60,10 +58,10 @@
         </div>
       </div>
     <% else %>
-        <div id="product-price">
-          <br>
-          <div><span class="price selling" itemprop="price"><%= Spree.t('product_not_available_in_this_currency') %></span></div>
-        </div>
+      <div id="product-price">
+        <br>
+        <div><span class="price selling" itemprop="price"><%= Spree.t('product_not_available_in_this_currency') %></span></div>
+      </div>
     <% end %>
   </div>
 <% end %>

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

@@ -1,4 +1,5 @@
 <% promotions = @product.possible_promotions %>
+
 <% if promotions.any? %>
   <div id="promotions">
     <h3><%= Spree.t(:promotions) %></h3>
@@ -7,11 +8,11 @@
       <h4><%= promotion.name %></h4>
       <p><%= promotion.description %></p>
       <% if promotion.products.any? %>
-      <ul>
-        <% promotion.products.each do |product| %>
-          <li><%= link_to product.name, product_path(product) %></li>
-        <% end %>
-      </ul>
+        <ul>
+          <% promotion.products.each do |product| %>
+            <li><%= link_to product.name, product_path(product) %></li>
+          <% end %>
+        </ul>
       <% end %>
     </div>
     <% end %>

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

@@ -1,14 +1,12 @@
 <% if !@product.taxons.blank? %>
   <div id="taxon-crumbs" data-hook class=" five ">
     <h3 class="product-section-title"><%= Spree.t(:look_for_similar_items) %></h3>
-
     <div data-hook="product_taxons">
       <ul class="list-group" id="similar_items_by_taxon" data-hook>
-      <% @product.taxons.each do |taxon| %>
-        <li class="list-group-item"><%= link_to taxon.name, seo_url(taxon) %></li>
-      <% end %>
+        <% @product.taxons.each do |taxon| %>
+          <li class="list-group-item"><%= link_to taxon.name, seo_url(taxon) %></li>
+        <% end %>
       </ul>
     </div>
-
   </div>
 <% end %>

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

@@ -10,9 +10,7 @@
   <% end %>
 <% end %>
 
-
 <% if params[:keywords] %>
-
   <div data-hook="search_results">
     <% if @products.empty? %>
       <h6 class="search-results-title"><%= Spree.t(:no_products_found) %></h6>
@@ -20,9 +18,7 @@
       <%= render :partial => 'spree/shared/products', :locals => { :products => @products, :taxon => @taxon } %>
     <% end %>
   </div>
-
 <% else %>
-
   <div data-hook="homepage_products">
     <% cache(cache_key_for_products) do %>
       <%= render :partial => 'spree/shared/products', :locals => { :products => @products, :taxon => @taxon } %>

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

@@ -1,10 +1,9 @@
 <% @body_id = 'product-details' %>
+
 <% cache [I18n.locale, current_currency, @product] do %>
   <div data-hook="product_show" itemscope itemtype="http://schema.org/Product">
-
     <div class="col-md-4" data-hook="product_left_part">
       <div data-hook="product_left_part_wrap">
-
         <div id="product-images" data-hook="product_images">
           <div id="main-image" class="panel panel-default" data-hook>
             <div class="panel-body text-center">
@@ -23,15 +22,12 @@
         <div data-hook="promotions">
           <%= render :partial => 'promotions' %>
         </div>
-
       </div>
     </div>
 
     <div class="col-md-8" data-hook="product_right_part">
       <div data-hook="product_right_part_wrap">
-
         <div id="product-description" data-hook="product_description">
-
           <h1 class="product-title" itemprop="name"><%= @product.name %></h1>
 
           <div class="well" itemprop="description" data-hook="description">
@@ -41,13 +37,10 @@
           <div id="cart-form" data-hook="cart_form">
             <%= render :partial => 'cart_form' %>
           </div>
-
         </div>
 
         <%= render :partial => 'taxons' %>
-
       </div>
     </div>
-
   </div>
 <% end %>

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

@@ -3,9 +3,9 @@
     <h3><%= Spree.t(:errors_prohibited_this_record_from_being_saved, :count => target.errors.count) %>:</h3>
     <p><%= Spree.t(:there_were_problems_with_the_following_fields) %>:</p>
      <ul>
-     <% target.errors.full_messages.each do |msg| %>
-       <li><%= msg %></li>
-     <% end %>
+       <% target.errors.full_messages.each do |msg| %>
+         <li><%= msg %></li>
+       <% end %>
      </ul>
      <br/>
   </div>

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

@@ -1,4 +1,5 @@
 <% filters = @taxon ? @taxon.applicable_filters : [Spree::Core::ProductFilters.all_taxons] %>
+
 <% unless filters.empty? %>
   <%= form_tag '', :method => :get, :id => 'sidebar_products_search' do %>
     <%= hidden_field_tag 'per_page', params[:per_page] %>

data/app/views/spree/shared/_google_checkout.js.erb

@@ -6,5 +6,5 @@ ga('set', '&cu', '<%= current_currency %>');
 
 // Add the step number and additional info about the checkout to the action.
 ga('ec:setAction','checkout', {
-'step': <%= step_number %>
+  'step': <%= step_number %>
 });

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

@@ -1,5 +1,4 @@
 <div id="spree-header">
-
   <header id="header" data-hook>
     <div class="container">
       <div class="row">
@@ -13,5 +12,4 @@
   <div class="container">
     <%= render :partial => 'spree/shared/main_nav_bar' if store_menu? %>
   </div>
-
-</div>
+</div>

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

@@ -4,5 +4,4 @@
       <%= render :partial => 'spree/shared/search' %>
     </li>
   </ul>
-  
 </nav>

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

@@ -1,7 +1,5 @@
 <div class="row steps-data">
-
   <% if order.has_step?("address") %>
-
     <div class="col-md-3" data-hook="order-bill-address">
       <h4><%= Spree.t(:billing_address) %> <%= link_to "(#{Spree.t(:edit)})", checkout_state_path(:address) unless order.completed? %></h4>
       <%= render partial: 'spree/shared/address', locals: { address: order.bill_address } %>
@@ -36,7 +34,6 @@
       <% end %>
     </div>
   </div>
-
 </div>
 
 <hr />

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

@@ -16,33 +16,33 @@
     </div>
   <% elsif params.key?(:keywords) %>
     <div data-hook="products_search_results_heading_results_found">
-      <h6 class="search-results-title"><%= Spree.t(:search_results, :keywords => h(params[:keywords])) %></h6>
+      <h6 class="search-results-title"><%= Spree.t(:search_results, keywords: h(params[:keywords])) %></h6>
     </div>
   <% end %>
 </div>
 
 <% if products.any? %>
-<div id="products" class="row" data-hook>
-  <% products.each do |product| %>
-    <% url = product_url(product, taxon_id: @taxon.try(:id)) %>
-    <div id="product_<%= product.id %>" class="col-md-3 col-sm-6 product-list-item" data-hook="products_list_item" itemscope itemtype="http://schema.org/Product">
-      <div class="panel panel-default">
-        <% cache(@taxon.present? ? [I18n.locale, current_currency, @taxon, product] : [I18n.locale, current_currency, product]) do %>
-          <div class="panel-body text-center product-body">
-            <%= link_to small_image(product, itemprop: "image"), url, itemprop: 'url' %><br/>
-            <%= link_to truncate(product.name, length: 50), url, class: 'info', itemprop: "name", title: product.name %>
-          </div>
-          <div class="panel-footer text-center">
-            <span itemprop="offers" itemscope itemtype="http://schema.org/Offer">
-              <span class="price selling lead" itemprop="price"><%= display_price(product) %></span>
-            </span>
-          </div>
-        <% end %>
+  <div id="products" class="row" data-hook>
+    <% products.each do |product| %>
+      <% url = spree.product_url(product, taxon_id: @taxon.try(:id)) %>
+      <div id="product_<%= product.id %>" class="col-md-3 col-sm-6 product-list-item" data-hook="products_list_item" itemscope itemtype="http://schema.org/Product">
+        <div class="panel panel-default">
+          <% cache(@taxon.present? ? [I18n.locale, current_currency, @taxon, product] : [I18n.locale, current_currency, product]) do %>
+            <div class="panel-body text-center product-body">
+              <%= link_to small_image(product, itemprop: "image"), url, itemprop: 'url' %><br/>
+              <%= link_to truncate(product.name, length: 50), url, class: 'info', itemprop: "name", title: product.name %>
+            </div>
+            <div class="panel-footer text-center">
+              <span itemprop="offers" itemscope itemtype="http://schema.org/Offer">
+                <span class="price selling lead" itemprop="price"><%= display_price(product) %></span>
+              </span>
+            </div>
+          <% end %>
+        </div>
       </div>
-    </div>
-  <% end %>
-  <% reset_cycle("classes") %>
-</div>
+    <% end %>
+    <% reset_cycle("classes") %>
+  </div>
 <% end %>
 
 <% if paginated_products.respond_to?(:num_pages) %>

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

@@ -1,15 +1,16 @@
 <% @taxons = @taxon && @taxon.parent ? @taxon.parent.children : Spree::Taxon.roots %>
+
 <%= form_tag spree.products_path, :method => :get, class: "navbar-form" do %>
-<div class="form-group">
-  <% cache(cache_key_for_taxons) do %>
-    <%= select_tag :taxon,
-          options_for_select([[Spree.t(:all_departments), '']] +
-                                @taxons.map {|t| [t.name, t.id]},
-                                @taxon ? @taxon.id : params[:taxon]), 'aria-label' => 'Taxon', class: "form-control" %>
-  <% end %>
-</div>
-<div class="form-group">
-  <%= search_field_tag :keywords, params[:keywords], :placeholder => Spree.t(:search), class: "form-control" %>
-</div>
-<%= submit_tag Spree.t(:search), :name => nil, class: "btn btn-success" %>
+  <div class="form-group">
+    <% cache(cache_key_for_taxons) do %>
+      <%= select_tag :taxon,
+            options_for_select([[Spree.t(:all_departments), '']] +
+                                  @taxons.map {|t| [t.name, t.id]},
+                                  @taxon ? @taxon.id : params[:taxon]), 'aria-label' => 'Taxon', class: "form-control" %>
+    <% end %>
+  </div>
+  <div class="form-group">
+    <%= search_field_tag :keywords, params[:keywords], :placeholder => Spree.t(:search), class: "form-control" %>
+  </div>
+  <%= submit_tag Spree.t(:search), :name => nil, class: "btn btn-success" %>
 <% end %>

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

@@ -1,4 +1,5 @@
 <% shipments = order.shipments.trackable %>
+
 <% if shipments.any? %>
   <h6><%= Spree.t(:tracking) %></h6>
   <div class="tracking">

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

@@ -1,4 +1,5 @@
 <% max_level = Spree::Config[:max_level_in_taxons_menu] || 1 %>
+
 <nav id="taxonomies" class="sidebar-item" data-hook>
   <% @taxonomies.each do |taxonomy| %>
     <% cache [I18n.locale, taxonomy, max_level] do %>

data/config/routes.rb

@@ -17,7 +17,6 @@ Spree::Core::Engine.add_routes do
   end
 
   get '/orders/populate', :to => populate_redirect
-  get '/orders/:id/token/:token' => 'orders#show', :as => :token_order
 
   resources :orders, :except => [:index, :new, :create, :destroy] do
     post :populate, :on => :collection

data/spec/controllers/controller_extension_spec.rb

@@ -23,6 +23,15 @@ describe Spree::CustomController, :type => :controller do
     Spree::CustomController.clear_overrides!
   end
 
+  before do
+    @routes = ActionDispatch::Routing::RouteSet.new.tap do |r|
+      r.draw {
+        get 'index', to: 'spree/custom#index'
+        post 'create', to: 'spree/custom#create'
+      }
+    end
+  end
+
   context "extension testing" do
     context "index" do
       context "specify symbol for handler instead of Proc" do
@@ -37,6 +46,7 @@ describe Spree::CustomController, :type => :controller do
             end
           end
         end
+
         describe "GET" do
           it "has value success" do
             spree_get :index
@@ -53,6 +63,7 @@ describe Spree::CustomController, :type => :controller do
             respond_override({:index => {:html => {:failure => lambda { render(:text => 'failure!!!') }}}})
           end
         end
+
         describe "GET" do
           it "has value success" do
             spree_get :index
@@ -69,6 +80,7 @@ describe Spree::CustomController, :type => :controller do
             respond_override({:index => {:html => {:failure => lambda { render(:text => 'failure!!!') }}}})
           end
         end
+
         describe "GET" do
           it "has value success" do
             spree_get :index
@@ -101,6 +113,7 @@ describe Spree::CustomController, :type => :controller do
             respond_override({:index => {:html => {:success => lambda { render(:text => 'success!!!') }}}})
           end
         end
+
         describe "POST" do
           it "should not effect the wrong controller" do
             spree_get :index
@@ -108,8 +121,6 @@ describe Spree::CustomController, :type => :controller do
           end
         end
       end
-
     end
   end
-
 end

data/spec/controllers/spree/checkout_controller_spec.rb

@@ -318,7 +318,8 @@ describe Spree::CheckoutController, :type => :controller do
         it "due to no available shipping rates for any of the shipments" do
           expect(order.shipments.count).to eq(1)
           order.shipments.first.shipping_rates.delete_all
-          spree_put :update, :order => {}
+
+          spree_put :update, state: order.state, :order => {}
           expect(flash[:error]).to eq(Spree.t(:items_cannot_be_shipped))
           expect(response).to redirect_to(spree.checkout_state_path('address'))
         end
@@ -332,7 +333,7 @@ describe Spree::CheckoutController, :type => :controller do
         end
 
         it "due to the order having errors" do
-          spree_put :update, :order => {}
+          spree_put :update, state: order.state, :order => {}
           expect(flash[:error]).to eq("Base error\nAdjustments error")
           expect(response).to redirect_to(spree.checkout_state_path('address'))
         end
@@ -359,7 +360,7 @@ describe Spree::CheckoutController, :type => :controller do
 
       it "when GatewayError is raised" do
         allow_any_instance_of(Spree::Payment).to receive(:process!).and_raise(Spree::Core::GatewayError.new(Spree.t(:payment_processing_failed)))
-        spree_put :update, :order => {}
+        spree_put :update, state: order.state, :order => {}
         expect(flash[:error]).to eq(Spree.t(:payment_processing_failed))
       end
     end
@@ -403,7 +404,7 @@ describe Spree::CheckoutController, :type => :controller do
 
     it "doesn't set shipping address on the order" do
       expect(order).to_not receive(:ship_address=)
-      spree_post :update
+      spree_post :update, state: order.state
     end
 
     it "doesn't remove unshippable items before payment" do

data/spec/controllers/spree/orders_controller_ability_spec.rb

@@ -1,45 +1,40 @@
 require 'spec_helper'
 
 module Spree
-  describe OrdersController, :type => :controller do
-    ORDER_TOKEN = 'ORDER_TOKEN'
-
+  describe OrdersController, type: :controller do
     let(:user) { create(:user) }
     let(:guest_user) { create(:user) }
     let(:order) { Spree::Order.create }
 
-    it 'should understand order routes with token' do
-      expect(spree.token_order_path('R123456', 'ABCDEF')).to eq('/orders/R123456/token/ABCDEF')
-    end
-
     context 'when an order exists in the cookies.signed' do
       let(:token) { 'some_token' }
       let(:specified_order) { create(:order) }
 
       before do
-        allow(controller).to receive_messages :current_order => order
-        allow(controller).to receive_messages :spree_current_user => user
+        cookies.signed[:guest_token] = token
+        allow(controller).to receive_messages current_order: order
+        allow(controller).to receive_messages spree_current_user: user
       end
 
       context '#populate' do
         it 'should check if user is authorized for :edit' do
           expect(controller).to receive(:authorize!).with(:edit, order, token)
-          spree_post :populate, :token => token
+          spree_post :populate
         end
         it "should check against the specified order" do
           expect(controller).to receive(:authorize!).with(:edit, specified_order, token)
-          spree_post :populate, :id => specified_order.number, :token => token
+          spree_post :populate, id: specified_order.number
         end
       end
 
       context '#edit' do
         it 'should check if user is authorized for :edit' do
           expect(controller).to receive(:authorize!).with(:edit, order, token)
-          spree_get :edit, :token => token
+          spree_get :edit
         end
         it "should check against the specified order" do
           expect(controller).to receive(:authorize!).with(:edit, specified_order, token)
-          spree_get :edit, :id => specified_order.number, :token => token
+          spree_get :edit, id: specified_order.number
         end
       end
 
@@ -47,54 +42,51 @@ module Spree
         it 'should check if user is authorized for :edit' do
           allow(order).to receive :update_attributes
           expect(controller).to receive(:authorize!).with(:edit, order, token)
-          spree_post :update, :order => { :email => "foo@bar.com" }, :token => token
+          spree_post :update, order: { email: "foo@bar.com" }
         end
         it "should check against the specified order" do
           allow(order).to receive :update_attributes
           expect(controller).to receive(:authorize!).with(:edit, specified_order, token)
-          spree_post :update, :order => { :email => "foo@bar.com" }, :id => specified_order.number, :token => token
+          spree_post :update, order: { email: "foo@bar.com" }, id: specified_order.number
         end
       end
 
       context '#empty' do
         it 'should check if user is authorized for :edit' do
           expect(controller).to receive(:authorize!).with(:edit, order, token)
-          spree_post :empty, :token => token
+          spree_post :empty
         end
         it "should check against the specified order" do
           expect(controller).to receive(:authorize!).with(:edit, specified_order, token)
-          spree_post :empty, :id => specified_order.number, :token => token
+          spree_post :empty, id: specified_order.number
         end
       end
 
       context "#show" do
         it "should check against the specified order" do
           expect(controller).to receive(:authorize!).with(:edit, specified_order, token)
-          spree_get :show, :id => specified_order.number, :token => token
+          spree_get :show, id: specified_order.number
         end
       end
     end
 
     context 'when no authenticated user' do
-      let(:order) { create(:order, :number => 'R123') }
+      let(:order) { create(:order, number: 'R123') }
 
       context '#show' do
-        context 'when token parameter present' do
-          it 'always ooverride existing token when passing a new one' do
-            cookies.signed[:guest_token] = "soo wrong"
-            spree_get :show, { :id => 'R123', :token => order.guest_token }
-            expect(cookies.signed[:guest_token]).to eq(order.guest_token)
-          end
+        context 'when guest_token correct' do
+          before { cookies.signed[:guest_token] = order.guest_token }
 
-          it 'should store as guest_token in session' do
-            spree_get :show, {:id => 'R123', :token => order.guest_token }
-            expect(cookies.signed[:guest_token]).to eq(order.guest_token)
+          it 'displays the page' do
+            expect(controller).to receive(:authorize!).with(:edit, order, order.guest_token)
+            spree_get :show, { id: 'R123' }
+            expect(response.code).to eq('200')
           end
         end
 
-        context 'when no token present' do
+        context 'when guest_token not present' do
           it 'should respond with 404' do
-            spree_get :show, {:id => 'R123'}
+            spree_get :show, { id: 'R123'}
             expect(response.code).to eq('404')
           end
         end

data/spec/spec_helper.rb

@@ -108,7 +108,7 @@ RSpec.configure do |config|
 
   config.include Spree::TestingSupport::Preferences
   config.include Spree::TestingSupport::UrlHelpers
-  config.include Spree::TestingSupport::ControllerRequests
+  config.include Spree::TestingSupport::ControllerRequests, type: :controller
   config.include Spree::TestingSupport::Flash
 
   config.include Paperclip::Shoulda::Matchers

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_frontend
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc1
+  version: 3.0.0.rc3
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-04 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc1
+        version: 3.0.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc1
+        version: 3.0.0.rc3
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc1
+        version: 3.0.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc1
+        version: 3.0.0.rc3
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement