partial-date 1.1.2 → 1.1.3

data/ChangeLog.textile

@@ -1,3 +1,9 @@
+h3. 1.1.3 / 2012-05-28
+
+* Bugfix: Fixed ZERO_DAY_MASK - which contained an extra bit, and was zeroing month when a day was set.
+* Check that day is set to zero if month is.
+* Added padding to string format for date.
+
 h3. 1.1.2 / 2012-05-27
 
 * Fixed syntax error in example code from README.

data/lib/partial-date/bits.rb

@@ -13,7 +13,7 @@ module PartialDate
 
     ZERO_YEAR_MASK = 0b00000000000000111111111
     ZERO_MONTH_MASK = 0b11111111111111000011111
-    ZERO_DAY_MASK = 0b111111111111111111000000
+    ZERO_DAY_MASK = 0b11111111111111111000000
 
     def self.get_date(register)
         (get_year(register) * 10000) + (get_month(register) * 100) + get_day(register)

data/lib/partial-date/date.rb

@@ -145,6 +145,7 @@ module PartialDate
 
       if value.is_a?(Integer) && (value <= 12 && value >= 0)
         @bits = Bits.set_month(@bits, value)
+        @bits = Bits.set_day(@bits, 0) if value == 0
       else
         raise PartialDateError, "Month must an be integer between 1 and 12"
       end
@@ -200,20 +201,40 @@ module PartialDate
     # Returns string representation of date.
     def to_s
       if self.year > 0
-        result = self.year.to_s 
-        result = result + "-" + self.month.to_s if self.month > 0
-        result = result + "-" + self.day.to_s if self.day > 0
+        result = self.year.to_s.rjust(4, '0') 
+        result = result + "-" + self.month.to_s.rjust(2, '0') if self.month > 0
+        result = result + "-" + self.day.to_s.rjust(2, '0') if self.day > 0
         return result
       else
         return ""
       end
     end
 
-    # Public: Spaceship operator for date comparisons.
+    # Public: Spaceship operator for date comparisons. Comparisons start
+    # with year, then month, then day - which are bitmask functions and 
+    # faster than 'self.value' which requires math to produce the integer.
     #
     # Returns -1, 1, or 0
     def <=>(other_date)
-      self.value <=> other_date.value
+      if self.year < other_date.year
+        -1
+      elsif self.year > other_date.year
+        1
+      else
+        if self.month < other_date.month
+          -1
+        elsif self.month > other_date.month
+          1
+        else
+          if self.day < other_date.day
+            -1
+          elsif self.day > other_date.day
+            1
+          else
+            0
+          end
+        end
+      end
     end
   end
 end

data/lib/partial-date/version.rb

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

data/partial-date.gemspec

@@ -5,8 +5,8 @@ require File.expand_path('../lib/partial-date/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.name          = "partial-date"
   gem.version       = PartialDate::VERSION
-  gem.summary       = "A simple date class that can be used to store partial date values in a single column/attribute." 
-  gem.description   = "A simple date class that can be used to store partial date values in a single column/attribute. An example use case would include an archive, or catalogue entry where the complete date is unknown."
+  gem.summary       = %q{A simple date class that can be used to store partial date values in a single column/attribute.} 
+  gem.description   = %q{A simple date class that can be used to store partial date values in a single column/attribute. An example use case would include an archive, or catalogue entry where the complete date is unknown.}
   gem.license       = "MIT"
   gem.authors       = ["Anthony Bouch"]
   gem.email         = ["tony@58bits.com"]

data/spec/date_spec.rb

@@ -9,6 +9,10 @@ describe PartialDate::Date do
     PartialDate.const_get('VERSION').should_not be_empty
   end
 
+  it "should return an empty string for an empty date" do
+    date.to_s.should == ""
+  end
+
   it "should have a readable value attribute" do
     date.year = 2000
     date.value.should == 20000000
@@ -166,19 +170,55 @@ describe PartialDate::Date do
   end
 
   describe "Comparisons" do
-    it "should determine if one date is greater than another" do
+    it "should determine if one date is greater than another based on year" do
+        a = PartialDate::Date.new {|d| d.year = 2013; }
+        b = PartialDate::Date.new {|d| d.year = 2012; }
+        a.should be > b
+    end
+
+    it "should determine if one date is less than another based on year" do
+        a = PartialDate::Date.new {|d| d.year = 2011; }
+        b = PartialDate::Date.new {|d| d.year = 2012; }
+        a.should be < b
+    end
+
+    it "should determine if one date is equal to another based on year" do
+        a = PartialDate::Date.new {|d| d.year = 2012; }
+        b = PartialDate::Date.new {|d| d.year = 2012; }
+        a.should be == b
+    end
+
+    it "should determine if one date is greater than another based on month" do
+        a = PartialDate::Date.new {|d| d.year = 2012; d.month = 11; }
+        b = PartialDate::Date.new {|d| d.year = 2012; d.month = 10 }
+        a.should be > b
+    end
+
+    it "should determine if one date is less than another based on month" do
+        a = PartialDate::Date.new {|d| d.year = 2012; d.month = 9; }
+        b = PartialDate::Date.new {|d| d.year = 2012; d.month = 10 }
+        a.should be < b
+    end
+
+    it "should determine if one date is equal to another based on month" do
+        a = PartialDate::Date.new {|d| d.year = 2012; d.month = 10; }
+        b = PartialDate::Date.new {|d| d.year = 2012; d.month = 10 }
+        a.should be == b
+    end
+
+    it "should determine if one date is greater than another based on day" do
         a = PartialDate::Date.new {|d| d.year = 2012; d.month = 12; d.day = 31}
         b = PartialDate::Date.new {|d| d.year = 2012; d.month = 12; d.day = 30}
         a.should be > b
     end
 
-    it "should determine if one date is less than another" do
-        a = PartialDate::Date.new {|d| d.year = 2012; d.month = 0; d.day = 0}
+    it "should determine if one date is less than another based on day" do
+        a = PartialDate::Date.new {|d| d.year = 2012; d.month = 12; d.day = 29}
         b = PartialDate::Date.new {|d| d.year = 2012; d.month = 12; d.day = 30}
         a.should be < b
     end
 
-    it "should determine if one date is equal to another" do
+    it "should determine if one date is equal to another based on day" do
         a = PartialDate::Date.new {|d| d.year = 2012; d.month = 12; d.day = 30}
         b = PartialDate::Date.new {|d| d.year = 2012; d.month = 12; d.day = 30}
         a.should be == b

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 gem 'rspec', '~> 2.4'
 require 'rspec'
 require 'partial-date/version'
-
+require 'simplecov'
+SimpleCov.start

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: partial-date
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-27 00:00:00.000000000 Z
+date: 2012-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubygems-tasks