rifle 0.0.9 → 0.1.0

data/lib/rifle.rb

@@ -21,22 +21,22 @@ module Rifle
       # First get the old values
       old_payload = get_payload_for_urn(urn)
       if old_payload
-        old_words = traverse_object(old_payload)
-        old_metaphones = get_metaphones(old_words)
+        old_words = traverse_object_for_word_set(old_payload)
+        old_metaphones = get_metaphones_from_word_set(old_words)
       else
         old_metaphones = []
       end
 
       # Now get the new ones
-      words = traverse_object(hash)
-      metaphones = get_metaphones(words)
+      words = traverse_object_for_word_set(hash)
+      metaphones = get_metaphones_from_word_set(words)
 
-      # Clear out words that have been removed
+      # Clear out words that have been removed (but leave ones that are still present in the new version)
       (old_metaphones - metaphones).each do |metaphone|
         remove_urn_from_metaphone_set(urn, metaphone)
       end
 
-      # And add the new ones
+      # And add the new ones (but don't bother with words that were in the old version or ignored words)
       (metaphones - old_metaphones).each do |metaphone|
         add_urn_to_metaphone_set(urn, metaphone)
       end
@@ -47,8 +47,8 @@ module Rifle
     end
 
     def search_for(sentence, urns_only)
-      words = get_words_from_text(sentence)
-      metaphones = get_metaphones(words)
+      words = get_words_array_from_text(sentence)
+      metaphones = get_metaphones_from_word_set(Set.new(words))
       urns = Set.new
       metaphones.each do |metaphone|
         new_urns = get_urns_for_metaphone(metaphone)
@@ -66,39 +66,40 @@ module Rifle
       end
     end
 
-    private
-
-    def remove_old(urn)
-
-    end
-
-    def traverse_object(input, words = nil)
-      words ||= Set.new
+    def traverse_object_for_word_set(input)
+      words = Set.new
       examine_value(input, words)
       words
     end
 
     def examine_value(value, words)
       if value.is_a? Hash
-        value.each do |k, v|
-          examine_value(v, words)
+        (value.keys - Rifle.settings.ignored_keys).each do |k|
+          examine_value(value[k], words)
         end
       elsif value.is_a? Array
         value.each do |a|
           examine_value(a, words)
         end
       else
-        words.add(get_words_from_text(value))
+        words.merge(get_words_array_from_text(value))
       end
     end
 
-    def get_words_from_text(text)
+    def get_words_array_from_text(text)
       return [] if !text.is_a?(String)
-      words = text.downcase.split(/[^a-zA-Z]/).select { |w| w.length >= Rifle.settings.min_word_length }
-      return words - Rifle.settings.ignored_words
+      words = text.downcase.split(/[^a-zA-Z0-9]/).select { |w| w.length >= Rifle.settings.min_word_length }
+      return words
     end
 
-    def get_metaphones(words)
+    def get_metaphones_from_word_set(words)
+      # Get just text words (no numbers)
+      words.keep_if { |w|
+        w.to_f == 0
+      }
+      # Removed ignored words
+      words.subtract Rifle.settings.ignored_words
+      # Get metaphones
       ::Text::Metaphone.metaphone(words.to_a.join(' ')).split(' ')
     end
 

data/lib/rifle/settings.rb

@@ -1,12 +1,16 @@
 module Rifle
 
   class Settings
-    attr_accessor :ignored_words, :min_word_length, :redis, :use_rest_server, :resque_queue
+    attr_accessor :ignored_words, :ignored_keys, :min_word_length, :redis, :use_rest_server, :resque_queue
 
     def ignored_words
       @ignored_words ||= ["the", "and", "you", "that"]
     end
 
+    def ignored_keys
+      @ignored_keys ||= [:created_at, :updated_at]
+    end
+
     def min_word_length
       @min_word_length ||= 3
     end

data/lib/rifle/version.rb

@@ -1,3 +1,3 @@
 module Rifle
-  VERSION = '0.0.9'
+  VERSION = '0.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rifle
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-15 00:00:00.000000000 Z
+date: 2012-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails