scripref 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d474cd23788d8e7fba5f76d10c0dae60e205000e
-  data.tar.gz: f2ca72e4fd6bb01e0d48d2b177e469cc1db5bad6
+  metadata.gz: 01a6a4eaf04a5db4c42caa6e28c39e4e024e6383
+  data.tar.gz: aaaf18868275f9e5c6e7c3cccfc139e9efe18dcb
 SHA512:
-  metadata.gz: 46913ffca73f184d92fbc33d2d02f311a8e456575cd229cd3d6cd05ee63a989c04d2102118afa00cf9562ce79bd6e84904b770a747952e3951fd1a672915c725
-  data.tar.gz: bcb8a59ae40f73e66fcc2676c6fe50fd2ddc02dd60fbd29291e6541516d0432a46b0af6e8aad2a43f59eca45ba567db5b8828b034998c0a114ba9f1d01b8c683
+  metadata.gz: 60f0173166dae8e8b133935eabbe99bfc624f819ab31a0b016876ec47104744bcaee0541e334eaab24e7129744c41c91e07c6e17164f809343208a418d6ca866
+  data.tar.gz: 954ee188ad98491e959db439801899dac9ae07af01072fb8fc1502065c5804e27537e452a965d65e67f46fd78aa4d0ffe804cc0ae0e82438e8edeaeb2aee0374

data/CHANGELOG

@@ -1,3 +1,8 @@
+0.5.0
+Rename Formatter#fullref -> #format.
+Implementing pipelining with >>.
+Fix typo in German book names.
+
 0.4.0
 Handling books with only one chapter correct.
 

data/Rakefile

@@ -1,5 +1,6 @@
 require 'rim/tire'
 require 'rim/regtest'
+require 'rim/version'
 
 $:.unshift File.dirname(__FILE__) + '/lib'
 require 'scripref'

data/lib/scripref/formatter.rb

@@ -16,9 +16,8 @@ module Scripref
       end
     end
 
-    # Formats a reference (array of passages) with full
-    # book names (i.e. Hebrews 3:8)
-    def fullref *reference
+    # Formats a reference (array of passages)
+    def format *reference
       last_b = last_c = last_v = nil
       pass_texts = reference.flatten.map do |pass|
         changed = false
@@ -75,6 +74,8 @@ module Scripref
       pass_texts.join(pass_separator)
     end
 
+    alias << format
+
   end
 
 end

data/lib/scripref/german.rb

@@ -9,7 +9,7 @@ module Scripref
     # Array of book names.
     BOOK_NAMES = <<-END.strip.split(/,\s*/)
       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,
+      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,
       Matthäus, Markus, Lukas, Johannes, Apostelgeschichte, Römer, 1. Korinther, 2. Korinther,

data/lib/scripref/parser.rb

@@ -37,7 +37,7 @@ module Scripref
     def b1
       s = scan(book_re) or return nil
       @text << s
-      @b1 = @b2 = book2num(s)
+      @b1 = @b2 = abbrev2num(s)
 
       if check(Regexp.new(NUMBER_RE.source + cv_sep_re.source))
         @c1 = @v1 = nil
@@ -107,7 +107,7 @@ module Scripref
     def b2
       s = scan(book_re) or return nil
       @text << s
-      @b2 = book2num(s)
+      @b2 = abbrev2num(s)
       @c2 = @v2 = nil
 
       if check(Regexp.new(NUMBER_RE.source + cv_sep_re.source))
@@ -224,25 +224,35 @@ module Scripref
       @a1 = @a2 = nil
     end
 
+    def abbrev2num str
+      book2num(abbrev2book(str))
+    end
+
+    def abbrev2book str
+      @books_str ||= ('#' << book_names.join('#') << '#')
+      pattern = str.strip.chars.map {|c| Regexp.escape(c) << '[^#]*'}.join
+      re = /(?<=#)#{pattern}(?=#)/
+      names = @books_str.scan(re)
+      fail Error, format("Abbreviation %s is ambiguous it matches %s!", str, names.join(', ')) unless names.size == 1
+      names.first
+    end
+
     def book2num str
-      return nil unless book_re =~str
-      books_res.each_with_index do |re, i|
-       if str =~ Regexp.new('^' << re.to_s << '$')
-         num = i + 1
-         return num
-       end
+      unless @book2num
+        @book2num = {}
+        book_names.each_with_index {|s, i| @book2num[s] = i+1}
       end
+      @book2num[str]
     end
 
     def inspect
       "#<#{self.class} #{@mods.inspect}>"
     end
 
-  end
+    alias << parse
+
+    class Error < RuntimeError; end
 
-  # check if the book has only one chapter
-  def self.book_has_only_one_chapter? book
-    [31, 63, 64, 65].include?(book)
   end
 
 end

data/lib/scripref/pipelining.rb

@@ -0,0 +1,19 @@
+# - encoding: utf-8 -
+
+module Scripref
+
+  module Pipelining
+    def >> o
+      o << self
+    end
+  end
+
+end
+
+class Array
+ include Scripref::Pipelining
+end
+
+class String
+  include Scripref::Pipelining
+end

data/lib/scripref.rb

@@ -7,7 +7,7 @@ require 'scripref/german'
 
 module Scripref
 
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 
   Passage = Struct.new(:text, :b1, :c1, :v1, :b2, :c2, :v2, :a1, :a2) do
 
@@ -18,4 +18,9 @@ module Scripref
     alias to_s text
   end
 
+  # check if the book has only one chapter
+  def self.book_has_only_one_chapter? book
+    [31, 63, 64, 65].include?(book)
+  end
+
 end

data/test/test_english.rb

@@ -29,7 +29,6 @@ class TestEnglish < Test::Unit::TestCase
     assert_book_num 66, 'Revelation'
     assert_book_num 1, 'Gen'
     assert_book_num 1, 'Ge'
-    assert_book_num 1, 'G'
     assert_book_num 55, '2 Tim'
     assert_book_num 55, '2Tim'
     assert_book_num 55, '2Tm'

data/test/test_formatter.rb

@@ -78,8 +78,8 @@ class TestFormatter < Test::Unit::TestCase
 
   def check_formatting
     ast = @parser.parse(@german)
-    assert_equal @german, @german_formatter.fullref(ast)
-    assert_equal @english, @english_formatter.fullref(ast)
+    assert_equal @german, @german_formatter.format(ast)
+    assert_equal @english, @english_formatter.format(ast)
   end
 
 end

data/test/test_parser.rb

@@ -16,6 +16,17 @@ class TestParser < Test::Unit::TestCase
     assert_parsed_ast_for_text [pass(text, 8, nil, nil, 8, nil, nil)], text
   end
 
+  def test_ambiguous_book
+    assert_raises Scripref::Parser::Error do
+      begin
+        @parser.parse 'Jo'
+      rescue RuntimeError => e
+        assert_equal 'Abbreviation Jo is ambiguous it matches Josua, Joel, Jona, Johannes, Jakobus!', e.message
+        raise e
+      end
+    end
+  end
+
   def test_book_and_chapter
     text = 'Ruth 2'
     assert_parsed_ast_for_text [pass(text, 8, 2, nil, 8, 2, nil)], text

data/test/test_pipelining.rb

@@ -0,0 +1,28 @@
+# - encoding: utf-8 -
+require 'test/unit'
+require 'test_helper'
+require 'scripref'
+
+class TestPipelining < Test::Unit::TestCase
+
+  include Test::Helper
+  include Scripref
+
+  def test_right_to_left
+    text = 'Hebräer 13,8'
+    parser = Parser.new(German)
+    formatter = Formatter.new(English)
+    result = formatter << (parser << text)
+    assert_equal 'Hebrews 13:8', result
+  end
+
+  def test_left_to_right
+    require 'scripref/pipelining'
+    text = 'Hebräer 13,8'
+    parser = Parser.new(German)
+    formatter = Formatter.new(English)
+    result = text >> parser >> formatter
+    assert_equal 'Hebrews 13:8', result
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scripref
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Jan Friedrich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rim
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: regtest
   requirement: !ruby/object:Gem::Requirement
@@ -54,6 +54,7 @@ files:
 - lib/scripref/formatter.rb
 - lib/scripref/german.rb
 - lib/scripref/parser.rb
+- lib/scripref/pipelining.rb
 - lib/scripref/processor.rb
 - regtest/parser.rb
 - test/test_english.rb
@@ -61,6 +62,7 @@ files:
 - test/test_german.rb
 - test/test_helper.rb
 - test/test_parser.rb
+- test/test_pipelining.rb
 - test/test_processor.rb
 homepage: http://gitorious.org/scripref
 licenses: []