flexyear 0.0.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c600ec9615d1a122bb9a76973bfaaa44c38e9b38
-  data.tar.gz: 60878b3ded358e15414b064e64266aadcde5b22c
+  metadata.gz: c675039dfb05f1a30e363fc530c26494f0ba16a4
+  data.tar.gz: 5b64c416f727efb0a6e6e7626f06329dcc924e85
 SHA512:
-  metadata.gz: faa9538ccd247cad361ccaa8d7061e0d5850a274a46f5f1b90e24d7472cd14234e7c8926482955ba123c76f65450e2b457a73ffbcbac823595bd45949ff7e4f8
-  data.tar.gz: 631f4828f79dd5e188ae9a81774c4ce6a18f3406427b104267eb86f12b4825fa255d15a1633c3f8d46fd85181068aa5cf15b79db8d33e85e227f9ce36a1b70e7
+  metadata.gz: 648190b1135fad334615fff61b97bdf6f9e628839b9191adb3da2ba157d54d315b8e82bf0cc4ca224ee947e85ec735d0182348376bfa7c3c6a15d69851b47a9a
+  data.tar.gz: 8d9810c0aab0b64d1883008a0714b93061c695e6de2ea9f295f2a3a7ed33755be873c55d567401b6b2996cf8aa1cb2bb58ebae9d57d3f0dd2ab5872e9e9ec1fa

data/lib/flexyear/range_parsers/after_parser.rb

@@ -0,0 +1,11 @@
+class FlexYear
+  class AfterParser < RangeParser
+    def self.can_parse?(string)
+      string.start_with?('after')
+    end
+
+    def parse
+      [0, nil]
+    end
+  end
+end

data/lib/flexyear/range_parsers/before_parser.rb

@@ -0,0 +1,11 @@
+class FlexYear
+  class BeforeParser < RangeParser
+    def self.can_parse?(string)
+      string.start_with?('before')
+    end
+
+    def parse
+      [nil, 0]
+    end
+  end
+end

data/lib/flexyear/version.rb

@@ -1,3 +1,3 @@
 class FlexYear
-  VERSION = "0.0.3"
+  VERSION = "1.0.0"
 end

data/lib/flexyear.rb

@@ -2,6 +2,8 @@ require 'flexyear/range_parsers/range_parser'
 require 'flexyear/range_parsers/early_parser'
 require 'flexyear/range_parsers/mid_parser'
 require 'flexyear/range_parsers/late_parser'
+require 'flexyear/range_parsers/after_parser'
+require 'flexyear/range_parsers/before_parser'
 require 'flexyear/range_parsers/decade_parser'
 require 'flexyear/range_parsers/year_range_parser'
 require 'flexyear/range_parsers/circa_parser'
@@ -68,8 +70,8 @@ class FlexYear
         raise InvalidYearError, "Please use a four digit year."
       end
 
-      @year_low = @base_year + (@low || 0)
-      @year_high = @base_year + (@high || 0)
+      @year_low = @base_year + @low unless @low.nil?
+      @year_high = @base_year + @high unless @high.nil?
     end
   end
 
@@ -80,8 +82,8 @@ class FlexYear
     def parse_year
       super
 
-      if @year_low > DateTime.now.year || @year_high > DateTime.now.year
-        raise InvalidYearError, "The year must be in the past. You specified #{@base_year}; Today is #{DateTime.now.year}"
+      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}"
       end
     end
   end

data/spec/flexyear_spec.rb

@@ -4,20 +4,20 @@ describe FlexYear do
   [FlexYear, FlexYear::Historical].each do |flexyear_class|
     context "given a blank string" do
       subject { flexyear_class.new("") }
-      its(:year_low) { should eq(0) }
-      its(:year_high) { should eq(0) }
+      its(:year_low) { should be_nil }
+      its(:year_high) { should be_nil }
     end
 
     context "given nil" do
       subject { flexyear_class.new(nil) }
-      its(:year_low) { should eq(0) }
-      its(:year_high) { should eq(0) }
+      its(:year_low) { should be_nil }
+      its(:year_high) { should be_nil }
     end
 
     context "text" do
       subject { flexyear_class.new("something") }
-      its(:year_low) { should eq(0) }
-      its(:year_high) { should eq(0) }
+      its(:year_low) { should be_nil }
+      its(:year_high) { should be_nil }
     end
 
     context "given 1979 as number" do
@@ -49,6 +49,18 @@ describe FlexYear do
       its(:year_low) { should eq(2005) }
       its(:year_high) { should eq(2007) }
     end
+    
+    context 'given before 1973' do
+      subject { FlexYear.new('before 1973') }
+      its(:year_low) { should be_nil }
+      its(:year_high) { should eq(1973) }
+    end
+    
+    context 'given after 1973' do
+      subject { FlexYear.new('after 1973') }
+      its(:year_low) { should eq(1973) }
+      its(:year_high) { should be_nil }
+    end
 
     ["mid 1970s", "mid 70s", "mid-70s", "mid-70's"].each do |year|
       context "given #{year}" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flexyear
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Dan Melnick & Yan Pritzker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-24 00:00:00.000000000 Z
+date: 2013-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -68,6 +68,8 @@ files:
 - Rakefile
 - flexyear.gemspec
 - lib/flexyear.rb
+- lib/flexyear/range_parsers/after_parser.rb
+- lib/flexyear/range_parsers/before_parser.rb
 - lib/flexyear/range_parsers/circa_parser.rb
 - lib/flexyear/range_parsers/decade_parser.rb
 - lib/flexyear/range_parsers/early_parser.rb
@@ -104,4 +106,3 @@ specification_version: 4
 summary: Natural language year range parser
 test_files:
 - spec/flexyear_spec.rb
-has_rdoc: