mongomapper_ext 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/mongomapper_ext/filter.rb

@@ -14,6 +14,8 @@ module MongoMapperExt
         ensure_index :_keywords
 
         before_save :_update_keywords
+
+        attr_accessor :search_score
       end
     end
 
@@ -47,38 +49,25 @@ module MongoMapperExt
           /^#{Regexp.escape(k)}/
         end
 
-        if opts[:per_page]
-          result = self.paginate(opts.deep_merge(:conditions => {:_keywords => regex }))
-          pagination = MongoMapper::Plugins::Pagination::Proxy.new(result.total_entries, result.current_page, result.per_page)
+        min_score = opts.delete(:min_score) || 0.0
+        limit = opts.delete(:per_page) || 25
+        page = opts.delete(:page) || 1
+        select = opts.delete(:select) || self.keys.keys
 
-          pagination.subject = result.sort_by do |e|
-            evaluate_result(e._keywords, original_words, stemmed) * -1
-          end
+        criteria, options = to_query(opts)
 
-          pagination
-        else
-          self.all(opts.deep_merge(:conditions => {:_keywords => regex })).sort_by do |e|
-            evaluate_result(e._keywords, original_words, stemmed)
-          end
-        end
-      end
+        results = self.database.eval("function(collection, q, config) { return filter(collection, q, config); }", self.collection_name, criteria.merge({"_keywords" => {:$in => regex}}), {:words => original_words.to_a, :stemmed => stemmed.to_a, :limit => limit, :min_score => min_score, :select => select })
 
-      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
+        pagination = MongoMapper::Plugins::Pagination::Proxy.new(results["total_entries"], page, limit)
 
-        stemmed.each do |word|
-          if keywords.include?(word)
-            score += 1.0 + word.length
-          end
+        pagination.subject = results['results'].map do |result|
+          item = self.new(result['doc'])
+          item.search_score = result['score']
+
+          item
         end
 
-        score
+        pagination
       end
     end
 

data/lib/mongomapper_ext/js/filter.js

@@ -0,0 +1,41 @@
+function filter(collection, q, config) {
+  var results = [];
+  var counter = 0;
+
+  var fields = {_keywords: 1};
+  for(var i in config.select) {
+    fields[config.select[i]] = 1;
+  }
+
+  var time = new Date().getTime();
+  db[collection].find(q, fields).limit(500).forEach(
+    function(doc) {
+      var score = 0.0;
+      for(var i in config.words) {
+        var word = config.words[i];
+        if(doc._keywords.indexOf(word) != -1 )
+          score += 15.0;
+      }
+
+      for(var i in config.stemmed) {
+        var word = config.stemmed[i];
+        if(doc._keywords.indexOf(word) != -1 )
+          score += (1.0 + word.length);
+      }
+
+      if(score >= config.min_score || 1.0 ) {
+        delete doc._keywords;
+        results.push({'score': score, 'doc': doc});
+        counter += 1;
+      }
+    }
+  );
+
+  var sorted = results.sort(function(a,b) {
+    return b.score - a.score;
+  });
+
+  time = (new Date().getTime() - time);
+
+  return {total_entries: counter, elapsed_time:  time, results: sorted.slice(0, config.limit||500)};
+}

data/lib/mongomapper_ext.rb

@@ -18,6 +18,7 @@ end
 # types
 require 'mongomapper_ext/types/open_struct'
 require 'mongomapper_ext/types/timestamp'
+require 'mongomapper_ext/types/translation'
 
 # storage
 require 'mongomapper_ext/file_list'
@@ -51,3 +52,4 @@ module MongoMapperExt
     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.2"
+  s.version = "0.2.3"
 
   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-20}
+  s.date = %q{2010-04-25}
   s.description = %q{MongoMapper extensions}
   s.email = %q{krawek@gmail.com}
   s.extra_rdoc_files = [
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
      "lib/mongomapper_ext/file.rb",
      "lib/mongomapper_ext/file_list.rb",
      "lib/mongomapper_ext/filter.rb",
+     "lib/mongomapper_ext/js/filter.js",
      "lib/mongomapper_ext/js/find_tags.js",
      "lib/mongomapper_ext/js/tag_cloud.js",
      "lib/mongomapper_ext/slugizer.rb",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - David A. Cuadrado
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-20 00:00:00 -05:00
+date: 2010-04-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -115,6 +115,7 @@ files:
 - lib/mongomapper_ext/file.rb
 - lib/mongomapper_ext/file_list.rb
 - lib/mongomapper_ext/filter.rb
+- lib/mongomapper_ext/js/filter.js
 - lib/mongomapper_ext/js/find_tags.js
 - lib/mongomapper_ext/js/tag_cloud.js
 - lib/mongomapper_ext/slugizer.rb