scripref 0.15.0 → 1.1.0

data/test/test_parser.rb

@@ -1,4 +1,6 @@
-# - encoding: utf-8 -
+# encoding: utf-8
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class TestParser < Test::Unit::TestCase
@@ -12,21 +14,21 @@ class TestParser < Test::Unit::TestCase
 
   def test_only_book
     text = 'Ruth'
-    assert_parsed_ast_for_text [pass(text: text, b1: 8, b2: 8)], text
+    assert_parsed_ast_for_text [pass(text: text, b1: :Ruth, b2: :Ruth)], text
   end
 
   def test_book_abbrev
     text = 'Ru'
-    assert_parsed_ast_for_text [pass(text: text, b1: 8, b2: 8)], text
+    assert_parsed_ast_for_text [pass(text: text, b1: :Ruth, b2: :Ruth)], text
     text = 'Offb'
-    assert_parsed_ast_for_text [pass(text: text, b1: 66, b2: 66)], text
+    assert_parsed_ast_for_text [pass(text: text, b1: :Rev, b2: :Rev)], text
   end
 
   def test_book_abbrev_with_period
     text = 'Ru.'
-    assert_parsed_ast_for_text [pass(text: text, b1: 8, b2: 8)], text
+    assert_parsed_ast_for_text [pass(text: text, b1: :Ruth, b2: :Ruth)], text
     text = 'Offb.'
-    assert_parsed_ast_for_text [pass(text: text, b1: 66, b2: 66)], text
+    assert_parsed_ast_for_text [pass(text: text, b1: :Rev, b2: :Rev)], text
   end
 
   def test_ambiguous_book
@@ -38,115 +40,115 @@ class TestParser < Test::Unit::TestCase
 
   def test_book_and_chapter
     text = 'Ruth 2'
-    assert_parsed_ast_for_text [pass(text: text, b1: 8, c1: 2, b2: 8, c2: 2)], text
+    assert_parsed_ast_for_text [pass(text: text, b1: :Ruth, c1: 2, b2: :Ruth, c2: 2)], text
   end
 
   def test_book_chapter_and_verse
     text = 'Ruth 2,5'
-    assert_parsed_ast_for_text [pass(text: text, b1: 8, c1: 2, v1: 5, b2: 8, c2: 2, v2: 5)], text
+    assert_parsed_ast_for_text [pass(text: text, b1: :Ruth, c1: 2, v1: 5, b2: :Ruth, c2: 2, v2: 5)], text
   end
 
   def test_verse_range
     text = 'Ruth 2,5-11'
-    assert_parsed_ast_for_text [pass(text: text, b1: 8, c1: 2, v1: 5, b2: 8, c2: 2, v2: 11)], text
+    assert_parsed_ast_for_text [pass(text: text, b1: :Ruth, c1: 2, v1: 5, b2: :Ruth, c2: 2, v2: 11)], text
   end
 
   def test_chapter_verse_range
     text = 'Ruth 2,5-3,7'
-    assert_parsed_ast_for_text [pass(text: text, b1: 8, c1: 2, v1: 5, b2: 8, c2: 3, v2: 7)], text
+    assert_parsed_ast_for_text [pass(text: text, b1: :Ruth, c1: 2, v1: 5, b2: :Ruth, c2: 3, v2: 7)], text
   end
 
   def test_chapter_range
     text = 'Ruth 2-3'
-    assert_parsed_ast_for_text [pass(text: text, b1: 8, c1: 2, b2: 8, c2: 3)], text
+    assert_parsed_ast_for_text [pass(text: text, b1: :Ruth, c1: 2, b2: :Ruth, c2: 3)], text
   end
 
   def test_book_range
     text = '1. Mose - Offenbarung'
-    assert_parsed_ast_for_text [pass(text: text, b1: 1, b2: 66)], text
+    assert_parsed_ast_for_text [pass(text: text, b1: :Gen, b2: :Rev)], text
   end
 
   def test_book_chapter_range
     text = '1. Mose 1 - Offenbarung 22'
-    assert_parsed_ast_for_text [pass(text: text, b1: 1, c1: 1, b2: 66, c2: 22)], text
+    assert_parsed_ast_for_text [pass(text: text, b1: :Gen, c1: 1, b2: :Rev, c2: 22)], text
   end
 
   def test_book_chapter_verse_range
     text = '1. Mose 1,1-Offenbarung 22,21'
-    assert_parsed_ast_for_text [pass(text: text, b1: 1, c1: 1, v1: 1, b2: 66, c2: 22, v2: 21)], text
+    assert_parsed_ast_for_text [pass(text: text, b1: :Gen, c1: 1, v1: 1, b2: :Rev, c2: 22, v2: 21)], text
   end
 
   def test_one_following_verse
     text = 'Ruth 2,5f'
-    assert_parsed_ast_for_text [pass(text: text, b1: 8, c1: 2, v1: 5, b2: 8, c2: 2, v2: :f)], text
+    assert_parsed_ast_for_text [pass(text: text, b1: :Ruth, c1: 2, v1: 5, b2: :Ruth, c2: 2, v2: :f)], text
   end
 
   def test_more_following_verse
     text = 'Ruth 2,5ff'
-    assert_parsed_ast_for_text [pass(text: text, b1: 8, c1: 2, v1: 5, b2: 8, c2: 2, v2: :ff)], text
+    assert_parsed_ast_for_text [pass(text: text, b1: :Ruth, c1: 2, v1: 5, b2: :Ruth, c2: 2, v2: :ff)], text
   end
 
   def test_first_addon
     text = 'Ruth 2,5a'
-    assert_parsed_ast_for_text [pass(text: text, b1: 8, c1: 2, v1: 5, b2: 8, c2: 2, v2: 5, a1: :a)], text
+    assert_parsed_ast_for_text [pass(text: text, b1: :Ruth, c1: 2, v1: 5, b2: :Ruth, c2: 2, v2: 5, a1: :a)], text
   end
 
   def test_second_addon
     text = 'Ruth 2,5-7a'
-    assert_parsed_ast_for_text [pass(text: text, b1: 8, c1: 2, v1: 5, b2: 8, c2: 2, v2: 7, a2: :a)], text
+    assert_parsed_ast_for_text [pass(text: text, b1: :Ruth, c1: 2, v1: 5, b2: :Ruth, c2: 2, v2: 7, a2: :a)], text
   end
 
   def test_both_addons
     text = 'Ruth 2,5b-7a'
-    assert_parsed_ast_for_text [pass(text: text, b1: 8, c1: 2, v1: 5, b2: 8, c2: 2, v2: 7, a1: :b, a2: :a)], text
+    assert_parsed_ast_for_text [pass(text: text, b1: :Ruth, c1: 2, v1: 5, b2: :Ruth, c2: 2, v2: 7, a1: :b, a2: :a)], text
   end
 
   def test_reset_addons
     @parser.parse 'Ruth 2,5b-7a'
     text = 'Ruth'
-    assert_parsed_ast_for_text [pass(text: text, b1: 8, b2: 8)], text
+    assert_parsed_ast_for_text [pass(text: text, b1: :Ruth, b2: :Ruth)], text
   end
 
   def test_book_with_only_one_chapter
     text = 'Obad 3'
-    assert_parsed_ast_for_text [pass(text: text, b1: 31, c1: 1, v1: 3, b2: 31, c2: 1, v2: 3)], text
+    assert_parsed_ast_for_text [pass(text: text, b1: :Obad, c1: 1, v1: 3, b2: :Obad, c2: 1, v2: 3)], text
     text = 'Obad 1,3'
-    assert_parsed_ast_for_text [pass(text: text, b1: 31, c1: 1, v1: 3, b2: 31, c2: 1, v2: 3)], text
+    assert_parsed_ast_for_text [pass(text: text, b1: :Obad, c1: 1, v1: 3, b2: :Obad, c2: 1, v2: 3)], text
     text = 'Obad 1'
-    assert_parsed_ast_for_text [pass(text: text, b1: 31, c1: 1, v1: 1, b2: 31, c2: 1, v2: 1)], text
+    assert_parsed_ast_for_text [pass(text: text, b1: :Obad, c1: 1, v1: 1, b2: :Obad, c2: 1, v2: 1)], text
     text = 'Obad 1,1'
-    assert_parsed_ast_for_text [pass(text: text, b1: 31, c1: 1, v1: 1, b2: 31, c2: 1, v2: 1)], text
+    assert_parsed_ast_for_text [pass(text: text, b1: :Obad, c1: 1, v1: 1, b2: :Obad, c2: 1, v2: 1)], text
   end
 
   def test_book_with_only_one_chapter_range
     text = 'Obad 3-5'
-    assert_parsed_ast_for_text [pass(text: text, b1: 31, c1: 1, v1: 3, b2: 31, c2: 1, v2: 5)], text
+    assert_parsed_ast_for_text [pass(text: text, b1: :Obad, c1: 1, v1: 3, b2: :Obad, c2: 1, v2: 5)], text
     text = 'Obad 1,3-5'
-    assert_parsed_ast_for_text [pass(text: text, b1: 31, c1: 1, v1: 3, b2: 31, c2: 1, v2: 5)], text
+    assert_parsed_ast_for_text [pass(text: text, b1: :Obad, c1: 1, v1: 3, b2: :Obad, c2: 1, v2: 5)], text
     text = 'Obad 1-4'
-    assert_parsed_ast_for_text [pass(text: text, b1: 31, c1: 1, v1: 1, b2: 31, c2: 1, v2: 4)], text
+    assert_parsed_ast_for_text [pass(text: text, b1: :Obad, c1: 1, v1: 1, b2: :Obad, c2: 1, v2: 4)], text
     text = 'Obad 1,1-4'
-    assert_parsed_ast_for_text [pass(text: text, b1: 31, c1: 1, v1: 1, b2: 31, c2: 1, v2: 4)], text
+    assert_parsed_ast_for_text [pass(text: text, b1: :Obad, c1: 1, v1: 1, b2: :Obad, c2: 1, v2: 4)], text
   end
 
   def test_book_with_only_one_chapter_at_begin_of_range
     text = 'Obad - Jona'
-    assert_parsed_ast_for_text [pass(text: text, b1: 31, c1: 1, b2: 32)], text
+    assert_parsed_ast_for_text [pass(text: text, b1: :Obad, c1: 1, b2: :Jonah)], text
     text = 'Obad 3 - Jona 2,4'
-    assert_parsed_ast_for_text [pass(text: text, b1: 31, c1: 1, v1: 3, b2: 32, c2: 2, v2: 4)], text
+    assert_parsed_ast_for_text [pass(text: text, b1: :Obad, c1: 1, v1: 3, b2: :Jonah, c2: 2, v2: 4)], text
     text = 'Obad 1,3 - Jona 2,4'
-    assert_parsed_ast_for_text [pass(text: text, b1: 31, c1: 1, v1: 3, b2: 32, c2: 2, v2: 4)], text
+    assert_parsed_ast_for_text [pass(text: text, b1: :Obad, c1: 1, v1: 3, b2: :Jonah, c2: 2, v2: 4)], text
   end
 
   def test_book_with_only_one_chapter_at_end_of_range
     text = 'Amos 2,4 - Obad 3'
-    assert_parsed_ast_for_text [pass(text: text, b1: 30, c1: 2, v1: 4, b2: 31, c2: 1, v2: 3)], text
+    assert_parsed_ast_for_text [pass(text: text, b1: :Amos, c1: 2, v1: 4, b2: :Obad, c2: 1, v2: 3)], text
     text = 'Amos 2,4 - Obad 1,3'
-    assert_parsed_ast_for_text [pass(text: text, b1: 30, c1: 2, v1: 4, b2: 31, c2: 1, v2: 3)], text
+    assert_parsed_ast_for_text [pass(text: text, b1: :Amos, c1: 2, v1: 4, b2: :Obad, c2: 1, v2: 3)], text
     text = 'Amos 2,4 - Obad 1'
-    assert_parsed_ast_for_text [pass(text: text, b1: 30, c1: 2, v1: 4, b2: 31, c2: 1, v2: 1)], text
+    assert_parsed_ast_for_text [pass(text: text, b1: :Amos, c1: 2, v1: 4, b2: :Obad, c2: 1, v2: 1)], text
     text = 'Amos 2,4 - Obad 1,1'
-    assert_parsed_ast_for_text [pass(text: text, b1: 30, c1: 2, v1: 4, b2: 31, c2: 1, v2: 1)], text
+    assert_parsed_ast_for_text [pass(text: text, b1: :Amos, c1: 2, v1: 4, b2: :Obad, c2: 1, v2: 1)], text
   end
 
   ######################################################################
@@ -156,49 +158,49 @@ class TestParser < Test::Unit::TestCase
   def test_two_books
     text = 'Ruth; Markus'
     t1, t2 = text.split(semi)
-    assert_parsed_ast_for_text [pass(text: t1, b1: 8, b2: 8), semi, pass(text: t2, b1: 41, b2: 41)], text
+    assert_parsed_ast_for_text [pass(text: t1, b1: :Ruth, b2: :Ruth), semi, pass(text: t2, b1: :Mark, b2: :Mark)], text
   end
 
   def test_two_complete_refs
     text = 'Ruth 2,1; Markus 4,8'
     t1, t2 = text.split(semi)
-    assert_parsed_ast_for_text [pass(text: t1, b1: 8, c1: 2, v1: 1, b2: 8, c2: 2, v2: 1), semi, pass(text: t2, b1: 41, c1: 4, v1: 8, b2: 41, c2: 4, v2: 8)], text
+    assert_parsed_ast_for_text [pass(text: t1, b1: :Ruth, c1: 2, v1: 1, b2: :Ruth, c2: 2, v2: 1), semi, pass(text: t2, b1: :Mark, c1: 4, v1: 8, b2: :Mark, c2: 4, v2: 8)], text
   end
 
   def test_two_refs_same_book
     text = 'Ruth 2,1; 5,4'
     t1, t2 = text.split(semi)
-    assert_parsed_ast_for_text [pass(text: t1, b1: 8, c1: 2, v1: 1, b2: 8, c2: 2, v2: 1), semi, pass(text: t2, b1: 8, c1: 5, v1: 4, b2: 8, c2: 5, v2: 4)], text
+    assert_parsed_ast_for_text [pass(text: t1, b1: :Ruth, c1: 2, v1: 1, b2: :Ruth, c2: 2, v2: 1), semi, pass(text: t2, b1: :Ruth, c1: 5, v1: 4, b2: :Ruth, c2: 5, v2: 4)], text
   end
 
   def test_two_chapters_same_book
     text = 'Ruth 2; 5'
     t1, t2 = text.split(semi)
-    assert_parsed_ast_for_text [pass(text: t1, b1: 8, c1: 2, b2: 8, c2: 2), semi, pass(text: t2, b1: 8, c1: 5, b2: 8, c2: 5)], text
+    assert_parsed_ast_for_text [pass(text: t1, b1: :Ruth, c1: 2, b2: :Ruth, c2: 2), semi, pass(text: t2, b1: :Ruth, c1: 5, b2: :Ruth, c2: 5)], text
   end
 
   def test_two_chapters_different_book
     text = 'Ruth 2; Markus 4'
     t1, t2 = text.split(semi)
-    assert_parsed_ast_for_text [pass(text: t1, b1: 8, c1: 2, b2: 8, c2: 2), semi, pass(text: t2, b1: 41, c1: 4, b2: 41, c2: 4)], text
+    assert_parsed_ast_for_text [pass(text: t1, b1: :Ruth, c1: 2, b2: :Ruth, c2: 2), semi, pass(text: t2, b1: :Mark, c1: 4, b2: :Mark, c2: 4)], text
   end
 
   def test_two_verses
     text = 'Ruth 2,5.11'
     t1, t2 = text.split(dot)
-    assert_parsed_ast_for_text [pass(text: t1, b1: 8, c1: 2, v1: 5, b2: 8, c2: 2, v2: 5), dot, pass(text: t2, b1: 8, c1: 2, v1: 11, b2: 8, c2: 2, v2: 11)], text
+    assert_parsed_ast_for_text [pass(text: t1, b1: :Ruth, c1: 2, v1: 5, b2: :Ruth, c2: 2, v2: 5), dot, pass(text: t2, b1: :Ruth, c1: 2, v1: 11, b2: :Ruth, c2: 2, v2: 11)], text
   end
 
   def test_partial_passage_after_full_passage
     text = 'Ruth 2,5; 4'
     t1, t2 = text.split(semi)
-    assert_parsed_ast_for_text [pass(text: t1, b1: 8, c1: 2, v1: 5, b2: 8, c2: 2, v2: 5), semi, pass(text: t2, b1: 8, c1: 4, b2: 8, c2: 4)], text
+    assert_parsed_ast_for_text [pass(text: t1, b1: :Ruth, c1: 2, v1: 5, b2: :Ruth, c2: 2, v2: 5), semi, pass(text: t2, b1: :Ruth, c1: 4, b2: :Ruth, c2: 4)], text
     text = 'Ruth 2,5; Markus'
     t1, t2 = text.split(semi)
-    assert_parsed_ast_for_text [pass(text: t1, b1: 8, c1: 2, v1: 5, b2: 8, c2: 2, v2: 5), semi, pass(text: t2, b1: 41, b2: 41)], text
+    assert_parsed_ast_for_text [pass(text: t1, b1: :Ruth, c1: 2, v1: 5, b2: :Ruth, c2: 2, v2: 5), semi, pass(text: t2, b1: :Mark, b2: :Mark)], text
     text = 'Ruth 2,5; Markus 4'
     t1, t2 = text.split(semi)
-    assert_parsed_ast_for_text [pass(text: t1, b1: 8, c1: 2, v1: 5, b2: 8, c2: 2, v2: 5), semi, pass(text: t2, b1: 41, c1: 4, b2: 41, c2: 4)], text
+    assert_parsed_ast_for_text [pass(text: t1, b1: :Ruth, c1: 2, v1: 5, b2: :Ruth, c2: 2, v2: 5), semi, pass(text: t2, b1: :Mark, c1: 4, b2: :Mark, c2: 4)], text
   end
 
   ######################################################################
@@ -208,61 +210,61 @@ class TestParser < Test::Unit::TestCase
   def test_verse_range_and_separated_verse
     text = 'Ruth 2,1-3.11'
     t1, t2 = text.split(dot)
-    assert_parsed_ast_for_text [pass(text: t1, b1: 8, c1: 2, v1: 1, b2: 8, c2: 2, v2: 3), dot, pass(text: t2, b1: 8, c1: 2, v1: 11, b2: 8, c2: 2, v2: 11)], text
+    assert_parsed_ast_for_text [pass(text: t1, b1: :Ruth, c1: 2, v1: 1, b2: :Ruth, c2: 2, v2: 3), dot, pass(text: t2, b1: :Ruth, c1: 2, v1: 11, b2: :Ruth, c2: 2, v2: 11)], text
   end
 
   def test_separate_verse_and_verse_range
     text = 'Ruth 2,1.3-11'
     t1, t2 = text.split(dot)
-    assert_parsed_ast_for_text [pass(text: t1, b1: 8, c1: 2, v1: 1, b2: 8, c2: 2, v2: 1), dot, pass(text: t2, b1: 8, c1: 2, v1: 3, b2: 8, c2: 2, v2: 11)], text
+    assert_parsed_ast_for_text [pass(text: t1, b1: :Ruth, c1: 2, v1: 1, b2: :Ruth, c2: 2, v2: 1), dot, pass(text: t2, b1: :Ruth, c1: 2, v1: 3, b2: :Ruth, c2: 2, v2: 11)], text
   end
 
   def test_two_verse_ranges
     text = 'Ruth 2,1-3.7-11'
     t1, t2 = text.split(dot)
-    assert_parsed_ast_for_text [pass(text: t1, b1: 8, c1: 2, v1: 1, b2: 8, c2: 2, v2: 3), dot, pass(text: t2, b1: 8, c1: 2, v1: 7, b2: 8, c2: 2, v2: 11)], text
+    assert_parsed_ast_for_text [pass(text: t1, b1: :Ruth, c1: 2, v1: 1, b2: :Ruth, c2: 2, v2: 3), dot, pass(text: t2, b1: :Ruth, c1: 2, v1: 7, b2: :Ruth, c2: 2, v2: 11)], text
   end
 
   def test_two_verse_range_different_books
     text = 'Ruth 2,1-11; Markus 4,3-7'
     t1, t2 = text.split(semi)
-    assert_parsed_ast_for_text [pass(text: t1, b1: 8, c1: 2, v1: 1, b2: 8, c2: 2, v2: 11), semi, pass(text: t2, b1: 41, c1: 4, v1: 3, b2: 41, c2: 4, v2: 7)], text
+    assert_parsed_ast_for_text [pass(text: t1, b1: :Ruth, c1: 2, v1: 1, b2: :Ruth, c2: 2, v2: 11), semi, pass(text: t2, b1: :Mark, c1: 4, v1: 3, b2: :Mark, c2: 4, v2: 7)], text
   end
 
   def test_two_verse_range_different_chapters
     text = 'Ruth 2,1-11; 3,10-19'
     t1, t2 = text.split(semi)
-    assert_parsed_ast_for_text [pass(text: t1, b1: 8, c1: 2, v1: 1, b2: 8, c2: 2, v2: 11), semi, pass(text: t2, b1: 8, c1: 3, v1: 10, b2: 8, c2: 3, v2: 19)], text
+    assert_parsed_ast_for_text [pass(text: t1, b1: :Ruth, c1: 2, v1: 1, b2: :Ruth, c2: 2, v2: 11), semi, pass(text: t2, b1: :Ruth, c1: 3, v1: 10, b2: :Ruth, c2: 3, v2: 19)], text
   end
 
   def test_book_range_and_following_book
     text = 'Ruth-Markus; Johannes'
     t1, t2 = text.split(semi)
-    assert_parsed_ast_for_text [pass(text: t1, b1: 8, b2: 41), semi, pass(text: t2, b1: 43, b2: 43)], text
+    assert_parsed_ast_for_text [pass(text: t1, b1: :Ruth, b2: :Mark), semi, pass(text: t2, b1: :John, b2: :John)], text
   end
 
   def test_chapter_range_and_following_book
     text = 'Ruth 1-2; Joh 4'
     t1, t2 = text.split(semi)
-    assert_parsed_ast_for_text [pass(text: t1, b1: 8, c1: 1, b2: 8, c2: 2), semi, pass(text: t2, b1: 43, c1: 4, b2: 43, c2: 4)], text
+    assert_parsed_ast_for_text [pass(text: t1, b1: :Ruth, c1: 1, b2: :Ruth, c2: 2), semi, pass(text: t2, b1: :John, c1: 4, b2: :John, c2: 4)], text
   end
 
   def test_chapter_range_and_following_chapter
     text = 'Ruth 1-2; 4'
     t1, t2 = text.split(semi)
-    assert_parsed_ast_for_text [pass(text: t1, b1: 8, c1: 1, b2: 8, c2: 2), semi, pass(text: t2, b1: 8, c1: 4, b2: 8, c2: 4)], text
+    assert_parsed_ast_for_text [pass(text: t1, b1: :Ruth, c1: 1, b2: :Ruth, c2: 2), semi, pass(text: t2, b1: :Ruth, c1: 4, b2: :Ruth, c2: 4)], text
   end
 
   def test_book_only_after_full_passage
     text = 'Matt 3,4; Mar; Joh 3,16'
     t1, t2, t3 = text.split(semi)
-    assert_parsed_ast_for_text [pass(text: t1, b1: 40, c1: 3, v1: 4, b2: 40, c2: 3, v2: 4), semi, pass(text: t2, b1: 41, b2: 41), semi, pass(text: t3, b1: 43, c1: 3, v1: 16, b2: 43, c2: 3, v2: 16)], text
+    assert_parsed_ast_for_text [pass(text: t1, b1: :Matt, c1: 3, v1: 4, b2: :Matt, c2: 3, v2: 4), semi, pass(text: t2, b1: :Mark, b2: :Mark), semi, pass(text: t3, b1: :John, c1: 3, v1: 16, b2: :John, c2: 3, v2: 16)], text
   end
 
   def test_chapter_only_after_full_passage
     text = 'Matt 3,4; 8; Joh 3,16'
     t1, t2, t3 = text.split(semi)
-    assert_parsed_ast_for_text [pass(text: t1, b1: 40, c1: 3, v1: 4, b2: 40, c2: 3, v2: 4), semi, pass(text: t2, b1: 40, c1: 8, b2: 40, c2: 8), semi, pass(text: t3, b1: 43, c1: 3, v1: 16, b2: 43, c2: 3, v2: 16)], text
+    assert_parsed_ast_for_text [pass(text: t1, b1: :Matt, c1: 3, v1: 4, b2: :Matt, c2: 3, v2: 4), semi, pass(text: t2, b1: :Matt, c1: 8, b2: :Matt, c2: 8), semi, pass(text: t3, b1: :John, c1: 3, v1: 16, b2: :John, c2: 3, v2: 16)], text
   end
 
   ######################################################################
@@ -273,13 +275,13 @@ class TestParser < Test::Unit::TestCase
     text = 'Ruth 2,1-11.15; 3,7.9-12; Markus 4; 5,3.18-21'
     t1, t2, t3, t4, t5, t6, t7 = text.split(/; |\./)
     ast = [
-      pass(text: t1, b1: 8, c1: 2, v1: 1, b2: 8, c2: 2, v2: 11), dot,
-      pass(text: t2, b1: 8, c1: 2, v1: 15, b2: 8, c2: 2, v2: 15), semi,
-      pass(text: t3, b1: 8, c1: 3, v1: 7, b2: 8, c2: 3, v2: 7), dot,
-      pass(text: t4, b1: 8, c1: 3, v1: 9, b2: 8, c2: 3, v2: 12), semi,
-      pass(text: t5, b1: 41, c1: 4, b2: 41, c2: 4), semi,
-      pass(text: t6, b1: 41, c1: 5, v1: 3, b2: 41, c2: 5, v2: 3), dot,
-      pass(text: t7, b1: 41, c1: 5, v1: 18, b2: 41, c2: 5, v2: 21)
+      pass(text: t1, b1: :Ruth, c1: 2, v1: 1, b2: :Ruth, c2: 2, v2: 11), dot,
+      pass(text: t2, b1: :Ruth, c1: 2, v1: 15, b2: :Ruth, c2: 2, v2: 15), semi,
+      pass(text: t3, b1: :Ruth, c1: 3, v1: 7, b2: :Ruth, c2: 3, v2: 7), dot,
+      pass(text: t4, b1: :Ruth, c1: 3, v1: 9, b2: :Ruth, c2: 3, v2: 12), semi,
+      pass(text: t5, b1: :Mark, c1: 4, b2: :Mark, c2: 4), semi,
+      pass(text: t6, b1: :Mark, c1: 5, v1: 3, b2: :Mark, c2: 5, v2: 3), dot,
+      pass(text: t7, b1: :Mark, c1: 5, v1: 18, b2: :Mark, c2: 5, v2: 21)
     ]
     assert_parsed_ast_for_text ast, text
   end
@@ -318,17 +320,17 @@ class TestParser < Test::Unit::TestCase
     # but in German the abbrev "Phil" is generally used for "Philipper",
     # so the parser should be able to support such behaviour.
     text = 'Phil 4,4'
-    assert_parsed_ast_for_text [pass(text: text, b1: 50, c1: 4, v1: 4, b2: 50, c2: 4, v2: 4)], text
+    assert_parsed_ast_for_text [pass(text: text, b1: :Phil, c1: 4, v1: 4, b2: :Phil, c2: 4, v2: 4)], text
     # It must also work with a dot
     text = 'Phil. 4,4'
-    assert_parsed_ast_for_text [pass(text: text, b1: 50, c1: 4, v1: 4, b2: 50, c2: 4, v2: 4)], text
+    assert_parsed_ast_for_text [pass(text: text, b1: :Phil, c1: 4, v1: 4, b2: :Phil, c2: 4, v2: 4)], text
   end
 
   def test_book_abbrev_which_seems_to_be_ambiguous
     # Abbreviation 'Psm' matches 'Psalm' and 'Psalmen' which is the same
     # book so it is not an ambiguous error.
     text = 'Psm 23,6'
-    assert_parsed_ast_for_text [pass(text: text, b1: 19, c1: 23, v1: 6, b2: 19, c2: 23, v2: 6)], text
+    assert_parsed_ast_for_text [pass(text: text, b1: :Ps, c1: 23, v1: 6, b2: :Ps, c2: 23, v2: 6)], text
   end
 
   private

data/test/test_passage.rb

@@ -1,5 +1,6 @@
-# - encoding: utf-8 -
+# encoding: utf-8
 require 'test_helper'
+# frozen_string_literal: true
 
 class TestPassage < Test::Unit::TestCase
 
@@ -12,7 +13,7 @@ class TestPassage < Test::Unit::TestCase
 
   def test_to_a
     pass = @parser.parse('Mr 1,2-Luk 3,4').first
-    assert_equal [41, 1, 2, 42, 3, 4], pass.to_a
+    assert_equal [:Mark, 1, 2, :Luke, 3, 4], pass.to_a
   end
 
   def test_spaceship_operator
@@ -66,25 +67,13 @@ class TestPassage < Test::Unit::TestCase
   end
 
   def test_start
-    p = pass(text: '', b1: 1, c1: 2, v1: 3, b2: 4, c2: 5, v2: 6)
-    assert_equal [1, 2, 3], p.start
+    p = pass(text: '', b1: :Gen, c1: 2, v1: 3, b2: :Num, c2: 5, v2: 6)
+    assert_equal [:Gen, 2, 3], p.start
   end
 
   def test_end
-    p = pass(text: '', b1: 1, c1: 2, v1: 3, b2: 4, c2: 5, v2: 6)
-    assert_equal [4, 5, 6], p.end
-  end
-
-  def test_sum
-    p1 = pass(text: '', b1: 1, c1: 2, v1: 3, b2: 4, c2: 5, v2: 6)
-    p2 = pass(text: '', b1: 1, c1: 1, v1: 1, b2: 1, c2: 1, v2: 1)
-    assert_equal [2, 3, 4, 5, 6, 7], p1 + p2
-  end
-
-  def test_differenz
-    p1 = pass(text: '', b1: 1, c1: 2, v1: 3, b2: 4, c2: 5, v2: 6)
-    p2 = pass(text: '', b1: 1, c1: 1, v1: 1, b2: 1, c2: 1, v2: 1)
-    assert_equal [0, 1, 2, 3, 4, 5], p2 - p1
+    p = pass(text: '', b1: :Gen, c1: 2, v1: 3, b2: :Num, c2: 5, v2: 6)
+    assert_equal [:Num, 5, 6], p.end
   end
 
   protected

data/test/test_pipelining.rb

@@ -1,4 +1,6 @@
-# - encoding: utf-8 -
+# encoding: utf-8
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class TestPipelining < Test::Unit::TestCase

data/test/test_processor.rb

@@ -1,4 +1,6 @@
-# - encoding: utf-8 -
+# encoding: utf-8
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class TestProcessorIterators < Test::Unit::TestCase
@@ -8,8 +10,8 @@ class TestProcessorIterators < Test::Unit::TestCase
 
   def setup
     @text = 'Some text Mt 1,1 and Mr 2 and so on ...'
-    @mt = [pass(text: 'Mt 1,1 ', b1: 40, c1: 1, v1: 1, b2: 40, c2: 1, v2: 1)]
-    @mr = [pass(text: 'Mr 2 ', b1: 41, c1: 2, b2: 41, c2: 2)]
+    @mt = [pass(text: 'Mt 1,1 ', b1: :Matt, c1: 1, v1: 1, b2: :Matt, c2: 1, v2: 1)]
+    @mr = [pass(text: 'Mr 2 ', b1: :Mark, c1: 2, b2: :Mark, c2: 2)]
     @processor = Processor.new(@text, German)
     @chunks = ['Some text ', @mt, 'and ', @mr, 'and so on ...']
   end
@@ -49,7 +51,7 @@ class TestProcessorVariousContexts < Test::Unit::TestCase
 
   def test_reference_without_other_text
     text = 'Mt 1,1'
-    ast = [[pass(text: 'Mt 1,1 ', b1: 40, c1: 1, v1: 1, b2: 40, c2: 1, v2: 1)]]
+    ast = [[pass(text: 'Mt 1,1 ', b1: :Matt, c1: 1, v1: 1, b2: :Matt, c2: 1, v2: 1)]]
     processor = Processor.new(text, German)
     assert_equal ast, processor.each_ref.to_a
     assert_equal ast, processor.each.to_a
@@ -72,46 +74,46 @@ class TestProcessorVariousContexts < Test::Unit::TestCase
   def test_numerical_context
     text = '1. Mt 1,1'
     processor = Processor.new(text, German)
-    ast = [[pass(text: text, b1: 40, c1: 1, v1: 1, b2: 40, c2: 1, v2: 1)]]
+    ast = [[pass(text: text, b1: :Matt, c1: 1, v1: 1, b2: :Matt, c2: 1, v2: 1)]]
     assert_equal ast, processor.each_ref.to_a
-    ast = ['1. ', [pass(text: text, b1: 40, c1: 1, v1: 1, b2: 40, c2: 1, v2: 1)]]
+    ast = ['1. ', [pass(text: text, b1: :Matt, c1: 1, v1: 1, b2: :Matt, c2: 1, v2: 1)]]
     assert_equal ast, processor.each.to_a
   end
 
   def test_verse_addon_or_postfix
     text = 'Mt 1,1a'
     processor = Processor.new(text, German)
-    ast = [[pass(text: text, b1: 40, c1: 1, v1: 1, b2: 40, c2: 1, v2: 1, a1: 'a')]]
+    ast = [[pass(text: text, b1: :Matt, c1: 1, v1: 1, b2: :Matt, c2: 1, v2: 1, a1: 'a')]]
     assert_equal ast, processor.each.to_a
     text = 'Mt 1,1f'
     processor = Processor.new(text, German)
-    ast = [[pass(text: text, b1: 40, c1: 1, v1: 1, b2: 40, c2: 1, v2: :f)]]
+    ast = [[pass(text: text, b1: :Matt, c1: 1, v1: 1, b2: :Matt, c2: 1, v2: :f)]]
     assert_equal ast, processor.each.to_a
     text = 'Mt 1,1ff'
     processor = Processor.new(text, German)
-    ast = [[pass(text: text, b1: 40, c1: 1, v1: 1, b2: 40, c2: 1, v2: :ff)]]
+    ast = [[pass(text: text, b1: :Matt, c1: 1, v1: 1, b2: :Matt, c2: 1, v2: :ff)]]
     assert_equal ast, processor.each.to_a
   end
 
   def test_verse_addon_or_postfix_for_books_with_only_one_chapter
     text = '2. Joh 5b'
     processor = Processor.new(text, German)
-    ast = [[pass(text: text, b1: 63, c1: 1, v1: 5, b2: 63, c2: 1, v2: 5, a1: 'b')]]
+    ast = [[pass(text: text, b1: :'2John', c1: 1, v1: 5, b2: :'2John', c2: 1, v2: 5, a1: 'b')]]
     assert_equal ast, processor.each.to_a
     text = '2. Joh 5f'
     processor = Processor.new(text, German)
-    ast = [[pass(text: text, b1: 63, c1: 1, v1: 5, b2: 63, c2: 1, v2: :f)]]
+    ast = [[pass(text: text, b1: :'2John', c1: 1, v1: 5, b2: :'2John', c2: 1, v2: :f)]]
     assert_equal ast, processor.each.to_a
     text = '2. Joh 5ff'
     processor = Processor.new(text, German)
-    ast = [[pass(text: text, b1: 63, c1: 1, v1: 5, b2: 63, c2: 1, v2: :ff)]]
+    ast = [[pass(text: text, b1: :'2John', c1: 1, v1: 5, b2: :'2John', c2: 1, v2: :ff)]]
     assert_equal ast, processor.each.to_a
   end
 
   def test_verse_sep
     text = '2. Joh 5.8'
     processor = Processor.new(text, German)
-    ast = [[pass(text: text, b1: 63, c1: 1, v1: 5, b2: 63, c2: 1, v2: 5), '.', pass(text: text, b1: 63, c1: 1, v1: 8, b2: 63, c2: 1, v2: 8)]]
+    ast = [[pass(text: text, b1: :'2John', c1: 1, v1: 5, b2: :'2John', c2: 1, v2: 5), '.', pass(text: text, b1: :'2John', c1: 1, v1: 8, b2: :'2John', c2: 1, v2: 8)]]
     assert_equal ast, processor.each.to_a
   end
 
@@ -121,9 +123,9 @@ class TestProcessorVariousContexts < Test::Unit::TestCase
     postfix = 'nachzulesen ...'
     text = prefix + ref + postfix
     processor = Processor.new(text, German)
-    ast = [pass(text: 'Apg 2,3', b1: 44, c1: 2, v1: 3, b2: 44, c2: 2, v2: 3), '; ', pass(text: '4,8', b1: 44, c1: 4, v1: 8, b2: 44, c2: 4, v2: 8), '; ',
-            pass(text: '7,55', b1: 44, c1: 7, v1: 55, b2: 44, c2: 7, v2: 55), '; ', pass(text: '8,29-39', b1: 44, c1: 8, v1: 29, b2: 44, c2: 8, v2: 39), '; ',
-            pass(text: 'Röm 8,2-9', b1: 45, c1: 8, v1: 2, b2: 45, c2: 8, v2: 9), '; ', pass(text: 'Gal 6,8 ', b1: 48, c1: 6, v1: 8, b2: 48, c2: 6, v2: 8)]
+    ast = [pass(text: 'Apg 2,3', b1: :Acts, c1: 2, v1: 3, b2: :Acts, c2: 2, v2: 3), '; ', pass(text: '4,8', b1: :Acts, c1: 4, v1: 8, b2: :Acts, c2: 4, v2: 8), '; ',
+            pass(text: '7,55', b1: :Acts, c1: 7, v1: 55, b2: :Acts, c2: 7, v2: 55), '; ', pass(text: '8,29-39', b1: :Acts, c1: 8, v1: 29, b2: :Acts, c2: 8, v2: 39), '; ',
+            pass(text: 'Röm 8,2-9', b1: :Rom, c1: 8, v1: 2, b2: :Rom, c2: 8, v2: 9), '; ', pass(text: 'Gal 6,8 ', b1: :Gal, c1: 6, v1: 8, b2: :Gal, c2: 6, v2: 8)]
     assert_equal [ast], processor.each_ref.to_a
     assert_equal [prefix, ast, postfix], processor.each.to_a
   end
@@ -131,12 +133,12 @@ class TestProcessorVariousContexts < Test::Unit::TestCase
   def test_reference_ends_with_chapter_or_verse
     text = 'Joh 8.'
     processor = Processor.new(text, German)
-    ast = [pass(text: 'Joh 8', b1: 43, c1: 8, b2: 43, c2: 8)]
+    ast = [pass(text: 'Joh 8', b1: :John, c1: 8, b2: :John, c2: 8)]
     assert_equal [ast], processor.each_ref.to_a
     assert_equal [ast, '.'], processor.each.to_a
     text = 'Joh 8,12.'
     processor = Processor.new(text, German)
-    ast = [pass(text: 'Joh 8,12', b1: 43, c1: 8, v1: 12, b2: 43, c2: 8, v2: 12)]
+    ast = [pass(text: 'Joh 8,12', b1: :John, c1: 8, v1: 12, b2: :John, c2: 8, v2: 12)]
     assert_equal [ast], processor.each_ref.to_a
     assert_equal [ast, '.'], processor.each.to_a
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scripref
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 1.1.0
 platform: ruby
+original_platform: ''
 authors:
 - Jan Friedrich
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-22 00:00:00.000000000 Z
+date: 2024-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.17'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.17'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: regtest
   requirement: !ruby/object:Gem::Requirement
@@ -52,13 +52,11 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
-description: ''
 email: janfri26@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- "./.aspell.pws"
 - Changelog
 - LICENSE
 - README.md
@@ -66,6 +64,7 @@ files:
 - lib/scripref.rb
 - lib/scripref/basic_methods.rb
 - lib/scripref/bookname.rb
+- lib/scripref/bookorder.rb
 - lib/scripref/const_reader.rb
 - lib/scripref/english.rb
 - lib/scripref/formatter.rb
@@ -94,8 +93,9 @@ files:
 - test/test_processor.rb
 homepage: https://github.com/janfri/scripref
 licenses: []
-metadata: {}
-post_install_message: 
+metadata:
+  homepage_uri: https://github.com/janfri/scripref
+  source_code_uri: https://github.com/janfri/scripref
 rdoc_options: []
 require_paths:
 - lib
@@ -103,15 +103,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.6.0.dev
 specification_version: 4
 summary: Library for parsing scripture references in real texts.
 test_files: []

data/.aspell.pws

@@ -1,22 +0,0 @@
-personal_ws-1.1 en 21 
-Bookname
-ParserError
-PassSep
-Philipper
-Psalmen
-Psm
-Scripref
-VerseSep
-addons
-autoload
-formatter
-fullref
-mixins
-pipelining
-postfix
-postfixes
-refactoring
-refactorings
-regtest
-sep
-struct