partial-date 1.1.8 → 1.1.9

data/ChangeLog.markdown

@@ -1,3 +1,8 @@
+### 1.1.9 / 2012-05-31
+
+* BugFix: to_s will preserve minus sign for negative year when formatter starts with %Y
+* BugFix: <=> correct for negative dates.
+
 ### 1.1.8 / 2012-05-30
 
 * Implemented to_s formatters.

data/lib/partial-date/date.rb

@@ -39,7 +39,7 @@ module PartialDate
 
   FORMATS = { :default => "%Y-%m-%d", :short => "%d %m %Y", :medium => "%d %b %Y", :long => "%d %B %Y", :number => "%Y%m%d",  }
   FORMAT_METHODS = { 
-                      "%Y" => lambda { |d| (d.year != 0) ? d.year.to_s.rjust(4, '0') : ""  },
+                      "%Y" => lambda { |d| (d.year != 0) ? d.year.to_s.rjust(4, '0') : ""},  
                       "%m" => lambda { |d| (d.month != 0) ? d.month.to_s.rjust(2, '0') : "" },
                       "%b" => lambda { |d| (d.month != 0) ? ABBR_MONTH_NAMES[d.month - 1] : "" },
                       "%B" => lambda { |d| (d.month != 0) ? MONTH_NAMES[d.month - 1] : "" },
@@ -266,22 +266,44 @@ module PartialDate
         result.gsub!( key, value.call( self )) if result.include? key
       end
 
-      result.strip!
       # Remove any leading "/-," chars.
       # Remove double white spaces.
       # Remove any duplicate "/-," chars and replace with the single char.
       # Remove any trailing "/-," chars.
-      # Anything else - the user is on their own ;-)
-      result = result.gsub(/\A[\/,-]+/, '').gsub(/\s\s/, ' ').gsub(/[\/\-,]([\/\-,])/, '\1').gsub(/[\/,-]+\z/, '')
+      # Anything else - you're on your own ;-)
+      lead_trim = (year != 0 && format.lstrip.start_with?("%Y")) ? /\A[\/\,\s]+/ : /\A[\/\,\-\s]+/ 
+      result = result.gsub(lead_trim, '').gsub(/\s\s/, ' ').gsub(/[\/\-\,]([\/\-\,])/, '\1').gsub(/[\/\,\-\s]+\z/, '')
     end
 
-    # Public: Spaceship operator for date comparisons. Comparisons are
-    # made using the bit containing backing store. However the sign bit 
-    # is in MSB - so we need to left shift both values by 1 first.
+    # Public: Spaceship operator for date comparisons. Comparisons 
+    # are made by cascading down from year, to month to day. This
+    # should be faster than passing to self.value <=> other_date.value
+    # since the integer value attribute requires multiplication to
+    # calculate.
     #
     # Returns -1, 1, or 0
     def <=>(other_date)
-      (@bits << 1) <=> (other_date.bits << 1)
+      if self.year < other_date.year
+        return -1
+      elsif self.year > other_date.year
+        return 1
+      else
+        if self.month < other_date.month
+          return -1
+        elsif
+          self.month > other_date.month
+          return 1
+        else
+          if self.day < other_date.day
+            return -1
+          elsif
+            self.day > other_date.day
+            return 1
+          else
+            return 0
+          end
+        end
+      end
     end
 
 

data/lib/partial-date/version.rb

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

data/spec/date_spec.rb

@@ -47,20 +47,7 @@ describe PartialDate::Date do
     expect {new_date = PartialDate::Date.new {|d| d.value = 10485761232 }}.to raise_error(PartialDate::PartialDateError, "Date value must be an integer betwen -10485761231 and 10485761231")
   end
 
-  it "should return a string representation of date in the correct format" do
-    new_date = PartialDate::Date.new {|d| d.year = 2012; d.month = 12; d.day = 31}
-    new_date.to_s.should match(/\A\d{4}-\d{2}-\d{2}\z/)
-  end
-
-  # it "should return a string representation of a partial date in the correct format" do
-  #   new_date = PartialDate::Date.new {|d| d.year = 2012; d.month = 12}
-  #   new_date.to_s.should match(/\\A\\d{4}-\\d{2}\\z/)
-  # end
 
-  # it "should return a string representation of a partial date in the correct format" do
-  #   new_date = PartialDate::Date.new {|d| d.year = 2012}
-  #   new_date.to_s.should match(/\\A\\d{4}\\z/)
-  # end
 
   describe "Sign" do
     it "should be set to 1" do
@@ -91,6 +78,11 @@ describe PartialDate::Date do
       expect {date.year = 1048577 }.to raise_error(PartialDate::YearError, "Year must be an integer from -1048576 to 1048576")
     end
 
+    it "should allow a negative year to be set from the block" do
+      date = PartialDate::Date.new { |d| d.year = -1000 }
+      date.year.should == -1000
+    end
+
     it "should return a postive year when a positive year is set" do
       date.year = 2050
       date.year.should == 2050
@@ -238,4 +230,17 @@ describe PartialDate::Date do
         a.should be == b
     end
   end
+
+  describe "String formats" do
+
+    it "should return a string representation of date in the correct format" do
+      new_date = PartialDate::Date.new {|d| d.year = 2012; d.month = 12; d.day = 31}
+      new_date.to_s.should match(/\A\d{4}-\d{2}-\d{2}\z/)
+    end
+
+    it "should have a minus sign in front of negative dates" do
+        date = PartialDate::Date.new { |d| d.year = -1000; d.month = 12; d.day = 1}
+        date.to_s.should start_with("-")
+    end
+  end
 end

metadata

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