kjdotxml 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9835d96c6c3c4fcbf12196f57c0c7f8ad8e369c0542b1ffb8bbd1f02eb7fd5dd
-  data.tar.gz: c28661e5fae357962cd14b59ca8ae507fc780baddc639babb9f6c023c11f0466
+  metadata.gz: a4e7b1b5b805baba3ea773f3d722b2c93d1a5da60eaf03b9ed6bc3009c89375a
+  data.tar.gz: f0ff7b1ac1e497034f1f9a4e9299cf4c7c004827e30cede18b71758f26625cc8
 SHA512:
-  metadata.gz: 7bfa7481e9bd9a2c459f92346c58a1de750b10974e5d5543394865a4fcf33a1c5c0d8240445e6004d1b0e8b33106bed801645b92546f9b23713ac9acc1f60ea2
-  data.tar.gz: 55206e69e0a81f30d3b4a5947558ec4bc4ee4f6182c61939d6291ef1e25eb660e4310f17b60515a6957eb5d186b9648264cf23ff9ddf777085211b51e7969c92
+  metadata.gz: e14d1410c7648573d99ab47a65115fd6a0cf4d9d03baf8dd59f2761f0843dcbd8fce2e112f0c1bddcc274dca309343302fa54d113774cf903c2a0fd64579856e
+  data.tar.gz: 9fc928be917d0411910d9c79f52db1e7c4ddd4d962dd9f9ed4db17cfb3bee60ad5c363abf5077bf15a2686293695429be5347f9a19d0c9d75da86f825186c919

data/lib/kjdotxml.rb

@@ -3,6 +3,8 @@
 # file: kjdotxml.rb
 
 require 'rexle'
+require 'abbrev'
+require 'novowels'
 
 
 BOOKS = [
@@ -78,15 +80,21 @@ 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)
     
     if File.exists? filepath then
@@ -100,11 +108,78 @@ 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 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

data.tar.gz.sig

@@ -1,5 +1,3 @@
-*yQg��ls���2��]�2��-�X}�H�Q����"����'�S�yTA�{�m��+
��bҌ_
-c��c
-4ܜ���7ڝ������o�o�p��T����
\7��5�����:�ŕ���:Lr�ئ�E�@UTWպ��0G��y�T�t�,H�_���
-�^՗�$[��=+�
(o]�ޟ�'̝P���5۸-v��K%�
-�+H}���`I(�p�ґ߲�4�����v[2
+OG.k���?3{3����6�R8�Cpz5xYd�>n�:��;�*�v�Ɉ����ž��
+%�@�Z���3p�4��N����
��n���ʙDb��v� УX,P�yE�9Ȭ��s�ړD�@������9v��xq�
+�p��b7��g�w`�1��u�#

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kjdotxml
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 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-02 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: []