mongo_db 0.1.8 → 0.1.9

data/lib/mongo_db/driver/core/collection.rb

@@ -1,7 +1,7 @@
 require 'set'
 require 'date'
 
-module Mongo::Ext::Collection
+module Mongo::CollectionExt
   #
   # CRUD
   #
@@ -38,6 +38,10 @@ module Mongo::Ext::Collection
   def destroy *args
     remove *args
   end
+  
+  def create *args
+    insert *args
+  end
 
   #
   # Querying
@@ -100,7 +104,7 @@ module Mongo::Ext::Collection
     def symbolize_doc doc
       return doc unless Mongo.defaults[:symbolize]
 
-      Mongo::Ext::Collection.convert_doc doc do |k, v, result|
+      Mongo::CollectionExt.convert_doc doc do |k, v, result|
         k = k.to_sym if k.is_a? String
         result[k] = v
       end
@@ -110,7 +114,7 @@ module Mongo::Ext::Collection
     def convert_underscore_to_dollar_in_selector selector
       return selector unless Mongo.defaults[:convert_underscore_to_dollar]
 
-      Mongo::Ext::Collection.convert_doc selector do |k, v, result|
+      Mongo::CollectionExt.convert_doc selector do |k, v, result|
         k = "$#{k.to_s[1..-1]}".to_sym if QUERY_KEYWORDS.include?(k)
         result[k] = v
       end
@@ -120,7 +124,7 @@ module Mongo::Ext::Collection
     def convert_underscore_to_dollar_in_update update
       return update unless Mongo.defaults[:convert_underscore_to_dollar]
 
-      Mongo::Ext::Collection.convert_doc update do |k, v, result|
+      Mongo::CollectionExt.convert_doc update do |k, v, result|
         k = "$#{k.to_s[1..-1]}".to_sym if UPDATE_KEYWORDS.include?(k)
         result[k] = v
       end

data/lib/mongo_db/driver/core/database.rb

@@ -1,4 +1,4 @@
-module Mongo::Ext::DB
+module Mongo::DBExt
   protected
     def method_missing collection_name
       self.collection collection_name

data/lib/mongo_db/driver/core.rb

@@ -2,9 +2,6 @@ require 'mongo_db/gems'
 
 require 'mongo'
 
-# namespace for extensions
-class Mongo::Ext; end
-
 %w(
   database
   collection
@@ -19,11 +16,11 @@ Mongo.class_eval do
 end
 
 # database
-Mongo::DB.send :include, Mongo::Ext::DB
+Mongo::DB.send :include, Mongo::DBExt
 
 # collection
 Mongo::Collection.class_eval do
-  include Mongo::Ext::Collection
+  include Mongo::CollectionExt
 
   %w(insert update remove save).each do |method|
     alias_method "#{method}_without_ext", method

data/lib/mongo_db/driver/more/collection_finders.rb

@@ -1,4 +1,4 @@
-module Mongo::Ext::CollectionFinders
+module Mongo::CollectionFinders
   #
   # first_by_id, special case
   #

data/lib/mongo_db/driver/more.rb

@@ -6,5 +6,5 @@ class Mongo::NotFound < StandardError; end
   collection_finders
 ).each{|f| require "mongo_db/driver/more/#{f}"}
 
-Mongo::Collection.send :include, Mongo::Ext::CollectionFinders
+Mongo::Collection.send :include, Mongo::CollectionFinders
 

data/lib/mongo_db/object/object_helper.rb

@@ -1,36 +1,37 @@
-  module Mongo::Ext::ObjectHelper
+module Mongo::ObjectHelper
   #
   # CRUD
   #
-  def save_with_model doc, opts = {}
+  def save_with_object doc, opts = {}
     if doc.is_a? Hash
-      save_without_model doc, opts
+      save_without_object doc, opts
     else
-      if id = doc.instance_variable_get(:@_id)
-        update({:_id => id}, doc, opts.merge(upsert: true))
-      else
-        insert doc, opts
-      end
+      ::Mongo::ObjectSerializer.new(doc).save opts, self
     end
   end
 
-  def insert_with_model args, opts = {}
-    docs = args.is_a?(Array) ? args : [args]
-    result = _insert_with_model docs, opts
-    args.is_a?(Array) ? result : result.first
+  def insert_with_object args, opts = {}
+    if args.is_a?(Hash) or args.is_a?(Array)
+      insert_without_object args, opts
+    else
+      ::Mongo::ObjectSerializer.new(args).insert opts, self
+    end
   end
 
-  def update_with_model selector, doc, opts = {}
-    doc = Mongo::Ext::ObjectHelper.convert_object_to_doc doc unless doc.is_a?(Hash)
-    update_without_model selector, doc, opts
+  def update_with_object selector, doc, opts = {}
+    if doc.is_a?(Hash)
+      update_without_object selector, doc, opts
+    else
+      raise "can't use update selector with object (#{selector}, {#{doc}})!" unless selector == nil
+      ::Mongo::ObjectSerializer.new(doc).update opts, self
+    end
   end
 
-  def remove_with_model arg = {}, opts = {}
+  def remove_with_object arg = {}, opts = {}
     if arg.is_a? Hash
-      remove_without_model arg, opts
+      remove_without_object arg, opts
     else
-      id = arg.instance_variable_get(:@_id) || "can't remove object without _id (#{arg})!"
-      remove_without_model({_id: id}, opts)
+      ::Mongo::ObjectSerializer.new(arg).remove opts, self
     end
   end
 
@@ -40,115 +41,14 @@
   #
   def first *args, &block
     doc = super *args, &block
-    Mongo::Ext::ObjectHelper.convert_doc_to_object doc
+    ::Mongo::ObjectSerializer.build(doc)
   end
 
   def each *args, &block
     super *args do |doc|
-      doc = Mongo::Ext::ObjectHelper.convert_doc_to_object(doc)
-      block.call doc
+      obj = ::Mongo::ObjectSerializer.build(doc)
+      block.call obj
     end
     nil
   end
-
-  protected
-    def _insert_with_model docs, opts
-      hashes = docs.collect do |doc|
-        doc.is_a?(Hash) ? doc : Mongo::Ext::ObjectHelper.convert_object_to_doc(doc)
-      end
-      result = insert_without_model hashes, opts
-      hashes.each_with_index do |h, i|
-        Mongo::Ext::ObjectHelper.update_object_after_insertion docs[i], h
-      end
-      result
-    end
-
-
-  SIMPLE_TYPES = [
-    Fixnum, Float,
-    TrueClass, FalseClass,
-    String, Symbol,
-    Array, Hash, Set,
-    Data, DateTime,
-    NilClass, Time,
-    BSON::ObjectId
-  ].to_set
-
-  class << self
-    def update_object_after_insertion doc, hash
-      return if doc.is_a? Hash
-      if id = hash[:_id] || hash['_id']
-        doc.instance_variable_set :@_id, id
-      end
-    end
-
-    # converts object to hash (also works with nested & arrays)
-    def convert_object_to_doc obj
-      return obj.to_mongo if obj.respond_to? :to_mongo
-
-      if obj.is_a? Hash
-        doc = {}
-        obj.each do |k, v|
-          doc[k] = convert_object_to_doc v
-        end
-        doc
-      elsif obj.is_a? Array
-        obj.collect{|v| convert_object_to_doc v}
-      elsif SIMPLE_TYPES.include? obj.class
-        obj
-      else
-        doc = {}
-
-        # copying instance variables to hash
-        obj.instance_variables.each do |iv_name|
-          # skipping variables starting with _xx, usually they
-          # have specific meaning and used for example for cache
-          next if iv_name =~ /^@_/ and iv_name != :@_id
-
-          k = iv_name.to_s[1..-1]
-          k = k.to_sym if Mongo.defaults[:symbolize]
-          v = obj.instance_variable_get iv_name
-          doc[k] = convert_object_to_doc v
-        end
-
-        # setting class
-        class_name = '_class'
-        class_name = class_name.to_sym if Mongo.defaults[:symbolize]
-        doc[class_name] = obj.class.name
-
-        doc
-      end
-    end
-
-    def convert_doc_to_object doc
-      if doc.is_a? Hash
-        if class_name = doc[:_class] || doc['_class']
-          klass = constantize class_name
-          obj = klass.new
-          doc.each do |k, v|
-            next if k.to_sym == :_class
-
-            v = convert_doc_to_object v
-            obj.instance_variable_set "@#{k}", v
-          end
-          obj
-        else
-          doc
-        end
-      elsif doc.is_a? Array
-        doc.collect{|v| convert_doc_to_object v}
-      else
-        doc
-      end
-    end
-
-    def constantize class_name
-      @constantize_cache ||= {}
-      unless klass = @constantize_cache[class_name]
-        klass = eval class_name, TOPLEVEL_BINDING, __FILE__, __LINE__
-        @constantize_cache[class_name] = klass
-      end
-      klass
-    end
-  end
 end

data/lib/mongo_db/object/object_serializer.rb

@@ -0,0 +1,274 @@
+class Mongo::ObjectSerializer
+  SIMPLE_TYPES = [
+    Fixnum, Float,
+    TrueClass, FalseClass,
+    String, Symbol,
+    Array, Hash, Set,
+    Data, DateTime,
+    NilClass, Time,
+    BSON::ObjectId
+  ].to_set
+
+  attr_reader :object
+
+  def initialize object
+    @object = object
+  end
+
+  def save opts, collection
+    if _id
+      self.update opts.merge(upsert: true), collection
+    else
+      self.insert opts, collection
+    end
+  end
+
+  def insert opts, collection
+    opts, validate, callbacks = parse_object_options opts
+
+    # before callbacks
+    return false if callbacks and !run_callbacks(objects, :before_validate, :before_save, :before_create)
+
+    # validation
+    return false if validate  and !valid?
+
+    # saving document
+    doc = to_document
+    collection.insert_without_object doc, opts
+    id = doc[:_id] || doc['_id'] || raise("internal error: no id after document insertion (#{doc})!")
+    object.instance_variable_set :@_id, id
+    update_internal_state!
+
+    # after callbacks
+    run_callbacks(objects, :after_create, :after_save, :after_validate) if callbacks
+
+    true
+  end
+
+  def update opts, collection
+    opts, validate, callbacks = parse_object_options opts
+
+    # before callbacks.
+    # we need to sort out embedded objects into created, updated and destroyed
+    created_objects, updated_objects, destroyed_objects = [], [], []
+    if callbacks
+      original_ids = original_embedded_objects.collect{|obj| obj.object_id}.to_set
+      objects.each do |obj|
+        (original_ids.include?(obj.object_id) ? updated_objects : created_objects) << obj
+      end
+
+      objects_ids = objects.collect{|obj| obj.object_id}.to_set
+      destroyed_objects = original_embedded_objects.select{|obj| !objects_ids.include?(obj.object_id)}
+
+      all_successfull = [
+        run_callbacks(created_objects,   :before_validate, :before_save,   :before_create),
+        run_callbacks(updated_objects,   :before_validate, :before_save,   :before_update),
+        run_callbacks(destroyed_objects, :before_validate, :before_destroy)
+      ].reduce(:&)
+
+      return false unless all_successfull
+    end
+
+    # validation
+    return false if validate  and !valid?
+
+    # saving document
+    doc = to_document
+    id = _id || raise("can't update document without id (#{doc})!")
+    collection.update_without_object({_id: id}, doc, opts)
+    update_internal_state!
+
+    # after callbacks
+    if callbacks
+      run_callbacks(created_objects,   :after_create,  :after_save,    :after_validate)
+      run_callbacks(updated_objects,   :after_update,  :after_save,    :after_validate)
+      run_callbacks(destroyed_objects, :after_destroy, :after_validate)
+    end
+
+    true
+  end
+
+  def remove opts, collection
+    opts, validate, callbacks = parse_object_options opts
+
+    # before callbacks
+    if callbacks
+      # we need to run :destroy callbacks also on detached embedded objects.
+      all_objects = (objects + original_embedded_objects).uniq{|o| o.object_id}
+      return false unless run_callbacks(all_objects, :before_validate, :before_destroy)
+    end
+
+    # validation
+    return false if validate  and !valid?
+
+    # saving document
+    id = _id || "can't destroy object without _id (#{arg})!"
+    collection.remove_without_object({_id: id}, opts)
+    update_internal_state!
+
+    # after callbacks
+    run_callbacks(objects, :after_destroy, :after_validate) if callbacks
+
+    true
+  end
+
+  def to_document
+    _to_document object
+  end
+
+  def _id
+    object.instance_variable_get(:@_id)
+  end
+
+  def valid?
+    objects.each do |obj|
+      return false if obj.respond_to?(:_valid?) and !obj._valid?
+    end
+    true
+  end
+
+  def run_callbacks objects, *names
+    all_successfull = true
+    names.each do |name|
+      objects.each do |obj|
+        if obj.respond_to? :_run_callbacks
+          all_successfull = false if obj._run_callbacks(name) == false
+        end
+      end
+    end
+    all_successfull
+  end
+
+  def objects
+    @objects_cache ||= begin
+      objects = []
+      _each_object(object){|obj| objects << obj}
+      objects
+    end
+  end
+
+  def update_internal_state!
+    self.original_embedded_objects = objects if Mongo.defaults[:callbacks]
+  end
+
+  protected
+    def original_embedded_objects; object.instance_variable_get(:@_original_embedded_objects) end
+    def original_embedded_objects= objects; object.instance_variable_set(:@_original_embedded_objects, objects) end
+
+    def parse_object_options opts
+      opts = opts.clone
+      validate  = opts.delete(:validate)  == false ? false : true
+      callbacks = opts.delete(:callbacks) == false ? false : Mongo.defaults[:callbacks]
+      return opts, validate, callbacks
+    end
+
+    # need this to allow change it in specs
+    # RSpec adds @mock_proxy, and we need to skip it
+    SKIP_IV_REGEXP = /^@_/
+
+    def _each_instance_variable obj, &block
+      obj.instance_variables.each do |iv_name|
+        # skipping variables starting with _xx, usually they
+        # have specific meaning and used for example for cache
+        next if iv_name =~ SKIP_IV_REGEXP
+
+        block.call iv_name, obj.instance_variable_get(iv_name)
+      end
+    end
+
+    # converts object to document (also works with nested & arrays)
+    def _to_document obj
+      return obj.to_mongo if obj.respond_to? :to_mongo
+
+      if obj.is_a? Hash
+        doc = {}
+        obj.each do |k, v|
+          doc[k] = _to_document v
+        end
+        doc
+      elsif obj.is_a? Array
+        obj.collect{|v| _to_document v}
+      elsif SIMPLE_TYPES.include? obj.class
+        obj
+      else
+        doc = {}
+
+        # copying instance variables
+        _each_instance_variable obj do |iv_name, v|
+          k = iv_name.to_s[1..-1]
+          k = k.to_sym if Mongo.defaults[:symbolize]
+          doc[k] = _to_document v
+        end
+
+        # adding _id & _class
+        id_key, class_key = Mongo.defaults[:symbolize] ? [:_id, :_class] : ['_id', '_class']
+        id = instance_variable_get('@_id')
+        doc[id_key]    = id if id
+        doc[class_key] = obj.class.name
+
+        doc
+      end
+    end
+
+    def _each_object obj, &block
+      if obj.is_a? Hash
+        obj.each{|k, v| _each_object v, &block}
+      elsif obj.is_a? Array
+        obj.each{|v| _each_object v, &block}
+      elsif SIMPLE_TYPES.include? obj.class
+      else
+        block.call obj
+        _each_instance_variable obj do |iv_name, v|
+          _each_object v, &block
+        end
+      end
+      nil
+    end
+
+
+  class << self
+    def build doc
+      obj = _build doc
+      serializer = Mongo::ObjectSerializer.new obj
+      serializer.update_internal_state!
+      obj
+    end
+
+    protected
+      def _build doc
+        if doc.is_a? Hash
+          if class_name = doc[:_class] || doc['_class']
+            klass = constantize class_name
+
+            if klass.respond_to? :to_object
+              klass.to_object doc
+            else
+              obj = klass.new
+              doc.each do |k, v|
+                next if k.to_sym == :_class
+
+                v = _build v
+                obj.instance_variable_set "@#{k}", v
+              end
+              obj
+            end
+          else
+            doc
+          end
+        elsif doc.is_a? Array
+          doc.collect{|v| _build v}
+        else
+          doc
+        end
+      end
+
+      def constantize class_name
+        @constantize_cache ||= {}
+        unless klass = @constantize_cache[class_name]
+          klass = eval class_name, TOPLEVEL_BINDING, __FILE__, __LINE__
+          @constantize_cache[class_name] = klass
+        end
+        klass
+      end
+  end
+end

data/lib/mongo_db/object.rb

@@ -1,15 +1,18 @@
 require 'mongo_db/driver'
 
 %w(
+  object_serializer
   object_helper
 ).each{|f| require "mongo_db/object/#{f}"}
 
+Mongo.defaults[:callbacks] = true
+
 # collection
 Mongo::Collection.class_eval do
-  include Mongo::Ext::ObjectHelper
+  include Mongo::ObjectHelper
 
   %w(insert update remove save).each do |method|
-    alias_method "#{method}_without_model", method
-    alias_method method, "#{method}_with_model"
+    alias_method "#{method}_without_object", method
+    alias_method method, "#{method}_with_object"
   end
 end

data/readme.md

@@ -18,45 +18,50 @@ These enhancements alter the driver's API and made it more simple and intuitive.
 ``` ruby
 require 'mongo_db/driver/core'
 
-# changing some defaults
+# Changing some defaults.
 Mongo.defaults.merge! symbolize: true, multi: true, safe: true
 
-# connection & db
+# Connection & db.
 connection = Mongo::Connection.new
 db = connection.db 'default_test'
+db.units.drop
 
-# create
+# 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)
+# 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]
+# 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 |unit|
-  unit                                              # => zeratul
+  unit                                             # => zeratul
 end
 ```
 
 Optionall stuff - simple query enchancements:
 
 ``` ruby
+# Finders.
 require 'mongo_db/driver/more'
 
-# simple finders (bang versions also availiable)
+# 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}}
+# Query sugar, use {name: {_gt: 'Z'}} instead of {name: {:$gt => 'Z'}}.
 Mongo.defaults.merge! convert_underscore_to_dollar: true
-db.units.all 'stats.life' => {_lt: 100}            # => [tassadar]
+db.units.all name: {_gt: 'Z'}                      # => [zeratul]
 ```
 
 More docs - there's no need for more docs, the whole point of this extension is to be small, intuitive, 100% compatible with the official driver, and require no extra knowledge.
@@ -69,7 +74,7 @@ Save any Ruby object to MongoDB, as if it's a document. Objects can be any type,
 Note: the :initialize method should allow to create object without arguments.
 
 ``` ruby
-# let's define the game unit
+# Let's define the game unit.
 class Unit
   attr_reader :name, :stats
 
@@ -87,38 +92,39 @@ class Unit
   end
 end
 
-# connecting to MongoDB
+# Connecting to MongoDB.
 require 'mongo_db/object'
 Mongo.defaults.merge! symbolize: true, multi: true, safe: true
 connection = Mongo::Connection.new
 db = connection.db 'default_test'
+db.units.drop
 
-# create
+# Create.
 zeratul  = Unit.new('Zeratul',  Unit::Stats.new(85, 300, 100))
 tassadar = Unit.new('Tassadar', Unit::Stats.new(0,  80,  300))
 
 db.units.save zeratul
 db.units.save tassadar
 
-# udate (we made error - mistakenly set Tassadar's attack as zero, let's fix it)
+# 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
+# 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 |unit|
   unit                                             # => zeratul
 end
 
-# simple finders (bang versions also availiable)
+# 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}}
+# Query sugar, use {name: {_gt: 'Z'}} instead of {name: {:$gt => 'Z'}}.
 Mongo.defaults.merge! convert_underscore_to_dollar: true
-db.units.all('stats.life' => {_lt: 100})           # => [tassadar]
+db.units.all name: {_gt: 'Z'}                      # => [zeratul]
 ```
 
 # Migrations (work in progress)

data/spec/driver/core/hash_helper_spec.rb

@@ -3,7 +3,7 @@ require 'driver/spec_helper'
 describe "Collection" do
   before do
     @helper = Object.new
-    @helper.send :extend, Mongo::Ext::Collection
+    @helper.send :extend, Mongo::CollectionExt
   end
 
   it "symbolize" do

data/spec/object/callbacks_spec.rb

@@ -0,0 +1,95 @@
+require 'object/spec_helper'
+
+describe 'Object callbacks' do
+  with_mongo
+
+  before do
+    class Player
+      include RSpec::CallbackHelper
+      attr_accessor :missions
+
+      class Mission
+        include RSpec::CallbackHelper
+      end
+    end
+
+    @mission = Player::Mission.new
+    @player = Player.new
+    @player.missions = [@mission]
+  end
+  after{remove_constants :Player}
+
+  it 'create' do
+    %w(before_validate before_save before_create after_create after_save after_validate).each do |name|
+      @player.should_receive(name).once.ordered
+      @mission.should_receive(name).once.ordered
+    end
+
+    db.players.save @player
+  end
+
+  it 'update' do
+    db.players.save(@player)
+
+    %w(before_validate before_save before_update after_update after_save after_validate).each do |name|
+      @player.should_receive(name).once.ordered
+      @mission.should_receive(name).once.ordered
+    end
+    db.players.save @player
+  end
+
+  it 'destroy' do
+    db.players.save @player
+
+    %w(before_validate before_destroy after_destroy after_validate).each do |name|
+      @player.should_receive(name).once.ordered
+      @mission.should_receive(name).once.ordered
+    end
+    db.players.destroy @player
+  end
+
+  it 'should be able skip callbacks' do
+    @player.should_not_receive(:_run_callbacks)
+    @mission.should_not_receive(:_run_callbacks)
+
+    db.players.save @player, callbacks: false
+    db.players.count.should == 1
+    db.players.save @player, callbacks: false
+    db.players.count.should == 1
+    db.players.destroy @player, callbacks: false
+    db.players.count.should == 0
+  end
+
+  it 'should be able interrupt CRUD' do
+    @mission.stub! :_run_callbacks do |name|
+      false if name == :before_save
+    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
+      @player.missions.clear
+      @mission.should_receive(:before_destroy).once
+      db.players.destroy @player
+    end
+
+    it 'should fire :destroy on deleted objects in update' do
+      db.players.save @player
+      @player.missions.clear
+      @mission.should_receive(:before_destroy).once
+      db.players.save @player
+    end
+
+    it 'should fire :create on new objects in update' do
+      db.players.save @player
+      mission2 = Player::Mission.new
+      @player.missions << mission2
+      mission2.should_receive(:before_create).once
+      mission2.should_not_receive(:before_update)
+      db.players.save @player
+    end
+  end
+end

data/spec/object/spec_helper.rb

@@ -1,3 +1,13 @@
 require 'mongo_db/object'
+require 'driver/spec_helper'
 
-require 'driver/spec_helper'
+# RSpec adds some instance variables and we need to skip it.
+Mongo::ObjectSerializer.send :const_set, :SKIP_IV_REGEXP, /^@_|^@mock_proxy/
+Mongo::ObjectSerializer::SIMPLE_TYPES << RSpec::Mocks::Proxy
+
+# To simplify callback expectations
+module RSpec::CallbackHelper
+  def _run_callbacks name
+    send name if respond_to? name
+  end
+end

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

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'object/spec_helper'
 
 describe 'Object validation' do
   with_mongo
@@ -19,56 +19,56 @@ describe 'Object validation' do
 
   it 'should not save/update/destroy invalid objects' do
     # create
-    @player.stub!(:valid?).and_return(false)
+    @player.stub!(:_valid?).and_return(false)
     db.players.save(@player).should be_false
 
-    @player.stub!(:valid?).and_return(true)
+    @player.stub!(:_valid?).and_return(true)
     db.players.save(@player).should be_true
 
     # update
-    @player.stub!(:valid?).and_return(false)
+    @player.stub!(:_valid?).and_return(false)
     db.players.save(@player).should be_false
 
-    @player.stub!(:valid?).and_return(true)
+    @player.stub!(:_valid?).and_return(true)
     db.players.save(@player).should be_true
 
     # destroy
-    @player.stub!(:valid?).and_return(false)
+    @player.stub!(:_valid?).and_return(false)
     db.players.destroy(@player).should be_false
 
-    @player.stub!(:valid?).and_return(true)
+    @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)
+    @mission.stub!(:_valid?).and_return(false)
     db.players.save(@player).should be_false
 
-    @mission.stub!(:valid?).and_return(true)
+    @mission.stub!(:_valid?).and_return(true)
     db.players.save(@player).should be_true
 
     # update
-    @mission.stub!(:valid?).and_return(false)
+    @mission.stub!(:_valid?).and_return(false)
     db.players.save(@player).should be_false
 
-    @mission.stub!(:valid?).and_return(true)
+    @mission.stub!(:_valid?).and_return(true)
     db.players.save(@player).should be_true
 
     # destroy
-    @mission.stub!(:valid?).and_return(false)
+    @mission.stub!(:_valid?).and_return(false)
     db.players.destroy(@player).should be_false
 
-    @mission.stub!(:valid?).and_return(true)
+    @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)
+    @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)
+    @player.stub!(:_valid?).and_return(true)
+    @mission.stub!(:_valid?).and_return(false)
     db.players.save(@player, validate: false).should be_true
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo_db
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-14 00:00:00.000000000Z
+date: 2011-08-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
@@ -39,12 +39,12 @@ files:
 - lib/mongo_db/driver.rb
 - lib/mongo_db/gems.rb
 - lib/mongo_db/object/object_helper.rb
+- lib/mongo_db/object/object_serializer.rb
 - lib/mongo_db/object.rb
 - spec/driver/core/collection_spec.rb
 - spec/driver/core/crud_spec.rb
 - spec/driver/core/database_spec.rb
 - spec/driver/core/hash_helper_spec.rb
-- spec/driver/example_spec.rb
 - spec/driver/fixes_spec.rb
 - spec/driver/more/querying_spec.rb
 - spec/driver/spec_helper.rb
@@ -52,12 +52,11 @@ files:
 - spec/model/callbacks.rb
 - spec/model/example.rb
 - spec/model/model_crud.rb
-- spec/object/callbacks.rb
+- spec/object/callbacks_spec.rb
 - spec/object/crud_shared.rb
-- spec/object/example_spec.rb
-- spec/object/object_crud_spec.rb
+- spec/object/crud_spec.rb
 - spec/object/spec_helper.rb
-- spec/object/validation.rb
+- spec/object/validation_spec.rb
 - spec/test.rb
 homepage: http://github.com/alexeypetrushin/mongo_db
 licenses: []

data/spec/driver/example_spec.rb

@@ -1,55 +0,0 @@
-require 'mongo_db/driver/core'
-require 'rspec'
-
-describe "Driver example" do
-  defaults = nil
-  before(:all){defaults = Mongo.defaults.clone}
-  after(:all){Mongo.defaults = defaults}
-
-  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 |unit|
-      unit                                             # => zeratul
-    end
-
-
-    #
-    # 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}}
-    Mongo.defaults.merge! convert_underscore_to_dollar: true
-    db.units.all 'stats.life' => {_lt: 100}            # => [tassadar]
-  end
-end

data/spec/object/example_spec.rb

@@ -1,64 +0,0 @@
-require 'mongo_db/object'
-require 'rspec'
-
-describe "Object example" do
-  defaults = nil
-  before(:all){defaults = Mongo.defaults.clone}
-  after :all do
-    Mongo.defaults = defaults
-    Object.send :remove_const, :Unit if Object.const_defined? :Unit
-  end
-
-  it do
-    # let's define the game unit
-    class Unit
-      attr_reader :name, :stats
-
-      # don't forget to allow creating object with no arguments
-      def initialize name = nil, stats = nil
-        @name, @stats = name, stats
-      end
-
-      class Stats
-        attr_accessor :attack, :life, :shield
-
-        def initialize attack = nil, life = nil, shield = nil
-          @attack, @life, @shield = attack, life, shield
-        end
-      end
-    end
-
-    # connecting to MongoDB
-    require 'mongo_db/object'
-    Mongo.defaults.merge! symbolize: true, multi: true, safe: true
-    connection = Mongo::Connection.new
-    db = connection.db 'default_test'
-
-    # create
-    zeratul  = Unit.new('Zeratul',  Unit::Stats.new(85, 300, 100))
-    tassadar = Unit.new('Tassadar', Unit::Stats.new(0,  80,  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 |unit|
-      unit                                             # => zeratul
-    end
-
-    # 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}}
-    Mongo.defaults.merge! convert_underscore_to_dollar: true
-    db.units.all('stats.life' => {_lt: 100})           # => [tassadar]
-  end
-end