flexyear 1.0.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c016a8105451d1e6531aad3a1a414c29e96ea58
-  data.tar.gz: 30c971747ad7fa88e014ce3a398b1acc0736cf4a
+  metadata.gz: 97cfa33d0a581edde9231e9179dcf15b4961886f
+  data.tar.gz: 28a10f8c6506e5aec3b1682e7bec4985cc6cd01b
 SHA512:
-  metadata.gz: 216677db5ea78483ff7b8f0f4b03b7945fc71eefd3ef9de8578a7671da6aa4e7d62f29bc8a92aa59f15ef96fcd9718b198999b2fce3e3ae8989575911fa9239a
-  data.tar.gz: c6435aaf570feb823d3c14f0c747b8768a9d2cac8e203227e587a2c8b3f70ed212bf0e81b3fbec38440c63d947d8a54ab8dad8a8776cfd6e5d9087b4ff753589
+  metadata.gz: 239b899a0be17549545621a5aa099c21b592cffdb0d442200ff9567be24aad59d78e27cfd99b8760f0612574fba2c2e6875515db6a2e512604d0d1ea926b71d7
+  data.tar.gz: f5045399981aac58a22aca47326d6cff185928943be452c256535aa95511a885ba984a9cbcad3bfa2ab1804ab56957d72ab11a2de1f0c46dccd7cae3833e2c06

data/flexyear.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["pair+dm+yp@reverb.com"]
   spec.description   = %q{Parse common year range formats like '1973-75' or natural language ranges like 'mid 80s'}
   spec.summary       = %q{Natural language year range parser}
-  spec.homepage      = "http://github.com/reverbdev/flexyear"
+  spec.homepage      = "http://github.com/reverbdotcom/flexyear"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
@@ -20,5 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec", "~> 3.5"
+  spec.add_development_dependency "rspec-its", "~> 1.2"
 end

data/lib/flexyear/version.rb

@@ -1,3 +1,3 @@
 class FlexYear
-  VERSION = "1.0.1"
+  VERSION = "2.0.0"
 end

data/lib/flexyear.rb

@@ -40,7 +40,7 @@ class FlexYear
   private
 
   def centuryize(year, base_year=nil)
-    base = "19" # 19th century
+    base = default_base_year(year)
     if base_year
       base = (base_year/100).to_s
     end
@@ -54,6 +54,15 @@ class FlexYear
     end
   end
 
+  def default_base_year(year)
+    current_year = Date.today.year.to_s
+    if year.to_i < current_year[-2..-1].to_i
+      "20" # 21st century
+    else
+      "19" # 20th century
+    end
+  end
+
   def parse_year
     if @year_string =~ range_regex && $1 && $2
       @year_low = centuryize($1).to_i
@@ -66,7 +75,7 @@ class FlexYear
       elsif @year_string =~ starts_with_word_regex
         @base_year = centuryize($1).to_i
       else
-        @base_year = @year_string.gsub(/\D+/,'').to_i
+        @base_year = centuryize(@year_string.gsub(/\D+/,'')).to_i
       end
 
       if @base_year > 9999

data/spec/flexyear_spec.rb

@@ -1,6 +1,12 @@
+require "rspec"
+require "rspec/its"
 require 'flexyear'
 
 describe FlexYear do
+  before do
+    allow(Date).to receive(:today) { Date.parse("2016-11-07") }
+  end
+
   [FlexYear, FlexYear::Historical].each do |flexyear_class|
     context "given a blank string" do
       subject { flexyear_class.new("") }
@@ -108,7 +114,7 @@ describe FlexYear do
     end
 
     context "given a range" do
-      ["2003-4", "2003-04"].each do |range|
+      ["2003-4", "2003-04", "03-04"].each do |range|
         subject { flexyear_class.new(range) }
         its(:year_low) { should eq(2003) }
         its(:year_high) { should eq(2004) }
@@ -188,6 +194,19 @@ describe FlexYear do
         its(:year_high) { should eq(1974) }
       end
 
+      context 'given 2 character fields' do
+        context "from previous century" do
+          subject { flexyear_class.new("73") }
+          its(:year_low) { should eq(1973) }
+          its(:year_high) { should eq(1973) }
+        end
+
+        context "from current century" do
+          subject { flexyear_class.new("06") }
+          its(:year_low) { should eq(2006) }
+          its(:year_high) { should eq(2006) }
+        end
+      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: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Dan Melnick & Yan Pritzker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-28 00:00:00.000000000 Z
+date: 2016-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,16 +42,30 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.5'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 description: Parse common year range formats like '1973-75' or natural language ranges
   like 'mid 80s'
 email:
@@ -83,7 +97,7 @@ files:
 - lib/flexyear/range_parsers/year_range_parser.rb
 - lib/flexyear/version.rb
 - spec/flexyear_spec.rb
-homepage: http://github.com/reverbdev/flexyear
+homepage: http://github.com/reverbdotcom/flexyear
 licenses:
 - MIT
 metadata: {}
@@ -103,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Natural language year range parser