dxtitle_search 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df32efa0600562a68efdde1eb315b79444c5b33b1ba32a4784976819ac62c241
-  data.tar.gz: 683deed83c63b4e755ff02b084e3b3e7d436248eb1a6db62fe0bb2e511024e08
+  metadata.gz: febca2af1d5f671487bb3a374e0ce3a3a1c9d1bc61a365a7e264da32f2865d44
+  data.tar.gz: 8fb8561355abb9b169b789fa9388e6c70f12c92521d4dea14594ab74e8ad69d9
 SHA512:
-  metadata.gz: 3533f42a47a75ae9f5dee05100e8a8b1594e9ac9f2dd5aeb926071a339fc7cbad82c0faa32e724924dd4e16e3c6d4465864e6c3560f042fa25bbb937d3ca80f9
-  data.tar.gz: fd0423876c4ded5577f0e8ced346a61520ac9df7f1d18b88dadfa3ef59f057a7d2a6ece5c9de67f5ef7b25a73e32edc479a45498a38ac7e742bbb155d7dc55de
+  metadata.gz: c6705c471563eede40e9dd71aa133dc3e5adf9a2f014864c44312aab6a3235bd335648b2dc9a40f6d3d1a339ea50258cfe2c31f56d61f617f67dba5be4237379
+  data.tar.gz: 9268dc3c81722d2e42824a3e6ac175e7c12e4927254fcdb7f95825f3797b060e2c912ba62af4517841c4f076cd3379ee4be48c44e866796037fb7cb27ad2520c

data/lib/dxtitle_search.rb

@@ -7,25 +7,29 @@ require 'dynarex'
 
 class DxTitleSearch
 
-  def initialize(obj, debug: false)
+  def initialize(obj=nil, sources: nil, debug: false)
 
     @debug = debug
 
-    # is it a Dynarex file location?
-    s = if obj.lines.length < 2 then
-
-      xml = RXFHelper.read(obj).first
-
-      dx = Dynarex.new(xml)
-
-      dx.all.map do |x|
-       "%d %s %s" % [Time.parse(x.created).to_i, x.title, x.url]
-      end.join("\n")
-
-    else
-      obj
+    s = if sources then
+    
+      dx = Dynarex.new(sources)
+      dx.all.map {|x| read x.uri }.join
+    
+    elsif obj then
+      
+      # is it a Dynarex file location?
+      if obj.lines.length < 2 then
+
+        read obj
+
+      else
+        
+        obj
+        
+      end
     end
-
+  
     @h = h = s.lines.inject({}) do |r,x|
       key, value = x.split(/\s+(?=[^\s]+$)/,2)
       r.merge(key.rstrip => value)
@@ -36,21 +40,34 @@ class DxTitleSearch
   end
 
   def search(keywords)
+    
+    phrases = @a.grep /#{keywords}/i
 
     # find out the keywords count for each entry found
-    a = keywords.split.flat_map {|x| @a.grep /#{x}/i }.uniq.map do |entry|
+    a0 = keywords.split.flat_map do |x| 
+      next if @a.length < 2
+      @a.grep /#{x}/i 
+    end
+    
+    a = a0.uniq.map do |entry|
       [entry, entry.scan(/#{keywords.split.join('|')}/).uniq.count]
     end
 
     # sort by keywords found per entry and then date
+    #a2 = (phrases + a).uniq.sort do |x, x2|
     a2 = a.sort do |x, x2| 
       -([x.last, x.first[/^\d+/], ] <=> [x2.last, x2.first[/^\d+/]])
     end
 
     # format each result as a Hash object
-    a3 = a2.map do |x|
-
-      line, _ = x
+    a3 = (phrases + a2).map do |x|
+
+      if x.length > 1 then
+        line, _ = x
+      else
+        line = x
+      end
+      
       puts 'line: ' + line.inspect if @debug
      
       rawtime, title = line.split(/ +/,2)
@@ -65,6 +82,17 @@ class DxTitleSearch
     return a3
 
   end
+  
+  private
+  
+  def read(source)
 
-end
+    dx = Dynarex.new(source)
 
+    dx.all.map do |x|
+      "%d %s %s" % [Time.parse(x.created).to_i, x.title, x.url]
+    end.join("\n")
+    
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dxtitle_search
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   ODgOmcgAsTin0T9l0vWQJnj2OClh1pcC6tFnQXXcYuwTpbtM2v4OmUfUDvJmwQ42
   POydZUYZg49X9TlTDqPMKed0
   -----END CERTIFICATE-----
-date: 2019-07-23 00:00:00.000000000 Z
+date: 2019-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex