flexyear 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03f0180f05ab5d01948b0a24796cbfd9a7b23970
-  data.tar.gz: cfaa51b4ed1ebae6f300a629cd1d500b3a1ab7e2
+  metadata.gz: c600ec9615d1a122bb9a76973bfaaa44c38e9b38
+  data.tar.gz: 60878b3ded358e15414b064e64266aadcde5b22c
 SHA512:
-  metadata.gz: b48806ae6b6b7658b7b0893a56bcfbb3ee28dbec7991cc3bad224495bb66ec3a8fd57fafbffd6a1b92c482ad431fbae6e21a215a0c62451fdb87c40e38cad2e5
-  data.tar.gz: 82427042b5d194fdc6afe64fc615e638ff9a4c7252071f76bb6cb6b4b2dc9cfd5c66ddaa724962d614985432cc921cb599dbea10fbd680beae595a958b73bdd0
+  metadata.gz: faa9538ccd247cad361ccaa8d7061e0d5850a274a46f5f1b90e24d7472cd14234e7c8926482955ba123c76f65450e2b457a73ffbcbac823595bd45949ff7e4f8
+  data.tar.gz: 631f4828f79dd5e188ae9a81774c4ce6a18f3406427b104267eb86f12b4825fa255d15a1633c3f8d46fd85181068aa5cf15b79db8d33e85e227f9ce36a1b70e7

data/CHANGELOG

@@ -1,3 +1,6 @@
+0.0.3
+	- Bugfix: FlexYear::Historical was broken in 0.0.2 when dealing with date
+	ranges
 0.0.2
 	- Refactor main parser code into parser subclasses (@tmaier)
 	- Remove ReissueParser, moved to Reverb codebase as it's not generic

data/lib/flexyear.rb

@@ -80,7 +80,7 @@ class FlexYear
     def parse_year
       super
 
-      if @base_year > DateTime.now.year
+      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}"
       end
     end

data/lib/flexyear/version.rb

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

data/spec/flexyear_spec.rb

@@ -1,179 +1,181 @@
 require 'flexyear'
 
 describe FlexYear do
-  context "given a blank string" do
-    subject { FlexYear.new("") }
-    its(:year_low) { should eq(0) }
-    its(:year_high) { should eq(0) }
-  end
-
-  context "given nil" do
-    subject { FlexYear.new(nil) }
-    its(:year_low) { should eq(0) }
-    its(:year_high) { should eq(0) }
-  end
-
-  context "text" do
-    subject { FlexYear.new("something") }
-    its(:year_low) { should eq(0) }
-    its(:year_high) { should eq(0) }
-  end
-
-  context "given 1979 as number" do
-    subject { FlexYear.new(1979) }
-    its(:year_low) { should eq(1979) }
-    its(:year_high) { should eq(1979) }
-  end
-
-  context "given 1979" do
-    subject { FlexYear.new("1979") }
-    its(:year_low) { should eq(1979) }
-    its(:year_high) { should eq(1979) }
-  end
+  [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) }
+    end
 
-  context "given 1970s" do
-    subject { FlexYear.new("1970s") }
-    its(:year_low) { should eq(1970) }
-    its(:year_high) { should eq(1979) }
-  end
+    context "given nil" do
+      subject { flexyear_class.new(nil) }
+      its(:year_low) { should eq(0) }
+      its(:year_high) { should eq(0) }
+    end
 
-  context "given 70s" do
-    subject { FlexYear.new("70s") }
-    its(:year_low) { should eq(1970) }
-    its(:year_high) { should eq(1979) }
-  end
+    context "text" do
+      subject { flexyear_class.new("something") }
+      its(:year_low) { should eq(0) }
+      its(:year_high) { should eq(0) }
+    end
 
-  context "given something with negative and dots" do
-    subject { FlexYear.new("approx.-2006") }
-    its(:year_low) { should eq(2005) }
-    its(:year_high) { should eq(2007) }
-  end
+    context "given 1979 as number" do
+      subject { flexyear_class.new(1979) }
+      its(:year_low) { should eq(1979) }
+      its(:year_high) { should eq(1979) }
+    end
 
-  ["mid 1970s", "mid 70s", "mid-70s", "mid-70's"].each do |year|
-    context "given #{year}" do
-      subject { FlexYear.new(year) }
-      its(:year_low) { should eq(1973) }
-      its(:year_high) { should eq(1976) }
-      its(:to_s) { should eq(year) }
+    context "given 1979" do
+      subject { flexyear_class.new("1979") }
+      its(:year_low) { should eq(1979) }
+      its(:year_high) { should eq(1979) }
     end
-  end
 
-  ["early 1970s", "early 70s", "early-70s", "early 70's"].each do |year|
-    context "given #{year}" do
-      subject { FlexYear.new(year) }
+    context "given 1970s" do
+      subject { flexyear_class.new("1970s") }
       its(:year_low) { should eq(1970) }
-      its(:year_high) { should eq(1973) }
+      its(:year_high) { should eq(1979) }
     end
-  end
 
-  ["late 1970s", "late 70s", "late -70s", "late  70  s"].each do |year|
-    context "given #{year}" do
-      subject { FlexYear.new(year) }
-      its(:year_low) { should eq(1976) }
+    context "given 70s" do
+      subject { flexyear_class.new("70s") }
+      its(:year_low) { should eq(1970) }
       its(:year_high) { should eq(1979) }
     end
-  end
 
-  ["73-75", "1973-1975", "1973 - 1975", "1973- 1975", "1973 -1975", "1973-75"].each do |range|
-    context "given a range #{range}" do
-      subject { FlexYear.new(range) }
-      its(:year_low) { should eq(1973) }
-      its(:year_high) { should eq(1975) }
+    context "given something with negative and dots" do
+      subject { flexyear_class.new("approx.-2006") }
+      its(:year_low) { should eq(2005) }
+      its(:year_high) { should eq(2007) }
     end
-  end
-
-  context "given a range 1975-1973 (from high to low)" do
-    subject { FlexYear.new('1975-1973') }
-    its(:year_low) { should eq(1973) }
-    its(:year_high) { should eq(1975) }
-  end
 
-  context "given a range" do
-    ["2003-4", "2003-04"].each do |range|
-      subject { FlexYear.new(range) }
-      its(:year_low) { should eq(2003) }
-      its(:year_high) { should eq(2004) }
+    ["mid 1970s", "mid 70s", "mid-70s", "mid-70's"].each do |year|
+      context "given #{year}" do
+        subject { flexyear_class.new(year) }
+        its(:year_low) { should eq(1973) }
+        its(:year_high) { should eq(1976) }
+        its(:to_s) { should eq(year) }
+      end
     end
-  end
 
-  context 'given a circa' do
-    context 'at the end of the string' do
-      subject { FlexYear.new('1973 (Circa)') }
-      its(:year_low) { should eq(1972) }
-      its(:year_high) { should eq(1974) }
+    ["early 1970s", "early 70s", "early-70s", "early 70's"].each do |year|
+      context "given #{year}" do
+        subject { flexyear_class.new(year) }
+        its(:year_low) { should eq(1970) }
+        its(:year_high) { should eq(1973) }
+      end
     end
 
-    context 'at the beginning of the string' do
-      subject { FlexYear.new('Circa 1973') }
-      its(:year_low) { should eq(1972) }
-      its(:year_high) { should eq(1974) }
+    ["late 1970s", "late 70s", "late -70s", "late  70  s"].each do |year|
+      context "given #{year}" do
+        subject { flexyear_class.new(year) }
+        its(:year_low) { should eq(1976) }
+        its(:year_high) { should eq(1979) }
+      end
     end
 
-    context 'abbreviated' do
-      subject { FlexYear.new('ca 1973') }
-      its(:year_low) { should eq(1972) }
-      its(:year_high) { should eq(1974) }
+    ["73-75", "1973-1975", "1973 - 1975", "1973- 1975", "1973 -1975", "1973-75"].each do |range|
+      context "given a range #{range}" do
+        subject { flexyear_class.new(range) }
+        its(:year_low) { should eq(1973) }
+        its(:year_high) { should eq(1975) }
+      end
     end
 
-    context 'with dots' do
-      subject { FlexYear.new('c.a. 1973') }
-      its(:year_low) { should eq(1972) }
-      its(:year_high) { should eq(1974) }
+    context "given a range 1975-1973 (from high to low)" do
+      subject { flexyear_class.new('1975-1973') }
+      its(:year_low) { should eq(1973) }
+      its(:year_high) { should eq(1975) }
     end
 
-    context 'with c.' do
-      subject { FlexYear.new('c. 1973') }
-      its(:year_low) { should eq(1972) }
-      its(:year_high) { should eq(1974) }
+    context "given a range" do
+      ["2003-4", "2003-04"].each do |range|
+        subject { flexyear_class.new(range) }
+        its(:year_low) { should eq(2003) }
+        its(:year_high) { should eq(2004) }
+      end
     end
 
-    context 'with ca.' do
-      subject { FlexYear.new('ca. 1973') }
-      its(:year_low) { should eq(1972) }
-      its(:year_high) { should eq(1974) }
-    end
+    context 'given a circa' do
+      context 'at the end of the string' do
+        subject { flexyear_class.new('1973 (Circa)') }
+        its(:year_low) { should eq(1972) }
+        its(:year_high) { should eq(1974) }
+      end
 
-    context 'with approx.' do
-      subject { FlexYear.new('approx. 1973') }
-      its(:year_low) { should eq(1972) }
-      its(:year_high) { should eq(1974) }
-    end
+      context 'at the beginning of the string' do
+        subject { flexyear_class.new('Circa 1973') }
+        its(:year_low) { should eq(1972) }
+        its(:year_high) { should eq(1974) }
+      end
 
-    context 'with appxly.' do
-      subject { FlexYear.new('appxly 1973') }
-      its(:year_low) { should eq(1972) }
-      its(:year_high) { should eq(1974) }
-    end
+      context 'abbreviated' do
+        subject { flexyear_class.new('ca 1973') }
+        its(:year_low) { should eq(1972) }
+        its(:year_high) { should eq(1974) }
+      end
 
-    context 'with around' do
-      subject { FlexYear.new('around 1973') }
-      its(:year_low) { should eq(1972) }
-      its(:year_high) { should eq(1974) }
-    end
+      context 'with dots' do
+        subject { flexyear_class.new('c.a. 1973') }
+        its(:year_low) { should eq(1972) }
+        its(:year_high) { should eq(1974) }
+      end
 
-    context 'with about' do
-      subject { FlexYear.new('about 1973') }
-      its(:year_low) { should eq(1972) }
-      its(:year_high) { should eq(1974) }
-    end
+      context 'with c.' do
+        subject { flexyear_class.new('c. 1973') }
+        its(:year_low) { should eq(1972) }
+        its(:year_high) { should eq(1974) }
+      end
 
-    context 'with circ' do
-      subject { FlexYear.new('circ. 1973') }
-      its(:year_low) { should eq(1972) }
-      its(:year_high) { should eq(1974) }
-    end
+      context 'with ca.' do
+        subject { flexyear_class.new('ca. 1973') }
+        its(:year_low) { should eq(1972) }
+        its(:year_high) { should eq(1974) }
+      end
 
-    context 'with cca' do
-      subject { FlexYear.new('cca 1973') }
-      its(:year_low) { should eq(1972) }
-      its(:year_high) { should eq(1974) }
-    end
+      context 'with approx.' do
+        subject { flexyear_class.new('approx. 1973') }
+        its(:year_low) { should eq(1972) }
+        its(:year_high) { should eq(1974) }
+      end
 
-  end
+      context 'with appxly.' do
+        subject { flexyear_class.new('appxly 1973') }
+        its(:year_low) { should eq(1972) }
+        its(:year_high) { should eq(1974) }
+      end
+
+      context 'with around' do
+        subject { flexyear_class.new('around 1973') }
+        its(:year_low) { should eq(1972) }
+        its(:year_high) { should eq(1974) }
+      end
+
+      context 'with about' do
+        subject { flexyear_class.new('about 1973') }
+        its(:year_low) { should eq(1972) }
+        its(:year_high) { should eq(1974) }
+      end
+
+      context 'with circ' do
+        subject { flexyear_class.new('circ. 1973') }
+        its(:year_low) { should eq(1972) }
+        its(:year_high) { should eq(1974) }
+      end
+
+      context 'with cca' do
+        subject { flexyear_class.new('cca 1973') }
+        its(:year_low) { should eq(1972) }
+        its(:year_high) { should eq(1974) }
+      end
+
+    end
 
-  context "given 12345 (five digit year)" do
-    specify do
-      expect { FlexYear.new('12345') }.to raise_error(FlexYear::InvalidYearError)
+    context "given 12345 (five digit year)" do
+      specify do
+        expect { flexyear_class.new('12345') }.to raise_error(FlexYear::InvalidYearError)
+      end
     end
   end
 
@@ -184,4 +186,5 @@ describe FlexYear do
       end
     end
   end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flexyear
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Dan Melnick & Yan Pritzker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-21 00:00:00.000000000 Z
+date: 2013-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler