bibletools 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5085703f655b244826701beeba91b5bbfc535a8d34f2d4fbbc842c6229ced5fa
-  data.tar.gz: 27639f898a9c016fdbaf47cbaddeae392c93500145492ea0ba51f1a2ebc82e1b
+  metadata.gz: e10c0e0f8c335ebc195c2086d59c3d27a9a4f3d2c19e42ba85bca938365a4c2b
+  data.tar.gz: bf5259405950f58998288d7d17f783a6672600c053617e56e34a5363c44f938f
 SHA512:
-  metadata.gz: a70124fe758ee62e6874e6126db903c56eb0edf8bd35f5ea7a80dae1917cc30c225191dc6eec93f35ac1f63b77dbaef461f25398a5a0db90684ece938aa427c8
-  data.tar.gz: 861ed48ae15f6d7516d98fac70e76b2b2bc6633c90f56193b7ca4f5f8fafbeee07e12ba8adbef23cb57119ef7c0a0c9ff31e7ec49a91383f695c19955dbfc9fc
+  metadata.gz: f8e7b6f0a5246ab59b5db9732c8ea29e34e354c687f6a6bdae7971a99f89947a53252acad367d0a006984fbd1bf7c8349f09cf21b2b7f9b4e66d42a25a53e087
+  data.tar.gz: 9fd82593908e3f1a97b0a65f5d7b77bc34b8fc3e343abe1d4b81e66d4f8bb152dab81efcf3a0424a306d8df4621c7bff5a93473e5cf3b9a4e70ae8950ed897b8

data/lib/bibletools.rb

@@ -93,17 +93,21 @@ module BibleTools
   
   class Scraper
 
-    def initialize(book: 'Exodus', url: '')
+    def initialize(book: 'Exodus', url: '', debug: false)
       
       raise ScraperErr, 'Please specify the URL' if url.empty?
       
       baseurl = url
 
       id = if book.is_a? String then
-        (BOOKS.index(book) + 1).to_s
+        i = BOOKS.index(book.gsub(/\b./){|x| x.upcase})
+        puts 'book *' + book + '* not found' unless i
+        (i + 1).to_s
       else
         book.to_s
       end
+      
+      puts 'id: ' + id.inspect if @debug
 
       url2 = baseurl + '?id=' + id
       doc = Nokorexi.new(url2).to_doc
@@ -180,9 +184,28 @@ module BibleTools
     #   Automatically select verses; verses are selected based upon word 
     # frequency 
     #
-    def asr()
+    def asr(chapters: [])
+      
+      r = if chapters.any? then
+        
+        doc = Rexle.new('<book/>')
+                
+        chapters.each do |n|
+          e2 = @doc.root.element("chapter[@no='#{n.to_s}']")
+          doc.root.add e2 if e2
+        end
+        
+        return doc
+        
+        keyword = wordtally(doc: doc).keys.first
+        #return keyword
+        #get the wordstally for the chapters
+        assoc_r(keyword, doc)
+        
+      else
+        assoc_r()
+      end
       
-      r = assoc_r()
       e = r[1].root.element('chapter/verse')
       verse_no = e.attributes[:no]
       chptr_no = e.parent.attributes[:no]
@@ -190,9 +213,11 @@ module BibleTools
       # we are backtracking the results to hopefully find a new branch to explore
       trail = r.first
 
+      #return r
       a, trail2 = mine_words(r, trail, level: 2)
       a << [chptr_no, verse_no,  e.text, 1]
-
+      puts 'a: ' + a.inspect
+      #return a
       h = a.group_by(&:first)
       a2 = h.sort_by {|x, _| x.to_i}
       @verses = a2.map do |chapter, verses|
@@ -266,9 +291,12 @@ module BibleTools
     def search(keyword, doc=@doc)
       
       verses = doc.root.xpath('chapter/verse')
+      puts 'verses: ' + verses.inspect
       a = verses.select {|x| x.text =~ /#{keyword}/i}
       
       a2 = a.map.with_index do |verse, i|
+        
+        #puts 'verse: ' + verse.xml.inspect
         txt = verse.text
         
         puts 'txt: ' + txt.inspect if @debug
@@ -278,9 +306,11 @@ module BibleTools
         
         until txt.rstrip[/[\.\?!]\W*$/] or n > 2 do
           n +=1
+          puts 'n: ' + n.inspect
           nverse = read(chapter, verse.attributes[:no].to_i + n)[0]
+          puts 'nverse: ' + nverse.inspect
           puts 'nverse: ' + nverse&.text.inspect if @debug
-          txt += nverse.text
+          txt += nverse.text if nverse
         end 
         
         if @debug then
@@ -396,10 +426,11 @@ module BibleTools
       puts 'trail.length: ' + trail.length.inspect if @debug
       puts 'verses.length: ' + verses.length.inspect if @debug
 
-      if verses.length < 30 or trail.length < 100
-        mine_words(r, trail, verses, level: level+1)
-      else
+      if verses.length > 30 or trail.length > 100
         [verses, trail]
+      else
+
+        mine_words(r, trail, verses, level: level+1)        
       end
     end    
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bibletools
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - James Robertson
@@ -36,7 +36,7 @@ cert_chain:
   hIlyeyH9vsaJLam1TYsSqh3KUBmRCIvc3XELg2MAlggTrHuCjBPdYXqjIOFvO6HZ
   Z1XDnMf4RhcEPF4AU3Q+Fefsw4qKRWH3YUw=
   -----END CERTIFICATE-----
-date: 2022-11-06 00:00:00.000000000 Z
+date: 2023-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokorexi
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.4
 signing_key: 
 specification_version: 4
 summary: Performs a word count within a specified book. Returns the verses within