means 1.2.2 → 1.2.3

data/Gemfile

@@ -10,5 +10,11 @@ group :development do
   gem "yard", "~> 0.7.4"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.4"
-  gem "rcov", ">= 0"
+  gem "simplecov"
 end
+
+group :development, :test do
+  gem 'debugger'
+end
+
+gem 'activesupport'

data/Gemfile.lock

@@ -1,30 +1,48 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    activesupport (3.2.8)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    columnize (0.3.6)
+    debugger (1.1.3)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.1.1)
+      debugger-ruby_core_source (~> 1.1.2)
+    debugger-linecache (1.1.1)
+      debugger-ruby_core_source (>= 1.1.1)
+    debugger-ruby_core_source (1.1.2)
     diff-lcs (1.1.3)
     git (1.2.5)
+    i18n (0.6.1)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+    multi_json (1.3.2)
     rake (0.9.2.2)
-    rcov (0.9.11)
     rspec (2.9.0)
       rspec-core (~> 2.9.0)
       rspec-expectations (~> 2.9.0)
       rspec-mocks (~> 2.9.0)
     rspec-core (2.9.0)
-    rspec-expectations (2.9.0)
+    rspec-expectations (2.9.1)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.9.0)
-    yard (0.7.4)
+    simplecov (0.6.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
+    yard (0.7.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  activesupport
   bundler (~> 1.0.0)
+  debugger
   jeweler (~> 1.6.4)
-  rcov
   rspec (~> 2.9.0)
+  simplecov
   yard (~> 0.7.4)

data/VERSION

@@ -1 +1 @@
-1.2.2
+1.2.3

data/lib/means.rb

@@ -1,4 +1,5 @@
 require 'mathn'
+require 'active_support/all'
 
 # Allows calculation of arithmetic, geometric and harmonic means.
 # Class methods allow the passing in of a data set. 
@@ -38,15 +39,8 @@ class Mean
   # @raise if `:sum_of_reciprocals` is negative
   # @raise if `:product` is negative
   def initialize(params={})
-    raise_error_for_negative params, :count
-    raise_error_for_negative params, :sum_of_reciprocals
-    raise_error_for_negative params, :product
-
-    @sum                ||= params[:sum]                ||= 0
-    @sum_of_reciprocals ||= params[:sum_of_reciprocals] ||= 0
-    @product            ||= params[:product]            ||= 1
-    @count              ||= params[:count]              ||= 0
-    @includes_zero_or_negative = false
+    check_params params
+    assign_defaults params
   end
 
   # Add element to the data set
@@ -81,13 +75,37 @@ class Mean
     @count / @sum_of_reciprocals unless @count.zero? or @includes_zero_or_negative
   end
 
-  private 
+  private
 
-    def Mean.includes_zero_or_negative? data
+    def check_params params
+      params.assert_valid_keys :count, :sum_of_reciprocals, :product, :sum
+      raise_error_for_negative params, :count
+      raise_error_for_negative params, :sum_of_reciprocals
+      raise_error_for_negative params, :product
+    end
+
+    def assign_defaults params
+      defaults = {
+        sum: 0,
+        sum_of_reciprocals: 0,
+        product: 1,
+        count: 0
+      }
+
+      options = params.reverse_merge defaults
+
+      @sum                       = options[:sum]
+      @sum_of_reciprocals        = options[:sum_of_reciprocals]
+      @product                   = options[:product]
+      @count                     = options[:count]
+      @includes_zero_or_negative = false
+    end
+
+    def self.includes_zero_or_negative? data
       data.any? {|element| zero_or_negative? element}
     end
 
-    def Mean.zero_or_negative? element
+    def self.zero_or_negative? element
       element <= 0
     end
 

data/means.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "means"
-  s.version = "1.2.2"
+  s.version = "1.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nigel Lowry"]
-  s.date = "2012-04-12"
+  s.date = "2012-11-05"
   s.description = "Calculates the different means for a data set (arithmetic, geometric and harmonic)."
   s.email = "nigel-lowry@ultra.eclipse.co.uk"
   s.extra_rdoc_files = [
@@ -34,31 +34,37 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/nigel-lowry/means"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.17"
+  s.rubygems_version = "1.8.24"
   s.summary = "Small gem to work out the arithmetic, harmonic and geometric means of a data set"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.9.0"])
       s.add_development_dependency(%q<yard>, ["~> 0.7.4"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
+      s.add_development_dependency(%q<debugger>, [">= 0"])
     else
+      s.add_dependency(%q<activesupport>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.9.0"])
       s.add_dependency(%q<yard>, ["~> 0.7.4"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
+      s.add_dependency(%q<debugger>, [">= 0"])
     end
   else
+    s.add_dependency(%q<activesupport>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.9.0"])
     s.add_dependency(%q<yard>, ["~> 0.7.4"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
+    s.add_dependency(%q<debugger>, [">= 0"])
   end
 end
 

data/spec/means_spec.rb

@@ -37,40 +37,15 @@ describe "Mean" do
   describe ".arithmetic" do
     it_behaves_like "all means"
 
-    it "is 1.5 for [1, 2]" do 
-      data = [1.0, 2.0]
-      Mean.arithmetic(data).should be_within(0.01).of(1.5)
-    end
-
-    it "works with integers" do
-      data = [1, 2]
-      Mean.arithmetic(data).should be_within(0.01).of(1.5) 
-    end
-
-    it "works with an int then a float" do
-      data = [1, 2.0]
-      Mean.arithmetic(data).should be_within(0.01).of(1.5) 
-    end
-
-    it "works with a float then an int" do
-      data = [1.0, 2]
-      Mean.arithmetic(data).should be_within(0.01).of(1.5) 
-    end
-
-    it "works with three numbers" do
-      data = [1, 2, 3]
-      Mean.arithmetic(data).should == 2
-    end
-
-    it "works with zero" do
-      data = [0, 2]
-      Mean.arithmetic(data).should == 1
-    end
-
-    it "works with negative numbers" do
-      data = [-1, 3]
-      Mean.arithmetic(data).should == 1
-    end
+    specify { Mean.arithmetic([1.0, 2.0]).should be_within(0.01).of(1.5) }
+    specify { Mean.arithmetic([1, 2]).should be_within(0.01).of(1.5) }
+    specify { Mean.arithmetic([1, 2.0]).should be_within(0.01).of(1.5) }
+    specify { Mean.arithmetic([1.0, 2]).should be_within(0.01).of(1.5) }
+
+    specify { Mean.arithmetic([1, 2, 3]).should == 2 }
+    
+    specify { Mean.arithmetic([0, 2]).should == 1 }
+    specify { Mean.arithmetic([-1, 3]).should == 1 }
   end
 
   describe ".geometric" do
@@ -194,6 +169,10 @@ describe "Mean" do
       m.harmonic_mean.should == 4.0 / 3.0
     end
 
+    it "rejects an unknown key" do
+      lambda { Mean.new(count: 1, blah: 1) }.should raise_error
+    end
+
     it "rejects a negative count" do
       lambda { Mean.new(count: -1) }.should raise_error
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: means
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-12 00:00:00.000000000 Z
+date: 2012-11-05 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: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70094703023460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +37,15 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70094703023460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.9.0
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70094703021720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +53,15 @@ dependencies:
         version: 0.7.4
   type: :development
   prerelease: false
-  version_requirements: *70094703021720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.4
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70094703018560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +69,15 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70094703018560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70094703080460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +85,15 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70094703080460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.4
 - !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &70094703079740 !ruby/object:Gem::Requirement
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +101,28 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70094703079740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: debugger
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Calculates the different means for a data set (arithmetic, geometric
   and harmonic).
 email: nigel-lowry@ultra.eclipse.co.uk
@@ -103,7 +160,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4072449701822511061
+      hash: 2287703100562753165
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -112,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Small gem to work out the arithmetic, harmonic and geometric means of a data