mongo_db 0.1.5 → 0.1.6

data/spec/driver/core/collection_spec.rb

@@ -2,7 +2,7 @@ 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
     db.units.save name: 'Probe', race: 'Protoss', status: 'alive'
     db.units.save name: 'Zealot', race: 'Protoss', status: 'alive'
@@ -10,12 +10,12 @@ describe "Collection" do
     # 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'
     db.units.count.should == 0
   end
-  
+
   describe "symbolize" do
     it 'should always return symbolized hashes' do
       zeratul = {name: 'Zeratul'}
@@ -26,12 +26,12 @@ describe "Collection" do
       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')
@@ -44,24 +44,24 @@ describe "Collection" do
       end
     end
   end
-  
+
   it "first" do
     db.units.first.should be_nil
     zeratul = {name: 'Zeratul'}
     db.units.save(zeratul).should be_mongo_id
     db.units.first(name: 'Zeratul')[:name].should == 'Zeratul'
   end
-  
+
   it 'all' do
-    db.units.all.should == []    
-    
+    db.units.all.should == []
+
     zeratul = {name: 'Zeratul'}
     db.units.save(zeratul).should be_mongo_id
-    
+
     list = db.units.all(name: 'Zeratul')
     list.size.should == 1
     list.first[:name].should == 'Zeratul'
-    
+
     # with block
     list = []; db.units.all{|o| list << o}
     list.size.should == 1

data/spec/driver/core/crud_spec.rb

@@ -2,50 +2,50 @@ require 'driver/spec_helper'
 
 describe "Hash CRUD" do
   with_mongo
-  
+
   describe 'simple' do
     before do
       @zeratul = {name: 'Zeratul', info: 'Dark Templar'}
     end
-  
+
     it 'crud' do
       # read
       db.units.count.should == 0
       db.units.all.should == []
       db.units.first.should == nil
-  
+
       # create
       db.units.save(@zeratul).should be_mongo_id
       @zeratul[:_id].should be_mongo_id
-    
+
       # read
       db.units.all.should == [@zeratul]
       db.units.count.should == 1
       db.units.first.should == @zeratul
-    
+
       # update
       @zeratul[:info] = 'Killer of Cerebrates'
       db.units.save @zeratul
       db.units.count.should == 1
       db.units.first(name: 'Zeratul')[:info].should == 'Killer of Cerebrates'
-          
+
       # destroy
       db.units.destroy @zeratul
       db.units.count.should == 0
     end
   end
-  
+
   describe 'embedded' do
-    before do 
+    before do
       @player = {
         name: 'Alex',
         missions: [
           {name: 'Wasteland',         stats: {buildings: 5, units: 10}},
           {name: 'Backwater Station', stats: {buildings: 8, units: 25}}
         ]
-      }      
+      }
     end
-    
+
     it 'crud' do
       # create
       db.players.save(@player).should be_mongo_id
@@ -66,5 +66,5 @@ describe "Hash CRUD" do
       db.players.destroy @player
       db.players.count.should == 0
     end
-  end  
+  end
 end

data/spec/driver/core/hash_helper_spec.rb

@@ -1,8 +1,13 @@
 require 'driver/spec_helper'
 
-describe "HashHelper" do
+describe "Collection" do
+  before do
+    @helper = Object.new
+    @helper.send :extend, Mongo::Ext::Collection
+  end
+
   it "symbolize" do
-    Mongo::Ext::HashHelper.symbolize({
+    @helper.send(:symbolize_doc, {
       'a' => 1,
       'b' => {
         'c' => 2,

data/spec/{driver_example_spec.rb → driver/example_spec.rb}

@@ -1,58 +1,55 @@
-require 'driver/spec_helper'
+require 'mongo_db/driver/core'
+require 'rspec'
 
-describe "Example" do
-  with_mongo
-  
+describe "Driver example" do
   defaults = nil
   before(:all){defaults = Mongo.defaults.clone}
   after(:all){Mongo.defaults = defaults}
-  
-  it "core" do    
-    require 'mongo_db/driver'  
-    
+
+  it "core" do
+    require 'mongo_db/driver/core'
+
     # changing some defaults
     Mongo.defaults.merge! symbolize: true, multi: true, safe: true
-    
+
     # connection & db
     connection = Mongo::Connection.new
     db = connection.db 'default_test'
-    
+
     # collection shortcuts
     db.some_collection
-    
+
     # create
     zeratul =  {name: 'Zeratul',  stats: {attack: 85, life: 300, shield: 100}}
     tassadar = {name: 'Tassadar', stats: {attack: 0,  life: 80,  shield: 300}}
-    
+
     db.units.save zeratul
     db.units.save tassadar
-    
+
     # udate (we made error - mistakenly set Tassadar's attack as zero, let's fix it)
     tassadar[:stats][:attack] = 20
     db.units.save tassadar
-    
+
     # querying first & all, there's also :each, the same as :all
     db.units.first name: 'Zeratul'                     # => zeratul
     db.units.all name: 'Zeratul'                       # => [zeratul]
-    db.units.all name: 'Zeratul' do |hero|
-      hero                                             # => zeratul
+    db.units.all name: 'Zeratul' do |unit|
+      unit                                             # => zeratul
     end
-  end
-  
-  it "optional" do        
+
+
+    #
+    # optional
+    #
+    require 'mongo_db/driver/more'
+
     # simple finders (bang versions also availiable)
     db.units.by_name 'Zeratul'                         # => zeratul
     db.units.first_by_name 'Zeratul'                   # => zeratul
     db.units.all_by_name 'Zeratul'                     # => [zeratul]
-    
+
     # query sugar, use {life: {_lt: 100}} instead of {life: {:$lt => 100}}
-    # it will affect olny small set of keywords (:_lt, :_inc),
-    # other underscored keys will be intact.
-    Mongo.defaults.merge! convert_underscore_to_dollar: true    
-    db.units.all life: {_lt: 100}                      # => [tassadar]
-    
-    # it's also trivial to add support for {:life.lt => 100} notion, but
-    # it uses ugly '=>' hash notation instead of ':' and it differs from
-    # how it looks in native MongoDB JSON query.
+    Mongo.defaults.merge! convert_underscore_to_dollar: true
+    db.units.all 'stats.life' => {_lt: 100}            # => [tassadar]
   end
 end

data/spec/driver/fixes_spec.rb

@@ -0,0 +1,12 @@
+require 'driver/spec_helper'
+
+describe "Driver 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'}, {name: 'Tassadar'}]).class.should == Array
+  end
+end

data/spec/driver/more/querying_spec.rb

@@ -2,23 +2,23 @@ require 'driver/spec_helper'
 
 describe "Querying" do
   with_mongo
-  
+
   before do
     @jim =  {name: 'Jim', age: 34}
     @units = db.units
   end
-    
+
   describe "dynamic finders" do
     it "find, first, by" do
-      @units.first_by_name('Jim').should be_nil    
+      @units.first_by_name('Jim').should be_nil
       -> {@units.first_by_name!('Jim')}.should raise_error(Mongo::NotFound)
-      @units.by_name('Jim').should be_nil    
+      @units.by_name('Jim').should be_nil
       -> {@units.by_name!('Jim')}.should raise_error(Mongo::NotFound)
-      @units.first_by_name('Jim').should be_nil    
+      @units.first_by_name('Jim').should be_nil
       -> {@units.first_by_name!('Jim')}.should raise_error(Mongo::NotFound)
-    
+
       @units.save @jim
-    
+
       @units.first_by_name('Jim').should == @jim
       @units.first_by_name!('Jim').should == @jim
       @units.by_name('Jim').should == @jim
@@ -26,31 +26,31 @@ describe "Querying" do
       @units.first_by_name('Jim').should == @jim
       @units.first_by_name!('Jim').should == @jim
     end
-  
+
     it "all" do
-      @units.all_by_name('Jim').should == []    
+      @units.all_by_name('Jim').should == []
       @units.save @jim
       @units.all_by_name('Jim').should == [@jim]
     end
-  
+
     it "should allow to use bang version only with :first" do
       -> {@units.all_by_name!('Jim')}.should raise_error(/can't use bang/)
     end
-  
+
     it "by_id (special case)" do
       @units.method(:by_id).should == @units.method(:first_by_id)
       @units.method(:by_id!).should == @units.method(:first_by_id!)
-    
-      @units.by_id('4de81858cf26bde569000009').should be_nil    
+
+      @units.by_id('4de81858cf26bde569000009').should be_nil
       -> {@units.by_id!('4de81858cf26bde569000009')}.should raise_error(Mongo::NotFound)
-    
+
       @units.save @jim
-    
+
       @units.by_id(@jim[:_id]).should == @jim
       @units.by_id!(@jim[:_id]).should == @jim
     end
   end
-  
+
   it "underscore to dollar" do
     @units.save @jim
     @units.save name: 'Zeratul', age: 600

data/spec/driver/spec_helper.rb

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

data/spec/model/{object/callbacks.rb → callbacks.rb}

@@ -1,16 +1,16 @@
 require 'spec_helper'
 
 describe 'Object callbacks' do
-  with_mongo_model
-  
+  with_mongo
+
   before do
     class Player
       attr_accessor :missions
-            
+
       class Mission
-      end                
+      end
     end
-  
+
     @mission = Player::Mission.new
     @player = Player.new
     @player.missions = [@mission]
@@ -29,13 +29,13 @@ describe 'Object callbacks' do
       @player.should_receive(name).ordered
       @misson.should_receive(name).ordered
     end
-    
+
     db.players.save @player
   end
-  
+
   it 'update' do
     db.players.save @player
-    
+
     [
       :before_validation,
       :validate,
@@ -50,10 +50,10 @@ describe 'Object callbacks' do
     end
     db.players.save @player
   end
-  
+
   it 'destroy' do
     db.players.save @player
-    
+
     [
       :before_validation,
       :validate,
@@ -66,13 +66,13 @@ describe 'Object callbacks' do
     end
     db.players.destroy @player
   end
-  
+
   it 'should be able interrupt CRUD' do
     @misson.stub!(:before_save).and_return(false)
     db.players.save(@player).should be_false
     db.players.count.should == 0
   end
-  
+
   it 'should be able skip callbacks' do
     [
       :before_validation,
@@ -89,7 +89,7 @@ describe 'Object callbacks' do
       @player.should_not_receive(name)
       @misson.should_receive(name)
     end
-    
+
     db.players.save @player, callbacks: false
     db.players.count.should == 1
     db.players.save @player, callbacks: false

data/spec/model/{model/crud.rb → model_crud.rb}

@@ -2,25 +2,25 @@ require 'spec_helper'
 require 'object/crud_shared'
 
 describe "Model CRUD" do
-  with_mongo_model
-  
+  with_mongo
+
   describe 'simple' do
     before do
       class Person
         inherit Mongo::Model
         collection{db.units}
-        
-        def initialize name, info; @name, @info = name, info end
+
+        def initialize name = nil, info = nil; @name, @info = name, info end
         attr_accessor :name, :info
         def == o; [self.class, name, info] == [o.class, o.respond_to(:name), o.respond_to(:info)] end
       end
-    
-      @zeratul = User.new 'Zeratul', 'Dark Templar'
+
+      @zeratul = Person.new 'Zeratul', 'Dark Templar'
     end
     after{remove_constants :Person}
-  
+
     it_should_behave_like "object CRUD"
-    
+
     it 'model crud' do
       # read
       Person.count.should == 0
@@ -29,14 +29,14 @@ describe "Model CRUD" do
 
       # create
       @zeratul.save.should be_true
-      @zeratul._id.should be_present
+      @zeratul._id.should_not be_nil
 
       # read
       Person.count.should == 1
       Person.all.should == [@zeratul]
       Person.first.should == @zeratul
       Person.first.object_id.should_not == @zeratul.object_id
-      
+
       # update
       @zeratul.info = 'Killer of Cerebrates'
       @zeratul.save.should be_true
@@ -47,18 +47,18 @@ describe "Model CRUD" do
       @zeratul.destroy.should be_true
       Person.count.should == 0
     end
-    
+
     it 'should be able to save to another collection' do
       # create
       @zeratul.save(collection: db.protosses).should be_true
-      @zeratul._id.should be_present      
+      @zeratul._id.should_not be_nil
 
       # read
       Person.count.should == 0
       db.protosses.count.should == 1
       db.protosses.should == @zeratul
       db.protosses.object_id.should_not == @zeratul.object_id
-      
+
       # update
       @zeratul.info = 'Killer of Cerebrates'
       @zeratul.save(collection: db.protosses).should be_true
@@ -71,22 +71,22 @@ describe "Model CRUD" do
       db.protosses.count.should == 0
     end
   end
-  
+
   describe 'embedded' do
-    before do 
+    before do
       class Player
         inherit Mongo::Model
         attr_accessor :missions
-        def == o; [self.class, self.missions] = [o.class, o.respond_to(:missions)] end
-        
+        def == o; [self.class, self.missions] == [o.class, o.respond_to(:missions)] end
+
         class Mission
           inherit Mongo::Model
-          def initialize name, stats; @name, @stats = name, stats end
+          def initialize name = nil, stats = nil; @name, @stats = name, stats end
           attr_accessor :name, :stats
-          def == o; [self.class, self.name, self.stats] = [o.class, o.respond_to(:name), o.respond_to(:stats)] end
-        end                
+          def == o; [self.class, self.name, self.stats] == [o.class, o.respond_to(:name), o.respond_to(:stats)] end
+        end
       end
-      
+
       @player = Player.new
       @player.missions = [
         Player::Mission.new('Wasteland',         {buildings: 5, units: 10}),
@@ -94,13 +94,13 @@ describe "Model CRUD" do
       ]
     end
     after{remove_constants :Player}
-    
+
     it_should_behave_like 'shared object CRUD'
-    
+
     it 'crud' do
       # create
       @player.save.should be_true
-      @player._id.should be_present
+      @player._id.should_not be_nil
 
       # read
       Player.count.should == 1
@@ -119,5 +119,5 @@ describe "Model CRUD" do
       @player.destroy.should be_true
       Player.count.should == 0
     end
-  end    
+  end
 end

data/spec/model/{object/validation.rb → validation.rb}

@@ -1,16 +1,16 @@
 require 'spec_helper'
 
 describe 'Object validation' do
-  with_mongo_model
-  
+  with_mongo
+
   before do
     class Player
       attr_accessor :missions
-            
+
       class Mission
-      end                
+      end
     end
-  
+
     @mission = Player::Mission.new
     @player = Player.new
     @player.missions = [@mission]
@@ -21,52 +21,52 @@ describe 'Object validation' do
     # create
     @player.stub!(:valid?).and_return(false)
     db.players.save(@player).should be_false
-    
+
     @player.stub!(:valid?).and_return(true)
     db.players.save(@player).should be_true
-    
+
     # update
     @player.stub!(:valid?).and_return(false)
     db.players.save(@player).should be_false
-    
+
     @player.stub!(:valid?).and_return(true)
     db.players.save(@player).should be_true
-    
+
     # destroy
     @player.stub!(:valid?).and_return(false)
     db.players.destroy(@player).should be_false
-    
+
     @player.stub!(:valid?).and_return(true)
     db.players.destroy(@player).should be_true
   end
-  
+
   it 'should not save/update/destroy invalid embedded objects' do
     # create
     @mission.stub!(:valid?).and_return(false)
     db.players.save(@player).should be_false
-    
+
     @mission.stub!(:valid?).and_return(true)
     db.players.save(@player).should be_true
-    
+
     # update
     @mission.stub!(:valid?).and_return(false)
     db.players.save(@player).should be_false
-    
+
     @mission.stub!(:valid?).and_return(true)
     db.players.save(@player).should be_true
-    
+
     # destroy
     @mission.stub!(:valid?).and_return(false)
     db.players.destroy(@player).should be_false
-    
+
     @mission.stub!(:valid?).and_return(true)
     db.players.destroy(@player).should be_true
   end
-  
+
   it "should be able skip validation" do
     @player.stub!(:valid?).and_return(false)
     db.players.save(@player, validate: false).should be_true
-    
+
     @player.stub!(:valid?).and_return(true)
     @mission.stub!(:valid?).and_return(false)
     db.players.save(@player, validate: false).should be_true

data/spec/{model/object → object}/crud_shared.rb

@@ -1,4 +1,4 @@
-shared_examples_for 'object CRUD' do  
+shared_examples_for 'object CRUD' do
   it 'crud' do
     # read
     db.units.count.should == 0
@@ -7,31 +7,31 @@ shared_examples_for 'object CRUD' do
 
     # create
     db.units.save(@zeratul).should be_true
-    @zeratul.instance_variable_get(:@_id).should be_present
-  
+    @zeratul.instance_variable_get(:@_id).should_not be_nil
+
     # read
     db.units.count.should == 1
     db.units.all.should == [@zeratul]
     db.units.first.should == @zeratul
     db.units.first.object_id.should_not == @zeratul.object_id
-  
+
     # update
     @zeratul.info = 'Killer of Cerebrates'
     db.units.save(@zeratul).should be_true
     db.units.count.should == 1
     db.units.first(name: 'Zeratul').info.should == 'Killer of Cerebrates'
-  
+
     # destroy
     db.units.destroy(@zeratul).should be_true
     db.units.count.should == 0
   end
 end
 
-shared_examples_for 'embedded object CRUD' do  
+shared_examples_for 'embedded object CRUD' do
   it 'crud' do
     # create
     db.players.save(@player)
-    @player.instance_variable_get(:@_id).should be_present
+    @player.instance_variable_get(:@_id).should_not be_nil
 
     # read
     db.players.count.should == 1
@@ -40,7 +40,7 @@ shared_examples_for 'embedded object CRUD' do
 
     # update
     @player.missions.first.stats[:units] = 9
-    @player.missions << Player::Mission.new('Desperate Alliance', {buildings: 11, units: 40}),
+    @player.missions << Player::Mission.new('Desperate Alliance', {buildings: 11, units: 40})
     db.players.save @player
     db.players.count.should == 1
     db.players.first.should == @player