indexer101 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67c8317bb311f9715b5bbef8c325b7e0e76cf44cc7d1d83c5543f1758b67f9b2
-  data.tar.gz: 87c825fb9af605084589749fde1e8b07464c8e7d9cf7713f40e5e49351e4171e
+  metadata.gz: 7c44c75f333aede7455b835b40bf64d518200bc5fb957050015b3a3b0b2ad7d9
+  data.tar.gz: 1846323dc390c84218f75a7f0933636b0feefdf1ab80df4a3a093d34c2119cf4
 SHA512:
-  metadata.gz: 737e4933056905d48a68c0a42997ab19a465b37008cafde631370b5505c4adbe1f2a7fe10c3a763daba2e9d4505e44432d4118ea2acb5b7cf0399c8c886d36fc
-  data.tar.gz: 13478e980d89771fa0014c8ad2b0a7d866ac3139f8fe39ef9f69d59e543b97d031d78567b6fc1a5507bffb450a785be39f8d5761712fb1493d06510a078ed8e2
+  metadata.gz: a6f0276cf0a8ed7e547a19c3e230aa2b304652e561873db5ae085241d19015fb322678ae3115ae6f470a9a5a4129496216f45d6da73a361bbdfb1882ba689d26
+  data.tar.gz: 87923aa4206e3a1de391ae6594fed0df2fc7c3b9dcc1295404e8c2a560ca9d03c418d01f90fc48dd1e771b3345476921acd5b34dab5586fbe8ed74e7ccc15877

data/lib/indexer101.rb

@@ -127,12 +127,20 @@ class Indexer101
     threads = locations.flatten.map do |location|
       
       Thread.new {
-        
-        Thread.current[:v] = case File.extname(location)
-        when '.xml'
-          Dynarex.new location
-        when '.json'
-          DxLite.new location
+
+        if location.is_a?(Dynarex) or location.is_a?(DxLite) then
+      
+          Thread.current[:v] = location
+      
+        elsif location.is_a? String
+      
+          case File.extname(location)
+          when '.xml'
+            Thread.current[:v] = Dynarex.new location, debug: @debug
+          when '.json'
+            Thread.current[:v] = DxLite.new location, debug: @debug
+          end
+      
         end
       }      
     end
@@ -140,7 +148,7 @@ class Indexer101
     ThreadsWait.all_waits(*threads)
     
     a = threads.map {|x| x[:v]}
-
+    puts '_a: ' + a.inspect if @debug
     t2 = Time.now - t
     puts ("dxindex documents loaded in " + ("%.2f" % t2).brown \
           + " seconds").info
@@ -152,6 +160,11 @@ class Indexer101
 
       id2 = id
       
+      if @debug then
+        puts 'dx: ' + dx.class.inspect
+        puts 'dx.all: ' + dx.all.inspect
+      end
+      
       @indexer.uri_index.merge! Hash[dx.all.reverse.map.with_index \
         {|x,i| [id+i, [Time.parse(x.created), x.title, x.url]]}]
               
@@ -167,7 +180,8 @@ class Indexer101
           
         when 1
           
-          x.title.split(/[\s:"!\?\(\)£]+(?=[\w#_'-]+)/).each do |keyword|
+          # \u{A3} = £ <- represented as Unicode to avoid ASCII to UTF-8 error
+          x.title.split(/[\s:"!\?\(\)\u{A3}]+(?=[\w#_'-]+)/).each do |keyword|
             @indexer.index[keyword.downcase.to_sym] ||= []
             @indexer.index[keyword.downcase.to_sym] << id2
           end
@@ -214,7 +228,7 @@ class Indexer101
   
   # enter the exact keywords to search from the index
   #
-  def search(*keywords)
+  def search(*keywords, minchars: 3)
     
     t = Time.now
     
@@ -223,7 +237,7 @@ class Indexer101
       a = []
       a += @indexer.index[x.to_sym].reverse if @indexer.index.has_key? x.to_sym
       
-      if x.length > 3 then
+      if x.length >= minchars then
         a += @indexer.index.keys.grep(/^#{x}/i).flat_map\
             {|y| @indexer.index[y].reverse}
         a += @indexer.index.keys.grep(/#{x}/i).flat_map\

data.tar.gz.sig

@@ -1,3 +1,3 @@
-� ���ib�^[�[��2v�^��<-~�Z≎xsF����1����)ܾ(��b�Oh���8��㜶��A�1�]�����c�y�w�f�Y:�}�&���!<m�+B�
-�>�ϭ�^š��Rńu����e�Ε�`��S�e�W1%�?��j��@8�~�j��:���߸��M���c*.-)�q�i�&}�J�t$�'�ĊW���r��y�MI&�(v8����:�t�@Z���A��1
-���ڢ�=Ew��~j�jU7�5��K�X ;��̷���>���[�
���
+8z�m�B	�D��0����嚶�0��r�5=����UC��Gߩ��cK�}g���ɂX�LOc���xG
+�!��'��y\�E��J��Q�x
+��H��H���Y}��P=� ����q~N��

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: indexer101
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -11,74 +11,94 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTkxMTExMjI1NjA5WhcN
-  MjAxMTEwMjI1NjA5WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDEF92R
-  JWEWjPhgU6nIiCKKXtWI9EE8DbqPtU+CnYuUN2BWN7c4dsbaYrU1tVMzxx22G+Of
-  apTIeIGFrq/oqub6nhx+UbnkMAqpmbJS8zTgnwEhFsGHGI2CD9+4OXh5rl36SqqP
-  IGxY7w45KDvuPWA/Htb2aC20cHclJebOjeaMNogpYDByVEjjxtZeiOmIJtJlQSf+
-  YpUviQVTkFJqbSK0WkKsPLQZu29P1zHETkdBvIGlGGDdo13haBW2Hdj9a2INeWcz
-  B+v6nAdnv9fTTvH0GX51XDa/EIisWNELaopHk1Hcx97pZdm92gaICQfdgUHje65s
-  oUDjyynUKE8dq+LAPEq5B1wj3e4BsIOFI5PSvPCMWI5jpbJWBXV6owex9qln22UA
-  lDUEP3COb9/+r6bGNiCBUvUwyy7l/RdmRXPSOYnP8jPcwD/qSVypJYObM+2q68qc
-  5Eg0WqCVdFgpIXzBJPVcxeDJiN6EKmFWr5vJkMwIGz9hhIcitQjjSguk4r8CAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUN0C2lCCv
-  /ATnmYSeZRQfUNpplfwwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjEwMjIyMDAwNzQ2WhcN
+  MjIwMjIyMDAwNzQ2WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDqAwJO
+  ET6LAnOZB9q04zgLVFB0gJTcuLvfwjf7vpH9gCa5uqshSJnfi0owkeS2Hao0OwD+
+  vJrRRYbPfmXHAhEV8l9bSE6Ul1uTT9A+XS7g724sgOm5tCKFkLu+rcDy25MSjqpD
+  q+cPG4SN3ZUGK5eR9tp//dzdrjCV2wsOaoYKPajVY698p+sRf1zsHsSMxYnJPD/8
+  IkeNC+3VdsJFQ7wAoSk4hSpDuIi1xknA61/elDy5O07r1M25PJMntBE6QpJZblvw
+  v5u8U7+nK9P82KFfUwAjqkrhizt90M+0eK6dG44PnqafnxF84K2v7Qr1W6hKMIeL
+  DcqKPjAop+DO8WPCtfKFcFQKGRSe+H2rej3h34eGPH/GVoh8/h+ZuoDUfQRfoWLb
+  zUTM4uC1XwMlRjg8W4uYgV8SWZ5eii3tpmUz7moKQ4k9DSNNpGO+/bk/IcMVbRkb
+  xG/LzBAa6JQyAtVw9AMq8WHZKtJeNrdthoJSczsurthCHb0nY7VUQ/pp9JsCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUVn1uBRaL
+  Zh8+3WB077Lz84bokZowJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
   c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAXrKEIca0q3x//SBOsv17jkonBSlzwVLIBuXKXX4R
-  f0q3kJw7vWBPJfIVpAcGn6mbx2ziWw3XvG/SMuwIfzitz0pKTapvwbKZFPscqy82
-  KcDxGtJt1cjDHzl0Bm+mgN/MgY+PAj3TcT/osuCc8iTu4+Ib6UxkmOP/uy2svBLs
-  Su2XzGoqd5SKxPpj7IwMOBSVQWrqgWN2B+gdkN0CqjUPVMmiEKuMNjz9Idu36nG/
-  QOPsTlpqBxR+yFbPEP0DlN5X8BRRAsraQZ+LPi7W/bU1fjkvIJxXuUkQD9dMF99+
-  me+6s7PoCJ1yMmc5XfMFmv4WYswC+VqI1EeG0EneAsxRo8MmhWZcokqRE/KUk+ym
-  NlDFqcKPZDaMsdO5dkYvEeguet/iG3XS1u7WKAcZgfhPdiIbue7cAhz9eQpNybe7
-  08cN0E9zjqKINgH/PsZTot+ohuVRLwn6WmHHhb18oUrxt3a0u4/3TNcWOcMeR0F2
-  GeYL+mKGct5bfjn8IZnAJVKY
+  BgkqhkiG9w0BAQsFAAOCAYEAUzwCxgrA0YiJvXoi1ZHlhhz+ROzRn6XSQZZVd0Ym
+  gQVkUcvb/iiMnE0PZdivLiorRjhdR5tIPAYhmuN7Mr5IscQFdb1cndyC+qUzy6zP
+  HJGDGqqHDtiYpWlQ3/VAD4V+mAYj67CTj8gM2Y0OfjOIzKLf4jeLzcR0XjxCS9bH
+  g3cF/0FdJ5ydwo6r9QW/mE5yej6yuWBD9NFjWVbV/TAY3rWWDtw9g1WG31HjZVRB
+  lYndPAx0WIUBse5IRDGTiQ1JuMI5vBrxYJCb1Je506nR2rktACDRVSe/DTM4sxZn
+  oP3LBd1hPOAhNya8tD4FmUjQg4tvuWwIKh55XorZVEkzTWGgAJSnu7XTxtPcjxFA
+  U/3nmRr1BTYMN96T+3L81oqJTW5CxAAlsR97O7H8eZhwnNdG9HjgAk4PwiMLOhPb
+  Ely2/UitUG79uLcra+83gWVYzYiqBYC2d5HR4vCpTeecqYFXjWo9E3LMrvyB5Unk
+  zn10wjI+T1ysW7U6t+VJft8s
   -----END CERTIFICATE-----
-date: 2020-06-23 00:00:00.000000000 Z
+date: 2022-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.21
+        version: 1.9.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.21
+        version: 1.9.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: dxlite
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.7
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.1
+- !ruby/object:Gem::Dependency
+  name: thwait
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.7
+        version: 0.2.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []