american_date 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fd9a4c53baa027ff94f1802a0f51e78bdc68fc9892d49152072b8eb2205f671
-  data.tar.gz: d56ba6c7c8a88eeb79a2993fac0c3eb69c2318437a3299eaf087e94213720ce1
+  metadata.gz: 7ad1d14cdbbdd03f5c6eef433b17dbb9e5bd296a1a244ce25cf2dec846ef5f4c
+  data.tar.gz: 66ca9d13ae079e149a3b2d7228b62cacde0a9b722f28450caf50bd0910c778e8
 SHA512:
-  metadata.gz: dfd6235350c26f3ed600bdcc5a6497cb9633666bda0df00c7129d142f145edd8fe6e14a8e9aa8b82398abf3210141e50d09a4c2c12021da69183cd3a691282cf
-  data.tar.gz: dc035e0b03255603061bd2a419250ab05c57187c60b441b64afe0de3a2730f620e594c46f7a7c7a2b67dfdbc3025c2c9583a2c840306a8db95e98793454461a5
+  metadata.gz: 1bd9aab61e47d7fc2ad2a1ca41181fbda894675d9afcfe718cf9c2de55663b6901b5cb7655392084b6479e9968c3423a0308895d1dfc1e1f7c5cfb392a8ab53e
+  data.tar.gz: c8a4d9579fc57d4cac21142d6cd7a5e36f44b05642fa5d5e9ea3b0907523b03199bc66d1193b4f10187848ab5dbbb02e24869d357a539e976acd71fe7057b45c

data/CHANGELOG

@@ -1,3 +1,7 @@
+=== 1.3.0 (2023-07-13)
+
+* Make sure AMERICAN_DATE_RE constant is defined on Date and not on the top level (jeremyevans)
+
 === 1.2.0 (2021-11-17)
 
 * Support the limit keyword argument supported by date 3.2.1+ (jeremyevans)

data/lib/american_date.rb

@@ -1,22 +1,27 @@
 require 'date'
 
+# :nocov:
 if RUBY_VERSION >= '1.9'
+# :nocov:
   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
+  # :nocov:
   else
     false
+  # :nocov:
   end
 
+  # American date format detected by the library.
+  Date::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.
+
   # Modify parsing methods to handle american date format correctly.
   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
-    # 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
@@ -27,14 +32,18 @@ if RUBY_VERSION >= '1.9'
           _parse_without_american_date(convert_american_to_iso(string), comp, limit: limit)
         end
       END
+    # :nocov:
     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
+    # :nocov:
     end
 
+    # :nocov:
     if RUBY_VERSION >= '1.9.3'
+    # :nocov:
       # Alias for stdlib Date.parse
       alias parse_without_american_date parse
 
@@ -44,12 +53,14 @@ if RUBY_VERSION >= '1.9'
             parse_without_american_date(convert_american_to_iso(string), comp, start, limit: limit)
           end
         END
+      # :nocov:
       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
+      # :nocov:
     end
 
     private
@@ -67,11 +78,13 @@ if RUBY_VERSION >= '1.9'
           raise TypeError, "no implicit conversion of #{string.inspect} into String"
         end
       end
-      string.sub(AMERICAN_DATE_RE){|m| "#$3-#$1-#$2"}
+      string.sub(Date::AMERICAN_DATE_RE){|m| "#$3-#$1-#$2"}
     end
   end
 
+  # :nocov:
   if RUBY_VERSION >= '1.9.3'
+  # :nocov:
     # Modify parsing methods to handle american date format correctly.
     DateTime.instance_eval do
       # Alias for stdlib Date.parse
@@ -83,12 +96,14 @@ if RUBY_VERSION >= '1.9'
             parse_without_american_date(convert_american_to_iso(string), comp, start, limit: limit)
           end
         END
+      # :nocov:
       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
+      # :nocov:
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: american_date
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Jeremy Evans
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-17 00:00:00.000000000 Z
+date: 2023-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -50,10 +50,7 @@ files:
 - CHANGELOG
 - MIT-LICENSE
 - 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:
 - MIT
@@ -61,7 +58,7 @@ 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: 
+post_install_message:
 rdoc_options:
 - "--quiet"
 - "--inline-source"
@@ -83,8 +80,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: American style month/day/year date parsing for ruby 1.9+
 test_files: []

data/Rakefile

@@ -1,37 +0,0 @@
-require "rake"
-require "rake/clean"
-
-CLEAN.include ["*.gem", "rdoc"]
-RDOC_OPTS = ['--inline-source', '--line-numbers', '--title', '', '--main', 'README.rdoc']
-
-rdoc_task_class = begin
-  require "rdoc/task"
-  RDOC_OPTS.concat(['-f', 'hanna'])
-  RDoc::Task
-rescue LoadError
-  begin
-    require "rake/rdoctask"
-    Rake::RDocTask
-  rescue RuntimeError
-  end
-end
-
-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"
-task :spec do
-  sh "#{FileUtils::RUBY} -I lib spec/american_date_spec.rb"
-end
-task :default=>[:spec]
-
-desc "Package american_date"
-task :gem=>[:clean] do
-  load './american_date.gemspec'
-  Gem::Builder.new(AMERICAN_DATE_GEMSPEC).build
-end

data/spec/american_date_keyword_spec.rb

@@ -1,40 +0,0 @@
-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,269 +0,0 @@
-require File.join(File.dirname(File.dirname(File.expand_path(__FILE__))), 'lib', 'american_date')
-require 'time'
-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
-    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).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').must_equal Date.new(2003, 1, 2)
-  end
-
-  specify "should use american date format for dd/mm" do
-    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').must_equal Date.new(Time.now.year, 1, 2)
-  end
-
-  specify "should ignore preceding whitespace" do
-    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').must_equal Date.new(2003, 1, 2)
-  end
-
-  specify "should work just like 1.8 does" do
-    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').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").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)}.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).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)}.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).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).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').must_equal DateTime.new(2003, 1, 2)
-  end
-
-  specify "should use american date format for dd/mm" do
-    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').must_equal DateTime.new(Time.now.year, 1, 2)
-  end
-
-  specify "should ignore preceding whitespace" do
-    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').must_equal Date.new(2003, 1, 2)
-  end
-
-  specify "should work with times" do
-    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').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').must_equal DateTime.new(2003, 1, 2, 10, 20, 30)
-  end
-
-  specify "should not mismatch years" do
-    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)}.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).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)}.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').must_equal Time.local(2003, 1, 2)
-  end
-
-  specify "should use american date format for d/m/yy" do
-    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').must_equal Time.local(2003, 1, 2)
-  end
-
-  specify "should use american date format for dd/mm" do
-    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').must_equal Time.local(Time.now.year, 1, 2)
-  end
-
-  specify "should ignore preceding whitespace" do
-    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').must_equal Time.local(2003, 1, 2)
-  end
-
-  specify "should work with times" do
-    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').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').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').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').must_equal Time.local(2003, 1, 2, 10, 20, 30)
-  end
-
-  specify "should not mismatch years" do
-    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)}.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).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)}.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).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).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').must_equal(:year=>2003, :mon=>1, :mday=>2)
-  end
-
-  specify "should use american date format for dd/mm" do
-    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').must_equal(:mon=>1, :mday=>2)
-  end
-
-  specify "should ignore preceding whitespace" do
-    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').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)}.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).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)}.must_raise(TypeError)
-    end
-  end
-end