spree_frontend 2.0.0.rc1

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

@@ -0,0 +1,5 @@
+<header id="header" class="row" data-hook>
+  <figure id="logo" class="columns six" data-hook><%= logo %></figure>
+  <%= render :partial => 'spree/shared/nav_bar' %>
+  <%= render :partial => 'spree/shared/main_nav_bar' if store_menu? %>
+</header>

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

@@ -0,0 +1,6 @@
+<nav class="columns sixteen">
+  <ul id="main-nav-bar" class="inline" data-hook>
+    <li id="home-link" data-hook><%= link_to Spree.t(:home), spree.root_path %></li>
+    <li id="link-to-cart" data-hook><%= link_to_cart %></li>
+  </ul>
+</nav>

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

@@ -0,0 +1,7 @@
+<nav id="top-nav-bar" class="columns ten">
+  <ul id="nav-bar" class="inline" data-hook>
+    <li id="search-bar" data-hook>
+      <%= render :partial => 'spree/shared/search' %>
+    </li>
+  </ul>
+</nav>

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

@@ -0,0 +1,110 @@
+<div class="row steps-data">
+
+  <% if order.has_step?("address") %>
+    <div class="columns alpha four" data-hook="order-ship-address">
+      <h6><%= Spree.t(:shipping_address) %> <%= link_to "(#{Spree.t(:edit)})", checkout_state_path(:address) unless @order.completed? %></h6>
+      <%= render :partial => 'spree/shared/address', :locals => { :address => order.ship_address } %>
+    </div>
+
+    <div class="columns alpha four" data-hook="order-bill-address">
+      <h6><%= Spree.t(:billing_address) %> <%= link_to "(#{Spree.t(:edit)})", checkout_state_path(:address) unless @order.completed? %></h6>
+      <%= render :partial => 'spree/shared/address', :locals => { :address => order.bill_address } %>
+    </div>
+
+    <% if @order.has_step?("delivery") %>
+      <div class="columns alpha four">
+        <h6><%= Spree.t(:shipments) %> <%= link_to "(#{Spree.t(:edit)})", checkout_state_path(:delivery) unless @order.completed? %></h6>
+        <div class="delivery">
+          <% order.shipments.each do |shipment| %>
+            <%= shipment.stock_location.name %>
+            <%= shipment.shipping_method.name %>
+            <br/>
+          <% end %>
+        </div>
+        <%= render(:partial => 'spree/shared/shipment_tracking', :locals => {:order => @order}) if @order.shipped? %>
+      </div>
+    <% end %>
+  <% end %>
+
+  <div class="columns omega four">
+    <h6><%= Spree.t(:payment_information) %> <%= link_to "(#{Spree.t(:edit)})", checkout_state_path(:payment) unless @order.completed? %></h6>
+    <div class="payment-info">
+      <% order.payments.valid.each do |payment| %>
+        <%= render payment%><br/>
+      <% end %>
+    </div>
+  </div>
+
+</div>
+
+<hr />
+
+<table id='line-items' class="index columns alpha omega sixteen" data-hook="order_details">
+  <col width="15%" valign="middle" halign="center">
+  <col width="70%" valign="middle">
+  <col width="5%" valign="middle" halign="center">
+  <col width="5%" valign="middle" halign="center">
+  <col width="5%" valign="middle" halign="center">
+
+  <thead data-hook>
+    <tr data-hook="order_details_line_items_headers">
+      <th colspan="2"><%= Spree.t(:item) %></th>
+      <th class="price"><%= Spree.t(:price) %></th>
+      <th class="qty"><%= Spree.t(:qty) %></th>
+      <th class="total"><span><%= Spree.t(:total) %></span></th>
+    </tr>
+  </thead>
+
+  <tbody data-hook>
+    <% @order.line_items.each do |item| %>
+      <tr data-hook="order_details_line_item_row">
+        <td data-hook="order_item_image">
+          <% if item.variant.images.length == 0 %>
+            <%= link_to small_image(item.variant.product), item.variant.product %>
+          <% else %>
+            <%= link_to image_tag(item.variant.images.first.attachment.url(:small)), item.variant.product %>
+          <% end %>
+        </td>
+        <td data-hook="order_item_description">
+          <h4><%= item.variant.product.name %></h4>
+          <%= truncated_product_description(item.variant.product) %>
+          <%= "(" + item.variant.options_text + ")" unless item.variant.option_values.empty? %>
+        </td>
+        <td data-hook="order_item_price" class="price"><span><%= item.single_money.to_html %></span></td>
+        <td data-hook="order_item_qty"><%= item.quantity %></td>
+        <td data-hook="order_item_total" class="total"><span><%= item.display_amount.to_html %></span></td>
+      </tr>
+    <% end %>
+  </tbody>
+  <tfoot id="order-total" data-hook="order_details_total">
+    <tr class="total">
+      <td colspan="4"><b><%= Spree.t(:order_total) %>:</b></td>
+      <td class="total"><span id="order_total"><%= @order.display_total.to_html %></span></td>
+    </tr>
+  </tfoot>
+  <% if order.price_adjustment_totals.present? %>
+    <tfoot id="price-adjustments" data-hook="order_details_price_adjustments">
+      <% @order.price_adjustment_totals.each do |key, total| %>
+        <tr class="total">
+          <td colspan="4"><strong><%= key %></strong></td>
+          <td class="total"><span><%= total %></span></td>
+        </tr>
+      <% end %>
+    </tfoot>
+  <% end %>
+  <tfoot id="subtotal" data-hook="order_details_subtotal">
+    <tr class="total" id="subtotal-row">
+      <td colspan="4"><b><%= Spree.t(:subtotal) %>:</b></td>
+      <td class="total"><span><%= @order.display_item_total.to_html %></span></td>
+    </tr>
+  </tfoot>
+  <tfoot id="order-charges" data-hook="order_details_adjustments">
+    <% @order.adjustments.eligible.each do |adjustment| %>
+    <% next if (adjustment.originator_type == 'Spree::TaxRate') and (adjustment.amount == 0) %>
+      <tr class="total">
+        <td colspan="4"><strong><%= adjustment.label %></strong></td>
+        <td class="total"><span><%= adjustment.display_amount.to_html %></span></td>
+      </tr>
+    <% end %>
+  </tfoot>
+</table>

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

@@ -0,0 +1,28 @@
+<%
+  paginated_products = @searcher.retrieve_products if params.key?(:keywords)
+  paginated_products ||= products
+%>
+<% if products.empty? %>
+  <%= Spree.t(:no_products_found) %>
+<% elsif params.key?(:keywords) %>
+  <h6 class="search-results-title"><%= Spree.t(:search_results, :keywords => h(params[:keywords])) %></h6>
+<% end %>
+
+<% if products.any? %>
+<ul id="products" class="inline product-listing" data-hook>
+  <% products.each do |product| %>
+    <li id="product_<%= product.id %>" class="columns three <%= cycle("alpha", "secondary", "", "omega secondary", :name => "classes") %>" data-hook="products_list_item" itemscope itemtype="http://schema.org/Product">
+      <div class="product-image">
+        <%= link_to small_image(product, :itemprop => "image"), product, :itemprop => 'url' %>
+      </div>
+      <%= link_to truncate(product.name, :length => 50), product, :class => 'info', :itemprop => "name", :title => product.name %>
+      <span class="price selling" itemprop="price"><%= display_price(product) %></span>
+    </li>
+  <% end %>
+  <% reset_cycle("classes") %>
+</ul>
+<% end %>
+
+<% if paginated_products.respond_to?(:num_pages) %>
+  <%= paginate paginated_products %>
+<% end %>

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

@@ -0,0 +1,9 @@
+<% @taxons = @taxon && @taxon.parent ? @taxon.parent.children : Spree::Taxon.roots %>
+<%= form_tag spree.products_path, :method => :get do %>
+  <%= select_tag :taxon,
+        options_for_select([[Spree.t(:all_departments), '']] +
+                              @taxons.map {|t| [t.name, t.id]},
+                            @taxon ? @taxon.id : params[:taxon]) %>
+  <%= search_field_tag :keywords, params[:keywords], :placeholder => Spree.t(:search) %>
+  <%= submit_tag Spree.t(:search), :name => nil %>
+<% end %>

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

@@ -0,0 +1,9 @@
+<% shipments = order.shipments.trackable %>
+<% if shipments.any? %>
+  <h6><%= Spree.t(:tracking) %></h6>
+  <div class="tracking">
+    <% shipments.each do |shipment| %>
+      <%= link_to_tracking(shipment) %>
+    <% end %>
+  </div>
+<% end %>

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

@@ -0,0 +1,3 @@
+<aside id="sidebar" class="columns four" data-hook>
+  <%= yield :sidebar %>
+</aside>

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

@@ -0,0 +1,6 @@
+<nav id="taxonomies" class="sidebar-item" data-hook>
+  <% get_taxonomies.each do |taxonomy| %>
+    <h6 class='taxonomy-root'><%= Spree.t(:shop_by_taxonomy, :taxonomy => taxonomy.name) %></h6>
+    <%= taxons_tree(taxonomy.root, @taxon, Spree::Config[:max_level_in_taxons_menu] || 1) %>
+  <% end %>
+</nav>

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

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

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

@@ -0,0 +1,19 @@
+<h1 class="taxon-title"><%= @taxon.name %></h1>
+
+<% content_for :sidebar do %>
+  <div data-hook="taxon_sidebar_navigation">
+    <%= render :partial => 'spree/shared/taxonomies' %>
+    <%= render :partial => 'spree/shared/filters' if @taxon.children.empty? %>
+  </div>
+<% end %>
+
+<div data-hook="taxon_products">
+  <%= render :partial => 'spree/shared/products', :locals => { :products => @products, :taxon => @taxon } %>
+</div>
+
+<% unless params[:keywords].present? %>
+  <div data-hook="taxon_children">
+    <%= render :partial => 'taxon', :collection => @taxon.children %>
+  </div>
+<% end %>
+

data/config/initializers/check_for_orphaned_preferences.rb

@@ -0,0 +1,9 @@
+begin
+  required_column_names = ["owner_id", "owner_type", "name"]     
+  if (Spree::Preference.column_names & required_column_names) == required_column_names
+     ActiveRecord::Base.connection.execute("SELECT owner_id, owner_type, name, value FROM spree_preferences WHERE 'key' IS NULL").each do |pref|
+       warn "[WARNING] Orphaned preference `#{pref[2]}` with value `#{pref[3]}` for #{pref[1]} with id of: #{pref[0]}, you should reset the preference value manually."
+     end
+  end
+rescue
+end

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/rails_5868.rb

@@ -0,0 +1,8 @@
+# Temporary fix for
+# NoMethodError: undefined method `gsub' for #<Arel::Nodes::Ascending:...>
+# See https://github.com/rails/rails/issues/5868
+class Arel::Nodes::Ordering
+  def gsub(*a, &b)
+    to_sql.gsub(*a, &b)
+  end
+end

data/config/initializers/spree.rb

@@ -0,0 +1,6 @@
+require 'mail'
+
+# Spree Configuration
+SESSION_KEY = '_spree_session_id'
+
+LIKE = ActiveRecord::Base.connection.adapter_name == 'PostgreSQL' ? 'ILIKE' : 'LIKE'

data/config/routes.rb

@@ -0,0 +1,39 @@
+Spree::Core::Engine.routes.draw do
+
+  root :to => 'home#index'
+
+  resources :products
+
+  match '/locale/set', :to => 'locale#set'
+
+  resources :states, :only => :index
+  resources :countries, :only => :index
+
+  # non-restful checkout stuff
+  put '/checkout/update/:state', :to => 'checkout#update', :as => :update_checkout
+  get '/checkout/:state', :to => 'checkout#edit', :as => :checkout_state
+  get '/checkout', :to => 'checkout#edit' , :as => :checkout
+
+  populate_redirect = redirect do |params, request|
+    request.flash[:error] = Spree.t(:populate_get_error)
+    request.referer || '/cart'
+  end
+
+  get '/orders/populate', :via => :get, :to => populate_redirect
+  match '/orders/:id/token/:token' => 'orders#show', :via => :get, :as => :token_order
+
+  resources :orders do
+    post :populate, :on => :collection
+  end
+
+  get '/cart', :to => 'orders#edit', :as => :cart
+  put '/cart', :to => 'orders#update', :as => :update_cart
+  put '/cart/empty', :to => 'orders#empty', :as => :empty_cart
+
+  # route globbing for pretty nested taxon and product paths
+  match '/t/*id', :to => 'taxons#show', :as => :nested_taxons
+
+  match '/unauthorized', :to => 'home#unauthorized', :as => :unauthorized
+  match '/content/cvv', :to => 'content#cvv', :as => :cvv
+  match '/content/*path', :to => 'content#show', :via => :get, :as => :content
+end

data/lib/spree/frontend.rb

@@ -0,0 +1,22 @@
+require 'rails/all'
+require 'rails/generators'
+require 'jquery-rails'
+require 'deface'
+require 'select2-rails'
+
+require 'spree/core'
+
+require 'spree/core/mail_settings'
+require 'spree/core/mail_interceptor'
+
+require 'spree/responder'
+require 'spree/frontend/middleware/seo_assist'
+
+require 'spree/frontend/engine'
+
+if defined?(ActionView)
+  require 'awesome_nested_set/helper'
+  ActionView::Base.class_eval do
+    include CollectiveIdea::Acts::NestedSet::Helper
+  end
+end

data/lib/spree/frontend/engine.rb

@@ -0,0 +1,19 @@
+module Spree
+  module Frontend
+    class Engine < ::Rails::Engine
+      config.middleware.use "Spree::Frontend::Middleware::SeoAssist"
+
+      # sets the manifests / assets to be precompiled, even when initialize_on_precompile is false
+      initializer "spree.assets.precompile", :group => :all do |app|
+        app.config.assets.precompile += %w[
+          store/all.*
+        ]
+      end
+
+      initializer "spree.frontend.environment", :before => :load_config_initializers do |app|
+        Spree::Frontend::Config = Spree::FrontendConfiguration.new
+      end
+
+    end
+  end
+end

data/lib/spree/frontend/middleware/seo_assist.rb

@@ -0,0 +1,51 @@
+# Make redirects for SEO needs
+module Spree
+  module Frontend
+    module Middleware
+      class SeoAssist
+        def initialize(app)
+          @app = app
+        end
+
+        def call(env)
+          request = Rack::Request.new(env)
+          params = request.params
+
+          taxon_id = params['taxon']
+
+          #redirect requests using taxon id's to their permalinks
+          if !taxon_id.blank? && !taxon_id.is_a?(Hash) && taxon = Taxon.find(taxon_id)
+            params.delete('taxon')
+
+            return build_response(params, "#{request.script_name}t/#{taxon.permalink}" )
+          elsif env["PATH_INFO"] =~ /^\/(t|products)(\/\S+)?\/$/
+            #ensures no trailing / for taxon and product urls
+
+            return build_response(params, env["PATH_INFO"][0...-1])
+          end
+
+          @app.call(env)
+        end
+
+        private
+
+        def build_response(params, location)
+          query = build_query(params)
+          location += '?' + query unless query.blank?
+          [301, { 'Location'=> location }, []]
+        end
+
+        def build_query(params)
+          params.map { |k, v|
+            if v.class == Array
+              build_query(v.map { |x| ["#{k}[]", x] })
+            else
+              k + "=" + Rack::Utils.escape(v)
+            end
+          }.join("&")
+        end
+
+      end
+    end
+  end
+end

data/lib/spree/frontend/preference_rescue.rb

@@ -0,0 +1,25 @@
+module Spree
+  class OldPrefs < ActiveRecord::Base
+    self.table_name = "spree_preferences"
+    belongs_to  :owner, :polymorphic => true
+    attr_accessor :owner_klass
+  end
+
+  class PreferenceRescue
+    def self.try
+      OldPrefs.where(:key => nil).each do |old_pref|
+        next unless owner = (old_pref.owner rescue nil)
+        unless old_pref.owner_type == "Spree::Activator" || old_pref.owner_type == "Spree::Configuration"
+          begin
+            old_pref.key = [owner.class.name, old_pref.name, owner.id].join('::').underscore
+            old_pref.value_type = owner.preference_type(old_pref.name)
+            puts "Migrating Preference: #{old_pref.key}"
+            old_pref.save
+          rescue NoMethodError => ex
+            puts ex.message
+          end
+        end
+      end
+    end
+  end
+end

data/lib/spree/scopes/dynamic.rb

@@ -0,0 +1,33 @@
+module Spree
+  module Scopes
+    # This module is extended by ProductScope
+    module Dynamic
+      module_function
+
+      # Sample dynamic scope generating from set of products
+      # generates 0 or (2..scope_limit) scopes for prices, based
+      # on number of products (uses Math.log, to guess number of scopes)
+      def price_scopes_for(products, scope_limit=5)
+        scopes = []
+
+        # Price based scopes
+        all_prices = products.map(&:price).sort
+
+        ranges = [Math.log(products.length).floor, scope_limit].max
+
+        if ranges >= 2
+          l = all_prices.length / ranges
+          scopes << ProductScope.new({:name => "master_price_lte", :arguments => [all_prices[l]] })
+
+          (ranges - 2).times do |x|
+            scopes << ProductScope.new({:name => "price_between",
+                                        :arguments => [ all_prices[l*(x+1)+1], all_prices[l*(x+2)] ] })
+          end
+          scopes << ProductScope.new({:name => "master_price_gte", :arguments => [all_prices[l*(ranges-1)+1]] })
+        end
+
+        scopes
+      end
+    end
+  end
+end