interpreted_date 0.0.3 → 0.0.4

data/lib/interpreted_date/version.rb

@@ -1,3 +1,3 @@
 class InterpretedDate
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/interpreted_date.rb

@@ -17,6 +17,32 @@ class InterpretedDate
     new(year: date.year, month: date.month, day: date.day)
   end
 
+  def decade=(value)
+    @decade = value.to_i  if value
+  end
+
+  def year=(value)
+    @year = value.to_i  if value
+  end
+
+  def month=(value)
+    if value.nil?
+      @month = nil
+    elsif value.to_i == 0
+      if Date::ABBR_MONTHNAMES.index(value) && Date::ABBR_MONTHNAMES.index(value) > 0
+        @month = Date::ABBR_MONTHNAMES.index(value)
+      elsif Date::MONTHNAMES.index(value) && Date::MONTHNAMES.index(value) > 0 
+        @month = Date::MONTHNAMES.index(value)
+      end
+    else
+      @month = value.to_i
+    end
+  end
+
+  def day=(value)
+    @day = value.to_i  if value
+  end
+
   def interpreted_year
     @interpreted_year ||= year || (decade && (decade + 5)) || DEFAULT_YEAR
   end
@@ -42,22 +68,25 @@ class InterpretedDate
 
   def to_s(options = {})
     preposition = options.fetch(:preposition) { false }
+    output = nil
     if day && month && year && date
-      date.strftime("%B %-d, %Y")
+      output = preposition ? "on " : ""
+      output << date.strftime("%B %-d, %Y")
     elsif month && year && date
-      date.strftime("%B %Y")
+      output = preposition ? "in " : ""
+      output << date.strftime("%B %Y")
     elsif year && date
       output = preposition ? "in " : ""
       output << date.strftime("%Y")
-      output
     elsif decade
       output = preposition ? "in the " : ""
       output << decade.to_s
       output << "s"
-      output
     elsif day && month && date
-      date.strftime("%B %-d")
+      output = preposition ? "on " : ""
+      output << date.strftime("%B %-d")
     end
+    output
   end
 
   def self.from_json(json)

data/spec/interpreted_date_spec.rb

@@ -56,6 +56,11 @@ describe InterpretedDate do
     it "returns the right integer" do
       subject.to_i.should eq(Date.new(1955, 3).to_time.to_i)
     end
+
+    it "returns the right string with a preposition" do
+      subject.to_s(preposition: true).should eq("in March 1955")
+    end
+
   end
 
   describe "with decade, year, month and day" do
@@ -68,6 +73,11 @@ describe InterpretedDate do
     it "returns the right integer" do
       subject.to_i.should eq(Date.new(1955, 3, 1).to_time.to_i)
     end
+
+    it "returns the right string with a preposition" do
+      subject.to_s(preposition: true).should eq("on March 1, 1955")
+    end
+
   end
 
   describe "with month and day" do
@@ -80,6 +90,11 @@ describe InterpretedDate do
     it "returns nil integer" do
       subject.to_i.should be_nil
     end
+
+    it "returns the right string with a preposition" do
+      subject.to_s(preposition: true).should eq("on October 31")
+    end
+
   end
 
   describe "with invalid date" do
@@ -100,6 +115,18 @@ describe InterpretedDate do
     it "correctly parses the json" do
       subject.should == InterpretedDate.from_json('year' => 2012, 'month' => 2, 'day' => 31)
     end
+
+    it "correctly parses dates where values are strings" do
+      subject.should == InterpretedDate.from_json('year' => 2012, 'month' => '2', 'day' => 31)
+    end
+
+    it "correctly parses date where the month is given by name" do
+      subject.should == InterpretedDate.from_json('year' => 2012, 'month' => 'February', 'day' => 31)
+    end
+
+    it "correctly parses date where the month is given by abbreviated name" do
+      subject.should == InterpretedDate.from_json('year' => 2012, 'month' => 'Feb', 'day' => 31)
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: interpreted_date
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors: