mongodb-mongo 0.6.6 → 0.6.7

data/README.rdoc

@@ -288,10 +288,6 @@ See the git log comments.
 
 = To Do
 
-* Add group_by. Need to figure out how we are going to send functions. The
-  current thinking is that Mongo will allow a subset of JavaScript (which we
-  would have to send as a string), but this is still under discussion.
-
 * Tests for update and repsert.
 
 * Add a way to specify a collection of databases on startup (a simple array of

data/Rakefile

@@ -23,7 +23,7 @@ desc "Generate documentation"
 task :rdoc do
   version = eval(File.read("mongo-ruby-driver.gemspec")).version
   out = File.join('html', version.to_s)
-  FileUtils.rm_rf(out)
+  FileUtils.rm_rf('html')
   system "rdoc --main README.rdoc --op #{out} --inline-source --quiet README.rdoc `find lib -name '*.rb'`"
 end
 

data/lib/mongo/collection.rb

@@ -139,6 +139,48 @@ module XGen
           @db.drop_collection(@name)
         end
 
+        # Perform a query similar to an SQL group by operation.
+        #
+        # Returns an array of grouped items.
+        #
+        # :keys :: list of fields to group by
+        # :condition :: specification of rows to be considered (as a 'find'
+        #               query specification)
+        # :initial :: initial value of the aggregation counter object
+        # :reduce :: aggregation function as a JavaScript string
+        def group(keys, condition, initial, reduce)
+          group_function = <<EOS
+function () {
+    var c = db[ns].find(condition);
+    var map = new Map();
+    var reduce_function = #{reduce};
+    while (c.hasNext()) {
+        var obj = c.next();
+
+        var key = {};
+        for (var i in keys) {
+            key[keys[i]] = obj[keys[i]];
+        }
+
+        var aggObj = map[key];
+        if (aggObj == null) {
+            var newObj = Object.extend({}, key);
+            aggObj = map[key] = Object.extend(newObj, initial);
+        }
+        reduce_function(obj, aggObj);
+    }
+    return {"result": map.values()};
+}
+EOS
+          return @db.eval(Code.new(group_function,
+                                   {
+                                     "ns" => @name,
+                                     "keys" => keys,
+                                     "condition" => condition,
+                                     "initial" => initial
+                                   }))["result"]
+        end
+
         # Return an array of hashes, one for each index. Each hash contains:
         #
         # :name :: Index name

data/lib/mongo/db.rb

@@ -372,6 +372,11 @@ module XGen
           raise "Error with count command: #{doc.inspect}"
         end
 
+        # Dereference a DBRef, getting the document it points to.
+        def dereference(dbref)
+          collection(dbref.namespace).find_first("_id" => dbref.object_id)
+        end
+
         # Evaluate a JavaScript expression on MongoDB.
         # +code+ should be a string or Code instance containing a JavaScript
         # expression. Additional arguments will be passed to that expression

data/lib/mongo/util/bson.rb

@@ -85,7 +85,13 @@ class BSON
       @buf.put_int(0)
 
       # Write key/value pairs. Always write _id first if it exists.
-      oid = obj['_id'] || obj[:_id]
+      if obj.has_key? '_id'
+        oid = obj['_id']
+      elsif obj.has_key? :_id
+        oid = obj[:_id]
+      else
+        oid = false
+      end
       serialize_key_value('_id', oid) if oid
       obj.each {|k, v| serialize_key_value(k, v) unless k == '_id' || k == :_id }
 

data/mongo-ruby-driver.gemspec

@@ -79,7 +79,7 @@ TEST_FILES = ['tests/mongo-qa/_common.rb',
 
 Gem::Specification.new do |s|
   s.name = 'mongo'
-  s.version = '0.6.6'
+  s.version = '0.6.7'
   s.platform = Gem::Platform::RUBY
   s.summary = 'Ruby driver for the 10gen Mongo DB'
   s.description = 'A Ruby driver for the 10gen Mongo DB. For more information about Mongo, see http://www.mongodb.org.'

data/tests/test_db_api.rb

@@ -522,6 +522,42 @@ class DBAPITest < Test::Unit::TestCase
     end
   end
 
+  def test_hash_default_value_id
+    val = Hash.new(0)
+    val["x"] = 5
+    @@coll.insert val
+    id = @@coll.find_first("x" => 5)["_id"]
+    assert id != 0
+  end
+
+  def test_group
+    @@db.drop_collection("test")
+    test = @@db.collection("test")
+
+    assert_equal [], test.group([], {}, {"count" => 0}, "function (obj, prev) { prev.count++; }")
+
+    test.insert("a" => 2)
+    test.insert("b" => 5)
+    test.insert("a" => 1)
+
+    assert_equal 3, test.group([], {}, {"count" => 0}, "function (obj, prev) { prev.count++; }")[0]["count"]
+    assert_equal 1, test.group([], {"a" => {"$gt" => 1}}, {"count" => 0}, "function (obj, prev) { prev.count++; }")[0]["count"]
+  end
+
+  def test_deref
+    @@coll.clear
+
+    assert_equal nil, @@db.dereference(DBRef.new("test", ObjectID.new))
+    obj = {"x" => true}
+    key = @@coll.insert(obj)["_id"]
+    assert_equal true, @@db.dereference(DBRef.new("test", key))["x"]
+
+    assert_equal nil, @@db.dereference(DBRef.new("test", 4))
+    obj = {"_id" => 4}
+    @@coll.insert(obj)
+    assert_equal obj, @@db.dereference(DBRef.new("test", 4))
+  end
+
 # TODO this test fails with error message "Undefed Before end of object"
 # That is a database error. The undefined type may go away.
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongodb-mongo
 version: !ruby/object:Gem::Version 
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors: 
 - Jim Menard