scripref 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0fc95082d6f8f815ac4125c0eef8b6e1c28abc9
-  data.tar.gz: e08bde6417a5fa005412d1125ea7fa23c327af24
+  metadata.gz: db688b68880cd6c75e6d60c4406d830099b1306d
+  data.tar.gz: 5b5e59086582d1c0f34942ea3b365d68ba0c143d
 SHA512:
-  metadata.gz: f89c7410072844ed4d09ecf4137a6168496bcfb888002219b74f864de0811c0f3a166b5f37a7513160d79266d9578832a10196b9408e8cfa3731731c5b58a6a1
-  data.tar.gz: cf33c35be9080ba70ac85259cdd56273405eed57508cdaf75d59f2f1d444e63fe93ab0bd9c2ccfb2d6af62f909d319b641891ec11928d0449d0e27f7c95d44a8
+  metadata.gz: 28ae3e96d2f71bdfd418eb1416e02f4e11edc9d8696c684d055f5cc316e266ffa07cd61b4253afba44c1e408aaebbed076f3468b011dedfaaaae476a7f3ed3a9
+  data.tar.gz: 405d7fcb3d5a402ff89e44d7fe73c72d137d999d2707a1bccb8d6bcd21fb48512ef0385225947413fa52d1e84f0f66777d1cd79b1338ab16992e3c047e746a5b

data/CHANGELOG

@@ -1,3 +1,8 @@
+0.7.0
+Allow alternative book names.
+Reorder formatting error messages to message, string, pointer.
+Update homepage.
+
 0.6.0
 Use explicit classes for separators: PassSep and VerseSep.
 Refactoring: Rename class Parser::Error -> ParserError.

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2015 Jan Friedrich
+Copyright (c) 2010-2016 Jan Friedrich
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/Rakefile

@@ -8,7 +8,7 @@ require 'scripref'
 Rim.setup do
   name 'scripref'
   authors 'Jan Friedrich'
-  homepage 'http://gitorious.org/scripref'
+  homepage 'https://github.com/janfri/scripref'
   version Scripref::VERSION
   summary 'Library for parsing scripture references in real texts.'
 end

data/lib/scripref/english.rb

@@ -21,14 +21,6 @@ module Scripref
       Jude, Revelation
     END
 
-    # Array of regular expressions to match book names.
-    BOOKS_RES = BOOK_NAMES.map do |bn|
-      Regexp.new(bn.gsub(/([^1-3A-Z])/, '\1?').gsub('.', '\.') << '\b\s*')
-    end
-
-    # Regular expression to match a book.
-    BOOK_RE = Regexp.new(BOOKS_RES.map {|re| '(^' << re.to_s << ')' }.join('|'))
-
     # Separator between chapter and verse.
     CV_SEPARATOR = ':'
 

data/lib/scripref/formatter.rb

@@ -32,10 +32,14 @@ module Scripref
       format_b1
     end
 
+    def format_book num
+      Array(book_names[num - 1]).first
+    end
+
     def format_b1
       b1 = @pass.b1
       if @last_b != b1
-        @result << book_names[b1 - 1]
+        @result << format_book(b1)
         @last_b = b1
         @changed = true
       end
@@ -73,7 +77,7 @@ module Scripref
       b2 = @pass.b2
       if b2 && (@changed || @last_b != b2)
         @result << hyphen_separator
-        @result << book_names[b2 - 1]
+        @result << format_book(b2)
         @last_b = b2
         @changed = true
         @hyphen = true

data/lib/scripref/german.rb

@@ -7,25 +7,17 @@ module Scripref
   module German
 
     # Array of book names.
-    BOOK_NAMES = <<-END.strip.split(/,\s*/)
+    BOOK_NAMES = <<-END.strip.split(/,\s*/).map {|e| e.split('|')}
       1. Mose, 2. Mose, 3. Mose, 4. Mose, 5. Mose, Josua, Richter, Ruth, 1. Samuel, 2. Samuel,
       1. Könige, 2. Könige, 1. Chronika, 2. Chronika, Esra, Nehemia, Esther, Hiob, Psalm,
       Sprüche, Prediger, Hohelied, Jesaja, Jeremia, Klagelieder, Hesekiel, Daniel, Hosea, Joel,
-      Amos, Obadja, Jona, Micha, Nahum, Habakuk, Zephanja, Haggai, Sacharja, Maleachi,
+      Amos, Obadja, Jona, Micha, Nahum, Habakuk, Zefanja|Zephanja, Haggai, Sacharja, Maleachi,
       Matthäus, Markus, Lukas, Johannes, Apostelgeschichte, Römer, 1. Korinther, 2. Korinther,
       Galater, Epheser, Philipper, Kolosser, 1. Thessalonicher, 2. Thessalonicher, 1. Timotheus,
       2. Timotheus, Titus, Philemon, Hebräer, Jakobus, 1. Petrus, 2. Petrus, 1. Johannes,
       2. Johannes, 3. Johannes, Judas, Offenbarung
     END
 
-    # Array of regular expressions to match book names.
-    BOOKS_RES = BOOK_NAMES.map do |bn|
-      Regexp.new(bn.gsub(/([^1-5A-Z])/, '\1?').gsub('.', '\.') << '\b\s*')
-    end
-
-    # Regular expression to match a book.
-    BOOK_RE = Regexp.new(BOOKS_RES.map {|re| '(^' << re.to_s << ')' }.join('|'))
-
     # Separator between chapter and verse.
     CV_SEPARATOR = ','
 

data/lib/scripref/parser.rb

@@ -227,12 +227,21 @@ module Scripref
       @a1 = @a2 = nil
     end
 
+    # Regular expression to match a book.
+    def book_re
+      return @book_re if @book_re
+      books_res_as_strings = book_names.flatten.map do |bn|
+        (bn.gsub(/([^\dA-Z])/, '\1?').gsub('.', '\.')) << '\b\s*'
+      end
+      @book_re = Regexp.compile(books_res_as_strings.map {|s| '(^' << s << ')' }.join('|'), nil)
+    end
+
     def abbrev2num str
       book2num(abbrev2book(str))
     end
 
     def abbrev2book str
-      @books_str ||= ('#' << book_names.join('#') << '#')
+      @books_str ||= ('#' << book_names.flatten.join('#') << '#')
       pattern = str.strip.chars.map {|c| Regexp.escape(c) << '[^#]*'}.join
       re = /(?<=#)#{pattern}(?=#)/
       names = @books_str.scan(re)
@@ -243,7 +252,11 @@ module Scripref
     def book2num str
       unless @book2num
         @book2num = {}
-        book_names.each_with_index {|s, i| @book2num[s] = i+1}
+        book_names.each_with_index do |bns, i|
+          Array(bns).each do |bn|
+            @book2num[bn] = i+1
+          end
+        end
       end
       @book2num[str]
     end
@@ -259,7 +272,7 @@ module Scripref
 
     def format_error
       if error
-        format("%s\n%s^\n%s", string, ' ' * pointer, error)
+        format("%s\n%s\n%s^", error, string, ' ' * pointer)
       else
         ''
       end

data/lib/scripref.rb

@@ -8,7 +8,7 @@ require 'scripref/german'
 
 module Scripref
 
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 
   Passage = Struct.new(:text, :b1, :c1, :v1, :b2, :c2, :v2, :a1, :a2) do
 

data/regtest/formatter.rb

@@ -0,0 +1,26 @@
+require 'ostruct'
+require 'regtest'
+require 'scripref'
+
+include Regtest
+include Scripref
+
+o = OpenStruct.new
+o.b1 = [42]
+o.c1 = [1, nil]
+o.v1 = [2, nil]
+o.b2 = [43, nil]
+o.c2 = [3, nil]
+o.v2 = [4, nil]
+
+formatter = Formatter.new(German)
+
+combinations(o).each do |c|
+  a = [c.b1, c.c1, c.v1, c.b2, c.c2, c.v2]
+  pass = Passage.new('', *a)
+  h = pass.to_h
+  h.shift
+  sample h do
+    formatter.format([pass])
+  end
+end

data/regtest/formatter.yml

@@ -0,0 +1,352 @@
+---
+sample:
+  :b1: 42
+  :c1: 1
+  :v1: 2
+  :b2: 43
+  :c2: 3
+  :v2: 4
+  :a1: 
+  :a2: 
+result: Lukas 1,2-Johannes 3,4
+---
+sample:
+  :b1: 42
+  :c1: 1
+  :v1: 2
+  :b2: 43
+  :c2: 3
+  :v2: 
+  :a1: 
+  :a2: 
+result: Lukas 1,2-Johannes 3
+---
+sample:
+  :b1: 42
+  :c1: 1
+  :v1: 2
+  :b2: 43
+  :c2: 
+  :v2: 4
+  :a1: 
+  :a2: 
+result: Lukas 1,2-Johannes,4
+---
+sample:
+  :b1: 42
+  :c1: 1
+  :v1: 2
+  :b2: 43
+  :c2: 
+  :v2: 
+  :a1: 
+  :a2: 
+result: Lukas 1,2-Johannes
+---
+sample:
+  :b1: 42
+  :c1: 1
+  :v1: 2
+  :b2: 
+  :c2: 3
+  :v2: 4
+  :a1: 
+  :a2: 
+result: Lukas 1,2-3,4
+---
+sample:
+  :b1: 42
+  :c1: 1
+  :v1: 2
+  :b2: 
+  :c2: 3
+  :v2: 
+  :a1: 
+  :a2: 
+result: Lukas 1,2-3
+---
+sample:
+  :b1: 42
+  :c1: 1
+  :v1: 2
+  :b2: 
+  :c2: 
+  :v2: 4
+  :a1: 
+  :a2: 
+result: Lukas 1,2-4
+---
+sample:
+  :b1: 42
+  :c1: 1
+  :v1: 2
+  :b2: 
+  :c2: 
+  :v2: 
+  :a1: 
+  :a2: 
+result: Lukas 1,2
+---
+sample:
+  :b1: 42
+  :c1: 1
+  :v1: 
+  :b2: 43
+  :c2: 3
+  :v2: 4
+  :a1: 
+  :a2: 
+result: Lukas 1-Johannes 3,4
+---
+sample:
+  :b1: 42
+  :c1: 1
+  :v1: 
+  :b2: 43
+  :c2: 3
+  :v2: 
+  :a1: 
+  :a2: 
+result: Lukas 1-Johannes 3
+---
+sample:
+  :b1: 42
+  :c1: 1
+  :v1: 
+  :b2: 43
+  :c2: 
+  :v2: 4
+  :a1: 
+  :a2: 
+result: Lukas 1-Johannes,4
+---
+sample:
+  :b1: 42
+  :c1: 1
+  :v1: 
+  :b2: 43
+  :c2: 
+  :v2: 
+  :a1: 
+  :a2: 
+result: Lukas 1-Johannes
+---
+sample:
+  :b1: 42
+  :c1: 1
+  :v1: 
+  :b2: 
+  :c2: 3
+  :v2: 4
+  :a1: 
+  :a2: 
+result: Lukas 1-3,4
+---
+sample:
+  :b1: 42
+  :c1: 1
+  :v1: 
+  :b2: 
+  :c2: 3
+  :v2: 
+  :a1: 
+  :a2: 
+result: Lukas 1-3
+---
+sample:
+  :b1: 42
+  :c1: 1
+  :v1: 
+  :b2: 
+  :c2: 
+  :v2: 4
+  :a1: 
+  :a2: 
+result: Lukas 1-4
+---
+sample:
+  :b1: 42
+  :c1: 1
+  :v1: 
+  :b2: 
+  :c2: 
+  :v2: 
+  :a1: 
+  :a2: 
+result: Lukas 1
+---
+sample:
+  :b1: 42
+  :c1: 
+  :v1: 2
+  :b2: 43
+  :c2: 3
+  :v2: 4
+  :a1: 
+  :a2: 
+result: Lukas,2-Johannes 3,4
+---
+sample:
+  :b1: 42
+  :c1: 
+  :v1: 2
+  :b2: 43
+  :c2: 3
+  :v2: 
+  :a1: 
+  :a2: 
+result: Lukas,2-Johannes 3
+---
+sample:
+  :b1: 42
+  :c1: 
+  :v1: 2
+  :b2: 43
+  :c2: 
+  :v2: 4
+  :a1: 
+  :a2: 
+result: Lukas,2-Johannes,4
+---
+sample:
+  :b1: 42
+  :c1: 
+  :v1: 2
+  :b2: 43
+  :c2: 
+  :v2: 
+  :a1: 
+  :a2: 
+result: Lukas,2-Johannes
+---
+sample:
+  :b1: 42
+  :c1: 
+  :v1: 2
+  :b2: 
+  :c2: 3
+  :v2: 4
+  :a1: 
+  :a2: 
+result: Lukas,2-3,4
+---
+sample:
+  :b1: 42
+  :c1: 
+  :v1: 2
+  :b2: 
+  :c2: 3
+  :v2: 
+  :a1: 
+  :a2: 
+result: Lukas,2-3
+---
+sample:
+  :b1: 42
+  :c1: 
+  :v1: 2
+  :b2: 
+  :c2: 
+  :v2: 4
+  :a1: 
+  :a2: 
+result: Lukas,2-4
+---
+sample:
+  :b1: 42
+  :c1: 
+  :v1: 2
+  :b2: 
+  :c2: 
+  :v2: 
+  :a1: 
+  :a2: 
+result: Lukas,2
+---
+sample:
+  :b1: 42
+  :c1: 
+  :v1: 
+  :b2: 43
+  :c2: 3
+  :v2: 4
+  :a1: 
+  :a2: 
+result: Lukas-Johannes 3,4
+---
+sample:
+  :b1: 42
+  :c1: 
+  :v1: 
+  :b2: 43
+  :c2: 3
+  :v2: 
+  :a1: 
+  :a2: 
+result: Lukas-Johannes 3
+---
+sample:
+  :b1: 42
+  :c1: 
+  :v1: 
+  :b2: 43
+  :c2: 
+  :v2: 4
+  :a1: 
+  :a2: 
+result: Lukas-Johannes,4
+---
+sample:
+  :b1: 42
+  :c1: 
+  :v1: 
+  :b2: 43
+  :c2: 
+  :v2: 
+  :a1: 
+  :a2: 
+result: Lukas-Johannes
+---
+sample:
+  :b1: 42
+  :c1: 
+  :v1: 
+  :b2: 
+  :c2: 3
+  :v2: 4
+  :a1: 
+  :a2: 
+result: Lukas-3,4
+---
+sample:
+  :b1: 42
+  :c1: 
+  :v1: 
+  :b2: 
+  :c2: 3
+  :v2: 
+  :a1: 
+  :a2: 
+result: Lukas-3
+---
+sample:
+  :b1: 42
+  :c1: 
+  :v1: 
+  :b2: 
+  :c2: 
+  :v2: 4
+  :a1: 
+  :a2: 
+result: Lukas-4
+---
+sample:
+  :b1: 42
+  :c1: 
+  :v1: 
+  :b2: 
+  :c2: 
+  :v2: 
+  :a1: 
+  :a2: 
+result: Lukas

data/regtest/parser.yml

@@ -0,0 +1,478 @@
+---
+sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
+result:
+- :text: Ruth 2,1a-11
+  :b1: 8
+  :c1: 2
+  :v1: 1
+  :b2: 8
+  :c2: 2
+  :v2: 11
+  :a1: :a
+  :a2: 
+- "."
+- :text: 15a
+  :b1: 8
+  :c1: 2
+  :v1: 15
+  :b2: 8
+  :c2: 2
+  :v2: 15
+  :a1: :a
+  :a2: 
+- "; "
+- :text: 3,7b
+  :b1: 8
+  :c1: 3
+  :v1: 7
+  :b2: 8
+  :c2: 3
+  :v2: 7
+  :a1: :b
+  :a2: 
+- "."
+- :text: 9-12b
+  :b1: 8
+  :c1: 3
+  :v1: 9
+  :b2: 8
+  :c2: 3
+  :v2: 12
+  :a1: 
+  :a2: :b
+- "; "
+- :text: Markus 4
+  :b1: 41
+  :c1: 4
+  :v1: 
+  :b2: 41
+  :c2: 4
+  :v2: 
+  :a1: 
+  :a2: 
+- "; "
+- :text: 5,3a
+  :b1: 41
+  :c1: 5
+  :v1: 3
+  :b2: 41
+  :c2: 5
+  :v2: 3
+  :a1: :a
+  :a2: 
+- "."
+- :text: 18b-21a
+  :b1: 41
+  :c1: 5
+  :v1: 18
+  :b2: 41
+  :c2: 5
+  :v2: 21
+  :a1: :b
+  :a2: :a
+---
+sample: " 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a"
+exception: |-
+  Book expected!
+   2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
+  ^
+---
+sample: Ruth ,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
+exception: |-
+  EOS or hyphen and book or chapter expected!
+  Ruth ,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
+       ^
+---
+sample: Ruth 21a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
+exception: |-
+  EOS or chapter verse separator or hyphen and book or hyphen and chapter or passage separator and book or passage separator and chapter expected!
+  Ruth 21a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
+         ^
+---
+sample: Ruth 2,-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
+exception: |-
+  Verse expected!
+  Ruth 2,-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
+         ^
+---
+sample: Ruth 2,1a11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
+exception: |-
+  EOS or passage separator or verse separator or hyphen expected!
+  Ruth 2,1a11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
+           ^
+---
+sample: Ruth 2,1a-.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
+exception: |-
+  Chapter or verse expected!
+  Ruth 2,1a-.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
+            ^
+---
+sample: Ruth 2,1a-1115a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
+result:
+- :text: Ruth 2,1a-1115a
+  :b1: 8
+  :c1: 2
+  :v1: 1
+  :b2: 8
+  :c2: 2
+  :v2: 1115
+  :a1: :a
+  :a2: :a
+- "; "
+- :text: 3,7b
+  :b1: 8
+  :c1: 3
+  :v1: 7
+  :b2: 8
+  :c2: 3
+  :v2: 7
+  :a1: :b
+  :a2: 
+- "."
+- :text: 9-12b
+  :b1: 8
+  :c1: 3
+  :v1: 9
+  :b2: 8
+  :c2: 3
+  :v2: 12
+  :a1: 
+  :a2: :b
+- "; "
+- :text: Markus 4
+  :b1: 41
+  :c1: 4
+  :v1: 
+  :b2: 41
+  :c2: 4
+  :v2: 
+  :a1: 
+  :a2: 
+- "; "
+- :text: 5,3a
+  :b1: 41
+  :c1: 5
+  :v1: 3
+  :b2: 41
+  :c2: 5
+  :v2: 3
+  :a1: :a
+  :a2: 
+- "."
+- :text: 18b-21a
+  :b1: 41
+  :c1: 5
+  :v1: 18
+  :b2: 41
+  :c2: 5
+  :v2: 21
+  :a1: :b
+  :a2: :a
+---
+sample: Ruth 2,1a-11.; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
+exception: |-
+  Verse expected!
+  Ruth 2,1a-11.; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
+               ^
+---
+sample: Ruth 2,1a-11.15a3,7b.9-12b; Markus 4; 5,3a.18b-21a
+exception: |-
+  EOS or passage separator or verse separator or hyphen expected!
+  Ruth 2,1a-11.15a3,7b.9-12b; Markus 4; 5,3a.18b-21a
+                  ^
+---
+sample: Ruth 2,1a-11.15a; ,7b.9-12b; Markus 4; 5,3a.18b-21a
+exception: |-
+  Book or chapter expected!
+  Ruth 2,1a-11.15a; ,7b.9-12b; Markus 4; 5,3a.18b-21a
+                    ^
+---
+sample: Ruth 2,1a-11.15a; 37b.9-12b; Markus 4; 5,3a.18b-21a
+exception: |-
+  EOS or chapter verse separator or hyphen and book or hyphen and chapter or passage separator and book or passage separator and chapter expected!
+  Ruth 2,1a-11.15a; 37b.9-12b; Markus 4; 5,3a.18b-21a
+                      ^
+---
+sample: Ruth 2,1a-11.15a; 3,.9-12b; Markus 4; 5,3a.18b-21a
+exception: |-
+  Verse expected!
+  Ruth 2,1a-11.15a; 3,.9-12b; Markus 4; 5,3a.18b-21a
+                      ^
+---
+sample: Ruth 2,1a-11.15a; 3,7b9-12b; Markus 4; 5,3a.18b-21a
+exception: |-
+  EOS or passage separator or verse separator or hyphen expected!
+  Ruth 2,1a-11.15a; 3,7b9-12b; Markus 4; 5,3a.18b-21a
+                        ^
+---
+sample: Ruth 2,1a-11.15a; 3,7b.-12b; Markus 4; 5,3a.18b-21a
+exception: |-
+  Verse expected!
+  Ruth 2,1a-11.15a; 3,7b.-12b; Markus 4; 5,3a.18b-21a
+                         ^
+---
+sample: Ruth 2,1a-11.15a; 3,7b.912b; Markus 4; 5,3a.18b-21a
+result:
+- :text: Ruth 2,1a-11
+  :b1: 8
+  :c1: 2
+  :v1: 1
+  :b2: 8
+  :c2: 2
+  :v2: 11
+  :a1: :a
+  :a2: 
+- "."
+- :text: 15a
+  :b1: 8
+  :c1: 2
+  :v1: 15
+  :b2: 8
+  :c2: 2
+  :v2: 15
+  :a1: :a
+  :a2: 
+- "; "
+- :text: 3,7b
+  :b1: 8
+  :c1: 3
+  :v1: 7
+  :b2: 8
+  :c2: 3
+  :v2: 7
+  :a1: :b
+  :a2: 
+- "."
+- :text: 912b
+  :b1: 8
+  :c1: 3
+  :v1: 912
+  :b2: 8
+  :c2: 3
+  :v2: 912
+  :a1: :b
+  :a2: 
+- "; "
+- :text: Markus 4
+  :b1: 41
+  :c1: 4
+  :v1: 
+  :b2: 41
+  :c2: 4
+  :v2: 
+  :a1: 
+  :a2: 
+- "; "
+- :text: 5,3a
+  :b1: 41
+  :c1: 5
+  :v1: 3
+  :b2: 41
+  :c2: 5
+  :v2: 3
+  :a1: :a
+  :a2: 
+- "."
+- :text: 18b-21a
+  :b1: 41
+  :c1: 5
+  :v1: 18
+  :b2: 41
+  :c2: 5
+  :v2: 21
+  :a1: :b
+  :a2: :a
+---
+sample: Ruth 2,1a-11.15a; 3,7b.9-; Markus 4; 5,3a.18b-21a
+exception: |-
+  Chapter or verse expected!
+  Ruth 2,1a-11.15a; 3,7b.9-; Markus 4; 5,3a.18b-21a
+                           ^
+---
+sample: Ruth 2,1a-11.15a; 3,7b.9-12bMarkus 4; 5,3a.18b-21a
+exception: |-
+  EOS or verse separator or passage separator expected!
+  Ruth 2,1a-11.15a; 3,7b.9-12bMarkus 4; 5,3a.18b-21a
+                              ^
+---
+sample: Ruth 2,1a-11.15a; 3,7b.9-12b;  4; 5,3a.18b-21a
+result:
+- :text: Ruth 2,1a-11
+  :b1: 8
+  :c1: 2
+  :v1: 1
+  :b2: 8
+  :c2: 2
+  :v2: 11
+  :a1: :a
+  :a2: 
+- "."
+- :text: 15a
+  :b1: 8
+  :c1: 2
+  :v1: 15
+  :b2: 8
+  :c2: 2
+  :v2: 15
+  :a1: :a
+  :a2: 
+- "; "
+- :text: 3,7b
+  :b1: 8
+  :c1: 3
+  :v1: 7
+  :b2: 8
+  :c2: 3
+  :v2: 7
+  :a1: :b
+  :a2: 
+- "."
+- :text: 9-12b
+  :b1: 8
+  :c1: 3
+  :v1: 9
+  :b2: 8
+  :c2: 3
+  :v2: 12
+  :a1: 
+  :a2: :b
+- ";  "
+- :text: '4'
+  :b1: 8
+  :c1: 4
+  :v1: 9
+  :b2: 8
+  :c2: 4
+  :v2: 12
+  :a1: 
+  :a2: 
+- "; "
+- :text: 5,3a
+  :b1: 8
+  :c1: 5
+  :v1: 3
+  :b2: 8
+  :c2: 5
+  :v2: 3
+  :a1: :a
+  :a2: 
+- "."
+- :text: 18b-21a
+  :b1: 8
+  :c1: 5
+  :v1: 18
+  :b2: 8
+  :c2: 5
+  :v2: 21
+  :a1: :b
+  :a2: :a
+---
+sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus ; 5,3a.18b-21a
+exception: |-
+  EOS or hyphen and book or chapter expected!
+  Ruth 2,1a-11.15a; 3,7b.9-12b; Markus ; 5,3a.18b-21a
+                                       ^
+---
+sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 45,3a.18b-21a
+result:
+- :text: Ruth 2,1a-11
+  :b1: 8
+  :c1: 2
+  :v1: 1
+  :b2: 8
+  :c2: 2
+  :v2: 11
+  :a1: :a
+  :a2: 
+- "."
+- :text: 15a
+  :b1: 8
+  :c1: 2
+  :v1: 15
+  :b2: 8
+  :c2: 2
+  :v2: 15
+  :a1: :a
+  :a2: 
+- "; "
+- :text: 3,7b
+  :b1: 8
+  :c1: 3
+  :v1: 7
+  :b2: 8
+  :c2: 3
+  :v2: 7
+  :a1: :b
+  :a2: 
+- "."
+- :text: 9-12b
+  :b1: 8
+  :c1: 3
+  :v1: 9
+  :b2: 8
+  :c2: 3
+  :v2: 12
+  :a1: 
+  :a2: :b
+- "; "
+- :text: Markus 45,3a
+  :b1: 41
+  :c1: 45
+  :v1: 3
+  :b2: 41
+  :c2: 45
+  :v2: 3
+  :a1: :a
+  :a2: 
+- "."
+- :text: 18b-21a
+  :b1: 41
+  :c1: 45
+  :v1: 18
+  :b2: 41
+  :c2: 45
+  :v2: 21
+  :a1: :b
+  :a2: :a
+---
+sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; ,3a.18b-21a
+exception: |-
+  Book or chapter expected!
+  Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; ,3a.18b-21a
+                                          ^
+---
+sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 53a.18b-21a
+exception: |-
+  EOS or chapter verse separator or hyphen and book or hyphen and chapter or passage separator and book or passage separator and chapter expected!
+  Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 53a.18b-21a
+                                            ^
+---
+sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,.18b-21a
+exception: |-
+  Verse expected!
+  Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,.18b-21a
+                                            ^
+---
+sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a18b-21a
+exception: |-
+  EOS or passage separator or verse separator or hyphen expected!
+  Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a18b-21a
+                                              ^
+---
+sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.-21a
+exception: |-
+  Verse expected!
+  Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.-21a
+                                               ^
+---
+sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b21a
+exception: |-
+  EOS or passage separator or verse separator or hyphen expected!
+  Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b21a
+                                                  ^
+---
+sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-
+exception: |-
+  Chapter or verse expected!
+  Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-
+                                                   ^

data/test/test_english.rb

@@ -6,9 +6,14 @@ require 'scripref/english'
 class TestEnglish < Test::Unit::TestCase
 
   include Test::Helper
-  include Scripref::English
+  include Scripref
+
+  def setup
+    @parser = Parser.new(English)
+  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'
@@ -37,7 +42,6 @@ class TestEnglish < Test::Unit::TestCase
   end
 
   def assert_book_num num, str
-    @parser ||= Scripref::Parser.new(Scripref::English)
     assert_equal num, @parser.parse(str).first.b1
   end
 

data/test/test_formatter.rb

@@ -97,6 +97,11 @@ class TestFormatter < Test::Unit::TestCase
     check_formatting
   end
 
+  def test_alternative_booknames
+    ast = @parser.parse('Zephanja 1,8')
+    assert_equal 'Zefanja 1,8', @german_formatter.format(ast)
+  end
+
   private
 
   def check_formatting

data/test/test_german.rb

@@ -6,9 +6,14 @@ require 'scripref/german'
 class TestGerman < Test::Unit::TestCase
 
   include Test::Helper
-  include Scripref::German
+  include Scripref
+
+  def setup
+    @parser = Parser.new(German)
+  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'

data/test/test_parser.rb

@@ -225,7 +225,7 @@ class TestParser < Test::Unit::TestCase
     rescue Scripref::ParserError
     end
     assert_equal 'Verse expected!', @parser.error
-    formated_error = "Ruth 2,x\n       ^\nVerse expected!"
+    formated_error = "Verse expected!\nRuth 2,x\n       ^"
     assert_equal formated_error, @parser.format_error
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scripref
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Jan Friedrich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-04 00:00:00.000000000 Z
+date: 2016-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rim
@@ -56,7 +56,10 @@ files:
 - lib/scripref/parser.rb
 - lib/scripref/pipelining.rb
 - lib/scripref/processor.rb
+- regtest/formatter.rb
+- regtest/formatter.yml
 - regtest/parser.rb
+- regtest/parser.yml
 - test/test_english.rb
 - test/test_formatter.rb
 - test/test_german.rb
@@ -65,7 +68,7 @@ files:
 - test/test_passage.rb
 - test/test_pipelining.rb
 - test/test_processor.rb
-homepage: http://gitorious.org/scripref
+homepage: https://github.com/janfri/scripref
 licenses: []
 metadata: {}
 post_install_message: