mongodb 0.0.11 → 0.0.12

data/lib/mongo/driver.rb

@@ -1,4 +1,4 @@
-require 'mongo/gems'
+require 'mongodb/gems'
 
 require 'mongo'
 

data/lib/mongo/driver/collection.rb

@@ -1,7 +1,7 @@
 require 'set'
 require 'date'
 
-module Mongo::CollectionExt  
+module Mongo::CollectionExt
   #
   # CRUD
   #

data/lib/mongo/driver/connection.rb

@@ -1,6 +1,6 @@
 module Mongo::ConnectionExt
   attr_writer :logger
-  
+
   protected
     def method_missing db_name
       self.db db_name.to_s

data/lib/mongo/driver/database.rb

@@ -2,14 +2,14 @@ module Mongo::DBExt
   def drop
     connection.drop_database name
   end
-  
+
   def clear
     collection_names.each do |name|
       next if name =~ /^system\./
       mongo.db.collection(name).drop
     end
   end
-  
+
   protected
     def method_missing collection_name
       self.collection collection_name

data/lib/mongo/object.rb

@@ -1,6 +1,7 @@
 require 'mongo/driver'
 
 %w(
+  support
   object
   object_helper
 ).each{|f| require "mongo/object/#{f}"}

data/lib/mongo/object/object.rb

@@ -2,15 +2,19 @@ module Mongo::Object
   attr_accessor :_id, :_parent
 
   def valid? options = {}
-    options = ::Mongo::Object.parse_options options
     errors.clear
+    run_validations options
+  end
+
+  def run_validations options = {}
+    options = ::Mongo::Object.parse_options options
     begin
       return false if options[:callbacks] and !::Mongo::Object.run_before_callbacks(self, :validate)
 
       child_options = options.merge internal: true
       result = [
+        (respond_to?(:run_model_validations) ? run_model_validations : true),
         child_objects.all?{|group| group.all?{|obj| obj.valid?(child_options)}},
-        ::Mongo::Object.run_validations(self),
         errors.empty?
       ].all?
 
@@ -18,12 +22,12 @@ module Mongo::Object
 
       result
     ensure
-      clear_child_objects unless options[:internal]
+      clear_child_objects_cache unless options[:internal]
     end
   end
 
   def errors
-    @_errors ||= {}
+    @_errors ||= Hash.new([])
   end
 
   def create_object collection, options
@@ -69,7 +73,7 @@ module Mongo::Object
       return options
     end
 
-    def to_mongo_options options
+    def parse_mongo_options options
       options = options.clone
       options.delete :validate
       options.delete :callbacks
@@ -83,7 +87,7 @@ module Mongo::Object
     end
 
     def instance_variables obj
-      # skipping variables starting with _xx, usually they
+      # skipping variables starting with @_, usually they
       # have specific meaning and used for example for cache
       obj.instance_variables.select{|n| n !~ SKIP_IV_REGEXP}
     end
@@ -138,8 +142,10 @@ module Mongo::Object
 
     def each_object obj, &block
       if obj.is_a? Hash
+        block.call obj if obj.is_a? ::Mongo::Object
         obj.each{|k, v| each_object v, &block}
       elsif obj.is_a? Array
+        block.call obj if obj.is_a? ::Mongo::Object
         obj.each{|v| each_object v, &block}
       elsif obj.is_a? ::Mongo::Object
         block.call obj
@@ -167,7 +173,7 @@ module Mongo::Object
     end
 
     def run_after_callbacks obj, method
-      if obj.respond_to?(:run_before_callbacks)
+      if obj.respond_to?(:run_after_callbacks)
         obj.run_after_callbacks(method, method: method)
         obj.run_after_callbacks(:save, method: :save) if method == :update or method == :create
       else
@@ -175,10 +181,6 @@ module Mongo::Object
       end
     end
 
-    def run_validations obj
-      obj.respond_to?(:run_validations) ? obj.run_validations : true
-    end
-
     protected
       def _build doc, parent = nil
         if doc.is_a? Hash
@@ -199,6 +201,7 @@ module Mongo::Object
               obj
             end
             obj._parent = parent if parent
+            run_after_callbacks obj, :build
             obj
           else
             hash = {}
@@ -223,7 +226,6 @@ module Mongo::Object
   end
 
   protected
-    attr_writer :original_children
     def original_children; @_original_children ||= [] end
 
     def update_original_children!
@@ -235,17 +237,17 @@ module Mongo::Object
       end
     end
 
-    def clear_child_objects
-      if instance_variable_get(:@_child_objects)
+    def clear_child_objects_cache
+      if instance_variable_get(:@_child_objects_cache)
         child_objects.each do |group|
-          group.each{|obj| obj.clear_child_objects}
+          group.each{|obj| obj.clear_child_objects_cache}
         end
-        remove_instance_variable :@_child_objects
+        remove_instance_variable :@_child_objects_cache
       end
     end
 
     def child_objects
-      unless @_child_objects
+      unless @_child_objects_cache
         created_children, updated_children, destroyed_children = [], [], []
 
         original_children_ids = Set.new; original_children.each{|obj| original_children_ids << obj.object_id}
@@ -258,9 +260,9 @@ module Mongo::Object
         end
         destroyed_children = original_children.select{|obj| !children_ids.include?(obj.object_id)}
 
-        @_child_objects = [created_children, updated_children, destroyed_children]
+        @_child_objects_cache = [created_children, updated_children, destroyed_children]
       end
-      @_child_objects
+      @_child_objects_cache
     end
 
     def with_object_callbacks method, options, &block
@@ -273,7 +275,7 @@ module Mongo::Object
       return false if options[:callbacks] and !run_all_callbacks(:before, method)
 
       # saving
-      block.call ::Mongo::Object.to_mongo_options(options)
+      block.call ::Mongo::Object.parse_mongo_options(options)
       update_original_children!
 
       # after callbacks
@@ -281,10 +283,9 @@ module Mongo::Object
 
       true
     ensure
-      clear_child_objects
+      clear_child_objects_cache
     end
 
-    # TODO1 move to static method
     def run_all_callbacks type, method
       result = if type == :before
         ::Mongo::Object.run_before_callbacks self, method

data/spec/object/callbacks_spec.rb

@@ -3,95 +3,113 @@ require 'object/spec_helper'
 describe 'Object callbacks' do
   with_mongo
 
-  before :all do
-    class Player
-      include Mongo::Object, RSpec::CallbackHelper
-      attr_accessor :missions
+  [Object, Array, Hash].each do |embedded_object_superclass|
+    embedded_object_class = nil
+    before :all do
+      class MainObject
+        include Mongo::Object, RSpec::CallbackHelper
+
+        attr_accessor :children
+      end
 
-      class Mission
+      embedded_object_class = Class.new embedded_object_superclass do
         include Mongo::Object, RSpec::CallbackHelper
       end
     end
-  end
-  after(:all){remove_constants :Player}
+    after(:all){remove_constants :MainObject}
 
-  before do
-    @mission = Player::Mission.new
-    @player = Player.new
-    @player.missions = [@mission]
-  end
-
-  it 'create' do
-    %w(before_validate after_validate before_save before_create after_create after_save).each do |name|
-      @player.should_receive(name).once.ordered.and_return(true)
-      @mission.should_receive(name).once.ordered.and_return(true)
+    before do
+      @child = embedded_object_class.new
+      @object = MainObject.new
+      @object.children = [@child]
     end
 
-    db.players.save(@player).should be_true
-  end
-
-  it 'update' do
-    db.players.save(@player).should be_true
+    it 'create' do
+      %w(before_validate after_validate before_save before_create after_create after_save).each do |name|
+        @object.should_receive(name).once.ordered.and_return(true)
+        @child.should_receive(name).once.ordered.and_return(true)
+      end
 
-    %w(before_validate after_validate before_save before_update after_update after_save).each do |name|
-      @player.should_receive(name).once.ordered.and_return(true)
-      @mission.should_receive(name).once.ordered.and_return(true)
+      db.objects.save(@object).should be_true
     end
-    db.players.save(@player).should be_true
-  end
 
-  it 'destroy' do
-    db.players.save(@player).should be_true
+    it 'update' do
+      db.objects.save(@object).should be_true
 
-    %w(before_validate after_validate before_destroy after_destroy).each do |name|
-      @player.should_receive(name).once.ordered.and_return(true)
-      @mission.should_receive(name).once.ordered.and_return(true)
+      %w(before_validate after_validate before_save before_update after_update after_save).each do |name|
+        @object.should_receive(name).once.ordered.and_return(true)
+        @child.should_receive(name).once.ordered.and_return(true)
+      end
+      db.objects.save(@object).should be_true
     end
-    db.players.destroy(@player).should be_true
-  end
 
-  it 'should be able skip callbacks' do
-    @player.should_not_receive(:run_callbacks)
-    @mission.should_not_receive(:run_callbacks)
+    it 'destroy' do
+      db.objects.save(@object).should be_true
 
-    db.players.save(@player, callbacks: false).should be_true
-    db.players.count.should == 1
-    db.players.save(@player, callbacks: false).should be_true
-    db.players.count.should == 1
-    db.players.destroy(@player, callbacks: false).should be_true
-    db.players.count.should == 0
-  end
+      %w(before_validate after_validate before_destroy after_destroy).each do |name|
+        @object.should_receive(name).once.ordered.and_return(true)
+        @child.should_receive(name).once.ordered.and_return(true)
+      end
+      db.objects.destroy(@object).should be_true
+    end
 
-  it 'should be able interrupt CRUD' do
-    @mission.stub! :run_before_callbacks do |method_name|
-      false if method_name == :create
+    it 'should be able skip callbacks' do
+      @object.should_not_receive(:run_callbacks)
+      @child.should_not_receive(:run_callbacks)
+
+      db.objects.save(@object, callbacks: false).should be_true
+      db.objects.count.should == 1
+      db.objects.save(@object, callbacks: false).should be_true
+      db.objects.count.should == 1
+      db.objects.destroy(@object, callbacks: false).should be_true
+      db.objects.count.should == 0
     end
-    db.players.save(@player).should be_false
-    db.players.count.should == 0
-  end
 
-  describe "embedded" do
-    it 'should fire :destroy on detached objects' do
-      db.players.save(@player).should be_true
-      @player.missions.clear
-      @mission.should_receive(:before_destroy).once.and_return(true)
-      db.players.destroy(@player).should be_true
+    it 'should be able interrupt CRUD' do
+      @child.stub! :run_before_callbacks do |method_name|
+        false if method_name == :create
+      end
+      db.objects.save(@object).should be_false
+      db.objects.count.should == 0
     end
 
-    it 'should fire :destroy on deleted objects in update' do
-      db.players.save(@player).should be_true
-      @player.missions.clear
-      @mission.should_receive(:before_destroy).once.and_return(true)
-      db.players.save(@player).should be_true
+    describe "embedded" do
+      it 'should fire :destroy on detached objects' do
+        db.objects.save(@object).should be_true
+        @object.children.clear
+        @child.should_receive(:before_destroy).once.and_return(true)
+        db.objects.destroy(@object).should be_true
+      end
+
+      it 'should fire :destroy on deleted objects in update' do
+        db.objects.save(@object).should be_true
+        @object.children.clear
+        @child.should_receive(:before_destroy).once.and_return(true)
+        db.objects.save(@object).should be_true
+      end
+
+      it 'should fire :create on new objects in update' do
+        db.objects.save(@object).should be_true
+        child2 = embedded_object_class.new
+        @object.children << child2
+        child2.should_receive(:before_create).once.and_return(true)
+        child2.should_not_receive(:before_update)
+        db.objects.save(@object).should be_true
+      end
     end
 
-    it 'should fire :create on new objects in update' do
-      db.players.save(@player).should be_true
-      mission2 = Player::Mission.new
-      @player.missions << mission2
-      mission2.should_receive(:before_create).once.and_return(true)
-      mission2.should_not_receive(:before_update)
-      db.players.save(@player).should be_true
+    it "should fire :after_build callback after building the object" do
+      class SpecialMainObject < MainObject
+        def run_after_callbacks method, options
+          self.class.build_callback if method == :build
+        end
+      end
+
+      player = SpecialMainObject.new
+      db.objects.save! player
+
+      SpecialMainObject.should_receive :build_callback
+      db.objects.first
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongodb
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,19 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-15 00:00:00.000000000Z
-dependencies: []
+date: 2011-09-19 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: mongo
+  requirement: &2782360 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2782360
 description: 
 email: 
 executables: []
@@ -25,7 +36,6 @@ files:
 - lib/mongo/driver/dynamic_finders.rb
 - lib/mongo/driver/spec.rb
 - lib/mongo/driver.rb
-- lib/mongo/gems.rb
 - lib/mongo/migration/definition.rb
 - lib/mongo/migration/dsl.rb
 - lib/mongo/migration/migration.rb
@@ -35,7 +45,9 @@ files:
 - lib/mongo/object/object_helper.rb
 - lib/mongo/object/spec/crud_shared.rb
 - lib/mongo/object/spec.rb
+- lib/mongo/object/support.rb
 - lib/mongo/object.rb
+- lib/mongodb/gems.rb
 - spec/driver/collection_spec.rb
 - spec/driver/connection_spec.rb
 - spec/driver/crud_spec.rb