mongodb 2.0.2 → 2.1.0

data/Rakefile

@@ -2,7 +2,7 @@ require 'rake_ext'
 
 project \
   name: "mongodb",
-  # version: '2.0.0',
+  version: '2.1.0',
   gem: true,
   summary: "Persistence for any Ruby Object & Driver enhancements for MongoDB.",
 

data/lib/mongo/object/collection_helper.rb

@@ -1,4 +1,4 @@
-module Mongo::CollectionHelper
+module Mongo::Object::CollectionHelper
   # CRUD.
 
   def create_with_object doc, options = {}
@@ -55,12 +55,13 @@ module Mongo::CollectionHelper
 
   # Querying.
 
-  def first selector = {}, options = {}, &block
+  def first selector = {}, options = {}
     options = options.clone
     if options.delete(:object) == false
-      super selector, options, &block
+      super selector, options
     else
-      ::Mongo::Object.build super(selector, options, &block)
+      doc = super(selector, options)
+      build doc
     end
   end
 
@@ -70,8 +71,22 @@ module Mongo::CollectionHelper
       super selector, options, &block
     else
       super selector, options do |doc|
-        block.call ::Mongo::Object.build(doc)
+        block.call build(doc)
       end
     end
   end
+
+  protected
+    def build doc
+      if doc and (class_name = doc['_class'])
+        klass = Mongo::Object.constantize class_name
+        if klass.respond_to? :from_mongo
+          klass.from_mongo doc
+        else
+          Mongo::Object.from_mongo doc
+        end
+      else
+        doc
+      end
+    end
 end

data/lib/mongo/object/load.rb

@@ -3,7 +3,7 @@ require 'mongo/object/object'
 require 'mongo/object/collection_helper'
 
 Mongo::Collection.class_eval do
-  include Mongo::CollectionHelper
+  include Mongo::Object::CollectionHelper
 
   %w(create update save delete).each do |method|
     alias_method "#{method}_without_object", method

data/lib/mongo/object/object.rb

@@ -1,18 +1,21 @@
 module Mongo::Object
-  attr_accessor :_id, :_parent
+  attr_accessor :_id, :_parent, :_not_new
 
   def _id?; !!_id end
-  def new?; !_id end
-  alias_method :new_record?, :new?
+
+  def new?; !_not_new end
 
   def create_object collection, options
     doc = to_mongo
 
     # Generating custom id if option enabled.
-    doc['_id'] = generate_id if Mongo.defaults[:generate_id]
+    doc['_id'] ||= generate_id if Mongo.defaults[:generate_id]
 
     id = collection.create doc, options
-    self._id = id
+
+    self._id ||= id
+    self._not_new = true
+
     id
   end
 
@@ -28,7 +31,7 @@ module Mongo::Object
   end
 
   def save_object collection, options
-    if _id
+    if _not_new
       update_object collection, options
     else
       create_object collection, options
@@ -43,23 +46,27 @@ module Mongo::Object
 
   # Convert object to document (with nested documents & arrays).
   def to_mongo
-    {}.tap do |h|
-      # Copy instance variables.
-      persistent_instance_variable_names.each do |iv_name|
-        k = iv_name.to_s[1..-1]
-        v = instance_variable_get iv_name
-        h[k] = v.to_mongo
-      end
+    convert_object self, :_to_mongo
+  end
 
-      # Adding _id & _class.
-      h['_id']    = _id if _id
-      h['_class'] = self.class.name || \
-        raise("unknow class name for model #{h.inspect}!")
+  def _to_mongo options = {}
+    h = {}
+    # Copy instance variables.
+    persistent_instance_variable_names.each do |iv_name|
+      k = iv_name.to_s[1..-1]
+      v = instance_variable_get iv_name
+      h[k] = convert_object v, :_to_mongo
     end
+
+    # Adding _id & _class.
+    h['_id']    = _id if _id
+    h['_class'] = self.class.name || \
+      raise("unknow class name for model #{h.inspect}!")
+    h
   end
 
   def to_hash
-    {}.tap{|h| to_mongo.each{|k, v| h[k.to_sym] = v}}
+    Hash.respond_to?(:symbolize) ? Hash.symbolize(to_mongo) : to_mongo
   end
 
   # Override it to generate Your custom ids.
@@ -75,6 +82,19 @@ module Mongo::Object
   alias_method :to_s, :inspect
 
   protected
+    def convert_object obj, method, options = {}
+      if obj.respond_to? :collect_with_value
+        # Array or Hash.
+        obj.collect_with_value{|v| convert_object v, method, options}
+      elsif obj.respond_to method
+        # Object.
+        obj.public_send method, options
+      else
+        # Simple object.
+        obj
+      end
+    end
+
     ID_SYMBOLS = ('a'..'z').to_a + ('A'..'Z').to_a + ('0'..'9').to_a
     def generate_random_string_id
       id, size = "", Mongo.defaults[:random_string_id_size]
@@ -83,52 +103,47 @@ module Mongo::Object
     end
 
   class << self
-    def build doc
-      doc && _build(doc, nil)
+    def from_mongo doc
+      _from_mongo doc, nil
+    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
 
     protected
-      def _build doc, parent = nil
+      def _from_mongo doc, parent = nil
         if doc.is_a? Hash
-          if class_name = doc[:_class] || doc['_class']
+          if class_name = doc['_class']
             klass = constantize class_name
+            obj = klass.new
 
-            # Unmarshalling object.
-            if klass.respond_to? :from_mongo
-              obj = klass.from_mongo doc
-            else
-              obj = klass.new
-              parent ||= obj
-              doc.each do |k, v|
-                v = _build v, parent
-                obj.instance_variable_set "@#{k}", v
-              end
-              obj
-            end
+            obj._not_new = true
             obj._parent = parent if parent
 
-            # Firing special after build callback if defined.
-            obj.run_after_callbacks :build, :build if obj.respond_to? :run_after_callbacks
+            doc.each do |k, v|
+              v = _from_mongo v, obj
+              obj.instance_variable_set "@#{k}", v
+            end
 
             obj
           else
-            {}.tap{|h| doc.each{|k, v| h[k] = _build v, parent}}
+            {}.tap{|h| doc.each{|k, v| h[k] = _from_mongo v, parent}}
           end
         elsif doc.is_a? Array
-          doc.collect{|v| _build v, parent}
+          a = doc.collect{|v| _from_mongo v, parent}
+          # Array also can be a model at the same time.
+          a._parent = parent if parent and a.respond_to?(:_parent=)
+          a
         else
           # Simple type.
           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/object/spec/shared_object_crud.rb

@@ -92,6 +92,7 @@ shared_examples_for 'embedded object CRUD' do
   it "embedded object should have :_parent reference to the main object" do
     db.units.save @unit
     unit = db.units.first
+    unit._parent.should be_nil
     unit.items.first._parent.should == unit
   end
 

data/lib/mongo/object/support.rb

@@ -1,15 +1,10 @@
-Object.class_eval do
-  def to_mongo; self end
-end
-
 Array.class_eval do
-  def to_mongo
-    collect{|v| v.to_mongo}
-  end
+  alias_method :each_value, :each
+  alias_method :collect_with_value, :collect
 end
 
 Hash.class_eval do
-  def to_mongo
-    {}.tap{|h| each{|k, v| h[k] = v.to_mongo}}
+  def collect_with_value &block
+    {}.tap{|h| self.each{|k, v| h[k] = block.call v}}
   end
 end

data/lib/mongodb/gems.rb

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

data/spec/object/object_crud_spec.rb

@@ -41,7 +41,7 @@ describe "Object CRUD" do
           include Mongo::Object
 
           attr_accessor :name
-          def == o; [self.class, self.name] == [o.class, o.name] end
+          def == o; (self.class == o.class) and (self.name == o.name) end
         end
       end
 

data/spec/object/object_spec.rb

@@ -0,0 +1,78 @@
+require 'object/spec_helper'
+
+describe "Object" do
+  with_mongo
+
+  old = Mongo.defaults[:generate_id] = false
+  before do
+    Mongo.defaults[:generate_id] = true
+    class Tmp
+      include Mongo::Object
+    end
+  end
+  after do
+    Mongo.defaults[:generate_id] = old
+    remove_constants :Tmp, :Comment, :Tags
+  end
+
+  after{remove_constants :Post, :Tags}
+
+  it "should use autogenerated random string id (if specified, instead of default BSON::ObjectId)" do
+    o = Tmp.new
+    db.objects.save o
+    o._id.should be_a(String)
+    o._id.size.should == Mongo.defaults[:random_string_id_size]
+  end
+
+  it "shoud convert to hash" do
+    class Tmp
+      attr_accessor :name
+    end
+    o = Tmp.new
+    o.name = 'some name'
+    o.to_hash.should == {name: 'some name', _class: 'Tmp'}
+  end
+
+  it "should convert object to mongo and to Hash" do
+    class Post
+      include Mongo::Object
+
+      attr_accessor :title, :tags, :comments
+    end
+
+    class Comment
+      include Mongo::Object
+
+      attr_accessor :text
+    end
+
+    class Tags < Array
+      include Mongo::Object
+    end
+
+    comment = Comment.new
+    comment.text = 'Some text'
+
+    tags = Tags.new
+    tags.push 'a', 'b'
+
+    post = Post.new
+    post.title = 'Some title'
+    post.comments = [comment]
+    post.tags = tags
+
+    post.to_mongo.should == {
+      "_class"   => "Post",
+      "title"    => 'Some title',
+      "comments" => [{"text" => "Some text", "_class" => "Comment"}],
+      "tags"     => ['a', 'b']
+    }
+
+    post.to_hash.should == {
+      _class:   "Post",
+      title:    'Some title',
+      comments: [{text: "Some text", _class: "Comment"}],
+      tags:     ['a', 'b']
+    }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongodb
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,19 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-19 00:00:00.000000000Z
+date: 2011-12-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &2849860 !ruby/object:Gem::Requirement
+  requirement: &70332531962700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *2849860
+  version_requirements: *70332531962700
 description: 
 email: 
 executables: []
@@ -57,8 +57,8 @@ files:
 - spec/driver/hash_crud_spec.rb
 - spec/driver/spec_helper.rb
 - spec/migration/migration_spec.rb
-- spec/object/miscellaneous_spec.rb
 - spec/object/object_crud_spec.rb
+- spec/object/object_spec.rb
 - spec/object/spec_helper.rb
 homepage: http://alexeypetrushin.github.com/mongodb
 licenses: []
@@ -80,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Persistence for any Ruby Object & Driver enhancements for MongoDB.

data/spec/object/miscellaneous_spec.rb

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