lib/mongoid_search/util.rb in mongoid_search-0.2.7 vs lib/mongoid_search/util.rb in mongoid_search-0.2.8

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