From ef6c08408b0af1a31d50c22d42bf57650d3a0ba3 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Tue, 7 Jan 2014 10:57:58 +1100
Subject: [PATCH] Generate option value name - value and description

---
 app/models/spree/variant_decorator.rb |  7 +++-
 spec/models/spree/variant_spec.rb     | 48 +++++++++++++++++++++++----
 2 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/app/models/spree/variant_decorator.rb b/app/models/spree/variant_decorator.rb
index b7f4cbcc9f..89b0fad7f8 100644
--- a/app/models/spree/variant_decorator.rb
+++ b/app/models/spree/variant_decorator.rb
@@ -31,7 +31,12 @@ Spree::Variant.class_eval do
   end
 
   def option_value_name
-    '10 g foo'
+    value = unit_value
+    value = value.to_i if value == value.to_i
+
+    name  = "#{value} g"
+    name += " #{unit_description}" if unit_description.present?
+    name
   end
 
 end
diff --git a/spec/models/spree/variant_spec.rb b/spec/models/spree/variant_spec.rb
index d4ff77d69e..90d431ac86 100644
--- a/spec/models/spree/variant_spec.rb
+++ b/spec/models/spree/variant_spec.rb
@@ -74,25 +74,59 @@ module Spree
     describe "unit value/description" do
       context "when the variant initially has no value" do
         context "when the required option value does not exist" do
-          it "creates the option value and assigns it to the variant" do
-            p = create(:simple_product, variant_unit: nil, variant_unit_scale: nil)
-            v = create(:variant, product: p, unit_value: nil, unit_description: nil)
-            p.update_attributes!(variant_unit: 'weight', variant_unit_scale: 1)
-            ot = Spree::OptionType.find_by_name 'unit_weight'
+          let!(:p) { create(:simple_product, variant_unit: nil, variant_unit_scale: nil) }
+          let!(:v) { create(:variant, product: p, unit_value: nil, unit_description: nil) }
 
+          before do
+            p.update_attributes!(variant_unit: 'weight', variant_unit_scale: 1)
+            @ot = Spree::OptionType.find_by_name 'unit_weight'
+          end
+
+          it "creates the option value and assigns it to the variant" do
             expect {
               v.update_attributes!(unit_value: 10, unit_description: 'foo')
             }.to change(Spree::OptionValue, :count).by(1)
 
             ov = Spree::OptionValue.last
-            ov.option_type.should == ot
+            ov.option_type.should == @ot
             ov.name.should == '10 g foo'
             ov.presentation.should == '10 g foo'
 
             v.option_values.should include ov
           end
 
-          it "correctly generates option value name and presentation"
+          describe "generating option value name and presentation" do
+            let(:ov) { Spree::OptionValue.last }
+
+            it "generates values within the unit range" do
+              v.update_attributes!(unit_value: 100, unit_description: 'bar')
+
+              ov.name.should == '100 g bar'
+              ov.presentation.should == '100 g bar'
+            end
+
+            it "generates values when unit value is non-integer" do
+              v.update_attributes!(unit_value: 123.45, unit_description: 'bar')
+
+              ov.name.should == '123.45 g bar'
+              ov.presentation.should == '123.45 g bar'
+            end
+
+            it "generates values without a unit description" do
+              v.update_attributes!(unit_value: 100, unit_description: '')
+
+              ov.name.should == '100 g'
+              ov.presentation.should == '100 g'
+            end
+
+            it "generates values for differing scales"
+
+            it "generates values for volume units"
+            it "generates values for item units"
+
+            it "switches units upwards when outside the base scale"
+            it "switches units downwards when outside the base scale"
+          end
         end
 
         context "when the required option value already exists" do