phrase_lookup 0.1.4 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fd368d5aba0843e380540e9067541510ddf2754d
-  data.tar.gz: b70ebf8bed7feb12a359eb5a46f708a69a7af1eb
+SHA256:
+  metadata.gz: 5fd6a1b23e62042749f8cce80d87af6fb330212b192bd60a593a3cee6441de0e
+  data.tar.gz: a3bbb9361865709d77b455b85f371929e91f29371fe3ed98a5fbd844e7fee3d1
 SHA512:
-  metadata.gz: f688e0f213dd0004989815f39c76fe7ae007444a7d9ebb8c5f872dea841a626d30bb5a3957637a74618a1bf11567ae305c49664685777ef5accbb903343ec848
-  data.tar.gz: 33c2696e31a4295878a22a5e9c3f3be8aa85fd7bd7a22ad0a2c3ac98415318fae98b3123ce19aad6722f5c3cc28c800bc0d22136fb852f8c369fa9e33f4ae57c
+  metadata.gz: 6fdc2c7d1b02a0008d8f8a11b20aa26d6e78b2fb25b185f5213eb74b7a10569ba0c014cfcc189c71fe91c9d5b9019325c899a00d1a771e9a89b3032f415e20eb
+  data.tar.gz: eede7d74a9a1e21efcc022e4792bb07bc4006ac306c97dc81a7d297757d160e461cb1944838c9e73d32fd4df0b34c874252fb913972b8efa91432464c05f384c

data/lib/phrase_lookup.rb

@@ -11,28 +11,44 @@ require 'rxfhelper'
 
 class PhraseLookup
 
-  def initialize(raw_s=nil)  
+  def initialize(obj=nil, debug: false)  
+    
+    @debug = debug
 
-    @master = if raw_s then
-      
-      s = RXFHelper.read(raw_s).first
+    @master = if obj then
       
-      if s.lstrip =~ /^---/ then # it's YAML
+      if obj.is_a? String then
+        
+        s = RXFHelper.read(obj).first
+        
+        if s.lstrip =~ /^---/ then # it's YAML
+          
+          Master.new( YAML.load(s))
+          
+        elsif s =~ /: /   # it's the contents of a log file
+          
+          m = Master.new
+          m.create s
+          m
+          
+        else   # it's plain text
+          
+          m = Master.new
+          m.create_from_txt s
+          m
+          
+        end
         
-         Master.new(s)      
-         
-      elsif s =~ /: /   # it's the contents of a log file
+      elsif obj.is_a? Array
         
-         m = Master.new
-         m.create s
-         m
-         
-      else   # it's plain text
+        puts 'array detected' if @debug
         
-         m = Master.new
-         m.create_from_txt s
-         m
-         
+        m = Master.new
+        m.parse_array obj
+        m
+        
+      else
+        Master.new obj
       end
       
     end
@@ -42,9 +58,9 @@ class PhraseLookup
   
   class Master    
     
-    def initialize(yaml=nil)
+    def initialize(h={})
 
-      @h = yaml ? YAML.load(yaml) : {}
+      @h = h
       
     end
     
@@ -72,9 +88,7 @@ class PhraseLookup
     
     def to_h()
       @h.clone
-    end
-    
-    private
+    end    
     
     def parse(raw_s)
       
@@ -85,6 +99,13 @@ class PhraseLookup
       
     end    
     
+    def parse_array(a)
+           
+      @h = a.map {|x| x.downcase.gsub(/\?/,'')}\
+          .inject({}) {|r,x| r.merge x => a.count(x)}
+      
+    end 
+    
     def parse_log(raw_s)
       
       s, _ = RXFHelper.read(raw_s)       
@@ -99,18 +120,24 @@ class PhraseLookup
     end
   end
 
-  def lookup(s, limit: 10)
+  def lookup(s, limit: 10, search_tags: false)
     
     return [] if s.empty?
     
     h = @master.to_h
     a = h.keys
     
-    a1 = a.grep /^#{s}/i
-    a2 = a.grep /\b#{s}/i        
+    a3 = if search_tags then
+      a.grep /\].*(?:\b#{s}\b|\b#{s}).*\|.*(?:\b#{s}\b|\b#{s})/i
+    else
+      a1, a2 = [/^#{s}/i, /\b#{s}/i].map do |regex|
+        a.select {|x| x.gsub(/\[[^\]]*\]/,'').gsub(/\([^\)]*\)/,'') =~ regex}
+      end
+      (a1 + a2)
+    end
 
-    return (a1 + a2).uniq.sort_by {|word| -h[word]}.take(limit)\
-        .map {|x| x.sub(/ +\|.*$/,'')}
+    return a3.sort_by {|word| -h[word]}.map {|x| x.sub(/ +\|.*$/,'')}\
+        .uniq.take(limit)        
     
   end
 
@@ -123,4 +150,5 @@ class PhraseLookup
   def save(filename='phrase_lookup.yaml')
     @master.save filename
   end
-end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phrase_lookup
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.9
 platform: ruby
 authors:
 - James Robertson
@@ -10,49 +10,53 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
-  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE3MTAxMTExMzUxNVoXDTE4MTAxMTExMzUxNVowSDESMBAG
-  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
-  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBALxTjEVtvsr1rCCnEdMkyx9b0CYjz3q90IaS8rGklhAO6u90AYfLTahxSTY/
-  U6ibpX2HFhu1mi03mq+JiNEkpsuk4w7/+l4lYlP3HtIYmMdssiwZnH+QyB4aP7R4
-  isso+Op95NkVNRw0oVTDjtpNl0IvonXB/6yGVRla9J8Erz9MLW89f4sHP0FGexzw
-  r/BGLqtVUNxha8hnH/BVyjkkYMKBYNpgOshZ313gmT4sPfavckbNbsUlhWHN+fuZ
-  i1yeuU231IihQyo45w8z/OsGhnXheDziHaEQ9KYo2jY2G/smWyfByj0RNQ1szBHj
-  H3HrfB401uYqre46iZjGpGP53/UCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUZRNz6mn0Jnt/0zxQhfGhfnHM+zAwJgYDVR0RBB8w
-  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAo+OjhDsb
-  I4O7uXvyMprFsmrPxLqJQZiG3Ca4biUSx9dTji5jwPctqzXUxB8shQV6iI0J2G/9
-  tghJOAqy18lXhlS0eBqZNuXS9rpDfiKOIeiD4X7GRbtIMmg68HKnW2l72ij5d+ay
-  oUN/NTJOCHKrgJ48XxdHG/4eYyQDXWVtduAitqNXvMREeP8eP6j2icBXP15bZpgY
-  DUWq9PrW+gmCWIDmnMtW8YTWTR+FnI+uGhcoFYucP1uKUv9J5EQp/B40m1Qoxnz6
-  m1kU5vbLTlJYenStfwtXDnHL7ul9y7MaPO+5UyjWWUuz8iRexmjB/HymNMK7NwPv
-  YzZJ2MWOCulgfw==
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTkxMTIwMTM0OTQxWhcN
+  MjAxMTE5MTM0OTQxWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDnocIe
+  ynp7xpDa6f+1R5habPc41uZOzQoXVrbCcOhmY9o5192YC7f+HBL+ebLdYdWFpSO5
+  MRtYzU5nmuCnAfY7L3KiVWSpf6s9sbPz9D5Rkt6PmCuuToPl2q0SZkdImRHH4+YP
+  IjMLZNVS9qPgEhj/iRH7eKyD/9AO7dO6yn3KGuJ9aQYmak1GD4NAh34jhT3nzuDf
+  IlWNlEfdqU3AJX15C+7Ai4ITTS6wzpbNNXlHYN6TKYYa1Kw3xo29FK8kHozK4NB7
+  GdlDSpm1EP4ag39ti7RlDyrs+zmGlazNr8FZv6h4TEsyaxN+VYr58QuikVf51HA9
+  U6pjVpQRI0PnVzvOQYMP+e4oZyGsiIjGfljxthu3LX4D331OQk1uAZ7+WWE2DUs5
+  kIFRRPvnen1ZlcA0OujWceNXEKrsMhdkfVNNjO5dgnqY8OMMdXU5Pgn/FHAGn8s7
+  7RG9RefAIAzUpi8v4a8p7B9A7T7Tcy5cthE5J2LBpDaBk31VgGwQnqcOWXcCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUOFRUBh27
+  Laf49pgbo0YHv7TA1n8wJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEAkG2HrpJKrfJYv9LzBMDW3ejjl2vlDRKWEXCQDZCA
+  hDVx7m5foGuON4yQuBvLl2qAn7M4TFYFB9twzFS9qhabr8syz/cnJslWDnhykVf4
+  TA3zQQyuzQWpMzPr4nO5dRy9ggm+WDJ2UThS0kTyV9BGeWqTXKUzWwlqI2nRxa+H
+  IlrX9Xu+Y9f8014sJ4PNmXydhK0qO39herMgjdhoHGdA7zP7u4i9c/diayRaEAI9
+  TcabuxBalabBraWkGnEAT2X33pnUusU01Uf4SUlA3+7JPKsQX3pXD9fvB1UoDjlq
+  2WxByXLsLaXyguSwnONHhJRg9BpzzaK6ovztQzenjYZMVG7TpoHcxa4kucpK+zxB
+  nn243c2e6s2GTK+PGlsJoSfxhIlxeQMfvi+Jkbtr1kNSu+SKFt1TkL8TaTdJ7CNj
+  okm7UBOgnw1k05vu6nv459XCUeIFRegIYJ+P+mI15c8WMWOSdLK7NoU3qYil6Pgd
+  VWIRHmtajxS0oRQe/0SeVorH
   -----END CERTIFICATE-----
-date: 2017-11-20 00:00:00.000000000 Z
+date: 2020-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rxfhelper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 1.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   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.3
+        version: 1.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: 
 email: james@jamesrobertson.eu
 executables: []
@@ -79,8 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Returns a list of matching phrases from plain text