scripref 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ca4f679be693441ac7736e45aa665afd11c9b51
-  data.tar.gz: 003e3c4548aa4157f7f337d62baefce20f12b7b1
+  metadata.gz: d474cd23788d8e7fba5f76d10c0dae60e205000e
+  data.tar.gz: f2ca72e4fd6bb01e0d48d2b177e469cc1db5bad6
 SHA512:
-  metadata.gz: 509cbf4f5d0cd161ace9424f359c34cbe714aaceead2650ee6034a9af3ba67c9ddde0edc3aa30c950fcfd4a56aa9c50b4728a00f7a1ff638b1dc105f5025faf9
-  data.tar.gz: 5cebfb96816bc6c76fcf4872bdb8e436c8a3442a80a5da61b5969fc666159fbd5b4a620f6fae9b33c13da475e6cffbdb9b0b25d34533cf5cd8055bfa4945bb17
+  metadata.gz: 46913ffca73f184d92fbc33d2d02f311a8e456575cd229cd3d6cd05ee63a989c04d2102118afa00cf9562ce79bd6e84904b770a747952e3951fd1a672915c725
+  data.tar.gz: bcb8a59ae40f73e66fcc2676c6fe50fd2ddc02dd60fbd29291e6541516d0432a46b0af6e8aad2a43f59eca45ba567db5b8828b034998c0a114ba9f1d01b8c683

data/CHANGELOG

@@ -1,3 +1,6 @@
+0.4.0
+Handling books with only one chapter correct.
+
 0.3.0
 Set unspecified chapter or verse values to nil instead to 1 or :max.
   Example: parser.parse("Ruth 2") => [#<struct Scripref::Passage text="Ruth 2", b1=8, c1=2, v1=nil, b2=8, c2=2, v2=nil>]

data/lib/scripref/formatter.rb

@@ -21,37 +21,54 @@ module Scripref
     def fullref *reference
       last_b = last_c = last_v = nil
       pass_texts = reference.flatten.map do |pass|
+        changed = false
         s = ''
-        unless last_b == pass.b1
+        if changed || last_b != pass.b1
           s << book_names[pass.b1 - 1]
           last_b = pass.b1
+          changed = true
         end
-        unless last_c == pass.c1
-          s << ' ' << pass.c1.to_s
+        if changed || last_c != pass.c1
+          s << ' '
+          if ! Scripref.book_has_only_one_chapter?(pass.b1)
+            s << pass.c1.to_s
+          end
           last_c = pass.c1
+          changed = true
         end
-        unless last_v == pass.v1
-          s << cv_separator << pass.v1.to_s
+        if changed || last_v != pass.v1
+          if ! Scripref.book_has_only_one_chapter?(pass.b1)
+            s << cv_separator
+          end
+          s << pass.v1.to_s
           last_v = pass.v1
+          changed = true
         end
         # second part
+        changed = false
         a2 = []
-        unless last_v == pass.v2
-          a2 << pass.v2.to_s
-          last_v = pass.v2
+        if changed || last_b != pass.b2
+          a2 << book_names[pass.b2 - 1]
+          last_b = pass.b2
+          changed = true
         end
-        unless last_c == pass.c2
-          a2 << cv_separator
-          a2 << pass.c2.to_s
+        if changed || last_c != pass.c2
+          a2 << ' ' if pass.b1 != pass.b2
+          if ! Scripref.book_has_only_one_chapter?(pass.b2)
+            a2 << pass.c2.to_s
+            a2 << cv_separator
+          end
           last_c = pass.c2
+          changed = true
         end
-        unless last_b == pass.b2
-          a2 << ' ' << book_names[pass.b2 - 1]
-          last_b = pass.b2
+        if changed || last_v != pass.v2
+          a2 << pass.v2.to_s
+          last_v = pass.v2
+          changed = true
         end
         if ! a2.empty?
           s << hyphen_separator
-          s << a2.reverse.join('')
+          s << a2.join('')
         end
         s
       end

data/lib/scripref/german.rb

@@ -55,26 +55,6 @@ module Scripref
     # Regular expression to parse a reference
     REFERENCE_RE = /#{pass}(;\s*#{pass})*/o
 
-    # try to parse first book
-    def b1
-      s = scan(book_re) or return nil
-      @text << s
-      @b1 = @b2 = book2num(s)
-
-      if book_has_only_one_chapter?(@b1)
-        @c1 = @c2 = 1
-        epsilon or (hyphen and b2) or v1 or nil
-      else
-        @c1 = @v1 = nil
-        @c2 = @v2 = nil
-        epsilon or (hyphen and b2) or c1 or nil
-      end
-    end
-
-    def book_has_only_one_chapter? book
-      [31, 63, 64, 65].include?(book)
-    end
-
   end
 
 end

data/lib/scripref/parser.rb

@@ -38,10 +38,21 @@ module Scripref
       s = scan(book_re) or return nil
       @text << s
       @b1 = @b2 = book2num(s)
-      @c1 = @v1 = nil
-      @c2 = @v2 = nil
 
-      epsilon or (hyphen and b2) or c1 or nil
+      if check(Regexp.new(NUMBER_RE.source + cv_sep_re.source))
+        @c1 = @v1 = nil
+        @c2 = @v2 = nil
+        c1
+      else
+        if Scripref.book_has_only_one_chapter?(@b1)
+          @c1 = @c2 = 1
+          epsilon or (hyphen and b2) or v1 or nil
+        else
+          @c1 = @v1 = nil
+          @c2 = @v2 = nil
+          epsilon or (hyphen and b2) or c1 or nil
+        end
+      end
     end
 
     # try parse first chapter
@@ -99,7 +110,16 @@ module Scripref
       @b2 = book2num(s)
       @c2 = @v2 = nil
 
-      epsilon or c2 or nil
+      if check(Regexp.new(NUMBER_RE.source + cv_sep_re.source))
+        c2
+      else
+        if Scripref.book_has_only_one_chapter?(@b2)
+          @c2 = 1
+          epsilon or v2 or nil
+        else
+          epsilon or c2 or nil
+        end
+      end
     end
 
     # try to parse second chapter
@@ -220,4 +240,9 @@ module Scripref
 
   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.rb

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

data/test/test_english.rb

@@ -42,11 +42,4 @@ class TestEnglish < Test::Unit::TestCase
     assert_equal num, @parser.parse(str).first.b1
   end
 
-  def test_book_with_only_one_chapter
-    @parser ||= Scripref::Parser.new(Scripref::English)
-    text = 'Obad 1:3'
-    ast = [pass(text, 31, 1, 3, 31, 1, 3)]
-    assert_parsed_ast_for_text ast, text
-  end
-
 end

data/test/test_formatter.rb

@@ -41,6 +41,31 @@ class TestFormatter < Test::Unit::TestCase
     check_formatting
   end
 
+  def test_passage_with_different_chapter_and_same_verse
+    @german = '2. Petrus 1,13-2,13'
+    @english = '2 Peter 1:13-2:13'
+    check_formatting
+  end
+
+  def test_book_with_only_one_chapter
+    @german = 'Obadja 3'
+    @english = 'Obadiah 3'
+    check_formatting
+  end
+
+  def test_book_with_only_one_chapter_range
+    @german = 'Obadja 3-5'
+    @english = 'Obadiah 3-5'
+    check_formatting
+  end
+
+  def test_book_with_only_one_chapter_at_end_of_range
+    @german = 'Amos 2,4-Obadja 3'
+    @english = 'Amos 2:4-Obadiah 3'
+    check_formatting
+  end
+
+
   def test_changed_hyphen_separator
     @german = '1. Korinther 1,1 - 2. Korinther 13,13'
     @english = '1 Corinthians 1:1 - 2 Corinthians 13:13'

data/test/test_german.rb

@@ -39,11 +39,4 @@ class TestGerman < Test::Unit::TestCase
     assert_equal num, @parser.parse(str).first.b1
   end
 
-  def test_book_with_only_one_chapter
-    @parser ||= Scripref::Parser.new(Scripref::German)
-    text = 'Obad 3'
-    ast = [pass(text, 31, 1, 3, 31, 1, 3)]
-    assert_parsed_ast_for_text ast, text
-  end
-
 end

data/test/test_parser.rb

@@ -87,6 +87,38 @@ class TestParser < Test::Unit::TestCase
     assert_parsed_ast_for_text [pass(text, 8, nil, nil, 8, nil, nil)], text
   end
 
+  def test_book_with_only_one_chapter
+    text = 'Obad 3'
+    assert_parsed_ast_for_text [pass(text, 31, 1, 3, 31, 1, 3)], text
+    text = 'Obad 1,3'
+    assert_parsed_ast_for_text [pass(text, 31, 1, 3, 31, 1, 3)], text
+    text = 'Obad 1'
+    assert_parsed_ast_for_text [pass(text, 31, 1, 1, 31, 1, 1)], text
+    text = 'Obad 1,1'
+    assert_parsed_ast_for_text [pass(text, 31, 1, 1, 31, 1, 1)], text
+  end
+
+  def test_book_with_only_one_chapter_range
+    text = 'Obad 3-5'
+    assert_parsed_ast_for_text [pass(text, 31, 1, 3, 31, 1, 5)], text
+    text = 'Obad 1,3-5'
+    assert_parsed_ast_for_text [pass(text, 31, 1, 3, 31, 1, 5)], text
+    text = 'Obad 1-4'
+    assert_parsed_ast_for_text [pass(text, 31, 1, 1, 31, 1, 4)], text
+    text = 'Obad 1,1-4'
+    assert_parsed_ast_for_text [pass(text, 31, 1, 1, 31, 1, 4)], text
+  end
+
+  def test_book_with_only_one_chapter_at_end_of_range
+    text = 'Amos 2,4 - Obad 3'
+    assert_parsed_ast_for_text [pass(text, 30, 2, 4, 31, 1, 3)], text
+    text = 'Amos 2,4 - Obad 1,3'
+    assert_parsed_ast_for_text [pass(text, 30, 2, 4, 31, 1, 3)], text
+    text = 'Amos 2,4 - Obad 1'
+    assert_parsed_ast_for_text [pass(text, 30, 2, 4, 31, 1, 1)], text
+    text = 'Amos 2,4 - Obad 1,1'
+    assert_parsed_ast_for_text [pass(text, 30, 2, 4, 31, 1, 1)], text
+  end
 
   ######################################################################
   # more than one reference

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scripref
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Jan Friedrich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-02 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rim