bible_ref 1.9.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9f9a5343547b1777a07bb2876bf17b38e31225c1948571a85588758a8f3d915
-  data.tar.gz: 8d1d69e4b6b97bdb6d675ec1584b6abb45b5c2a7b2731ea7647443f7bc5c0138
+  metadata.gz: 289edfed9344b42456cd5f107d8fdd3197dbc14f3f28a7a92c8258f387fdac7a
+  data.tar.gz: 6f8bbaf0415d8d1d2d5d23251616f01d7f931a9e27701218cad6f4ce0b70b9dc
 SHA512:
-  metadata.gz: fc93394a58615d9f47562e8d30e65c45aa3407b050574ef777994d0ff0775cd5aa7c44996538e56499f8006573ccce9341cc42e162935933ec248d2cb794f76a
-  data.tar.gz: c84fc9f49b17114c55f2178eed9bce81c320a969b41cd3a68519126a3d7d6258b77c6c51dfafd154dc58895b00c131a811734465da1fdcc17a7b8bb1c10e2b68
+  metadata.gz: ba2f800f04d6c46f67c629780348beba179efb6c6a63072fb30a0f6afafd48b92fb1a9defd3c9cfbdda9b3f193fc7dd48c46d43fbb314d1641297a07530983f1
+  data.tar.gz: de3d6f6a6af1d897891b56bd44db56e4aba0f1c884d138d1ac2c23a1d561096828ffc4f2b35a7dffb7c52fc64b0e1ed23c103c0e1e97704c3944118cb87e55b1

data/lib/bible_ref/languages/base.rb

@@ -5,21 +5,17 @@ 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
+
         canon.books.each do |book|
           details = books[book]
           next if details.nil?
           if (match = details[:match])
-            return book if book_name.downcase =~ match
+            return book if book_name.downcase =~ match || book_name =~ match
           else
-            return book if book_name.downcase == details[:name].downcase
+            return book if book_name.downcase == details[:name].downcase || book_name == details[:name]
           end
         end
         nil

data/lib/bible_ref/languages/cherokee.rb

@@ -4,13 +4,6 @@ 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/chinese.rb

@@ -4,13 +4,6 @@ require_relative 'base'
 module BibleRef
   module Languages
     class Chinese < Base
-
-      # Is it a single chapter book?
-      def has_single_chapter?(reference)
-          matches = [/^俄/, /^腓利門/, /^約翰貳/, /^約翰參/, /^猶/]
-          return Regexp.union(matches).match?(reference)
-      end
-
       def books
         {
           'GEN' => { match: /^創/, name: '創世紀'},
@@ -27,7 +20,7 @@ module BibleRef
           '2KI' => { match: /紀下$/, name: '列王紀下'},
           '1CH' => { match: /志上$/, name: '歷代志上'},
           '2CH' => { match: /志下$/, name: '歷代志下'},
-          'EZR' => { match: /^以斯/, name: '以斯拉記'},
+          'EZR' => { match: /^以斯拉/, name: '以斯拉記'},
           'NEH' => { match: /^尼/, name: '尼希米記'},
           'EST' => { match: /帖記$/, name: '以斯帖記'},
           'JOB' => { match: /^約伯/, name: '約伯記'},
@@ -73,14 +66,14 @@ module BibleRef
           'HEB' => { match: /^希/, name: '希伯來書'},
           'JAS' => { match: /^雅各/, name: '雅各書'},
           '1PE' => { match: /^彼得前/, name: '彼得前書'},
-          '2PE' => { match: /^彼得後/, name: '彼得前書'},
+          '2PE' => { match: /^彼得後/, name: '彼得後書'},
           '1JN' => { match: /壹書$/, name: '約翰壹書'},
-          '2JH' => { match: /貳書$/, name: '約翰貳書'},
-          '3JH' => { match: /參書$/, name: '約翰參書'},
+          '2JN' => { match: /貳書$/, name: '約翰貳書'},
+          '3JN' => { match: /參書$/, name: '約翰參書'},
           'JUD' => { match: /^猶/, name: '猶大書'},
           'REV' => { match: /^啟/, name: '啟示錄'}
         }
       end
     end
   end
-end
+end

data/lib/bible_ref/languages/czech.rb

@@ -5,12 +5,6 @@ require_relative 'base'
 module BibleRef
   module Languages
     class Czech < Base
-      # Is it a single chapter book?
-      def has_single_chapter?(reference)
-        matches = [/^ab/, /^(jud|juda)$/, /^2 ?jan/, /^3 ?jan/, /^fil/]
-        Regexp.union(matches).match?(reference.downcase)
-      end
-
       def books
         {
           'GEN' => { match: /^gen/,              name: 'Genesis'                },
@@ -20,30 +14,30 @@ module BibleRef
           'DEU' => { match: /^d(e?ut|eu)/,       name: 'Deuteronomium'          },
           'JOS' => { match: /^joz/,              name: 'Jozue'                  },
           'JDG' => { match: /^soud/,             name: 'Soudců'                 },
-          'RUT' => { match: /^ru/,               name: 'Rút'                    },
-          '1SA' => { match: /^1 ?s(a?m)?/,       name: '1. Samuel'              },
-          '2SA' => { match: /^2 ?s(a?m)?/,       name: '2. Samuel'              },
-          '1KI' => { match: /^1 ?kr(a?l)?/,      name: '1. Královská'           },
-          '2KI' => { match: /^2 ?kr(a?l)?/,      name: '2. Královská'           },
-          '1CH' => { match: /^1 ?p(ar)?/,        name: '1. Paralipomenon'       },
-          '2CH' => { match: /^2 ?p(ar)?/,        name: '2. Paralipomenon'       },
-          'EZR' => { match: /^ezr/,              name: 'Ezdráš'                 },
+          'RUT' => { match: /^r[uú]/,            name: 'Rút'                    },
+          '1SA' => { match: /^1\.? ?s(a?m)?/,    name: '1. Samuel'              },
+          '2SA' => { match: /^2\.? ?s(a?m)?/,    name: '2. Samuel'              },
+          '1KI' => { match: /^1\.? ?kr(a?l)?/,   name: '1. Královská'           },
+          '2KI' => { match: /^2\.? ?kr(a?l)?/,   name: '2. Královská'           },
+          '1CH' => { match: /^1\.? ?par/,        name: '1. Paralipomenon'       },
+          '2CH' => { match: /^2\.? ?par/,        name: '2. Paralipomenon'       },
+          'EZR' => { match: /^ezd/,              name: 'Ezdráš'                 },
           'NEH' => { match: /^ne/,               name: 'Nehemiáš'               },
           'EST' => { match: /^est/,              name: 'Ester'                  },
           'JOB' => { match: /^jo?b/,             name: 'Job'                    },
-          'PSA' => { match: /^za/,               name: 'Žalmy'                  },
-          'PRO' => { match: /^pri/,              name: 'Přísloví'               },
+          'PSA' => { match: /^zal|^žal/,         name: 'Žalmy'                  },
+          'PRO' => { match: /^p[řr]/,            name: 'Přísloví'               },
           'ECC' => { match: /^kaz/,              name: 'Kazatel'                },
-          'SNG' => { match: /^pis/,              name: 'Píseň písní'            },
+          'SNG' => { match: /^p[ií]/,            name: 'Píseň písní'            },
           'ISA' => { match: /^iza/,              name: 'Izaiáš'                 },
           'JER' => { match: /^jer/,              name: 'Jeremiáš'               },
-          'LAM' => { match: /^plac/,             name: 'Pláč'                   },
+          'LAM' => { match: /^pl[aá]/,           name: 'Pláč'                   },
           'EZK' => { match: /^eze/,              name: 'Ezechiel'               },
           'DAN' => { match: /^dan/,              name: 'Daniel'                 },
           'HOS' => { match: /^oze/,              name: 'Ozeáš'                  },
           'JOL' => { match: /^joe?l/,            name: 'Joel'                   },
           'AMO' => { match: /^amo/,              name: 'Amos'                   },
-          'OBA' => { match: /^ab/,               name: 'Abdiáš'                 },
+          'OBA' => { match: /^abd/,              name: 'Abdiáš'                 },
           'JON' => { match: /^jona?/,            name: 'Jonáš'                  },
           'MIC' => { match: /^mi/,               name: 'Micheáš'                },
           'NAM' => { match: /^na(h|m)/,          name: 'Nahum'                  },
@@ -53,30 +47,30 @@ module BibleRef
           'ZEC' => { match: /^zac/,              name: 'Zachariáš'              },
           'MAL' => { match: /^mal/,              name: 'Malachiáš'              },
           'MAT' => { match: /^ma?t/,             name: 'Matouš'                 },
-          'MRK' => { match: /^ma?rk/,            name: 'Marek'                  },
+          'MRK' => { match: /^ma?re?k/,          name: 'Marek'                  },
           'LUK' => { match: /^lu?k/,             name: 'Lukáš'                  },
           'JHN' => { match: /^j(an|n)/,          name: 'Jan'                    },
           'ACT' => { match: /^sku/,              name: 'Skutky'                 },
-          'ROM' => { match: /^rim/,              name: 'Římanům'                },
-          '1CO' => { match: /^1 ?kor/,           name: '1. Korintským'          },
-          '2CO' => { match: /^2 ?kor/,           name: '2. Korintským'          },
+          'ROM' => { match: /^rim|^řím/,         name: 'Římanům'                },
+          '1CO' => { match: /^1\.? ?kor/,        name: '1. Korintským'          },
+          '2CO' => { match: /^2\.? ?kor/,        name: '2. Korintským'          },
           'GAL' => { match: /^gal/,              name: 'Galatským'              },
           'EPH' => { match: /^ef/,               name: 'Efeským'                },
           'PHP' => { match: /^filip/,            name: 'Filipským'              },
           'COL' => { match: /^kol/,              name: 'Koloským'               },
-          '1TH' => { match: /^1 ?tes/,           name: '1. Tesalonickým'        },
-          '2TH' => { match: /^2 ?tes/,           name: '2. Tesalonickým'        },
-          '1TI' => { match: /^1 ?tim/,           name: '1. Timoteovi'           },
-          '2TI' => { match: /^2 ?tim/,           name: '2. Timoteovi'           },
+          '1TH' => { match: /^1\.? ?tes/,        name: '1. Tesalonickým'        },
+          '2TH' => { match: /^2\.? ?tes/,        name: '2. Tesalonickým'        },
+          '1TI' => { match: /^1\.? ?tim/,        name: '1. Timoteovi'           },
+          '2TI' => { match: /^2\.? ?tim/,        name: '2. Timoteovi'           },
           'TIT' => { match: /^tit/,              name: 'Titovi'                 },
           'PHM' => { match: /^fil/,              name: 'Filemonovi'             },
-          'HEB' => { match: /^zid/,              name: 'Židům'                  },
+          'HEB' => { match: /^[žz]id/,           name: 'Židům'                  },
           'JAS' => { match: /^jak/,              name: 'Jakub'                  },
-          '1PE' => { match: /^1 ?pet/,           name: '1. Petr'                },
-          '2PE' => { match: /^2 ?pet/,           name: '2. Petr'                },
-          '1JN' => { match: /^1 ?jan/,           name: '1. Jan'                 },
-          '2JN' => { match: /^2 ?jan/,           name: '2. Jan"'                },
-          '3JN' => { match: /^3 ?jan/,           name: '3. Jan'                 },
+          '1PE' => { match: /^1\.? ?pet/,        name: '1. Petr'                },
+          '2PE' => { match: /^2\.? ?pet/,        name: '2. Petr'                },
+          '1JN' => { match: /^1\.? ?jan/,        name: '1. Jan'                 },
+          '2JN' => { match: /^2\.? ?jan/,        name: '2. Jan'                 },
+          '3JN' => { match: /^3\.? ?jan/,        name: '3. Jan'                 },
           'JUD' => { match: /^(jud|juda)$/,      name: 'Juda'                   },
           'REV' => { match: /^zj(e)?/,           name: 'Zjevení'                }
         }

data/lib/bible_ref/languages/english.rb

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

data/lib/bible_ref/languages/latin.rb

@@ -4,12 +4,6 @@ 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,13 +4,6 @@ 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'           },
@@ -19,7 +12,7 @@ module BibleRef
           'NUM' => { match: /^n[uú]/,           name: 'Números'           },
           'DEU' => { match: /^de?ut/,           name: 'Deuteronômio'      },
           'JOS' => { match: /^jos/,             name: 'Josué'             },
-          'JDG' => { match: /^ju/,              name: 'Juízes'            },
+          'JDG' => { match: /^juí|^jz/,         name: 'Juízes'            },
           'RUT' => { match: /^ru/,              name: 'Rute'              },
           '1SA' => { match: /^1 sa?m/,          name: '1 Samuel'          },
           '2SA' => { match: /^2 sa?m/,          name: '2 Samuel'          },
@@ -62,7 +55,7 @@ module BibleRef
           '2CO' => { match: /^2 cor/,           name: '2 Coríntios'       },
           'GAL' => { match: /^g[aá]l/,          name: 'Gálatas'           },
           'EPH' => { match: /^ef[eé]/,          name: 'Efésios'           },
-          'PHP' => { match: /^fil/,             name: 'Filipenses'        },
+          'PHP' => { match: /^fp|^filip/,       name: 'Filipenses'        },
           'COL' => { match: /^col/,             name: 'Colossenses'       },
           '1TH' => { match: /^1 te?s/,          name: '1 Tessalonicenses' },
           '2TH' => { match: /^2 te?s/,          name: '2 Tessalonicenses' },

data/lib/bible_ref/languages/romanian.rb

@@ -4,13 +4,6 @@ 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'                },
@@ -23,8 +16,8 @@ module BibleRef
           'RUT' => { match: /^ru/,              name: 'Rut'                   },
           '1SA' => { match: /^1 sa?m/,          name: '1 Samuel'              },
           '2SA' => { match: /^2 sa?m/,          name: '2 Samuel'              },
-          '1KI' => { match: /^1 [iîÎ]/,         name: '1 Împăraţi'            },
-          '2KI' => { match: /^2 [iîÎ]/,         name: '2 Împăraţi'            },
+          '1KI' => { match: /^1 [iîÎ]mp/,       name: '1 Împăraţi'            },
+          '2KI' => { match: /^2 [iîÎ]mp/,       name: '2 Împăraţi'            },
           '1CH' => { match: /^1 cr/,            name: '1 Cronici'             },
           '2CH' => { match: /^2 cr/,            name: '2 Cronici'             },
           'EZR' => { match: /^ezr/,             name: 'Ezra'                  },
@@ -34,7 +27,7 @@ module BibleRef
           'PSA' => { match: /^ps/,              name: 'Psalmii'               },
           'PRO' => { match: /^pr/,              name: 'Proverbe'              },
           'ECC' => { match: /^ecl/,             name: 'Eclesiastul'           },
-          'SNG' => { match: /^c[aâ]n$/,         name: 'Cântarea cântărilor'   },
+          'SNG' => { match: /^c[aâ]n/,          name: 'Cântarea cântărilor'   },
           'ISA' => { match: /^isa/,             name: 'Isaia'                 },
           'JER' => { match: /^ier/,             name: 'Ieremia'               },
           'LAM' => { match: /^plâ/,             name: 'Plângerile lui Ieremia'},
@@ -62,7 +55,7 @@ module BibleRef
           '2CO' => { match: /^2 cor/,           name: '2 Corinteni'           },
           'GAL' => { match: /^gal/,             name: 'Galateni'              },
           'EPH' => { match: /^ef/,              name: 'Efeseni'               },
-          'PHP' => { match: /^fil/,             name: 'Filipeni'              },
+          'PHP' => { match: /^flp|^filip/,      name: 'Filipeni'              },
           'COL' => { match: /^col/,             name: 'Coloseni'              },
           '1TH' => { match: /^1 te?s/,          name: '1 Tesaloniceni'        },
           '2TH' => { match: /^2 te?s/,          name: '2 Tesaloniceni'        },
@@ -76,7 +69,7 @@ module BibleRef
           '2PE' => { match: /^2 pet/,           name: '2 Petru'               },
           '1JN' => { match: /^1 io/,            name: '1 Ioan'                },
           '2JN' => { match: /^2 io/,            name: '2 Ioan'                },
-          '3JN' => { match: /^3 io/,            name: '1 Ioan'                },
+          '3JN' => { match: /^3 io/,            name: '3 Ioan'                },
           'JUD' => { match: /^iud/,             name: 'Iuda'                  },
           'REV' => { match: /^apo/,             name: 'Apocalipsa'            }
         }

data/lib/bible_ref/languages/russian.rb

@@ -4,12 +4,6 @@ require_relative 'base'
 module BibleRef
   module Languages
     class Russian < Base
-      # Is it a single chapter book?
-      def has_single_chapter?(reference)
-        matches = [/^авд(и[йя])?/, /^иуды?/, /^2 ?и(оа)?нн?а?/, /^3 ?и(оа)?нн?а?/, /^ф(лм|ил(имон)?у?)/]
-        return Regexp.union(matches).match?(reference.downcase)
-      end
-
       def books
         {
           'GEN' => { match: /^быт(и[её])?/,             name: 'Бытие'                 },  # Быт, Бытие
@@ -24,7 +18,7 @@ module BibleRef
           '2SA' => { match: /^2 ?(цар(ств)?|сам(уила?)?)/, name: '2 Царств'           },  # 2 Цар, 2 Царств, 2 Сам, 2 Самуила
           '1KI' => { match: /^3 ?цар(ств)?/,            name: '3 Царств'              },  # 3 Цар, 3 Царств
           '2KI' => { match: /^4 ?цар(ств)?/,            name: '4 Царств'              },  # 4 Цар, 4 Царств
-          '1CH' => { match: /^2 ?пар(алипоменон)/,      name: '1 Паралипоменон'       },  # 1 Пар, 1 Паралипоменон
+          '1CH' => { match: /^1 ?пар(алипоменон)/,      name: '1 Паралипоменон'       },  # 1 Пар, 1 Паралипоменон
           '2CH' => { match: /^2 ?пар(алипоменон)/,      name: '2 Паралипоменон'       },  # 2 Пар, 2 Паралипоменон
           'EZR' => { match: /^езд(р[аы])?/,             name: 'Ездра'                 },  # Ездр, Ездра, Ездры
           'NEH' => { match: /^неем(и[яи])?/,            name: 'Неемия'                },  # Неем, Неемия, Неемии
@@ -82,14 +76,14 @@ module BibleRef
           '2CO' => { match: /^2 ?кор(инфянам)?/,        name: '2 Коринфянам'          },  # 2 Кор, 2 Коринфянам
           'GAL' => { match: /^гал(атам)?/,              name: 'Галатам'               },  # Гал, Галатам
           'EPH' => { match: /^[еэ]ф(есянам)?/,          name: 'Ефесянам'              },  # Еф, Ефесянам
-          'PHP' => { match: /^флп/,                     name: 'Филиппийцам'           },  # Флп, Филиппийцам
+          'PHP' => { match: /^флп|^Филип/,              name: 'Филиппийцам'           },  # Флп, Филиппийцам
           'COL' => { match: /^кол(оссянам)?/,           name: 'Колоссянам'            },  # Кол, Колоссянам
           '1TH' => { match: /^1 ?фес(с(алоникийцам)?)?/,name: '1 Фессалоникийцам'     },  # 1 Фес, 1 Фессалоникийцам
           '2TH' => { match: /^2 ?фес(с(алоникийцам)?)?/,name: '2 Фессалоникийцам'     },  # 2 Фес, 2 Фессалоникийцам
           '1TI' => { match: /^1 ?тим(офею)?/,           name: '1 Тимофею'             },  # 1 Тим, 1 Тимофею
           '2TI' => { match: /^2 ?тим(офею)?/,           name: '2 Тимофею'             },  # 2 Тим, 2 Тимофею
           'TIT' => { match: /^титу?/,                   name: 'Титу'                  },  # Тит, Титу
-          'PHM' => { match: /^флм/,                     name: 'Филимону'              },  # Флм, Филимону
+          'PHM' => { match: /^флм|^Филим/,              name: 'Филимону'              },  # Флм, Филимону
           'HEB' => { match: /^евр(еям)?/,               name: 'Евреям'                },  # Евр, Евреям
           'JAS' => { match: /^иак(ова?)?/,              name: 'Иакова'                },  # Иак, Иаков, Иакова
           '1PE' => { match: /^1 ?пет(ра?)?/,            name: '1 Петра'               },  # 1 Пет, 1 Петра

data/lib/bible_ref/parser.rb

@@ -23,13 +23,13 @@ module BibleRef
     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) }
 
-    rule(:ref)         { (chapter >> str(":") >> verse) }
+    rule(:ref)         { chapter >> str(":") >> verse }
 
     rule(:chapters)    { (chapter >> (match("[-,]") >> chapter).repeat).as(:refs) }
     rule(:chapter)     { num.as(:chapter) }
     rule(:verse)       { num.as(:verse) }
 
-    rule(:word)        { (match("[123]").maybe >> match("[^0-9]").repeat(1)).as(:word) }
+    rule(:word)        { (match("[1234]").maybe >> match("[^0-9]").repeat(1)).as(:word) }
     rule(:separator)   { (str(",") >> space.maybe) | (space.maybe >> str("&") >> space.maybe) }
     rule(:num)         { match("[0-9]").repeat(1).as(:num) }
     rule(:space)       { str(" ").repeat(1) }

data/lib/bible_ref/reference.rb

@@ -13,8 +13,8 @@ module BibleRef
       @reference = reference
       @single_chapter_book_matching = single_chapter_book_matching
       raise 'expected :special or :indifferent' unless %i[special indifferent].include?(@single_chapter_book_matching)
-      standardize_reference
       @details = parse
+      standardize_single_chapter_book
     end
 
     # Returns an array of pairs, each one being the from and to for a range.
@@ -25,11 +25,15 @@ module BibleRef
     def ranges
       return nil unless valid?
       @chapter = nil
-      [@details[:refs]].flatten.map do |ref|
+      refs_as_array.map do |ref|
         normalize_range(ref) || normalize_ref(ref)
       end
     end
 
+    def refs_as_array
+      [@details[:refs]].flatten
+    end
+
     # Returns a USFX-compatible book id, or nil if book is unknown.
     def book_id
       return nil unless @details
@@ -77,20 +81,19 @@ module BibleRef
       end
     end
 
-    def standardize_reference
-      standardize_single_chapter_book if @language.has_single_chapter?(@reference)
-    end
-
     def standardize_single_chapter_book
       return if @single_chapter_book_matching == :indifferent
       return @reference if @reference.include? ':'
+      return unless %w[OBA PHM 2JN 3JN JUD].include?(book_id)
+      return if refs_as_array.any? { |r| r[:verse] }
 
       matches = @reference.match(/^([\d]?[\D\s]*)/)
-      return @reference if matches.length() == 0
+      #return @reference if matches.length() == 0
 
       book = matches[0].strip
       requested = @reference.sub(book, '').strip
       @reference = "#{book} 1:#{requested}"
+      @details = parse
     end
 
     def parse

data/lib/bible_ref/version.rb

@@ -1,3 +1,3 @@
 module BibleRef
-  VERSION = '1.9.0'
+  VERSION = '2.0.0'
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: bible_ref
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Tim Morgan
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-02 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -81,7 +80,6 @@ homepage: https://github.com/seven1m/bible_ref
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -96,8 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Bible reference parser
 test_files: []