mongodb 0.0.13 → 2.0.0

data/lib/mongo/object/spec.rb

@@ -1,6 +1,16 @@
 require 'mongo/object'
 require 'mongo/driver/spec'
 
-# RSpec adds some instance variables and we need to skip it.
-Mongo::Object.send :remove_const, :SKIP_IV_REGEXP
-Mongo::Object.send :const_set, :SKIP_IV_REGEXP, /^@_|^@mock_proxy/
+Mongo::Object.class_eval do
+  # RSpec adds some instance variables and we need to skip it.
+  def persistent_instance_variable_names
+    instance_variables.select{|n| n !~ /^@_|^@mock_proxy/}
+  end
+
+  class << self
+    # Disabling cache.
+    def constantize class_name
+      eval class_name, TOPLEVEL_BINDING, __FILE__, __LINE__
+    end
+  end
+end

data/lib/mongo/object/spec/shared_object_crud.rb

@@ -0,0 +1,124 @@
+shared_examples_for 'single object CRUD' do
+  it 'should convert object to mongo hash format' do
+    expected = {
+      "_class" => "Unit",
+      "name"   => "Zeratul",
+      "info"   => "Dark Templar"
+    }
+    @unit.to_mongo.should == expected
+
+    @unit._id    = 'some id'
+    expected['_id'] = 'some id'
+    @unit.to_mongo.should == expected
+  end
+
+  it 'should perform CRUD' do
+    # Read.
+    db.units.count.should == 0
+    db.units.all.should == []
+    db.units.first.should == nil
+
+    # Create.
+    db.units.save(@unit).should be_true
+    @unit._id.should_not be_nil
+
+    # Read.
+    db.units.count.should == 1
+    obj = db.units.first
+    obj.should == @unit
+    obj.class.should == @unit.class
+    obj.object_id.should_not == @unit.object_id
+
+    # Update.
+    @unit.info = 'Killer of Cerebrates'
+    db.units.save(@unit).should be_true
+    db.units.count.should == 1
+    db.units.first(name: 'Zeratul').info.should == 'Killer of Cerebrates'
+
+    # Delete.
+    db.units.delete(@unit).should be_true
+    db.units.count.should == 0
+  end
+end
+
+shared_examples_for 'embedded object CRUD' do
+  it 'should convert object to mongo hash format' do
+    expected = {
+      "_class" => "Unit",
+      "items"  => [
+        {"name" => "Psionic blade", "_class" => "Unit::Item"},
+        {"name" => "Plasma shield", "_class" => "Unit::Item"}
+      ]
+    }
+    @unit.to_mongo.should == expected
+
+    @unit._id    = 'some id'
+    expected['_id'] = 'some id'
+    @unit.to_mongo.should == expected
+  end
+
+  it 'should perform CRUD' do
+    # Create.
+    db.units.save @unit
+    @unit._id.should_not be_nil
+
+    item = @unit.items.first
+    item._id.should be_nil
+
+    # Read.
+    db.units.count.should == 1
+    unit = db.units.first
+    unit.should == @unit
+    unit.object_id.should_not == @unit.object_id
+
+    item = unit.items.first
+    item._id.should be_nil
+
+    # Update.
+    @unit.items.first.name = 'Psionic blade level 3'
+    item = @item_class.new.tap{|o| o.name = 'Power suit'}
+    @unit.items << item
+    db.units.save @unit
+    db.units.count.should == 1
+    unit = db.units.first
+    unit.should == @unit
+    unit.object_id.should_not == @unit.object_id
+
+    # Delete.
+    db.units.delete @unit
+    db.units.count.should == 0
+  end
+
+  it "embedded object should have :_parent reference to the main object" do
+    db.units.save @unit
+    unit = db.units.first
+    unit.items.first._parent.should == unit
+  end
+
+  # Discarded.
+  # describe "id for embedded objects" do
+  #   old = nil
+  #   before{old = Mongo.defaults[:generate_id]}
+  #   after{Mongo.defaults[:generate_id] = old}
+  #
+  #   it "should not be generated if not specified" do
+  #     Mongo.defaults[:generate_id] = false
+  #
+  #     db.units.save @unit
+  #     unit = db.units.first
+  #
+  #     @unit.items.first._id.should be_nil
+  #     unit.items.first._id.should be_nil
+  #   end
+  #
+  #   it "should be generated if specified" do
+  #     Mongo.defaults[:generate_id] = true
+  #
+  #     db.units.save @unit
+  #     unit = db.units.first
+  #
+  #     @unit.items.first._id.should be_present
+  #     unit.items.first._id.should be_present
+  #   end
+  # end
+end

data/lib/mongo/object/support.rb

@@ -0,0 +1,15 @@
+Object.class_eval do
+  def to_mongo; self end
+end
+
+Array.class_eval do
+  def to_mongo
+    collect{|v| v.to_mongo}
+  end
+end
+
+Hash.class_eval do
+  def to_mongo
+    {}.tap{|h| each{|k, v| h[k] = v.to_mongo}}
+  end
+end

data/lib/mongodb/gems.rb

@@ -1 +1 @@
-gem 'mongo',    '~> 1.3'
+gem 'mongo',    '~> 1.4'

data/spec/driver/collection_spec.rb

@@ -3,80 +3,50 @@ require 'driver/spec_helper'
 describe "Collection" do
   with_mongo
 
-  it 'by default save must update all matched by criteria (not first as defautl in mongo)' do
+  it "should by default update all matched by criteria (not first as default in mongo)" do
     db.units.save name: 'Probe', race: 'Protoss', status: 'alive'
     db.units.save name: 'Zealot', race: 'Protoss', status: 'alive'
 
-    # update
+    # Update.
     db.units.update({race: 'Protoss'}, :$set => {status: 'dead'})
     db.units.all.collect{|u| u['status']}.should == %w(dead dead)
 
-    # destroy
-    db.units.destroy race: 'Protoss'
+    # Delete.
+    db.units.delete race: 'Protoss'
     db.units.count.should == 0
   end
 
-  # Discarded
-  # describe "symbolize" do
-  #   it 'should always return symbolized hashes' do
-  #     zeratul = {name: 'Zeratul'}
-  #     db.units.save(zeratul).should be_mongo_id
-  #     r = db.units.first(name: 'Zeratul')
-  #     r[:_id].should be_mongo_id
-  #     r['_id'].should be_nil
-  #     r[:name].should == 'Zeratul'
-  #     r['name'].should be_nil
-  #   end
-  #
-  #   it "should be able to disable symbolization" do
-  #     old = Mongo.defaults[:symbolize]
-  #     begin
-  #       Mongo.defaults[:symbolize] = false
-  #
-  #       zeratul = {name: 'Zeratul'}
-  #       db.units.save(zeratul).should be_mongo_id
-  #       r = db.units.first(name: 'Zeratul')
-  #       r[:_id].should be_nil
-  #       r['_id'].should be_mongo_id
-  #       r[:name].should be_nil
-  #       r['name'].should == 'Zeratul'
-  #     ensure
-  #       Mongo.defaults[:symbolize] = old
-  #     end
-  #   end
-  # end
-
-  it "first" do
+  it "should return first element of collection" do
     db.units.first.should be_nil
-    zeratul = {name: 'Zeratul'}
-    db.units.save(zeratul).should be_mongo_id
+    unit = {name: 'Zeratul'}
+    db.units.save(unit).should be_mongo_id
     db.units.first(name: 'Zeratul')['name'].should == 'Zeratul'
   end
 
-  it 'all' do
+  it 'should return all elements of collection' do
     db.units.all.should == []
 
-    zeratul = {name: 'Zeratul'}
-    db.units.save(zeratul).should be_mongo_id
+    unit = {name: 'Zeratul'}
+    db.units.save(unit).should be_mongo_id
 
     list = db.units.all(name: 'Zeratul')
     list.size.should == 1
     list.first['name'].should == 'Zeratul'
 
-    # with block
+    # With block.
     list = []; db.units.all{|o| list << o}
     list.size.should == 1
     list.first['name'].should == 'Zeratul'
   end
 
-  it 'count' do
+  it 'should return count of elements in collection' do
     db.units.count(name: 'Zeratul').should == 0
     db.units.save name: 'Zeratul'
     db.units.save name: 'Tassadar'
     db.units.count(name: 'Zeratul').should == 1
   end
 
-  it "underscore to dollar" do
+  it "should rewrite underscore symbol to dollar in query" do
     db.units.save name: 'Jim',     age: 34
     db.units.save name: 'Zeratul', age: 600
     db.units.all(age: {_lt: 100}).count.should == 1

data/spec/driver/connection_spec.rb

@@ -3,7 +3,7 @@ require 'driver/spec_helper'
 describe "Connection" do
   with_mongo
 
-  it "should provide handy access to databases" do
+  it "should provide handy shortcuts to databases" do
     db.connection.some_db.name.should == 'some_db'
   end
 end

data/spec/driver/database_spec.rb

@@ -3,7 +3,7 @@ require 'driver/spec_helper'
 describe "Database" do
   with_mongo
 
-  it "should provide handy access to collections" do
+  it "should provide handy shortcuts to collections" do
     db.some_collection.name.should == 'some_collection'
   end
 end

data/spec/driver/dynamic_finders_spec.rb

@@ -3,15 +3,15 @@ require 'driver/spec_helper'
 describe "Dynamic Finders" do
   with_mongo
 
-  before :all do
+  before_all do
     class FindersStub
       include Mongo::DynamicFinders
     end
   end
 
-  after(:all){remove_constants :FindersStub}
+  after_all{remove_constants :FindersStub}
 
-  it "parse_finder" do
+  it "should parse finders" do
     [
       [:first_by_name,  'Jim'],         [:first,  {name: 'Jim'}],
       [:first_by_name!, 'Jim'],         [:first!, {name: 'Jim'}],
@@ -42,7 +42,7 @@ describe "Dynamic Finders" do
     -> {stub.all_by_name!('Jim')}.should raise_error(/can't use bang/)
   end
 
-  it 'integration with collection' do
+  it 'should work with collection' do
     db.units.first_by_name('Jim').should be_nil
     db.units.save name: 'Jim'
     db.units.first_by_name('Jim')['name'].should == 'Jim'

data/spec/driver/fixes_spec.rb

@@ -1,12 +1,12 @@
 require 'driver/spec_helper'
 
-describe "Driver fixes" do
+describe "Fixes" do
   with_mongo
 
   it "should always return array if input is array" do
     db.units.insert([{name: 'Zeratul'}]).class.should == Array
 
-    db.units.insert(name: 'Zeratul').class.should == BSON::ObjectId
+    db.units.insert(name: 'Zeratul').should be_mongo_id
     db.units.insert([{name: 'Zeratul'}, {name: 'Tassadar'}]).class.should == Array
   end
 end

data/spec/driver/hash_crud_spec.rb

@@ -0,0 +1,69 @@
+require 'driver/spec_helper'
+
+describe "Hash CRUD" do
+  with_mongo
+
+  describe 'single hash' do
+    before do
+      @unit = {'name' => 'Zeratul', 'info' => 'Dark Templar'}
+    end
+
+    it 'should perform CRUD' do
+      # Read.
+      db.units.count.should == 0
+      db.units.all.should == []
+      db.units.first.should == nil
+
+      # Create.
+      db.units.save(@unit).should be_mongo_id
+      @unit['_id'].should be_mongo_id
+
+      # Read.
+      db.units.all.should == [@unit]
+      db.units.count.should == 1
+      db.units.first.should == @unit
+
+      # Update.
+      @unit['info'] = 'Killer of Cerebrates'
+      db.units.save @unit
+      db.units.count.should == 1
+      db.units.first(name: 'Zeratul')['info'].should == 'Killer of Cerebrates'
+
+      # Delete.
+      db.units.delete @unit
+      db.units.count.should == 0
+    end
+  end
+
+  describe 'embedded hash' do
+    before do
+      @unit = {
+        'items' => [
+          {'name' => 'Psionic blade'},
+          {'name' => 'Plasma shield'}
+        ]
+      }
+    end
+
+    it 'should perform CRUD' do
+      # Create.
+      db.units.save(@unit).should be_mongo_id
+
+      # Read.
+      db.units.count.should == 1
+      db.units.first.should == @unit
+
+      # Update.
+      @unit['items'].first['name'] = 'Psionic blade level 3'
+      @unit['items'].push 'name' => 'Power suit'
+      db.units.save(@unit).should_not be_nil
+      db.units.count.should == 1
+      db.units.first.should == @unit
+      db.units.first.object_id.should_not == @unit.object_id
+
+      # Delete.
+      db.units.delete @unit
+      db.units.count.should == 0
+    end
+  end
+end

data/spec/driver/spec_helper.rb

@@ -10,9 +10,7 @@ require 'ruby_ext'
 require 'rspec_ext'
 require 'mongo/driver/spec'
 
-#
-# Handy spec helpers
-#
+# Shortcuts.
 rspec do
   def db
     mongo.db

data/spec/migration/migration_spec.rb

@@ -12,7 +12,7 @@ describe "Migration" do
     @migration.update(0).should be_false
   end
 
-  it "migration should provide access to database" do
+  it "should provide access to database" do
     @migration.add 1 do |m|
       m.up do |db|
         db.users.save name: 'Bob'
@@ -22,7 +22,7 @@ describe "Migration" do
     db.users.count.should == 1
   end
 
-  it "increase_db_version" do
+  it "should increase db version" do
     @migration.current_version.should == 0
 
     check = mock
@@ -35,7 +35,7 @@ describe "Migration" do
     @migration.current_version.should == 1
   end
 
-  it "decrease_db_version" do
+  it "should decrease db version" do
     check = mock
     @migration.add 1 do |m|
       m.up{check.up}
@@ -50,7 +50,7 @@ describe "Migration" do
     @migration.current_version.should == 0
   end
 
-  it "should automigrate to highest version" do
+  it "should migrate to the highest version if version not explicitly specified" do
     @migration.add 1 do |m|
       m.up{}
     end

data/spec/object/miscellaneous_spec.rb

@@ -0,0 +1,23 @@
+require 'object/spec_helper'
+
+describe "Miscellaneous" do
+  with_mongo
+  old = Mongo.defaults[:generate_id] = false
+  before do
+    Mongo.defaults[:generate_id] = true
+    class Tmp
+      include Mongo::Object
+    end
+  end
+  after do
+    Mongo.defaults[:generate_id] = old
+    remove_constants :Tmp
+  end
+
+  it "should use autogenerated random string id (if specified, instead of default BSON::ObjectId)" do
+    o = Tmp.new
+    db.objects.save o
+    o._id.should be_a(String)
+    o._id.size.should == Mongo.defaults[:random_string_id_size]
+  end
+end