spree_variant_options 0.3.0 → 0.4.0

data/README.md

@@ -5,93 +5,107 @@ Spree Variant Options is a very simple spree extension that replaces the radio-b
 
 
 #### When no selection has been made:
-![Spree Variant Options - No selection](http://spree-docs.s3.amazonaws.com/spree_variant_options/1.jpg)
+![Spree Variant Options - No selection](http://spree-docs.s3.amazonaws.com/spree_variant_options/v0.3.1/1.jpg)
 
-#### After "Medium" is selected, "Medium Blue" is out of stock:
+#### After "Large" is selected, "Large Blue" is out of stock:
 
-![Spree Variant Options - Option Type/Value selected](http://spree-docs.s3.amazonaws.com/spree_variant_options/2.jpg)
+![Spree Variant Options - Option Type/Value selected](http://spree-docs.s3.amazonaws.com/spree_variant_options/v0.3.1/2.jpg)
 
 #### And after "Green" is selected:
-![Spree Variant Options - Variant Selcted](http://spree-docs.s3.amazonaws.com/spree_variant_options/3.jpg)
+![Spree Variant Options - Variant Selcted](http://spree-docs.s3.amazonaws.com/spree_variant_options/v0.3.1/3.jpg)
 
 To see it in action, follow the steps for "Demo" below.
 
 
+------------------------------------------------------------------------------
 Installation
-------------
+------------------------------------------------------------------------------
 
 If you don't already have an existing Spree site, [click here](https://gist.github.com/946719) then come back later... You can also read the Spree docs [here](http://spreecommerce.com/documentation/getting_started.html)...
 
 To install Spree Variant Options, just add the following to your Gemfile:
 
-    gem 'spree_variant_options', '0.3.0'
-  
+```ruby
+gem 'spree_variant_options', '0.3.1'
+```
 
 Now, bundle up with:
 
-    bundle
-
+```bash
+bundle
+```
 
 Next, run the install generator to copy the necessary migration to your project and migrate your database:
 
-    rails g spree_variant_options:install
-    rake db:migrate
-
+```bash
+rails g spree_variant_options:install
+rake db:migrate
+```
 
 
+------------------------------------------------------------------------------
 Versions
---------
+------------------------------------------------------------------------------
 
-Spree Variant Options is compatible with Spree 0.30.x through 0.70.x. Please reference `Versionfile` for more details.
+Spree Variant Options is compatible with Spree 0.30.x through 1.0.x. Please reference `Versionfile` for more details.
 
 
+------------------------------------------------------------------------------
 Testing
--------
+------------------------------------------------------------------------------
 
 Clone this repo to where you develop, bundle up, then run `dummier' to get the show started:
 
-    git clone git://github.com/citrus/spree_variant_options.git
-    cd spree_variant_options
-    bundle install
-    bundle exec dummier
+```bash
+git clone git://github.com/citrus/spree_variant_options.git
+cd spree_variant_options
+bundle install
+bundle exec dummier
+
+# cucumber/capybara
+bundle exec rake cucumber
+
+# test/unit
+bundle exec rake test
+
+# both
+bundle exec rake 
+```
 
-    # cucumber/capybara
-    rake cucumber
-    
-    # test/unit
-    rake test
-    
-    # both
-    rake 
-  
 POW!
 
 
+------------------------------------------------------------------------------
 Demo
-----
+------------------------------------------------------------------------------
 
 You can easily use the test/dummy app as a demo of spree_variant_options. Just `cd` to where you develop and run:
 
-    git clone git://github.com/citrus/spree_variant_options.git
-    cd spree_variant_options
-    mv lib/dummy_hooks/after_migrate.rb.sample lib/dummy_hooks/after_migrate.rb
-    bundle install
-    bundle exec dummier
-    cd test/dummy
-    rails s
-    
+```bash
+git clone git://github.com/citrus/spree_variant_options.git
+cd spree_variant_options
+cp test/dummy_hooks/after_migrate.rb.sample test/dummy_hooks/after_migrate.rb
+bundle install
+bundle exec dummier
+cd test/dummy
+rails s
+```
 
+    
+------------------------------------------------------------------------------
 Contributors
-------------
+------------------------------------------------------------------------------
 
 * Spencer Steffen ([@citrus](https://github.com/citrus))
+* Dan Morin ([@danmorin](https://github.com/danmorin))
 * Richard Brown ([@rbrown](https://github.com/rbrown))
 * [@baracek](https://github.com/baracek)
 
 If you'd like to help out feel free to fork and send me pull requests!
 
 
+------------------------------------------------------------------------------
 License
--------
+------------------------------------------------------------------------------
 
-Copyright (c) 2011 Spencer Steffen and Citrus, released under the New BSD License All rights reserved.
+Copyright (c) 2011 - 2012 Spencer Steffen and Citrus, released under the New BSD License All rights reserved.

data/Versionfile

@@ -1,3 +1,4 @@
+"1.0.x"  => { :version => "0.4.0" }
 "0.70.x" => { :version => "0.3.0" }
 "0.60.x" => { :version => "0.2.0" }
 "0.50.x" => { :version => "0.1.1" }

data/app/assets/javascripts/store/product_variant_options.js

@@ -0,0 +1,24 @@
+var show_variant_images = function(variant_id) {
+  $('li.vtmb').hide();
+  $('li.vtmb-' + variant_id).show();
+  var currentThumb = $('#' + $("#main-image").data('selectedThumbId'));
+  // if currently selected thumb does not belong to current variant, nor to common images,
+  // hide it and select the first available thumb instead.
+  if(!currentThumb.hasClass('vtmb-' + variant_id)) {
+    //var thumb = $($('ul.thumbnails li:visible').eq(0));
+    var thumb = $($("ul.thumbnails li.vtmb-" + variant_id + ":first").eq(0));
+    if (thumb.length == 0) {
+      thumb = $($('ul.thumbnails li:visible').eq(0));
+    }
+    var newImg = thumb.find('a').attr('href');
+    $('ul.thumbnails li').removeClass('selected');
+    thumb.addClass('selected');
+    $('#main-image img').attr('src', newImg);
+    $("#main-image").data('selectedThumb', newImg);
+    $("#main-image").data('selectedThumbId', thumb.attr('id'));
+  }
+}
+
+var show_all_variant_images = function() {
+  $('li.vtmb').show();
+}

data/app/assets/javascripts/store/variant_options.js

@@ -164,7 +164,7 @@ function VariantOptions(options, allow_backorders) {
       $('#product-price .price').removeClass('unselected').text(variant.price);      
       $('button[type=submit]').attr('disabled', false).fadeTo(100, 1);
       try {
-        select_variant(variant.id, $.map($('a.selected'), function(i) { return $(i).text() }).join(" "));
+        show_variant_images(variant.id);
       } catch(error) {
         // depends on modified version of product.js  
       }
@@ -184,6 +184,7 @@ function VariantOptions(options, allow_backorders) {
       disable($(element).find('a.option-value').show().removeClass('in-stock out-of-stock').addClass('locked').unbind('click'));
       $(element).find('a.clear-button').hide();
     });
+    show_all_variant_images();
   }
    
   

data/app/assets/stylesheets/store/{variant_options.css → variant_options.css.erb}

@@ -1,11 +1,6 @@
-#product-variants {
-  
-}
-
 #product-details .price.unselected {
   color: #bbb;  
 }
-
 .variant-option-type {
   margin-bottom: 0;
 }
@@ -55,7 +50,7 @@ li.clear-option a.clear-button:hover {
 }
 .option-value.out-of-stock {
   display: block;
-  background: transparent url(/images/out-of-stock.png) 0 0 repeat;
+  background: transparent url(<%= asset_path "store/out-of-stock.png" %>) 0 0 repeat;
   color: #aaa;
   cursor: default;
 }

data/app/controllers/spree/admin/option_values_controller.rb

@@ -0,0 +1,18 @@
+module Spree
+  module Admin
+    class OptionValuesController < BaseController
+  
+      def update_positions
+        params[:positions].each do |id, index|
+          OptionValue.update_all(['position=?', index], ['id=?', id])
+        end
+    
+        respond_to do |format|
+          format.html { redirect_to edit_admin_option_type_url(params[:id]) }
+          format.js  { render :text => 'Ok' }
+        end
+      end
+
+    end
+  end
+end

data/app/models/option_value_decorator.rb

@@ -1,4 +1,4 @@
-OptionValue.class_eval do
+Spree::OptionValue.class_eval do
 
   default_scope order(:position)
     

data/app/models/product_decorator.rb

@@ -1,4 +1,4 @@
-Product.class_eval do
+Spree::Product.class_eval do
 
   include ActionView::Helpers::NumberHelper
 

data/app/overrides/spree_variant_options.rb

@@ -1,5 +1,26 @@
-Deface::Override.new(:virtual_path => "products/_cart_form",
-                     :name         => "spree_variant_options",
-                     :replace      => "#product-variants",
-                     :partial      => "products/variant_options",
-                     :disabled     => false)
+Deface::Override.new(:virtual_path   => "spree/products/_cart_form",
+                     :name           => "spree_variant_options",
+                     :replace        => "#product-variants",
+                     :partial        => "spree/products/variant_options",
+                     :disabled       => false)
+
+Deface::Override.new(:virtual_path   => "spree/admin/option_types/edit",
+                     :name           => "admin_option_value_table_headers",
+                     :replace        => "thead[data-hook=option_header]",
+                     :partial        => "spree/admin/option_values/table_header",
+                     :disabled       => false)
+
+Deface::Override.new(:virtual_path   => "spree/admin/option_types/edit",
+                     :name           => "admin_option_value_table_empty_colspan",
+                     :set_attributes => "tr[data-hook=option_none] td",
+                     :attributes     => { :colspan => 5 },
+                     :disabled       => false)
+
+Deface::Override.new(:virtual_path   => "spree/admin/option_types/edit",
+                     :name           => "admin_sortable_option_values",
+                     :set_attributes => "table.index",
+                     :attributes     => { 
+                       "class"              => "index sortable",
+                       "data-sortable-link" => "/admin/option_values/update_positions"
+                     },
+                     :disabled       => false)

data/app/views/spree/admin/option_types/_option_value_fields.html.erb

@@ -0,0 +1,7 @@
+<tr class="option_value fields" id="<%= dom_id(f.object) %>"  data-hook="option_value">
+  <td class="name"><span class="handle"></span> <%= f.text_field :name %></td>
+  <td class="presentation"><%= f.text_field :presentation %></td>
+  <td><%= image_tag f.object.image.url(:small) if f.object.has_image? %></td>
+  <td><%= f.file_field :image %></td>
+  <td class="actions"><%= link_to_remove_fields t(:remove), f %></td>
+</tr>

data/app/views/spree/admin/option_values/_table_header.html.erb

@@ -0,0 +1,7 @@
+<tr>
+  <th><%= t(:name) %></th>
+  <th><%= t(:display) %></th>
+  <th><%= t(:preview) %></th>
+  <th><%= t(:image) %></th>
+  <th></th>
+</tr>

data/app/views/{products → spree/products}/_variant_options.html.erb

@@ -5,7 +5,7 @@
     <% index = 0 %>
     <% @product.grouped_option_values.each do |type, values| %>
       <div id="<%= dom_id(type) %>" class="variant-options index-<%= index %>">
-        <h3 class="variant-option-type"><%= type.presentation %></h3>
+        <h6 class="variant-option-type"><%= type.presentation %></h6>
         <ul class="variant-option-values">
         <% values.each do |value| %>
           <% classes = ["option-value"] %>
@@ -30,15 +30,10 @@
     <%= hidden_field_tag "products[#{@product.id}]", "", :id => "variant_id", :class => "hidden" %>
     <script type="text/javascript">
     //<![CDATA[
-        var variant_options = new VariantOptions(<%== @product.variant_options_hash.to_json %>, <%==  Spree::Config[:allow_backorders] %>);
+        var variant_options = new VariantOptions(<%== @product.variant_options_hash.to_json %>, <%==  !!Spree::Config[:allow_backorders] %>);
     //]]>
     </script>
     
   </div>
-  
-  <% content_for :head do %>
-    <%= stylesheet_link_tag 'store/variant_options' %>
-    <%= javascript_include_tag 'store/variant_options' %>
-  <% end %>
 
 <% end%>

data/config/routes.rb

@@ -1,11 +1,9 @@
-Rails.application.routes.draw do
+Spree::Core::Engine.routes.append do
 
   namespace :admin do
-    resources :option_types do
-      resources :option_values do
-        collection do
-          post :update_positions
-        end
+    resources :option_values do
+      collection do
+        post :update_positions
       end
     end
   end

data/db/migrate/20120213174249_add_image_to_option_values.rb

@@ -0,0 +1,8 @@
+class AddImageToOptionValues < ActiveRecord::Migration
+  def change
+    add_column :spree_option_values, :image_file_name,    :string
+    add_column :spree_option_values, :image_content_type, :string
+    add_column :spree_option_values, :image_file_size,    :integer
+    add_column :spree_option_values, :image_updated_at,   :datetime
+  end
+end

data/features/step_definitions/option_values.rb

@@ -9,11 +9,11 @@ end
 
 Then /^I fill in the option value fields for (.*)$/ do |parent|
   if parent == 'the new option value'
-    parent = "tr#new_option_value"
+    parent = "tr#new_spree_option_value"
   else
     matches = parent.match(/([^"]*)"$/)
-    ov = OptionValue.find_by_presentation(matches[matches.length - 1])
-    parent = "tr#option_value_#{ov.id}"
+    ov = Spree::OptionValue.find_by_presentation(matches[matches.length - 1])
+    parent = "tr#spree_option_value_#{ov.id}"
   end
   within parent do
     %w(name presentation).each do |name|
@@ -31,8 +31,8 @@ Then /^I should see image "([^"]*)"$/ do |source|
 end
 
 When /^I follow "([^"]*)" for option type "([^"]*)"$/ do |link_text, value_string|
-  ov = OptionValue.find_by_presentation(value_string)
-  within "tr#option_value_#{ov.id}" do
+  ov = Spree::OptionValue.find_by_presentation(value_string)
+  within "tr#spree_option_value_#{ov.id}" do
     click_link link_text
   end
 end
@@ -42,12 +42,12 @@ end
 
 #When /^I drag option value "([^"]*)" to the top$/ do |value_string|
 #  ov = OptionValue.find_by_presentation(value_string)
-#  page.driver.browser.drag_and_drop("#option_value_#{ov.id} span.handle", "0,-100")
+#  page.driver.browser.drag_and_drop("#spree_option_value_#{ov.id} span.handle", "0,-100")
 #end
 
 #When /^I drag option value "([^"]*)" to the top$/ do |value_string|
 #  ov = OptionValue.find_by_presentation(value_string)
-#  from = find("#option_value_#{ov.id} span.handle")
+#  from = find("#spree_option_value_#{ov.id} span.handle")
 #  to   = find("table.index tr:first")
 #  from.drag_to(to) 
 #end
@@ -59,6 +59,6 @@ end
 #Then /^I should see "([^"]*)" as the first option value$/ do |value_string|
 #  ov = OptionValue.find_by_presentation(value_string)
 #  #assert_equal 1, ov.position
-#  #assert_equal find("table.index tr:first"), find("#option_value_#{ov.id}")
+#  #assert_equal find("table.index tr:first"), find("#spree_option_value_#{ov.id}")
 #end
 

data/features/step_definitions/variant_options.rb

@@ -3,7 +3,7 @@
 
 def variant_by_descriptor(descriptor)
   values = descriptor.split(" ")
-  values.map! { |word| OptionValue.find_by_presentation(word) rescue nil }.compact!
+  values.map! { |word| Spree::OptionValue.find_by_presentation(word) rescue nil }.compact!
   return if values.blank?
   @product.variants.includes(:option_values).select{|i| i.option_value_ids.sort == values.map(&:id) }.first
 end
@@ -21,8 +21,9 @@ end
 # Givens
 
 Given /^I( don't)? allow backorders$/ do |dont|
+  Spree::Config.instance_variable_set("@configuration", nil)
   Spree::Config.set(:allow_backorders => dont.nil?)
-  assert_equal dont.nil?, Spree::Config[:allow_backorders]
+  assert_equal dont.nil?, !!Spree::Config[:allow_backorders]
 end
 
 Given /^I have a product( with variants)?( and images)?$/ do |has_variants, has_images|
@@ -64,7 +65,7 @@ Given /^I have an? "([^"]*)" variant( for .*)?$/ do |descriptor, price|
   return @variant if @variant
   @product.option_type_ids.each_with_index do |otid, index|
     word = values[index]
-    val = OptionValue.find_by_presentation(word) || Factory.create(:option_value, :option_type_id => otid, :presentation => word, :name => word.downcase) 
+    val = Spree::OptionValue.find_by_presentation(word) || Factory.create(:option_value, :option_type_id => otid, :presentation => word, :name => word.downcase) 
     values[index] = val
   end
   @variant = Factory.create(:variant, :product => @product, :option_values => values, :price => price)
@@ -99,10 +100,10 @@ Then /^I should see (enabled|disabled)+ links for the ((?!option).*) option type
     when "second"; @product.option_types[1];
     when "last";   @product.option_types.last;
   end
-  assert_seen option_type.presentation, :within => "#option_type_#{option_type.id} h3.variant-option-type"
+  assert_seen option_type.presentation, :within => "#spree_option_type_#{option_type.id} h6.variant-option-type"
   option_type.option_values.each do |value|
     rel = "#{option_type.id}-#{value.id}"
-    link = find("#option_type_#{option_type.id} a[rel='#{option_type.id}-#{value.id}']")
+    link = find("#spree_option_type_#{option_type.id} a[rel='#{option_type.id}-#{value.id}']")
     assert_not_nil link
     assert_equal value.presentation, link.text
     assert_equal "#", link.native.attribute('href').last