scripref 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 373b4b572bcb6fadc58872590bc98e75f5bebe3c
-  data.tar.gz: be215c400b76c7327bdeb63b1bff52917c854eca
+  metadata.gz: a7969fae6655c502970897c3a7c75e5542e35f70
+  data.tar.gz: 4a71db57ad05ad5be040812473904d8db8dfa712
 SHA512:
-  metadata.gz: fc24a4742a42477c252edd1c06fb52f2b41bb6411479556921b39e2512082accc7ce9270d0d87dc6b86032ba13847f3bf9074268b18ac0cce789cd90faf8918c
-  data.tar.gz: 31e56ca2e1000abc2a8bdcdf6b7af0c99b6c49e604dbdd0f530dd02416b4e1d188884ff4428e466c3b367439357876c4b66d4244ca61e42e6bfb4a59de283608
+  metadata.gz: 54f273d53bf3e1ebdab926508c7763ad97542088fdaa9a3b65e5d6fefe29c4e577fd3da6931be41e646c84cf87729347ad27be84d5e8790a71ad9794b607409f
+  data.tar.gz: 6ce53ebcd0a65466877bbc57c22c7d0e663522402f30dea5950df31fbfa0ab2debb37afd111b88653cacf30a8d01fe66929313d9ea1b7fe856380452ae368ff8

data/CHANGELOG

@@ -1,3 +1,8 @@
+0.9.0
+Differentiate between verse addons and postfixes for one ore more following verses.
+New methods Parser#postfix_one_following_verse and Parser#postfix_more_following_verses.
+
+
 0.8.0
 Formatting of verse addons implemented.
 Refactoring: Rename methods in Formatter to distinguish between format_* and process_*.

data/lib/scripref/english.rb

@@ -43,7 +43,19 @@ module Scripref
     VERSE_SEP_RE = /,\s*/o
 
     # Regular expression to match addons for a verse.
-    VERSE_ADDON_RE = /([ab]|ff?)\s*/o
+    VERSE_ADDON_RE = /[ab]\s*/o
+
+    # Postfix for one following verse
+    POSTFIX_ONE_FOLLOWING_VERSE = 'f'
+
+    # Regular expression to match postfix for one following verse
+    POSTFIX_ONE_FOLLOWING_VERSE_RE = /f\b\s*/o
+
+    # Postfix for more following verses
+    POSTFIX_MORE_FOLLOWING_VERSES = 'ff'
+
+    # Regular expression to match postfix for more following verses
+    POSTFIX_MORE_FOLLOWING_VERSES_RE = /ff\b\s*/o
 
     pass = '([1-3]\s*)?[A-Z][a-z]+\.?\s*(\d+\s*[,.\-]\s*)*\d+\s*'
 

data/lib/scripref/formatter.rb

@@ -110,6 +110,14 @@ module Scripref
 
     def process_v2
       v2 = @pass.v2
+      case v2
+      when :f
+        @result << postfix_one_following_verse
+        return
+      when :ff
+        @result << postfix_more_following_verses
+        return
+      end
       if v2 && (@changed || @last_v != v2)
         if @hyphen
           if ! book_has_only_one_chapter?(@pass.b2)

data/lib/scripref/german.rb

@@ -40,7 +40,19 @@ module Scripref
     VERSE_SEP_RE = /\.\s*/o
 
     # Regular expression to match addons for a verse.
-    VERSE_ADDON_RE = /([ab]|ff?)\s*/o
+    VERSE_ADDON_RE = /[ab]\s*/o
+
+    # Postfix for one following verse
+    POSTFIX_ONE_FOLLOWING_VERSE = 'f'
+
+    # Regular expression to match postfix for one following verse
+    POSTFIX_ONE_FOLLOWING_VERSE_RE = /f\b\s*/o
+
+    # Postfix for more following verses
+    POSTFIX_MORE_FOLLOWING_VERSES = 'ff'
+
+    # Regular expression to match postfix for more following verses
+    POSTFIX_MORE_FOLLOWING_VERSES_RE = /ff\b\s*/o
 
     pass = '([1-5]\.?\s*)?[A-Z][a-zäöü]+\.?\s*(\d+\s*[,.\-]\s*)*\d+\s*'
 

data/lib/scripref/parser.rb

@@ -29,7 +29,7 @@ module Scripref
     # for example {'Phil' => 'Philipper'}
     # usual overwritten in Mixins
     def special_abbrev_mapping
-      Hash.new
+      @special_abbrev_mapping ||= {}
     end
 
     # Parsing a string of a scripture reference
@@ -93,12 +93,11 @@ module Scripref
       @v1 = @v2 = s.to_i
 
       if addon = verse_addon
-        case addon
-        when :f, :ff
-          @v2 = addon
-        when :a, :b, :c
-          @a1 = addon
-        end
+        @a1 = addon
+      end
+
+      if postfix = verse_postfix
+        @v2 = postfix
       end
 
       if hyphen
@@ -156,10 +155,7 @@ module Scripref
       @v2 = s.to_i
 
       if addon = verse_addon
-        case addon
-        when :a, :b, :c
-          @a2 = addon
-        end
+        @a2 = addon
       end
 
       if verse_sep
@@ -232,6 +228,17 @@ module Scripref
       end
     end
 
+    # try to parse postfixes for verse
+    def verse_postfix
+      s = (scan(postfix_one_following_verse_re) or scan(postfix_more_following_verses_re))
+      if s
+        @text << s
+        s.to_sym
+      else
+        nil
+      end
+    end
+
     def push_passage
       @result << Passage.new(@text, @b1, @c1, @v1, @b2, @c2, @v2, a1: @a1, a2: @a2)
       @text = ''

data/lib/scripref.rb

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

data/test/test_formatter.rb

@@ -120,6 +120,18 @@ class TestFormatter < Test::Unit::TestCase
     check_formatting
   end
 
+  def test_postfix_one_following_verse
+    @german = 'Markus 2,2f'
+    @english = 'Mark 2:2f'
+    check_formatting
+  end
+
+  def test_postfix_more_following_verses
+    @german = 'Markus 2,2ff'
+    @english = 'Mark 2:2ff'
+    check_formatting
+  end
+
   private
 
   def check_formatting

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scripref
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Jan Friedrich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-14 00:00:00.000000000 Z
+date: 2016-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rim