ski_binding_calculator 0.6.8 → 0.6.9

data/lib/ski_binding_calculator/calculator.rb

@@ -1,10 +1,12 @@
 require 'ski_binding_calculator/config_loader'
 require 'active_support/core_ext/hash/indifferent_access'
+require 'active_support/core_ext/object/blank'
 
 class SkiBinding::Calculator 
   extend SkiBinding::ConfigLoader
   
   def self.setting(attrs)
+    self.validate_attrs(attrs)
     attrs = self.prep_attributes(attrs)
     attrs = self.age(attrs)
     attrs = self.validate_type(attrs)
@@ -13,6 +15,29 @@ class SkiBinding::Calculator
   end
   
   private
+    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"])
+      elsif attrs[:height].blank?
+        error.add_message(*[:height, "height is blank"])
+      elsif attrs[:sole_length].blank?
+        error.add_message(*[:sole_length, "sole length is blank"])
+      elsif attrs[:birthday_year].blank?
+        error.add_message(*[:birthday_year, "birthday year is blank"])
+      elsif attrs[:birthday_month].blank?
+        error.add_message(*[:birthday_month, "birthday month is blank"])
+      elsif attrs[:birthday_day].blank?
+        error.add_message(*[:birthday_day, "birthday day is blank"])
+      elsif attrs[:type].blank?
+        error.add_message(*[:type, "type is blank"])
+      end
+      
+      raise error unless error.messages.empty?
+    end
+    
     def self.prep_attributes(attrs)
       attrs = attrs.with_indifferent_access
       hashy = {}

data/lib/ski_binding_calculator/error.rb

@@ -0,0 +1,14 @@
+class SkiBinding::Error < StandardError
+  
+  def initialize
+    @messages = {}
+  end
+  
+  def messages
+    @messages
+  end
+  
+  def add_message(key, value)
+    @messages[key] = value
+  end
+end

data/lib/ski_binding_calculator.rb

@@ -3,3 +3,4 @@ require 'ski_binding_calculator/calculator'
 require 'ski_binding_calculator/config_loader'
 require 'ski_binding_calculator/code'
 require 'ski_binding_calculator/setting'
+require 'ski_binding_calculator/error'

data/ski_binding_calculator.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name        = 'ski_binding_calculator'
-  s.version     = '0.6.8'
+  s.version     = '0.6.9'
   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

@@ -61,6 +61,23 @@ describe SkiBinding::Calculator do
     it { SkiBinding::Calculator.new.class.should == SkiBinding::Calculator }
   end
   
+  describe "#validate_attrs" do
+    subject(:calculated_attr_validation) { SkiBinding::Calculator.validate_attrs(parameters) }
+    let(:parameters) do
+      skiers_parameters[:weight] = ""
+      skiers_parameters[:height] = ""
+      skiers_parameters
+    end
+    
+    it "raise error with two messages" do
+      expect { calculated_attr_validation }.to raise_error(SkiBinding::Error) do |e|
+        e.message.should == {:weight => "weight is blank", :height => "height is blank"}
+      end 
+    end
+    #it { expect { calculated_attr_validation }
+    #     .to raise_error(ArgumentError, "height is blank") }
+  end
+  
   describe "#prep_attributes" do
     subject(:calculated_preped) { SkiBinding::Calculator.prep_attributes(parameters) }
     let(:parameters) { skiers_parameters }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ski_binding_calculator
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-15 00:00:00.000000000 Z
+date: 2013-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -118,6 +118,7 @@ files:
 - lib/ski_binding_calculator/calculator.rb
 - lib/ski_binding_calculator/code.rb
 - lib/ski_binding_calculator/config_loader.rb
+- lib/ski_binding_calculator/error.rb
 - lib/ski_binding_calculator/setting.rb
 - lib/ski_binding_calculator/ski_binding.rb
 - lib/ski_binding_calculator.rb