pericope 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 698c96ecdc048ebb8e7a58a9f148cefc8e4624ad
-  data.tar.gz: 797d432c67c6a4cb59e112b72a61121a5ad65036
+  metadata.gz: 0e48633c3d81555ea2a699d359437bcbebfae2c3
+  data.tar.gz: b9017728cd671d4c9d24ed5612ffbf6459e38068
 SHA512:
-  metadata.gz: 430308f6c397f366d43b1d752c12929a51279b23ac4fd9d1ca14d8c3de8e130ba95284710823072dc78d7940a016e235b43673e2277f17b0d9524b4d02efa444
-  data.tar.gz: a013c095b00d59e156498f5c0d15014502f2c6e8fa734678e8ea8e0de4b4dd8fd9e66605a76eafd5693e5ea33771a7dfb6928474d104fd6e42249bc8c1074740
+  metadata.gz: 280f67bd0faf5654e48a15971ef1874df15b3a5802ad146b27367acb3dc95b3758278c889bf77ab0708c51ecd42886c92340ab825dda1b8880d433478dd8e0fd
+  data.tar.gz: e14e5dadefe61d965613f312d4b14e67566837ef248ae3b0d6bf2abb726f905397760d20b779d314e0b9b8e7327ac8e6fc7f8b2fdd17533fedea7c0ba1702ae8

data/lib/cli/base.rb

@@ -1,30 +1,18 @@
 module CLI
   class Base
 
-
-
     def self.command(name, description, &block)
-
     end
 
-
-
     def self.print_commands
       usage = ""
-
     end
 
-
-
   private
 
-
-
     def commands
       @commands || {}
     end
 
-
-
   end
 end

data/lib/cli/command.rb

@@ -1,23 +1,15 @@
 module CLI
   class Command
 
-
-
     def initialize(name, description, &block)
       @name, @description, @block = name, description, &block
     end
 
-
-
     attr_reader :name, :description
 
-
-
     def execute
       @block.call
     end
 
-
-
   end
 end

data/lib/pericope.rb

@@ -20,6 +20,10 @@ class Pericope
       @ranges = Pericope.group_array_into_ranges(arg)
 
     when Range
+      STDERR.puts "DEPRECATION WARNING: instantiating a pericope with a single range is deprecated and will be removed in pericope 1.0.",
+           "",
+           "   You can change `Pericope.new(range)` to `Pericope.new(range.to_a)`",
+           ""
       set_book Pericope.get_book(arg.begin)
       @ranges = [arg]
 
@@ -101,8 +105,12 @@ class Pericope
 
 
   def self.sub(text)
-    segments = split(text)
-    segments.inject("") do |text, segment|
+    STDERR.puts "DEPRECATION WARNING: Pericope.sub is deprecated and will be removed in pericope 1.0.",
+         "",
+         "   You can use `Pericope.split` with `inject` to replace pericopes in a block of text",
+         ""
+
+    split(text).inject("") do |text, segment|
       if segment.is_a?(String)
         text << segment
       else
@@ -114,6 +122,8 @@ class Pericope
 
 
   def self.rsub(text)
+    STDERR.puts "DEPRECATION WARNING: Pericope.rsub is deprecated and will be removed in pericope 1.0."
+
     text.gsub(/\{\{(\d{7,8} ?)+\}\}/) do |match|
       ids = match[2...-2].split.collect(&:to_i)
       Pericope.new(ids).to_s
@@ -138,6 +148,10 @@ class Pericope
     [book, ranges].hash
   end
 
+  def <=>(other)
+    to_a <=> other.to_a
+  end
+
 
 
   def to_a
@@ -173,6 +187,7 @@ class Pericope
     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)
+    always_print_verse_range = true unless book_has_chapters?
 
     s = ""
     ranges.each_with_index do |range, i|
@@ -219,9 +234,9 @@ class Pericope
 
   def intersects?(pericope)
     return false unless pericope.is_a?(Pericope)
-    return false unless (self.book == pericope.book)
+    return false unless book == pericope.book
 
-    self.ranges.each do |self_range|
+    ranges.each do |self_range|
       pericope.ranges.each do |other_range|
         return true if (self_range.end >= other_range.begin) and (self_range.begin <= other_range.end)
       end
@@ -373,14 +388,11 @@ private
   end
 
   def self.parse_reference(book, reference)
-    reference = normalize_reference(reference)
-    parse_ranges(book, reference.split(/[,;]/))
+    parse_ranges(book, normalize_reference(reference).split(/[,;]/))
   end
 
   def self.normalize_reference(reference)
-    reference = reference.to_s
-    NORMALIZATIONS.each { |(regex, replacement)| reference.gsub!(regex, replacement) }
-    reference
+    NORMALIZATIONS.reduce(reference.to_s) { |reference, (regex, replacement)| reference.gsub(regex, replacement) }
   end
 
   def self.parse_ranges(book, ranges)

data/lib/pericope/cli.rb

@@ -98,8 +98,7 @@ Commands
 
 
   private
-
-
+    attr_reader :options, :input
 
     def initialize(*args)
       @options = extract_options!(*args)
@@ -107,17 +106,8 @@ Commands
       @input = $stdin.read if $stdin.stat.pipe?
     end
 
-
-
-    attr_reader :options, :input
-
-
-
     def extract_options!(*args)
       {} # No options accepted yet
     end
-
-
-
   end
 end

data/lib/pericope/version.rb

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

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: pericope
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Bob Lail
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-30 00:00:00.000000000 Z
+date: 2018-08-21 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement