kjlite 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5cde0f8d3eddc5f53ac438664f8429ccb1ac40b98264a5bb362dcb468b8572f
-  data.tar.gz: 556f581983938d18ac256f622485ebab6a22c98692221460288032e96067a931
+  metadata.gz: d9828f3ba1ba9e27da83bdd6f1bf8d9c68736fc716ad520201a4c97d3cd47003
+  data.tar.gz: 62e27f180ddf0603f06352ebef55495314fec8fe8e095ca950ea9ee035d5d7f0
 SHA512:
-  metadata.gz: 8c26d4b31d50b8b52e627e933b2bb67ef7c7fb60c67eae09ed8b00b3683b1523be5dd1250e62dfa4293ab1af86891d31f560c94bb2b2a9e2bedaf698e82d6a12
-  data.tar.gz: 891e58b74defaeca770ce2bbaeed0cc6222741e19584b650e14633d03afb5bf8e0d316c4c57db6bdf55c24c1746b58c829d1881cbb2bd45281238c551828b628
+  metadata.gz: 43cc29791deeea09d3f4eefc64c150b545d6821f3e47e84089b999e0a8079e1992f2c69b536d9779e2f6a11c21fd0a2e09057a3eaa43cfb8cbb882bdf662de74
+  data.tar.gz: b4b72cb2da6d3a5871eceb7824654d53b57ca677d56aa21f89502d04882a4c1bc17e0b6002dbb6de3be81494ad99ec347ccb1ddd896765d611d44da7f68b65a1

data/lib/kjlite.rb

@@ -24,7 +24,7 @@ module KjLite
     end
 
     def text()
-      @verse[/^\d+:\d+:\d+\s+(.*)/m,1].gsub(/[\r\n]|\s\s/,'')
+      @verse[/^\d+:\d+:\d+\s+(.*)/m,1].gsub(/[\r\n\s]+/,' ').rstrip
     end
 
     def title()
@@ -53,11 +53,15 @@ module KjLite
     def verses(*list)
 
       puts 'inside verses' if @debug
+      puts '@verses: ' + @verses.inspect if @debug
       
       list = list.first.to_a if list.first.is_a? Range
 
       if list.empty? then
-        return @verses.map.with_index {|x,i| Verse.new @book_name, @id, i+1, x}
+        return @verses.map.with_index do |x,i|
+          #puts 'x: ' + x.inspect
+          Verse.new @book_name, @id, i+1, x, debug: @debug
+        end
       elsif list.length < 2
         Verse.new @book_name, @id, list.first, @verses[list.first.to_i-1]
       else
@@ -129,7 +133,7 @@ module KjLite
 
     attr_reader :to_h, :to_s, :booklist
 
-    def initialize(url='http://www.gutenberg.org/cache/epub/30/pg30.txt',
+    def initialize(url='https://gutenberg.org/cache/epub/30/pg30.txt',
                   debug: false)
       
       filename, @debug = 'kjbible.txt', debug
@@ -137,14 +141,14 @@ module KjLite
       if File.exists?(filename) then
         s = File.read(filename)
       else
-        s = open(url).read
+        s = URI.open(url).read
         File.write filename, s
       end
 
       s2 = s.split(/.*(?=^Book 01)/,3).last; 0
       a = s2.split(/.*(?=^Book \d+)/); 0
 
-      h = a.inject({}) do |r,x|
+      @h = a.inject({}) do |r,x|
 
         title, body = x.match(/^Book \d+\s+([^\r]+)\s+(.*)/m).captures
 
@@ -153,14 +157,16 @@ module KjLite
         r.merge(title => a3[1..-1])  
 
       end
-
+      
+      #puts '@h: ' + @h.keys.inspect
+=begin
       @h = h.group_by {|key, _| key[/\d*\s*(.*)/,1]}; 0
 
       @h.each do |key, value|
         @h[key] = value.length < 2 ? value.last.last : value.map(&:last)
       end
-
-      @to_h, @to_s, @booklist = @h, s, h.keys
+=end
+      @to_h, @to_s, @booklist = @h, s, @h.keys
 
     end
 
@@ -171,17 +177,13 @@ module KjLite
       index = ref.to_s[/^\d+$/] ? (ref.to_i - 1) : find_book(ref.downcase)
       puts 'index: ' + index.inspect if @debug
       title = @booklist[index]
-      r = @h[title.sub(/^\d+\s+/,'')]
+      #r = @h[title.sub(/^\d+\s+/,'')]
+      r = @h[title]
 
       puts 'r: '  + r.class.inspect if @debug
 
-      if r.length > 3 then
-        Book.new index+1, title, r, debug: @debug
-      else
-        i = ref[/\d+/].to_i - 1
-        a = r.map.with_index {|x,i| Book.new index+1, title, r[i], debug: @debug}
-        a[i]
-      end
+      Book.new index+1, title, r, debug: @debug
+
     end
 
     def inspect()
@@ -204,6 +206,8 @@ module KjLite
 
     def find_book(ref)
 
+      puts 'find_book/ref: ' + ref.inspect if @debug
+      
       h = @booklist.inject({}) do |r,rawx|
 
         x = rawx.downcase
@@ -215,20 +219,19 @@ module KjLite
           NoVowels.compact(x.sub(/(\d)\s/,'\1')),
           NoVowels.compact(x.sub(/(\d)\s/,'\1-')),
         ]
-        puts 'a3: ' + a3.inspect if @debug
+        #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
+      #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
+      puts '_r: ' + r.inspect if @debug
+      @booklist.index r.first if r
 
     end
 
   end
 
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kjlite
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -10,32 +10,33 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTkxMTEwMjI1ODIwWhcN
-  MjAxMTA5MjI1ODIwWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCopv51
-  GSwrFtZUTZpTIu7RGRwQ6Alj9l6deGz5fi8X8rBSYJdH0G//3O0ZReVmvNrWCHpT
-  Wda7myeLOuSJglqPNbI9ECj4eO25TYm4GYnPUGcmH9D4zPF/Bi3WfEZqSKxnJ1pg
-  FcABSvyE+NzUldKPONAYriTl5jTu/5rPwoyJD6TlhYbilbZtuB9E7A30umghbmFr
-  SF3pnnJ10l4JNWxujL1o/UMrxJgn8hjca5PhPA/mEE1IUPwBQZGVzNLsosAPcqqq
-  7DPwD58wSExY7WrAgA7OQpeX8Arau5X2ccDIySWuBzejatnAfMca6SC1zcLaisXP
-  UCxxTyGAonlucgyHsLEkGIIzFRILZmRSDVLiLTMBhLgTfR8dPhfRjhTyAPxi4sim
-  MsWnZWV8CsjnS9a0rUpbtsXFwfYDtZPlZLjAX0uNIeR+/WpvZ7eAkF+KVXgEIZO1
-  JlpVEXMlr72FcydMKzlTHZPJ5kItZzOhv4UMDXH1W069vyH/NagwWHHPS1kCAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUUY19rBvg
-  tJDEFelRWmMqi8ybjkYwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
-  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAZpm2BvDzdbS1dhq018OOP6Dr84Dq3smOlQjhUJEc
-  o48tImCU1S9wEjGb589kAIRUTUUw9o65QBi8Ruvm20nqrT8yZzj8C7QU+IPO2lXX
-  BHiaMWsxZm0hl7D5wjxTbO8z07KNZezXaecCqTYVIJ77HABB8EUedZSbvsDkS+16
-  F3JJvL6yz2nKMSnIXdddSz09NVA3CGp5xtgUCK3rxaI70fDIxhdoxcMeriImnF/k
-  BtVMP6sCY7YgHeGEqvvX6JrRoTq5IXOgURufKe+UYEe2h6r7MVxB6EX99PnDjQe9
-  mpk8pHkDTiOsamwzdRl5g1utCWoEGGcR5RdDDXkGIHPZfpKSo63Ci+3x4s6PMcOy
-  nH689Sdw5mNWuIhVvszKA+jrCHbqMrrPUuRR8QBGl7dtDw3CIbN1SzGrG9qSTaE4
-  7Gcy8IrLOPU1HEKZKt+vY47mSWAUSe+4nwxccGZyHJtZtFdnPtvDyuAjH2+u4T2k
-  Dr1Vid3kU5/7VH1UBV1RZs5P
+  MIIEljCCAv6gAwIBAgIBATANBgkqhkiG9w0BAQsFADBIMRIwEAYDVQQDDAlnZW1t
+  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
+  8ixkARkWAmV1MB4XDTIyMDcxNDE2MjU0NFoXDTIzMDcxNDE2MjU0NFowSDESMBAG
+  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
+  EjAQBgoJkiaJk/IsZAEZFgJldTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoC
+  ggGBAL8RMmMCCcZQc/yAuYF7WwTixiT6gJVIwQAG/DgXzK3bz0wYm6k1E+N1elSl
+  q1SsVJaxvRhjrWAFbDnQ2/DXznR6kxUJcZ2D9Uki/0UCXdezcQQo+u+SuN6JoydO
+  Ltz0l++FcBX8vL3+8jYX0v7qKL5xRwxl4gIknXzFdD8sWPgsSTmwwSPpQHBVvte5
+  FvBQ9SyMAm+WY2lgzEgX13pkkOCXjau6XG9eUe2mJuh6RNFao/7llyGfTiF2EbkA
+  NHY3VO9lMdFJKkJeY80rwc46I6jpkXKx9YAlXwS2B661upWxfqFsbMe+NAWP3Xei
+  rMoPHxA/jTDmQmAc986ds5xnUI0e8Yr5sWvettnXRjBlHNPuPGXJ2CQ8SJpYZFTb
+  ZPSA9J3vxMIuuvEMDi7NJfp3tZUDoGgJ8j3TY72f+YPaZnBt/rnK8TYnGSLVL/aH
+  K4k+DoNhJOYcTgMMeJVR02btUvKZ2Ng3sjoZrwfd6v9We1/VUc2SGGDXNpYOV15g
+  AGoIvwIDAQABo4GKMIGHMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
+  BBQrLaOlOCo7ywlFH8V4equPpNOUUTAmBgNVHREEHzAdgRtnZW1tYXN0ZXJAamFt
+  ZXNyb2JlcnRzb24uZXUwJgYDVR0SBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MA0GCSqGSIb3DQEBCwUAA4IBgQA5EE7vv2TTT910hemLew1agXYVt7DH
+  O7HH+UBS+3PMIS/aXmgEwHeVhYAUrpdq3nborOcpWX84hNBIP2OKLOJWeqRHK2Yb
+  lLKXVO0PDivkXxMiie5gxP6Bcm04l53OUrOnmoWg8F9OaFpSwN3ZC+Y3vFx1FK4s
+  kodmyO5hiBeIy5ZBOcyZmE4KLjxANwrFcz56iPoe4m8sNIM1wpPCn8Gim0Aqb6rA
+  ToIWu8HKGZirK8lDNT1TnDAEfeieMeQE+ha3MycqPQjTUOffqd9jIKf8zMelIXXX
+  EDbY7W3a8ntMUSyX+3FD1k/JNGwgJ6hAIoEL1JklVBU0utqU+25IFkrwAzsGKzYX
+  wHsrBcLrEqKeQ4v6zBckiJcr+ibE19ycTKkwxjJtYMJBOA7VC62i1q132a+t6Co7
+  EALnBk6AgDlRDIbN+5DYzhfnTJ1Tjl8AktYuDKy5QnljJI1ywXdnUUQV4sbSUiIq
+  GLSnE26JTgh8Vx2YqZ7IisLxAR/yR2wdAG8=
   -----END CERTIFICATE-----
-date: 2019-11-10 00:00:00.000000000 Z
+date: 2022-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: novowels
@@ -58,7 +59,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.3
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -83,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: kjlist is a lightweight version of the kj gem for accessing the King James