pericope 0.5.2 → 0.5.3

data/lib/pericope.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require 'yaml'
 require 'pericope/version'
 
@@ -10,11 +12,18 @@ class Pericope
               :ranges
   
   
-  
   def self.book_names
     @@book_names ||= ["Genesis", "Exodus", "Leviticus", "Numbers", "Deuteronomy", "Joshua", "Judges", "Ruth", "1 Samuel", "2 Samuel", "1 Kings", "2 Kings", "1 Chronicles", "2 Chronicles", "Ezra", "Nehemiah", "Esther", "Job", "Psalm", "Proverbs", "Ecclesiastes", "Song of Songs", "Isaiah", "Jeremiah", "Lamentations", "Ezekiel", "Daniel",  "Hosea", "Joel", "Amos", "Obadiah", "Jonah", "Micah", "Nahum", "Habakkuk", "Zephaniah", "Haggai", "Zechariah", "Malachi", "Matthew", "Mark", "Luke", "John", "Acts", "Romans", "1 Corinthians", "2 Corinthians", "Galatians", "Ephesians", "Philippians", "Colossians", "1 Thessalonians", "2 Thessalonians", "1 Timothy", "2 Timothy", "Titus", "Philemon", "Hebrews", "James", "1 Peter", "2 Peter", "1 John ", "2 John", "3 John", "Jude", "Revelation"]
   end
   
+  def self.book_name_regexes
+    @@book_name_regexes ||= begin
+      book_abbreviations.map do |book|
+        [book, Regexp.new("\\b#{book[1]}\\b.? (#{ValidReference})", true)]
+      end
+    end
+  end
+  
   
   
   def initialize(string_or_array)
@@ -240,9 +249,10 @@ private
   end
   
   def normalize_reference(reference)
-    { %r{(\d+)[".](\d+)} => '\1:\2',       # 12"5 and 12.5 -> 12:5
-      %r{[^0-9,:;-]} => ''                 # remove everything but [0-9,;:-]
-    }.each {|pattern, replacement| reference.gsub!(pattern, replacement)}
+    [ [%r{(\d+)[".](\d+)},'\1:\2'],       # 12"5 and 12.5 -> 12:5
+      [%r{(–|—)},'-'],                     # convert em dash and en dash to -
+      [%r{[^0-9,:;\-–—]},'']              # remove everything but [0-9,;:-]
+    ].each { |pattern, replacement| reference.gsub!(pattern, replacement) }
     reference
   end
   
@@ -345,15 +355,16 @@ private
   def self.match_all(text, &block)
     matches = []
     unmatched = text
-    for book in book_abbreviations
-      rx = Regexp.new("\\b#{book[1]}\\b.? (#{ValidReference})", true)
+    
+    for book_regex in book_name_regexes
+      rx = book_regex[1]
       while (match = unmatched.match rx) # find all occurrences of pericopes in this book
         length = match.end(0) - match.begin(0)
         
         # after matching "2 Peter" don't match "Peter" again as "1 Peter"
         # but keep the same number of characters in the string so indices work
         unmatched = match.pre_match + ("*" * length) + match.post_match
-        match.instance_variable_set('@book', book[0])
+        match.instance_variable_set('@book', book_regex[0][0])
         if block_given?
           yield match
         else
@@ -516,15 +527,8 @@ private
       22]       # Revelation      66
   end
   
-  
-  
   ValidReference = begin
-    chapter = '\d{1,3}' # matches 0-999
-    verse = '\d{1,3}[ab]?' # matches 0-999 with or without 'a' or 'b' afterward
-    chapter_verse = "#{chapter}(?:\\s?[.:\"]\\s?#{verse})?" # matches chapter with or without verse reference
-    chapter_verse_range = "(?:#{chapter_verse}(?:\\s?[\\&\\-]\\s?(?:(?:#{chapter_verse})|(?:#{verse})))?)"
-     # "(#{chapter}(?:[.:]#{verse})?(?:\\s?[\\&\\-]\\s?(?:#{verse}(?:[.:]\\d{1,3})?)?)" # chapter:verse reference
-    reference = "#{chapter_verse_range}(?:\\s?[,;]\\s?#{chapter_verse_range})*" # multiple chapter:verse references
+    reference = '((\s*\d{1,3})(\s*[:\"\.]\s*\d{1,3}(a|b)?(\s*(,|;)\s*(\d{1,3}[:\"\.])?\s*\d{1,3}(a|b)?)*)?(\s*(-|–|—)\s*(\d{1,3}\s*[:\"\.])?(\d{1,3}(a|b)?)(\s*(,|;)\s*(\d{1,3}\s*[:\"\.])?\s*\d{1,3}(a|b)?)*)*)'
   end
   
   

data/lib/pericope/version.rb

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

metadata

@@ -1,47 +1,56 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: pericope
-version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
-  segments: 
-  - 0
-  - 5
-  - 2
-  version: 0.5.2
+version: !ruby/object:Gem::Version
+  version: 0.5.3
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Bob Lail
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-10-26 00:00:00 -05:00
-default_executable: pericope
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-09-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: turn
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
-email: 
+email:
 - bob.lailfamily@gmail.com
-executables: 
+executables:
 - pericope
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - bin/pericope
 - data/book_abbreviations.txt
 - data/chapter_verse_count.txt
@@ -53,41 +62,28 @@ files:
 - lib/pericope.rb
 - lib/tasks/pericope_tasks.rake
 - README.mdown
-has_rdoc: true
 homepage: http://github.com/boblail/Pericope
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Parses Bible references
 test_files: []
-