historical_dating 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5626f5c1b07674a6546b19aa32011ecbd3b78699c9c2b86533708fc83f20d80d
-  data.tar.gz: 946a0c51e02776a04847d35a7671226af38134fa2c55c14031a4b942912e77d0
+  metadata.gz: 6a00cb6bc3975511c1024df18f2aeaefe6fd0b11f6f850f78b4e61aac88b8c2b
+  data.tar.gz: a5fc6b15f83541d095d8a41f43a948f16425ea93c0e1d699ad31bbd0d3193667
 SHA512:
-  metadata.gz: c1446b31cb59adf40e9ebac90a3479131dc8dccbac9e8b38442399cba282e6773b290f7a41c5f15b2b349278fb8deff4256cb341ce59f5c4b4d01637a940445f
-  data.tar.gz: e3f755f48886b00c478934e2f66307c71f3b8fb1011d98d4f7e47f562f51e11d9ff9977f97eff84547278f10cb50c14b7c317b7ab0d60509456243bad055ffda
+  metadata.gz: e17156f25a2517c1fe3a4cb28476697a0ed327bdce8411ce995c7b5f2695b32596041f649a1071991e2fa88531cb0b2429e69ce0707039c5a515d787813f89b4
+  data.tar.gz: 0e08c630c58bb7bee22172548b6137040c073bf8f3d2e1f619b4aa11fbe86a65bd5a7593a1b05ec9ed80f64f243e4cc6ba48610103cee48f640734f4f5778831

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    historical_dating (1.7.0)
+    historical_dating (1.8.0)
       activesupport (>= 3.0.0)
       parslet (~> 2.0.0)
 
@@ -15,9 +15,9 @@ GEM
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
     coderay (1.1.3)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.8)
     diff-lcs (1.4.4)
-    i18n (1.8.5)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
     method_source (1.0.0)
     minitest (5.14.1)
@@ -40,7 +40,7 @@ GEM
       rspec-support (~> 3.9.0)
     rspec-support (3.9.3)
     thread_safe (0.3.6)
-    tzinfo (1.2.8)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
     zeitwerk (2.4.1)
 
@@ -55,4 +55,4 @@ DEPENDENCIES
   rspec (~> 3.9.0)
 
 BUNDLED WITH
-   2.1.4
+   2.2.8

data/lib/historical_dating/parser.rb

@@ -52,16 +52,16 @@ class HistoricalDating::Parser < Parslet::Parser
   rule(:approx){ str('ca.') | str('Ca.') | str('ca') | str('um') | str('Um') | str('circa') }
   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 }
@@ -91,7 +91,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){
@@ -110,7 +110,7 @@ class HistoricalDating::Parser < Parslet::Parser
     (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){

data/lib/historical_dating/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: historical_dating
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Moritz Schepp
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-13 00:00:00.000000000 Z
+date: 2021-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet