keyword_finder 0.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aae2604a62d298eec0d41d58308531c4ee0a69c0
-  data.tar.gz: cf00f39dbe6ceaa3967407c2eb63b1757aba963e
+  metadata.gz: b3959babed302bb4c954ccfc78922caa407abb00
+  data.tar.gz: 1939597c3c374b9925ec03f1a77b18c3b688f8d0
 SHA512:
-  metadata.gz: 3b404c8bef1c440f70629a7cb1a61865cac24a4662c3bf3bbb4c28b01bc263c4ea68aad6c490d6e96d6ab3d882d9299cee818af75bfcdabb17850edb92eae8ea
-  data.tar.gz: 1c3445137b678fe7ba44156b5a699b92d9bb6d7bdf075c0c864970b1fc04c0243a2d3f67b8dbb984f5f4f73db47fac168184fed848ea7750d0b50f7214bda4ab
+  metadata.gz: 63434cc4ad29c3e6aab06fab33065008de54837c1a8fce1be87e97907a0193477cbab6be853f4c1a13ed89289412ee9f1b7448e38056f71a88199533944aba8a
+  data.tar.gz: 67bf8f3c227fd453b0325c36d6896b3469973ad7e91bdc2e22fd077f56a5b4928b76c6fa3118959ba8f76bc46144eeffb4f8b82ecc487d2efe49d8653cad3a9b

data/lib/keyword_finder/keywords.rb

@@ -21,7 +21,9 @@ module KeywordFinder
     end
 
     def combine_more_specifics sentence
-      sentence.gsub(/([A-Za-z]*\([A-Za-z]*\)[A-Za-z]*)/) { |s| s.gsub(/(\(|\))/,'') }
+      sentence.
+        gsub(/([A-Za-z]*\([A-Za-z]*\)[A-Za-z]+)/) { |s| s.gsub(/(\(|\))/,'') }.
+        gsub(/([A-Za-z]+\([A-Za-z]*\)[A-Za-z]*)/) { |s| s.gsub(/(\(|\))/,'') }
     end
 
     def scan_part sentence
@@ -36,14 +38,25 @@ module KeywordFinder
       results
     end
 
+    # find in a sentence
+    #
+    #
+    # @param [String] sentence that might contain the keywords this instance was initalized with
+    # @param [Hash] options; notably the +:subsentences_strategy+, which can be one of +:none+, +:ignore_if_found_in_main+, +:always_ignore+
+
     def find_in sentence, options={}
       options = {
         subsentences_strategy: :none # :none, :ignore_if_found_in_main, :always_ignore
       }.merge(options)
+
       sentence = sentence.downcase
+
+      full_sentence_results = self.scan_part(sentence)
+
       sentence = self.combine_more_specifics(sentence)
       main_and_subs = self.separate_main_and_sub_sentences(sentence)
       main_results = self.scan_part(main_and_subs[:main])
+
       sub_results = []
       unless (
         options[:subsentences_strategy] == :always_ignore or
@@ -51,7 +64,35 @@ module KeywordFinder
         )
         sub_results = main_and_subs[:subs].collect{|subsentence| self.scan_part(subsentence)}.flatten
       end
-      return main_results + sub_results
+
+      clean_sentence_results = main_results + sub_results
+
+      return select_the_best_results(clean_sentence_results, full_sentence_results)
+    end
+
+    def select_the_best_results result_set_a, result_set_b
+      ## check whether there are better matches in the full sentence approach (or the other way around)
+      result_set_a_to_delete = []
+      result_set_b_to_delete = []
+
+      result_set_a.each do |result_a|
+        result_set_b.each do |result_b|
+          if result_a.match(escape_regex_chars(result_b))
+            result_set_b_to_delete << result_b
+          elsif result_b.match(escape_regex_chars(result_a))
+            result_set_a_to_delete << result_a
+          end
+        end
+      end
+
+      result_set_a_to_delete.each do |a|
+        result_set_a.delete(a)
+      end
+      result_set_b_to_delete.each do |a|
+        result_set_b.delete(a)
+      end
+
+      return result_set_a + result_set_b
     end
 
     def separate_main_and_sub_sentences sentence
@@ -59,7 +100,7 @@ module KeywordFinder
       subs.each do |subsentence|
         sentence = sentence.gsub(subsentence,"")
       end
-      {main:sentence,subs:subs.collect{|a| a[1..(a.length-2)]}}
+      {main:sentence.strip,subs:subs.collect{|a| a[1..(a.length-2)].strip}}
     end
 
   end

data/lib/keyword_finder/version.rb

@@ -1,3 +1,3 @@
 module KeywordFinder
-  VERSION = "0.2"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: keyword_finder
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.1
 platform: ruby
 authors:
 - murb
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2016-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler