mongodb 0.0.4 → 0.0.5

data/lib/{mongodb → mongo}/driver.rb

@@ -1,4 +1,4 @@
-require 'mongodb/gems'
+require 'mongo/gems'
 
 require 'mongo'
 
@@ -9,7 +9,7 @@ class Mongo::NotFound < Mongo::Error; end
   database
   collection
   dynamic_finders
-).each{|f| require "mongodb/driver/#{f}"}
+).each{|f| require "mongo/driver/#{f}"}
 
 # defaults
 Mongo.class_eval do

data/lib/mongo/migration.rb

@@ -0,0 +1,8 @@
+require 'mongo/driver'
+
+class Mongo::Migration; end
+
+%w(
+  definition
+  migration
+).each{|f| require "mongo/migration/#{f}"}

data/lib/{mongodb → mongo}/object.rb

@@ -1,9 +1,9 @@
-require 'mongodb/driver'
+require 'mongo/driver'
 
 %w(
-  object_serializer
+  object
   object_helper
-).each{|f| require "mongodb/object/#{f}"}
+).each{|f| require "mongo/object/#{f}"}
 
 Mongo.defaults[:callbacks] = true
 
@@ -11,7 +11,7 @@ Mongo.defaults[:callbacks] = true
 Mongo::Collection.class_eval do
   include Mongo::ObjectHelper
 
-  %w(insert update remove save).each do |method|
+  %w(create update save destroy).each do |method|
     alias_method "#{method}_without_object", method
     alias_method method, "#{method}_with_object"
   end

data/lib/mongo/object/object.rb

@@ -0,0 +1,284 @@
+module Mongo::Object
+  attr_accessor :_id
+
+  def valid? opts = {}
+    opts = ::Mongo::Object.parse_options opts
+    begin
+      return false unless errors.empty?
+
+      return false if opts[:callbacks] and !::Mongo::Object.run_callbacks(self, :before, :validate)
+
+      child_opts = opts.merge internal: true
+      if child_objects.all?{|group| group.all?{|obj| obj.valid?(child_opts)}} and errors.empty?
+        ::Mongo::Object.run_callbacks(self, :after, :validate) if opts[:callbacks]
+        true
+      else
+        false
+      end
+    ensure
+      clear_child_objects unless opts[:internal]
+    end
+  end
+
+  def errors
+    @_errors ||= {}
+  end
+
+  def create_object collection, opts
+    with_object_callbacks :create, opts do |opts|
+      doc = ::Mongo::Object.to_mongo self
+      collection.create(doc, opts)
+      self._id = doc[:_id] || doc['_id']
+    end
+  end
+
+  def update_object collection, opts
+    with_object_callbacks :update, opts do |opts|
+      id = _id || "can't update object without _id (#{self})!"
+      doc = ::Mongo::Object.to_mongo self
+      collection.update({_id: id}, doc, opts)
+    end
+  end
+
+  def destroy_object collection, opts
+    with_object_callbacks :destroy, opts do |opts|
+      id = _id || "can't destroy object without _id (#{self})!"
+      collection.destroy({_id: id}, opts)
+    end
+  end
+
+  def save_object collection, opts
+    if _id
+      update_object collection, opts
+    else
+      create_object collection, opts
+    end
+  end
+
+  # need this to allow change it in specs
+  # RSpec adds @mock_proxy, and we need to skip it
+  SKIP_IV_REGEXP = /^@_/
+
+  class << self
+    def parse_options opts
+      opts = opts.clone
+      opts[:validate]  = true                       unless opts.include?(:validate)
+      opts[:callbacks] = Mongo.defaults[:callbacks] unless opts.include?(:callbacks)
+      return opts
+    end
+
+    def to_mongo_options opts
+      opts = opts.clone
+      opts.delete :validate
+      opts.delete :callbacks
+      opts
+    end
+
+    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_mongo obj
+      return obj.to_mongo if obj.respond_to? :to_mongo
+      symbolize = ::Mongo.defaults[:symbolize]
+
+      if obj.is_a? Hash
+        doc = {}
+        obj.each do |k, v|
+          doc[k] = to_mongo v
+        end
+        doc
+      elsif obj.is_a? Array
+        obj.collect{|v| to_mongo v}
+      elsif obj.is_a? Mongo::Object
+        doc = {}
+
+        # copying instance variables
+        each_instance_variable obj do |iv_name, v|
+          k = iv_name.to_s[1..-1]
+          k = k.to_sym if symbolize
+          doc[k] = to_mongo v
+        end
+
+        # adding _id & _class
+        id_key, class_key = symbolize ? [:_id, :_class] : ['_id', '_class']
+        id = instance_variable_get('@_id')
+        doc[id_key]    = id if id
+        doc[class_key] = obj.class.name
+
+        doc
+      else # simple type
+        obj
+      end
+    end
+
+    def each_object obj, include_first = true, &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 obj.is_a? ::Mongo::Object
+        block.call obj if include_first
+        each_instance_variable obj do |iv_name, v|
+          each_object v, &block
+        end
+      end
+      nil
+    end
+
+    def build doc
+      return unless doc
+      obj = _build doc
+      obj.send :update_internal_state! if obj.is_a? ::Mongo::Object
+      obj
+    end
+
+    def run_callbacks obj, type, method_name
+      obj.respond_to?(:run_callbacks) ? obj.run_callbacks(type, method_name) : true
+    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? :from_mongo
+              klass.from_mongo 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
+
+  protected
+    attr_writer :_original_children
+    def _original_children
+      @_original_children ||= []
+    end
+
+    def update_internal_state!
+      return unless ::Mongo.defaults[:callbacks]
+
+      _original_children.clear
+      ::Mongo::Object.each_object self, false do |obj|
+        _original_children << obj
+      end
+    end
+
+    def clear_child_objects
+      if instance_variable_get(:@_child_objects)
+        child_objects.each do |group|
+          group.each{|obj| obj.clear_child_objects}
+        end
+        remove_instance_variable :@_child_objects
+      end
+    end
+
+    def child_objects
+      unless @_child_objects
+        created_children, updated_children, destroyed_children = [], [], []
+
+        original_children_ids = Set.new; _original_children.each{|obj| original_children_ids << obj.object_id}
+        ::Mongo::Object.each_object self, false do |obj|
+          (original_children_ids.include?(obj.object_id) ? updated_children : created_children) << obj
+        end
+
+        children_ids = Set.new; ::Mongo::Object.each_object(self, false){|obj| children_ids << obj.object_id}
+        destroyed_children = _original_children.select{|obj| !children_ids.include?(obj.object_id)}
+
+        @_child_objects = [created_children, updated_children, destroyed_children]
+      end
+      @_child_objects
+    end
+
+    def with_object_callbacks method_name, opts, &block
+      opts = ::Mongo::Object.parse_options opts
+
+      # validation
+      return false if opts[:validate] and !valid?(opts.merge(internal: true))
+
+      # before callbacks
+      return false if opts[:callbacks] and !run_all_callbacks(:before, method_name)
+
+      # saving
+      block.call ::Mongo::Object.to_mongo_options(opts)
+      update_internal_state!
+
+      # after callbacks
+      run_all_callbacks :after, method_name if opts[:callbacks]
+
+      true
+    ensure
+      clear_child_objects
+    end
+
+    # TODO1 move to static method
+    def run_all_callbacks type, method_name
+      result = if type == :before
+        ::Mongo::Object.run_callbacks self, type, method_name
+      else
+        true
+      end
+
+      result &= if method_name == :create
+        child_objects.all? do |group|
+          group.all? do |obj|
+            obj.run_all_callbacks type, method_name
+          end
+        end
+      elsif method_name == :update
+        created_children, updated_children, destroyed_children = child_objects
+        created_children.all?{|obj| obj.run_all_callbacks type, :create} and
+          updated_children.all?{|obj| obj.run_all_callbacks type, :update} and
+          destroyed_children.all?{|obj| obj.run_all_callbacks type, :destroy}
+      elsif method_name == :destroy
+        child_objects.all? do |group|
+          group.all? do |obj|
+            obj.run_all_callbacks type, method_name
+          end
+        end
+      else
+        raise_error "unknown callback method (#{method_name})!"
+      end
+
+      result &= if type == :after
+        ::Mongo::Object.run_callbacks self, type, method_name
+      else
+        true
+      end
+
+      result
+    end
+end

data/lib/mongo/object/object_helper.rb

@@ -0,0 +1,80 @@
+module Mongo::ObjectHelper
+  #
+  # CRUD
+  #
+  def create_with_object doc, opts = {}
+    if doc.is_a? ::Mongo::Object
+      doc.create_object self, opts
+    else
+      create_without_object doc, opts
+    end
+  end
+
+  def update_with_object *args
+    if args.first.is_a? ::Mongo::Object
+      doc, opts = args
+      opts ||= {}
+      doc.update_object self, opts
+    else
+      update_without_object *args
+    end
+  end
+
+  def save_with_object doc, opts = {}
+    if doc.is_a? ::Mongo::Object
+      doc.save_object self, opts
+    else
+      save_without_object doc, opts
+    end
+  end
+
+  def destroy_with_object *args
+    if args.first.is_a? ::Mongo::Object
+      doc, opts = args
+      opts ||= {}
+      doc.destroy_object self, opts
+    else
+      destroy_without_object *args
+    end
+  end
+
+  def create! *args
+    create(*args) || raise(Mongo::Error, "can't create #{doc.inspect}!")
+  end
+
+  def update! *args
+    update(*args) || raise(Mongo::Error, "can't update #{doc.inspect}!")
+  end
+
+  def save! *args
+    save(*args) || raise(Mongo::Error, "can't save #{doc.inspect}!")
+  end
+
+  def destroy! *args
+    destroy(*args) || raise(Mongo::Error, "can't destroy #{doc.inspect}!")
+  end
+
+
+  #
+  # Querying
+  #
+  def first selector = {}, opts = {}, &block
+    opts = opts.clone
+    if opts.delete(:object) == false
+      super selector, opts, &block
+    else
+      ::Mongo::Object.build super(selector, opts, &block)
+    end
+  end
+
+  def each selector = {}, opts = {}, &block
+    opts = opts.clone
+    if opts.delete(:object) == false
+      super selector, opts, &block
+    else
+      super selector, opts do |doc|
+        block.call ::Mongo::Object.build(doc)
+      end
+    end
+  end
+end

data/lib/mongo/object/spec.rb

@@ -0,0 +1,4 @@
+require 'mongo/driver/spec'
+
+# RSpec adds some instance variables and we need to skip it.
+Mongo::Object.send :const_set, :SKIP_IV_REGEXP, /^@_|^@mock_proxy/

data/{spec/object → lib/mongo/object/spec}/crud_shared.rb

@@ -7,7 +7,7 @@ shared_examples_for 'object CRUD' do
 
     # create
     db.units.save(@zeratul).should be_true
-    @zeratul.instance_variable_get(:@_id).should_not be_nil
+    @zeratul._id.should_not be_nil
 
     # read
     db.units.count.should == 1
@@ -31,7 +31,7 @@ shared_examples_for 'embedded object CRUD' do
   it 'crud' do
     # create
     db.players.save(@player)
-    @player.instance_variable_get(:@_id).should_not be_nil
+    @player._id.should_not be_nil
 
     # read
     db.players.count.should == 1

data/readme.md

@@ -16,7 +16,7 @@ These enhancements alter the driver's API and made it more simple and intuitive.
 - 100% backward compatibility with original driver API (if not - it's a bug, report it please)
 
 ``` ruby
-require 'mongodb/driver'
+require 'mongo/driver'
 
 # Changing some defaults.
 Mongo.defaults.merge! symbolize: true, multi: true, safe: true
@@ -67,7 +67,7 @@ So, please use standard Ruby driver documentation.
 Define migration steps, specify desired version and apply it (usually all this should be done via Rake task).
 
 ``` ruby
-require 'mongodb/migration'
+require 'mongo/migration'
 
 # Connection & db.
 connection = Mongo::Connection.new
@@ -121,8 +121,16 @@ 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
+# Connecting to MongoDB.
+require 'mongo/object'
+Mongo.defaults.merge! symbolize: true, multi: true, safe: true
+connection = Mongo::Connection.new
+db = connection.db 'default_test'
+db.units.drop
+
 # Let's define the game unit.
 class Unit
+  include Mongo::Object
   attr_reader :name, :stats
 
   # don't forget to allow creating object with no arguments
@@ -131,6 +139,7 @@ class Unit
   end
 
   class Stats
+    include Mongo::Object
     attr_accessor :attack, :life, :shield
 
     def initialize attack = nil, life = nil, shield = nil
@@ -139,13 +148,6 @@ class Unit
   end
 end
 
-# Connecting to MongoDB.
-require 'mongodb/object'
-Mongo.defaults.merge! symbolize: true, multi: true, safe: true
-connection = Mongo::Connection.new
-db = connection.db 'default_test'
-db.units.drop
-
 # Create.
 zeratul  = Unit.new('Zeratul',  Unit::Stats.new(85, 300, 100))
 tassadar = Unit.new('Tassadar', Unit::Stats.new(0,  80,  300))

data/spec/driver/spec_helper.rb

@@ -1,4 +1,4 @@
-require 'mongodb/driver'
+require 'mongo/driver'
 
 Mongo.defaults.merge! \
   symbolize:                    true,
@@ -9,7 +9,7 @@ Mongo.defaults.merge! \
 
 require 'ruby_ext'
 require 'rspec_ext'
-require 'mongodb/driver/spec'
+require 'mongo/driver/spec'
 
 #
 # Handy spec helpers

data/spec/migration/migration_spec.rb

@@ -1,5 +1,5 @@
 require 'driver/spec_helper'
-require 'mongodb/migration'
+require 'mongo/migration'
 
 describe "Migration" do
   with_mongo

data/spec/object/callbacks_spec.rb

@@ -5,11 +5,11 @@ describe 'Object callbacks' do
 
   before :all do
     class Player
-      include RSpec::CallbackHelper
+      include Mongo::Object, RSpec::CallbackHelper
       attr_accessor :missions
 
       class Mission
-        include RSpec::CallbackHelper
+        include Mongo::Object, RSpec::CallbackHelper
       end
     end
   end
@@ -22,49 +22,49 @@ describe 'Object callbacks' do
   end
 
   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
+    %w(before_validate after_validate before_create after_create).each do |name|
+      @player.should_receive(name).once.ordered.and_return(true)
+      @mission.should_receive(name).once.ordered.and_return(true)
     end
 
-    db.players.save @player
+    db.players.save(@player).should be_true
   end
 
   it 'update' do
-    db.players.save(@player)
+    db.players.save(@player).should be_true
 
-    %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
+    %w(before_validate after_validate before_update after_update).each do |name|
+      @player.should_receive(name).once.ordered.and_return(true)
+      @mission.should_receive(name).once.ordered.and_return(true)
     end
-    db.players.save @player
+    db.players.save(@player).should be_true
   end
 
   it 'destroy' do
-    db.players.save @player
+    db.players.save(@player).should be_true
 
-    %w(before_validate before_destroy after_destroy after_validate).each do |name|
-      @player.should_receive(name).once.ordered
-      @mission.should_receive(name).once.ordered
+    %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)
     end
-    db.players.destroy @player
+    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)
+    @player.should_not_receive(:run_callbacks)
+    @mission.should_not_receive(:run_callbacks)
 
-    db.players.save @player, callbacks: false
+    db.players.save(@player, callbacks: false).should be_true
     db.players.count.should == 1
-    db.players.save @player, callbacks: false
+    db.players.save(@player, callbacks: false).should be_true
     db.players.count.should == 1
-    db.players.destroy @player, callbacks: false
+    db.players.destroy(@player, callbacks: false).should be_true
     db.players.count.should == 0
   end
 
   it 'should be able interrupt CRUD' do
-    @mission.stub! :_run_callbacks do |type, method_name|
-      false if type == :before and method_name == :save
+    @mission.stub! :run_callbacks do |type, method_name|
+      false if type == :before and method_name == :create
     end
     db.players.save(@player).should be_false
     db.players.count.should == 0
@@ -72,26 +72,26 @@ describe 'Object callbacks' do
 
   describe "embedded" do
     it 'should fire :destroy on detached objects' do
-      db.players.save @player
+      db.players.save(@player).should be_true
       @player.missions.clear
-      @mission.should_receive(:before_destroy).once
-      db.players.destroy @player
+      @mission.should_receive(:before_destroy).once.and_return(true)
+      db.players.destroy(@player).should be_true
     end
 
     it 'should fire :destroy on deleted objects in update' do
-      db.players.save @player
+      db.players.save(@player).should be_true
       @player.missions.clear
-      @mission.should_receive(:before_destroy).once
-      db.players.save @player
+      @mission.should_receive(:before_destroy).once.and_return(true)
+      db.players.save(@player).should be_true
     end
 
     it 'should fire :create on new objects in update' do
-      db.players.save @player
+      db.players.save(@player).should be_true
       mission2 = Player::Mission.new
       @player.missions << mission2
-      mission2.should_receive(:before_create).once
+      mission2.should_receive(:before_create).once.and_return(true)
       mission2.should_not_receive(:before_update)
-      db.players.save @player
+      db.players.save(@player).should be_true
     end
   end
 end

data/spec/object/crud_spec.rb

@@ -1,5 +1,5 @@
 require 'object/spec_helper'
-require 'object/crud_shared'
+require 'mongo/object/spec/crud_shared'
 
 describe "Object CRUD" do
   with_mongo
@@ -7,6 +7,8 @@ describe "Object CRUD" do
   describe 'simple' do
     before :all do
       class Unit2
+        include Mongo::Object
+
         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
@@ -29,10 +31,14 @@ describe "Object CRUD" do
   describe 'embedded' do
     before :all do
       class Player2
+        include Mongo::Object
+
         attr_accessor :missions
         def == o; [self.class, self.missions] == [o.class, o.respond_to(:missions)] end
 
         class Mission
+          include Mongo::Object
+
           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

data/spec/object/spec_helper.rb

@@ -1,14 +1,14 @@
-require 'mongodb/object'
-require 'driver/spec_helper'
+require 'mongo/object'
+
+require 'rspec_ext'
+require 'mongo/object/spec'
 
-# 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
+require 'driver/spec_helper'
 
 # To simplify callback expectations
 module RSpec::CallbackHelper
-  def _run_callbacks type, method_name
+  def run_callbacks type, method_name
     callback_method_name = :"#{type}_#{method_name}"
-    send callback_method_name if respond_to? callback_method_name
+    respond_to?(callback_method_name) ? send(callback_method_name) : true
   end
 end

data/spec/object/validation_spec.rb

@@ -5,9 +5,12 @@ describe 'Object validation' do
 
   before :all do
     class Player
+      include Mongo::Object
+
       attr_accessor :missions
 
       class Mission
+        include Mongo::Object
       end
     end
   end
@@ -21,56 +24,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: mongodb
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-28 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: mongo
-  requirement: &2820900 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: *2820900
+date: 2011-08-30 00:00:00.000000000Z
+dependencies: []
 description: 
 email: 
 executables: []
@@ -30,19 +19,21 @@ extra_rdoc_files: []
 files:
 - Rakefile
 - readme.md
-- lib/mongodb/driver/collection.rb
-- lib/mongodb/driver/database.rb
-- lib/mongodb/driver/dynamic_finders.rb
-- lib/mongodb/driver/spec.rb
-- lib/mongodb/driver.rb
-- lib/mongodb/gems.rb
-- lib/mongodb/migration/definition.rb
-- lib/mongodb/migration/migration.rb
-- lib/mongodb/migration/tasks.rb
-- lib/mongodb/migration.rb
-- lib/mongodb/object/object_helper.rb
-- lib/mongodb/object/object_serializer.rb
-- lib/mongodb/object.rb
+- lib/mongo/driver/collection.rb
+- lib/mongo/driver/database.rb
+- 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/migration.rb
+- lib/mongo/migration/tasks.rb
+- lib/mongo/migration.rb
+- lib/mongo/object/object.rb
+- lib/mongo/object/object_helper.rb
+- lib/mongo/object/spec/crud_shared.rb
+- lib/mongo/object/spec.rb
+- lib/mongo/object.rb
 - spec/driver/collection_spec.rb
 - spec/driver/crud_spec.rb
 - spec/driver/database_spec.rb
@@ -52,7 +43,6 @@ files:
 - spec/driver/spec_helper.rb
 - spec/migration/migration_spec.rb
 - spec/object/callbacks_spec.rb
-- spec/object/crud_shared.rb
 - spec/object/crud_spec.rb
 - spec/object/spec_helper.rb
 - spec/object/validation_spec.rb

data/lib/mongodb/migration.rb

@@ -1,8 +0,0 @@
-require 'mongodb/driver'
-
-class Mongo::Migration; end
-
-%w(
-  definition
-  migration
-).each{|f| require "mongodb/migration/#{f}"}

data/lib/mongodb/object/object_helper.rb

@@ -1,62 +0,0 @@
-module Mongo::ObjectHelper
-  #
-  # CRUD
-  #
-  def save_with_object doc, opts = {}
-    if doc.is_a? Hash
-      save_without_object doc, opts
-    else
-      ::Mongo::ObjectSerializer.new(doc).save opts, self
-    end
-  end
-
-  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_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_object arg = {}, opts = {}
-    if arg.is_a? Hash
-      remove_without_object arg, opts
-    else
-      ::Mongo::ObjectSerializer.new(arg).remove opts, self
-    end
-  end
-
-  def save! doc, opts = {}
-    save(doc, opts) || raise(Mongo::Error, "can't save #{doc.inspect}!")
-  end
-
-
-  #
-  # Querying
-  #
-  def first selector = {}, opts = {}, &block
-    opts = opts.clone
-    object = (opts.delete(:object) == false) ? false : true
-    doc = super selector, opts, &block
-    object ? ::Mongo::ObjectSerializer.build(doc) : doc
-  end
-
-  def each selector = {}, opts = {}, &block
-    opts = opts.clone
-    object = (opts.delete(:object) == false) ? false : true
-    super selector, opts do |doc|
-      doc = ::Mongo::ObjectSerializer.build(doc) if object
-      block.call doc
-    end
-    nil
-  end
-end

data/lib/mongodb/object/object_serializer.rb

@@ -1,273 +0,0 @@
-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_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_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_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, *callbacks
-    callbacks.each do |type, method_name|
-      objects.each do |obj|
-        if obj.respond_to? :_run_callbacks
-          return false if obj._run_callbacks(type, method_name) == false
-        end
-      end
-    end
-    true
-  end
-
-  def objects
-    @objects_cache ||= begin
-      objects = []
-      _each_object(object){|obj| objects << obj}
-      objects
-    end
-  end
-
-  def update_internal_state!
-    self.original_objects = objects if Mongo.defaults[:callbacks]
-  end
-
-  protected
-    def original_objects; object.instance_variable_get(:@_original_objects) end
-    def original_objects= objects; object.instance_variable_set(:@_original_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