lib/soulmate/matcher.rb in soulmate_rails-0.3.0 vs lib/soulmate/matcher.rb in soulmate_rails-0.3.1

@@ -1,31 +1,32 @@
 module Soulmate
   class Matcher < Base
 
     def matches_for_term(term, options = {})
-      options = { :limit => 5, :cache => true }.merge(options)
-      
+      options = { :limit => Soulmate.max_results, :cache => true }.merge(options)
+
       words = normalize(term).split(' ').reject do |w|
-        w.size < MIN_COMPLETE or Soulmate.stop_words.include?(w)
+        w.size < Soulmate.min_complete or Soulmate.stop_words.include?(w)
       end.sort
 
       return [] if words.empty?
 
       cachekey = "#{cachebase}:" + words.join('|')
 
       if !options[:cache] || !Soulmate.redis.exists(cachekey)
         interkeys = words.map { |w| "#{base}:#{w}" }
         Soulmate.redis.zinterstore(cachekey, interkeys)
-        Soulmate.redis.expire(cachekey, 10 * 60) # expire after 10 minutes
+        Soulmate.redis.expire(cachekey, Soulmate.cache_time)
       end
 
       ids = Soulmate.redis.zrevrange(cachekey, 0, options[:limit] - 1)
       if ids.size > 0
         results = Soulmate.redis.hmget(database, *ids)
         results = results.reject{ |r| r.nil? } # handle cached results for ids which have since been deleted
         results.map { |r| MultiJson.decode(r) }
       else
         []
       end
+
     end
   end
 end