scripref 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 223ae6028e566b369b6848eef6374fe2bc52706a
-  data.tar.gz: 6b9f27eee78bc4c6ca03254851e80911a9846da6
+  metadata.gz: 21205b3151c514f536d81a727778d0ec3ad46a48
+  data.tar.gz: 6869a6575b30d177406baa6a9867a7f1534eb3e4
 SHA512:
-  metadata.gz: 2f85ed0888401fb880980fd31552720e23494ae879cc6dbc9834dc36d2ffaca33fdbaf62fa4f8856c9bc2754820c53e5701cf6ca44fb73172d452f139916d927
-  data.tar.gz: 6261f6a48f837d69701270e0083758ded7b3a47c26eb7a4e48f5b345ce9a8ddfc1ca228afea8ac692c2ad208eaa7c625aae87f469a33d0a0c804859ad9b0383a
+  metadata.gz: cf00d9e8951725ad7551eafbaf9e841c8549a56d7c90a9aa7de82e158702403bcdc63816dab72f415e996bf0de8807a9e7b75c2c66b09d1690568bc0771b3871
+  data.tar.gz: 53d7ed2ade506a9adaa0933537884657b86e2dc89aa596a922c9b51a65a908417a041312173c6583e0dc23027eb745678920ed0fa93dea55543d88ca75d8a4d6

data/Changelog

@@ -1,3 +1,6 @@
+0.12.0
+Allow periods at the end of book abbreviations.
+
 0.11.0
 Add class Bookname and methods Passage#+ and Passage#-.
 Make processor working for complex contexts.

data/lib/scripref/basic_methods.rb

@@ -24,7 +24,7 @@ module Scripref
           (n.gsub(/([^\dA-Z])/, '\1?').gsub('.', '\.'))
         end
       end.flatten
-      @book_re = Regexp.compile(books_res_as_strings.map {|s| '(\b' << s << '\b\s*)' }.join('|'), nil)
+      @book_re = Regexp.compile(books_res_as_strings.map {|s| '(\b' << s << '\b\.?\s*)' }.join('|'), nil)
     end
 
   end

data/lib/scripref/parser.rb

@@ -244,6 +244,7 @@ module Scripref
 
     def abbrev2book str
       s = str.strip
+      s.sub! /\.$/, ''
       @books_str ||= ('#' << book_names.map(&:names).flatten.join('#') << '#')
       pattern = s.chars.map {|c| Regexp.escape(c) << '[^#]*'}.join
       re = /(?<=#)#{pattern}(?=#)/

data/lib/scripref.rb

@@ -3,7 +3,7 @@ require 'delegate'
 
 module Scripref
 
-  VERSION = '0.11.0'
+  VERSION = '0.12.0'
 
   autoload :Bookname, 'scripref/bookname'
   autoload :English, 'scripref/english'

data/test/test_parser.rb

@@ -15,6 +15,20 @@ class TestParser < Test::Unit::TestCase
     assert_parsed_ast_for_text [pass(text, 8, nil, nil, 8, nil, nil)], text
   end
 
+  def test_book_abbrev
+    text = 'Ru'
+    assert_parsed_ast_for_text [pass(text, 8, nil, nil, 8, nil, nil)], text
+    text = 'Offb'
+    assert_parsed_ast_for_text [pass(text, 66, nil, nil, 66, nil, nil)], text
+  end
+
+  def test_book_abbrev_with_period
+    text = 'Ru.'
+    assert_parsed_ast_for_text [pass(text, 8, nil, nil, 8, nil, nil)], text
+    text = 'Offb.'
+    assert_parsed_ast_for_text [pass(text, 66, nil, nil, 66, nil, nil)], text
+  end
+
   def test_ambiguous_book
     msg = 'Abbreviation Jo is ambiguous it matches Josua, Joel, Jona, Johannes, Jakobus!'
     assert_parser_error msg do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scripref
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Jan Friedrich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-26 00:00:00.000000000 Z
+date: 2017-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rim