american_date 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6fc099c8faff7f7a245c01f54bcc32c4770fa8d
-  data.tar.gz: 0b072c3a750fc6fb6ac0bc81c730ff1fae5e6889
+  metadata.gz: 31ef507a1c4d779f57d7d4b282cc9ab599486a51
+  data.tar.gz: 81ab0504ac210e53f7ee924733b9563209fbdc61
 SHA512:
-  metadata.gz: deff8c7fd14b1b48d4e88fd6f3257931623206746cdd2f8947f329ec441edf136fe94b3fce081cecfb4e2601563669b0bdc5ed33288a06e690ce14fefa8e4803
-  data.tar.gz: 1a9b4920b7396ba32f4589168943fa1870d256e3ef6fa5c7ed529fc396fc9d05d32f53513b8cff6a4b61f893c2ddd7292276a7b2a90058dbcf95a4f869b29377
+  metadata.gz: ac9c93467143930a15273c7b89890e017a0cfeedae78899279912585883c666ff1e4ad6355639f442d2b29c30241b09d6888b3892a8d9f7b9bebdef747eefe87
+  data.tar.gz: 2918ae5d191f828fb89500181c2c53e10720f52621cc51156c7f5d32400397b6fe7d75b8c09f412fd7b4a1588133e2499f10dee609b5e0a748233bf0801c6c7a

data/CHANGELOG

@@ -1,4 +1,8 @@
-=== HEAD
+=== 1.1.0 (2013-03-23)
+
+* Handle MM/DD/YYYY substrings in the middle of strings, not just the beginning (sd, clonezone, jeremyevans) (#5)
+
+=== 1.0.1 (2013-03-20)
 
 * Don't freeze the regular expression used, to allow easier overrides (jeremyevans)
 

data/README.rdoc

@@ -1,9 +1,9 @@
 = ruby-american_date
 
-ruby-american_date exists to make ruby versions greater than 1.8
-parse american-style month/day/year dates correctly, just like
-ruby 1.8.  It can also be used on ruby 1.8, but it is basically a
-noop there.
+ruby-american_date exists to make ruby 1.9+ parse american-style
+month/day/year dates correctly, with behavior matching ruby 1.8.7.
+It can also be used on earlier ruby version, but it is basically
+a noop there.
 
 As far as I know, there isn't a gem that already handles this. You
 can find many snippets on the web that partially solve the issue, but
@@ -12,19 +12,17 @@ DateTime.parse no longer call Date._parse directly on 1.9.3. Also
 most don't handle cases where an american date format is used in
 addition to a time format.
 
+Note that this gem only handles / separated dates.  It does not
+handle - or . separated dates.  This is by design.
+
 == Design
 
-The general idea is fairly simple.  We just check the beginning of
-the input string for an american date format, and transform it into
-a year-month-day ISO format before passing it to the standard date
-parsing methods.  This is probably the least invasive way that works
-correctly on both the pure-ruby date parser (<1.9.3) and the C
-extension date parser (>=1.9.3).
-
-To reduce the possibility of problems, only the beginning of the
-input string is checked.  So if you have an american date format
-embedded in the middle of the input string, it won't be translated.
-That may change in the future if it is determined to be safe.
+The general idea is fairly simple.  We look for a month/day/year
+substring in the input string, and if we find it, we transform it
+into a year-month-day ISO format string before passing it to the
+standard date parsing methods.  This is probably the least invasive
+way that works correctly on both the pure-ruby date parser (<1.9.3)
+and the C extension date parser (>=1.9.3).
 
 == Tested ruby versions
 

data/lib/american_date.rb

@@ -4,7 +4,10 @@ if RUBY_VERSION >= '1.9'
   # Modify parsing methods to handle american date format correctly.
   class << Date
     # American date format detected by the library.
-    AMERICAN_DATE_RE = %r_\A\s*(\d{1,2})/(\d{1,2})/(\d{4}|\d{2})_
+    AMERICAN_DATE_RE = eval('%r_(?<!\d)(\d{1,2})/(\d{1,2})/(\d{4}|\d{2})(?!\d)_').freeze
+    # Negative lookbehinds, which are not supported in Ruby 1.8
+    # so by using eval, we prevent an error when this file is first parsed
+    # since the regexp itself will only be parsed at runtime if the RUBY_VERSION condition is met.
 
     # Alias for stdlib Date._parse
     alias _parse_without_american_date _parse

data/spec/american_date_spec.rb

@@ -27,6 +27,24 @@ describe "Date.parse" do
     Date.parse('  01/02/2003').should == Date.new(2003, 1, 2)
   end
 
+  specify "should ignore preceding weekday" do
+    Date.parse('Day 01/02/2003').should == Date.new(2003, 1, 2)
+  end
+
+  specify "should work just like 1.8 does" do
+    Date.parse('10:20:30something01/02/2003else').should == Date.new(2003, 1, 2)
+  end
+
+  specify "should not mismatch years" do
+    Date.parse('2003/01/02').should == Date.new(2003, 1, 2)
+  end
+
+  specify "should behave like 1.8 and only allow / as delimiters in american-style dates" do
+    Date.parse("10/11/2012").should == Date.new(2012, 10, 11)
+    Date.parse("10-11-2012").should == Date.new(2012, 11, 10)
+    Date.parse("10.11.2012").should == Date.new(2012, 11, 10)
+  end
+
   if RUBY_VERSION > '1.9'
     specify "should raise TypeError for invalid values" do
       [nil, 1, 1.0, [], {}].each do |x|
@@ -74,10 +92,26 @@ describe "DateTime.parse" do
     DateTime.parse('  01/02/2003').should == DateTime.new(2003, 1, 2)
   end
 
+  specify "should ignore preceding weekday" do
+    DateTime.parse('Day 01/02/2003').should == Date.new(2003, 1, 2)
+  end
+
   specify "should work with times" do
     DateTime.parse('01/02/2003 10:20:30').should == DateTime.new(2003, 1, 2, 10, 20, 30)
   end
 
+  specify "should work with times and weekdays" do
+    DateTime.parse('Day 01/02/2003 10:20:30').should == DateTime.new(2003, 1, 2, 10, 20, 30)
+  end
+
+  specify "should work just like 1.8 does" do
+    DateTime.parse('10:20:30something01/02/2003else').should == DateTime.new(2003, 1, 2, 10, 20, 30)
+  end
+
+  specify "should not mismatch years" do
+    DateTime.parse('2003/01/02').should == Date.new(2003, 1, 2)
+  end
+
   if RUBY_VERSION > '1.9'
     specify "should raise TypeError for invalid values" do
       [nil, 1, 1.0, [], {}].each do |x|
@@ -124,10 +158,34 @@ describe "Time.parse" do
     Time.parse('  01/02/2003').should == Time.local(2003, 1, 2)
   end
 
+  specify "should ignore preceding weekdays" do
+    Time.parse('Day 01/02/2003').should == Time.local(2003, 1, 2)
+  end
+
   specify "should work with times" do
     Time.parse('01/02/2003 10:20:30').should == Time.local(2003, 1, 2, 10, 20, 30)
   end
 
+  specify "should work with times and weekdays" do
+    Time.parse('Day 01/02/2003 10:20:30').should == Time.local(2003, 1, 2, 10, 20, 30)
+  end
+
+  specify "should work with time first and date second" do
+    Time.parse('10:20:30 01/02/2003').should == Time.local(2003, 1, 2, 10, 20, 30)
+  end
+
+  specify "should work with time first and date second and weekday in the middle" do
+    Time.parse('10:20:30 Thu 01/02/2003').should == Time.local(2003, 1, 2, 10, 20, 30)
+  end
+
+  specify "should work just like 1.8 does" do
+    Time.parse('10:20:30something01/02/2003else').should == Time.local(2003, 1, 2, 10, 20, 30)
+  end
+
+  specify "should not mismatch years" do
+    Time.parse('2003/01/02').should == Time.local(2003, 1, 2, 0, 0, 0)
+  end
+
   if RUBY_VERSION > '1.9'
     specify "should raise TypeError for invalid values" do
       [nil, 1, 1.0, [], {}].each do |x|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: american_date
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-20 00:00:00.000000000 Z
+date: 2013-03-22 00:00:00.000000000 Z
 dependencies: []
 description: American style month/day/year date parsing for ruby 1.9
 email: code@jeremyevans.net