bible_ref 0.2.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 694d21174ea7792cbd836f0cee4a3dedf63af0bc
-  data.tar.gz: 4d46099efa929b7623add504ca322ff63eb0b9ad
+  metadata.gz: 68f998033defe0c1f8dc086834178c4d680380c2
+  data.tar.gz: 405ff445a3dc1a7ee78412dd84b783405f4fe2a2
 SHA512:
-  metadata.gz: 39b71a97e6bf202687a272c4c86a6310b9a55e8ffe2306f2af99b9a57574a27ba8d11b448e30568abf383fa4fc55cc521664b2b1a93d703f2c6beda4765c1d76
-  data.tar.gz: 11aee5b5db6cf40ec51d5796322a87996e35bf6ba9db53ffcc4aa2f649472709f92c3c794cffe5565c632a0002f359971b07166308a87f4b1ca8632bacee8377
+  metadata.gz: c646a6b5b7501d39822b10d298b14524cbc61e7a99b935f28b4100b9ecd00e300bd96097678cab49aa48e4de2c6d105cb5809dea83deac26cb7ed447efa7185c
+  data.tar.gz: 7891140a1831b033324e074321fdf1476044bfdc6731cdb64933ae514bb975ca68b0497fb643c0d6ac4363df1c9d02f0a2c0613113da6e00b2e7733eb6099f8b

data/README.md

@@ -1,33 +1,58 @@
 # BibleRef
 
-Turn "John 3:16" into:
+This small Rubygem does its best at taking a user-input string like "john 3:16" and turning it into something useful
+for querying a database (this is how we use it in [bible_api](https://github.com/seven1m/bible_api)).
+
+## Usage
 
 ```ruby
-[
-  [{ book: 'JHN', chapter: 3, verse: 16 },
-   { book: 'JHN', chapter: 3, verse: 16 }]
-]
+ref = BibleRef::Reference.new('jn 3:16')
+# #<BibleRef::Reference:0x000001020f7000 @reference="jn 3:16", @details={:book=>"jn", :refs=>{:chapter=>3, :verse=>16}}>
+
+ref.valid?
+# true
+
+ref.book.id
+# "JHN"
+
+ref.normalize
+# "John 3:16"
 ```
 
-...and turn "Romans 12:1,3-4 & 13:2-4,7-8" into:
+## Ranges
+
+Call `#ranges` to get from/to pairs of verses.
 
 ```ruby
-[
-  [{ book: 'ROM', chapter: 12, verse: 1 },
-   { book: 'ROM', chapter: 12, verse: 1 }],
-  [{ book: 'ROM', chapter: 12, verse: 3 },
-   { book: 'ROM', chapter: 12, verse: 4 }],
-  [{ book: 'ROM', chapter: 13, verse: 2 },
-   { book: 'ROM', chapter: 13, verse: 4 }],
-  [{ book: 'ROM', chapter: 13, verse: 7 },
-   { book: 'ROM', chapter: 13, verse: 8 }]
-]
+BibleRef::Reference.new('john 3:16').ranges
+# [
+#   [{ book: 'JHN', chapter: 3, verse: 16 },
+#    { book: 'JHN', chapter: 3, verse: 16 }]
+# ]
+
+BibleRef::Reference.new('Romans 12:1,3-4 & 13:2-4,7-8').ranges
+# [
+#   [{ book: 'ROM', chapter: 12, verse: 1 },
+#    { book: 'ROM', chapter: 12, verse: 1 }],
+#   [{ book: 'ROM', chapter: 12, verse: 3 },
+#    { book: 'ROM', chapter: 12, verse: 4 }],
+#   [{ book: 'ROM', chapter: 13, verse: 2 },
+#    { book: 'ROM', chapter: 13, verse: 4 }],
+#   [{ book: 'ROM', chapter: 13, verse: 7 },
+#    { book: 'ROM', chapter: 13, verse: 8 }]
+# ]
 ```
 
-(We return from/to pairs for every range so to make querying a SQL database easy peasy.)
+You can then take this and turn it into a few small SQL queries like this:
 
-See [the specs](https://github.com/seven1m/bible_ref/blob/master/spec/bible_ref/reference_spec.rb) for more examples.
+```ruby
+verses = ranges.map do |from_ref, to_ref|
+  first = DB['select id from verses where book = :book and chapter = :chapter and verse = :verse limit 1', from_ref].first
+  last  = DB['select id from verses where book = :book and chapter = :chapter and verse = :verse limit 1', to_ref].first
+  DB['select * from verses where id between ? and ?', first['id'], last['id']]
+end
+```
 
 ## Copyright
 
-Copyright [Tim Morgan](http://timmorgan.org). See LICENSE.
+Copyright [Tim Morgan](http://timmorgan.org). Licensed MIT.

data/lib/bible_ref/canons/protestant.rb

@@ -0,0 +1,12 @@
+module BibleRef
+  module Canons
+    class Protestant
+      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
+          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/canons.rb

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

data/lib/bible_ref/languages/base.rb

@@ -0,0 +1,31 @@
+module BibleRef
+  module Languages
+    class Base
+      def books
+        fail NotImplementedError, "You must override #books in your language class."
+      end
+
+      def book_id(book_name, canon)
+        book_name = replace_roman_numerals(book_name.downcase)
+        return book_name.upcase if books[book_name.upcase] # already normalized
+        canon.books.each do |book|
+          match = books[book][:match]
+          return book if book_name =~ match
+        end
+        nil
+      end
+
+      def book_name(book_name, canon)
+        return unless id = book_id(book_name, canon)
+        books[id][:name]
+      end
+
+      def replace_roman_numerals(book)
+        book.sub!(/^iii/i, '3')
+        book.sub!(/^ii/i, '2')
+        book.sub!(/^i/i, '1')
+        book
+      end
+    end
+  end
+end

data/lib/bible_ref/languages/english.rb

@@ -0,0 +1,97 @@
+# -*- coding: utf-8 -*-
+require_relative 'base'
+
+module BibleRef
+  module Languages
+    class English < Base
+      def books
+        {
+          'GEN' => { match: /^gen/,              name: 'Genesis'                },
+          'EXO' => { match: /^ex/,               name: 'Exodus'                 },
+          'LEV' => { match: /^le?v/,             name: 'Leviticus'              },
+          'NUM' => { match: /^nu/,               name: 'Numbers'                },
+          'DEU' => { match: /^d(e?ut|eu)/,       name: 'Deuteronomy'            },
+          'JOS' => { match: /^jos/,              name: 'Joshua'                 },
+          'JDG' => { match: /^ju?dg/,            name: 'Judges'                 },
+          'RUT' => { match: /^ru/,               name: 'Ruth'                   },
+          '1SA' => { match: /^1 ?s(a?m|a)/,      name: '1 Samuel'               },
+          '2SA' => { match: /^2 ?s(a?m|a)/,      name: '2 Samuel'               },
+          '1KI' => { match: /^1 ?(king|kgs|ki)/, name: '1 Kings'                },
+          '2KI' => { match: /^2 ?(king|kgs|ki)/, name: '2 Kings'                },
+          '1CH' => { match: /^1 ?chr?/,          name: '1 Chronicles'           },
+          '2CH' => { match: /^2 ?chr?/,          name: '2 Chronicles'           },
+          'EZR' => { match: /^ez/,               name: 'Ezra'                   },
+          'NEH' => { match: /^ne/,               name: 'Nehemiah'               },
+          'EST' => { match: /^est/,              name: 'Esther'                 },
+          'JOB' => { match: /^jo?b/,             name: 'Job'                    },
+          'PSA' => { match: /^ps/,               name: 'Psalms'                 },
+          'PRO' => { match: /^(pro?v|pro)/,      name: 'Proverbs'               },
+          'ECC' => { match: /^ecc/,              name: 'Ecclesiastes'           },
+          'SNG' => { match: /^so?ng|^sol|^sg$/,  name: 'Song of Solomon'        },
+          'ISA' => { match: /^isa/,              name: 'Isaiah'                 },
+          'JER' => { match: /^jer/,              name: 'Jeremiah'               },
+          'LAM' => { match: /^lam/,              name: 'Lamentations'           },
+          'EZK' => { match: /^ez/,               name: 'Ezekiel'                },
+          'DAN' => { match: /^dan/,              name: 'Daniel'                 },
+          'HOS' => { match: /^hos/,              name: 'Hosea'                  },
+          'JOL' => { match: /^joe?l/,            name: 'Joel'                   },
+          'AMO' => { match: /^amo/,              name: 'Amos'                   },
+          'OBA' => { match: /^ob/,               name: 'Obadiah'                },
+          'JON' => { match: /^jona?/,            name: 'Jonah'                  },
+          'MIC' => { match: /^mi/,               name: 'Micah'                  },
+          'NAM' => { match: /^na(h|m)/,          name: 'Nahum'                  },
+          'HAB' => { match: /^hab/,              name: 'Habakkuk'               },
+          'ZEP' => { match: /^zep/,              name: 'Zephaniah'              },
+          'HAG' => { match: /^hag/,              name: 'Haggai'                 },
+          'ZEC' => { match: /^zec/,              name: 'Zechariah'              },
+          'MAL' => { match: /^mal/,              name: 'Malachi'                },
+          'TOB' => { match: /^tob/,              name: 'Tobit'                  },
+          'JDT' => { match: /^(jud|jdt)/,        name: 'Judith'                 },
+          'ESG' => { match: /^(est.*greek|esg)/, name: 'Esther (Greek)'         },
+          'WIS' => { match: /^wis(dom)?/,        name: 'Wisdom of Solomon'      },
+          'SIR' => { match: /^sir/,              name: 'Sirach'                 },
+          'BAR' => { match: /^bar/,              name: 'Baruch'                 },
+          'LJE' => { match: /^(jeremy|lje)/,     name: 'Jeremy’s Letter'        },
+          'S3Y' => { match: /^(3 holy|s3y)/,     name: '3 Holy Children’s Song' },
+          'SUS' => { match: /^sus/,              name: 'Susanna'                },
+          'BEL' => { match: /^bel/,              name: 'Bel and the Dragon'     },
+          '1MA' => { match: /^1 ?mac?/,          name: '1 Maccabees'            },
+          '2MA' => { match: /^2 ?mac?/,          name: '2 Maccabees'            },
+          '1ES' => { match: /^1 ?esd?/,          name: '1 Esdras'               },
+          'MAN' => { match: /^(prayer|man)/,     name: 'Prayer of Manasses'     },
+          'PS2' => { match: /^(psalm 151|ps2)/,  name: 'Psalm 151'              },
+          '3MA' => { match: /^3 ?mac?/,          name: '3 Maccabees'            },
+          '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'                   },
+          'LUK' => { match: /^lu?k/,             name: 'Luke'                   },
+          'JHN' => { match: /^(john|jn|jhn)/,    name: 'John'                   },
+          'ACT' => { match: /^act/,              name: 'Acts'                   },
+          'ROM' => { match: /^rom/,              name: 'Romans'                 },
+          '1CO' => { match: /^1 ?cor?/,          name: '1 Corinthians'          },
+          '2CO' => { match: /^2 ?cor?/,          name: '2 Corinthians'          },
+          'GAL' => { match: /^gal/,              name: 'Galatians'              },
+          'EPH' => { match: /^eph/,              name: 'Ephesians'              },
+          'PHP' => { match: /^(phil|php)/,       name: 'Philippians'            },
+          'COL' => { match: /^col/,              name: 'Colossians'             },
+          '1TH' => { match: /^1 ?the?s?/,        name: '1 Thessalonians'        },
+          '2TH' => { match: /^2 ?the?s?/,        name: '2 Thessalonians'        },
+          '1TI' => { match: /^1 ?tim?/,          name: '1 Timothy'              },
+          '2TI' => { match: /^2 ?tim?/,          name: '2 Timothy'              },
+          'TIT' => { match: /^tit/,              name: 'Titus'                  },
+          'PHM' => { match: /^ph(i?l|m)/,        name: 'Philemon'               },
+          'HEB' => { match: /^heb/,              name: 'Hebrews'                },
+          'JAS' => { match: /^ja(m|s)/,          name: 'James'                  },
+          '1PE' => { match: /^1 ?pet?/,          name: '1 Peter'                },
+          '2PE' => { match: /^2 ?pet?/,          name: '2 Peter'                },
+          '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'                   },
+          'REV' => { match: /^re?v/,             name: 'Revelation'             }
+        }
+      end
+    end
+  end
+end

data/lib/bible_ref/languages/portuguese.rb

@@ -0,0 +1,79 @@
+# -*- coding: utf-8 -*-
+require_relative 'base'
+
+module BibleRef
+  module Languages
+    class Portuguese < Base
+      def books
+        {
+          'GEN' => { match: /^g[eê]n/,          name: 'Gênesis'           },
+          'EXO' => { match: /^[eê]x/,           name: 'Êxodo'             },
+          'LEV' => { match: /^le?v/,            name: 'Levítico'          },
+          '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'            },
+          'RUT' => { match: /^ru/,              name: 'Rute'              },
+          '1SA' => { match: /^1 sa?m/,          name: '1 Samuel'          },
+          '2SA' => { match: /^2 sa?m/,          name: '2 Samuel'          },
+          '1KI' => { match: /^1 r/,             name: '1 Reis'            },
+          '2KI' => { match: /^2 r/,             name: '2 Reis'            },
+          '1CH' => { match: /^1 cr/,            name: '1 Crônicas'        },
+          '2CH' => { match: /^2 cr/,            name: '2 Crônicas'        },
+          'EZR' => { match: /^esd/,             name: 'Esdras'            },
+          'NEH' => { match: /^ne/,              name: 'Neemias'           },
+          'EST' => { match: /^est/,             name: 'Ester'             },
+          'JOB' => { match: /^j[oó]$/,          name: 'Jó'                },
+          'PSA' => { match: /^sal/,             name: 'Salmos'            },
+          'PRO' => { match: /^pro?v/,           name: 'Provérbios'        },
+          'ECC' => { match: /^ecl/,             name: 'Eclesiastes'       },
+          'SNG' => { match: /^c[aâ]n$/,         name: 'Cânticos'          },
+          'ISA' => { match: /^isa/,             name: 'Isaías'            },
+          'JER' => { match: /^jer/,             name: 'Jeremias'          },
+          'LAM' => { match: /^lam/,             name: 'Lamentações'       },
+          'EZK' => { match: /^ez/,              name: 'Ezequiel'          },
+          'DAN' => { match: /^dan/,             name: 'Daniel'            },
+          'HOS' => { match: /^os/,              name: 'Oséias'            },
+          'JOL' => { match: /^joel/,            name: 'Joel'              },
+          'AMO' => { match: /^am[oó]/,          name: 'Amós'              },
+          'OBA' => { match: /^ob/,              name: 'Obadias'           },
+          'JON' => { match: /^jona/,            name: 'Jonas'             },
+          'MIC' => { match: /^mi/,              name: 'Miquéias'          },
+          'NAM' => { match: /^nau/,             name: 'Naum'              },
+          'HAB' => { match: /^hab/,             name: 'Habacuque'         },
+          'ZEP' => { match: /^sof/,             name: 'Sofonias'          },
+          'HAG' => { match: /^ag/,              name: 'Ageu'              },
+          'ZEC' => { match: /^zac/,             name: 'Zacarias'          },
+          'MAL' => { match: /^mal/,             name: 'Malaquias'         },
+          'MAT' => { match: /^mat/,             name: 'Mateus'            },
+          'MRK' => { match: /^mar/,             name: 'Marcos'            },
+          'LUK' => { match: /^lu/,              name: 'Lucas'             },
+          'JHN' => { match: /^jo/,              name: 'João'              },
+          'ACT' => { match: /^at/,              name: 'Atos'              },
+          'ROM' => { match: /^rom/,             name: 'Romanos'           },
+          '1CO' => { match: /^1 cor/,           name: '1 Coríntios'       },
+          '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'        },
+          'COL' => { match: /^col/,             name: 'Colossenses'       },
+          '1TH' => { match: /^1 te?s/,          name: '1 Tessalonicenses' },
+          '2TH' => { match: /^2 te?s/,          name: '2 Tessalonicenses' },
+          '1TI' => { match: /^1 tim/,           name: '1 Timóteo'         },
+          '2TI' => { match: /^2 tim/,           name: '2 Timóteo'         },
+          'TIT' => { match: /^tit/,             name: 'Tito'              },
+          'PHM' => { match: /^fil/,             name: 'Filemom'           },
+          'HEB' => { match: /^heb/,             name: 'Hebreus'           },
+          'JAS' => { match: /^tia/,             name: 'Tiago'             },
+          '1PE' => { match: /^1 ped/,           name: '1 Pedro'           },
+          '2PE' => { match: /^2 ped/,           name: '2 Pedro'           },
+          '1JN' => { match: /^1 jo/,            name: '1 João'            },
+          '2JN' => { match: /^2 jo/,            name: '2 João'            },
+          '3JN' => { match: /^3 jo/,            name: '3 João'            },
+          'JUD' => { match: /^jud/,             name: 'Judas'             },
+          'REV' => { match: /^apo/,             name: 'Apocalipse'        }
+        }
+      end
+    end
+  end
+end

data/lib/bible_ref/languages.rb

@@ -0,0 +1,9 @@
+require_relative 'languages/english'
+require_relative 'languages/portuguese'
+
+module BibleRef
+  LANGUAGES = {
+    'eng' => Languages::English,
+    'por' => Languages::Portuguese
+  }
+end

data/lib/bible_ref/parser.rb

@@ -21,7 +21,7 @@ module BibleRef
     rule(:chapter)     { num.as(:chapter) }
     rule(:verse)       { num.as(:verse) }
 
-    rule(:word)        { (match("[0-9]").maybe >> match("[A-Za-z ]").repeat(1)).as(:word) }
+    rule(:word)        { (match("[123]").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

@@ -1,16 +1,17 @@
-require_relative './book'
+require_relative './languages'
+require_relative './canons'
 require_relative './parser'
 
 module BibleRef
   class Reference
-
-    attr_reader :book
-    attr_reader :reference
+    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)
+    def initialize(reference, language: 'eng', canon: 'protestant')
       @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
     end
 
     # Returns an array of pairs, each one being the from and to for a range.
@@ -26,23 +27,29 @@ module BibleRef
       end
     end
 
-    # Returns a BibleRef::Book instance or nil if book not known.
-    def book
+    # Returns a USFX-compatible book id, or nil if book is unknown.
+    def book_id
+      return nil unless @details
+      @book_id ||= @language.book_id(@details[:book], @canon)
+    end
+
+    # Returns the formatted book name
+    def book_name
       return nil unless @details
-      @book ||= Book.new(@details[:book])
+      @book_name ||= @language.book_name(@details[:book], @canon)
     end
 
     # Returns true if the reference is a known bible passage.
     def valid?
-      @details and book.id
+      @details && !book_id.nil?
     end
 
     # Returns a normalized passage reference. e.g.
     #
     # 'JOHN 3:16&17' => 'John 3:16,17'
     def normalize
-      return unless book and ranges
-      book.formatted + ' ' +
+      return unless book_id and ranges
+      book_name + ' ' +
       ranges.map do |(ref_from, ref_to)|
         if ref_from != ref_to
           ref_part(ref_from) + '-' + ref_part(ref_to)
@@ -57,7 +64,11 @@ module BibleRef
     def ref_part(ref)
       if @last_chapter != ref[:chapter] and ref[:chapter]
         @last_chapter = ref[:chapter]
-        "#{ref[:chapter]}:#{ref[:verse]}"
+        if ref[:verse]
+          "#{ref[:chapter]}:#{ref[:verse]}"
+        else
+          ref[:chapter]
+        end
       else
         ref[:verse].to_s
       end
@@ -78,15 +89,15 @@ module BibleRef
       ch = range.detect { |_, r| r[:chapter] }
       @chapter = ch.last[:chapter] if ch
       [
-        { book: @book.id, chapter: @chapter }.merge(range[:from]),
-        { book: @book.id, chapter: @chapter }.merge(range[:to])
+        { book: book_id, chapter: @chapter }.merge(range[:from]),
+        { book: book_id, chapter: @chapter }.merge(range[:to])
       ]
     end
 
     def normalize_ref(ref)
       @chapter = ref[:chapter] if ref[:chapter]
       (1..2).map do
-        { book: @book.id, chapter: @chapter }.merge(ref)
+        { book: book_id, chapter: @chapter }.merge(ref)
       end
     end
 

data/lib/bible_ref/version.rb

@@ -1,3 +1,3 @@
 module BibleRef
-  VERSION = '0.2.1'
+  VERSION = '1.0.0'
 end

data/lib/bible_ref.rb

@@ -1 +1,8 @@
 require_relative 'bible_ref/reference'
+
+module BibleRef
+  module_function
+  def new(*args)
+    Reference.new(*args)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bible_ref
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Tim Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-07 00:00:00.000000000 Z
+date: 2015-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.1
 description: Bible reference parser returns normalized sets of ranges, ideal for querying
   a database or XML data source such as WEB in USFX.
 email: tim@timmorgan.org
@@ -47,7 +61,12 @@ extra_rdoc_files: []
 files:
 - README.md
 - lib/bible_ref.rb
-- lib/bible_ref/book.rb
+- lib/bible_ref/canons.rb
+- lib/bible_ref/canons/protestant.rb
+- lib/bible_ref/languages.rb
+- lib/bible_ref/languages/base.rb
+- lib/bible_ref/languages/english.rb
+- lib/bible_ref/languages/portuguese.rb
 - lib/bible_ref/parser.rb
 - lib/bible_ref/reference.rb
 - lib/bible_ref/version.rb

data/lib/bible_ref/book.rb

@@ -1,218 +0,0 @@
-module BibleRef
-
-  class UnknownCanon < StandardError; end
-
-  class Book
-
-    CANONS = {
-      protestant: %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
-        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
-      )
-    }
-
-    BOOKS = {
-      'GEN' => /^gen/,
-      'EXO' => /^ex/,
-      'LEV' => /^le?v/,
-      'NUM' => /^nu/,
-      'DEU' => /^de?ut/,
-      'JOS' => /^jos/,
-      'JDG' => /^ju?dg/,
-      'RUT' => /^ru/,
-      '1SA' => /^1 sa?m/,
-      '2SA' => /^2 sa?m/,
-      '1KI' => /^1 (king|kgs)/,
-      '2KI' => /^2 (king|kgs)/,
-      '1CH' => /^1 chr/,
-      '2CH' => /^2 chr/,
-      'EZR' => /^ez/,
-      'NEH' => /^ne/,
-      'EST' => /^est/,
-      'JOB' => /^jo?b/,
-      'PSA' => /^ps/,
-      'PRO' => /^pro?v/,
-      'ECC' => /^ecc/,
-      'SNG' => /^so?ng|^sol|^sg$/,
-      'ISA' => /^isa/,
-      'JER' => /^jer/,
-      'LAM' => /^lam/,
-      'EZK' => /^ez/,
-      'DAN' => /^dan/,
-      'HOS' => /^hos/,
-      'JOL' => /^joel/,
-      'AMO' => /^amo/,
-      'OBA' => /^ob/,
-      'JON' => /^jona/,
-      'MIC' => /^mi/,
-      'NAM' => /^nah/,
-      'HAB' => /^hab/,
-      'ZEP' => /^zep/,
-      'HAG' => /^hag/,
-      'ZEC' => /^zec/,
-      'MAL' => /^mal/,
-      'TOB' => /^tob/,
-      'JDT' => /^jud/,
-      'ESG' => /^est.*greek/,
-      'WIS' => /^wisdom/,
-      'SIR' => /^sir/,
-      'BAR' => /^bar/,
-      'LJE' => /^jeremy/,
-      'S3Y' => /^3 holy/,
-      'SUS' => /^sus/,
-      'BEL' => /^bel/,
-      '1MA' => /^1 mac/,
-      '2MA' => /^2 mac/,
-      '1ES' => /^1 esd/,
-      'MAN' => /^prayer/,
-      'PS2' => /^psalm 151/,
-      '3MA' => /^3 mac/,
-      '2ES' => /^2 esd/,
-      '4MA' => /^4 mac/,
-      'MAT' => /^mat/,
-      'MRK' => /^ma?rk/,
-      'LUK' => /^lu?k/,
-      'JHN' => /^john|^jn/,
-      'ACT' => /^act/,
-      'ROM' => /^rom/,
-      '1CO' => /^1 cor/,
-      '2CO' => /^2 cor/,
-      'GAL' => /^gal/,
-      'EPH' => /^eph/,
-      'PHP' => /^phil/,
-      'COL' => /^col/,
-      '1TH' => /^1 the?s/,
-      '2TH' => /^2 the?s/,
-      '1TI' => /^1 tim/,
-      '2TI' => /^2 tim/,
-      'TIT' => /^tit/,
-      'PHM' => /^phi?l/,
-      'HEB' => /^heb/,
-      'JAS' => /^jam/,
-      '1PE' => /^1 pet/,
-      '2PE' => /^2 pet/,
-      '1JN' => /^1 jo?h?n/,
-      '2JN' => /^2 jo?h?n/,
-      '3JN' => /^3 jo?h?n/,
-      'JUD' => /^jud/,
-      'REV' => /^re?v/
-    }
-
-    FORMATTED_BOOKS = {
-      'GEN' => 'Genesis',
-      'EXO' => 'Exodus',
-      'LEV' => 'Leviticus',
-      'NUM' => 'Numbers',
-      'DEU' => 'Deuteronomy',
-      'JOS' => 'Joshua',
-      'JDG' => 'Judges',
-      'RUT' => 'Ruth',
-      '1SA' => '1 Samuel',
-      '2SA' => '2 Samuel',
-      '1KI' => '1 Kings',
-      '2KI' => '2 Kings',
-      '1CH' => '1 Chronicles',
-      '2CH' => '2 Chronicles',
-      'EZR' => 'Ezra',
-      'NEH' => 'Nehemiah',
-      'EST' => 'Esther',
-      'JOB' => 'Job',
-      'PSA' => 'Psalms',
-      'PRO' => 'Proverbs',
-      'ECC' => 'Ecclesiastes',
-      'SNG' => 'Song of Solomon',
-      'ISA' => 'Isaiah',
-      'JER' => 'Jeremiah',
-      'LAM' => 'Lamentations',
-      'EZK' => 'Ezekiel',
-      'DAN' => 'Daniel',
-      'HOS' => 'Hosea',
-      'JOL' => 'Joel',
-      'AMO' => 'Amos',
-      'OBA' => 'Obadiah',
-      'JON' => 'Jonah',
-      'MIC' => 'Micah',
-      'NAM' => 'Nahum',
-      'HAB' => 'Habakkuk',
-      'ZEP' => 'Zephaniah',
-      'HAG' => 'Haggai',
-      'ZEC' => 'Zechariah',
-      'MAL' => 'Malachi',
-      'TOB' => 'Tobit',
-      'JDT' => 'Judith',
-      'ESG' => 'Esther (Greek)',
-      'WIS' => 'Wisdom of Solomon',
-      'SIR' => 'Sirach',
-      'BAR' => 'Baruch',
-      'LJE' => 'Jeremy’s Letter',
-      'S3Y' => '3 Holy Children’s Song',
-      'SUS' => 'Susanna',
-      'BEL' => 'Bel and the Dragon',
-      '1MA' => '1 Maccabees',
-      '2MA' => '2 Maccabees',
-      '1ES' => '1 Esdras',
-      'MAN' => 'Prayer of Manasses',
-      'PS2' => 'Psalm 151',
-      '3MA' => '3 Maccabees',
-      '2ES' => '2 Esdras',
-      '4MA' => '4 Maccabees',
-      'MAT' => 'Matthew',
-      'MRK' => 'Mark',
-      'LUK' => 'Luke',
-      'JHN' => 'John',
-      'ACT' => 'Acts',
-      'ROM' => 'Romans',
-      '1CO' => '1 Corinthians',
-      '2CO' => '2 Corinthians',
-      'GAL' => 'Galatians',
-      'EPH' => 'Ephesians',
-      'PHP' => 'Philippians',
-      'COL' => 'Colossians',
-      '1TH' => '1 Thessalonians',
-      '2TH' => '2 Thessalonians',
-      '1TI' => '1 Timothy',
-      '2TI' => '2 Timothy',
-      'TIT' => 'Titus',
-      'PHM' => 'Philemon',
-      'HEB' => 'Hebrews',
-      'JAS' => 'James',
-      '1PE' => '1 Peter',
-      '2PE' => '2 Peter',
-      '1JN' => '1 John',
-      '2JN' => '2 John',
-      '3JN' => '3 John',
-      'JUD' => 'Jude',
-      'REV' => 'Revelation'
-    }
-
-    def initialize(book, canon=:protestant)
-      @canon = canon
-      unless CANONS[@canon]
-        raise UnknownCanon.new("#{canon} is not known. Canons this library support are: #{CANONS.join(', ')}")
-      end
-      @book = replace_roman_numerals(book).downcase
-    end
-
-    def id
-      CANONS[@canon].each do |book|
-        match = BOOKS[book]
-        return book if @book =~ match
-      end
-      nil
-    end
-
-    def formatted
-      FORMATTED_BOOKS[id]
-    end
-
-    private
-
-    def replace_roman_numerals(book)
-      book.sub!(/^iii/i, '3')
-      book.sub!(/^ii/i, '2')
-      book.sub!(/^i/i, '1')
-      book
-    end
-
-  end
-end