kjdotxml 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9835d96c6c3c4fcbf12196f57c0c7f8ad8e369c0542b1ffb8bbd1f02eb7fd5dd
-  data.tar.gz: c28661e5fae357962cd14b59ca8ae507fc780baddc639babb9f6c023c11f0466
+  metadata.gz: 690ac5f8aa188410ddca62ae15087b3b5fc1dd3f04591e2f3d4b632e89160197
+  data.tar.gz: 3ce40599596b313c5c39860e1b2857a3856ff58412d9b57447447b357a18d793
 SHA512:
-  metadata.gz: 7bfa7481e9bd9a2c459f92346c58a1de750b10974e5d5543394865a4fcf33a1c5c0d8240445e6004d1b0e8b33106bed801645b92546f9b23713ac9acc1f60ea2
-  data.tar.gz: 55206e69e0a81f30d3b4a5947558ec4bc4ee4f6182c61939d6291ef1e25eb660e4310f17b60515a6957eb5d186b9648264cf23ff9ddf777085211b51e7969c92
+  metadata.gz: 4e91a9d1f12fd6eeb4c8bdd149e78b97b529c7d01fbcf90760aa4bc1e6864385972c0e1e3f3f2f8ab4152c68d5b6ec2ef7829c0be1ad7495dbe14d17d2f8f427
+  data.tar.gz: 998e8852ea26773c3ee40d72ef1acca782e64a8c162d9ab47479c001b0c8351f9bb98a9bba64f1d342e944b2a6900d2ec1867069489c46411802829decf07312

data/lib/kjdotxml.rb

@@ -3,6 +3,8 @@
 # file: kjdotxml.rb
 
 require 'rexle'
+require 'abbrev'
+require 'novowels'
 
 
 BOOKS = [
@@ -78,16 +80,23 @@ class KjDotXmlError < Exception
 end
 
 class KjDotXml
+  
+  attr_reader :booklist
 
-  def initialize(title=nil)
+  def initialize(title=nil, debug: false)
+    
+    @debug = debug
+    
     book(title) if title
+    @booklist = BOOKS
+    
   end
   
   def book(s)
         
     filename = s.downcase.gsub(/\s/,'-') + '.xml'
-    #filepath = File.join('/tmp', filename)
-    filepath = File.join(File.dirname(__FILE__), '..', 'xml', filename)
+    filepath = File.join('/home/james/jamesrobertson.eu/rorb/r/ruby/kjdotxml', filename)
+    #filepath = File.join(File.dirname(__FILE__), '..', 'xml', filename)
     
     if File.exists? filepath then
       
@@ -100,11 +109,88 @@ class KjDotXml
     
   end
   
-  def books()
-    BOOKS
+  def books(ref=nil)           
+    
+    return @booklist.map {|x| books(x) } unless ref
+
+    index = ref.to_s[/^\d+$/] ? (ref.to_i - 1) : find_book(ref.downcase)
+    puts 'index: ' + index.inspect if @debug
+    
+    title = @booklist[index]
+
+
   end
+  
+  def text(s)
+
+    s.strip.lines.map do |line|
+
+      [line, verses(line.chomp)]
+
+    end
+
+  end  
+
+  def verses(s)
+
+    r = s.match(/(?<book>\w+)\s+(?<chapter>\d+)[,\:]?\s*(?<verses>.*)/)
+    verses2 = r[:verses] =~ /(?:\.\.|,|-)/ ? Range.new(*r[:verses]\
+                        .split(/(?:\.\.|,|-)/).map(&:to_i)).to_a : r[:verses]
+    puts 'r[:book]: ' + r[:book].inspect if @debug
+    
+    doc = book(books(r[:book]))
+    
+    puts 'verses2: ' + verses2.inspect if @debug
+    
+    if verses2.is_a? String then
+      
+      [
+        doc.root.element("chapter[@no='#{r[:chapter]}']/verse" + 
+                         "[@no='#{verses2}']")
+      ]
+      
+    elsif verses2.is_a? Array
+      
+      verses2.map do |verse|
+        doc.root.element("chapter[@no='#{r[:chapter]}']/verse[@no='#{verse}']")
+      end
+      
+    end
+  end  
+ 
 
   def to_doc()
     @doc
   end
+  
+    private
+
+    def find_book(ref)
+
+      puts 'find_book/ref: ' + ref.inspect if @debug
+      
+      h = @booklist.inject({}) do |r,rawx|
+
+        x = rawx.downcase
+        a3 = [
+          x,
+          x.sub(/(\d)\s/,'\1'),
+          x.sub(/(\d)\s/,'\1-'),
+          NoVowels.compact(x),
+          NoVowels.compact(x.sub(/(\d)\s/,'\1')),
+          NoVowels.compact(x.sub(/(\d)\s/,'\1-')),
+        ]
+        #puts 'a3: ' + a3.inspect if @debug
+        a3b = a3.uniq.abbrev.keys.reject {|x| x[/^\s*\d+$/] or x.length < 2}
+        r.merge(rawx => a3b)
+
+      end
+      #puts 'h: '  + h.inspect if @debug
+      r = h.find {|key, val| val.grep(/#{ref}/).any? }
+      r = h.find {|key, vl| vl.grep(/#{ref.sub(/\d+\s*/,'')}/).any? } unless r
+      puts '_r: ' + r.inspect if @debug
+      @booklist.index r.first if r
+
+    end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kjdotxml
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - James Robertson
@@ -36,7 +36,7 @@ cert_chain:
   OXTrn4UmSRUyQHWNI24lThlPaWZJ6ULj4BtuALPaaM/cWYRhRaE3NiLF/SFiyzGg
   JYoHu6HVj1QoC6XZVMnuByx8sBhH1e/kRkk=
   -----END CERTIFICATE-----
-date: 2022-11-01 00:00:00.000000000 Z
+date: 2022-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexle
@@ -58,6 +58,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.14
+- !ruby/object:Gem::Dependency
+  name: novowels
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.3
 description: 
 email: digital.robertson@gmail.com
 executables: []