scripref 0.10.0 → 0.11.0

data/test/test_bookname.rb

@@ -0,0 +1,20 @@
+# - encoding: utf-8 -
+require 'test_helper'
+
+class TestBookname < Test::Unit::TestCase
+
+  include Scripref
+
+  def setup
+    @zef = Bookname.new(%w(Zefanja Zephanja), %w(Zef Zefan Zeph Zephan))
+  end
+
+  def test_name
+    assert_equal 'Zefanja', @zef.name
+  end
+
+  def test_abbrev
+    assert_equal 'Zef', @zef.abbrev
+  end
+
+end

data/test/test_english.rb

@@ -1,24 +1,26 @@
 # - encoding: utf-8 -
-require 'test/unit'
 require 'test_helper'
-require 'scripref/english'
 
 class TestEnglish < Test::Unit::TestCase
 
-  include Test::Helper
   include Scripref
+  include Test::Helper
 
   def setup
     @parser = Parser.new(English)
   end
 
+  def test_size_of_book_array
+    assert_equal 66, English::BOOK_NAMES.size
+  end
+
   def test_book_re
     book_re = @parser.book_re
     assert_match book_re, 'Genesis'
     assert_match book_re, 'Exodus'
     assert_match book_re, 'Matthew'
     assert_match book_re, '2 Timothy'
-    assert_not_match book_re, '2 2 Timothy'
+    assert_not_match book_re, 'x2 Timothy'
     assert_match book_re, 'Revelation'
     assert_not_match book_re, 'something'
     assert_match book_re, 'Gen'

data/test/test_formatter.rb

@@ -1,20 +1,14 @@
 # - encoding: utf-8 -
-require 'test/unit'
 require 'test_helper'
-require 'scripref'
-require 'scripref/english'
-require 'scripref/formatter'
-require 'scripref/german'
-require 'scripref/parser'
 
 class TestFormatter < Test::Unit::TestCase
 
+  include Scripref
   include Test::Helper
 
   def setup
-    @parser = Scripref::Parser.new(Scripref::German)
-    @german_formatter = Scripref::Formatter.new(Scripref::German)
-    @english_formatter = Scripref::Formatter.new(Scripref::English)
+    @german_formatter = Formatter.new(German)
+    @english_formatter = Formatter.new(English)
   end
 
   def test_only_book
@@ -88,7 +82,6 @@ class TestFormatter < Test::Unit::TestCase
   end
 
   def test_reset_addons
-    @parser.parse 'Ruth 2,5b-7a'
     text = 'Ruth'
     assert_formated_text_for_ast text, [pass(text, 8, nil, nil, 8, nil, nil)]
   end
@@ -256,6 +249,23 @@ class TestFormatter < Test::Unit::TestCase
     assert_formated_text_for_ast text, ast
   end
 
+  ######################################################################
+  # Formatting of books
+  ######################################################################
+
+  def test_formatting_with_book_abbrevs
+    @german_formatter.bookformat = :abbrev
+    text = 'Mat 3,4; Mar; Joh 3,16'
+    t1, t2, t3 = text.split(semi)
+    assert_formated_text_for_ast text, [pass(t1, 40, 3, 4, 40, 3, 4), semi, pass(t2, 41, nil, nil, 41, nil, nil), semi, pass(t3, 43, 3, 16, 43, 3, 16)]
+  end
+
+  def test_exception_for_unhandled_bookformat
+    assert_raise NoMethodError do
+      @german_formatter.bookformat = :unknown
+      @german_formatter.format [pass(1,2,3,4,5,6,7)]
+    end
+  end
   private
 
   def assert_formated_text_for_ast text, ast

data/test/test_german.rb

@@ -1,24 +1,26 @@
 # - encoding: utf-8 -
-require 'test/unit'
 require 'test_helper'
-require 'scripref/german'
 
 class TestGerman < Test::Unit::TestCase
 
-  include Test::Helper
   include Scripref
+  include Test::Helper
 
   def setup
     @parser = Parser.new(German)
   end
 
+  def test_size_of_book_array
+    assert_equal 66, German::BOOK_NAMES.size
+  end
+
   def test_book_re
     book_re = @parser.book_re
     assert_match book_re, '1. Mose'
     assert_match book_re, '2. Mose'
     assert_match book_re, 'Matthäus'
     assert_match book_re, '2. Timotheus'
-    assert_not_match book_re, '2. 2. Timotheus'
+    assert_not_match book_re, 'x2. Timotheus'
     assert_match book_re, 'Offenbarung'
     assert_not_match book_re, 'something'
     assert_match book_re, '1. Mo'

data/test/test_helper.rb

@@ -1,3 +1,7 @@
+# - encoding: utf-8 -
+require 'scripref'
+require 'test/unit'
+
 module Test::Helper
 
   def pass *args
@@ -12,35 +16,4 @@ module Test::Helper
     Scripref::VerseSep.new('.')
   end
 
-  def assert_equal_passage expected, actual
-    assert_equal expected.text, actual.text, 'Parsed text'
-    assert_equal expected.b1, actual.b1, 'First book'
-    assert_equal expected.c1, actual.c1, 'First chapter'
-    assert_equal expected.v1, actual.v1, 'First verse'
-    assert_equal expected.b2, actual.b2, 'Second book'
-    assert_equal expected.c2, actual.c2, 'Second chapter'
-    assert_equal expected.v2, actual.v2, 'Second verse'
-    assert_equal expected.a1, actual.a1, 'First addon'
-    assert_equal expected.a2, actual.a2, 'Second addon'
-  end
-
-  def assert_parsed_ast_for_text expected_ast, text
-    res = @parser.parse(text)
-    assert_equal expected_ast.size, res.size, 'Array size of AST'
-    expected_ast.zip(res) do |expected_elem, actual_elem|
-      if expected_elem.kind_of?(Scripref::Passage)
-        assert_equal_passage expected_elem, actual_elem
-      else
-        assert_equal expected_elem, actual_elem
-      end
-    end
-  end
-
-  def assert_parser_error msg
-    assert_raise Scripref::ParserError do
-      yield
-    end
-    assert_equal msg, @parser.error
-  end
-
 end

data/test/test_integration.rb

@@ -1,20 +1,14 @@
 # - encoding: utf-8 -
-require 'test/unit'
 require 'test_helper'
-require 'scripref'
-require 'scripref/english'
-require 'scripref/formatter'
-require 'scripref/german'
-require 'scripref/parser'
 
 class TestIntegration < Test::Unit::TestCase
 
-  include Test::Helper
+  include Scripref
 
   def setup
-    @parser = Scripref::Parser.new(Scripref::German)
-    @german_formatter = Scripref::Formatter.new(Scripref::German)
-    @english_formatter = Scripref::Formatter.new(Scripref::English)
+    @parser = Parser.new(German)
+    @german_formatter = Formatter.new(German)
+    @english_formatter = Formatter.new(English)
   end
 
   def test_only_book

data/test/test_parser.rb

@@ -1,14 +1,13 @@
 # - encoding: utf-8 -
-require 'test/unit'
 require 'test_helper'
-require 'scripref'
 
 class TestParser < Test::Unit::TestCase
 
+  include Scripref
   include Test::Helper
 
   def setup
-    @parser = Scripref::Parser.new(Scripref::German)
+    @parser = Parser.new(German)
   end
 
   def test_only_book
@@ -279,7 +278,7 @@ class TestParser < Test::Unit::TestCase
     text = 'Ruth 2,x'
     begin
       @parser.parse text
-    rescue Scripref::ParserError
+    rescue ParserError
     end
     assert_equal 'Verse expected!', @parser.error
     formated_error = "Verse expected!\nRuth 2,x\n       ^"
@@ -290,7 +289,7 @@ class TestParser < Test::Unit::TestCase
     text = 'Ruth 2,4; M 3,8'
     begin
       @parser.parse text
-    rescue Scripref::ParserError
+    rescue ParserError
     end
     assert_match /^Abbreviation M is ambiguous/, @parser.error
     formated_error = "Abbreviation M is ambiguous it matches Micha, Maleachi, Matthäus, Markus!\nRuth 2,4; M 3,8\n          ^"
@@ -310,4 +309,37 @@ class TestParser < Test::Unit::TestCase
     assert_parsed_ast_for_text [pass(text, 50, 4, 4, 50, 4, 4)], text
   end
 
+  private
+
+  def assert_equal_passage expected, actual
+    assert_equal expected.text, actual.text, 'Parsed text'
+    assert_equal expected.b1, actual.b1, 'First book'
+    assert_equal expected.c1, actual.c1, 'First chapter'
+    assert_equal expected.v1, actual.v1, 'First verse'
+    assert_equal expected.b2, actual.b2, 'Second book'
+    assert_equal expected.c2, actual.c2, 'Second chapter'
+    assert_equal expected.v2, actual.v2, 'Second verse'
+    assert_equal expected.a1, actual.a1, 'First addon'
+    assert_equal expected.a2, actual.a2, 'Second addon'
+  end
+
+  def assert_parsed_ast_for_text expected_ast, text
+    res = @parser.parse(text)
+    assert_equal expected_ast.size, res.size, 'Array size of AST'
+    expected_ast.zip(res) do |expected_elem, actual_elem|
+      if expected_elem.kind_of?(Passage)
+        assert_equal_passage expected_elem, actual_elem
+      else
+        assert_equal expected_elem, actual_elem
+      end
+    end
+  end
+
+  def assert_parser_error msg
+    assert_raise ParserError do
+      yield
+    end
+    assert_equal msg, @parser.error
+  end
+
 end

data/test/test_passage.rb

@@ -1,12 +1,13 @@
 # - encoding: utf-8 -
-require 'test/unit'
 require 'test_helper'
-require 'scripref'
 
 class TestPassage < Test::Unit::TestCase
 
+  include Scripref
+  include Test::Helper
+
   def setup
-    @parser = Scripref::Parser.new(Scripref::German)
+    @parser = Parser.new(German)
   end
 
   def test_to_a
@@ -26,7 +27,7 @@ class TestPassage < Test::Unit::TestCase
 
   def test_comparable_with_sort
     ast = @parser.parse('Joh 8,1-9,11; 8,2-9,12; 8,2-9,11; 8,1-9,12; Joh 8')
-    passages = ast.grep(Scripref::Passage)
+    passages = ast.grep(Passage)
     expect = ['Joh 8',
               'Joh 8,1-9,11',
               '8,1-9,12',
@@ -35,8 +36,8 @@ class TestPassage < Test::Unit::TestCase
     assert_equal expect, passages.sort.map(&:text)
 
     ast = @parser.parse('Mar 1; 1,1; 1,1f; 1,1ff; 1,2; 1,1-2,2; Mar 1-2; Markus; Markus-Lukas; Mar 1-Luk 2; Mar 1,1-Luk 2,2')
-    passages = ast.grep(Scripref::Passage)
-    formatter = Scripref::Formatter.new(Scripref::German)
+    passages = ast.grep(Passage)
+    formatter = Formatter.new(German)
     expect = ['Markus 1,1',
               'Markus 1,1f',
               'Markus 1,1ff',
@@ -65,15 +66,27 @@ class TestPassage < Test::Unit::TestCase
   end
 
   def test_start
-    p = Scripref::Passage.new('', 1, 2, 3, 4, 5, 6)
+    p = pass('', 1, 2, 3, 4, 5, 6)
     assert_equal [1, 2, 3], p.start
   end
 
   def test_end
-    p = Scripref::Passage.new('', 1, 2, 3, 4, 5, 6)
+    p = pass('', 1, 2, 3, 4, 5, 6)
     assert_equal [4, 5, 6], p.end
   end
 
+  def test_sum
+    p1 = pass('', 1, 2, 3, 4, 5, 6)
+    p2 = pass('', 1, 1, 1, 1, 1, 1)
+    assert_equal [2, 3, 4, 5, 6, 7], p1 + p2
+  end
+
+  def test_differenz
+    p1 = pass('', 1, 2, 3, 4, 5, 6)
+    p2 = pass('', 1, 1, 1, 1, 1, 1)
+    assert_equal [0, 1, 2, 3, 4, 5], p2 - p1
+  end
+
   protected
 
   def assert_overlap a, b

data/test/test_pipelining.rb

@@ -1,12 +1,10 @@
 # - encoding: utf-8 -
-require 'test/unit'
 require 'test_helper'
-require 'scripref'
 
 class TestPipelining < Test::Unit::TestCase
 
-  include Test::Helper
   include Scripref
+  include Test::Helper
 
   def test_right_to_left
     text = 'Hebräer 13,8'

data/test/test_processor.rb

@@ -1,30 +1,35 @@
 # - encoding: utf-8 -
-require 'test/unit'
-require 'scripref'
+require 'test_helper'
 
 class TestProcessor < Test::Unit::TestCase
 
-  def setup
+  include Scripref
+  include Test::Helper
+
+  def setup1
     @text = 'Some text Mt 1,1 and Mr 2 and so on ...'
-    @mt = [Scripref::Passage.new('Mt 1,1 ', 40, 1, 1, 40, 1, 1)]
-    @mr = [Scripref::Passage.new('Mr 2 ', 41, 2, nil, 41, 2, nil)]
-    @processor = Scripref::Processor.new(@text, Scripref::German)
+    @mt = [pass('Mt 1,1 ', 40, 1, 1, 40, 1, 1)]
+    @mr = [pass('Mr 2 ', 41, 2, nil, 41, 2, nil)]
+    @processor = Processor.new(@text, German)
     @chunks = ['Some text ', @mt, 'and ', @mr, 'and so on ...']
   end
 
   def test_each_with_block
+    setup1
     @processor.each do |chunk|
       assert_equal @chunks.shift, chunk
     end
   end
 
   def test_each_without_block
+    setup1
     enum = @processor.each
     assert_kind_of Enumerator, enum
     assert_equal @chunks, enum.to_a
   end
 
   def test_each_ref_with_block
+    setup1
     refs = @chunks.select {|c| c.kind_of? Array}
     @processor.each_ref do |ref|
       assert_equal refs.shift, ref
@@ -32,10 +37,79 @@ class TestProcessor < Test::Unit::TestCase
   end
 
   def test_each_ref_without_block
+    setup1
     enum = @processor.each_ref
     refs = @chunks.select {|c| c.kind_of? Array}
     assert_kind_of Enumerator, enum
     assert_equal refs, enum.to_a
   end
 
+  def test_reference_without_other_text
+    text = 'Mt 1,1'
+    ast = [[pass('Mt 1,1 ', 40, 1, 1, 40, 1, 1)]]
+    processor = Processor.new(text, German)
+    assert_equal ast, processor.each_ref.to_a
+    assert_equal ast, processor.each.to_a
+  end
+
+  def test_text_without_reference
+    text = 'some text'
+    processor = Processor.new(text, German)
+    assert_equal [], processor.each_ref.to_a
+    assert_equal [text], processor.each.to_a
+  end
+
+  def test_empty_text
+    text = ''
+    processor = Processor.new(text, German)
+    assert_equal [], processor.each_ref.to_a
+    assert_equal [], processor.each.to_a
+  end
+
+  def test_numerical_context
+    text = '1. Mt 1,1'
+    processor = Processor.new(text, German)
+    ast = [[pass(text, 40, 1, 1, 40, 1, 1)]]
+    assert_equal ast, processor.each_ref.to_a
+    ast = ['1. ', [pass(text, 40, 1, 1, 40, 1, 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, 40, 1, 1, 40, 1, 1, a1: 'a')]]
+    assert_equal ast, processor.each.to_a
+    text = 'Mt 1,1f'
+    processor = Processor.new(text, German)
+    ast = [[pass(text, 40, 1, 1, 40, 1, :f)]]
+    assert_equal ast, processor.each.to_a
+    text = 'Mt 1,1ff'
+    processor = Processor.new(text, German)
+    ast = [[pass(text, 40, 1, 1, 40, 1, :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, 63, 1, 5, 63, 1, 5, a1: 'b')]]
+    assert_equal ast, processor.each.to_a
+    text = '2. Joh 5f'
+    processor = Processor.new(text, German)
+    ast = [[pass(text, 63, 1, 5, 63, 1, :f)]]
+    assert_equal ast, processor.each.to_a
+    text = '2. Joh 5ff'
+    processor = Processor.new(text, German)
+    ast = [[pass(text, 63, 1, 5, 63, 1, :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, 63, 1, 5, 63, 1, 5), '.', pass(text, 63, 1, 8, 63, 1, 8)]]
+    assert_equal ast, processor.each.to_a
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scripref
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Jan Friedrich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-18 00:00:00.000000000 Z
+date: 2017-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rim
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.9'
 - !ruby/object:Gem::Dependency
   name: regtest
   requirement: !ruby/object:Gem::Requirement
@@ -49,10 +49,13 @@ files:
 - README.md
 - Rakefile
 - lib/scripref.rb
+- lib/scripref/basic_methods.rb
+- lib/scripref/bookname.rb
 - lib/scripref/const_reader.rb
 - lib/scripref/english.rb
 - lib/scripref/formatter.rb
 - lib/scripref/german.rb
+- lib/scripref/include.rb
 - lib/scripref/parser.rb
 - lib/scripref/passage.rb
 - lib/scripref/pipelining.rb
@@ -61,6 +64,9 @@ files:
 - regtest/formatter.yml
 - regtest/parser.rb
 - regtest/parser.yml
+- regtest/processor.rb
+- regtest/processor.yml
+- test/test_bookname.rb
 - test/test_english.rb
 - test/test_formatter.rb
 - test/test_german.rb
@@ -89,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Library for parsing scripture references in real texts.