flexyear 2.0.1 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be16123e3ada3bc97daf20dfa0878e0ec64fb3d5
-  data.tar.gz: cdd73aa8f992531f09d9f329a76af8ec850bde19
+  metadata.gz: 929b57a6f2f71b83adb9d436b5304e88802ccec1
+  data.tar.gz: d4936577ab3e36019669b9c9222fc8611a757cbd
 SHA512:
-  metadata.gz: 6cebdc541a73b357bf70257e1c6127d88f1cc3c18253f70d5ca066df10485f0e4bb6f59806c337dc58044b910ca87b33a78724d854dc6873ac691fa52de1ff88
-  data.tar.gz: 0b96b4c50820649422dabf3f465d46ca4515ff937f4e99289413c6c761b869152a9d30ccb14d847a023306e18599c3cd99a415972c1d9d07d8b91dc05bd15818
+  metadata.gz: f20398d5815ac685692558a248e2f1eab79735186d34b8ea7fc9668287a73b152e972fcbff1be08dd0b129a1deb870adb8a812b001ae0dda6553239d10c44443
+  data.tar.gz: 2e746c4ee7fbb2b48d84a022674da74e78e5690a175e64ef93becb052e1ebe694ae5c07e838ae9d8ccc6a25420faac887e043069afe413e58455f970af7caed5

data/README.md

@@ -10,6 +10,12 @@ FlexYear.new("1980s").year_high == 1989
 
 FlexYear.new("mid-80s").year_low == 1983
 FlexYear.new("mid-80s").year_high == 1986
+
+FlexYear.new(1983).year_low == 1983
+FlexYear.new(1983).year_high == 1983
+
+FlexYear.new(["1980s", "1988 - 2000", 2001]).year_low == 1980
+FlexYear.new(["1980s", "1988 - 2000", 2001]).year_high == 2001
 ```
 
 It's pretty flexible in the kinds of things it takes. For more examples, see the spec.
@@ -30,6 +36,7 @@ Or install it yourself as:
 
     $ gem install flexyear
 
+
 ## Contributing
 
 1. Fork it
@@ -37,3 +44,7 @@ Or install it yourself as:
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+### Test
+
+`rake`

data/lib/flexyear/version.rb

@@ -1,3 +1,3 @@
 class FlexYear
-  VERSION = "2.0.1"
+  VERSION = "2.1.1"
 end

data/lib/flexyear.rb

@@ -25,20 +25,38 @@ class FlexYear
 
   attr_reader :year_low, :year_high
 
-  def initialize(year_string)
-    @year_string = year_string.to_s.strip
+  def initialize(year_input)
+    @year_input = year_input
 
-    @low, @high = RangeParser.parse(@year_string)
-
-    parse_year
+    if year_input.is_a?(Array)
+      parse_year_list(year_input)
+    else
+      parse_year_string(year_input)
+    end
   end
 
   def to_s
-    @year_string
+    @year_input
   end
 
   private
 
+  def parse_year_list(years)
+    all_years = years.flat_map do |y|
+      year = self.class.new(y)
+      [year.year_low, year.year_high]
+    end
+
+    flat_years = all_years.compact.uniq
+
+    @year_low = flat_years.min
+    @year_high = flat_years.max
+  end
+
+  def parse_year_string(year_string)
+    parse_year(year_string.to_s.strip)
+  end
+
   def centuryize(year, base_year=nil)
     base = default_base_year(year)
     if base_year
@@ -63,27 +81,29 @@ class FlexYear
     end
   end
 
-  def parse_year
-    if @year_string =~ range_regex && $1 && $2
+  def parse_year(year_string)
+    low, high = RangeParser.parse(year_string)
+
+    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
     else
-      if @year_string =~ decade_regex
+      if year_string =~ decade_regex
         @base_year = centuryize($1).to_i
-      elsif @year_string =~ asterisk_regex
+      elsif year_string =~ asterisk_regex
         @base_year = centuryize($1).to_i * 10
-      elsif @year_string =~ starts_with_word_regex
+      elsif year_string =~ starts_with_word_regex
         @base_year = centuryize($1).to_i
       else
-        @base_year = centuryize(@year_string.gsub(/\D+/,'')).to_i
+        @base_year = centuryize(year_string.gsub(/\D+/,'')).to_i
       end
 
       if @base_year > 9999
         raise InvalidYearError, "Please use a four digit year."
       end
 
-      @year_low = @base_year + @low unless @low.nil?
-      @year_high = @base_year + @high unless @high.nil?
+      @year_low = @base_year + low unless low.nil?
+      @year_high = @base_year + high unless high.nil?
     end
   end
 
@@ -107,11 +127,11 @@ class FlexYear
   class Historical < FlexYear
     private
 
-    def parse_year
-      super
+    def parse_year(year_string)
+      super(year_string)
 
       if (!@year_low.nil? && @year_low > DateTime.now.year) || (!@year_high.nil? && @year_high > DateTime.now.year)
-        raise InvalidYearError, "The year must be in the past. You specified #{@year_string}; Today is #{DateTime.now.year}"
+        raise InvalidYearError, "The year must be in the past. You specified #{year_string}; Today is #{DateTime.now.year}"
       end
     end
   end

data/spec/flexyear_spec.rb

@@ -215,11 +215,32 @@ describe FlexYear do
       end
     end
 
+    context "given a list" do
+      context "mixed years" do
+        subject { flexyear_class.new(["1980s", "mid-80s", "1988 - 1999", 2001,]) }
+        its(:year_low) { should eq(1980) }
+        its(:year_high) { should eq(2001) }
+      end
+
+      context "same years" do
+        subject { flexyear_class.new(["1988", "1988"]) }
+        its(:year_low) { should eq(1988) }
+        its(:year_high) { should eq(1988) }
+      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) }
+      end
+    end
+
     context "given 12345 (five digit year)" do
       specify do
         expect { flexyear_class.new('12345') }.to raise_error(FlexYear::InvalidYearError)
       end
     end
+
   end
 
   describe FlexYear::Historical do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flexyear
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.1
 platform: ruby
 authors:
 - Dan Melnick & Yan Pritzker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-24 00:00:00.000000000 Z
+date: 2019-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,8 +75,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".ruby-gemset"
-- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG
 - Gemfile
@@ -118,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Natural language year range parser

data/.ruby-gemset

@@ -1 +0,0 @@
-flexyear

data/.ruby-version

@@ -1 +0,0 @@
-ruby-2.1.1