flexyear 2.2.2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ba90e3142ece7c435fd2ee4acc7d7ca19ef77f0
-  data.tar.gz: 7880df13f9e0be791c7ec842ae79094d7bf24990
+  metadata.gz: 9e9174d74ff69cacee7ce260b97f5d078df55504
+  data.tar.gz: 4b24e5c479bb602a2622f5460ec391cd0ef17390
 SHA512:
-  metadata.gz: d993fd9336e03ae8563077141830884fc2efdeeb3f1eb9ed4aee6f92f4282fa1cfcc40395848ddd5849669d16dae4408cf56330cf196e7bea97cdb2cca5f13aa
-  data.tar.gz: c9fc713af6a53ab7551a47a2c949a8a30a8e01fd567f98dfe98d08da226fc7c27dcdb482bfd2cc42e34ca070eeb731e7503844839a85f662208ded0061297722
+  metadata.gz: 0d18648d7172c4accb880dc63047fedfc590e7c5d76ca74f42a60279aad65e8e790a238612bccd69d8dadd2f15e7eabc0b04ec5ef100a8a8a88c71231e8e7ea1
+  data.tar.gz: 534ea4c77aaec2aa1ef32661c92472ced07f5817a44773b1da7c7867be5971e61037a777aa5319b8f1797f6e64dd499193a21687a200b6a3f53f1f071980806e

data/README.md

@@ -7,15 +7,23 @@ Examples:
 ```ruby
 FlexYear.new("1980s").year_low == 1980
 FlexYear.new("1980s").year_high == 1989
+FlexYear.new("1980s").decade == 1980s
 
 FlexYear.new("mid-80s").year_low == 1983
 FlexYear.new("mid-80s").year_high == 1986
+FlexYear.new("mid-80s").decade == 1980s
 
 FlexYear.new(1983).year_low == 1983
 FlexYear.new(1983).year_high == 1983
+FlexYear.new(1983).decade == 1980s
+
+FlexYear.new(198*).year_low == 1980
+FlexYear.new(198*).year_high == 1989
+FlexYear.new(198*).decade == 1980s
 
 FlexYear.new(["1980s", "1988 - 2000", 2001]).year_low == 1980
 FlexYear.new(["1980s", "1988 - 2000", 2001]).year_high == 2001
+FlexYear.new(["1980s", "1988 - 2000", nil, 2001]).decades == [1980s, nil, nil, 2000s]
 ```
 
 It's pretty flexible in the kinds of things it takes. For more examples, see the spec.

data/lib/flexyear.rb

@@ -23,7 +23,7 @@ require 'date'
 class FlexYear
   class InvalidYearError < ArgumentError; end
 
-  attr_reader :year_low, :year_high
+  attr_reader :year_low, :year_high, :decade, :decades
 
   def initialize(year_input)
     @year_input = year_input
@@ -44,6 +44,21 @@ class FlexYear
     year_low % 10 == 0 && year_high % 10 == 9
   end
 
+  def parse_decade(yr_low, yr_high)
+    return if @year_input.is_a?(Array)
+    return unless yr_low && yr_high
+
+    same_decade = yr_low.to_s[0,3] == yr_high.to_s[0, 3]
+    @decade = "#{yr_low.to_s[0,3]}0s" if same_decade
+  end
+
+  def parse_decades(years)
+    return unless @year_input.is_a?(Array)
+
+    parsed_decades = years.flat_map { |y| self.class.new(y).decade }
+    @decades = parsed_decades
+  end
+
   private
 
   def parse_year_list(years)
@@ -56,10 +71,13 @@ class FlexYear
 
     @year_low = flat_years.min
     @year_high = flat_years.max
+
+    parse_decades(years)
   end
 
   def parse_year_string(year_string)
     parse_year(year_string.to_s.strip)
+    parse_decade(@year_low, @year_high)
   end
 
   def centuryize(year, base_year=nil)

data/lib/flexyear/version.rb

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

data/spec/flexyear_spec.rb

@@ -13,6 +13,8 @@ describe FlexYear do
       its(:year_low) { should be_nil }
       its(:year_high) { should be_nil }
       its(:decade?) { should eq(false) }
+      its(:decade) { should be_nil }
+      its(:decades) { should be_nil }
     end
 
     context "given nil" do
@@ -20,6 +22,8 @@ describe FlexYear do
       its(:year_low) { should be_nil }
       its(:year_high) { should be_nil }
       its(:decade?) { should eq(false) }
+      its(:decade) { should be_nil }
+      its(:decades) { should be_nil }
     end
 
     context "text" do
@@ -27,6 +31,8 @@ describe FlexYear do
       its(:year_low) { should be_nil }
       its(:year_high) { should be_nil }
       its(:decade?) { should eq(false) }
+      its(:decade) { should be_nil }
+      its(:decades) { should be_nil }
     end
 
     context "given 1979 as number" do
@@ -34,6 +40,8 @@ describe FlexYear do
       its(:year_low) { should eq(1979) }
       its(:year_high) { should eq(1979) }
       its(:decade?) { should eq(false) }
+      its(:decade) { should eq("1970s") }
+      its(:decades) { should be_nil }
     end
 
     context "given 1979" do
@@ -41,6 +49,8 @@ describe FlexYear do
       its(:year_low) { should eq(1979) }
       its(:year_high) { should eq(1979) }
       its(:decade?) { should eq(false) }
+      its(:decade) { should eq("1970s") }
+      its(:decades) { should be_nil }
     end
 
     context "given 1979 (with a space)" do
@@ -48,6 +58,8 @@ describe FlexYear do
       its(:year_low) { should eq(1979) }
       its(:year_high) { should eq(1979) }
       its(:decade?) { should eq(false) }
+      its(:decade) { should eq("1970s") }
+      its(:decades) { should be_nil }
     end
 
     context 'given 197*' do
@@ -55,6 +67,8 @@ describe FlexYear do
       its(:year_low) { should eq(1970) }
       its(:year_high) { should eq(1979) }
       its(:decade?) { should eq(true) }
+      its(:decade) { should eq("1970s") }
+      its(:decades) { should be_nil }
     end
 
     context "given 1970s" do
@@ -62,6 +76,8 @@ describe FlexYear do
       its(:year_low) { should eq(1970) }
       its(:year_high) { should eq(1979) }
       its(:decade?) { should eq(true) }
+      its(:decade) { should eq("1970s") }
+      its(:decades) { should be_nil }
     end
 
     context "given 70s" do
@@ -69,6 +85,8 @@ describe FlexYear do
       its(:year_low) { should eq(1970) }
       its(:year_high) { should eq(1979) }
       its(:decade?) { should eq(true) }
+      its(:decade) { should eq("1970s") }
+      its(:decades) { should be_nil }
     end
 
     context "given something with negative and dots" do
@@ -76,6 +94,8 @@ describe FlexYear do
       its(:year_low) { should eq(2005) }
       its(:year_high) { should eq(2007) }
       its(:decade?) { should eq(false) }
+      its(:decade) { should eq("2000s") }
+      its(:decades) { should be_nil }
     end
 
     context 'given before 1973' do
@@ -83,6 +103,8 @@ describe FlexYear do
       its(:year_low) { should be_nil }
       its(:year_high) { should eq(1973) }
       its(:decade?) { should eq(false) }
+      its(:decade) { should be_nil }
+      its(:decades) { should be_nil }
     end
 
     context 'given after 1973' do
@@ -90,6 +112,8 @@ describe FlexYear do
       its(:year_low) { should eq(1973) }
       its(:year_high) { should be_nil }
       its(:decade?) { should eq(false) }
+      its(:decade) { should be_nil }
+      its(:decades) { should be_nil }
     end
 
     ["mid 1970s", "mid 70s", "mid-70s", "mid-70's"].each do |year|
@@ -97,6 +121,8 @@ describe FlexYear do
         subject { flexyear_class.new(year) }
         its(:year_low) { should eq(1973) }
         its(:year_high) { should eq(1976) }
+        its(:decade) { should eq("1970s") }
+        its(:decades) { should be_nil }
         its(:to_s) { should eq(year) }
         its(:decade?) { should eq(false) }
       end
@@ -108,6 +134,8 @@ describe FlexYear do
         its(:year_low) { should eq(1970) }
         its(:year_high) { should eq(1973) }
         its(:decade?) { should eq(false) }
+        its(:decade) { should eq("1970s") }
+        its(:decades) { should be_nil }
       end
     end
 
@@ -117,6 +145,8 @@ describe FlexYear do
         its(:year_low) { should eq(1976) }
         its(:year_high) { should eq(1979) }
         its(:decade?) { should eq(false) }
+        its(:decade) { should eq("1970s") }
+        its(:decades) { should be_nil }
       end
     end
 
@@ -126,6 +156,8 @@ describe FlexYear do
         its(:year_low) { should eq(1973) }
         its(:year_high) { should eq(1975) }
         its(:decade?) { should eq(false) }
+        its(:decade) { should eq("1970s") }
+        its(:decades) { should be_nil }
       end
     end
 
@@ -133,7 +165,18 @@ describe FlexYear do
       subject { flexyear_class.new('1975-1973') }
       its(:year_low) { should eq(1973) }
       its(:year_high) { should eq(1975) }
-        its(:decade?) { should eq(false) }
+      its(:decade?) { should eq(false) }
+      its(:decade) { should eq("1970s") }
+      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) }
+      its(:year_high) { should eq(1983) }
+      its(:decade?) { should eq(false) }
+      its(:decade) { should be_nil}
+      its(:decades) { should be_nil }
     end
 
     context "given a range" do
@@ -142,6 +185,8 @@ describe FlexYear do
         its(:year_low) { should eq(2003) }
         its(:year_high) { should eq(2004) }
         its(:decade?) { should eq(false) }
+        its(:decade) { should eq("2000s") }
+        its(:decades) { should be_nil }
       end
     end
 
@@ -151,6 +196,8 @@ describe FlexYear do
         its(:year_low) { should eq(1972) }
         its(:year_high) { should eq(1974) }
         its(:decade?) { should eq(false) }
+        its(:decade) { should eq("1970s") }
+        its(:decades) { should be_nil }
       end
 
       context 'at the beginning of the string' do
@@ -158,6 +205,8 @@ describe FlexYear do
         its(:year_low) { should eq(1972) }
         its(:year_high) { should eq(1974) }
         its(:decade?) { should eq(false) }
+        its(:decade) { should eq("1970s") }
+        its(:decades) { should be_nil }
       end
 
       context 'abbreviated' do
@@ -165,6 +214,8 @@ describe FlexYear do
         its(:year_low) { should eq(1972) }
         its(:year_high) { should eq(1974) }
         its(:decade?) { should eq(false) }
+        its(:decade) { should eq("1970s") }
+        its(:decades) { should be_nil }
       end
 
       context 'with dots' do
@@ -172,6 +223,8 @@ describe FlexYear do
         its(:year_low) { should eq(1972) }
         its(:year_high) { should eq(1974) }
         its(:decade?) { should eq(false) }
+        its(:decade) { should eq("1970s") }
+        its(:decades) { should be_nil }
       end
 
       context 'with c.' do
@@ -179,6 +232,8 @@ describe FlexYear do
         its(:year_low) { should eq(1972) }
         its(:year_high) { should eq(1974) }
         its(:decade?) { should eq(false) }
+        its(:decade) { should eq("1970s") }
+        its(:decades) { should be_nil }
       end
 
       context 'with ca.' do
@@ -186,6 +241,8 @@ describe FlexYear do
         its(:year_low) { should eq(1972) }
         its(:year_high) { should eq(1974) }
         its(:decade?) { should eq(false) }
+        its(:decade) { should eq("1970s") }
+        its(:decades) { should be_nil }
       end
 
       context 'with approx.' do
@@ -193,6 +250,8 @@ describe FlexYear do
         its(:year_low) { should eq(1972) }
         its(:year_high) { should eq(1974) }
         its(:decade?) { should eq(false) }
+        its(:decade) { should eq("1970s") }
+        its(:decades) { should be_nil }
       end
 
       context 'with appxly.' do
@@ -200,6 +259,8 @@ describe FlexYear do
         its(:year_low) { should eq(1972) }
         its(:year_high) { should eq(1974) }
         its(:decade?) { should eq(false) }
+        its(:decade) { should eq("1970s") }
+        its(:decades) { should be_nil }
       end
 
       context 'with around' do
@@ -207,6 +268,8 @@ describe FlexYear do
         its(:year_low) { should eq(1972) }
         its(:year_high) { should eq(1974) }
         its(:decade?) { should eq(false) }
+        its(:decade) { should eq("1970s") }
+        its(:decades) { should be_nil }
       end
 
       context 'with about' do
@@ -214,6 +277,8 @@ describe FlexYear do
         its(:year_low) { should eq(1972) }
         its(:year_high) { should eq(1974) }
         its(:decade?) { should eq(false) }
+        its(:decade) { should eq("1970s") }
+        its(:decades) { should be_nil }
       end
 
       context 'with circ' do
@@ -221,6 +286,8 @@ describe FlexYear do
         its(:year_low) { should eq(1972) }
         its(:year_high) { should eq(1974) }
         its(:decade?) { should eq(false) }
+        its(:decade) { should eq("1970s") }
+        its(:decades) { should be_nil }
       end
 
       context 'with cca' do
@@ -228,6 +295,8 @@ describe FlexYear do
         its(:year_low) { should eq(1972) }
         its(:year_high) { should eq(1974) }
         its(:decade?) { should eq(false) }
+        its(:decade) { should eq("1970s") }
+        its(:decades) { should be_nil }
       end
 
       context 'given 2 character fields' do
@@ -236,6 +305,8 @@ describe FlexYear do
           its(:year_low) { should eq(1973) }
           its(:year_high) { should eq(1973) }
           its(:decade?) { should eq(false) }
+          its(:decade) { should eq("1970s") }
+          its(:decades) { should be_nil }
         end
 
         context "from current century" do
@@ -243,30 +314,38 @@ describe FlexYear do
           its(:year_low) { should eq(2006) }
           its(:year_high) { should eq(2006) }
           its(:decade?) { should eq(false) }
+          its(:decade) { should eq("2000s") }
+          its(:decades) { should be_nil }
         end
       end
     end
 
     context "given a list" do
       context "mixed years" do
-        subject { flexyear_class.new(["1980s", "mid-80s", "1988 - 1999", 2001,]) }
+        subject { flexyear_class.new(["1980s", "mid-80s", "1988 - 1999", 2001, "199*"]) }
         its(:year_low) { should eq(1980) }
         its(:year_high) { should eq(2001) }
-          its(:decade?) { should eq(false) }
+        its(:decade?) { should eq(false) }
+        its(:decade) { should be_nil }
+        its(:decades) { should eq(["1980s", "1980s", nil, "2000s", "1990s"])}
       end
 
       context "same years" do
         subject { flexyear_class.new(["1988", "1988"]) }
         its(:year_low) { should eq(1988) }
         its(:year_high) { should eq(1988) }
-          its(:decade?) { should eq(false) }
+        its(:decade?) { should eq(false) }
+        its(:decade) { should be_nil }
+        its(:decades) { should eq(["1980s", "1980s"])}
       end
 
       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(:decade?) { should eq(false) }
+        its(:decade?) { should eq(false) }
+        its(:decade) { should be_nil }
+        its(:decades) { should eq(["1980s", "1990s", nil])}
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flexyear
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.0
 platform: ruby
 authors:
 - Dan Melnick & Yan Pritzker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-30 00:00:00.000000000 Z
+date: 2019-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Natural language year range parser