bible_ref 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b66f31665e878b3a71f4c334f43ed5a26c972f15989e8569fab62aa557df191
-  data.tar.gz: 9e7d5a746bf49b140963dfcc945eeaee58fcf68633828892447519841d656f5f
+  metadata.gz: bde7acf78ffcc07b248065b3cd2ec9d32a3bc91f3e3bdd3f1d9ded76d826c15d
+  data.tar.gz: 3213de8717c20091ff98a89efdcd6bf69d4239d19a97afc7286d6aa0f0322fe7
 SHA512:
-  metadata.gz: 460cb9fc1df0ae490c46607ed010b21986d636dc63c2a5783ca3343589a58351570c15df9deca603a309108ca59ac74c70b89e994da1e45eec939f648fb2b27f
-  data.tar.gz: 88462cdbb3dc94dc66c1470455ea5b0de6605da4d1df45a2b1be761fc7ee2262aa8558173df036686f1f8bc2ab329995b7bf64e430bc411bae982591b3032154
+  metadata.gz: 936aee7bb8e169a10a1d6926f8a56ab26ce05681e37d027afee499fb08cbfacd2e2ef410ff48deea6d2fae550d7ed7a409528f8207be9a97af7d31b0bf9182a6
+  data.tar.gz: db1a2089508ceb4cee78c7824b6c883549b12979cdd2d32eb9f383848b01cd960be2af4ec4ba7d341f8ace5731dc4fb2b954c7610cbc22b87e3c642d5956fa66

data/README.md

@@ -53,6 +53,11 @@ verses = ranges.map do |from_ref, to_ref|
 end
 ```
 
+## Note
+
+When searching a book that contains a single chapter (ie. Obadiah, Philemon, Jude, 2 John, 3 John), you can use either Jude 1 or Jude 1:1 to retrieve verse 1.
+This is quite different from searching a book with multiple chapters.  **John 1** will return all of chapter 1, where as **Jude 1** only returns the first verse.
+
 ## Copyright
 
 Copyright [Tim Morgan](http://timmorgan.org). Licensed MIT.

data/lib/bible_ref/languages/base.rb

@@ -5,6 +5,11 @@ module BibleRef
         fail NotImplementedError, "You must override #books in your language class."
       end
 
+      # Is it a single chapter book?
+      def has_single_chapter?(reference)
+        fail NotImplementedError, "You must override #has_single_chapter? in your language class."
+      end
+
       def book_id(book_name, canon)
         book_name = replace_roman_numerals(book_name)
         return book_name.upcase if books[book_name.upcase] # already normalized

data/lib/bible_ref/languages/cherokee.rb

@@ -4,6 +4,13 @@ require_relative 'base'
 module BibleRef
   module Languages
     class Cherokee < Base
+
+      # Is it a single chapter book?
+      def has_single_chapter?(reference)
+          matches = ['ᏉᎳ ᏆᎵᎹᏂ ᎤᏬᏪᎳᏁᎸᎯ', 'ᏣᏂ ᏔᎵᏁ ᎤᏬᏪᎳᏅᎯ', 'ᏣᏂ ᏦᎢᏁ ᎤᏬᏪᎳᏅᎯ', 'ᏧᏓᏏ ᎤᏬᏪᎳᏅᎯ']
+          return matches.any? { |e| reference.include?(e)  }
+      end
+
       def books
         {
           'MAT' => { name: 'ᎣᏍᏛ ᎧᏃᎮᏛ ᎹᏚ ᎤᏬᏪᎳᏅᎯ' },

data/lib/bible_ref/languages/english.rb

@@ -4,6 +4,13 @@ require_relative 'base'
 module BibleRef
   module Languages
     class English < Base
+
+      # Is it a single chapter book?
+      def has_single_chapter?(reference)
+          matches = [/^ob/, /^(jude|jd(?!th)|jud(?!ith))/, /^2 ?jo?h?n/, /^3 ?jo?h?n/, /^ph(i?l|m)/]
+          return Regexp.union(matches).match?(reference.downcase)
+      end
+
       def books
         {
           'GEN' => { match: /^gen/,              name: 'Genesis'                },

data/lib/bible_ref/languages/latin.rb

@@ -4,6 +4,12 @@ require_relative 'base'
 module BibleRef
   module Languages
     class Latin < Base
+      # Is it a single chapter book?
+      def has_single_chapter?(reference)
+        matches = ['Abdias', 'ad Philemonem', 'Joannis II', 'Joannis III', 'Judæ']
+        return matches.any? { |e| reference.include?(e)  }
+      end
+
       def books
         {
           'GEN' => { name: 'Genesis' },

data/lib/bible_ref/languages/portuguese.rb

@@ -4,6 +4,13 @@ require_relative 'base'
 module BibleRef
   module Languages
     class Portuguese < Base
+
+      # Is it a single chapter book?
+      def has_single_chapter?(reference)
+          matches = [/^ob/, /^jud/, /^2 jo/, /^3 jo/, /^fil/]
+          return Regexp.union(matches).match?(reference.downcase)
+      end
+
       def books
         {
           'GEN' => { match: /^g[eê]n/,          name: 'Gênesis'           },

data/lib/bible_ref/languages/romanian.rb

@@ -4,6 +4,13 @@ require_relative 'base'
 module BibleRef
   module Languages
     class Romanian < Base
+
+      # Is it a single chapter book?
+      def has_single_chapter?(reference)
+          matches = [/^ob/, /^iud/, /^2 io/, /^3 io/, /^fil/]
+          return Regexp.union(matches).match?(reference.downcase)
+      end
+
       def books
         {
           'GEN' => { match: /^gen/,             name: 'Geneza'                },

data/lib/bible_ref/reference.rb

@@ -8,10 +8,11 @@ module BibleRef
 
     # Create a new Reference instance by passing in the user-supplied bible reference as a string.
     def initialize(reference, language: 'eng', canon: 'all')
-      @reference = reference
-      @details = parse
       @language = language.respond_to?(:book_id) ? language : LANGUAGES.fetch(language.to_s).new
       @canon = canon.respond_to?(:books) ? canon : CANONS.fetch(canon.to_s).new
+      @reference = reference
+      standardize_reference()
+      @details = parse
     end
 
     # Returns an array of pairs, each one being the from and to for a range.
@@ -22,7 +23,6 @@ module BibleRef
     def ranges
       return nil unless valid?
       @chapter = nil
-      fix_chapter_for_jude if book_id == 'JUD'
       [@details[:refs]].flatten.map do |ref|
         normalize_range(ref) || normalize_ref(ref)
       end
@@ -75,6 +75,19 @@ module BibleRef
       end
     end
 
+    # standardize the reference so it can be handed to the parser.
+    def standardize_reference
+        return @reference unless @language.has_single_chapter?(@reference)
+        return @reference if @reference.include? ':'
+
+        matches = @reference.match(/^([\d]?[\D\s]*)/)
+        return @reference if matches.length() == 0
+
+        book = matches[0].strip
+        requested = @reference.sub(book, '').strip
+        @reference = "#{book} 1:#{requested}"
+    end
+
     def parse
       begin
         parsed = Parser.new.parse(@reference)
@@ -102,23 +115,5 @@ module BibleRef
       end
     end
 
-    def fix_chapter_for_jude
-      (start, finish) = @details[:refs]
-      finish ||= start
-      @details[:refs] = [
-        {
-          range: {
-            from: {
-              chapter: 1,
-              verse: start[:chapter]
-            },
-            to: {
-              chapter: 1,
-              verse: finish[:chapter]
-            }
-          }
-        }
-      ]
-    end
   end
 end

data/lib/bible_ref/version.rb

@@ -1,3 +1,3 @@
 module BibleRef
-  VERSION = '1.4.0'
+  VERSION = '1.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bible_ref
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Tim Morgan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-16 00:00:00.000000000 Z
+date: 2020-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet