scripref 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5799e584189e442c2d2f4c5dbf56ae36e26a461280ac94f656527897d0995dab
-  data.tar.gz: 68e9ab8f3c1422eb2cc77a1d81e66390711b616b981556af1c9bd1ddf10d82f2
+  metadata.gz: e94d9ac076852eecdb1678b74a3ce57335ac2bdddf72103a9ccd07180d5391bf
+  data.tar.gz: 5149ff60646c8ec4284eb6ed82457b65032b901a6d8621d746ec5fe4ffc145fa
 SHA512:
-  metadata.gz: db67b8fc06cea9e737b7cbc89b7f0e26fb2c9604da8dbdb7dd871a3ea38c1ce2df6d154cdd7b6c74fd3e3be42ca870c59ff63f36a9f3f320e249f387995f2936
-  data.tar.gz: 6f65fe7594467f62542022e560f7f873f69dc2b7d0758cc8eca048583d16c59fec351803c9256be26834a52abd6184c2f908e28fd217cea5191364691431bdb4
+  metadata.gz: 66e9c0fd63d8c6b651e3a7436e01b0b1973cdd51f98ea644e72d568596631d0287814b7b24ae3e007210c0aa5df0091db2774bcbd5ef1e771ae9d6d0f25ac08c
+  data.tar.gz: 7d17267a34064323d23aaf8f3ca2da04f132b50c27180d758f22591f1bd922e99ae53156be7f125822cbcd98510e9be068436f416d5c9314f06424163bdbc830

data/Changelog

@@ -1,3 +1,9 @@
+1.2.0
+Extend German abbreviations.
+
+1.1.2
+Fix bug in Formatter with books with only one chapter.
+
 1.1.1
 Fix Bookname#to_s and add license to gemspec.
 

data/lib/scripref/english.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 # frozen_string_literal: true
 
-require 'scripref/const_reader'
+require_relative 'const_reader'
 
 module Scripref
 

data/lib/scripref/formatter.rb

@@ -109,7 +109,12 @@ module Scripref
             push_sep cv_separator
           end
         else
-          push_space
+          case last_token
+          when Verse
+            push_sep verse_separator
+          else
+            push_space
+          end
         end
         push_verse v1
         @last_v = v1

data/lib/scripref/german.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 # frozen_string_literal: true
 
-require 'scripref/const_reader'
+require_relative 'const_reader'
 
 module Scripref
 
@@ -26,9 +26,8 @@ module Scripref
       Hohel|Hoh|Hl, Jes, Jer, Klag, Hes, Dan, Hos, Joel, Amos|Am, Obad|Ob,
       Jona|Jon, Mich|Mi, Nah, Hab, Zef, Hag, Sach, Mal, Mat|Mt, Mar|Mr, Luk|Lk,
       Joh|Jh, Apg, Röm|Rö, 1. Kor|1Ko, 2. Kor|2Ko, Gal, Eph, Phil, Kol,
-      1. Thes|1Thes|1Th, 2. Thes|2Thes|2Th, 1. Tim|1Tim, 2. Tim|2Tim, Tit, Philem|Phm, Heb,
-      Jak, 1. Pet|1Pet|1Pe, 2. Pet|2Pet|2Pe, 1. Joh|1Joh|1Jo, 2. Joh|2Joh|2Jo,
-      3. Joh|3Joh|3Jo, Jud, Off
+      1. Thes|1.Thes|1Thes|1Th, 2. Thes|2.Thes|2Thes|2Th, 1. Tim|1Tim, 2. Tim|2Tim, Tit, Philem|Phm, Heb, Jak, 1. Pet|1Pet|1Pe, 2. Pet|2Pet|2Pe, 1.
+      Joh|1Joh|1Jo, 2. Joh|2Joh|2Jo, 3. Joh|3Joh|3Jo, Jud, Off
     END
 
     # Array of book names.

data/lib/scripref/include.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # frozen_string_literal: true
 
-require 'scripref'
+require_relative '../scripref'
 
 include Scripref

data/lib/scripref/parser.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 # frozen_string_literal: false
 
-require 'scripref/basic_methods'
+require_relative 'basic_methods'
 require 'strscan'
 
 module Scripref

data/lib/scripref/processor.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
 # frozen_string_literal: true
 
+require_relative 'basic_methods'
 require 'strscan'
-require 'scripref/basic_methods'
 
 module Scripref
 

data/lib/scripref.rb

@@ -5,16 +5,16 @@ require 'delegate'
 
 module Scripref
 
-  VERSION = '1.1.1'
-
-  autoload :Bookname, 'scripref/bookname'
-  autoload :Bookorder, 'scripref/bookorder'
-  autoload :English, 'scripref/english'
-  autoload :Formatter, 'scripref/formatter'
-  autoload :German, 'scripref/german'
-  autoload :Parser, 'scripref/parser'
-  autoload :Passage, 'scripref/passage'
-  autoload :Processor, 'scripref/processor'
+  VERSION = '1.2.0'
+
+  require_relative 'scripref/bookname'
+  require_relative 'scripref/bookorder'
+  require_relative 'scripref/english'
+  require_relative 'scripref/formatter'
+  require_relative 'scripref/german'
+  require_relative 'scripref/parser'
+  require_relative 'scripref/passage'
+  require_relative 'scripref/processor'
 
   class Token < DelegateClass(String)
     def initialize *args

data/regtest/formatter.rb

@@ -1,6 +1,9 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
 require 'ostruct'
 require 'regtest'
-require 'scripref'
+require_relative '../lib/scripref'
 
 include Scripref
 

data/regtest/parser.rb

@@ -1,5 +1,8 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
 require 'regtest'
-require 'scripref'
+require_relative '../lib/scripref'
 
 include Scripref
 

data/regtest/processor.rb

@@ -1,5 +1,8 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
 require 'regtest'
-require 'scripref'
+require_relative '../lib/scripref'
 
 include Scripref
 

data/test/test_bookname.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 # frozen_string_literal: true
 
-require 'test_helper'
+require_relative 'test_helper'
 
 class TestBookname < Test::Unit::TestCase
 

data/test/test_english.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 # frozen_string_literal: true
 
-require 'test_helper'
+require_relative 'test_helper'
 
 class TestEnglish < Test::Unit::TestCase
 

data/test/test_formatter.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 # frozen_string_literal: true
 
-require 'test_helper'
+require_relative 'test_helper'
 
 class TestFormatter < Test::Unit::TestCase
 
@@ -168,6 +168,11 @@ class TestFormatter < Test::Unit::TestCase
     assert_formated_text_for_ast text, [pass(text: t1, b1: :Ruth, c1: 2, v1: 5, b2: :Ruth, c2: 2, v2: 5), semi, pass(text: t2, b1: :Mark, c1: 4, b2: :Mark, c2: 4)]
   end
 
+  def test_two_refs_with_book_with_only_one_chapter
+    text = 'Obadja 3.5'
+    assert_formated_text_for_ast text, [pass(text: text, b1: :Obad, c1: 1, v1: 3, b2: :Obad, c2: 1, v2: 3), pass(b1: :Obad, c1: 1, v1: 5, b2: :Obad, c2: 1, v2: 5)]
+  end
+
   ######################################################################
   # mixed variants of more than one passage
   ######################################################################

data/test/test_german.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 # frozen_string_literal: true
 
-require 'test_helper'
+require_relative 'test_helper'
 
 class TestGerman < Test::Unit::TestCase
 

data/test/test_helper.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 # frozen_string_literal: true
 
-require 'scripref'
+require_relative '../lib/scripref'
 require 'test/unit'
 
 module Test::Helper

data/test/test_integration.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 # frozen_string_literal: true
 
-require 'test_helper'
+require_relative 'test_helper'
 
 class TestIntegration < Test::Unit::TestCase
 

data/test/test_parser.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 # frozen_string_literal: true
 
-require 'test_helper'
+require_relative 'test_helper'
 
 class TestParser < Test::Unit::TestCase
 

data/test/test_passage.rb

@@ -1,7 +1,8 @@
 # encoding: utf-8
-require 'test_helper'
 # frozen_string_literal: true
 
+require_relative 'test_helper'
+
 class TestPassage < Test::Unit::TestCase
 
   include Scripref

data/test/test_pipelining.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 # frozen_string_literal: true
 
-require 'test_helper'
+require_relative 'test_helper'
 
 class TestPipelining < Test::Unit::TestCase
 
@@ -17,7 +17,7 @@ class TestPipelining < Test::Unit::TestCase
   end
 
   def test_left_to_right
-    require 'scripref/pipelining'
+    require_relative '../lib/scripref/pipelining'
     text = 'Hebräer 13,8'
     parser = Parser.new(German)
     formatter = Formatter.new(English)

data/test/test_processor.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 # frozen_string_literal: true
 
-require 'test_helper'
+require_relative 'test_helper'
 
 class TestProcessorIterators < Test::Unit::TestCase
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: scripref
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
-original_platform: ''
 authors:
 - Jan Friedrich
 bindir: bin
 cert_chain: []
-date: 2024-11-30 00:00:00.000000000 Z
+date: 2025-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -111,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.0.dev
+rubygems_version: 3.7.0.dev
 specification_version: 4
 summary: Library for parsing scripture references in real texts.
 test_files: []