icu_ratings 1.7.0 → 1.8.0

data/lib/icu_ratings/player.rb

@@ -211,9 +211,9 @@ module ICU
       case
       when args[:rating] >= 2100 then
         16
-      when ICU::Util.age(args[:dob], args[:start]) < 21 then
+      when ICU::Util::Date.age(args[:dob], args[:start]) < 21 then
         40
-      when ICU::Util.age(args[:joined], args[:start]) < 8 then
+      when ICU::Util::Date.age(args[:joined], args[:start]) < 8 then
         32
       else
         24

data/lib/icu_ratings/tournament.rb

@@ -156,7 +156,7 @@ module ICU
 
     # Set the start date. Raises exception on error.
     def start=(date)
-      @start = ICU::Util.parsedate!(date)
+      @start = ICU::Util::Date.parsedate!(date)
     end
 
     # Set whether there are no bonuses (false by default).

data/lib/icu_ratings/util.rb

@@ -2,41 +2,43 @@ require 'date' # needed for 1.9.1
 
 module ICU
   module Util
+    module Date
 
-    # Parses strings into date objects, interpreting nn/nn/nnnn as dd/mm/yyyy. It raises an exception on error.
-    #
-    #   Util.parsedate!('1955-11-09')       # => Date (1955-11-09)
-    #   Util.parsedate!('02/03/2009')       # => Date (2009-03-02)
-    #   Util.parsedate!('02/23/2009')       # => Date (2009-02-23)
-    #   Util.parsedate!('16th June 1986')   # => Date (1986-06-16)
-    #   Util.parsedate!('not a date')       # exception raised
-    #
-    # Note that the parse method of the Date class behaves differently in Ruby 1.8.7 and 1.9.1.
-    # In 1.8.7 it assumes American dates and will raise ArgumentError on "30/03/2003".
-    # In 1.9.1 it assumes European dates and will raise ArgumentError on "03/30/2003".
-    #
-    def self.parsedate!(date)
-      return date.clone if date.is_a?(Date)
-      string = date.to_s.strip
-      raise "invalid date (#{date})" unless string.match(/[1-9]/)
-      string = [$3].concat($2.to_i > 12 ? [$1, $2] : [$2, $1]).join('-') if string.match(/^(\d{1,2}).(\d{1,2}).(\d{4})$/)
-      begin
-        Date.parse(string, true)
-      rescue
-        raise "invalid date (#{date})"
+      # Parses strings into date objects, interpreting nn/nn/nnnn as dd/mm/yyyy. It raises an exception on error.
+      #
+      #   parsedate!('1955-11-09')       # => Date (1955-11-09)
+      #   parsedate!('02/03/2009')       # => Date (2009-03-02)
+      #   parsedate!('02/23/2009')       # => Date (2009-02-23)
+      #   parsedate!('16th June 1986')   # => Date (1986-06-16)
+      #   parsedate!('not a date')       # exception raised
+      #
+      # Note that the parse method of the Date class behaves differently in Ruby 1.8.7 and 1.9.1.
+      # In 1.8.7 it assumes American dates and will raise ArgumentError on "30/03/2003".
+      # In 1.9.1 it assumes European dates and will raise ArgumentError on "03/30/2003".
+      #
+      def self.parsedate!(date)
+        return date.clone if date.is_a?(::Date)
+        string = date.to_s.strip
+        raise "invalid date (#{date})" unless string.match(/[1-9]/)
+        string = [$3].concat($2.to_i > 12 ? [$1, $2] : [$2, $1]).join('-') if string.match(/^(\d{1,2}).(\d{1,2}).(\d{4})$/)
+        begin
+          ::Date.parse(string, true)
+        rescue
+          raise "invalid date (#{date})"
+        end
       end
-    end
 
-    # Returns the difference of two dates:
-    #
-    #   Util.age(born, date)               # age in years at the given date (Float)
-    #   Util.age(born)                     # age in years now (today)
-    #
-    # Internally it uses _parsedate!_ so can throw a exception if an invalid date is supplied.
-    def self.age(born, date=Date.today)
-      born = parsedate!(born)
-      date = parsedate!(date)
-      date.year - born.year + (date.yday - born.yday) / 366.0
+      # Returns the difference of two dates:
+      #
+      #   age(born, date)  # age in years at the given date (Float)
+      #   age(born)        # age in years now (today)
+      #
+      # Internally it uses _parsedate!_ so can throw a exception if an invalid date is supplied.
+      def self.age(born, date=::Date.today)
+        born = parsedate!(born)
+        date = parsedate!(date)
+        date.year - born.year + (date.yday - born.yday) / 366.0
+      end
     end
   end
 end

data/lib/icu_ratings/version.rb

@@ -2,6 +2,6 @@
 
 module ICU
   class Ratings
-    VERSION = "1.7.0"
+    VERSION = "1.8.0"
   end
 end

data/spec/util_spec.rb

@@ -1,63 +1,65 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 module ICU
-  describe Util do
-    context "#parsedate!" do
-      it "should return instances of class Date" do
-        Util.parsedate!('2001-01-01').should be_a(Date)
-      end
+  module Util
+    describe Date do
+      context "#parsedate!" do
+        it "should return instances of class Date" do
+          Date.parsedate!('2001-01-01').should be_a(::Date)
+        end
 
-      it "should parse standard dates" do
-        Util.parsedate!('2001-01-01').to_s.should == '2001-01-01'
-        Util.parsedate!('1955-11-09').to_s.should == '1955-11-09'
-      end
+        it "should parse standard dates" do
+          Date.parsedate!('2001-01-01').to_s.should == '2001-01-01'
+          Date.parsedate!('1955-11-09').to_s.should == '1955-11-09'
+        end
 
-      it "should handle US format" do
-        Util.parsedate!('03/30/2009').to_s.should == '2009-03-30'
-      end
+        it "should handle US format" do
+          Date.parsedate!('03/30/2009').to_s.should == '2009-03-30'
+        end
 
-      it "should handle European format" do
-        Util.parsedate!('30/03/2009').to_s.should == '2009-03-30'
-      end
+        it "should handle European format" do
+          Date.parsedate!('30/03/2009').to_s.should == '2009-03-30'
+        end
 
-      it "should prefer European format" do
-        Util.parsedate!('02/03/2009').to_s.should == '2009-03-02'
-      end
+        it "should prefer European format" do
+          Date.parsedate!('02/03/2009').to_s.should == '2009-03-02'
+        end
 
-      it "should handle US style when there's no alternative" do
-        Util.parsedate!('02/23/2009').to_s.should == '2009-02-23'
-      end
+        it "should handle US style when there's no alternative" do
+          Date.parsedate!('02/23/2009').to_s.should == '2009-02-23'
+        end
 
-      it "should handle single digits" do
-        Util.parsedate!('9/8/2006').to_s.should == '2006-08-09'
-      end
+        it "should handle single digits" do
+          Date.parsedate!('9/8/2006').to_s.should == '2006-08-09'
+        end
 
-      it "should handle names of months" do
-        Util.parsedate!('9th Nov 1955').to_s.should == '1955-11-09'
-        Util.parsedate!('16th June 1986').to_s.should == '1986-06-16'
-      end
+        it "should handle names of months" do
+          Date.parsedate!('9th Nov 1955').to_s.should == '1955-11-09'
+          Date.parsedate!('16th June 1986').to_s.should == '1986-06-16'
+        end
 
-      it "should raise exception on error" do
-        lambda { Util.parsedate!('2010-13-32') }.should raise_error(/invalid date/)
-      end
+        it "should raise exception on error" do
+          lambda { Date.parsedate!('2010-13-32') }.should raise_error(/invalid date/)
+        end
 
-      it "should accept Date objects as well as strings" do
-        Util.parsedate!(Date.parse('2013-07-01')).should == Date.parse('2013-07-01')
+        it "should accept Date objects as well as strings" do
+          Date.parsedate!(::Date.parse('2013-07-01')).should == ::Date.parse('2013-07-01')
+        end
       end
-    end
 
-    context "#age" do
-      it "should return age in years" do
-        Util.age('2001-01-01', '2001-01-01').should == 0.0
-        Util.age('2001-01-01', '2002-01-01').should == 1.0
-        Util.age('2001-01-01', '2001-01-02').should be_within(0.01).of(1/365)
-        Util.age('2001-01-01', '2001-02-01').should be_within(0.01).of(1/12.0)
-        Util.age('1955-11-09', '2010-01-17').should be_within(0.01).of(54.2)
-        Util.age('2001-01-01', '2000-01-01').should == -1.0
-      end
+      context "#age" do
+        it "should return age in years" do
+          Date.age('2001-01-01', '2001-01-01').should == 0.0
+          Date.age('2001-01-01', '2002-01-01').should == 1.0
+          Date.age('2001-01-01', '2001-01-02').should be_within(0.01).of(1/365)
+          Date.age('2001-01-01', '2001-02-01').should be_within(0.01).of(1/12.0)
+          Date.age('1955-11-09', '2010-01-17').should be_within(0.01).of(54.2)
+          Date.age('2001-01-01', '2000-01-01').should == -1.0
+        end
 
-      it "should default second date to today" do
-        Util.age(Date.today).should == 0.0
+        it "should default second date to today" do
+          Date.age(::Date.today).should == 0.0
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: icu_ratings
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-31 00:00:00.000000000 Z
+date: 2013-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -112,7 +112,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3613568099200182560
+      hash: -933146652784732237
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3613568099200182560
+      hash: -933146652784732237
 requirements: []
 rubyforge_project: icu_ratings
 rubygems_version: 1.8.23