scripref 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18851c425f1c4a9504ede784a43a46d80a668c9059bc000d6f866b6ce3a5ffe2
-  data.tar.gz: e7cdaa42c34785fd755dc747247ea100ca757c9fed062cca691060c8c5288c3b
+  metadata.gz: 307a7c3809c70de6386b29d42030f15f11500fbbcb4610eda7ce3316a10413d9
+  data.tar.gz: bf6c3dbe9bf855fdc9be762e5aca9e356b586276341e1b770506e0ae39aeaf69
 SHA512:
-  metadata.gz: 01c5874544e15524587022c02e5e3002fa170f07889248f1937410671f94e03db239ec8fd5cfd47db8dee687c7b41b9ba56a4fb8fd12ebffb6f050b3a64eb2c3
-  data.tar.gz: 1745d52b620f5b71e9f12627a9b797f668f160e914de8869ab05c692218b87567aa08ff4eae6b2d04e9cad36dd43c1d868d5c8ac4f4b47cfcfeb19e41eea1063
+  metadata.gz: 10045f4c2a5b3faae38ace17eab90c256ad1bfdb01ffea1dafc9bb8b0e58617c38c1eff92d8ab9f06b54efb8cd6b671e417667f6cc68efac5d994988a9561e7e
+  data.tar.gz: 6a5eb88141c66149b450ff9eb847475fd5f446050520bb9b7cce2dac99dd3d6a74b4e38a7a815e5a07663673435fe156e6630830e8ae47e6ae030c460d2e3a9b

data/Changelog

@@ -1,3 +1,9 @@
+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.
+
 1.1.0
 Adapt German abbreviations.
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2017 Jan Friedrich
+Copyright (c) 2010-2018, 2020, 2024 Jan Friedrich
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/scripref/bookname.rb

@@ -22,7 +22,7 @@ module Scripref
     end
 
     def to_s
-      @osis_id
+      @osis_id.to_s
     end
 
     alias to_str to_s

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
 

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.0'
-
-  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.1.2'
+
+  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/scripref.gemspec

@@ -7,6 +7,7 @@ Gem::Specification.new do |s|
   s.version = Scripref::VERSION
   s.authors = 'Jan Friedrich'
   s.email = 'janfri26@gmail.com'
+  s.license = 'MIT'
 
   s.homepage = 'https://github.com/janfri/scripref'
   s.metadata = {

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
 
@@ -32,21 +32,21 @@ class TestGerman < Test::Unit::TestCase
     assert_match book_re, 'Off'
   end
 
-  def test_book2num
-    assert_book_num :Gen, '1. Mose'
-    assert_book_num :Matt, 'Matthäus'
-    assert_book_num :Rev, 'Offenbarung'
-    assert_book_num :Gen, '1. Mo'
-    assert_book_num :Gen, '1.Mo'
-    assert_book_num :Gen, '1M'
-    assert_book_num :Matt, 'Mat'
-    assert_book_num :Phil, 'Phil'
-    assert_book_num :Rev, 'Off'
+  def test_book2osis_id
+    assert_osis_book_id :Gen, '1. Mose'
+    assert_osis_book_id :Matt, 'Matthäus'
+    assert_osis_book_id :Rev, 'Offenbarung'
+    assert_osis_book_id :Gen, '1. Mo'
+    assert_osis_book_id :Gen, '1.Mo'
+    assert_osis_book_id :Gen, '1M'
+    assert_osis_book_id :Matt, 'Mat'
+    assert_osis_book_id :Phil, 'Phil'
+    assert_osis_book_id :Rev, 'Off'
   end
 
-  def assert_book_num num, str
+  def assert_osis_book_id id, str
     @parser ||= Scripref::Parser.new(Scripref::German)
-    assert_equal num, @parser.parse(str).first.b1
+    assert_equal id, @parser.parse(str).first.b1
   end
 
 end

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.0
+  version: 1.1.2
 platform: ruby
-original_platform: ''
 authors:
 - Jan Friedrich
 bindir: bin
 cert_chain: []
-date: 2024-11-14 00:00:00.000000000 Z
+date: 2025-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -92,7 +91,8 @@ files:
 - test/test_pipelining.rb
 - test/test_processor.rb
 homepage: https://github.com/janfri/scripref
-licenses: []
+licenses:
+- MIT
 metadata:
   homepage_uri: https://github.com/janfri/scripref
   source_code_uri: https://github.com/janfri/scripref
@@ -110,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: []