bible_ref 1.1.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 28b605a11d97398a0fdcbcffc5428d473a665cc4
-  data.tar.gz: 3cf70fdc28474f749365aef71ddb059ee2794348
+SHA256:
+  metadata.gz: 5b66f31665e878b3a71f4c334f43ed5a26c972f15989e8569fab62aa557df191
+  data.tar.gz: 9e7d5a746bf49b140963dfcc945eeaee58fcf68633828892447519841d656f5f
 SHA512:
-  metadata.gz: 0d80a0bff0cc8d4f07f1323d8162c690b767c4cf90a5a6aef8fdf5f43681442505e4216cc28423a66f03c1183a41ef9cf2009f26bb4d9ef05b04f09f2f876196
-  data.tar.gz: 852239f8bd36937df9c042005ea3406da5db441f5db3e3c9bf08e44b3c9ab549d11fad7a80fe654c483ecf38e0e395b9fb70b24245ad3895e925c7dede1d4954
+  metadata.gz: 460cb9fc1df0ae490c46607ed010b21986d636dc63c2a5783ca3343589a58351570c15df9deca603a309108ca59ac74c70b89e994da1e45eec939f648fb2b27f
+  data.tar.gz: 88462cdbb3dc94dc66c1470455ea5b0de6605da4d1df45a2b1be761fc7ee2262aa8558173df036686f1f8bc2ab329995b7bf64e430bc411bae982591b3032154

data/README.md

@@ -12,7 +12,7 @@ ref = BibleRef::Reference.new('jn 3:16')
 ref.valid?
 # true
 
-ref.book.id
+ref.book_id
 # "JHN"
 
 ref.normalize

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

@@ -6,15 +6,15 @@ module BibleRef
       end
 
       def book_id(book_name, canon)
-        book_name = replace_roman_numerals(book_name.downcase)
+        book_name = replace_roman_numerals(book_name)
         return book_name.upcase if books[book_name.upcase] # already normalized
         canon.books.each do |book|
           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
@@ -26,9 +26,9 @@ module BibleRef
       end
 
       def replace_roman_numerals(book)
-        book.sub!(/^iii /i, '3 ')
-        book.sub!(/^ii /i, '2 ')
-        book.sub!(/^i /i, '1 ')
+        book.sub!(/^iii |^III /i, '3 ')
+        book.sub!(/^ii |^II /i, '2 ')
+        book.sub!(/^i |^I /i, '1 ')
         book
       end
     end

data/lib/bible_ref/languages/english.rb

@@ -46,7 +46,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 +64,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 +88,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,79 @@
+# -*- coding: utf-8 -*-
+require_relative 'base'
+
+module BibleRef
+  module Languages
+    class Latin < Base
+      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

@@ -46,7 +46,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

@@ -46,7 +46,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/parser.rb

@@ -4,14 +4,22 @@ module BibleRef
   class Parser < Parslet::Parser
     rule(:refs) do
       (
-        (ref_range | ref) >>
-        (
-          separator >>
-          (ref_range | verse_range | ref | verse)
-        ).repeat
+        chapter_range | chapter_and_verse_range
       ).as(:refs)
     end
 
+    rule(:chapter_range) do
+      chapter >> (separator >> chapter).repeat
+    end
+
+    rule(:chapter_and_verse_range) do
+      (ref_range | ref | chapter) >>
+      (
+        separator >>
+        (ref_range | verse_range | ref | verse)
+      ).repeat
+    end
+
     rule(:ref_range)   { (ref.as(:from) >> str("-") >> (ref | verse).as(:to)).as(:range) }
     rule(:verse_range) { (verse.as(:from) >> str("-") >> verse.as(:to)).as(:range) }
 

data/lib/bible_ref/reference.rb

@@ -7,7 +7,7 @@ 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')
+    def initialize(reference, language: 'eng', canon: 'all')
       @reference = reference
       @details = parse
       @language = language.respond_to?(:book_id) ? language : LANGUAGES.fetch(language.to_s).new

data/lib/bible_ref/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bible_ref
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Tim Morgan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-05-23 00:00:00.000000000 Z
+date: 2020-08-16 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,9 +93,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Bible reference parser
 test_files: []