flexyear 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9e9174d74ff69cacee7ce260b97f5d078df55504
-  data.tar.gz: 4b24e5c479bb602a2622f5460ec391cd0ef17390
+SHA256:
+  metadata.gz: 76222dec0e41ccbd4cfae4dd0d6ce3372790ae0ff9f1a0454b7003b663d03f1a
+  data.tar.gz: 9ae27ce940ba0e5b8e5258c7e4ccc2b405913b077b2193eef32ff7f5ca8f1702
 SHA512:
-  metadata.gz: 0d18648d7172c4accb880dc63047fedfc590e7c5d76ca74f42a60279aad65e8e790a238612bccd69d8dadd2f15e7eabc0b04ec5ef100a8a8a88c71231e8e7ea1
-  data.tar.gz: 534ea4c77aaec2aa1ef32661c92472ced07f5817a44773b1da7c7867be5971e61037a777aa5319b8f1797f6e64dd499193a21687a200b6a3f53f1f071980806e
+  metadata.gz: b375a2c188636a09b4598e0141649112d4845485b3c618061d86cdc16a099ccbf5aee9c5b51b84b5a9a5d8b58cffa52219b8cedd15fa8ea26aac8d610f051fb3
+  data.tar.gz: 1264dbafb0d737569bde093983260a23bb1d0f8468ad09ecf1d4d3b6a31a9c6eb437717cebe49e6810511052682023daede11376f28ee306b81e54aa989ed88a

data/lib/flexyear/version.rb

@@ -1,3 +1,3 @@
 class FlexYear
-  VERSION = "2.3.0"
+  VERSION = "2.4.0"
 end

data/lib/flexyear.rb

@@ -67,7 +67,7 @@ class FlexYear
       [year.year_low, year.year_high]
     end
 
-    flat_years = all_years.compact.uniq
+    flat_years = all_years.uniq.map { |y| y.nil? ? Date.today.year : y }
 
     @year_low = flat_years.min
     @year_high = flat_years.max
@@ -110,6 +110,9 @@ class FlexYear
     if year_string =~ range_regex && $1 && $2
       @year_low = centuryize($1).to_i
       @year_low, @year_high = [@year_low, centuryize($2, @year_low).to_i].sort
+    elsif year_string =~ open_ended_range_regex
+      @year_low = centuryize($1).to_i
+      @year_high = Date.today.year
     else
       if year_string =~ decade_regex
         @base_year = centuryize($1).to_i
@@ -134,6 +137,10 @@ class FlexYear
     /(\d+)\s*-\s*(\d+)/
   end
 
+  def open_ended_range_regex
+    /(\d+)\s*-\s*(\D+)/
+  end
+
   def asterisk_regex
     /(\d+).*\*$/
   end

data/spec/flexyear_spec.rb

@@ -170,6 +170,15 @@ describe FlexYear do
       its(:decades) { should be_nil }
     end
 
+    context "given a range from a year to present" do
+      subject { flexyear_class.new('1975-Present') }
+      its(:year_low) { should eq(1975) }
+      its(:year_high) { should eq(2016) }
+      its(:decade?) { should eq(false) }
+      its(:decade) { should be_nil }
+      its(:decades) { should be_nil }
+    end
+
     context "given a range in difference decades" do
       subject { flexyear_class.new('1975-1983') }
       its(:year_low) { should eq(1975) }
@@ -342,11 +351,20 @@ describe FlexYear do
       context "mixed years with nil" do
         subject { flexyear_class.new(["1988", "1990s", nil]) }
         its(:year_low) { should eq(1988) }
-        its(:year_high) { should eq(1999) }
+        its(:year_high) { should eq(2016) }
         its(:decade?) { should eq(false) }
         its(:decade) { should be_nil }
         its(:decades) { should eq(["1980s", "1990s", nil])}
       end
+
+      context "with a year with an undefined end date" do
+        subject { flexyear_class.new(["1980s", "mid-80s", "1988 - 1999", 2001, "199*", "1999 - Present"]) }
+        its(:year_low) { should eq(1980) }
+        its(:year_high) { should eq(2016) }
+        its(:decade?) { should eq(false) }
+        its(:decade) { should be_nil }
+        its(:decades) { should eq(["1980s", "1980s", nil, "2000s", "1990s", nil])}
+      end
     end
 
     context "given 12345 (five digit year)" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flexyear
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Dan Melnick & Yan Pritzker
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-09 00:00:00.000000000 Z
+date: 2021-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,7 +100,7 @@ homepage: http://github.com/reverbdotcom/flexyear
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -115,9 +115,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Natural language year range parser
 test_files: