spree 0.8.5 → 0.9.0

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

@@ -1,20 +1,46 @@
 <!-- no need for thumnails unless there is more then one image -->
 <% if product.images.size > 1 %>
-  <ul id="product-thumbnails">
+  <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>
     <% end %>
+  </ul>
 <% end %>
 
+<% if @product.has_variants? 
+  has_checked = false %>
+  <h4 id="variant-images"><%= t('images_for') %>: <%= @selected_variant.options_text %></h4>
+  <ul id="variant-thumbnails" class="thumbnails">
+    <% product.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">
-    jQuery(document).ready(function($){
+ 
+    var images = new Array();
+    <% product.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 %>] = '<%= image.attachment.url(:mini) %>';
+      <% end %>
+    <% end %>
+ 
+    var add_image_handlers = function(){
       $("#main-image").data('selectedThumb', $('#main-image img').attr('src'));
-      $('ul#product-thumbnails li').eq(0).addClass('selected');
-      $('ul#product-thumbnails li a').click(function() {
+      $('ul.thumbnails li').eq(0).addClass('selected');
+      $('ul.thumbnails li a').click(function() {
         $("#main-image").data('selectedThumb', $(this).attr('href'));
-        $('ul#product-thumbnails li').removeClass('selected');
+        $('ul.thumbnails li').removeClass('selected');
         $(this).parent('li').addClass('selected');
         return false;
       }).hover(
@@ -25,6 +51,8 @@
           $('#main-image img').attr('src', $("#main-image").data('selectedThumb'));
         }
       );
-    });
+    };
+ 
+    jQuery(document).ready(function(){ add_image_handlers(); });
   </script>
 <% end %>

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

@@ -1,7 +1,11 @@
 <% content_for :sidebar do %>
-	<%= render :partial => "shared/taxonomies" %>
+  <% if "products" == @current_controller && @taxon %>
+    <%= render :partial => "shared/filters" %>
+  <% else %>
+    <%= render :partial => "shared/taxonomies" %>
+  <% end %>
 <% end %>
 
 <%= render :partial => "shared/products.html.erb", :locals => {:products => @products, :taxon => @taxon } %>
 
-<%= page_links(:prev => "&#171; #{t('previous')}", :next => "#{t('next')} &#187;") if @search.page_count > 1 %>
+<%= will_paginate(:prev => "&#171; #{t('previous')}", :next => "#{t('next')} &#187;") %>

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

@@ -12,7 +12,7 @@
 </div>
 
 <div id="product-description">
-  <%= product_description(@product) %>
+  <%= product_description(@product) rescue t("product_has_no_description") %>
 
   <%= render 'properties' %>
 </div>

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

@@ -1 +1 @@
-<%= submit_tag t("update") %> or <%= link_to t("cancel"), collection_url %>
+<%= submit_tag t("update") %> <%= t("or") %> <%= link_to t("cancel"), collection_url %>

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

@@ -0,0 +1,52 @@
+<% if @taxon.parent 
+     siblings = @taxon.parent.children 
+   else
+     siblings = Taxonomy.all.map &:root
+   end
+%>
+  
+<div id="taxonomies" class="sidebar-item">
+  <ul class="navigation-list">
+  <% siblings.each do |s| %>
+    <li<%= ' class="current"' if s == @taxon %>>
+      <% if s.parent %>
+        <%= link_to s.name, url_for(:taxon => s.id) %>
+      <% else %>
+        <%= link_to t("shop_by_taxonomy", :taxonomy => s.taxonomy.name.singularize), url_for(:taxon => s.id), :class => 'root' %>
+      <% end %>
+    </li>
+  <% end %>
+  </ul>
+</div>
+
+<% form_for @search do |f| %>
+  <% params[:search] ||= {} %>
+  <input type="hidden" name="taxon"    value="<%= @taxon.id %>"/>
+  <input type="hidden" name="per_page" value="<%= 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">
+      <span class="category"> <%= filter[:name] %> </span>
+      <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">
+            <%# had problems with the following, so am hard-coding it %>
+            <%# f.check_box "taxons_id_equals_any[]", {}, taxon.id %>
+            <input type="checkbox" 
+                   id="<%= label %>" 
+                   name="search[<%= filter[:scope].to_s %>][]" 
+                   value="<%= val %>"
+                   <%= params[:search][filter[:scope]] && params[:search][filter[:scope]].include?(val.to_s) ? "checked" : "" %> 
+                   onclick="this.form.submit();"
+            />
+            <label class="nowrap" for="<%= label %>"> <%= nm %> </label>
+          </li>
+        <% end %>
+      </ul>
+    </div>
+  <% end %>
+<% end %>

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

@@ -1,7 +1,7 @@
 <div id="footer">
   <div class="left">
     <p>
-      Powered by <a href="http://spreecommerce.com/">Spree</a>
+      <%= t("powered_by") %> <a href="http://spreecommerce.com/">Spree</a>
     </p>
   </div>
   <div class="right">

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

@@ -0,0 +1,6 @@
+<title><%= title %></title>
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<%= stylesheet_tags %>
+<%= javascript_include_tag 'jquery-1.3.2.min', 'jquery.validate.min.js', :cache => 'jquery-and-plugins' %>
+<%= meta_data_tags %> 
+<%= yield :head %>

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

@@ -10,9 +10,9 @@
   <p>
   	<label>
       <%= check_box :user_session, :remember_me %>
-      <%= label :user_session, :remember_me, t ('remember_me') %>
+      <%= label :user_session, :remember_me, t('remember_me') %>
 	  </label>
 	</p>
   <p><%= submit_tag t("log_in"), :class => 'button primary'%></p>
 
-<% end %>
+<% end %>

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

@@ -1 +1 @@
-<%= submit_tag t("actions.create") %> or <%= link_to t("actions.cancel"), collection_url %>
+<%= submit_tag t("actions.create") %> <%= t("or") %> <%= link_to t("actions.cancel"), collection_url %>

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

@@ -1,36 +1,46 @@
-<table class="order-summary">
-  <tr>
-    <th><%= t('item_description') %></th>
-    <th class="price"><%= t('price') %></th>
-    <th class="qty"><%= t('qty') %></th>
-    <th class="total_display"><span><%= t('total') %></span></th>
-  </tr>
-  <% @order.line_items.each do |item| %>
-  <tr >
-    <td width="300"><%=item.variant.product.name-%> <%= "(" + variant_options(item.variant) + ")" unless item.variant .option_values.empty? %></td>
-    <td valign="top"><%= number_to_currency item.price -%></td>
-    <td valign="top"><%=item.quantity-%></td>
-    <td valign="top" class="total_display"><span><%= number_to_currency (item.price * item.quantity)-%></span></td>
-  </tr>
-  <% end %>      
-  <tr id="subtotal-row">
-    <td colspan="3"><b><%= t('subtotal') %>:</b></td>
-    <td class="total_display"><span><%= number_to_currency @order.item_total -%></span></td>
-  </tr>
-  <tr>
-    <td colspan="3"><b><%= t('tax') %>:</b></td>
-    <td class="total_display"><span id="tax_amount"><%= number_to_currency @order.tax_amount -%></span></td>
-  </tr>
-  <tr>
-    <td colspan="3"><b><%= t('shipping') %>:</b> 
-      <% if @order.shipment && @order.shipment.shipping_method %>
-        <span id="ship_method">(<%= @order.shipment.shipping_method.name %>)</span>
-      <% end %>
-    </td>
-    <td class="total_display"><span id="ship_amount"><%= number_to_currency @order.ship_amount -%></span></td>
-  </tr>
-  <tr>
-    <td colspan="3"><b><%= t('order_total') %>:</b></td>
-    <td class="total_display"><span id="order_total"><%= number_to_currency @order.total -%></span></td>
-  </tr>
-</table>
+<table class="index">
+  <tbody id='line-items'>
+    <tr>
+      <th><%= t('item_description') %></th>
+      <th class="price"><%= t('price') %></th>
+      <th class="qty"><%= t('qty') %></th>
+      <th class="total_display"><span><%= t('total') %></span></th>
+    </tr>
+    <% @order.line_items.each do |item| %>
+      <tr >
+        <td width="300"><%=item.variant.product.name-%> <%= "(" + variant_options(item.variant) + ")" unless item.variant .option_values.empty? %></td>
+        <td valign="top"><%= number_to_currency item.price -%></td>
+        <td valign="top"><%=item.quantity-%></td>
+        <td valign="top" class="total_display"><span><%= number_to_currency (item.price * item.quantity)-%></span></td>
+      </tr>
+    <% end %>      
+  </tbody>
+  <tbody id='subtotal'>
+    <tr class="total" id="subtotal-row">
+      <td colspan="3"><b><%= t('subtotal') %>:</b></td>
+      <td class="total_display"><span><%= number_to_currency @order.item_total -%></span></td>
+    </tr>
+  </tbody>
+  <tbody id="order-charges">
+    <% order.charges.each do |charge| %>
+      <tr class="total">
+        <td colspan="3"><strong><%= charge.description %></strong></td>
+        <td class="total_display"><span><%= number_to_currency charge.amount -%></span></td>
+      </tr>
+    <% end %>
+  </tbody>
+  <tbody id="order-credits">
+    <% order.credits.each do |credit| %>
+      <tr class="total">
+        <td colspan="3"><%= credit.description %></td>
+        <td class="total_display"><span><%= number_to_currency credit.amount -%></span></td>
+      </tr>
+    <% end %>
+  </tbody>
+  <tbody id='order-total'>
+    <tr class="total">
+      <td colspan="3"><b><%= t('order_total') %>:</b></td>
+      <td class="total_display"><span id="order_total"><%= number_to_currency @order.total -%></span></td>
+    </tr>
+  </tbody>
+</table>

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

@@ -1,11 +1,10 @@
 <div id="taxonomies" class="sidebar-item">
 <% @taxonomies.each do |taxonomy| %>
-	<h3><%= t("shop_by_taxonomy", :taxonomy => taxonomy.name.singularize) %></h3>
-	<ul class="navigation-list">
-	<% 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 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>
 <% end %>
 </div>

data/app/views/states/index.js.erb

@@ -1 +1 @@
-<%= @state_info.to_json %> 
+state_mapper = <%= @state_info.to_json %>

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

@@ -2,7 +2,7 @@
 
 <% if @taxon.children.empty? %>
   <%= render :partial => "shared/products.html.erb", :locals => {:products => @products, :taxon => @taxon } %>
-  <%= page_links(:prev => "&#171; #{t('previous')}", :next => "#{t('next')} &#187;") if @search.page_count > 1 %>
+  <%= will_paginate @products, :prev => "&#171; #{t('previous')}", :next => "#{t('next')} &#187;" %> 
 <% else %>
   <%= render :partial => "taxon", :collection => @taxon.children %>
 <% end %>

data/bin/spree

@@ -15,12 +15,52 @@ if ARGV.any? { |arg| %w(--version -v).any? { |flag| arg == flag } }
   exit 0
 end
 
-app_path = ARGV.first
-
 # configuration must be set or we get uninitialized class variable @@configuration (introduced w/rails 2.1)
 require 'spree/initializer'
 Rails.configuration = Spree::Configuration.new
 
+#  Upddate will replace certain javascript, stylesheet assets, etc. but the replaced files are preserved with a ~ suffix.
+require 'spree/file_utilz'
+if ARGV.any? { |arg| %w(--update -u).any? { |flag| arg == flag } }
+  puts "Updating to Spree #{Spree::Version} ..."
+  APP_ROOT = Dir.pwd
+
+  # remove defunct file
+  sl = "#{APP_ROOT}/config/initializers/searchlogic.rb"; File.rename(sl, sl + '~') if File.exist?(sl)
+
+  # move session_store to new place in site initializer
+  site_extension_dir = "#{APP_ROOT}/vendor/extensions/site/"
+  session_store_file = "config/initializers/session_store.rb"
+  if File.exist?(site_extension_dir) && File.exist?("#{APP_ROOT}/#{session_store_file}")
+    FileUtils.mkdir(site_extension_dir + "/config") rescue ''
+    FileUtils.mkdir(site_extension_dir + "/config/initializers") rescue ''
+    File.rename("#{APP_ROOT}/#{session_store_file}", "#{site_extension_dir}/#{session_store_file}")
+  end
+
+  # copy the "infrastructure" files 
+  items = [ "/public/javascripts", 
+            "/public/stylesheets", 
+            "/public/images", 
+            "/config/initializers", 
+            "/config/environments", 
+            "/config/environment.rb", 
+            "/config/spree_permissions.yml", 
+            "/config/boot.rb" ]
+  items.each do |item|
+    Spree::FileUtilz.mirror_with_backup(SPREE_ROOT + item, APP_ROOT + item)
+  end
+
+  # discard copied session_store
+  if File.exist?(site_extension_dir)
+    FileUtils.rm("#{APP_ROOT}/#{session_store_file}")
+  end
+
+  puts "Finished."
+  exit 0
+end
+
+app_path = ARGV.first
+
 require 'rails_generator'
 require 'rails_generator/scripts/generate'
 
@@ -36,6 +76,7 @@ class Rails::Generator::Base
     opt.separator 'Spree Info:'
     opt.on('-v', '--version', 'Show the Spree version number and quit.')
     opt.on('-h', '--help', 'Show this help message and quit.') { |v| options[:help] = v }
+    opt.on('-u', '--update', 'Update an existing Spree project to the newest gem version.')    
 
     opt.separator ''
     opt.separator 'General Options:'

data/config/boot.rb

@@ -48,14 +48,14 @@ module Spree
     end
     
     def rubygems_version
-      Gem::RubyGemsVersion if defined? Gem::RubyGemsVersion
+      Gem::RubyGemsVersion.nil? ? '0.0' : Gem::RubyGemsVersion
     end
   end
 
   class Boot 
     include Spree::RubyGemsLoader
     def run
-      load_rails("2.3.2")  # note: spree requires this specific version of rails (change at your own risk)
+      load_rails("2.3.4")  # note: spree requires this specific version of rails (change at your own risk)
       load_initializer
       Spree::Initializer.run(:set_load_path)
     end

data/config/environment.rb

@@ -5,7 +5,7 @@
 # ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-SPREE_GEM_VERSION = '0.8.5' unless defined? SPREE_GEM_VERSION
+SPREE_GEM_VERSION = '0.9.0' unless defined? SPREE_GEM_VERSION
           
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
@@ -31,10 +31,16 @@ Spree::Initializer.run do |config|
   config.gem "activemerchant", :lib => "active_merchant", :version => '>=1.4.1'
   config.gem "tlsmail", :version => '0.0.1'
   config.gem 'activerecord-tableless', :lib => 'tableless', :version => '>=0.1.0'
-  config.gem 'haml-edge', :lib=> 'haml', :version => "2.1.3"
-  config.gem 'chriseppstein-compass', :lib => 'compass', :source => "http://gems.github.com", :version => '0.6.6'
+  config.gem 'haml-edge', :lib=> 'haml', :version => ">=2.1.37"
+  config.gem 'chriseppstein-compass', :lib => 'compass', :source => "http://gems.github.com", :version => '0.6.15'
   config.gem 'calendar_date_select', :version => '1.15'    
-  config.gem 'searchlogic', :version => '1.6.6'
+  config.gem 'rsl-stringex', :lib => 'stringex', :source => "http://gems.github.com"
+  config.gem 'chronic' #required for whenever
+  config.gem 'javan-whenever', :lib => false, :source => 'http://gems.github.com'
+  config.gem 'searchlogic', :version => '>= 2.3.5'
+  config.gem 'mislav-will_paginate', :version => '~> 2.3.11', :lib => 'will_paginate', 
+        :source => 'http://gems.github.com'
+
 
   # Only load the plugins named here, in the order given. By default, all plugins 
   # in vendor/plugins are loaded in alphabetical order.
@@ -66,10 +72,12 @@ Spree::Initializer.run do |config|
   # All files from config/locales/*.rb,yml are added automatically.
   #config.i18n.load_path << Dir[File.join(RAILS_ROOT, 'my', 'locales', '*.{rb,yml}')]
   config.i18n.default_locale = :'en-US'    
-    
+
+  config.active_record.observers = :order_observer
 end
 
 Time::DATE_FORMATS[:date_time24] = "%Y-%m-%d %H:%M"
+Time::DATE_FORMATS[:short_date] = "%Y-%m-%d"
 
 # Add new inflection rules using the following format 
 # (all these examples are active by default):

data/config/environments/test.rb

@@ -19,7 +19,11 @@ config.action_controller.perform_caching             = false
 config.action_mailer.delivery_method = :test
 
 # prevents rails 2.1 from complaining about protect_from_forgery while running rspec tests
-config.action_controller.allow_forgery_protection = false 
+config.action_controller.allow_forgery_protection = false
 
 config.gem "rspec", :lib => false, :version => ">= 1.2.0"
-config.gem "rspec-rails", :lib => false, :version => ">= 1.2.0"
+config.gem "rspec-rails", :lib => false, :version => ">= 1.2.0"
+config.gem "thoughtbot-shoulda", :lib => "shoulda", :version => ">= 2.10.2", :source => "http://gems.github.com"
+config.gem "thoughtbot-factory_girl", :lib => "factory_girl", :source => "http://gems.github.com"       
+config.gem "jeremymcanally-stump", :lib => "stump", :source => "http://gems.github.com"
+config.gem "faker"

data/config/initializers/locales.rb

@@ -1,8 +1,20 @@
-LOCALES_DIRECTORY = "#{SPREE_ROOT}/config/locales/" 
-AVAILABLE_LOCALES =
-Dir.new(LOCALES_DIRECTORY).entries.collect do |x|
-  x =~ /\.yml/ ? x.sub(/\.yml/,"") : nil
-end.compact.each_with_object({}) do |str, hsh|
-  locale_file = YAML.load_file(LOCALES_DIRECTORY + str + ".yml")
-  hsh[str] = locale_file[str]["this_file_language"] if locale_file.has_key? str
-end.freeze
+require 'spree/extension'
+
+all_locale_paths = Spree::ExtensionLoader.load_extension_roots.dup << SPREE_ROOT
+
+AVAILABLE_LOCALES = {}
+
+all_locale_paths.each do |path|
+	path = File.join(path, 'config', 'locales')
+
+	if File.exists? path
+		locales = Dir.new(path).entries.collect do |x|
+		  x =~ /\.yml/ ? x.sub(/\.yml/,"") : nil
+		end.compact.each_with_object({}) do |str, hsh|
+		  locale_file = YAML.load_file(path + "/" + str + ".yml")
+		  hsh[str] = locale_file[str]["this_file_language"] if locale_file.has_key? str
+		end.freeze
+	
+		AVAILABLE_LOCALES.merge! locales
+	end
+end