kronos 0.1.9 → 0.1.10

data/lib/kronos.rb

@@ -40,21 +40,37 @@ class Kronos
     s
   end
 
-  def valid?
-    return false if day && (!month || !year)
-    return false if month && !year
-    return false if !year
-    return false if year && !((1970 .. 2069) === year)
-    return false if month && !((1 .. 12) === month)
-    return false if day && !((1 .. 31) === day)
-    if year && month && day
-      begin
-        Date.new(year, month, day)
-      rescue ArgumentError
-        return false
+  def errors
+    errors = []
+    if day && (!month || !year)
+      errors << "if day is given, then month and year must also be given"
+    elsif month && !year
+      errors << "if month is given, then year must also be given"
+    elsif !year
+      errors << "year must be given"
+    else
+      if day && !((1 .. 31) === day)
+        errors << "day (#{day}) must be between 1 and 31"
+      end
+      if month && !((1 .. 12) === month)
+        errors << "month (#{month}) must be between 1 and 12"
+      end
+      if year && !((1970 .. 2069) === year)
+        errors << "year (#{year}) must be between 1970 and 2069"
+      end
+      if errors.length == 0 && day && month && year
+        begin
+          Date.new(year, month, day)
+        rescue ArgumentError
+          errors << "date (#{year}-#{month}-#{day}) must be valid"
+        end
       end
     end
-    true
+    errors
+  end
+
+  def valid?
+    errors.length == 0
   end
 
   def <(other)

data/lib/version.rb

@@ -3,7 +3,7 @@ class Kronos
   module Version
     MAJOR = 0
     MINOR = 1
-    PATCH = 9
+    PATCH = 10
     BUILD = nil
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
   end

data/spec/errors_spec.rb

@@ -0,0 +1,71 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "Kronos Comparisons" do
+
+  def new_kronos(year=nil, month=nil, day=nil)
+    k = Kronos.new
+    k.year  = year if year
+    k.month = month if month
+    k.day   = day if day
+    k
+  end
+
+  it "year only is valid" do
+    new_kronos(2005).errors.should == []
+  end
+
+  it "month and year is valid" do
+    new_kronos(2005, 8).errors.should == []
+  end
+
+  it "day and year is invalid" do
+    errors = new_kronos(2005, nil, 22).errors
+    errors.length.should == 1
+    errors.should include("if day is given, then month and year must also be given")
+  end
+
+  it "nothing is invalid" do
+    errors = new_kronos(nil, nil, nil).errors
+    errors.length.should == 1
+    errors.should include("year must be given")
+  end
+
+  it "month, day, and year is valid" do
+    new_kronos(2005, 8, 22).errors.should == []
+  end
+
+  it "month, day, and year with out-of-range month is invalid" do
+    errors = new_kronos(2005, 13, 22).errors
+    errors.length.should == 1
+    errors.should include("month (13) must be between 1 and 12")
+  end
+
+  it "month, day, and year with out-of-range day is invalid" do
+    errors = new_kronos(2005, 4, 32).errors
+    errors.length.should == 1
+    errors.should include("day (32) must be between 1 and 31")
+  end
+
+  it "June 0, 2005 is invalid" do
+    errors = new_kronos(2005, 6, 0).errors
+    errors.length.should == 1
+    errors.should include("day (0) must be between 1 and 31")
+  end
+
+  it "June 31, 2005 is invalid" do
+    errors = new_kronos(2005, 6, 31).errors
+    errors.length.should == 1
+    errors.should include("date (2005-6-31) must be valid")
+  end
+
+  it "February 29, 2008 is valid" do
+    new_kronos(2008, 2, 29).errors.should == []
+  end
+
+  it "February 29, 2010 is invalid" do
+    errors = new_kronos(2010, 2, 29).errors
+    errors.length.should == 1
+    errors.should include("date (2010-2-29) must be valid")
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kronos
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 1
-  - 9
-  version: 0.1.9
+  - 10
+  version: 0.1.10
 platform: ruby
 authors: 
 - David James
@@ -99,6 +99,7 @@ files:
 - lib/kronos.rb
 - lib/version.rb
 - spec/compare_spec.rb
+- spec/errors_spec.rb
 - spec/from_hash_spec.rb
 - spec/parse_spec.rb
 - spec/spec.opts
@@ -141,6 +142,7 @@ specification_version: 3
 summary: Simple and flexible date parsing.
 test_files: 
 - spec/compare_spec.rb
+- spec/errors_spec.rb
 - spec/from_hash_spec.rb
 - spec/parse_spec.rb
 - spec/spec_helper.rb