spree_variant_options 0.4.0 → 0.4.1

data/.travis.yml

@@ -2,7 +2,6 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - rbx
   - ree
 
 before_script:

data/README.md

@@ -26,7 +26,7 @@ If you don't already have an existing Spree site, [click here](https://gist.gith
 To install Spree Variant Options, just add the following to your Gemfile:
 
 ```ruby
-gem 'spree_variant_options', '0.3.1'
+gem 'spree_variant_options', '0.4.1'
 ```
 
 Now, bundle up with:
@@ -97,6 +97,7 @@ Contributors
 ------------------------------------------------------------------------------
 
 * Spencer Steffen ([@citrus](https://github.com/citrus))
+* Stéphane Bounmy ([@sbounmy](https://github.com/sbounmy))
 * Dan Morin ([@danmorin](https://github.com/danmorin))
 * Richard Brown ([@rbrown](https://github.com/rbrown))
 * [@baracek](https://github.com/baracek)

data/Versionfile

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

data/app/models/spree/option_value_decorator.rb

@@ -0,0 +1,17 @@
+Spree::OptionValue.class_eval do
+
+  default_scope order("#{quoted_table_name}.position")
+
+  has_attached_file :image,
+    :styles        => { :small => '40x30#', :large => '140x110#' },
+    :default_style => :small,
+    :url           => "/spree/option_values/:id/:style/:basename.:extension",
+    :path          => ":rails_root/public/spree/option_values/:id/:style/:basename.:extension"
+
+  def has_image?
+    image_file_name && !image_file_name.empty?
+  end
+
+  scope :for_product, lambda { |product| select("DISTINCT #{table_name}.*").where("spree_option_values_variants.variant_id IN (?)", product.variant_ids).joins(:variants)
+  }
+end

data/app/models/spree/product_decorator.rb

@@ -0,0 +1,31 @@
+Spree::Product.class_eval do
+
+  def option_values
+    @_option_values ||= Spree::OptionValue.for_product(self).sort_by {|ov| ov.option_type.position }
+  end
+
+  def grouped_option_values
+    @_grouped_option_values ||= option_values.group_by(&:option_type)
+  end
+
+  def variants_for_option_value(value)
+    @_variant_option_values ||= variants.includes(:option_values).all
+    @_variant_option_values.select { |i| i.option_value_ids.include?(value.id) }
+  end
+
+  def variant_options_hash
+    return @_variant_options_hash if @_variant_options_hash
+    hash = {}
+    variants.includes(:option_values).each do |variant|
+      variant.option_values.each do |ov|
+        otid = ov.option_type_id.to_s
+        ovid = ov.id.to_s
+        hash[otid] ||= {}
+        hash[otid][ovid] ||= {}
+        hash[otid][ovid][variant.id.to_s] = variant.to_hash
+      end
+    end
+    @_variant_options_hash = hash
+  end
+
+end

data/app/models/spree/variant_decorator.rb

@@ -0,0 +1,15 @@
+Spree::Variant.class_eval do
+  
+  include ActionView::Helpers::NumberHelper
+  
+  def to_hash
+    actual_price  = self.price
+    #actual_price += Calculator::Vat.calculate_tax_on(self) if Spree::Config[:show_price_inc_vat]
+    { 
+      :id    => self.id, 
+      :count => self.count_on_hand, 
+      :price => number_to_currency(actual_price)
+    }
+  end
+    
+end

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

@@ -1,25 +1,17 @@
 <% if @product.has_variants? %>
   <div id="product-variants">
     <h2><%= t('variants') %></h2>
-        
     <% index = 0 %>
     <% @product.grouped_option_values.each do |type, values| %>
       <div id="<%= dom_id(type) %>" class="variant-options index-<%= index %>">
         <h6 class="variant-option-type"><%= type.presentation %></h6>
         <ul class="variant-option-values">
-        <% values.each do |value| %>
+        <% values.sort_by(&:position).each do |value| %>
           <% classes = ["option-value"] %>
-          <% if index == 0 %>
-            <% variants = @variants.select{|i| i.option_values.select{|j| j.option_type_id == type.id && j == value }.length == 1 } %>
-            <% if variants.empty? %>
-              <% classes << "unavailable" %>
-            <% else %>
-              <% classes << ( Spree::Config[:allow_backorders] || variants.sum(&:count_on_hand) > 0 ? "in-stock" : "out-of-stock" ) %>
-            <% end %>
+          <% unless (variants = @product.variants_for_option_value(value)).empty? %>
+            <% classes << ( Spree::Config[:allow_backorders] || variants.sum(&:count_on_hand) > 0 ? "in-stock" : "out-of-stock" ) if index == 0 %>
+            <li><%= link_to value.has_image? ? image_tag(value.image.url, :alt => value.presentation) : content_tag(:span, value.presentation), "#", :title => value.presentation, :class => classes.join(" "), :rel => "#{type.id}-#{value.id}" %></li>
           <% end %>
-          <li>
-            <%= link_to value.has_image? ? image_tag(value.image.url, :alt => value.presentation) : content_tag(:span, value.presentation), "#", :title => value.presentation, :class => classes.join(" "), :rel => "#{type.id}-#{value.id}" %>
-          </li>
         <% end %>
           <li class="clear-option"><%= link_to "X", "#clear", :class => "clear-button clear-index-#{index}" %></li>
           <li class="clear"></li>
@@ -30,10 +22,8 @@
     <%= 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>
-    
+    </script>    
   </div>
-
 <% end%>

data/features/step_definitions/variant_options.rb

@@ -47,7 +47,7 @@ Then /^I should see image "([^"]*)" within the first option value$/ do |source|
   ot = @product.option_types.first
   ov = ot.option_values.first
   within ".variant-options a[rel='#{ot.id}-#{ov.id}']" do
-    assert_match "/system/images/#{ov.id}/small/#{source}", find("img").native.attribute("src")
+    assert_match "/spree/option_values/#{ov.id}/small/#{source}", find("img").native.attribute("src")
   end
 end
 

data/lib/spree_variant_options/version.rb

@@ -1,3 +1,3 @@
 module SpreeVariantOptions
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/test/unit/spree/option_value_test.rb

@@ -7,51 +7,76 @@ class Spree::OptionValueTest < ActiveSupport::TestCase
   end
 
   should_have_attached_file :image
-  
+
   context "a new option value" do
-  
+
     setup do
       @option_value = Spree::OptionValue.new
     end
-  
+
     should "not have an image" do
       assert !@option_value.has_image?
     end
-  
+
   end
-  
+
   context "an existing option value" do
-  
+
     setup do
       @option_value = Factory.create(:option_value)
     end
-  
+
     should "not have an image" do
       assert !@option_value.has_image?
     end
-    
+
     context "with an image" do
-      
+
       setup do
         @path = @images.shuffle.first
         file = File.open(@path)
         @option_value.update_attributes(:image => file)
         file.close
       end
-      
+
       should "have an image" do
         assert @option_value.has_image?
       end
-      
+
       should "have small large and original images" do
-        dir = File.expand_path("../../../dummy/public/system/images/#{@option_value.id}", __FILE__)
+        dir = File.expand_path("../../../dummy/public/spree/option_values/#{@option_value.id}", __FILE__)
         %w(small large original).each do |size|
           assert File.exists?(File.join(dir, size, File.basename(@path)))
-        end        
+        end
       end
-      
+
+    end
+
+  end
+
+  context "#for_product" do
+    setup do
+      @product = Factory.create(:product_with_variants)
+    end
+
+    should "return uniq option_values" do
+      unused = Factory(:option_value, :option_type => @product.option_types.first, :presentation => "Unused")
+      assert !Spree::OptionValue.for_product(@product).include?(unused)
+    end
+
+    should "retain option values sort order" do
+      @unordered, @prev_position = false, 0
+      Spree::OptionValue.for_product(@product).all.each do |ov|
+        @unordered = true if @prev_position > ov.position
+        @prev_position = ov.position
+      end
+
+      assert !@unordered
+    end
+
+    should "return empty array when no variants" do
+      product = Factory(:product)
+      assert_equal [], Spree::OptionValue.for_product(product)
     end
-  
   end
-  
 end

data/test/unit/spree/product_test.rb

@@ -5,34 +5,34 @@ class Spree::ProductTest < ActiveSupport::TestCase
   setup do
     @methods = %w(option_values grouped_option_values variant_options_hash)
   end
-  
+
   context "any product" do
-  
+
     setup do
       @product = Factory.create(:product)
     end
-  
+
     should "have proper methods" do
       @methods.each do |m|
         assert @product.respond_to?(m)
       end
     end
-  
+
   end
-  
-  
+
+
   context "a product with variants" do
-    
+
     setup do
       @product = Factory.create(:product_with_variants)
     end
-    
+
     should "have variants and option types and values" do
       assert_equal 2,  @product.option_types.count
       assert_equal 12, @product.option_values.count
       assert_equal 32, @product.variants.count
     end
-    
+
     should "have values grouped by type" do
       expected = { "size" => 4, "color" => 8 }
       assert_equal 2,  @product.grouped_option_values.count
@@ -40,7 +40,7 @@ class Spree::ProductTest < ActiveSupport::TestCase
         assert_equal expected[type.name], values.length
       end
     end
-    
+
   end
-    
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_variant_options
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-27 00:00:00.000000000Z
+date: 2012-03-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
-  requirement: &70218045579800 !ruby/object:Gem::Requirement
+  requirement: &70249587535800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70218045579800
+  version_requirements: *70249587535800
 - !ruby/object:Gem::Dependency
   name: spree_sample
-  requirement: &70218045579220 !ruby/object:Gem::Requirement
+  requirement: &70249587528380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70218045579220
+  version_requirements: *70249587528380
 - !ruby/object:Gem::Dependency
   name: dummier
-  requirement: &70218045578360 !ruby/object:Gem::Requirement
+  requirement: &70249587527100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.3.0
   type: :development
   prerelease: false
-  version_requirements: *70218045578360
+  version_requirements: *70249587527100
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70218045577460 !ruby/object:Gem::Requirement
+  requirement: &70249587525800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 3.0.0.beta2
   type: :development
   prerelease: false
-  version_requirements: *70218045577460
+  version_requirements: *70249587525800
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70218045576200 !ruby/object:Gem::Requirement
+  requirement: &70249587524740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 2.3.2
   type: :development
   prerelease: false
-  version_requirements: *70218045576200
+  version_requirements: *70249587524740
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
-  requirement: &70218045575120 !ruby/object:Gem::Requirement
+  requirement: &70249587523920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 1.2.1
   type: :development
   prerelease: false
-  version_requirements: *70218045575120
+  version_requirements: *70249587523920
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70218045574360 !ruby/object:Gem::Requirement
+  requirement: &70249587522400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 0.6.7
   type: :development
   prerelease: false
-  version_requirements: *70218045574360
+  version_requirements: *70249587522400
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70218045573380 !ruby/object:Gem::Requirement
+  requirement: &70249587521480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: 1.3.4
   type: :development
   prerelease: false
-  version_requirements: *70218045573380
+  version_requirements: *70249587521480
 description: Spree Variant Options is a simple spree extension that replaces the radio-button
   variant selection with groups of option types and values. Please see the documentation
   for more details.
@@ -120,8 +120,9 @@ files:
 - app/assets/javascripts/store/variant_options.js
 - app/assets/stylesheets/store/variant_options.css.erb
 - app/controllers/spree/admin/option_values_controller.rb
-- app/models/option_value_decorator.rb
-- app/models/product_decorator.rb
+- app/models/spree/option_value_decorator.rb
+- app/models/spree/product_decorator.rb
+- app/models/spree/variant_decorator.rb
 - app/overrides/spree_variant_options.rb
 - app/views/spree/admin/option_types/_option_value_fields.html.erb
 - app/views/spree/admin/option_values/_table_header.html.erb
@@ -180,7 +181,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -34473155772268830
+      hash: 1078116666989698030
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -189,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -34473155772268830
+      hash: 1078116666989698030
 requirements: []
 rubyforge_project: spree_variant_options
 rubygems_version: 1.8.10

data/app/models/option_value_decorator.rb

@@ -1,13 +0,0 @@
-Spree::OptionValue.class_eval do
-
-  default_scope order(:position)
-    
-  has_attached_file :image, 
-    :styles => { :small => '40x30#', :large => '140x110#' },
-    :default_style => :small
-  
-  def has_image?
-    image_file_name && !image_file_name.empty?
-  end
-  
-end

data/app/models/product_decorator.rb

@@ -1,27 +0,0 @@
-Spree::Product.class_eval do
-
-  include ActionView::Helpers::NumberHelper
-
-  def option_values
-    option_types.map{|i| i.option_values }.flatten.uniq
-  end
-  
-  def grouped_option_values
-    option_values.group_by(&:option_type)
-  end
-  
-  def variant_options_hash  
-    return @variant_options_hash if @variant_options_hash
-    @variant_options_hash = Hash[grouped_option_values.map{ |type, values| 
-      [type.id.inspect, Hash[values.map{ |value|         
-        [value.id.inspect, Hash[variants.includes(:option_values).select{ |variant| 
-          variant.option_values.select{ |val| 
-            val.id == value.id && val.option_type_id == type.id 
-          }.length == 1 }.map{ |v| [ v.id, { :id => v.id, :count => v.count_on_hand, :price => number_to_currency(v.price) } ] }]
-        ]
-      }]]
-    }]
-    @variant_options_hash
-  end
-  
-end