ski_binding_calculator 0.7.1 → 0.8.0

data/lib/ski_binding_calculator/error.rb

@@ -1,5 +1,4 @@
-class SkiBinding::Error < StandardError
-  
+class SkiBinding::Error < StandardError 
   def initialize(key = nil, value = nil)
     @messages = {}
     

data/lib/ski_binding_calculator/version.rb

@@ -0,0 +1,3 @@
+module SkiBinding
+  VERSION = "0.8.0"
+end

data/lib/ski_binding_calculator.rb

@@ -1,4 +1,4 @@
-require 'ski_binding_calculator/ski_binding'
+require 'ski_binding_calculator/version'
 require 'ski_binding_calculator/calculator'
 require 'ski_binding_calculator/config_loader'
 require 'ski_binding_calculator/code'

data/ski_binding_calculator.gemspec

@@ -1,20 +1,22 @@
-Gem::Specification.new do |s|
+$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+require 'ski_binding_calculator/version'
 
+Gem::Specification.new do |s|
   s.name        = 'ski_binding_calculator'
-  s.version     = '0.7.1'
-  s.summary     = "Ski Binding Calculator"
-  s.description = "Calculates the z-value according to ISO 11088."
+  s.version     = SkiBinding::VERSION
+  s.summary     = "Ski binding release value calculator (ISO 11088)"
+  s.description = "Calculates the initial indicator value (z-value) according to ISO 11088 standard."
   s.authors     = ["Jonas Ruef, Felix Langenegger"]
   s.email       = 'support@fadendaten.ch'
   s.homepage    = 'http://fadendaten.ch'
   s.license     = 'MIT'
   
+  s.add_dependency "activesupport", "~> 4.0.0"
   s.add_development_dependency "rspec", "~> 2.14.1"
   s.add_development_dependency "spork", "~> 0.9.2"
   s.add_development_dependency "simplecov", "~> 0.7.1"
   s.add_development_dependency "timecop", "~> 0.6.3"
-  s.add_development_dependency "fuubar", "~> 1.1.1"
-  s.add_development_dependency "activesupport", "~> 4.0.0"
+  s.add_development_dependency "fuubar", "~> 1.2.1"
 
   s.files =  Dir.glob("{config,lib,spec}/**/*")
   s.files += %w(Rakefile ski_binding_calculator.gemspec)

data/spec/lib/calculator_spec.rb

@@ -6,7 +6,7 @@ require 'timecop'
 # 315mm, and is born 01/01/1983 has code "L" or in our notation 11 
 # (see readme for details on codes). Furthermore it's z_value is 6.
 describe SkiBinding::Calculator do
-  subject(:skiers_parameters) do
+  let(:skiers_parameter) do
     { :type => "Type2", 
      :weight => "70", 
      :height => "170", 
@@ -15,7 +15,7 @@ describe SkiBinding::Calculator do
      :birthday_month => "01",
      :birthday_day => "01" }  
   end
-  subject(:skiers_parameters_string_keys) do
+  let(:skiers_parameter_string_keys) do
     { "type" => "Type2", 
      "weight" => "70", 
      "height" => "170", 
@@ -24,7 +24,7 @@ describe SkiBinding::Calculator do
      "birthday_month" => "01",
      "birthday_day" => "01" }  
   end
-  subject(:expected_preped) do
+  let(:expected_preped) do
     { :type => "Type2", 
      :weight => 70.0, 
      :height => 170.0, 
@@ -33,22 +33,22 @@ describe SkiBinding::Calculator do
      :birthday_month => 1,
      :birthday_day => 1 }  
   end
-  subject(:expected_aged) do
+  let(:expected_aged) do
     { :type => "Type2", 
      :weight => 70.0, 
      :height => 170.0, 
      :sole_length => 315.0, 
      :age => 30 }  
   end
-  subject(:expected_validated) do
+  let(:expected_type_validated) do
     { :type => 1, 
      :weight => 70.0, 
      :height => 170.0, 
      :sole_length => 315.0, 
      :age => 30 }  
   end
-  subject(:expected_code) { 11 }
-  subject(:expected_setting) do
+  let(:expected_code) { 11 }
+  let(:expected_setting) do
     { :z_value => 6 }
   end
   
@@ -56,155 +56,177 @@ describe SkiBinding::Calculator do
     #freeze time! so birthday will always be 30 years back
     Timecop.freeze(2013, 8, 13)                  
   end
-
-  describe "#new" 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
+  describe ".validate_attrs" do
+    let(:calculated_validated) { SkiBinding::Calculator.validate_attrs(parameters) }
     
-    it "raise error with two messages" do
-      expect { calculated_attr_validation }.to raise_error(SkiBinding::Error) { |e|
-        e.messages.should == { :weight => "is blank", :height => "is blank" } } 
-    end
+    context "when attributes are blank" do
+      let(:parameters) do
+        skiers_parameter[:weight] = ""
+        skiers_parameter[:height] = ""
+        skiers_parameter
+      end
+      
+      it "raises SkiBinding::Error" do
+        expect { calculated_validated }.to raise_error(SkiBinding::Error)  { |e|
+              e.messages.should == { :weight => "is blank", :height => "is blank" } }
+      end
+    end 
   end
   
-  describe "#prep_attributes" do
-    subject(:calculated_preped) { SkiBinding::Calculator.prep_attributes(parameters) }
-    let(:parameters) { skiers_parameters }
+  describe ".prep_attributes" do
+    let(:calculated_preped) { SkiBinding::Calculator.prep_attributes(parameters) }
     
-    it { calculated_preped.should == expected_preped }
+    context "when input hash keys are symbols" do
+      let(:parameters) { skiers_parameter }
+      
+      it "calculates the expected preped hash" do
+        expect(calculated_preped).to eq(expected_preped)
+      end
+    end
     
-    context "when hash keys are strings" do
-      let(:parameters) { skiers_parameters_string_keys}
-      it { calculated_preped.should == expected_preped }
+    context "when input hash key are strings" do
+      let(:parameters) { skiers_parameter_string_keys}
+      
+      it "calculates the expected preped hash" do
+         expect(calculated_preped).to eq(expected_preped)
+      end
     end
     
-    context "when weight < 10kg" do
+    context "when weight is less than 9kg" do
       let(:parameters) do
-        skiers_parameters[:weight] = 9 
-        skiers_parameters
+        skiers_parameter[:weight] = 9 
+        skiers_parameter
       end
-      it "raise error" do
+      it "raises SkiBinding::Error" do
           expect { calculated_preped }.to raise_error(SkiBinding::Error) { |e|
             e.messages.should == { :weight => "is less than 10kg" } }
       end
     end
   end
   
-  describe "#age" do
-    subject(:calculated_aged) { SkiBinding::Calculator.age(preped) }
-    let(:preped) { expected_preped }
+  describe ".age" do
+    let(:calculated_aged) { SkiBinding::Calculator.age(expected_preped) }
     
-    it { calculated_aged.should == expected_aged }
+    it "replaces birthday by age" do
+      expect(calculated_aged).to eq(expected_aged)
+    end
   end
   
-  describe "#validate_type" do
-    subject(:calculated_validated) { SkiBinding::Calculator.validate_type(aged) }
+  describe ".validate_type" do
+    let(:calculated_type_validated) { SkiBinding::Calculator.validate_type(aged) }
     let(:aged) { expected_aged }
     
-    it "sets \"Type2\" to 1" do
-      calculated_validated.should == expected_validated
+    it "sets 'Type2' to 1" do
+      expect(calculated_type_validated[:type]).to eq(expected_type_validated[:type])
     end
     
-    context "when type is \"unknown\"" do
+    context "when type is 'unknown'" do
       let(:aged) do
         expected_aged[:type] = "unknown"
         expected_aged
       end
       
-      it "raise error" do
-        expect { calculated_validated }.to raise_error(SkiBinding::Error) { |e|
+      it "raises SkiBinding::Error" do
+        expect { calculated_type_validated }.to raise_error(SkiBinding::Error) { |e|
             e.messages.should == { :type => "You have entered an invalid type." } }
       end
     end
   end
      
-  describe "#binding_code" do
-    subject(:calculated_code) { SkiBinding::Calculator.binding_code(validated) }
-    let(:validated) { expected_validated }
+  describe ".binding_code" do
+    let(:calculated_code) { SkiBinding::Calculator.binding_code(validated) }
+    let(:validated) { expected_type_validated }
     
-    it{ calculated_code.should == 11 }
+    it "calculates the expected code" do
+      expect(calculated_code).to eq(11)
+    end
     
-    context "when weight < 13kg" do
+    context "when weight less than 13kg" do
       let(:validated) do
-        expected_validated[:weight] = 12
-        expected_validated
+        expected_type_validated[:weight] = 12
+        expected_type_validated
       end
+      
       #because "Type 2" is given the code would be changed to 1
-      it{ calculated_code.should == 0 }
+      it "code is unchanged" do
+        expect(calculated_code).to eq(0)
+      end
     end
     
     context "when no code found" do
       let(:validated) do 
-        expected_validated[:weight] = -1
-        expected_validated[:height] = -1
-        expected_validated
+        expected_type_validated[:weight] = -1
+        expected_type_validated[:height] = -1
+        expected_type_validated
       end
       
-      it "raises error" do 
+      it "raises SkiBinding::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             
-      context "age is 50" do
+    context "when age is bigger or equal 50 or less than 10" do      
+      context "when age is 50" do
         let(:validated) do
-          expected_validated[:age] = 50
-          expected_validated
+          expected_type_validated[:age] = 50
+          expected_type_validated
         end
         
-        it { calculated_code.should == (expected_code - 1) }                                  
+        it "code changes by -1" do
+          expect(calculated_code).to eq(expected_code - 1) 
+        end                                 
       end
       
-      context "age is 51" do
+      context "when age is 51" do
         let(:validated) do
-          expected_validated[:age] = 51
-          expected_validated
+          expected_type_validated[:age] = 51
+          expected_type_validated
         end
         
-        it { calculated_code.should == (expected_code - 1) }
+        it "code changes by -1" do
+          expect(calculated_code).to eq(expected_code - 1) 
+        end             
       end
       
-      context "age is 9" do
+      context "when age is 9" do
         let(:validated) do
-          expected_validated[:age] = 9
-          expected_validated
+          expected_type_validated[:age] = 9
+          expected_type_validated
         end
         
-        it { calculated_code.should == (expected_code - 1) }
+        it "code changes by -1" do
+          expect(calculated_code).to eq(expected_code - 1) 
+        end            
       end
     end
   end
- 
-  describe "#binding_setting" do
-    subject(:calculated_setting) { SkiBinding::Calculator.binding_setting(validated, binding_code) }
+  
+  describe ".binding_setting" do
+    let(:calculated_setting) { SkiBinding::Calculator.binding_setting(expected_type_validated, binding_code) }
     let(:binding_code) { expected_code }
-    let(:validated) { expected_validated }
     
-    it{ calculated_setting.should == expected_setting }
+    it "calculates the expected setting" do
+      expect(calculated_setting).to eq(expected_setting)
+    end
     
     context "when no setting found" do
       let(:binding_code) { 0 }
-      it "raise error" do
+      
+      it "raises SkiBinding::Error" do
         expect { calculated_setting }.to raise_error(SkiBinding::Error) { |e|
             e.messages.should == { :base => "Please calculate z-index by hand." } }
       end
     end
   end
- 
-  describe "#setting" do
-    subject(:all_at_once_calculated) { SkiBinding::Calculator.setting(parameters) }
-    let(:parameters) { skiers_parameters }
+  
+  describe ".setting" do
+    subject(:one_pass_calculated_setting) { SkiBinding::Calculator.setting(skiers_parameter) }
     
-    it{ all_at_once_calculated.should == expected_setting }
+    it "calculates the expected setting in one pass" do
+      expect(one_pass_calculated_setting).to eq(expected_setting)
+    end
   end
   
   after(:all) do

data/spec/lib/code_spec.rb

@@ -1,15 +1,7 @@
 require 'spec_helper'
 
-describe SkiBinding::Code do
-  describe "#new" do
-    it "should return a Code class" do
-      SkiBinding::Code.new.class.should == SkiBinding::Code
-    end
-  end
-    
-  context "when instantiated Code class" do
-    it { should respond_to :weight }
-    it { should respond_to :height }
-  end
+describe SkiBinding::Code do 
+  it { should respond_to :weight }
+  it { should respond_to :height }
 end
 

data/spec/lib/config_loader_spec.rb

@@ -1,36 +1,31 @@
 require 'spec_helper'
 
 # For original table with codes referred to in this tests see iso 11088 
-# Table B.1
+# table B.1
 describe "ConfigLoader" do 
-  subject(:dummy_class) { DummyClass.new.extend(SkiBinding::ConfigLoader) }
+  subject(:dummy_class) { double('empty class').extend SkiBinding::ConfigLoader }
 
-  describe "loading binding codes:" do
-    it { dummy_class.load_binding_codes.class.should_not == nil }
-    
-    context "when loaded codes" do
-      subject(:codes) { dummy_class.load_binding_codes }
+  describe "#load_binding_codes" do
+    context "loaded binding codes" do
+      let(:loaded_codes) { dummy_class.load_binding_codes }
       
-      it{ codes.class.should == Array }
-      it{ codes[0].class.should == SkiBinding::Code }
-      it{ codes.size.should == 13 }
+      it{ expect(loaded_codes).to be_instance_of(Array)}
+      it{ loaded_codes.should have(13).elements }
+      it "first element is instance of SkiBinding::Code" do
+        expect(loaded_codes[0]).to be_instance_of(SkiBinding::Code)
+      end
     end
   end
   
-  describe "loading binding settings for all codes" do
-    subject(:settings_all_codes) do
-      settings = []
-      (0..15).each { |i| settings << dummy_class.load_binding_settings(i) }
-      settings
-    end
+  describe "#load_binding_setting" do
+    let(:settings_all_codes) { (0..15).map { |i| dummy_class.load_binding_settings(i) } }
     
-    context "for each code" do
-      it { settings_all_codes.each { |s| s.class.should == Array } }
-      it { settings_all_codes.each { |s| s[0].class.should == SkiBinding::Setting } }
-      it { settings_all_codes.each { |s| s.size.should == 8 } }
+    context "for each code loaded settings" do
+      it { settings_all_codes.each { |s| expect(s).to be_instance_of(Array) } }
+      it { settings_all_codes.each { |s| s.should have(8).elements } }
+      it "first element is instance of SkiBinding::Setting" do
+        settings_all_codes.each { |s| expect(s[0]).to be_instance_of(SkiBinding::Setting) }
+      end
     end
   end
-end
-
-class DummyClass 
 end

data/spec/lib/setting_spec.rb

@@ -1,16 +1,8 @@
 require 'spec_helper'
 
 describe SkiBinding::Setting do
-  describe "#new" do
-    it "should return a Setting class" do
-      SkiBinding::Setting.new.class.should == SkiBinding::Setting
-    end
-  end
-    
-  context "when instantiated Setting class" do
-    it { should respond_to :sole_length_range }
-    it { should respond_to :z_value }
-    it { should respond_to :twist }
-    it { should respond_to :forward_lean }
-  end
+  it { should respond_to :sole_length_range }
+  it { should respond_to :z_value }
+  it { should respond_to :twist }
+  it { should respond_to :forward_lean }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ski_binding_calculator
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-16 00:00:00.000000000 Z
+date: 2013-08-17 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,24 +106,9 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.1
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-description: Calculates the z-value according to ISO 11088.
+        version: 1.2.1
+description: Calculates the initial indicator value (z-value) according to ISO 11088
+  standard.
 email: support@fadendaten.ch
 executables: []
 extensions: []
@@ -120,7 +121,7 @@ files:
 - 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/version.rb
 - lib/ski_binding_calculator.rb
 - spec/lib/calculator_spec.rb
 - spec/lib/code_spec.rb
@@ -153,5 +154,5 @@ rubyforge_project:
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: Ski Binding Calculator
+summary: Ski binding release value calculator (ISO 11088)
 test_files: []

data/lib/ski_binding_calculator/ski_binding.rb

@@ -1,2 +0,0 @@
-module SkiBinding
-end