mongomapper_ext 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/mongomapper_ext/filter.rb

@@ -30,14 +30,55 @@ module MongoMapperExt
       end
 
       def filter(query, opts = {})
-        q = query.downcase.split.map do |k|
-          Regexp.escape(k)
-        end.join("|")
+        stemmer = nil
+        original_words = Set.new(query.downcase.split)
+        language = opts.delete(:language) || 'en'
+
+        stemmed = []
+        if defined?(Lingua)
+          stemmer = Lingua::Stemmer.new(:language => language)
+          original_words.each do |word|
+            stemmed_word = stemmer.stem(word)
+            stemmed << stemmed_word unless original_words.include?(stemmed_word)
+          end
+        end
+
+        regex = (original_words+stemmed).map do |k|
+          /^#{Regexp.escape(k)}/
+        end
+
         if opts[:per_page]
-          self.paginate(opts.deep_merge(:conditions => {:_keywords => /^(#{q}).*/ }))
+          result = self.paginate(opts.deep_merge(:conditions => {:_keywords => regex }))
+          pagination = MongoMapper::Plugins::Pagination::Proxy.new(result.total_entries, result.current_page, result.per_page)
+
+          pagination.subject = result.sort_by do |e|
+            evaluate_result(e._keywords, original_words, stemmed) * -1
+          end
+
+          pagination
         else
-          self.all(opts.deep_merge(:conditions => {:_keywords => /^(#{q}).*/ }))
+          self.all(opts.deep_merge(:conditions => {:_keywords => regex })).sort_by do |e|
+            evaluate_result(e._keywords, original_words, stemmed)
+          end
+        end
+      end
+
+      private
+      def evaluate_result(keywords, original_words, stemmed)
+        score = 0.0
+        original_words.each do |word|
+          if keywords.include?(word)
+            score += 15.0
+          end
+        end
+
+        stemmed.each do |word|
+          if keywords.include?(word)
+            score += 1.0 + word.length
+          end
         end
+
+        score
       end
     end
 
@@ -72,18 +113,23 @@ module MongoMapperExt
         words = []
         val.downcase.split.each do |word|
           next if word.length < 3
-          next if word =~ %r{'|"|\/|\\}
           next if stop_words.include?(word)
 
-          stem = word
-          if stemmer
-            stem = stemmer.stem(word)
-          end
+          deword = word.split(%r{'|"|\/|\\|\?|\+|_|\-|\>|\>})
+
+          deword.each do |word|
+            next if word.empty?
+
+            stem = word
+            if stemmer
+              stem = stemmer.stem(word)
+            end
 
-          if stem && stem != word
-            words += [stem, word]
-          else
-            words << word
+            if stem && stem != word
+              words += [stem, word]
+            else
+              words << word
+            end
           end
         end
 

data/mongomapper_ext.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongomapper_ext}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David A. Cuadrado"]
-  s.date = %q{2010-04-12}
+  s.date = %q{2010-04-20}
   s.description = %q{MongoMapper extensions}
   s.email = %q{krawek@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - David A. Cuadrado
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-12 00:00:00 -05:00
+date: 2010-04-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency