edtf 3.2.0 → 4.0.0

data/lib/edtf/parser.y

@@ -21,9 +21,9 @@ rule
                      ;
 
   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! }
+    year             { result = Date.gregorian(val[0]).year_precision! }
+    | year_month     { result = Date.gregorian(*val.flatten).month_precision! }
+    | year_month_day { result = Date.gregorian(*val.flatten).day_precision! }
     ;
 
 
@@ -97,7 +97,7 @@ rule
 
   unspecified : unspecified_year
               {
-                result = Date.new(val[0][0]).year_precision!
+                result = Date.gregorian(val[0][0]).year_precision!
                 result.unspecified.year[2,2] = val[0][1]
               }
               | unspecified_month
@@ -123,36 +123,68 @@ rule
     }
 
   unspecified_month : year '-' U U {
-    result = Date.new(val[0]).unspecified!(:month)
+    result = Date.gregorian(val[0]).unspecified!(:month)
     result.precision = :month
   }
 
   unspecified_day : year_month '-' U U {
-    result = Date.new(*val[0]).unspecified!(:day)
+    result = Date.gregorian(*val[0]).unspecified!(:day)
   }
 
   unspecified_day_and_month : year '-' U U '-' U U {
-    result = Date.new(val[0]).unspecified!([:day,:month])
+    result = Date.gregorian(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 :
     LONGYEAR long_year
     {
-      result = Date.new(val[1])
+      result = Date.gregorian(val[1])
       result.precision = :year
     }
     | LONGYEAR '-' long_year
     {
-      result = Date.new(-1 * val[2])
+      result = Date.gregorian(-1 * val[2])
       result.precision = :year
     }
     ;
@@ -197,15 +229,15 @@ rule
   long_year_scientific :
     long_year_simple E integer
     {
-      result = Date.new(val[0].year * 10 ** val[2]).year_precision!
+      result = Date.gregorian(val[0].year * 10 ** val[2]).year_precision!
     }
     | LONGYEAR int1_4 E integer
     {
-      result = Date.new(val[1] * 10 ** val[3]).year_precision!
+      result = Date.gregorian(val[1] * 10 ** val[3]).year_precision!
     }
     | LONGYEAR '-' int1_4 E integer
     {
-      result = Date.new(-1 * val[2] * 10 ** val[4]).year_precision!
+      result = Date.gregorian(-1 * val[2] * 10 ** val[4]).year_precision!
     }
     ;
 
@@ -255,49 +287,49 @@ rule
 
   earlier : DOTS date { result = val[1] }
 
-  later : year_month_day DOTS { result = Date.new(*val[0]).day_precision! }
-        | year_month DOTS     { result = Date.new(*val[0]).month_precision! }
-        | year DOTS           { result = Date.new(val[0]).year_precision! }
+  later : year_month_day DOTS { result = Date.gregorian(*val[0]).day_precision! }
+        | year_month DOTS     { result = Date.gregorian(*val[0]).month_precision! }
+        | year DOTS           { result = Date.gregorian(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!) }
-               | year DOTS year                     { result = (Date.new(val[0]).year_precision! .. Date.new(val[2]).year_precision!) }
+  consecutives : year_month_day DOTS year_month_day { result = (Date.gregorian(*val[0]).day_precision! .. Date.gregorian(*val[2]).day_precision!) }
+               | year_month DOTS year_month         { result = (Date.gregorian(*val[0]).month_precision! .. Date.gregorian(*val[2]).month_precision!) }
+               | year DOTS year                     { result = (Date.gregorian(val[0]).year_precision! .. Date.gregorian(val[2]).year_precision!) }
                ;
 
   partial_unspecified :
     unspecified_year '-' month '-' day
     {
-      result = Date.new(val[0][0], val[2], val[4])
+      result = Date.gregorian(val[0][0], val[2], val[4])
       result.unspecified.year[2,2] = val[0][1]
     }
     | unspecified_year '-' month
     {
-      result = Date.new(val[0][0], val[2], 1)
+      result = Date.gregorian(val[0][0], val[2], 1)
       result.month_precision!
       result.unspecified.year[2,2] = val[0][1]
     }
     | unspecified_year '-' U U '-' day
     {
-      result = Date.new(val[0][0], 1, val[5])
+      result = Date.gregorian(val[0][0], 1, val[5])
       result.unspecified.year[2,2] = val[0][1]
       result.unspecified!(:month)
     }
     | unspecified_year '-' U U '-' U U
     {
-      result = Date.new(val[0][0], 1, 1)
+      result = Date.gregorian(val[0][0], 1, 1)
       result.unspecified.year[2,2] = val[0][1]
       result.unspecified!([:month, :day])
     }
     | unspecified_year '-' month '-' U U
     {
-      result = Date.new(val[0][0], val[2], 1)
+      result = Date.gregorian(val[0][0], val[2], 1)
       result.unspecified.year[2,2] = val[0][1]
       result.unspecified!(:day)
     }
     | year '-' U U '-' day
     {
-      result = Date.new(val[0], 1, val[5])
+      result = Date.gregorian(val[0], 1, val[5])
       result.unspecified!(:month)
     }
     ;
@@ -310,17 +342,17 @@ rule
     | pua_year_month     { result = val[0][0].month_precision! }
     | pua_year_month_day { result = val[0].day_precision! }
 
-  pua_year : year UA { result = uoa(Date.new(val[0]), val[1], :year) }
+  pua_year : year UA { result = uoa(Date.gregorian(val[0]), val[1], :year) }
 
   pua_year_month :
     pua_year '-' month ua {
       result = [uoa(val[0].change(:month => val[2]), val[3], [:month, :year])]
     }
     | year '-' month UA {
-        result = [uoa(Date.new(val[0], val[2]), val[3], [:year, :month])]
+        result = [uoa(Date.gregorian(val[0], val[2]), val[3], [:year, :month])]
     }
     | year '-(' month ')' UA {
-        result = [uoa(Date.new(val[0], val[2]), val[4], [:month]), true]
+        result = [uoa(Date.gregorian(val[0], val[2]), val[4], [:month]), true]
     }
     | pua_year '-(' month ')' UA {
         result = [uoa(val[0].change(:month => val[2]), val[4], [:month]), true]
@@ -335,19 +367,19 @@ rule
         result = uoa(val[0][0].change(:day => val[2]), val[4], [:day])
     }
     | year '-(' month ')' UA day ua {
-        result = uoa(uoa(Date.new(val[0], val[2], val[5]), val[4], :month), val[6], :day)
+        result = uoa(uoa(Date.gregorian(val[0], val[2], val[5]), val[4], :month), val[6], :day)
     }
     | year_month '-' day UA {
-        result = uoa(Date.new(val[0][0], val[0][1], val[2]), val[3])
+        result = uoa(Date.gregorian(val[0][0], val[0][1], val[2]), val[3])
     }
     | year_month '-(' day ')' UA {
-        result = uoa(Date.new(val[0][0], val[0][1], val[2]), val[4], [:day])
+        result = uoa(Date.gregorian(val[0][0], val[0][1], val[2]), val[4], [:day])
     }
     | year '-(' month '-' day ')' UA {
-        result = uoa(Date.new(val[0], val[2], val[4]), val[6], [:month, :day])
+        result = uoa(Date.gregorian(val[0], val[2], val[4]), val[6], [:month, :day])
     }
     | year '-(' month '-(' day ')' UA ')' UA {
-        result = Date.new(val[0], val[2], val[4])
+        result = Date.gregorian(val[0], val[2], val[4])
         result = uoa(result, val[6], [:day])
         result = uoa(result, val[8], [:month, :day])
     }

data/lib/edtf/season.rb

@@ -130,7 +130,13 @@ module EDTF
     def qualified?; !!@qualifier; end
 
     def edtf
-      '%04d-%2d%s' % [year, CODES[season], qualified? ? "^#{qualifier}" : '']
+      '%04d-%2d%s%s%s' % [
+        year,
+        CODES[season],
+        uncertain? ? '?' : '',
+        approximate? ? '~' : '',
+        qualified? ? "^#{qualifier}" : ''
+      ]
     end
 
     alias to_s edtf
@@ -140,7 +146,9 @@ module EDTF
       case other
       when Date
         cover?(other) ? 0 : to_date <=> other
-      when Interval, Epoch
+      when Interval
+        (c = other <=> self) && -c
+      when Epoch
         [min, max] <=> [other.min, other.max]
       when Season
         [year, month, qualifier] <=> [other.year, other.month, other.qualifier]

data/lib/edtf/set.rb

@@ -7,7 +7,6 @@ module EDTF
     include Comparable
 
     def_delegators :@dates, :size, :length, :empty?
-    def_delegators :to_a, :include?
 
     attr_accessor :choice, :later, :earlier
 
@@ -29,6 +28,21 @@ module EDTF
       end
     end
 
+    def include?(v)
+      return false unless v.is_a?(Date)
+      return false if empty?
+
+      dates_array = to_a
+      if earlier?
+        (min = dates_array.first) >= v && min.precision == v.precision
+      elsif later?
+        (max = dates_array.last) <= v && max.precision == v.precision
+      else
+        dates_array.member?(v)
+      end
+    end
+    alias member? include?
+
     def <<(date)
       dates << date
       self

data/lib/edtf/uncertainty.rb

@@ -12,7 +12,6 @@ module EDTF
     end
 
     def hash_base=(base)
-      @hash_map = false
       @hash_base = base
     end
 
@@ -37,13 +36,7 @@ module EDTF
     end
 
     def hash
-      values.zip(hash_map).reduce(0) { |s, (v, h)|  s + (v ? h : 0) }
-    end
-
-    private
-
-    def hash_map
-      @hash_map ||= (0...length).map { |i| hash_base << i }
+      (year ? hash_base : 0) + (month ? hash_base << 1 : 0) + (day ? hash_base << 2 : 0)
     end
 
   end
@@ -79,6 +72,12 @@ module EDTF
     alias specific! specified!
     alias unspecific! unspecified!
 
+    def hash
+      y, m, d = year, month, day
+      (y[0] ? 1 : 0) | (y[1] ? 2 : 0) | (y[2] ? 4 : 0) | (y[3] ? 8 : 0) |
+        (m[0] ? 16 : 0) | (m[1] ? 32 : 0) | (d[0] ? 64 : 0) | (d[1] ? 128 : 0)
+    end
+
     private :year=, :month=, :day=
 
     def to_s

data/lib/edtf/version.rb

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

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edtf
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 4.0.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
@@ -31,37 +30,29 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '9.0'
+- !ruby/object:Gem::Dependency
+  name: racc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 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"
-- ".simplecov"
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
-- cucumber.yml
-- edtf.gemspec
-- features/parser/date_times.feature
-- features/parser/dates.feature
-- features/parser/intervals.feature
-- features/parser/precision.feature
-- features/parser/uncertain_or_approximate.feature
-- features/parser/unspecified.feature
-- features/print/level_0_edtf.feature
-- features/print/level_1_edtf.feature
-- features/print/level_2_edtf.feature
-- features/print/uncertain_or_approximate.feature
-- features/step_definitions/edtf_steps.rb
-- features/support/env.rb
 - lib/edtf.rb
 - lib/edtf/compatibility.rb
 - lib/edtf/date.rb
@@ -76,62 +67,35 @@ files:
 - lib/edtf/uncertainty.rb
 - lib/edtf/unknown.rb
 - lib/edtf/version.rb
-- spec/edtf/date_spec.rb
-- spec/edtf/epoch_spec.rb
-- spec/edtf/interval_spec.rb
-- spec/edtf/parser_spec.rb
-- spec/edtf/season_spec.rb
-- spec/edtf/set_spec.rb
-- spec/edtf/uncertainty_spec.rb
-- spec/spec_helper.rb
-homepage: http://github.com/inukshuk/edtf-ruby
+homepage: https://github.com/inukshuk/edtf-ruby
 licenses:
 - BSD-2-Clause-Views
-metadata: {}
-post_install_message:
+metadata:
+  source_code_uri: https://github.com/inukshuk/edtf-ruby
+  bug_tracker_uri: https://github.com/inukshuk/edtf-ruby/issues
+  rubygems_mfa_required: 'true'
 rdoc_options:
 - "--line-numbers"
-- "--inline-source"
 - "--title"
-- '"EDTF-Ruby"'
+- EDTF-Ruby
 - "--main"
 - README.md
-- "--webcvs=http://github.com/inukshuk/edtf-ruby/tree/master/"
+- "--exclude"
+- lib/edtf/parser.rb
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
-signing_key:
+rubygems_version: 4.0.22
 specification_version: 4
 summary: Extended Date/Time Format for Ruby.
-test_files:
-- features/parser/date_times.feature
-- features/parser/dates.feature
-- features/parser/intervals.feature
-- features/parser/precision.feature
-- features/parser/uncertain_or_approximate.feature
-- features/parser/unspecified.feature
-- features/print/level_0_edtf.feature
-- features/print/level_1_edtf.feature
-- features/print/level_2_edtf.feature
-- features/print/uncertain_or_approximate.feature
-- features/step_definitions/edtf_steps.rb
-- features/support/env.rb
-- spec/edtf/date_spec.rb
-- spec/edtf/epoch_spec.rb
-- spec/edtf/interval_spec.rb
-- spec/edtf/parser_spec.rb
-- spec/edtf/season_spec.rb
-- spec/edtf/set_spec.rb
-- spec/edtf/uncertainty_spec.rb
-- spec/spec_helper.rb
+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
-

data/.github/workflows/ci.yml

@@ -1,41 +0,0 @@
-name: ci
-
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-
-jobs:
-  build:
-    environment: CI
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        ruby-version:
-          - '2.7'
-          - '3.0'
-          - '3.1'
-          - '3.2'
-          - 'jruby'
-
-    steps:
-      - name: Git checkout
-        uses: actions/checkout@v2
-
-      - name: Setup Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby-version }}
-          bundler-cache: true
-
-      - name: Run tests
-        run: bundle exec rake
-
-      - name: Upload coverage results
-        if: matrix.ruby-version == '3.1'
-        continue-on-error: true
-        uses: coverallsapp/github-action@master
-        with:
-          github-token: ${{ github.token }}

data/.gitignore

@@ -1,8 +0,0 @@
-Gemfile.lock
-lib/edtf/parser.output
-*.rbc
-.rbx
-.ruby-version
-*.swp
-.bundle
-coverage

data/.rspec

@@ -1,3 +0,0 @@
---color
---require ./spec/spec_helper.rb
---format progress

data/.simplecov

@@ -1,19 +0,0 @@
-require 'simplecov-lcov'
-
-SimpleCov::Formatter::LcovFormatter.config do |c|
-  c.output_directory = 'coverage'
-  c.lcov_file_name = 'lcov.info'
-  c.report_with_single_file = true
-end
-
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
-  SimpleCov::Formatter::HTMLFormatter,
-  SimpleCov::Formatter::LcovFormatter
-])
-
-SimpleCov.start do
-  add_filter 'spec/'
-  add_filter 'features/'
-
-  enable_coverage :branch
-end

data/Gemfile

@@ -1,22 +0,0 @@
-source 'https://rubygems.org'
-gemspec
-
-group :debug do
-  gem 'debug', platform: 'mri'
-end
-
-group :development do
-  gem 'rake'
-  gem 'racc'
-  gem 'cucumber'
-  gem 'rspec'
-  gem 'simplecov', platform: 'mri'
-  gem 'simplecov-lcov', platform: 'mri'
-end
-
-group :extra do
-  gem 'ZenTest'
-end
-
-# active_support requires this
-gem 'i18n'

data/Rakefile

@@ -1,68 +0,0 @@
-
-require 'bundler'
-begin
-  Bundler.setup
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-
-$:.unshift(File.join(File.dirname(__FILE__), './lib'))
-require 'edtf/version'
-
-require 'rake/clean'
-
-task :default => [:spec, :cucumber]
-
-desc 'Run an IRB session with CiteProc loaded'
-task :console, [:script] do |t,args|
-  ARGV.clear
-
-  require 'irb'
-  require 'edtf'
-
-  IRB.conf[:SCRIPT] = args.script
-  IRB.start
-end
-
-desc 'Generates the parser'
-task :racc do
-  system 'bundle exec racc -o lib/edtf/parser.rb lib/edtf/parser.y'
-end
-
-desc 'Generates the parser with debug information'
-task :racc_debug do
-  system 'bundle exec racc -v -t -o lib/edtf/parser.rb lib/edtf/parser.y'
-end
-
-require 'rspec/core'
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
-end
-
-require 'cucumber/rake/task'
-Cucumber::Rake::Task.new(:cucumber)
-
-desc 'Builds the gem file'
-task :build => [:check_warnings] do
-  system 'gem build edtf.gemspec'
-end
-
-task :check_warnings do
-  $VERBOSE = true
-  require 'edtf'
-  puts EDTF::VERSION
-end
-
-task :release => [ :build] do
-  system "git tag #{EDTF::VERSION}"
-  system "git push --tags"
-  system "gem push edtf-#{EDTF::VERSION}.gem"
-end
-
-CLEAN.include('lib/edtf/parser.rb')
-CLEAN.include('lib/edtf/parser.output')
-CLEAN.include('*.gem')
-CLEAN.include('**/*.rbc')

data/cucumber.yml

@@ -1 +0,0 @@
-default: --format progress --require features --color --publish-quiet

data/edtf.gemspec

@@ -1,29 +0,0 @@
-# -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib/', __FILE__)
-$:.unshift lib unless $:.include?(lib)
-
-require 'edtf/version'
-
-Gem::Specification.new do |s|
-  s.name        = 'edtf'
-  s.version     = EDTF::VERSION.dup
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ['Sylvester Keil', 'Ilja Srna']
-  s.homepage    = 'http://github.com/inukshuk/edtf-ruby'
-  s.summary     = 'Extended Date/Time Format for Ruby.'
-  s.description = 'A Ruby implementation of the Extended Date/Time Format (EDTF).'
-  s.license     = 'BSD-2-Clause-Views'
-
-  s.add_runtime_dependency('activesupport', '>= 3.0', '< 9.0')
-
-  s.files        = `git ls-files`.split("\n") << 'lib/edtf/parser.rb'
-  s.test_files   = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables  = []
-  s.require_path = 'lib'
-
-  s.rdoc_options      = %w{--line-numbers --inline-source --title "EDTF-Ruby" --main README.md --webcvs=http://github.com/inukshuk/edtf-ruby/tree/master/}
-  s.extra_rdoc_files  = %w{README.md LICENSE}
-
-end
-
-# vim: syntax=ruby