parse_date 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 367f2e3cc7710655783c53692b76d6c483be5dd197047b0a285857c2e8b29b10
-  data.tar.gz: 37da36fa61807abcc852bb1dc4c5f4f05313dc87e25ad6d03db7a3f64da34998
+  metadata.gz: 36071ca61e644a7abfeb616a883260772c05498c06d9d8974bd6bc077147397c
+  data.tar.gz: 13c12acb9740c601876cbde4ab46ef4a7b966b9bc2d9471481d7ab2cad29d52d
 SHA512:
-  metadata.gz: 31a6ec4a2b621f6689ecc4151f7809e3fc861a491382117350f2b9404db6f6c753206dc263d028b04a54aaa23b14c8cfcf036d3de7139d1f61dd3a3fdfb07d6e
-  data.tar.gz: 289196806a4c8acba6904525adb65e5afe429dd5ee74acfb9ae75ea30980bc52f0ef1112871f948e0cd0454a9e0b303ac407b030d4562f8eac898cf3f8f5a6fe
+  metadata.gz: d7e538ce28565ddcc358f3985c540280bfde3703cf8b94c6debf830fbc27c9dda3639f325a0ad94cd70073d027c1a0b2d68ff8e32552a1b1a16274ca18b2644a
+  data.tar.gz: 21d322b522ada492336e0d521a38f17fabb118010b025b0e4f81e9e405b74533db468304e01100d841bfbba82fc194015f7e5040085ba4b65a1d0c1e9b87e8f5

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-10-28 20:35:55 -0700 using RuboCop version 0.74.0.
+# on 2019-11-05 16:05:23 -0800 using RuboCop version 0.74.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -8,7 +8,7 @@
 
 # Offense count: 5
 Metrics/AbcSize:
-  Max: 41
+  Max: 43
 
 # Offense count: 4
 Metrics/CyclomaticComplexity:
@@ -17,7 +17,7 @@ Metrics/CyclomaticComplexity:
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
-  Max: 183
+  Max: 195
 
 # Offense count: 4
 Metrics/PerceivedComplexity:

data/README.md

@@ -40,6 +40,12 @@ ParseDate.parse_range('195-')                           # (1950..1959).to_a
 ParseDate.parse_range('199u')                           # (1990..1999).to_a
 ParseDate.parse_range('197?')                           # (1970..1979).to_a
 ParseDate.parse_range('196x')                           # (1960..1969).to_a
+ParseDate.parse_range('1990s')                          # (1990..1999).to_a
+ParseDate.parse_range('1990s?')                         # (1990..1999).to_a
+ParseDate.parse_range('ca. 1930s')                      # (1930..1939).to_a
+ParseDate.parse_range('1928-1980s')                     # (1928..1989).to_a
+ParseDate.parse_range('1940s-1990')                     # (1940..1990).to_a
+ParseDate.parse_range('1980s-1990s')                    # (1980..1999).to_a
 ParseDate.parse_range('18th century CE')                # (1700..1799).to_a
 ParseDate.parse_range('17uu')                           # (1700..1799).to_a
 ParseDate.parse_range('between 1694 and 1799')          # (1694..1799).to_a
@@ -112,6 +118,12 @@ ParseDate.latest_year('195-')                           # 1959
 ParseDate.latest_year('199u')                           # 1999
 ParseDate.latest_year('197?')                           # 1979
 ParseDate.latest_year('196x')                           # 1969
+ParseDate.latest_year('1990s')                          # 1999
+ParseDate.latest_year('1990s?')                         # 1999
+ParseDate.latest_year('ca. 1930s')                      # 1939
+ParseDate.latest_year('1928-1980s')                     # 1989
+ParseDate.latest_year('1940s-1990')                     # 1990
+ParseDate.latest_year('1980s-1990s')                    # 1999
 ParseDate.latest_year('18th century CE')                # 1799
 ParseDate.latest_year('17uu')                           # 1799
 ParseDate.latest_year('between 1694 and 1799')          # 1799

data/lib/parse_date/int_from_string.rb

@@ -65,6 +65,7 @@ class ParseDate
       result ||= ParseDate.send(:year_after_or, date_str)
       result ||= ParseDate.send(:negative_4digits_after_hyphen, date_str)
       result ||= ParseDate.send(:negative_first_four_digits, date_str)
+      result ||= ParseDate.send(:last_year_for_0s_decade, date_str)
       result ||= ParseDate.send(:first_four_digits, date_str)
       result ||= ParseDate.send(:year_from_mm_dd_yy, date_str)
       result ||= ParseDate.send(:last_year_for_decade, date_str) # 198x or 201x
@@ -98,7 +99,7 @@ class ParseDate
       date_str.delete('[]') if date_str.match(BRACKETS_BETWEEN_DIGITS_REGEX)
     end
 
-    YYYY_HYPHEN_YYYY_REGEX = Regexp.new(/(?<first>\d{3,4})\??\s*(-|—|–|to)\s*(?<last>\d{4})\??/m)
+    YYYY_HYPHEN_YYYY_REGEX = Regexp.new(/(?<first>\d{3,4})s?\??\s*(-|—|–|to)\s*(?<last>\d{4}s?)\??/m)
 
     # Integer value for latest year if we have "yyyy-yyyy" pattern
     # @return [Integer, nil] yyyy if date_str matches pattern; nil otherwise
@@ -109,7 +110,13 @@ class ParseDate
     # Integer value for latest year if we have "yyyy-yyyy" pattern
     # @return [Integer, nil] yyyy if date_str matches pattern; nil otherwise
     def hyphen_4digit_latest_year(date_str)
-      Regexp.last_match(:last).to_i if date_str.match(YYYY_HYPHEN_YYYY_REGEX)
+      latest = Regexp.last_match(:last) if date_str.match(YYYY_HYPHEN_YYYY_REGEX)
+      if ParseDate.year_int_valid?(latest.to_i)
+        ParseDate.latest_year(latest) # accommodates '1980s - 1990s'
+      else
+        # return the bad value;  parse_range might need to complain about it
+        latest
+      end
     end
 
     YYYY_HYPHEN_YY_REGEX = Regexp.new(/(?<first>\d{3,4})\??\s*(-|—|–|to)\s*(?<last>\d{2})\??([^-0-9].*)?$/)
@@ -219,6 +226,16 @@ class ParseDate
       nil # explicitly want nil if date won't parse
     end
 
+    DECADE_0S_REGEX = Regexp.new('(^|\D)\d{3}0\'?s($|\D)', REGEX_OPTS)
+
+    # last year of decade (as String) if we have:  yyy0s flavor pattern
+    # @return [String, nil] 4 digit year (e.g. 1869, 1959) if date_str matches pattern, nil otherwise
+    def last_year_for_0s_decade(date_str)
+      decade_matches = date_str.match(DECADE_0S_REGEX)
+      changed_to_nine = decade_matches.to_s.sub(/0\'?s/, '9') if decade_matches
+      ParseDate.first_four_digits(changed_to_nine) if changed_to_nine
+    end
+
     DECADE_4CHAR_REGEX = Regexp.new('(^|\D)\d{3}[u\-?x]($|\D)', REGEX_OPTS)
 
     # first year of decade (as String) if we have:  yyyu, yyy-, yyy? or yyyx pattern

data/lib/parse_date/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class ParseDate
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parse_date
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Naomi Dushay
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-01 00:00:00.000000000 Z
+date: 2019-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk