keyword_finder 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d2ffa4c856beb883fe0de8d43583d871cbd2e99
-  data.tar.gz: 98555a484aad026fd7a343ec8eda923b878a0625
+  metadata.gz: 0dd010b498bebdedbb2a27b95760645bfe2c5f45
+  data.tar.gz: 12a32eee997aa77ef87247b747bb10d680ff6ce8
 SHA512:
-  metadata.gz: 9f95f4ae6718c346ea9f54edb53abb26cec97e50e354c80484136e199be4bbeae3eb72b683f439fdb8ceeabcc8f4f2d5faeda32d23a9d2ae403e361674b9b580
-  data.tar.gz: 0b2f0e427bce9c4ac532f995a80bf3c3a908b0d445d028ce1fc1055b524ffec4cdbcc8db0582f781a3a7760b982735fd622683fde109f17fe8e84ed01d1dcc6d
+  metadata.gz: c37be69c1fca9f4978123b82ff0d8223de110130b06dc981ae0f157a4f1c488f56ca224a74400e61f78eb160983969ecc502d6d431f932ca497df5df2e8224b5
+  data.tar.gz: ae85cf9f939e53caa71a5ebec19e57ca4edeeef9ec3acad743f5d8434c85b93e7407663701bbb7a40c413223b79715fe92ed08bbf5e6e18453cbb26b58804acb

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,22 @@ 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)
 
+      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 +61,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 +97,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.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: keyword_finder
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - murb
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-23 00:00:00.000000000 Z
+date: 2016-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Find given set of keywords in a sentence.