dxtitle_search 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e227dc645595c967bf03dd213ea6846c7c9c438a26ee7db3fd059f464493f370
-  data.tar.gz: eccff27f864a56f00f0952d8ddd47a70eaeb2fca6eca24d961cf4c91d54f7387
+  metadata.gz: fb844f529ab06c2cc4e084e3f5af0f41ab4425d6dc7b9194b210963f5e37da39
+  data.tar.gz: 80a837d7414e45ce4dee39e2a4025ad8419b090d3ae3f057c4236d4d6961a0b5
 SHA512:
-  metadata.gz: db771d09b581573be92de6c65b79c3f635dbcb6187e0bc1d6a00c5d4042a3f13f4838696588d65cc9856be56ed5666047221204e5910fbe38e8aec42f075ee70
-  data.tar.gz: f39cbbb2ca067cfb4c307787b94dab70c7c0d34255037e24e9228b32f284ebbe6361523456d078659aa11e5e3e694ef6dfae3890b18b87ce90d2a707d618a14d
+  metadata.gz: 6482d7adffc9dc3ba09925d770ef6ad6aacc0ba771b2e703540d4ef7d34b009b49b60318e8450d617d64ed865bc55d70c8b4b447bb06a2f0c3be86f6fe1cc327
+  data.tar.gz: fd11a8b0080b6f48790d5524c14144bdb578761b6e47c6a346c9cb7d736998f5f7b862bac28d91e37bf94abce5b429ed61e28a681e6061683da97cddb8b51a8c

data/lib/dxtitle_search.rb

@@ -6,6 +6,7 @@ require 'indexer101'
 
 
 class DxTitleSearch
+  using ColouredText
 
   def initialize(obj=nil, sources: nil, level: 1, debug: false)
 
@@ -14,24 +15,26 @@ class DxTitleSearch
     @level = level
 
     s = if sources then
-    
-      dx = Dynarex.new(sources)      
+
+      puts "found sources".info if @debug
+      dx = Dynarex.new(sources)
+
       puts 'before scan_dxindex' if @debug
       a = dx.all.map(&:uri)
       puts 'a: ' + a.inspect if @debug
       @indexer.scan_dxindex a, level: level
-    
-    elsif obj and (obj.is_a?(DxLite) or obj.is_a?(Dynarex)) or obj.lines.length < 2 
+
+    elsif obj and (obj.is_a?(DxLite) or obj.is_a?(Dynarex)) or obj.lines.length < 2
 
       @indexer.scan_dxindex  obj, level: level
-        
+
     end
-  
+
     #jr230620 @indexer.build
 
   end
 
-  def search(keywords, minchars: 3)    
+  def search(keywords, minchars: 3)
 
     a2 = @indexer.search keywords.split(/[\s:"!\?\(\)£]+(?=[\w#_'-]+)/), \
         minchars: minchars
@@ -43,55 +46,55 @@ class DxTitleSearch
     end
 
     puts 'a3: ' + a3.inspect if @debug
-    
+
     @dx = Dynarex.new('results/result(title, url, date)').import(a3)
-    
+
     def a3.to_dx()
       Dynarex.new('results/result(title, url, date)').import(self)
     end
-    
+
     def a3.to_tags()
       a = self.map {|x| x[:title].scan(/(?<=#)(\w+)/)}.flatten
       a.uniq.sort.map {|x| [x, a.count(x)]}
-    end    
-    
+    end
+
     def a3.search(keywords)
-      
+
       dx = Dynarex.new('results/result(title, url, date)').import(self)
 
       level = keywords[0] == '#' ? 0 : 1
       dts = DxTitleSearch.new dx, level: level
       dts.search keywords
-      
+
     end
-    
+
     def a3.tag_search(keywords)
-      
+
       dx = Dynarex.new('results/result(title, url, date)').import(self)
 
       level = keywords[0] == '#' ? 0 : 1
       dts = DxTitleSearch.new dx, level: level
       dts.tag_search keywords
-      
-    end    
 
-    return a3
+    end
+
+    return Array.new(a3)
 
   end
-  
-  def tag_search(keywords)    
+
+  def tag_search(keywords)
     r = @indexer.lookup *keywords.split(/[\W]+(?=[\w]+)/).map {|x| "#" + x}
     r.map {|x| x.to_s[1..-1]}
   end
 
   def to_tags()
-    
+
     a = @indexer.index.map do |key, value|
       [key.to_s[1..-1], value.length]
     end
-    
+
     a.sort_by(&:first)
-    
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dxtitle_search
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   g10O6gIBUztpsNHwbBTi9fHgtis4E5dAPAo4uzo4MCKVwi72iZQ3E92ACYb9zlxA
   g6CsTY0vUjhgfh9taSRj3qxd
   -----END CERTIFICATE-----
-date: 2021-02-22 00:00:00.000000000 Z
+date: 2022-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: indexer101