american_date 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 639c1dccbfe0dbf670569aaffb560c53ad3dac27
-  data.tar.gz: 0e6ab6b8a1847e58c5ef5cf4d93228b0f26f61f2
+SHA256:
+  metadata.gz: 2fd9a4c53baa027ff94f1802a0f51e78bdc68fc9892d49152072b8eb2205f671
+  data.tar.gz: d56ba6c7c8a88eeb79a2993fac0c3eb69c2318437a3299eaf087e94213720ce1
 SHA512:
-  metadata.gz: e730ca1a4deae09680360f844048476abb5ea396c94222933fdf7687f20c1f6469925fd80c4599825c7cc5ea27cf0f11d7fe77b503f8dec59eb02790e82f8100
-  data.tar.gz: 2c69087b54b406a9b332ad65ae9b1cb0bbef7bf2c787b49ea5b7e864158e4f0b7f1541e6f40741796171e31d881aba094afa0758e6e836766e728baf84893ba8
+  metadata.gz: dfd6235350c26f3ed600bdcc5a6497cb9633666bda0df00c7129d142f145edd8fe6e14a8e9aa8b82398abf3210141e50d09a4c2c12021da69183cd3a691282cf
+  data.tar.gz: dc035e0b03255603061bd2a419250ab05c57187c60b441b64afe0de3a2730f620e594c46f7a7c7a2b67dfdbc3025c2c9583a2c840306a8db95e98793454461a5

data/CHANGELOG

@@ -1,3 +1,7 @@
+=== 1.2.0 (2021-11-17)
+
+* Support the limit keyword argument supported by date 3.2.1+ (jeremyevans)
+
 === 1.1.1 (2015-10-27)
 
 * Support the third argument to Date/DateTime.parse (costi) (#13)

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011,2013 Jeremy Evans
+Copyright (c) 2011-2021 Jeremy Evans
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

data/README.rdoc

@@ -2,7 +2,7 @@
 
 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
+It can also be used on earlier ruby versions, but it is basically
 a noop there.
 
 As far as I know, there isn't a gem that already handles this. You
@@ -25,12 +25,6 @@ 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
-
-* 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:

data/Rakefile

@@ -26,7 +26,7 @@ end
 
 desc "Run specs"
 task :spec do
-  sh "#{FileUtils::RUBY} -rubygems -I lib spec/american_date_spec.rb"
+  sh "#{FileUtils::RUBY} -I lib spec/american_date_spec.rb"
 end
 task :default=>[:spec]
 

data/lib/american_date.rb

@@ -1,8 +1,17 @@
 require 'date'
 
 if RUBY_VERSION >= '1.9'
+  long_date = ' ' * 128 + '2021-10-11'
+  limit_supported = begin
+    Date.parse(long_date)
+  rescue ArgumentError
+    (Date.parse(long_date, true, Date::ITALY, :limit=>nil) == Date.new(2021, 10, 11)) rescue false
+  else
+    false
+  end
+
   # Modify parsing methods to handle american date format correctly.
-  class << Date
+  Date.instance_eval do
     # American date format detected by the library.
     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
@@ -12,18 +21,34 @@ if RUBY_VERSION >= '1.9'
     # Alias for stdlib Date._parse
     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)
+    if limit_supported
+      instance_eval(<<-END, __FILE__, __LINE__+1)
+        def _parse(string, comp=true, limit: 128)
+          _parse_without_american_date(convert_american_to_iso(string), comp, limit: limit)
+        end
+      END
+    else
+      # Transform american dates into ISO dates before parsing.
+      def _parse(string, comp=true)
+        _parse_without_american_date(convert_american_to_iso(string), comp)
+      end
     end
 
     if RUBY_VERSION >= '1.9.3'
       # Alias for stdlib Date.parse
       alias parse_without_american_date parse
 
-      # Transform american dates into ISO dates before parsing.
-      def parse(string, comp=true, start=Date::ITALY)
-        parse_without_american_date(convert_american_to_iso(string), comp, start)
+      if limit_supported
+        instance_eval(<<-END, __FILE__, __LINE__+1)
+          def parse(string, comp=true, start=Date::ITALY, limit: 128)
+            parse_without_american_date(convert_american_to_iso(string), comp, start, limit: limit)
+          end
+        END
+      else
+        # Transform american dates into ISO dates before parsing.
+        def parse(string, comp=true, start=Date::ITALY)
+          parse_without_american_date(convert_american_to_iso(string), comp, start)
+        end
       end
     end
 
@@ -48,13 +73,21 @@ if RUBY_VERSION >= '1.9'
 
   if RUBY_VERSION >= '1.9.3'
     # Modify parsing methods to handle american date format correctly.
-    class << DateTime
+    DateTime.instance_eval do
       # Alias for stdlib Date.parse
       alias parse_without_american_date parse
 
-      # Transform american dates into ISO dates before parsing.
-      def parse(string, comp=true, start=DateTime::ITALY)
-        parse_without_american_date(convert_american_to_iso(string), comp, start)
+      if limit_supported
+        instance_eval(<<-END, __FILE__, __LINE__+1)
+          def parse(string, comp=true, start=Date::ITALY, limit: 128)
+            parse_without_american_date(convert_american_to_iso(string), comp, start, limit: limit)
+          end
+        END
+      else
+        # Transform american dates into ISO dates before parsing.
+        def parse(string, comp=true, start=Date::ITALY)
+          parse_without_american_date(convert_american_to_iso(string), comp, start)
+        end
       end
     end
   end

data/spec/american_date_keyword_spec.rb

@@ -0,0 +1,40 @@
+long_date = ' ' * 128 + '01/02/2003'
+limit_supported = begin
+  Date.parse(long_date)
+rescue ArgumentError
+if ((Date.parse(long_date, true, Date::ITALY, :limit=>nil) == Date.new(2003, 1, 2)) rescue false)
+describe "Date.parse" do
+  specify "should not support long dates without limit keyword" do
+    proc{Date.parse(long_date, true)}.must_raise ArgumentError
+  end
+
+  specify "should not support long dates with limit keyword" do
+    Date.parse(long_date, true, limit: 150).must_equal Date.new(2003, 1, 2)
+    Date.parse(long_date, true, limit: nil).must_equal Date.new(2003, 1, 2)
+  end
+end
+
+describe "DateTime.parse" do
+  long_datetime = long_date + ' 10:11:12'
+  specify "should not support long dates without limit keyword" do
+    proc{DateTime.parse(long_datetime, true)}.must_raise ArgumentError
+  end
+
+  specify "should not support long dates with limit keyword" do
+    DateTime.parse(long_datetime, true, limit: 150).must_equal DateTime.new(2003, 1, 2, 10, 11, 12)
+    DateTime.parse(long_datetime, true, limit: nil).must_equal DateTime.new(2003, 1, 2, 10, 11, 12)
+  end
+end
+
+describe "Date._parse" do
+  specify "should not support long dates without limit keyword" do
+    proc{Date._parse(long_date, true)}.must_raise ArgumentError
+  end
+
+  specify "should not support long dates with limit keyword" do
+    Date._parse(long_date, true, limit: 150).must_equal(:year=>2003, :mon=>1, :mday=>2)
+    Date._parse(long_date, true, limit: nil).must_equal(:year=>2003, :mon=>1, :mday=>2)
+  end
+end
+end
+end

data/spec/american_date_spec.rb

@@ -1,6 +1,13 @@
 require File.join(File.dirname(File.dirname(File.expand_path(__FILE__))), 'lib', 'american_date')
 require 'time'
-require 'minitest/autorun'
+require 'rubygems'
+ENV['MT_NO_PLUGINS'] = '1' # Work around stupid autoloading of plugins
+gem 'minitest'
+require 'minitest/global_expectations/autorun'
+
+if RUBY_VERSION >= '2.0'
+  require File.join(File.dirname(File.dirname(File.expand_path(__FILE__))), 'spec', 'american_date_keyword_spec')
+end
 
 describe "Date.parse" do
   specify "should use american date format for dd/mm/yy" do

metadata

@@ -1,16 +1,44 @@
 --- !ruby/object:Gem::Specification
 name: american_date
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-28 00:00:00.000000000 Z
-dependencies: []
-description: American style month/day/year date parsing for ruby 1.9
+date: 2021-11-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5'
+- !ruby/object:Gem::Dependency
+  name: minitest-global_expectations
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: American style month/day/year date parsing for ruby 1.9+
 email: code@jeremyevans.net
 executables: []
 extensions: []
@@ -24,17 +52,22 @@ files:
 - README.rdoc
 - Rakefile
 - lib/american_date.rb
+- spec/american_date_keyword_spec.rb
 - spec/american_date_spec.rb
 homepage: https://github.com/jeremyevans/ruby-american_date
-licenses: []
-metadata: {}
+licenses:
+- MIT
+metadata:
+  bug_tracker_uri: https://github.com/jeremyevans/ruby-american_date/issues
+  changelog_uri: https://github.com/jeremyevans/ruby-american_date/blob/master/CHANGELOG
+  source_code_uri: https://github.com/jeremyevans/ruby-american_date
 post_install_message: 
 rdoc_options:
 - "--quiet"
 - "--inline-source"
 - "--line-numbers"
 - "--title"
-- 'american_date: American style month/day/year date parsing for ruby 1.9'
+- 'american_date: American style month/day/year date parsing for ruby 1.9+'
 - "--main"
 - README.rdoc
 require_paths:
@@ -50,9 +83,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
-summary: American style month/day/year date parsing for ruby 1.9
+summary: American style month/day/year date parsing for ruby 1.9+
 test_files: []