historical_dating 1.1.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61c2761f143332e112b83166ce6625fa43290563bf54c5f7e7657c13b2436a84
-  data.tar.gz: 27a4cf50e18e236c2a4ef28c7c414dd157d564c832a58e45de851557a7240521
+  metadata.gz: 47c1a58ce160b759e2787853d78b7aa96428fe9e2f7076fdf96158a38664902f
+  data.tar.gz: 236c5fadd1663f7516fa09f5504d2fc5227c0290a8739814da2ebc7e0cf1dd36
 SHA512:
-  metadata.gz: c924bc2b924f9618ac9f0cebe5c74a1af9c2aaa41223476a72294576e8fcda5c948aeabc3b44823b23cb7e413a6ad2efd2ea3229d2758e765481629eadb5d52b
-  data.tar.gz: 89af9de4952185120151316468db777565f0c44d9081009627bc6d4e4f4a7dc450397432507a433a58fc7a20459db7a6e583cd2bb2e4036b6df12867efbcda57
+  metadata.gz: c9f810f66539567fa1cdc3f83e22106d533e94c6bb334d28ca884d1dcbf60e078835cd2a8b47f2490149cc7e4063cb76ff6f7d2078afdf13a4432f447a2300fb
+  data.tar.gz: 6b5ce82213a10cb258cad1062eccc431aeed3444679062b3584b08771351f467c12d65209344a4677c9380365eda9dca2ef8898c9b49742a045893ac99507a0a

data/Gemfile.lock

@@ -1,48 +1,48 @@
 PATH
   remote: .
   specs:
-    historical_dating (1.1.0)
+    historical_dating (1.4.0)
       activesupport (>= 3.0.0)
-      parslet (~> 1.8)
+      parslet (~> 2.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.1)
+    activesupport (6.0.3.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
-    coderay (1.1.2)
-    concurrent-ruby (1.1.6)
-    diff-lcs (1.3)
-    i18n (1.8.2)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.7)
+    diff-lcs (1.4.4)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    method_source (0.9.2)
-    minitest (5.13.0)
-    parslet (1.8.2)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
+    method_source (1.0.0)
+    minitest (5.14.1)
+    parslet (2.0.0)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     rake (12.3.3)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
+    rspec-support (3.9.3)
     thread_safe (0.3.6)
-    tzinfo (1.2.7)
+    tzinfo (1.2.8)
       thread_safe (~> 0.1)
-    zeitwerk (2.3.0)
+    zeitwerk (2.4.1)
 
 PLATFORMS
   ruby

data/README.md

@@ -22,7 +22,7 @@ Or install it yourself as:
 ## Usage
 
 ~~~ruby
-hd = HistoryDating.parse("2. Jahrhundert nach Christus")
+hd = HistoricalDating.parse("2. Jahrhundert nach Christus")
 hd.from
 # => #<Date: 0100-01-01 ((1757583j,0s,0n),+0s,2299161j)>
 hd.to
@@ -33,11 +33,10 @@ hd.julian_range
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `bundle exec rspec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `bundle exec rspec` to run the tests. In order to run a single test, execute: `bundle exec rspec <test-filename>:<test-line-number>`. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/wendig-ou/historical_dating.
-

data/historical_dating.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'parslet', '~> 1.8'
+  spec.add_runtime_dependency 'parslet', '~> 2.0.0'
   spec.add_runtime_dependency 'activesupport', '>= 3.0.0'
 
   spec.add_development_dependency 'rspec', '~> 3.9.0'

data/lib/historical_dating.rb

@@ -18,6 +18,7 @@ module HistoricalDating
 
   autoload :Api, 'historical_dating/api'
   autoload :Parser, 'historical_dating/parser'
+  autoload :PreTransform, 'historical_dating/pre_transform'
   autoload :Range, 'historical_dating/range'
   autoload :Transform, 'historical_dating/transform'
 

data/lib/historical_dating/parser.rb

@@ -5,6 +5,7 @@ class HistoricalDating::Parser < Parslet::Parser
   rule(:natural_number){ match['1-9'] >> match['0-9'].repeat }
   rule(:positive_number){ zero | natural_number }
   rule(:minus){ match '-' }
+  rule(:whole_number_without_zero){ natural_number | minus >> natural_number }
   rule(:whole_number){ positive_number | minus >> natural_number }
   rule(:day){ match['1-2'] >> match['0-9'] | str('3') >> match['0-1'] | match['1-9'] | str('0') >> match['1-9'] }
   rule(:month){ str('1') >> match['0-2'] | match['1-9'] | str('0') >> match['1-9'] }
@@ -13,22 +14,43 @@ class HistoricalDating::Parser < Parslet::Parser
 
   rule(:space){ str(' ').repeat(1, nil) }
   rule(:christ){ str('Chr.') | str('Christus') }
-  rule(:age){ str('v.') | str('vor') }
-  rule(:bc){ age >> space >> christ }
-  rule(:century_string){ str('Jahrhundert') | str('Jh.') }
+  rule(:age){ str('v.') | str('vor') | str('n.') | str('nach') }
+  rule(:acbc){ age >> space >> christ | str('BC') | str('AC') }
+  rule(:century_string){ str('Jahrhundert') | str('Jh.') | str('Jhd') }
   rule(:approx){ str('ca.') | str('um') | str('circa') }
   rule(:unknown){ str('?') }
-  rule(:to){ space >> str('bis') >> space }
+  rule(:to){
+    ((space >> (str('bis') | str('-') | str('/')) >> space) |
+    str('-') |
+    str('/'))
+  }
   rule(:before){ str('vor') >> space }
   rule(:after){ str('nach') >> space }
   rule(:negate){ str('nicht') >> space }
-  rule(:part){ str('Anfang') | str('Mitte') | str('Ende') | str('1. Hälfte') | str('2. Hälfte') | str('1. Drittel') | str('2. Drittel') | str('3. Drittel') | str('1. Viertel') | str('2. Viertel') | str('3. Viertel') | str('4. Viertel') }
+  rule(:part){
+    str('Anfang') |
+    str('Mitte') |
+    str('Ende') |
+    str('1. Hälfte') |
+    str('2. Hälfte') |
+    str('1. Drittel') |
+    str('2. Drittel') |
+    str('3. Drittel') |
+    str('1. Viertel') |
+    str('2. Viertel') |
+    str('3. Viertel') |
+    str('4. Viertel')
+  }
 
   # Dating
 
-  rule(:century){ (approx >> space).maybe.as(:approx) >> positive_number.as(:num) >> str('.') >> space >> century_string.as(:cs) >> (space >> bc).maybe.as(:bc) }
-  rule(:year){ (approx >> space).maybe.as(:approx) >> natural_number.as(:num) >> (space >> bc).maybe.as(:bc) }
-  rule(:century_part){ part.as(:part) >> space >> positive_number.as(:num) >> str('.') >> space >> century_string.as(:cs) >> (space >> bc).maybe.as(:bc) }
+  rule(:century){
+    (approx >> space).maybe.as(:approx) >>
+    positive_number.as(:num) >> str('.').as(:cd) >> 
+    (space >> century_string.as(:cs) >> (space >> acbc).maybe.as(:acbc)).maybe
+  }
+  rule(:year){ (approx >> space).maybe.as(:approx) >> whole_number_without_zero.as(:num) >> (space >> acbc).maybe.as(:acbc) }
+  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('.') >> month.as(:month) >> str('.') >> whole_number.as(:yearnum) }
   rule(:machine_date){ whole_number.as(:yearnum) >> (str('.') | str('-')) >> month.as(:month) >> (str('.') | str('-')) >> day.as(:day) }
   rule(:date){ european_date | machine_date }
@@ -36,14 +58,21 @@ class HistoricalDating::Parser < Parslet::Parser
   rule(:century_interval){ century.as(:from) >> to >> century.as(:to) }
   rule(:before_year){ negate.maybe.as(:not) >> before >> year.as(:date) }
   rule(:after_year){ negate.maybe.as(:not) >> after >> year.as(:date) }
-  rule(:year_interval){ year.as(:from) >> to >> (year | unknown).as(:to) | (year | unknown).as(:from) >> to >> year.as(:to) }
+  rule(:year_interval){
+    year.as(:from) >> to >> (year | unknown).as(:to) |
+    (year | unknown).as(:from) >> to >> year.as(:to)
+  }
+  rule(:before_century){ before >> century.as(:century) }
+
   rule(:interval){
     before_year.as(:before_year) |
       after_year.as(:after_year) |
       date_interval.as(:date_interval) |
       century_interval.as(:century_interval) |
-      year_interval.as(:year_interval)
+      year_interval.as(:year_interval) |
+      before_century.as(:before_century)
   }
+
   rule(:dating){
     interval.as(:interval) |
       century_part.as(:century_part) |
@@ -57,6 +86,8 @@ class HistoricalDating::Parser < Parslet::Parser
   # Transform
 
   def transform(input)
-    HistoricalDating::Transform.new.apply(self.class.new.parse(input))
+    result = self.class.new.parse(input)
+    result = HistoricalDating::PreTransform.new.apply(result)
+    HistoricalDating::Transform.new.apply(result)
   end
 end

data/lib/historical_dating/pre_transform.rb

@@ -0,0 +1,42 @@
+class HistoricalDating::PreTransform < Parslet::Transform
+  rule(from: subtree(:from), to: subtree(:to)) do
+    if to[:acbc] && (to[:acbc].match(/(vor|v.) (Chr.|Christus)/) || to[:acbc].match(/BC/))
+      from[:acbc] = to[:acbc]
+    end
+
+    if to[:num].to_s.size == 2 && to[:cs].nil?
+      # e.g.: 1890/91
+      to[:num] = (from[:num].to_i / 100).to_s + to[:num]
+    end
+
+    {from: from, to: to}
+  end
+
+  # detect century by :cd and add :cs
+  rule(num: simple(:num), approx: simple(:approx), acbc: simple(:acbc), cd: simple(:cd)) do |data|
+    data.delete :cd
+    data.merge(
+      cs: 'Jahrhundert'
+    )
+  end
+
+  # detect century by :cd and add :cs
+  rule(num: simple(:num), approx: simple(:approx), cd: simple(:cd)) do |data|
+    data.delete :cd
+    data.merge(
+      cs: 'Jahrhundert'
+    )
+  end
+
+  # remove :cd if :cs already present (with acbc)
+  rule(num: simple(:num), approx: simple(:approx), acbc: simple(:acbc), cd: simple(:cd), cs: simple(:cs)) do |data|
+    data.delete :cd
+    data
+  end
+
+  # remove :cd if :cs already present (no acbc)
+  rule(num: simple(:num), approx: simple(:approx), cd: simple(:cd), cs: simple(:cs)) do |data|
+    data.delete :cd
+    data
+  end
+end

data/lib/historical_dating/transform.rb

@@ -1,5 +1,5 @@
 class HistoricalDating::Transform < Parslet::Transform
-  rule(:num => simple(:num), :part => simple(:part), :bc => simple(:bc), :cs => simple(:cs)) do
+  rule(:num => simple(:num), :part => simple(:part), :acbc => simple(:acbc), :cs => simple(:cs)) do
     modifier = case part
     when "Anfang" then [0, 75]
     when "Mitte" then [35, 35]
@@ -15,7 +15,7 @@ class HistoricalDating::Transform < Parslet::Transform
     when "4. Viertel" then [75, 0]
     end
 
-    if bc.nil?
+    if acbc.nil? || acbc.match(/(nach|n.) (Chr.|Christus)/) || acbc.match(/AC/)
       {
         :from => Date.new((num.to_i - 1) * 100 + modifier.first, 1, 1),
         :to => Date.new((num.to_i - 1) * 100 + 99 - modifier.last, 12, 31)
@@ -28,8 +28,8 @@ class HistoricalDating::Transform < Parslet::Transform
     end
   end
 
-  rule(:num => simple(:num), :approx => simple(:approx), :bc => simple(:bc), :cs => simple(:cs)) do
-    result = if bc.nil?
+  rule(:num => simple(:num), :approx => simple(:approx), :acbc => simple(:acbc), :cs => simple(:cs)) do
+    result = if acbc.nil? || acbc.match(/(nach|n.) (Chr.|Christus)/) || acbc.match(/AC/)
       {
         :from => Date.new((num.to_i - 1) * 100, 1, 1),
         :to => Date.new((num.to_i - 1) * 100 + 99, 12, 31)
@@ -49,10 +49,10 @@ class HistoricalDating::Transform < Parslet::Transform
     result
   end
 
-  rule(:num => simple(:num), :approx => simple(:approx), :bc => simple(:bc)) do
+  rule(:num => simple(:num), :approx => simple(:approx), :acbc => simple(:acbc)) do
     modifier = (approx ? 5 : 0)
 
-    if bc.nil?
+    if acbc.nil? || acbc.match(/(nach|n.) (Chr.|Christus)/) || acbc.match(/AC/)
       {
         :from => Date.new(num.to_i - modifier, 1, 1),
         :to => Date.new(num.to_i + modifier, 12, 31)
@@ -84,8 +84,16 @@ class HistoricalDating::Transform < Parslet::Transform
     {:from => first_from, :to => last_to}
   end
 
+  rule(before_century: {from: simple(:from), to: simple(:to) }) do
+    {from: from - 100.years, to: to - 100.years}
+  end
+
   [:century, :date_interval, :year, :year_interval, :interval, :century_interval, :century_part].each do |key|
     rule(key => {:from => simple(:from), :to => simple(:to)}) do
+      if to < from
+        raise HistoricalDating::Error, 'from_later_than_to'
+      end
+
       {:from => from, :to => to}
     end
   end

data/lib/historical_dating/version.rb

@@ -1,3 +1,3 @@
 module HistoricalDating
-  VERSION = "1.1.0"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: historical_dating
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Moritz Schepp
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-03 00:00:00.000000000 Z
+date: 2020-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -89,6 +89,7 @@ files:
 - lib/historical_dating.rb
 - lib/historical_dating/api.rb
 - lib/historical_dating/parser.rb
+- lib/historical_dating/pre_transform.rb
 - lib/historical_dating/range.rb
 - lib/historical_dating/transform.rb
 - lib/historical_dating/version.rb