ski_binding_calculator 0.7.0 → 0.7.1

data/lib/ski_binding_calculator/calculator.rb

@@ -18,27 +18,11 @@ class SkiBinding::Calculator
     def self.validate_attrs(attrs)
       attrs = attrs.with_indifferent_access
       error = SkiBinding::Error.new
-      
-      if attrs[:weight].blank?
-        error.add_message(*[:weight, "weight is blank"])
-      end
-      if attrs[:height].blank?
-        error.add_message(*[:height, "height is blank"])
-      end
-      if attrs[:sole_length].blank?
-        error.add_message(*[:sole_length, "sole length is blank"])
-      end
-      if attrs[:birthday_year].blank?
-        error.add_message(*[:birthday_year, "birthday year is blank"])
-      end
-      if attrs[:birthday_month].blank?
-        error.add_message(*[:birthday_month, "birthday month is blank"])
-      end
-      if attrs[:birthday_day].blank?
-        error.add_message(*[:birthday_day, "birthday day is blank"])
-      end
-      if attrs[:type].blank?
-        error.add_message(*[:type, "type is blank"])
+      attributes = [:weight, :height, :birthday_year, :birthday_month, :birthday_day, 
+                    :sole_length, :type]
+                    
+      attributes.each do |attr|
+        error.add_message(*[attr, "is blank"]) if attrs[attr].blank?
       end
       
       raise error unless error.messages.empty?
@@ -49,7 +33,7 @@ class SkiBinding::Calculator
       hashy = {}
       hashy[:weight] = attrs[:weight].to_f
       if hashy[:weight] < 10.0
-        raise ArgumentError, "Weight must be at least 10kg"
+        raise SkiBinding::Error.new(*[:weight, "is less than 10kg"])
       end
       hashy[:height] = attrs[:height].to_f
       hashy[:sole_length] = attrs[:sole_length].to_f
@@ -81,7 +65,7 @@ class SkiBinding::Calculator
       if keys.include?(type_string)
         attrs[:type] = types[type_string]
       else
-        raise ArgumentError, "You have entered an invalid type."
+        raise SkiBinding::Error.new(*[:type, "You have entered an invalid type."])
       end
       attrs
     end
@@ -102,7 +86,7 @@ class SkiBinding::Calculator
         end
       end
       if code == -1 
-        raise ArgumentError, "You have entered invalid weight and/or height"
+        raise SkiBinding::Error.new(*[:base, "You have entered invalid weight and/or height"])
       end
       unless attrs[:weight] < 13
         code += attrs[:type]
@@ -120,7 +104,7 @@ class SkiBinding::Calculator
           unless s.z_value.nil?
             return {:z_value => s.z_value}
           else
-            raise ArgumentError, "Please calculate z-index by hand."
+            raise SkiBinding::Error.new(*[:base, "Please calculate z-index by hand."])
           end
         end
       end

data/lib/ski_binding_calculator/error.rb

@@ -1,7 +1,11 @@
 class SkiBinding::Error < StandardError
   
-  def initialize
+  def initialize(key = nil, value = nil)
     @messages = {}
+    
+    if !key.nil? && !value.nil?
+      @messages[key] = value
+    end
   end
   
   def messages

data/ski_binding_calculator.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name        = 'ski_binding_calculator'
-  s.version     = '0.7.0'
+  s.version     = '0.7.1'
   s.summary     = "Ski Binding Calculator"
   s.description = "Calculates the z-value according to ISO 11088."
   s.authors     = ["Jonas Ruef, Felix Langenegger"]

data/spec/lib/calculator_spec.rb

@@ -71,7 +71,7 @@ describe SkiBinding::Calculator do
     
     it "raise error with two messages" do
       expect { calculated_attr_validation }.to raise_error(SkiBinding::Error) { |e|
-        e.messages.should == {:weight => "weight is blank", :height => "height is blank"} } 
+        e.messages.should == { :weight => "is blank", :height => "is blank" } } 
     end
   end
   
@@ -91,8 +91,10 @@ describe SkiBinding::Calculator do
         skiers_parameters[:weight] = 9 
         skiers_parameters
       end
-      it { expect { calculated_preped }
-           .to raise_error(ArgumentError, "Weight must be at least 10kg") }
+      it "raise error" do
+          expect { calculated_preped }.to raise_error(SkiBinding::Error) { |e|
+            e.messages.should == { :weight => "is less than 10kg" } }
+      end
     end
   end
   
@@ -117,8 +119,10 @@ describe SkiBinding::Calculator do
         expected_aged
       end
       
-      it{ expect { calculated_validated }
-          .to raise_error(ArgumentError, "You have entered an invalid type.") }
+      it "raise error" do
+        expect { calculated_validated }.to raise_error(SkiBinding::Error) { |e|
+            e.messages.should == { :type => "You have entered an invalid type." } }
+      end
     end
   end
      
@@ -144,8 +148,10 @@ describe SkiBinding::Calculator do
         expected_validated
       end
       
-      it { expect { calculated_code }.
-           to raise_error(ArgumentError, "You have entered invalid weight and/or height") }
+      it "raises error" do 
+        expect { calculated_code }.to raise_error(SkiBinding::Error) { |e|
+            e.messages.should == { :base => "You have entered invalid weight and/or height" } }
+      end
     end
     
     context "when age >= 50 || age < 10" do             
@@ -187,8 +193,10 @@ describe SkiBinding::Calculator do
     
     context "when no setting found" do
       let(:binding_code) { 0 }
-      it{ expect { calculated_setting }
-          .to raise_error(ArgumentError, "Please calculate z-index by hand.") }
+      it "raise error" do
+        expect { calculated_setting }.to raise_error(SkiBinding::Error) { |e|
+            e.messages.should == { :base => "Please calculate z-index by hand." } }
+      end
     end
   end
  

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ski_binding_calculator
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors: