Merge pull request #12 from mrdougal/published-at-fixes

Fixes to meta 'published' and 'updated' methods, on ruby 2.0.0

Author: mdub

lib/pith/plugins/publication/input.rb

@@ -22,7 +22,18 @@ def updated_at
         private
 
         def parse_date(date_string)
-          Time.parse(date_string) if date_string
+          
+          return unless date_string
+          
+          # yaml may parse the date for us, in which case
+          # we will be passed a Time or Date object
+          return date_string if date_string.instance_of? Time
+          return date_string.to_time if date_string.respond_to?('to_time')
+
+          # cast to a string prior to casting
+          # as ruby 1.8.7 Date doesn't respond to 'to_time'
+          Time.parse(date_string.to_s)
+          
         end
 
       end

spec/pith/plugins/publication_spec.rb

@@ -19,6 +19,16 @@
       @template.published_at.should == Time.local(1999, 12, 25, 22, 30)
     end
 
+    it "honours any parsing (of Time) that yaml may do on the 'published' meta-field" do
+      @template.meta["published"] = Time.local(1999, 12, 25, 22, 30)
+      @template.published_at.should == Time.local(1999, 12, 25, 22, 30)
+    end
+
+    it "honours any parsing (to Date) of time that yaml may do on the 'published' meta-field" do
+      @template.meta["published"] = Date.new(1999, 12, 25)
+      @template.published_at.should == Time.local(1999, 12, 25)
+    end
+
   end
 
   describe "#updated_at" do
@@ -30,9 +40,14 @@
 
     it "can be overridden with an 'updated' meta-field" do
       @template.meta["published"] = "25 Dec 1999 22:30"
-      @template.meta["published"] = "1 Jan 2000 03:00"
+      @template.meta["updated"] = "1 Jan 2000 03:00"
       @template.updated_at.should == Time.local(2000, 1, 1, 3, 0)
     end
+    
+    it "honours any parsing of time that yaml may do on the 'updated' meta-field" do
+      @template.meta["updated"] = Date.new(2000, 1, 1)
+      @template.updated_at.should == Time.local(2000, 1, 1)
+    end
 
   end