bible_ref 1.1.4 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60e2dfcac1d655696dae057ac1c3b0a1d946d30aa3227eeecca5f6857622276c
-  data.tar.gz: f5100ac7b741b9fb57baecea60581b1b61e65a18891e9a3271840ebb73ce2966
+  metadata.gz: 28631c2deed7edc4e9d018a03e9cbce155028deeaa8d5149b8a1e57bf1812a21
+  data.tar.gz: d66be495db2c250116a6988e40752db5c18ed9ab4143572f3843a21be959a9ad
 SHA512:
-  metadata.gz: b776331cbf41a6dcc3a9be38945cf08b003246c258bebce377a23d5338529ef01ec73cc3f0c8abb1d0aa8234da1f6b8604ae613b6d94afd29f9f048dc3e53030
-  data.tar.gz: ca2d55457a2783c8bce2a0df58267d1142fc3cca1c08c64f828da67c6a1dc7144c724c6f2abdf96e8370308e087c6ee5695f3e7d84a2cf0ab0faba43940993b4
+  metadata.gz: 320349a57e409a9af89a6ce807c7ce87bdf693a51105e2eb65c895192419d48c628915e3c96ab8878c5eeedd420e9e2b2f05057620aceafbd0df5545450e716e
+  data.tar.gz: 750fc6c150ea10c2493c0944cc4e10c203e56b89abf5284fca6fbe880afce0e6f839f3589b0fa3a07aefcdab55df5009b1a94502ea9a03e3e2d06af6349f3f16

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/canons.rb

@@ -1,7 +1,8 @@
 require_relative 'canons/protestant'
-
+require_relative 'canons/all'
 module BibleRef
   CANONS = {
-    'protestant' => Canons::Protestant
+    'protestant' => Canons::Protestant,
+    'all' => Canons::All
   }
 end

data/lib/bible_ref/canons/all.rb

@@ -0,0 +1,15 @@
+module BibleRef
+  module Canons
+    class All
+      def books
+        %w(
+          GEN EXO LEV NUM DEU JOS JDG RUT 1SA 2SA 1KI 2KI 1CH 2CH EZR NEH EST JOB
+          PSA PRO ECC SNG ISA JER LAM EZK DAN HOS JOL AMO OBA JON MIC NAM HAB ZEP HAG
+          ZEC MAL TOB JDT ESG WIS SIR BAR LJE S3Y SUS BEL 1MA 2MA 1ES MAN PS2 3MA 2ES
+          4MA MAT MRK LUK JHN ACT ROM 1CO 2CO GAL EPH PHP COL 1TH 2TH 1TI 2TI TIT PHM
+          HEB JAS 1PE 2PE 1JN 2JN 3JN JUD REV
+        )
+      end
+    end
+  end
+end

data/lib/bible_ref/languages.rb

@@ -1,5 +1,6 @@
 require_relative 'languages/cherokee'
 require_relative 'languages/english'
+require_relative 'languages/latin'
 require_relative 'languages/portuguese'
 require_relative 'languages/romanian'
 
@@ -7,7 +8,8 @@ module BibleRef
   LANGUAGES = {
     'chr' => Languages::Cherokee,
     'eng' => Languages::English,
+    'lat' => Languages::Latin,
     'por' => Languages::Portuguese,
     'ron' => Languages::Romanian
-  }
+  }.freeze
 end

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
@@ -12,9 +17,9 @@ module BibleRef
           details = books[book]
           next if details.nil?
           if (match = details[:match])
-            return book if book_name =~ match
+            return book if book_name.downcase =~ match
           else
-            return book if book_name == details[:name]
+            return book if book_name.downcase == details[:name].downcase
           end
         end
         nil

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)(?!ges))/, /^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'                },
@@ -46,7 +53,7 @@ module BibleRef
           'ZEC' => { match: /^zec/,              name: 'Zechariah'              },
           'MAL' => { match: /^mal/,              name: 'Malachi'                },
           'TOB' => { match: /^tob/,              name: 'Tobit'                  },
-          'JDT' => { match: /^(jud|jdt)/,        name: 'Judith'                 },
+          'JDT' => { match: /^(jth|jdth?|judith)/, name: 'Judith'                 },
           'ESG' => { match: /^(est.*greek|esg)/, name: 'Esther (Greek)'         },
           'WIS' => { match: /^wis(dom)?/,        name: 'Wisdom of Solomon'      },
           'SIR' => { match: /^sir/,              name: 'Sirach'                 },
@@ -64,7 +71,7 @@ module BibleRef
           '2ES' => { match: /^2 ?esd?/,          name: '2 Esdras'               },
           '4MA' => { match: /^4 ?mac?/,          name: '4 Maccabees'            },
           'MAT' => { match: /^mat/,              name: 'Matthew'                },
-          'MRK' => { match: /^ma?rk/,            name: 'Mark'                   },
+          'MRK' => { match: /^(ma?rk|mk)/,       name: 'Mark'                   },
           'LUK' => { match: /^lu?k/,             name: 'Luke'                   },
           'JHN' => { match: /^(john|jn|jhn)/,    name: 'John'                   },
           'ACT' => { match: /^act/,              name: 'Acts'                   },
@@ -88,7 +95,7 @@ module BibleRef
           '1JN' => { match: /^1 ?jo?h?n/,        name: '1 John'                 },
           '2JN' => { match: /^2 ?jo?h?n/,        name: '2 John'                 },
           '3JN' => { match: /^3 ?jo?h?n/,        name: '3 John'                 },
-          'JUD' => { match: /^jud/,              name: 'Jude'                   },
+          'JUD' => { match: /^(jud$|jd$|jude$)/, name: 'Jude'                   },
           'REV' => { match: /^re?v/,             name: 'Revelation'             }
         }
       end

data/lib/bible_ref/languages/latin.rb

@@ -0,0 +1,85 @@
+# -*- coding: utf-8 -*-
+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' },
+          'EXO' => { name: 'Exodus' },
+          'LEV' => { name: 'Leviticus' },
+          'NUM' => { name: 'Numeri' },
+          'DEU' => { name: 'Deuteronomium' },
+          'JOS' => { name: 'Josue' },
+          'JDG' => { name: 'Judicum' },
+          'RUT' => { name: 'Ruth' },
+          '1SA' => { name: 'Regum I' },
+          '2SA' => { name: 'Regum II' },
+          '1KI' => { name: 'Regum III' },
+          '2KI' => { name: 'Regum IV' },
+          '1CH' => { name: 'Paralipomenon I' },
+          '2CH' => { name: 'Paralipomenon II' },
+          'EZR' => { name: 'Esdræ' },
+          'NEH' => { name: 'Nehemiæ' },
+          'EST' => { name: 'Tobiæ' },
+          'JOB' => { name: 'Job' },
+          'PSA' => { name: 'Psalmi' },
+          'PRO' => { name: 'Proverbia' },
+          'ECC' => { name: 'Ecclesiastes' },
+          'SNG' => { name: 'Canticum Canticorum' },
+          'ISA' => { name: 'Isaias' },
+          'JER' => { name: 'Jeremias' },
+          'LAM' => { name: 'Lamentationes' },
+          'EZK' => { name: 'Ezechiel' },
+          'DAN' => { name: 'Daniel' },
+          'HOS' => { name: 'Osee' },
+          'JOL' => { name: 'Joël' },
+          'AMO' => { name: 'Amos' },
+          'OBA' => { name: 'Abdias' },
+          'JON' => { name: 'Jonas' },
+          'MIC' => { name: 'Michæa' },
+          'NAM' => { name: 'Nahum' },
+          'HAB' => { name: 'Habacuc' },
+          'ZEP' => { name: 'Sophonias' },
+          'HAG' => { name: 'Aggæus' },
+          'ZEC' => { name: 'Zacharias' },
+          'MAL' => { name: 'Malachias' },
+          'MAT' => { name: 'Matthæus' },
+          'MRK' => { name: 'Marcus' },
+          'LUK' => { name: 'Lucas' },
+          'JHN' => { name: 'Joannes' },
+          'ACT' => { name: 'Actus Apostolorum' },
+          'ROM' => { name: 'ad Romanos' },
+          '1CO' => { name: 'ad Corinthios I' },
+          '2CO' => { name: 'ad Corinthios II' },
+          'GAL' => { name: 'ad Galatas' },
+          'EPH' => { name: 'ad Ephesios' },
+          'PHP' => { name: 'ad Philippenses' },
+          'COL' => { name: 'ad Colossenses' },
+          '1TH' => { name: 'ad Thessalonicenses I' },
+          '2TH' => { name: 'ad Thessalonicenses II' },
+          '1TI' => { name: 'ad Timotheum I' },
+          '2TI' => { name: 'ad Timotheum II' },
+          'TIT' => { name: 'ad Titum' },
+          'PHM' => { name: 'ad Philemonem' },
+          'HEB' => { name: 'ad Hebræos' },
+          'JAS' => { name: 'Jacobi' },
+          '1PE' => { name: 'Petri I' },
+          '2PE' => { name: 'Petri II' },
+          '1JN' => { name: 'Joannis I' },
+          '2JN' => { name: 'Joannis II' },
+          '3JN' => { name: 'Joannis III' },
+          'JUD' => { name: 'Judæ' },
+          'REV' => { name: 'Apocalypsis' }
+        }
+      end
+    end
+  end
+end

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'           },
@@ -46,7 +53,7 @@ module BibleRef
           'ZEC' => { match: /^zac/,             name: 'Zacarias'          },
           'MAL' => { match: /^mal/,             name: 'Malaquias'         },
           'MAT' => { match: /^mat/,             name: 'Mateus'            },
-          'MRK' => { match: /^mar/,             name: 'Marcos'            },
+          'MRK' => { match: /^(mar|mk)/,        name: 'Marcos'            },
           'LUK' => { match: /^lu/,              name: 'Lucas'             },
           'JHN' => { match: /^jo/,              name: 'João'              },
           'ACT' => { match: /^at/,              name: 'Atos'              },

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'                },
@@ -46,7 +53,7 @@ module BibleRef
           'ZEC' => { match: /^za/,              name: 'Zaharia'               },
           'MAL' => { match: /^mal/,             name: 'Maleahi'               },
           'MAT' => { match: /^mat/,             name: 'Matei'                 },
-          'MRK' => { match: /^mar/,             name: 'Marcu'                 },
+          'MRK' => { match: /^(mar|mk)/,        name: 'Marcu'                 },
           'LUK' => { match: /^lu/,              name: 'Luca'                  },
           'JHN' => { match: /^io/,              name: 'Ioan'                  },
           'ACT' => { match: /^fa/,              name: 'Faptele apostolilor'   },

data/lib/bible_ref/reference.rb

@@ -7,11 +7,12 @@ module BibleRef
     attr_reader :book, :reference, :language, :canon
 
     # Create a new Reference instance by passing in the user-supplied bible reference as a string.
-    def initialize(reference, language: 'eng', canon: 'protestant')
-      @reference = reference
-      @details = parse
+    def initialize(reference, language: 'eng', canon: 'all')
       @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.1.4'
+  VERSION = '1.5.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bible_ref
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.5.1
 platform: ruby
 authors:
 - Tim Morgan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-03-03 00:00:00.000000000 Z
+date: 2020-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -62,11 +62,13 @@ files:
 - README.md
 - lib/bible_ref.rb
 - lib/bible_ref/canons.rb
+- lib/bible_ref/canons/all.rb
 - lib/bible_ref/canons/protestant.rb
 - lib/bible_ref/languages.rb
 - lib/bible_ref/languages/base.rb
 - lib/bible_ref/languages/cherokee.rb
 - lib/bible_ref/languages/english.rb
+- lib/bible_ref/languages/latin.rb
 - lib/bible_ref/languages/portuguese.rb
 - lib/bible_ref/languages/romanian.rb
 - lib/bible_ref/parser.rb
@@ -76,7 +78,7 @@ homepage: https://github.com/seven1m/bible_ref
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -91,8 +93,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Bible reference parser
 test_files: []