phrase_lookup 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53f55c98fc2fb5b6d0d3c92198a6105024a42755
-  data.tar.gz: 6d1efac3f74aadfb4935bf93256bd12003f6ac25
+  metadata.gz: 445e3b08f2b2a4152aad4dffa8290256a1782210
+  data.tar.gz: '0956745dcb6bc0d9689528dd483eb5a079dd5d3d'
 SHA512:
-  metadata.gz: 96a430be6b3cee2b2156fd68e9b82e0a91b0af0b1b338e97d83b94261cea768bbf18fb1d0d4cdc8141b3ea00a4fb915f0841d2b912ac5b468749fc576c7c87a7
-  data.tar.gz: 0fa29aff7658290cdb42b7a3540b41d2e5237c8981c8454e7d84ce13853c344b648e4215ea62a96fce50d561aa688a1d04e50826735629f39a598d638e283702
+  metadata.gz: 5f4a339a1e7e2164479edfd87d3858d640d8a1e8a43329d974c23f087158c3e1560b877000da58ca496f9e814902685ea07942aefa27b4deebc1684469eeb23a
+  data.tar.gz: 65022771885abe43116f52021d2e16f9e0654ac6761f1bb145ba53a8ce8596c0958dcfb6075444d4ce740cceafade9977d7fa09ac931c51ee829dfa8200f2665

data/lib/phrase_lookup.rb

@@ -104,19 +104,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, a2 = [/^#{s}/i, /\b#{s}/i].map do |regex|
-      a.select {|x| x.gsub(/\[[^\]]*\]/,'').gsub(/\([^\)]*\)/,'') =~ regex}
+    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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phrase_lookup
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   m1kU5vbLTlJYenStfwtXDnHL7ul9y7MaPO+5UyjWWUuz8iRexmjB/HymNMK7NwPv
   YzZJ2MWOCulgfw==
   -----END CERTIFICATE-----
-date: 2017-12-25 00:00:00.000000000 Z
+date: 2017-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rxfhelper