historical_dating 1.5.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d4c906bc72a0b96c769243f6b025b0f15b6d0e96293f0a2b715706f80ff00e7
-  data.tar.gz: db559bafccbefa59ed6b24ff8a3d5797e197f29a323860a405fab056fb959d94
+  metadata.gz: ea9f6d3ea5c9989b77256a1a935b671fcfea3670e45b83120c40f0f7012c3708
+  data.tar.gz: 9dcf1c375641b46cadb8268a60bf37650f5775be48f6e58fdb5d6ad8c222fa39
 SHA512:
-  metadata.gz: 61d0cbd348f836dd2bfb9e1b07ea7c5042534bbdfdfb7d0333e97f8332548d53d7668ec2606582e37acaece60fc8558257c89b21dd6504b7d544828d5aa544a0
-  data.tar.gz: 7b72d6a0d078730008dede42c8df257c20fdd43221d80eab32c605abb2d44b5632a3ba901eeea72624b21bc0582ae536c0f0a4840a9649b13c32f41cea290a9b
+  metadata.gz: 4d39a07f5744036e7e5304e5d94f9548bff69f84cabdda11e19d9271538b9a674b0e1cc576463b2327ddbf337f1dce449357b386472f39d4152f0603f9ed6324
+  data.tar.gz: 7aad71e45279f25a1d7b739a6bf656e78dcf2831178c54ebe32804f8b5499c1a16c4915d993cd4574678bc58c4d23732207da1039ddf99da789c4e523da47a5d

data/Gemfile.lock

@@ -1,23 +1,23 @@
 PATH
   remote: .
   specs:
-    historical_dating (1.5.0)
+    historical_dating (1.9.0)
       activesupport (>= 3.0.0)
       parslet (~> 2.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.4)
+    activesupport (6.1.4.1)
       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.7)
+    concurrent-ruby (1.1.9)
     diff-lcs (1.4.4)
-    i18n (1.8.5)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
     method_source (1.0.0)
     minitest (5.14.1)
@@ -39,10 +39,9 @@ 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.8)
-      thread_safe (~> 0.1)
-    zeitwerk (2.4.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -55,4 +54,4 @@ DEPENDENCIES
   rspec (~> 3.9.0)
 
 BUNDLED WITH
-   2.1.4
+   2.2.30

data/lib/historical_dating/parser.rb

@@ -50,18 +50,18 @@ class HistoricalDating::Parser < Parslet::Parser
     str('jh')
   }
   rule(:approx){ str('ca.') | str('Ca.') | str('ca') | str('um') | str('Um') | str('circa') }
-  rule(:unknown){ str('?') }
+  rule(:unknown){ str('?') | str('unbekannt') | str('onbekend') }
   rule(:to_characters){
-    str('bis') | str('-') | str('/') | str('und')
+    str('bis') | str('-') | str('–') | str('/') | str('und')
   }
   rule(:to_two_digit_year){
     (space >> to_characters >> space) |
     (to_characters >> space) |
     (space >> to_characters) |
-    str('/')
+    str('/') | str('-')
   }
   rule(:to){
-    to_two_digit_year | str('-')
+    to_two_digit_year | str('-') | str('–')
   }
   rule(:before){ (str('vor') | str('Vor') | str('before')) >> space }
   rule(:after){ (str('Nach') | str('nach') | str('ab') | str('after')) >> space }
@@ -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'] }
@@ -91,7 +99,7 @@ class HistoricalDating::Parser < Parslet::Parser
   rule(:century){
     (approx >> space).maybe.as(:approx) >>
     natural_number.as(:num) >>
-    ((str('.').as(:cd) >> (space >> century_string.as(:cs) >> (space >> acbc).maybe.as(:acbc)).maybe) |
+    ((str('.').as(:cd) >> space.maybe >> century_string.as(:cs).maybe >> space.maybe >> acbc.maybe.as(:acbc)) |
     (space >> century_string.as(:cs) >> (space >> acbc).maybe.as(:acbc)))
   }
   rule(:century_number){
@@ -102,15 +110,15 @@ class HistoricalDating::Parser < Parslet::Parser
   }
   rule(:century_part){ part.as(:part) >> space >> positive_number.as(:num) >> str('.') >> space >> century_string.as(:cs) >> (space >> acbc).maybe.as(:acbc) }
   rule(:european_date){
-    (day.as(:day) >> (str('.') | str('-')) >>
+    (day.as(:day) >> (str('.') | str('-') | str('/')) >>
     month.as(:month) >>
-    (str('.') | str('-')) >>
+    (str('.') | str('-') | str('/')) >>
     whole_number.as(:yearnum)) |
     (month.as(:month) >>
-    (str('.') | str('-')) >>
+    (str('.') | str('-') | str('/')) >>
     whole_number.as(:yearnum))
   }
-  rule(:machine_date){ whole_number.as(:yearnum) >> (str('.') | str('-')) >> month.as(:month) >> ((str('.') | str('-')) >> day.as(:day)).maybe }
+  rule(:machine_date){ whole_number.as(:yearnum) >> (str('.') | str('-') | str('–')) >> month.as(:month) >> (str('.') | str('-')) >> day.as(:day) }
   rule(:date){ european_date | machine_date }
   rule(:date_interval){ date.as(:from) >> to >> date.as(:to) }
   rule(:century_interval){
@@ -124,10 +132,8 @@ class HistoricalDating::Parser < Parslet::Parser
   rule(:year_interval){
     prefix.maybe >>
     (year | unknown).as(:from) >>
-    ((to >>
-    (more_than_two_digit_year | unknown).as(:to)) |
-    (to_two_digit_year >>
-    two_digit_year.as(:to)))
+    ((to >> (more_than_two_digit_year | unknown).as(:to)) |
+    (to_two_digit_year >> two_digit_year.as(:to)))
   }
   rule(:before_century){ before >> century.as(:century) }
 
@@ -145,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.5.0"
+  VERSION = "1.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: historical_dating
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Moritz Schepp
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-30 00:00:00.000000000 Z
+date: 2021-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -100,7 +100,7 @@ metadata:
   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 +115,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.1.6
+signing_key:
 specification_version: 4
 summary: Parse human historical datings
 test_files: []