edtf 3.2.0 → 3.3.0

data/lib/edtf/parser.y

@@ -135,13 +135,45 @@ rule
     result = Date.new(val[0]).unspecified!([:day,:month])
   }
 
-  level_1_interval : level_1_start '/' level_1_end {
+  level_1_interval : level_1_interval_closed | level_1_interval_open | level_1_interval_unknown
+
+  level_1_interval_closed : level_1_start '/' level_1_end {
     result = Interval.new(val[0], val[2])
   }
 
-  level_1_start : date | partial_uncertain_or_approximate | unspecified | partial_unspecified | UNKNOWN
+  level_1_interval_open : level_1_interval_open_start | level_1_interval_open_end 
+
+  level_1_interval_open_start : open_start_or_end '/' level_1_end {
+    result = Interval.new(:open, val[2])
+  }
+
+  level_1_interval_open_end : level_1_start '/' open_start_or_end {
+    result = Interval.new(val[0], :open)
+  }
+
+  open_start_or_end : OPEN | DOTS 
+
+  level_1_interval_unknown : level_1_interval_empty_start | level_1_interval_empty_end | level_1_interval_unknown_start | level_1_interval_unknown_end
+
+  level_1_interval_empty_start : '/' level_1_end {
+    result = Interval.new(:unknown, val[1])
+  }
+
+  level_1_interval_empty_end : level_1_start '/' {
+    result = Interval.new(val[0], :unknown)
+  }
+
+  level_1_interval_unknown_start : UNKNOWN '/' level_1_end {
+    result = Interval.new(:unknown, val[2])
+  }
+
+  level_1_interval_unknown_end : level_1_start '/' UNKNOWN {
+    result = Interval.new(val[0], :unknown)
+  }
+
+  level_1_start : date | partial_uncertain_or_approximate | unspecified | partial_unspecified
 
-  level_1_end : level_1_start | OPEN
+  level_1_end : level_1_start
 
 
   long_year_simple :
@@ -260,8 +292,8 @@ rule
         | year DOTS           { result = Date.new(val[0]).year_precision! }
         ;
 
-  consecutives : year_month_day DOTS year_month_day { result = (Date.new(val[0]).day_precision! .. Date.new(val[2]).day_precision!) }
-               | year_month DOTS year_month         { result = (Date.new(val[0]).month_precision! .. Date.new(val[2]).month_precision!) }
+  consecutives : year_month_day DOTS year_month_day { result = (Date.new(*val[0]).day_precision! .. Date.new(*val[2]).day_precision!) }
+               | year_month DOTS year_month         { result = (Date.new(*val[0]).month_precision! .. Date.new(*val[2]).month_precision!) }
                | year DOTS year                     { result = (Date.new(val[0]).year_precision! .. Date.new(val[2]).year_precision!) }
                ;
 

data/lib/edtf/version.rb

@@ -1,3 +1,3 @@
 module EDTF
-  VERSION = '3.2.0'.freeze
+  VERSION = '3.3.0'.freeze
 end

data/spec/edtf/interval_spec.rb

@@ -106,6 +106,99 @@ module EDTF
 
     end
 
+    describe 'the interval 2008-08-23/..' do
+      let(:interval) { Date.edtf('2008-08-23/..') }
+
+      it { expect(interval).to be_open }
+      it { expect(interval).to be_open_end }
+      it { expect(interval).not_to be_unknown }
+      it { expect(interval).not_to be_unknown_start }
+      it { expect(interval).not_to be_unknown_end }
+
+      it 'the min date is 2008-08-23' do
+        expect(interval.min).to eq(Date.new(2008,8,23))
+      end
+
+      it 'the max date is nil' do
+        expect(interval.max).to be nil
+      end
+
+      it 'includes christmas day 2009' do
+        expect(interval).to be_include(Date.new(2009,12,24))
+      end
+
+      it 'covers christmas day 2009' do
+        expect(interval).to be_cover(Date.new(2009,12,24))
+      end
+
+      it 'covers 2023-07-02' do
+        expect(interval).to be_cover(Date.new(2023,07,02))
+      end
+
+    end
+
+    describe 'the interval open/2008-08-23' do
+      let(:interval) { Date.edtf('open/2008-08-23') }
+
+      it { expect(interval).to be_open }
+      it { expect(interval).to be_open_start }
+      it { expect(interval).not_to be_open_end }
+      it { expect(interval).not_to be_unknown }
+      it { expect(interval).not_to be_unknown_start }
+      it { expect(interval).not_to be_unknown_end }
+
+      it 'the max date is 2008-08-23' do
+        expect(interval.max).to eq(Date.new(2008,8,23))
+      end
+
+      it 'the min date is nil' do
+        expect(interval.min).to be nil
+      end
+
+      it 'includes christmas day 2007' do
+        expect(interval).to be_include(Date.new(2007,12,24))
+      end
+
+      it 'covers christmas day 2007' do
+        expect(interval).to be_cover(Date.new(2007,12,24))
+      end
+
+      it 'covers 2003-07-02' do
+        expect(interval).to be_cover(Date.new(2003,07,02))
+      end
+    end
+
+    describe 'the interval ../2008-08-23' do
+      let(:interval) { Date.edtf('../2008-08-23') }
+
+      it { expect(interval).to be_open }
+      it { expect(interval).to be_open_start }
+      it { expect(interval).not_to be_open_end }
+      it { expect(interval).not_to be_unknown }
+      it { expect(interval).not_to be_unknown_start }
+      it { expect(interval).not_to be_unknown_end }
+
+      it 'the max date is 2008-08-23' do
+        expect(interval.max).to eq(Date.new(2008,8,23))
+      end
+
+      it 'the min date is nil' do
+        expect(interval.min).to be nil
+      end
+
+      it 'includes christmas day 2007' do
+        expect(interval).to be_include(Date.new(2007,12,24))
+      end
+
+      it 'covers christmas day 2007' do
+        expect(interval).to be_cover(Date.new(2007,12,24))
+      end
+
+      it 'covers 2003-07-02' do
+        expect(interval).to be_cover(Date.new(2003,07,02))
+      end
+    end
+
     describe 'the interval 2008/unknown' do
       let(:interval) { Date.edtf('2008/unknown') }
 
@@ -126,6 +219,66 @@ module EDTF
       end
     end
 
+    describe 'the interval unknown/2008' do
+      let(:interval) { Date.edtf('unknown/2008') }
+
+      it { expect(interval).to be_unknown }
+      it { expect(interval).not_to be_unknown_end }
+      it { expect(interval).to be_unknown_start }
+
+      it 'the max date is 2008-12-31' do
+        expect(interval.max.to_s).to eq('2008-12-31')
+      end
+
+      it 'the max date has year precision' do
+        expect(interval.max).to be_year_precision
+      end
+
+      it 'the min date is nil' do
+        expect(interval.min).to be nil
+      end
+    end
+
+    describe 'the interval 2008/' do
+      let(:interval) { Date.edtf('2008/') }
+
+      it { expect(interval).to be_unknown }
+      it { expect(interval).to be_unknown_end }
+      it { expect(interval).not_to be_unknown_start }
+
+      it 'the min date is 2008-01-01' do
+        expect(interval.min.to_s).to eq('2008-01-01')
+      end
+
+      it 'the min date has year precision' do
+        expect(interval.min).to be_year_precision
+      end
+
+      it 'the max date is nil' do
+        expect(interval.max).to be nil
+      end
+    end
+
+    describe 'the interval /2008' do
+      let(:interval) { Date.edtf('/2008') }
+
+      it { expect(interval).to be_unknown }
+      it { expect(interval).not_to be_unknown_end }
+      it { expect(interval).to be_unknown_start }
+
+      it 'the max date is 2008-12-31' do
+        expect(interval.max.to_s).to eq('2008-12-31')
+      end
+
+      it 'the max date has year precision' do
+        expect(interval.max).to be_year_precision
+      end
+
+      it 'the min date is nil' do
+        expect(interval.min).to be nil
+      end
+    end
+
     describe 'comparisions' do
       it '2007/2009 should be greater than 2001/2002' do
         expect(Date.edtf('2007/2009')).to be > Date.edtf('2001/2002')
@@ -151,11 +304,5 @@ module EDTF
         expect(Date.edtf('2007/2009')).to eq(Date.edtf('2007/2009'))
       end
     end
-
-    it 'may not have an open start' do
-      expect {
-        Interval.new(:open, Date.today)
-      }.to raise_error(ArgumentError)
-    end
   end
 end

data/spec/edtf/set_spec.rb

@@ -78,5 +78,30 @@ module EDTF
       end
     end
 
+    describe 'the set [1760-12..1761-03]' do
+      let(:set) { Date.edtf('[1760-12..1761-03]') }
+      
+      it "is a choice" do
+        expect(set).to be_choice
+      end
+      
+      it "maps to the 4 months 1760-12 through 1761-03" do
+        expected_months = %w[1760-12 1761-01 1761-02 1761-03].map { |m| Date.edtf(m) }
+        expect(set.to_a).to eq(expected_months)
+      end
+    end
+
+    describe 'the set {1760-12..1761-03}' do
+      let(:set) { Date.edtf('{1760-12..1761-03}') }
+
+      it "is not a choice" do
+        expect(set).not_to be_choice
+      end
+
+      it "maps to the 4 months 1760-12 through 1761-03" do
+        expected_months = %w[1760-12 1761-01 1761-02 1761-03].map { |m| Date.edtf(m) }
+        expect(set.to_a).to eq(expected_months)
+      end
+    end
   end
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edtf
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Sylvester Keil
 - Ilja Srna
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-26 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -32,14 +31,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '9.0'
 description: A Ruby implementation of the Extended Date/Time Format (EDTF).
-email:
 executables: []
 extensions: []
 extra_rdoc_files:
-- README.md
 - LICENSE
+- README.md
 files:
-- ".autotest"
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
@@ -88,7 +85,6 @@ homepage: http://github.com/inukshuk/edtf-ruby
 licenses:
 - BSD-2-Clause-Views
 metadata: {}
-post_install_message:
 rdoc_options:
 - "--line-numbers"
 - "--inline-source"
@@ -110,8 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
-signing_key:
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Extended Date/Time Format for Ruby.
 test_files:

data/.autotest

@@ -1,8 +0,0 @@
-require 'autotest/bundler'
-
-Autotest.add_hook :initialize do |at|
-  at.add_mapping(/.+\.y$/) do |f,_|
-    system 'rake clean racc_debug'
-  end
-end
-