scripref 0.15.0 → 1.0.0

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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scripref
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Jan Friedrich
@@ -66,6 +66,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