util.rb in mongoid_search-0.3.0

- old
+ new

@@ -1,40 +1,42 @@
 # encoding: utf-8
-module Util
+module Mongoid::Search::Util
 
-  def self.keywords(klass, field, stem_keywords, ignore_list)
+  def self.keywords(klass, field)
     if field.is_a?(Hash)
       field.keys.map do |key|
         attribute = klass.send(key)
         unless attribute.blank?
           method = field[key]
           if attribute.is_a?(Array)
             if method.is_a?(Array)
-              method.map {|m| attribute.map { |a| Util.normalize_keywords a.send(m), stem_keywords, ignore_list } }
+              method.map {|m| attribute.map { |a| normalize_keywords a.send(m) } }
             else
-              attribute.map(&method).map { |t| Util.normalize_keywords t, stem_keywords, ignore_list }
+              attribute.map(&method).map { |t| normalize_keywords t }
             end
           elsif attribute.is_a?(Hash)
             if method.is_a?(Array)
-              method.map {|m| Util.normalize_keywords attribute[m.to_sym], stem_keywords, ignore_list }
+              method.map {|m| normalize_keywords attribute[m.to_sym] }
             else
-              Util.normalize_keywords(attribute[method.to_sym], stem_keywords, ignore_list)
+              normalize_keywords(attribute[method.to_sym])
             end
           else
-            Util.normalize_keywords(attribute.send(method), stem_keywords, ignore_list)
+            normalize_keywords(attribute.send(method))
           end
         end
       end
     else
       value = klass[field]
       value = value.join(' ') if value.respond_to?(:join)
-      Util.normalize_keywords(value, stem_keywords, ignore_list) if value
+      normalize_keywords(value) if value
     end
   end
 
-  def self.normalize_keywords(text, stem_keywords, ignore_list)
-    ligatures = {"œ"=>"oe", "æ"=>"ae"}
+  def self.normalize_keywords(text)
+    ligatures     = Mongoid::Search.ligatures
+    ignore_list   = Mongoid::Search.ignore_list
+    stem_keywords = Mongoid::Search.stem_keywords
 
     return [] if text.blank?
     text = text.to_s.
       mb_chars.
       normalize(:kd).
@@ -42,10 +44,10 @@
       to_s.
       gsub(/[._:;'"`,?|+={}()!@#%^&*<>~\$\-\\\/\[\]]/, ' '). # strip punctuation
       gsub(/[^[:alnum:]\s]/,'').   # strip accents
       gsub(/[#{ligatures.keys.join("")}]/) {|c| ligatures[c]}.
       split(' ').
-      reject { |word| word.size < 2 }
+      reject { |word| word.size < Mongoid::Search.minimum_word_size }
     text = text.reject { |word| ignore_list.include?(word) } unless ignore_list.blank?
     text = text.map(&:stem) if stem_keywords
     text
   end
 