pericope 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab67c11e856b86c538704505aab0d04ac0fbae42
-  data.tar.gz: 2a76d75eec804384c8e80dca7b6e887d0b5d3882
+  metadata.gz: e9520cfcbbe46071bc2f891a3eb1cd2c4790b88b
+  data.tar.gz: 06d8cc8008621dd923b08054a63cfb627f532f57
 SHA512:
-  metadata.gz: 31d08e0db1237a628c3bfc030dd369b6da47ea7ffcc754902e93ec0f220ec70ef3c2c1bb8c0691bc109b003944c1131ae68060700bc7aa0d3813fc5b29eee504
-  data.tar.gz: 887c38d4c421b9b56cba1072d16b28d49d342ffb17b37fa2e0e3d2066ab9ab4d668138c646e6a51f012a60b2f0c3cf772c57f6e5bd2194384e15bced497c4ee4
+  metadata.gz: 1b8e7a0866232493e1bd8b36d80ff5baefa278df4f76129e6f130e56cc2a73b4190aa9ef26a2555399733c583f76315608d140ff6787fb91473a0b56af4757c2
+  data.tar.gz: 643ca5b7bdcd8fcaef115c2afd7c13a91c835c0d6b520422c90cdf63211570a124039bd223a832b5f8c0c972caef7ed70d10cc4211df37df817357488c7d0012

data/bin/console

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "pericope"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start

data/bin/pericope

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 $:.unshift File.expand_path("../../lib", __FILE__)
-require 'pericope/cli'
+require "pericope/cli"
 
 command = ARGV.shift
 arguments = ARGV

data/lib/pericope.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require 'pericope/version'
+require "pericope/version"
 
 class Pericope
   attr_reader :book,
@@ -54,7 +54,7 @@ class Pericope
 
 
   def self.book_has_chapters?(book)
-    book_chapter_counts[book - 1] > 1
+    book_chapter_counts[book] > 1
   end
 
   def book_has_chapters?
@@ -172,8 +172,8 @@ class Pericope
 
 
 
-  def to_s
-    "#{book_name} #{self.well_formatted_reference}"
+  def to_s(options={})
+    "#{book_name} #{well_formatted_reference(options)}"
   end
 
 
@@ -209,19 +209,34 @@ class Pericope
 
 
 
-  def well_formatted_reference
+  def well_formatted_reference(options={})
     recent_chapter = nil # e.g. in 12:1-8, remember that 12 is the chapter when we parse the 8
     recent_chapter = 1 unless book_has_chapters?
-    ranges.map do |range|
+
+    verse_range_separator = options.fetch(:verse_range_separator, "–") # en-dash
+    chapter_range_separator = options.fetch(:chapter_range_separator, "—") # em-dash
+    verse_list_separator = options.fetch(:verse_list_separator, ", ")
+    chapter_list_separator = options.fetch(:chapter_list_separator, "; ")
+    always_print_verse_range = options.fetch(:always_print_verse_range, false)
+
+    s = ""
+    ranges.each_with_index do |range, i|
       min_chapter = Pericope.get_chapter(range.begin)
       min_verse = Pericope.get_verse(range.begin)
       max_chapter = Pericope.get_chapter(range.end)
       max_verse = Pericope.get_verse(range.end)
-      s = ""
 
-      if min_verse == 1 and max_verse >= Pericope.get_max_verse(book, max_chapter)
+      if i > 0
+        if recent_chapter == min_chapter
+          s << verse_list_separator
+        else
+          s << chapter_list_separator
+        end
+      end
+
+      if min_verse == 1 && max_verse >= Pericope.get_max_verse(book, max_chapter) && !always_print_verse_range
         s << min_chapter.to_s
-        s << "-#{max_chapter}" if max_chapter > min_chapter
+        s << "#{chapter_range_separator}#{max_chapter}" if max_chapter > min_chapter
       else
         if recent_chapter == min_chapter
           s << min_verse.to_s
@@ -232,18 +247,17 @@ class Pericope
 
         if range.count > 1
 
-          s << "-"
           if min_chapter == max_chapter
-            s << max_verse.to_s
+            s << "#{verse_range_separator}#{max_verse}"
           else
             recent_chapter = max_chapter
-            s << "#{max_chapter}:#{max_verse}"
+            s << "#{chapter_range_separator}#{max_chapter}:#{max_verse}"
           end
         end
       end
+    end
 
-      s
-    end.join(", ")
+    s
   end
 
 
@@ -269,7 +283,7 @@ class Pericope
   end
 
   def self.get_max_chapter(book)
-    book_chapter_counts[book - 1]
+    book_chapter_counts[book]
   end
 
 
@@ -280,8 +294,8 @@ private
 
   def set_book(value)
     @book = value || raise(ArgumentError, "must specify book")
-    @book_name = Pericope.book_names[@book - 1]
-    @book_chapter_count = Pericope.book_chapter_counts[@book - 1]
+    @book_name = Pericope.book_names[@book]
+    @book_chapter_count = Pericope.book_chapter_counts[@book]
   end
 
 
@@ -482,7 +496,7 @@ private
     current_book_id = nil
     chapters = 0
     @chapter_verse_counts = {}
-    @book_chapter_counts = []
+    @book_chapter_counts = [{}]
 
     path = File.expand_path(File.dirname(__FILE__) + "/../data/chapter_verse_count.txt")
     File.open(path) do |file|
@@ -522,7 +536,7 @@ private
         # as the aforementioned book.
         segments = text.chomp.split("\t")
         book_id = segments.shift.to_i
-        @book_names[book_id - 1] = segments.shift
+        @book_names[book_id] = segments.shift
         @book_name_regexes[book_id] = /\b(?:#{segments.join("|")})\b/
       end
     end

data/lib/pericope/cli.rb

@@ -1,5 +1,5 @@
-require 'pericope'
-require 'cli/base'
+require "pericope"
+require "cli/base"
 
 class Pericope
   class CLI

data/lib/pericope/version.rb

@@ -1,3 +1,3 @@
 class Pericope
-  VERSION = "0.6.5" unless defined?(::Pericope::Version)
+  VERSION = "0.6.6" unless defined?(::Pericope::Version)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pericope
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Bob Lail
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-22 00:00:00.000000000 Z
+date: 2016-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -106,6 +106,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.mdown
+- bin/console
 - bin/pericope
 - data/book_abbreviations.txt
 - data/chapter_verse_count.txt