scripref 2.0.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41762855bac59cfd4181dacab1ae3cb5d5fa879e08e841d60d9fbde5170a5f65
-  data.tar.gz: debe69c84f21f2d0af4e5ba88ddd8a0ee89c78ca449a4dc0ee302c593ecb46a0
+  metadata.gz: 1b86988fd1527cd91715024994bc47a03f0b564a74c5ebf11781e00a7a9ebe82
+  data.tar.gz: cf809a65188207a7688dfe150af32d90acb038a871c93e9e250e8a200945f68c
 SHA512:
-  metadata.gz: 40877991379c9c1d743fa68575fdc2de3d8f16984483e0b121aa306913f18f5c06af30cc0fee604ea8c2d9678989811388a8c2e12980a74ee7a390051da56345
-  data.tar.gz: b80cdba6be11573f7691913d8415a0c45874996e6050ef4f6fd91535006ffcffb2cdaa4e714b5ede4649b617abfb6a795c73b3b2d655420786fe78c574eec2f5
+  metadata.gz: b00eee0bf3b0126a320f1908e2312e4fbe86c99fa504ffc598fa709d887bc51fff6ecb140a16f25dc8897276f2717c28baa738e35dbb9869c31c2d44953154f9
+  data.tar.gz: aec528ec46bb8e7470c7ef06fac6411d4c36ccf3e3595541d07a611309a545e91404eb28c8de8e3189039a2b4be7ff04e437c023f170163a2558433a72f3bee6

data/Changelog

@@ -1,3 +1,9 @@
+2.1.1
+Use the verse separator between addon and verse when formatting.
+
+2.1.0
+Implement correct sorting for passages with addons.
+
 2.0.0
 Major release with following breaking changes:
 Rewrite Bookorder and Bookname and adapt Formatter#format accordingly.

data/Rakefile

@@ -5,6 +5,9 @@ require 'rim/version'
 Rim.setup do
   if feature_loaded? 'rim/irb'
     irb_requires %w(scripref scripref/include scripref/pipelining)
+    if File.exist?(fn = './.irb_init.rb')
+      irb_requires << fn
+    end
   end
   test_warning false
 end

data/lib/scripref/formatter.rb

@@ -103,7 +103,7 @@ module Scripref
       if v1 && (@changed || @last_v != v1)
         if ! book_has_only_one_chapter?(@pass.b1)
           case last_token
-          when Verse
+          when Verse, Addon
             push_sep verse_separator
           when Token
             push_sep cv_separator

data/lib/scripref/passage.rb

@@ -6,7 +6,7 @@ module Scripref
   Passage = Struct.new(:text, :b1, :c1, :v1, :b2, :c2, :v2, :a1, :a2, keyword_init: true) do
 
     def to_a
-      [b1, c1, v1, b2, c2, v2]
+      [b1, c1, v1, a1, b2, c2, v2, a2]
     end
 
     def == other

data/lib/scripref/sorter.rb

@@ -23,7 +23,7 @@ module Scripref
     module SortUpDown
       def signum pass1, pass2
         a, b = passage2arr(pass1), passage2arr(pass2)
-        a[0, 3] + b[3, 3] <=> b[0, 3] + a[3, 3]
+        a[0, 4] + b[4, 4] <=> b[0, 4] + a[4, 4]
       end
     end
 
@@ -43,8 +43,41 @@ module Scripref
 
     def passage2arr pass
       b1 = book2num(pass.b1)
+      c1 = pass.c1 || 1
+      v1 = pass.v1 || 1
+      a1 = case pass.a1.to_s
+           when ''
+             0
+           when 'a'
+             1
+           when 'b'
+             2
+           when 'c'
+             3
+           end
       b2 = book2num(pass.b2)
-      [b1, pass.c1 || 1, pass.v1 || 1, b2, pass.c2 || Float::INFINITY, pass.v2 || Float::INFINITY]
+      c2 = pass.c2 || Float::INFINITY
+      v2 = case pass.v2
+           when nil
+             Float::INFINITY
+           when Integer
+             pass.v2
+           when :f
+             pass.v1.to_i + 1
+           when :ff
+             pass.v1.to_i + 3
+           end
+      a2 = case pass.a2.to_s
+           when ''
+             0
+           when 'a'
+             -3
+           when 'b'
+             -2
+           when 'c'
+             -1
+           end
+      [b1, c1, v1, a1, b2, c2, v2, a2]
     end
 
   end

data/lib/scripref.rb

@@ -5,7 +5,7 @@ require 'delegate'
 
 module Scripref
 
-  VERSION = '2.0.0'
+  VERSION = '2.1.1'
 
   require_relative 'scripref/bookname'
   require_relative 'scripref/bookorder'

data/test/test_formatter.rb

@@ -238,6 +238,21 @@ class TestFormatter < Test::Unit::TestCase
     assert_formated_text_for_ast text, [pass(text: t1, b1: :Matt, c1: 3, v1: 4, b2: :Matt, c2: 3, v2: 4), semi, pass(text: t2, b1: :Matt, c1: 8, b2: :Matt, c2: 8), semi, pass(text: t3, b1: :John, c1: 3, v1: 16, b2: :John, c2: 3, v2: 16)]
   end
 
+  def test_verse_after_addon
+    text = 'Johannes 1,1-3.1-3a.1-3b.1a-3.1b-3.1a-3a.1a-3b'
+    ast = [
+      pass(b1: :John, c1: 1, v1: 1, b2: :John, c2: 1, v2: 3), dot,
+      pass(b1: :John, c1: 1, v1: 1, b2: :John, c2: 1, v2: 3, a2: :a), dot,
+      pass(b1: :John, c1: 1, v1: 1, b2: :John, c2: 1, v2: 3, a2: :b), dot,
+      pass(b1: :John, c1: 1, v1: 1, b2: :John, c2: 1, v2: 3, a1: :a), dot,
+      pass(b1: :John, c1: 1, v1: 1, b2: :John, c2: 1, v2: 3, a1: :b), dot,
+      pass(b1: :John, c1: 1, v1: 1, b2: :John, c2: 1, v2: 3, a1: :a, a2: :a), dot,
+      pass(b1: :John, c1: 1, v1: 1, b2: :John, c2: 1, v2: 3, a1: :a, a2: :b)
+    ]
+    assert_formated_text_for_ast text, ast
+  end
+
+
   ######################################################################
   # complex variants of references
   ######################################################################

data/test/test_processor.rb

@@ -83,7 +83,7 @@ class TestProcessorVariousContexts < Test::Unit::TestCase
   def test_verse_addon_or_postfix
     text = 'Mt 1,1a'
     processor = Processor.new(text, German)
-    ast = [[pass(text: text, b1: :Matt, c1: 1, v1: 1, b2: :Matt, c2: 1, v2: 1, a1: 'a')]]
+    ast = [[pass(text: text, b1: :Matt, c1: 1, v1: 1, b2: :Matt, c2: 1, v2: 1, a1: :a)]]
     assert_equal ast, processor.each.to_a
     text = 'Mt 1,1f'
     processor = Processor.new(text, German)
@@ -98,7 +98,7 @@ class TestProcessorVariousContexts < Test::Unit::TestCase
   def test_verse_addon_or_postfix_for_books_with_only_one_chapter
     text = '2. Joh 5b'
     processor = Processor.new(text, German)
-    ast = [[pass(text: text, b1: :'2John', c1: 1, v1: 5, b2: :'2John', c2: 1, v2: 5, a1: 'b')]]
+    ast = [[pass(text: text, b1: :'2John', c1: 1, v1: 5, b2: :'2John', c2: 1, v2: 5, a1: :b)]]
     assert_equal ast, processor.each.to_a
     text = '2. Joh 5f'
     processor = Processor.new(text, German)

data/test/test_sorter.rb

@@ -3,46 +3,86 @@
 
 require_relative 'test_helper'
 
-class TestSorter < Test::Unit::TestCase
-
-  include Scripref
-  include Test::Helper
-
-  def setup
-    @john_1 = pass(b1: :John, c1: 1, b2: :John, c2: 1)
-    @john_1_1_3 = pass(b1: :John, c1: 1, v1: 1, b2: :John, c2: 1, v2: 3)
-    @john_1_1_18 = pass(b1: :John, c1: 1, v1: 1, b2: :John, c2: 1, v2: 18)
-    @john_2 = pass(b1: :John, c1: 2, b2: :John, c2: 2)
-    @heb_9 = pass(b1: :Heb, c1: 9, b2: :Heb, c2: 9)
-    @jas_1 = pass(b1: :Jas, c1: 1, b2: :Jas, c2: 1)
-    @pet_1 = pass(b1: :'1Pet', c1: 1, b2: :'1Pet', c2: 1)
-  end
+module TestSorter
 
-  def test_canonical_default
-    sorter = Sorter.new(Bookorder::Canonical)
-    assert_equal [@john_1, @heb_9, @jas_1, @pet_1], sorter.sort([@heb_9, @pet_1, @jas_1, @john_1])
-    assert_equal [@john_1_1_18, @john_1_1_3], sorter.sort([@john_1_1_3, @john_1_1_18])
-    assert_equal [@john_1, @john_1_1_18, @john_1_1_3, @john_2], sorter.sort([@john_1, @john_1_1_3, @john_2, @john_1_1_18])
-  end
+  class TestBookordering < Test::Unit::TestCase
 
-  def test_canonical_sort_up_up
-    sorter = Sorter.new(Bookorder::Canonical, Sorter::SortUpUp)
-    assert_equal [@john_1_1_3, @john_1_1_18], sorter.sort([@john_1_1_3, @john_1_1_18])
-    assert_equal [@john_1_1_3, @john_1_1_18, @john_1, @john_2], sorter.sort([@john_1, @john_1_1_3, @john_2, @john_1_1_18])
-  end
+    include Scripref
+    include Test::Helper
+
+    def setup
+      @john_1 = pass(b1: :John, c1: 1, b2: :John, c2: 1)
+      @john_1_1_3 = pass(b1: :John, c1: 1, v1: 1, b2: :John, c2: 1, v2: 3)
+      @john_1_1_18 = pass(b1: :John, c1: 1, v1: 1, b2: :John, c2: 1, v2: 18)
+      @john_2 = pass(b1: :John, c1: 2, b2: :John, c2: 2)
+      @heb_9 = pass(b1: :Heb, c1: 9, b2: :Heb, c2: 9)
+      @jas_1 = pass(b1: :Jas, c1: 1, b2: :Jas, c2: 1)
+      @pet_1 = pass(b1: :'1Pet', c1: 1, b2: :'1Pet', c2: 1)
+    end
+
+    def test_canonical_default
+      sorter = Sorter.new(Bookorder::Canonical)
+      assert_equal [@john_1, @heb_9, @jas_1, @pet_1], sorter.sort([@heb_9, @pet_1, @jas_1, @john_1])
+      assert_equal [@john_1_1_18, @john_1_1_3], sorter.sort([@john_1_1_3, @john_1_1_18])
+      assert_equal [@john_1, @john_1_1_18, @john_1_1_3, @john_2], sorter.sort([@john_1, @john_1_1_3, @john_2, @john_1_1_18])
+    end
+
+    def test_canonical_sort_up_up
+      sorter = Sorter.new(Bookorder::Canonical, Sorter::SortUpUp)
+      assert_equal [@john_1_1_3, @john_1_1_18], sorter.sort([@john_1_1_3, @john_1_1_18])
+      assert_equal [@john_1_1_3, @john_1_1_18, @john_1, @john_2], sorter.sort([@john_1, @john_1_1_3, @john_2, @john_1_1_18])
+    end
+
+    def test_luther_default
+      sorter = Sorter.new(Bookorder::Luther)
+      assert_equal [@john_1, @pet_1, @heb_9, @jas_1], sorter.sort([@heb_9, @pet_1, @jas_1, @john_1])
+      assert_equal [@john_1_1_18, @john_1_1_3], sorter.sort([@john_1_1_3, @john_1_1_18])
+      assert_equal [@john_1, @john_1_1_18, @john_1_1_3, @john_2], sorter.sort([@john_1, @john_1_1_3, @john_2, @john_1_1_18])
+    end
+
+    def test_luther_sort_up_up
+      sorter = Sorter.new(Bookorder::Luther, Sorter::SortUpUp)
+      assert_equal [@john_1, @pet_1, @heb_9, @jas_1], sorter.sort([@heb_9, @pet_1, @jas_1, @john_1])
+      assert_equal [@john_1_1_3, @john_1_1_18], sorter.sort([@john_1_1_3, @john_1_1_18])
+      assert_equal [@john_1_1_3, @john_1_1_18, @john_1, @john_2], sorter.sort([@john_1, @john_1_1_3, @john_2, @john_1_1_18])
+    end
 
-  def test_luther_default
-    sorter = Sorter.new(Bookorder::Luther)
-    assert_equal [@john_1, @pet_1, @heb_9, @jas_1], sorter.sort([@heb_9, @pet_1, @jas_1, @john_1])
-    assert_equal [@john_1_1_18, @john_1_1_3], sorter.sort([@john_1_1_3, @john_1_1_18])
-    assert_equal [@john_1, @john_1_1_18, @john_1_1_3, @john_2], sorter.sort([@john_1, @john_1_1_3, @john_2, @john_1_1_18])
   end
 
-  def test_luther_sort_up_up
-    sorter = Sorter.new(Bookorder::Luther, Sorter::SortUpUp)
-    assert_equal [@john_1, @pet_1, @heb_9, @jas_1], sorter.sort([@heb_9, @pet_1, @jas_1, @john_1])
-    assert_equal [@john_1_1_3, @john_1_1_18], sorter.sort([@john_1_1_3, @john_1_1_18])
-    assert_equal [@john_1_1_3, @john_1_1_18, @john_1, @john_2], sorter.sort([@john_1, @john_1_1_3, @john_2, @john_1_1_18])
+  class TestNumberordering < Test::Unit::TestCase
+
+    include Scripref
+    include Test::Helper
+
+    def setup
+      @sorter = Sorter.new(Bookorder::Canonical)
+    end
+
+    def test_sort_with_addons
+      f = Formatter.new(German, abbrev_level: 1)
+      ref = [
+        pass(b1: :John, c1: 1, v1: 1, b2: :John, c2: 1, v2: 3),
+        pass(b1: :John, c1: 1, v1: 1, b2: :John, c2: 1, v2: 3, a2: :b),
+        pass(b1: :John, c1: 1, v1: 1, b2: :John, c2: 1, v2: 3, a2: :a),
+        pass(b1: :John, c1: 1, v1: 1, b2: :John, c2: 1, v2: 3, a1: :a),
+        pass(b1: :John, c1: 1, v1: 1, b2: :John, c2: 1, v2: 3, a1: :a, a2: :b),
+        pass(b1: :John, c1: 1, v1: 1, b2: :John, c2: 1, v2: 3, a1: :a, a2: :a),
+        pass(b1: :John, c1: 1, v1: 1, b2: :John, c2: 1, v2: 3, a1: :b)
+      ]
+      assert_equal ref, @sorter.sort(ref)
+      assert_equal ref, @sorter.sort(ref.reverse)
+    end
+
+    def test_sort_with_addon_and_postfix
+      p = Parser.new(German)
+      pass1 = p.parse('Spr 25,6f').first
+      pass2 = p.parse('Spr 25,6b-7').first
+      assert_equal -1, @sorter.signum(pass1, pass2)
+      assert_equal 1, @sorter.signum(pass2, pass1)
+      assert_equal [pass1, pass2], @sorter.sort([pass1, pass2])
+      assert_equal [pass1, pass2], @sorter.sort([pass2, pass1])
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scripref
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Jan Friedrich