edtf 3.0.1 → 3.0.2

data/lib/edtf/parser.y

@@ -20,18 +20,12 @@ rule
                      | date_time
                      ;
 
-  date : positive_date
-       | negative_date
-       ;
-
-  positive_date :
+  date :
     year             { result = Date.new(val[0]).year_precision! }
     | year_month     { result = Date.new(*val.flatten).month_precision! }
     | year_month_day { result = Date.new(*val.flatten).day_precision! }
     ;
 
-  negative_date :  '-' positive_date { result = -val[1] }
-
 
   date_time : date T time {
     result = DateTime.new(val[0].year, val[0].month, val[0].day, *val[2])
@@ -61,7 +55,10 @@ rule
                    | '0' '0' ':' d01_59  { result = Rational(val[3], 1440) }
                    ;
 
-  year : digit digit digit digit {
+  year : positive_year
+       | '-' positive_year { result = -val[1] }
+
+  positive_year : digit digit digit digit {
     result = val.zip([1000,100,10,1]).reduce(0) { |s,(a,b)| s += a * b }
   }
 
@@ -108,7 +105,14 @@ rule
               | unspecified_day_and_month
               ;
 
-  unspecified_year :
+  unspecified_year : positive_unspecified_year
+                   | '-' positive_unspecified_year
+                   {
+                     result = val[1]
+                     result[0] = -result[0]
+                   }
+
+  positive_unspecified_year :
     digit digit digit U
     {
       result = [val[0,3].zip([1000,100,10]).reduce(0) { |s,(a,b)| s += a * b }, [false,true]]

data/lib/edtf/version.rb

@@ -1,3 +1,3 @@
 module EDTF
-  VERSION = '3.0.1'.freeze
+  VERSION = '3.0.2'.freeze
 end

data/spec/edtf/parser_spec.rb

@@ -50,7 +50,12 @@ module EDTF
         expect(Parser.new.parse('199u')).to be_unspecified
         expect(Parser.new.parse('1999-uu-uu')).to be_unspecified
       end
-      
+
+      it 'parses negative unspecified dates' do
+        expect(Parser.new.parse('-199u')).to be_unspecified
+        expect(Parser.new.parse('-1999-uu-uu')).to be_unspecified
+      end
+
       it 'parses open intervals' do
         expect(Parser.new.parse('2004-01-01/open')).to be_open
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edtf
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Sylvester Keil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-17 00:00:00.000000000 Z
+date: 2017-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport