mongoid_ext 0.6.2 → 0.7.1

data/Gemfile

@@ -1,6 +1,6 @@
 source :gemcutter
 
-gem 'mongoid', '~> 2'
+gem 'mongoid', '~> 2.3'
 gem 'uuidtools', '>= 2.1.1'
 gem 'i18n'
 gem 'tzinfo'

data/Gemfile.lock

@@ -1,36 +1,37 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.6)
-      activesupport (= 3.0.6)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activesupport (3.0.6)
-    bson (1.3.0)
-    builder (2.1.2)
+    activemodel (3.2.1)
+      activesupport (= 3.2.1)
+      builder (~> 3.0.0)
+    activesupport (3.2.1)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    bson (1.5.2)
+    builder (3.0.0)
     differ (0.1.2)
+    encryptor (1.1.3)
     git (1.2.5)
-    i18n (0.5.0)
+    i18n (0.6.0)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
     jnunemaker-matchy (0.4.0)
     mocha (0.9.12)
-    mongo (1.3.0)
-      bson (>= 1.3.0)
-    mongoid (2.0.1)
-      activemodel (~> 3.0)
+    mongo (1.5.2)
+      bson (= 1.5.2)
+    mongoid (2.4.4)
+      activemodel (~> 3.1)
       mongo (~> 1.3)
       tzinfo (~> 0.3.22)
-      will_paginate (~> 3.0.pre)
-    rake (0.8.7)
+    multi_json (1.0.4)
+    rake (0.9.2.2)
     shoulda (2.11.3)
     timecop (0.3.5)
-    tzinfo (0.3.26)
+    tzinfo (0.3.31)
     uuidtools (2.1.2)
-    will_paginate (3.0.pre2)
-    yard (0.6.7)
+    yard (0.6.8)
 
 PLATFORMS
   ruby
@@ -38,11 +39,12 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0.0)
   differ (>= 0.1.2)
+  encryptor (~> 1.1.3)
   i18n
   jeweler (~> 1.5.2)
   jnunemaker-matchy (~> 0.4)
   mocha (~> 0.9.4)
-  mongoid (~> 2.0.0)
+  mongoid (~> 2.3)
   shoulda (~> 2.11.3)
   timecop
   tzinfo

data/VERSION

@@ -1 +1 @@
-0.6.2
+0.7.1

data/lib/mongoid_ext/criteria_ext.rb

@@ -7,9 +7,6 @@ module MongoidExt
 
     module ClassMethods
     end
-
-    module InstanceMethods
-    end
   end
 end
 Mongoid::Criteria.send(:include, MongoidExt::CriteriaExt)

data/lib/mongoid_ext/document_ext.rb

@@ -12,18 +12,16 @@ module MongoidExt
 
     end
 
-    module InstanceMethods
-      def raw_save(opts = {})
-        return true if !changed? && !opts.delete(:force)
+    def raw_save(opts = {})
+      return true if !changed? && !opts.delete(:force)
 
-        if (opts.delete(:validate) != false || valid?)
-          self.collection.save(raw_attributes, opts)
-          true
-        else
-          false
-        end
+      if (opts.delete(:validate) != false || valid?)
+        self.collection.save(raw_attributes, opts)
+        true
+      else
+        false
       end
     end
   end
 end
-Mongoid::Document.send(:include, MongoidExt::DocumentExt)
+Mongoid::Document.send(:include, MongoidExt::DocumentExt)

data/lib/mongoid_ext/file.rb

@@ -1,14 +1,18 @@
 module MongoidExt
   class File < EmbeddedHash
     attr_accessor :_root_document
+    attr_accessor :_list_name
 
     field :name, :type => String
     field :extension, :type => String
     field :content_type, :type => String
+    field :md5, :type => String
 
     alias :filename :name
 
     def put(filename, io, options = {})
+      mark_parent!
+
       options[:_id] = grid_filename
 
       options[:metadata] ||= {}
@@ -26,7 +30,10 @@ module MongoidExt
       if defined?(Magic) && Magic.respond_to?(:guess_string_mime_type)
         data = io.read(256) # be nice with memory usage
         self["content_type"] = options[:content_type] = Magic.guess_string_mime_type(data.to_s)
-        self["extension"] ||= options[:content_type].to_s.split("/").last.split("-").last
+
+        if self.fetch("extension", nil).nil?
+          self["extension"] = options[:content_type].to_s.split("/").last.split("-").last
+        end
 
         if io.respond_to?(:rewind)
           io.rewind
@@ -38,6 +45,11 @@ module MongoidExt
       options[:filename] = grid_filename
       gridfs.delete(grid_filename)
       gridfs.put(io, options)
+
+      if file = self.get
+        file.send(:get_md5)
+        self['md5'] = file.server_md5
+      end
     end
 
     def get
@@ -61,11 +73,11 @@ module MongoidExt
     end
 
     def size
-      get.file_length
+      get.file_length rescue nil
     end
 
     def read(size = nil)
-      self.get.read(size)
+      self.get.read(size) rescue nil
     end
 
     def delete
@@ -74,7 +86,7 @@ module MongoidExt
     end
 
     def method_missing(name, *args, &block)
-      f = self.get rescue nil
+      f = self.get
       if f && f.respond_to?(name)
         f.send(name, *args, &block)
       else
@@ -86,5 +98,9 @@ module MongoidExt
     def gridfs
       _root_document.class.gridfs
     end
+
+    def mark_parent!
+      _root_document.send("#{_list_name}_will_change!")
+    end
   end
 end

data/lib/mongoid_ext/file_list.rb

@@ -1,8 +1,11 @@
 module MongoidExt
   class FileList < EmbeddedHash
     attr_accessor :parent_document
+    attr_accessor :list_name
 
     def put(id, io, metadata = {})
+      mark_parent!
+
       if !parent_document.new_record?
         filename = id
         if io.respond_to?(:original_filename)
@@ -33,20 +36,24 @@ module MongoidExt
     end
 
     def get(id)
+      mark_parent!
+
       if id.kind_of?(MongoidExt::File)
         self[id.id] = id
         return id
       end
 
       id = id.to_s.gsub(".", "_")
-      file = self[id]
+      file = self.fetch(id, nil)
+
       if file.nil?
         file = self[id] = MongoidExt::File.new
-      elsif file.class == BSON::OrderedHash
+      elsif file.class == ::Hash || file.class == BSON::OrderedHash
         file = self[id] = MongoidExt::File.new(file)
       end
 
       file._root_document = parent_document
+      file._list_name = self.list_name
       file
     end
 
@@ -60,6 +67,8 @@ module MongoidExt
     end
 
     def delete(id)
+      mark_parent!
+
       file = self.get(id)
       super(id)
       file.delete
@@ -70,5 +79,22 @@ module MongoidExt
         get(id).delete
       end
     end
+
+    def serialize(v)
+      v
+    end
+
+    def deserialize(v)
+      doc = self.class.new
+      v.each do |k,v|
+        doc[k] = MongoidExt::File.new(v)
+      end
+
+      doc
+    end
+
+    def mark_parent!
+      parent_document.send("#{list_name}_will_change!")
+    end
   end
 end

data/lib/mongoid_ext/filter/result_set.rb

@@ -9,6 +9,8 @@ module MongoidExt
       attr_reader :parsed_query
       attr_reader :mongo_query
       alias limit per_page
+      alias :total_count :total_entries
+      alias :limit_value :per_page
 
       def initialize(total_entries, parsed_query, mongo_query, current_page, per_page=nil)
         @total_entries    = total_entries.to_i
@@ -21,6 +23,7 @@ module MongoidExt
       def total_pages
         (total_entries / per_page.to_f).ceil
       end
+      alias :num_pages :total_pages
 
       def out_of_bounds?
         current_page > total_pages

data/lib/mongoid_ext/js/filter.js

@@ -8,28 +8,49 @@ function filter(collection, q, config) {
   }
 
   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;
-      }
+  db[collection].find(q, fields).limit(500).forEach(function(doc) {
+    var rac = db.eval(
+      function(doc, config) {
+        var r = [];
+        var c = 0;
+
+        var set = {};
+        for(var i = 0; i<doc._keywords.length; i++) {
+          set[doc._keywords[i]] = true;
+        }
+
+        var score = 0.0;
+        for(var i = 0; i < config.words.length; i++) {
+          var word = config.words[i];
+          if(set[word]) {
+            score += 15.0;
+          }
+        }
+
+        for(var i = 0; i < config.stemmed.length; i++) {
+          var word = config.stemmed[i];
+          if(set[word]) {
+            score += (1.0 + word.length);
+          }
+        }
+
+        if(score >= config.min_score || 1.0 ) {
+          delete doc._keywords;
+          r.push({'score': score, 'doc': doc});
+          c += 1;
+        }
+
+        return [r, c];
+      },
+      doc,
+      config
+    );
+
+    for(var i = 0; i<rac[0].length; i++) {
+      results.push(rac[0][i]);
     }
-  );
+    counter += rac[1];
+  });
 
   var sorted = results.sort(function(a,b) {
     return b.score - a.score;

data/lib/mongoid_ext/js/find_tags.js

@@ -1,5 +1,6 @@
 function find_tags(collection, regex, query, limit) {
-  var counter = function(collection, regex, query){
+  var counts = db.eval(
+    function(collection, regex, query){
       var counts = {};
       db[collection].find(query, {"tags":1}).limit(500).forEach(
         function(p){
@@ -13,9 +14,11 @@ function find_tags(collection, regex, query, limit) {
         }
       );
       return counts;
-  };
-
-  var counts = counter(collection, regex, query);
+    },
+    collection,
+    regex,
+    query
+  );
 
   var tags = [];
   for ( var tag in counts ){

data/lib/mongoid_ext/js/tag_cloud.js

@@ -1,22 +1,24 @@
 // TODO: port it to map reduce
 function tagCloud(collection, q, limit) {
-  var counter = function(collection, q){
-    var counts = {constructor: 0};
-    db[collection].find(q, {"tags":1}).limit(500).forEach(
-      function(p){
-        if ( p.tags ){
-          for ( var i=0; i<p.tags.length; i++ ){
-            var name = p.tags[i];
-            counts[name] = 1 + ( counts[name] || 0 );
+  var counts = db.eval(
+    function(collection, q){
+      var counts = {constructor: 0};
+      db[collection].find(q, {"tags":1}).limit(500).forEach(
+        function(p){
+          if ( p.tags ){
+            for ( var i=0; i<p.tags.length; i++ ){
+              var name = p.tags[i];
+              counts[name] = 1 + ( counts[name] || 0 );
+            }
           }
         }
-      }
-    );
-    if(counts["constructor"] == 0) { delete counts.constructor; }
-    return counts;
-  };
-
-  var counts = counter(collection, q);
+      );
+      if(counts["constructor"] == 0) { delete counts.constructor; }
+      return counts;
+    },
+    collection,
+    q
+  );
 
   // maybe sort to by nice
   var sorted = [];

data/lib/mongoid_ext/modifiers.rb

@@ -54,38 +54,37 @@ module MongoidExt
       end
     end
 
-    module InstanceMethods
-      def unset(update)
-        self.class.unset({:_id => id}, update)
-      end
+    #InstanceMethods
+    def unset(update)
+      self.class.unset({:_id => id}, update)
+    end
 
-      def increment(update)
-        self.class.increment({:_id => id}, update)
-      end
+    def increment(update)
+      self.class.increment({:_id => id}, update)
+    end
 
-      def decrement(update)
-        self.class.decrement({:_id => id}, update)
-      end
+    def decrement(update)
+      self.class.decrement({:_id => id}, update)
+    end
 
-      def override(update)
-        self.class.override({:_id => id}, update)
-      end
+    def override(update)
+      self.class.override({:_id => id}, update)
+    end
 
-      def push(update)
-        self.class.push({:_id => id}, update)
-      end
+    def push(update)
+      self.class.push({:_id => id}, update)
+    end
 
-      def pull(update)
-        self.class.pull({:_id => id}, update)
-      end
+    def pull(update)
+      self.class.pull({:_id => id}, update)
+    end
 
-      def push_uniq(update)
-        self.class.push_uniq({:_id => id}, update)
-      end
+    def push_uniq(update)
+      self.class.push_uniq({:_id => id}, update)
+    end
 
-      def pop(update)
-        self.class.pop({:_id => id}, update)
-      end
+    def pop(update)
+      self.class.pop({:_id => id}, update)
     end
   end
 end