kronos 0.1.10 → 0.2.0

data/lib/kronos.rb

@@ -3,6 +3,9 @@ require 'parsedate'
 
 class Kronos
 
+  class Exception < RuntimeError; end
+  class Invalid < Exception; end
+
   attr_accessor :year, :month, :day
 
   IGNORE_PATTERN = Regexp.compile("^prior")
@@ -33,7 +36,7 @@ class Kronos
 
   def to_s
     s = ""
-    raise "Invalid" unless valid?
+    raise Invalid, errors unless valid?
     s << "%04i" % year if year
     s << "-%02i" % month if month
     s << "-%02i" % day if day
@@ -97,11 +100,11 @@ class Kronos
         elsif self.day == other.day
           false
         else
-          raise "Unexpected"
+          raise Exception, "unexpected error"
         end
       end
     else
-      raise "Unexpected"
+      raise Exception, "unexpected error"
     end
   end
 
@@ -143,15 +146,16 @@ class Kronos
         elsif self.day == other.day
           false
         else
-          raise "Unexpected"
+          raise Exception, "unexpected error"
         end
       end
     else
-      raise "Unexpected"
+      raise Exception, "unexpected error"
     end
   end
 
   def to_hash
+    raise Invalid, errors unless valid?
     h = {}
     h['year']  = year  if year
     h['month'] = month if month
@@ -164,7 +168,7 @@ class Kronos
     o.year  = h['year']  if h['year']
     o.month = h['month'] if h['month']
     o.day   = h['day']   if h['day']
-    o if o.valid?
+    o
   end
 
   def self.parse(string)

data/lib/version.rb

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

data/spec/from_hash_spec.rb

@@ -38,7 +38,10 @@ describe "Kronos from_hash" do
       'month' => nil,
       'day'   => 9,
     })
-    k.should == nil
+    k.should be_instance_of(Kronos)
+    k.year.should == 2002
+    k.month.should == nil
+    k.day.should == 9
   end
 
 end

data/spec/parse_spec.rb

@@ -7,11 +7,6 @@ describe "Kronos" do
     c.year.should  == 2001
     c.month.should == 3
     c.day.should   == 15
-    c.to_hash.should == {
-      'year'  => 2001,
-      'month' => 3,
-      'day'   => 15,
-    }
   end
 
   it "January 1976" do
@@ -19,10 +14,6 @@ describe "Kronos" do
     c.year.should  == 1976
     c.month.should == 1
     c.day.should   == nil
-    c.to_hash.should == {
-      'year'  => 1976,
-      'month' => 1,
-    }
   end
 
   it "1991" do
@@ -30,9 +21,6 @@ describe "Kronos" do
     c.year.should  == 1991
     c.month.should == nil
     c.day.should   == nil
-    c.to_hash.should == {
-      'year'  => 1991,
-    }
   end
 
   it "91" do
@@ -40,9 +28,6 @@ describe "Kronos" do
     c.year.should  == 1991
     c.month.should == nil
     c.day.should   == nil
-    c.to_hash.should == {
-      'year'  => 1991,
-    }
   end
 
   it "'91" do
@@ -50,9 +35,6 @@ describe "Kronos" do
     c.year.should  == 1991
     c.month.should == nil
     c.day.should   == nil
-    c.to_hash.should == {
-      'year'  => 1991,
-    }
   end
 
   it "2019" do
@@ -60,9 +42,6 @@ describe "Kronos" do
     c.year.should  == 2019
     c.month.should == nil
     c.day.should   == nil
-    c.to_hash.should == {
-      'year'  => 2019,
-    }
   end
 
   it "19" do
@@ -70,9 +49,6 @@ describe "Kronos" do
     c.year.should  == 2019
     c.month.should == nil
     c.day.should   == nil
-    c.to_hash.should == {
-      'year'  => 2019,
-    }
   end
 
   it "'19" do
@@ -80,9 +56,6 @@ describe "Kronos" do
     c.year.should  == 2019
     c.month.should == nil
     c.day.should   == nil
-    c.to_hash.should == {
-      'year'  => 2019,
-    }
   end
 
   it "1/17/2007" do
@@ -90,11 +63,6 @@ describe "Kronos" do
     c.year.should  == 2007
     c.month.should == 1
     c.day.should   == 17
-    c.to_hash.should == {
-      'year'  => 2007,
-      'month' => 1,
-      'day'   => 17,
-    }
   end
 
   it "Aug-96" do
@@ -102,10 +70,6 @@ describe "Kronos" do
     c.year.should  == 1996
     c.month.should == 8
     c.day.should   == nil
-    c.to_hash.should == {
-      'year'  => 1996,
-      'month' => 8,
-    }
   end
 
   it "15-Mar-96" do
@@ -113,11 +77,6 @@ describe "Kronos" do
     c.year.should  == 1996
     c.month.should == 3
     c.day.should   == 15
-    c.to_hash.should == {
-      'year'  => 1996,
-      'month' => 3,
-      'day'   => 15,
-    }
   end
 
   it "nil" do
@@ -125,7 +84,6 @@ describe "Kronos" do
     c.year.should  == nil
     c.month.should == nil
     c.day.should   == nil
-    c.to_hash.should == {}
   end
 
   it "empty string" do
@@ -133,7 +91,6 @@ describe "Kronos" do
     c.year.should  == nil
     c.month.should == nil
     c.day.should   == nil
-    c.to_hash.should == {}
   end
 
   it "unknown" do
@@ -141,7 +98,6 @@ describe "Kronos" do
     c.year.should  == nil
     c.month.should == nil
     c.day.should   == nil
-    c.to_hash.should == {}
   end
 
   it "prior to 1998" do
@@ -149,7 +105,6 @@ describe "Kronos" do
     c.year.should  == nil
     c.month.should == nil
     c.day.should   == nil
-    c.to_hash.should == {}
   end
 
 end

data/spec/to_hash_spec.rb

@@ -0,0 +1,46 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "to_hash" 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 "2007-1-17" do
+    new_kronos(2007, 1, 17).to_hash.should == {
+      'year'  => 2007,
+      'month' => 1,
+      'day'   => 17,
+    }
+  end
+
+  it "1996-8" do
+    new_kronos(1996, 8).to_hash.should == {
+      'year'  => 1996,
+      'month' => 8,
+    }
+  end
+
+  it "1980" do
+    new_kronos(1980).to_hash.should == {
+      'year'  => 1980,
+    }
+  end
+
+  it "nil, nil, nil" do
+    lambda do
+      new_kronos(nil, nil, nil).to_hash.should raise(Kronos::Invalid)
+    end
+  end
+
+  it "nil, 7" do
+    lambda do
+      new_kronos(nil, 7).to_hash.should raise(Kronos::Invalid)
+    end
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kronos
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 10
-  version: 0.1.10
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - David James
@@ -104,6 +104,7 @@ files:
 - spec/parse_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/to_hash_spec.rb
 - spec/to_s_spec.rb
 - spec/valid_spec.rb
 has_rdoc: true
@@ -146,5 +147,6 @@ test_files:
 - spec/from_hash_spec.rb
 - spec/parse_spec.rb
 - spec/spec_helper.rb
+- spec/to_hash_spec.rb
 - spec/to_s_spec.rb
 - spec/valid_spec.rb