parse_date 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36071ca61e644a7abfeb616a883260772c05498c06d9d8974bd6bc077147397c
-  data.tar.gz: 13c12acb9740c601876cbde4ab46ef4a7b966b9bc2d9471481d7ab2cad29d52d
+  metadata.gz: 184d14ddbda19e12229fd0b245505ee8a0891593bade0e99ca44d51603b3fa90
+  data.tar.gz: 293f5d385495c6fca24b94445d22a9680affa2a4cd50cf47b19733a12b612656
 SHA512:
-  metadata.gz: d7e538ce28565ddcc358f3985c540280bfde3703cf8b94c6debf830fbc27c9dda3639f325a0ad94cd70073d027c1a0b2d68ff8e32552a1b1a16274ca18b2644a
-  data.tar.gz: 21d322b522ada492336e0d521a38f17fabb118010b025b0e4f81e9e405b74533db468304e01100d841bfbba82fc194015f7e5040085ba4b65a1d0c1e9b87e8f5
+  metadata.gz: d8aca40d9e0ad5ccab88e589120a6009a4116026e6501974eb63bf13e7be018677ba581352b84d72f1ea288fbb8fd120a7717a85ce40770e289b97dbf695940e
+  data.tar.gz: e7c14cf9101f297982104c4aa5fe23597ee3932134770cd829ca38c67f4118b1c280962719a01f9f30dc917e01f9c076b7a909f157633cce842466218a9dd2b6

data/.rubocop.yml

@@ -17,7 +17,14 @@ Metrics/LineLength:
   Max: 120
 
 Metrics/MethodLength:
-  Max: 25
+  Max: 15
+  ExcludedMethods:
+    - earliest_year
+    - latest_year
+
+Metrics/ModuleLength:
+  Exclude:
+    - lib/parse_date/int_from_string.rb
 
 Style/NumericLiterals:
   Enabled: false

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-11-05 16:05:23 -0800 using RuboCop version 0.74.0.
+# on 2019-11-06 14:49:31 -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,17 +8,12 @@
 
 # Offense count: 5
 Metrics/AbcSize:
-  Max: 43
+  Max: 45
 
 # Offense count: 4
 Metrics/CyclomaticComplexity:
   Max: 12
 
-# Offense count: 1
-# Configuration parameters: CountComments.
-Metrics/ModuleLength:
-  Max: 195
-
 # Offense count: 4
 Metrics/PerceivedComplexity:
   Max: 12

data/README.md

@@ -46,6 +46,8 @@ 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('1675-7')                         # [1675, 1676, 1677]
+ParseDate.parse_range('1040–1 CE')                      # [1040, 1041]
 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
@@ -124,6 +126,8 @@ 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('1675-7')                         # 1677
+ParseDate.latest_year('1040–1 CE')                      # 1041
 ParseDate.latest_year('18th century CE')                # 1799
 ParseDate.latest_year('17uu')                           # 1799
 ParseDate.latest_year('between 1694 and 1799')          # 1799

data/lib/parse_date.rb

@@ -72,7 +72,7 @@ class ParseDate
     return [] unless last_year || first_year
     return [first_year] if last_year.nil? && first_year
     return [last_year] if first_year.nil? && last_year
-    raise(StandardError, "unable to create year range array from #{first_year}, #{last_year}") unless
+    raise(ParseDate::Error, "unable to create year range array from #{first_year}, #{last_year}") unless
       year_range_valid?(first_year, last_year)
 
     Range.new(first_year, last_year).to_a

data/lib/parse_date/int_from_string.rb

@@ -61,6 +61,7 @@ class ParseDate
       result ||= ParseDate.send(:between_latest_year, date_str)
       result ||= ParseDate.send(:hyphen_4digit_latest_year, date_str)
       result ||= ParseDate.send(:hyphen_2digit_latest_year, date_str)
+      result ||= ParseDate.send(:hyphen_1digit_latest_year, date_str)
       result ||= ParseDate.send(:yyuu_after_hyphen, date_str)
       result ||= ParseDate.send(:year_after_or, date_str)
       result ||= ParseDate.send(:negative_4digits_after_hyphen, date_str)
@@ -75,7 +76,7 @@ class ParseDate
       unless result
         # try removing brackets between digits in case we have 169[5] or [18]91
         no_brackets = ParseDate.send(:remove_brackets, date_str)
-        return earliest_year(no_brackets) if no_brackets
+        return latest_year(no_brackets) if no_brackets
       end
       result.to_i if result && year_int_valid?(result.to_i)
     end
@@ -133,6 +134,20 @@ class ParseDate
       last.to_i if ParseDate.year_range_valid?(first.to_i, last.to_i)
     end
 
+    YYYY_HYPHEN_Y_REGEX = Regexp.new(/(?<first>\d{3,4})\??\s*(-|—|–|to)\s*(?<last>\d{1})\??([^-0-9].*)?$/)
+
+    # Integer value for latest year if we have "yyyy-y" pattern
+    # @return [Integer, nil] yyyy if date_str matches pattern; nil otherwise
+    def hyphen_1digit_latest_year(date_str)
+      matches = date_str.match(YYYY_HYPHEN_Y_REGEX)
+      return unless matches
+
+      first = Regexp.last_match(:first)
+      decade = first[0..-2] # whatever is before the last digit
+      last = "#{decade}#{Regexp.last_match(:last)}"
+      last.to_i if ParseDate.year_range_valid?(first.to_i, last.to_i)
+    end
+
     YYUU = '\\d{1,2}[u\\-]{2}'
     YYuu_HYPHEN_YYuu_REGEX =
       Regexp.new("(?<first>#{YYUU})\\??\\s*(-|—|–|to)\\s*(?<last>#{YYUU})\\??([^u\\-]|$)??", REGEX_OPTS)

data/lib/parse_date/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parse_date
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Naomi Dushay