partial-date 1.1.5 → 1.1.6

data/ChangeLog.textile

@@ -1,3 +1,8 @@
+h3. 1.1.6 / 2012-05-30
+
+* Bugfix: Checked that sign is switched off when a postive year is set after a negative year.
+* Bugfix: Fixed to_s again (before formatters are implemented).
+
 h3. 1.1.5 / 2012-05-30
 
 * Allow negative years and year range from -1048576 to 1048576 (20 bits).

data/lib/partial-date/date.rb

@@ -133,13 +133,12 @@ module PartialDate
     #
     # Returns nothing  
     def year=(value)
-
       if value.nil?
         raise YearError, "Year cannot be nil"
       end
 
       if value.is_a?(String) 
-        if value =~ /\A\d{1,7}\z/
+        if value =~ /\A\-?\d{1,7}\z/
           value = value.to_i
         else
           raise YearError, "Year must be a valid string or integer from -1048576 to 1048576"
@@ -149,7 +148,7 @@ module PartialDate
       if value.is_a?(Integer) && (value >= -1048576 && value <= 1048576) 
         @bits = self.class.set_year(@bits, value)
       else
-        raise YearError, "Year must be an integer integer from -1048576 to 1048576"
+        raise YearError, "Year must be an integer from -1048576 to 1048576"
       end
     end
 
@@ -160,7 +159,6 @@ module PartialDate
 
     # Public: Set the month of a partial date.
     def month=(value)
-
       value = 0 if value.nil?
 
       if value.is_a?(String) 
@@ -188,7 +186,6 @@ module PartialDate
     # Public: Set the day portion of a partial date. Day is optional so zero, 
     # nil and empty strings are allowed.
     def day=(value)
-
       raise DayError, "A month must be set before a day" if month == 0
 
       value = 0 if value.nil?
@@ -228,14 +225,15 @@ module PartialDate
     #
     # Returns string representation of date.
     def to_s
-      if year > 0
-        result = year.to_s.rjust(4, '0') 
-        result = result + "-" + month.to_s.rjust(2, '0') if month > 0
+      result = ""
+      if value != 0
+        result = year.to_s.rjust(4, '0') if year != 0
+        result = result + "-" if result.length > 3
+        result = result + month.to_s.rjust(2, '0') if month > 0
         result = result + "-" + day.to_s.rjust(2, '0') if day > 0
         return result
-      else
-        return ""
       end
+      result
     end
 
     # Public: Spaceship operator for date comparisons. Comparisons are
@@ -283,6 +281,7 @@ module PartialDate
 
     def self.set_year(register, value)
       register = set_sign(register, 1) if value < 0
+      register = set_sign(register, 0) if value >= 0
       register = (register & ZERO_YEAR_MASK) | (value.abs << YEAR_SHIFT)
     end
 

data/lib/partial-date/version.rb

@@ -1,4 +1,4 @@
 module PartialDate
   # partial-date version
-    VERSION = "1.1.5"
+    VERSION = "1.1.6"
 end

data/spec/date_spec.rb

@@ -92,7 +92,7 @@ describe PartialDate::Date do
     end
 
     it "should raise an error if year is set to a value greater than 1048576" do
-      expect {date.year = 1048577 }.to raise_error(PartialDate::YearError, "Year must be an integer integer from -1048576 to 1048576")
+      expect {date.year = 1048577 }.to raise_error(PartialDate::YearError, "Year must be an integer from -1048576 to 1048576")
     end
 
     it "should return a postive year when a positive year is set" do
@@ -104,6 +104,16 @@ describe PartialDate::Date do
       date.year = -9999
       date.year.should == -9999
     end
+
+    it "should allow a valid string value" do
+      date.year = "2010"
+      date.year.should == 2010
+    end
+
+    it "should allow a negative value in a string" do
+      date.year = "-2010"
+      date.year.should == -2010
+    end
   end
 
   describe "Month" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: partial-date
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
   prerelease: 
 platform: ruby
 authors: