american_date 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31ef507a1c4d779f57d7d4b282cc9ab599486a51
-  data.tar.gz: 81ab0504ac210e53f7ee924733b9563209fbdc61
+  metadata.gz: 639c1dccbfe0dbf670569aaffb560c53ad3dac27
+  data.tar.gz: 0e6ab6b8a1847e58c5ef5cf4d93228b0f26f61f2
 SHA512:
-  metadata.gz: ac9c93467143930a15273c7b89890e017a0cfeedae78899279912585883c666ff1e4ad6355639f442d2b29c30241b09d6888b3892a8d9f7b9bebdef747eefe87
-  data.tar.gz: 2918ae5d191f828fb89500181c2c53e10720f52621cc51156c7f5d32400397b6fe7d75b8c09f412fd7b4a1588133e2499f10dee609b5e0a748233bf0801c6c7a
+  metadata.gz: e730ca1a4deae09680360f844048476abb5ea396c94222933fdf7687f20c1f6469925fd80c4599825c7cc5ea27cf0f11d7fe77b503f8dec59eb02790e82f8100
+  data.tar.gz: 2c69087b54b406a9b332ad65ae9b1cb0bbef7bf2c787b49ea5b7e864158e4f0b7f1541e6f40741796171e31d881aba094afa0758e6e836766e728baf84893ba8

data/CHANGELOG

@@ -1,3 +1,7 @@
+=== 1.1.1 (2015-10-27)
+
+* Support the third argument to Date/DateTime.parse (costi) (#13)
+
 === 1.1.0 (2013-03-23)
 
 * Handle MM/DD/YYYY substrings in the middle of strings, not just the beginning (sd, clonezone, jeremyevans) (#5)

data/README.rdoc

@@ -13,7 +13,8 @@ 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.
+handle - or . separated dates.  This is by design, for compatibility
+with ruby 1.8.7.
 
 == Design
 
@@ -26,12 +27,12 @@ and the C extension date parser (>=1.9.3).
 
 == Tested ruby versions
 
-* ruby 1.8.6, 1.8.7, 1.9.2, 1.9.3, 2.0.0
-* rubinius 1.2.4
-* jruby 1.6.5 (both --1.8 and --1.9 modes)
+* ruby 1.8.6, 1.8.7, 1.9.2, 1.9.3, 2.0.0, 2.1.0
+* rubinius 1.2.4, 2.2.6
+* jruby 1.6.5, 1.7.9 (both --1.8 and --1.9 modes)
 
 == Installation
-   
+
 ruby-american_date is distributed as a gem, and can be installed with:
 
   gem install american_date

data/Rakefile

@@ -9,30 +9,24 @@ rdoc_task_class = begin
   RDOC_OPTS.concat(['-f', 'hanna'])
   RDoc::Task
 rescue LoadError
-  require "rake/rdoctask"
-  Rake::RDocTask
+  begin
+    require "rake/rdoctask"
+    Rake::RDocTask
+  rescue RuntimeError
+  end
 end
 
-rdoc_task_class.new do |rdoc|
-  rdoc.rdoc_dir = "rdoc"
-  rdoc.options += RDOC_OPTS
-  rdoc.rdoc_files.add %w"lib/american_date.rb MIT-LICENSE CHANGELOG README.rdoc"
-end
-
-begin
-  require "spec/rake/spectask"
-  spec_class = Spec::Rake::SpecTask
-  spec_files_meth = :spec_files=
-rescue LoadError
-  # RSpec 2
-  require "rspec/core/rake_task"
-  spec_class = RSpec::Core::RakeTask
-  spec_files_meth = :pattern=
+if rdoc_task_class
+  rdoc_task_class.new do |rdoc|
+    rdoc.rdoc_dir = "rdoc"
+    rdoc.options += RDOC_OPTS
+    rdoc.rdoc_files.add %w"lib/american_date.rb MIT-LICENSE CHANGELOG README.rdoc"
+  end
 end
 
 desc "Run specs"
-spec_class.new("spec") do |t|
-  t.send(spec_files_meth, ["spec/american_date_spec.rb"])
+task :spec do
+  sh "#{FileUtils::RUBY} -rubygems -I lib spec/american_date_spec.rb"
 end
 task :default=>[:spec]
 

data/lib/american_date.rb

@@ -22,8 +22,8 @@ if RUBY_VERSION >= '1.9'
       alias parse_without_american_date parse
 
       # Transform american dates into ISO dates before parsing.
-      def parse(string, comp=true)
-        parse_without_american_date(convert_american_to_iso(string), comp)
+      def parse(string, comp=true, start=Date::ITALY)
+        parse_without_american_date(convert_american_to_iso(string), comp, start)
       end
     end
 
@@ -53,8 +53,8 @@ if RUBY_VERSION >= '1.9'
       alias parse_without_american_date parse
 
       # Transform american dates into ISO dates before parsing.
-      def parse(string, comp=true)
-        parse_without_american_date(convert_american_to_iso(string), comp)
+      def parse(string, comp=true, start=DateTime::ITALY)
+        parse_without_american_date(convert_american_to_iso(string), comp, start)
       end
     end
   end

data/spec/american_date_spec.rb

@@ -1,259 +1,262 @@
 require File.join(File.dirname(File.dirname(File.expand_path(__FILE__))), 'lib', 'american_date')
 require 'time'
+require 'minitest/autorun'
 
 describe "Date.parse" do
   specify "should use american date format for dd/mm/yy" do
-    Date.parse('01/02/03', true).should == Date.new(2003, 1, 2)
+    Date.parse('01/02/03', true).must_equal Date.new(2003, 1, 2)
+    Date.parse('01/02/03', true, Date::ITALY).must_equal Date.new(2003, 1, 2)
   end
 
   specify "should use american date format for d/m/yy" do
-    Date.parse('1/2/03', true).should == Date.new(2003, 1, 2)
-    Date.parse('1/2/03', false).should == Date.new(3, 1, 2)
+    Date.parse('1/2/03', true).must_equal Date.new(2003, 1, 2)
+    Date.parse('1/2/03', false).must_equal Date.new(3, 1, 2)
   end
 
   specify "should use american date format for dd/mm/yyyy" do
-    Date.parse('01/02/2003').should == Date.new(2003, 1, 2)
+    Date.parse('01/02/2003').must_equal Date.new(2003, 1, 2)
   end
 
   specify "should use american date format for dd/mm" do
-    Date.parse('01/02').should == Date.new(Time.now.year, 1, 2)
+    Date.parse('01/02').must_equal Date.new(Time.now.year, 1, 2)
   end
 
   specify "should use american date format for d/m" do
-    Date.parse('1/2').should == Date.new(Time.now.year, 1, 2)
+    Date.parse('1/2').must_equal Date.new(Time.now.year, 1, 2)
   end
 
   specify "should ignore preceding whitespace" do
-    Date.parse('  01/02/2003').should == Date.new(2003, 1, 2)
+    Date.parse('  01/02/2003').must_equal Date.new(2003, 1, 2)
   end
 
   specify "should ignore preceding weekday" do
-    Date.parse('Day 01/02/2003').should == Date.new(2003, 1, 2)
+    Date.parse('Day 01/02/2003').must_equal 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)
+    Date.parse('10:20:30something01/02/2003else').must_equal Date.new(2003, 1, 2)
   end
 
   specify "should not mismatch years" do
-    Date.parse('2003/01/02').should == Date.new(2003, 1, 2)
+    Date.parse('2003/01/02').must_equal 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)
+    Date.parse("10/11/2012").must_equal Date.new(2012, 10, 11)
+    Date.parse("10-11-2012").must_equal Date.new(2012, 11, 10)
+    Date.parse("10.11.2012").must_equal 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|
-        proc{Date.parse(x)}.should raise_error(TypeError)
+        proc{Date.parse(x)}.must_raise(TypeError)
       end
     end
 
     specify "should handle values implicitly convertible to String" do
       o = Object.new
       def o.to_str() '01/02/2003' end
-      Date.parse(o).should == Date.new(2003, 1, 2)
+      Date.parse(o).must_equal Date.new(2003, 1, 2)
     end
 
     specify "should handle values implicitly convertible to String" do
       o = Object.new
       def o.to_str() 1 end
-      proc{Date.parse(o)}.should raise_error(TypeError)
+      proc{Date.parse(o)}.must_raise(TypeError)
     end
   end
 end
 
 describe "DateTime.parse" do
   specify "should use american date format for dd/mm/yy" do
-    DateTime.parse('01/02/03', true).should == DateTime.new(2003, 1, 2)
+    DateTime.parse('01/02/03', true).must_equal DateTime.new(2003, 1, 2)
+    DateTime.parse('01/02/03', true, DateTime::ITALY).must_equal DateTime.new(2003, 1, 2)
   end
 
   specify "should use american date format for d/m/yy" do
-    DateTime.parse('1/2/03', true).should == DateTime.new(2003, 1, 2)
-    DateTime.parse('1/2/03', false).should == DateTime.new(3, 1, 2)
+    DateTime.parse('1/2/03', true).must_equal DateTime.new(2003, 1, 2)
+    DateTime.parse('1/2/03', false).must_equal DateTime.new(3, 1, 2)
   end
 
   specify "should use american date format for dd/mm/yyyy" do
-    DateTime.parse('01/02/2003').should == DateTime.new(2003, 1, 2)
+    DateTime.parse('01/02/2003').must_equal DateTime.new(2003, 1, 2)
   end
 
   specify "should use american date format for dd/mm" do
-    DateTime.parse('01/02').should == DateTime.new(Time.now.year, 1, 2)
+    DateTime.parse('01/02').must_equal DateTime.new(Time.now.year, 1, 2)
   end
 
   specify "should use american date format for d/m" do
-    DateTime.parse('1/2').should == DateTime.new(Time.now.year, 1, 2)
+    DateTime.parse('1/2').must_equal DateTime.new(Time.now.year, 1, 2)
   end
 
   specify "should ignore preceding whitespace" do
-    DateTime.parse('  01/02/2003').should == DateTime.new(2003, 1, 2)
+    DateTime.parse('  01/02/2003').must_equal DateTime.new(2003, 1, 2)
   end
 
   specify "should ignore preceding weekday" do
-    DateTime.parse('Day 01/02/2003').should == Date.new(2003, 1, 2)
+    DateTime.parse('Day 01/02/2003').must_equal 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)
+    DateTime.parse('01/02/2003 10:20:30').must_equal 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)
+    DateTime.parse('Day 01/02/2003 10:20:30').must_equal 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)
+    DateTime.parse('10:20:30something01/02/2003else').must_equal 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)
+    DateTime.parse('2003/01/02').must_equal 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|
-        proc{DateTime.parse(x)}.should raise_error(TypeError)
+        proc{DateTime.parse(x)}.must_raise(TypeError)
       end
     end
 
     specify "should handle values implicitly convertible to String" do
       o = Object.new
       def o.to_str() '01/02/2003' end
-      DateTime.parse(o).should == DateTime.new(2003, 1, 2)
+      DateTime.parse(o).must_equal DateTime.new(2003, 1, 2)
     end
 
     specify "should handle values implicitly convertible to String" do
       o = Object.new
       def o.to_str() 1 end
-      proc{DateTime.parse(o)}.should raise_error(TypeError)
+      proc{DateTime.parse(o)}.must_raise(TypeError)
     end
   end
 end
 
 describe "Time.parse" do
   specify "should use american date format for dd/mm/yy" do
-    Time.parse('01/02/03', true).should == Time.local(2003, 1, 2)
+    Time.parse('01/02/03').must_equal Time.local(2003, 1, 2)
   end
 
   specify "should use american date format for d/m/yy" do
-    Time.parse('1/2/03', true).should == Time.local(2003, 1, 2)
+    Time.parse('1/2/03').must_equal Time.local(2003, 1, 2)
   end
 
   specify "should use american date format for dd/mm/yyyy" do
-    Time.parse('01/02/2003').should == Time.local(2003, 1, 2)
+    Time.parse('01/02/2003').must_equal Time.local(2003, 1, 2)
   end
 
   specify "should use american date format for dd/mm" do
-    Time.parse('01/02').should == Time.local(Time.now.year, 1, 2)
+    Time.parse('01/02').must_equal Time.local(Time.now.year, 1, 2)
   end
 
   specify "should use american date format for d/m" do
-    Time.parse('1/2').should == Time.local(Time.now.year, 1, 2)
+    Time.parse('1/2').must_equal Time.local(Time.now.year, 1, 2)
   end
 
   specify "should ignore preceding whitespace" do
-    Time.parse('  01/02/2003').should == Time.local(2003, 1, 2)
+    Time.parse('  01/02/2003').must_equal Time.local(2003, 1, 2)
   end
 
   specify "should ignore preceding weekdays" do
-    Time.parse('Day 01/02/2003').should == Time.local(2003, 1, 2)
+    Time.parse('Day 01/02/2003').must_equal 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)
+    Time.parse('01/02/2003 10:20:30').must_equal 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)
+    Time.parse('Day 01/02/2003 10:20:30').must_equal 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)
+    Time.parse('10:20:30 01/02/2003').must_equal 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)
+    Time.parse('10:20:30 Thu 01/02/2003').must_equal 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)
+    Time.parse('10:20:30something01/02/2003else').must_equal 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)
+    Time.parse('2003/01/02').must_equal 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|
-        proc{Time.parse(x)}.should raise_error(TypeError)
+        proc{Time.parse(x)}.must_raise(TypeError)
       end
     end
 
     specify "should handle values implicitly convertible to String" do
       o = Object.new
       def o.to_str() '01/02/2003' end
-      Time.parse(o).should == Time.local(2003, 1, 2)
+      Time.parse(o).must_equal Time.local(2003, 1, 2)
     end
 
     specify "should handle values implicitly convertible to String" do
       o = Object.new
       def o.to_str() 1 end
-      proc{Time.parse(o)}.should raise_error(TypeError)
+      proc{Time.parse(o)}.must_raise(TypeError)
     end
   end
 end
 
 describe "Date._parse" do
   specify "should use american date format for dd/mm/yy" do
-    Date._parse('01/02/03', true).should == {:year=>2003, :mon=>1, :mday=>2}
+    Date._parse('01/02/03', true).must_equal(:year=>2003, :mon=>1, :mday=>2)
   end
 
   specify "should use american date format for d/m/yy" do
-    Date._parse('1/2/03', true).should == {:year=>2003, :mon=>1, :mday=>2}
-    Date._parse('1/2/03', false).should == {:year=>3, :mon=>1, :mday=>2}
+    Date._parse('1/2/03', true).must_equal(:year=>2003, :mon=>1, :mday=>2)
+    Date._parse('1/2/03', false).must_equal(:year=>3, :mon=>1, :mday=>2)
   end
 
   specify "should use american date format for dd/mm/yyyy" do
-    Date._parse('01/02/2003').should == {:year=>2003, :mon=>1, :mday=>2}
+    Date._parse('01/02/2003').must_equal(:year=>2003, :mon=>1, :mday=>2)
   end
 
   specify "should use american date format for dd/mm" do
-    Date._parse('01/02').should == {:mon=>1, :mday=>2}
+    Date._parse('01/02').must_equal(:mon=>1, :mday=>2)
   end
 
   specify "should use american date format for d/m" do
-    Date._parse('1/2').should == {:mon=>1, :mday=>2}
+    Date._parse('1/2').must_equal(:mon=>1, :mday=>2)
   end
 
   specify "should ignore preceding whitespace" do
-    Date._parse('  01/02/2003').should == {:year=>2003, :mon=>1, :mday=>2}
+    Date._parse('  01/02/2003').must_equal(:year=>2003, :mon=>1, :mday=>2)
   end
 
   specify "should work with times" do
-    DateTime._parse('01/02/2003 10:20:30').should == {:year=>2003, :mon=>1, :mday=>2, :hour=>10, :min=>20, :sec=>30}
+    DateTime._parse('01/02/2003 10:20:30').must_equal(:year=>2003, :mon=>1, :mday=>2, :hour=>10, :min=>20, :sec=>30)
   end
 
   if RUBY_VERSION > '1.9'
     specify "should raise TypeError for invalid values" do
       [nil, 1, 1.0, [], {}].each do |x|
-        proc{DateTime._parse(x)}.should raise_error(TypeError)
+        proc{DateTime._parse(x)}.must_raise(TypeError)
       end
     end
 
     specify "should handle values implicitly convertible to String" do
       o = Object.new
       def o.to_str() '01/02/2003' end
-      DateTime._parse(o).should == {:year=>2003, :mon=>1, :mday=>2}
+      DateTime._parse(o).must_equal(:year=>2003, :mon=>1, :mday=>2)
     end
 
     specify "should handle values implicitly convertible to String" do
       o = Object.new
       def o.to_str() 1 end
-      proc{DateTime._parse(o)}.should raise_error(TypeError)
+      proc{DateTime._parse(o)}.must_raise(TypeError)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: american_date
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-22 00:00:00.000000000 Z
+date: 2015-10-28 00:00:00.000000000 Z
 dependencies: []
 description: American style month/day/year date parsing for ruby 1.9
 email: code@jeremyevans.net
@@ -19,39 +19,39 @@ extra_rdoc_files:
 - CHANGELOG
 - MIT-LICENSE
 files:
-- MIT-LICENSE
 - CHANGELOG
+- MIT-LICENSE
 - README.rdoc
 - Rakefile
-- spec/american_date_spec.rb
 - lib/american_date.rb
+- spec/american_date_spec.rb
 homepage: https://github.com/jeremyevans/ruby-american_date
 licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --quiet
-- --inline-source
-- --line-numbers
-- --title
+- "--quiet"
+- "--inline-source"
+- "--line-numbers"
+- "--title"
 - 'american_date: American style month/day/year date parsing for ruby 1.9'
-- --main
+- "--main"
 - README.rdoc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: American style month/day/year date parsing for ruby 1.9