todoist_date_time 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/todoist_date_time.rb

@@ -99,10 +99,19 @@ module TodoistDateTime
             parts[0] = Date::MONTHNAMES.find{ |month| month =~ Regexp.new("^" + parts[0], Regexp::IGNORECASE) unless month.nil? }
           end
 
-          DateTime.parse( parts[1].to_s + "." + parts[0].to_s + "." + (parts.count == 3 ? parts[2].to_s : Date.today.year).to_s )
+          parts[2] = Date.today.year unless parts.count == 3
+          parts.map!{|elem| elem.to_s}
 
+          if parts[0].to_i > 12
+            date_string = parts[0] + "." + parts[1]
+          else
+            date_string = parts[1] + "." + parts[0]
+          end
+          date_string += "." + parts[2]
+
+          DateTime.parse(date_string)
         else
-          begin            
+          begin
             DateTime.parse(date_string)
           rescue
             raise InvalidInput.new(datetime_string)

data/spec/todoist_date_time_spec.rb

@@ -96,12 +96,17 @@ describe "TodoistDateTime" do
         month.chars.to_a.each_with_index do |char, char_idx| # build dayname char by char and test each one
           month = @monthnames.find{ |month| month =~ Regexp.new("^" + month[0..char_idx], Regexp::IGNORECASE) unless month.nil? }
           expected_date = @today
-          expected_date += 1.month until expected_date.month == @monthnames.index(month)         
+          expected_date += 1.month until expected_date.month == @monthnames.index(month)
           (month[0..char_idx] + "/" + expected_date.day.to_s + "/" + expected_date.year.to_s).to_tddatetime.should == expected_date
         end
       end
     end
 
+    it "should parse '27/5', '27/5 2009' as 27.01. in YYYY or 2009" do
+      "27/5".to_tddatetime.should == DateTime.parse("27.05.#{Date.today.year}")
+      "27/5/2009".to_tddatetime.should == DateTime.parse("27.05.2009")
+    end
+
     it "should parse 'april/1', 'april/1/2009', '4/1', 4/1/2009', '1/april', '1/april/2009' as 01.04 in YYYY or 2009" do
       @date_parts_separators.each do |date_separator|
         @monthnames.each_index do |month_idx|

data/todoist_date_time.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{todoist_date_time}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kazuhiro Hiramatsu"]
-  s.date = %q{2010-02-01}
+  s.date = %q{2010-02-10}
   s.description = %q{Add into String class method which converts string value written in Todoist (http://todoist.com) datetime syntax into valid DateTime instance}
   s.email = %q{kaz_u@wp.pl}
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: todoist_date_time
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Kazuhiro Hiramatsu
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-01 00:00:00 +01:00
+date: 2010-02-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency