historical_dating 1.8.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a00cb6bc3975511c1024df18f2aeaefe6fd0b11f6f850f78b4e61aac88b8c2b
-  data.tar.gz: a5fc6b15f83541d095d8a41f43a948f16425ea93c0e1d699ad31bbd0d3193667
+  metadata.gz: e8d41ccea6467e9b0af4679dfde3cf7591993c7269c31f24cd20076cd2b77049
+  data.tar.gz: 548be0649b5f157434f29d8e2c106c2abf66ee88d49425e8c464361701f71c89
 SHA512:
-  metadata.gz: e17156f25a2517c1fe3a4cb28476697a0ed327bdce8411ce995c7b5f2695b32596041f649a1071991e2fa88531cb0b2429e69ce0707039c5a515d787813f89b4
-  data.tar.gz: 0e08c630c58bb7bee22172548b6137040c073bf8f3d2e1f619b4aa11fbe86a65bd5a7593a1b05ec9ed80f64f243e4cc6ba48610103cee48f640734f4f5778831
+  metadata.gz: 3da263bae047e57e00b8003d767680ff08cca84ae8ffcbac5ff5e7c1c9ca1251d6f672e9821e0a702ffd6748247811d8006265e3cf3ebe3f203f95a7e775ed81
+  data.tar.gz: 22d8f2b7d3cda26c24feaee8beab051136fa2864b2abf7ac00c5720d6af4aabc3e71cc2a2f3cd9f4748b327fd5cc76a2d05ec0b61b1e7d2a03646b13c1ba33ea

data/Gemfile

@@ -5,3 +5,5 @@ gemspec
 
 gem "rake", "~> 12.0"
 gem "minitest", "~> 5.0"
+
+gem "timecop", "~> 0.9.11"

data/Gemfile.lock

@@ -1,31 +1,35 @@
 PATH
   remote: .
   specs:
-    historical_dating (1.8.0)
-      activesupport (>= 3.0.0)
+    historical_dating (1.9.1)
+      activesupport (~> 6.1.4.1)
       parslet (~> 2.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.4)
+    activesupport (6.1.4.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     coderay (1.1.3)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.3.7)
     diff-lcs (1.4.4)
-    i18n (1.8.9)
+    i18n (1.15.2)
       concurrent-ruby (~> 1.0)
-    method_source (1.0.0)
-    minitest (5.14.1)
+    io-console (0.8.2)
+    method_source (1.1.0)
+    minitest (5.27.0)
     parslet (2.0.0)
-    pry (0.13.1)
+    pry (0.16.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
+      reline (>= 0.6.0)
     rake (12.3.3)
+    reline (0.6.3)
+      io-console (~> 0.5)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -39,10 +43,10 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.3)
-    thread_safe (0.3.6)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
-    zeitwerk (2.4.1)
+    timecop (0.9.11)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.8.2)
 
 PLATFORMS
   ruby
@@ -50,9 +54,10 @@ PLATFORMS
 DEPENDENCIES
   historical_dating!
   minitest (~> 5.0)
-  pry
+  pry (~> 0.16.0)
   rake (~> 12.0)
   rspec (~> 3.9.0)
+  timecop (~> 0.9.11)
 
 BUNDLED WITH
-   2.2.8
+   2.2.30

data/historical_dating.gemspec

@@ -11,6 +11,8 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/wendig-ou/historical_dating"
   spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
 
+  spec.licenses      = ['AGPL-3.0-or-later']
+
   spec.metadata["allowed_push_host"] = "https://rubygems.org"
 
   spec.metadata["homepage_uri"] = spec.homepage
@@ -27,8 +29,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency 'parslet', '~> 2.0.0'
-  spec.add_runtime_dependency 'activesupport', '>= 3.0.0'
+  spec.add_runtime_dependency 'activesupport', '~> 6.1.4.1'
 
   spec.add_development_dependency 'rspec', '~> 3.9.0'
-  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'pry', '~> 0.16.0'
 end

data/lib/historical_dating/parser.rb

@@ -81,6 +81,14 @@ class HistoricalDating::Parser < Parslet::Parser
     str('4. Viertel')
   }
 
+  # Special cases / conflicts with existing rules
+
+  rule(:uncertain_from_range){
+    natural_number.as(:from_year) >> str('/') >> whole_number >>
+    space.maybe >> to_characters >> space.maybe >>
+    natural_number.as(:to_year)
+  }
+
   # Dating
 
   rule(:day){ match['1-2'] >> match['0-9'] | str('3') >> match['0-1'] | match['1-9'] | str('0') >> match['1-9'] }
@@ -143,7 +151,8 @@ class HistoricalDating::Parser < Parslet::Parser
     century_part.as(:century_part) |
     century.as(:century) |
     date.as(:date) |
-    year.as(:year)
+    year.as(:year) |
+    uncertain_from_range.as(:special)
   }
 
   root(:dating)

data/lib/historical_dating/transform.rb

@@ -65,6 +65,20 @@ class HistoricalDating::Transform < Parslet::Transform
     end
   end
 
+  # rule(from_year: simple(:from_year), to_year: simple(:to_year), acbc: simple(:acbc)) do
+  #   if acbc.nil? || acbc.match(/(nach|n.) (Chr.|Christus)/)
+  #     {
+  #       :from => Date.new(from_year.to_i, 1, 1),
+  #       :to => Date.new(to_year.to_i, 12, 31)
+  #     }
+  #   else
+  #     {
+  #       :from => Date.new(to_year.to_i * -1, 1, 1),
+  #       :to => Date.new(from_year.to_i * -1, 12, 31)
+  #     }
+  #   end
+  # end
+
   rule(:day => simple(:day), :month => simple(:month), :yearnum => simple(:yearnum)) do
     if !Date.leap?(yearnum.to_i) && month.to_i == 2 && day.to_i == 29
       raise HistoricalDating::Error.new('not_leap_year', year: yearnum.to_i)
@@ -143,6 +157,13 @@ class HistoricalDating::Transform < Parslet::Transform
     end
   end
 
+  rule(special: subtree(:a)) do
+    result = {
+      from: Date.new(a[:from_year].to_i, 1, 1),
+      to: Date.new(a[:to_year].to_i, 12, 31)
+    }
+  end
+
   def self.ac?(acbc)
     acbc.nil? || acbc.match(/(nach|n.) (Chr.|Christus)/) || acbc.match(/AC|Ac|Anno Domini|A. D.|AD/)
   end

data/lib/historical_dating/version.rb

@@ -1,3 +1,3 @@
 module HistoricalDating
-  VERSION = "1.8.0"
+  VERSION = "1.9.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: historical_dating
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.1
 platform: ruby
 authors:
 - Moritz Schepp
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-03 00:00:00.000000000 Z
+date: 2026-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -28,16 +28,16 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 6.1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 6.1.4.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +56,16 @@ dependencies:
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.16.0
 description: Parse human historical datings and convert them to Julian day ranges
 email:
 - moritz.schepp@gmail.com
@@ -94,13 +94,14 @@ files:
 - lib/historical_dating/transform.rb
 - lib/historical_dating/version.rb
 homepage: https://github.com/wendig-ou/historical_dating
-licenses: []
+licenses:
+- AGPL-3.0-or-later
 metadata:
   allowed_push_host: https://rubygems.org
   homepage_uri: https://github.com/wendig-ou/historical_dating
   source_code_uri: https://github.com/wendig-ou/historical_dating
   changelog_uri: https://github.com/wendig-ou/historical_dating/blob/master/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -115,8 +116,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Parse human historical datings
 test_files: []