mongo_doc 0.4.2 → 0.5.5

data/spec/associations/document_proxy_spec.rb

@@ -10,33 +10,36 @@ describe "MongoDoc::Associations::DocumentProxy" do
   end
 
   let(:parent) { Parent.new }
-  let(:name) {'association'}
+  let(:name) {'association_name'}
 
   subject do
     MongoDoc::Associations::DocumentProxy.new(:assoc_name => name, :root => parent, :parent => parent, :assoc_class => Child)
   end
 
-  it "has the association name" do
-    subject.assoc_name.should == name
+  describe "#build" do
+    it "#build builds a new object" do
+      Child.should === subject.build({})
+    end
   end
 
-  it "has the parent" do
-    subject._parent.should == parent
+  context "delegated to the document" do
+    %w(id to_bson).each do |method|
+      it "delegates #{method} to the document" do
+        subject.stub(:document => stub)
+        subject.document.should_receive(method)
+        subject.send(method)
+      end
+    end
   end
 
-  it "has the root" do
-    subject._root.should == parent
-  end
-
-  it "has the association class" do
-    subject.assoc_class.should == Child
-  end
-
-  it "inserts the association name the _path_to_root" do
-    subject._path_to_root(Child.new, :name1 => 'value1', :name2 => 'value2').should == {"#{name}.name1" => 'value1', "#{name}.name2" => "value2"}
-  end
-
-  it "#build builds a new object" do
-    Child.should === subject.build({})
+  %w(_modifier_path= _selector_path=).each do |setter|
+    describe "##{setter}" do
+      it "delegates to the document with our assoc name" do
+        subject.stub(:document => stub)
+        subject.document.should_receive(setter).with("new.path.#{name}")
+        MongoDoc::Associations::ProxyBase.stub(:is_document?).and_return(true)
+        subject.send("#{setter}", 'new.path')
+      end
+    end
   end
 end

data/spec/associations/hash_proxy_spec.rb

@@ -7,14 +7,22 @@ describe MongoDoc::Associations::HashProxy do
     attr_accessor :name
   end
 
+  let(:name) { 'embed_hash_name' }
   let(:root) { HashProxyTest.new }
-  let(:proxy) { MongoDoc::Associations::HashProxy.new(:assoc_name => 'embed_hash_name', :assoc_class => HashProxyTest, :root => root, :parent => root) }
+  let(:proxy) { MongoDoc::Associations::HashProxy.new(:assoc_name => name, :assoc_class => HashProxyTest, :root => root, :parent => root) }
   let(:item) { HashProxyTest.new }
   let(:other_item) {[1,2]}
 
-  it "inserts the association name and key into the _path_to_root" do
-    proxy.stub(:index).and_return('key')
-    proxy._path_to_root(HashProxyTest.new, 'name' => 'value').should == {"embed_hash_name.key.name" => 'value'}
+  %w(_modifier_path= _selector_path=).each do |setter|
+    describe "##{setter}" do
+      it "delegates to the document with our assoc name and the key" do
+        document = stub
+        proxy.stub(:hash).and_return(:key => document)
+        document.should_receive(setter).with("new.path.#{name}.key")
+        MongoDoc::Associations::ProxyBase.stub(:is_document?).and_return(true)
+        proxy.send("#{setter}", 'new.path')
+      end
+    end
   end
 
   context "#[]=" do
@@ -64,6 +72,11 @@ describe MongoDoc::Associations::HashProxy do
         proxy['new'] = item
         item._root.should == root
       end
+
+      it "adds the item through a document proxy" do
+        proxy['new'] = item
+        MongoDoc::Associations::DocumentProxy.should === proxy['new']
+      end
     end
   end
 

data/spec/associations/proxy_base_spec.rb

@@ -0,0 +1,92 @@
+require 'spec_helper'
+
+describe "MongoDoc::Associations::ProxyBase" do
+  class ProxyBaseTest
+    include MongoDoc::Associations::ProxyBase
+  end
+
+  let(:_assoc_class) { 'ClassOfAssociation' }
+  let(:_assoc_name) { 'name_of_association' }
+  let(:_root) { 'root of document' }
+  let(:path) { 'root.parent' }
+
+  subject do
+    ProxyBaseTest.new({ :path => path, :assoc_class => _assoc_class, :assoc_name => _assoc_name, :root => _root })
+  end
+
+  %w(_assoc_class _assoc_name _modifier_path _root _selector_path).each do |attr|
+    it "defines #{attr}" do
+      should respond_to(attr)
+    end
+  end
+
+  describe "#initialize" do
+    %w(_assoc_class _assoc_name _root).each do |attr|
+      its(attr) { should == send(attr) }
+    end
+  end
+
+  describe "#_modifier_path" do
+    its(:_modifier_path) { should == path + '.' + _assoc_name }
+  end
+
+  describe "#_modifier_path=" do
+    it "sets the modifier path to the path + '.' + the assoc name" do
+      subject._modifier_path = 'new_path'
+      subject._modifier_path.should == "new_path.#{_assoc_name}"
+    end
+  end
+
+  describe "#_selector_path" do
+    its(:_selector_path) { should == path + '.' + _assoc_name }
+  end
+
+  describe "#_selector_path=" do
+    it "sets the selector path to the path + '.' + the assoc name" do
+      subject._selector_path = 'new_path'
+      subject._selector_path.should == "new_path.#{_assoc_name}"
+    end
+  end
+
+  describe ".is_document" do
+    class TestIsDocument
+      include MongoDoc::Document
+    end
+
+    it "returns false for any non-Document" do
+      MongoDoc::Associations::ProxyBase.is_document?(Object.new).should be_false
+    end
+
+    it "returns true for any Document" do
+      MongoDoc::Associations::ProxyBase.is_document?(TestIsDocument.new).should be_true
+    end
+  end
+
+  describe "#attach" do
+    class AttachDocument
+      include MongoDoc::Document
+    end
+
+    let(:doc) { AttachDocument.new }
+    let(:object) { Object.new }
+    let(:proxy) { ProxyBaseTest.new(:assoc_class => _assoc_class, :assoc_name => _assoc_name, :root => _root) }
+
+    it "returns the attached object" do
+      proxy.send(:attach, object).should == object
+    end
+
+    context "when a Document" do
+      it "attaches the Document" do
+        proxy.should_receive(:attach_document)
+        proxy.send(:attach, doc)
+      end
+    end
+
+    context "when not a Document" do
+      it "does not attach the Document" do
+        proxy.should_not_receive(:attach_document)
+        proxy.send(:attach, object)
+      end
+    end
+  end
+end

data/spec/associations_spec.rb

@@ -32,10 +32,6 @@ describe "MongoDoc::Associations" do
       MongoDoc::Associations::DocumentProxy.should === TestHasOne.new(:sub_doc => SubDoc.new).sub_doc
     end
 
-    it "sets the subdocuments parent to the proxy" do
-      doc.sub_doc.should == subdoc._parent
-    end
-
     it "set the subdocuments root" do
       doc.should == subdoc._root
     end
@@ -98,24 +94,20 @@ describe "MongoDoc::Associations" do
       MongoDoc::Associations::CollectionProxy.should === TestHasManyDoc.new.sub_docs
     end
 
-    it "sets the subdocuments parent to the proxy" do
-      doc.sub_docs.should == subdoc._parent
-    end
-
     it "set the subdocuments root to the root" do
       doc.should == subdoc._root
     end
 
     it "uses the association name to find the children's class name" do
-      TestImplicitEmbedManyDoc.new.sub_embed_many_docs.assoc_class.should == SubEmbedManyDoc
+      TestImplicitEmbedManyDoc.new.sub_embed_many_docs._assoc_class.should == SubEmbedManyDoc
     end
 
     it "uses class_name attribute for the children's class name" do
-      TestEmbedManyDoc.new.sub_docs.assoc_class.should == SubEmbedManyDoc
+      TestEmbedManyDoc.new.sub_docs._assoc_class.should == SubEmbedManyDoc
     end
 
     it "uses class_name attribute for the children's class name" do
-      TestEmbedManyDoc2.new.sub_docs.assoc_class.should == SubEmbedManyDoc
+      TestEmbedManyDoc2.new.sub_docs._assoc_class.should == SubEmbedManyDoc
     end
 
     context "validations" do
@@ -185,16 +177,12 @@ describe "MongoDoc::Associations" do
       MongoDoc::Associations::HashProxy.should === TestEmbedHashDoc.new.sub_docs
     end
 
-    it "sets the subdocuments parent to the proxy" do
-      doc.sub_docs.should == subdoc._parent
-    end
-
     it "set the subdocuments root to the root" do
       doc.should == subdoc._root
     end
 
     it "uses the association name to find the children's class name" do
-      TestImplicitEmbedHashDoc.new.sub_embed_hash_docs.assoc_class.should == SubEmbedHashDoc
+      TestImplicitEmbedHashDoc.new.sub_embed_hash_docs._assoc_class.should == SubEmbedHashDoc
     end
 
     context "validations" do

data/spec/bson_spec.rb

@@ -140,7 +140,7 @@ describe "BSON for Mongo (BSON)" do
   end
 
   describe "Mongo Classes" do
-    [Mongo::ObjectID.new, Mongo::DBRef.new('ns', 1), Mongo::Code.new('code'), Mongo::Binary.new].each do |obj|
+    [BSON::ObjectID.new, BSON::DBRef.new('ns', 1), BSON::Code.new('code'), BSON::Binary.new, BSON::MinKey.new, BSON::MaxKey.new].each do |obj|
       it "#to_bson for #{obj.class.name} returns self" do
         obj.to_bson.should == obj
       end

data/spec/connection_spec.rb

@@ -105,12 +105,12 @@ describe "MongoDoc::Connection.Connections" do
     let(:connection) { stub('connection') }
 
     it "raises when the server version is unsupported" do
-      connection.stub(:server_version).and_return(Mongo::ServerVersion.new('1.3.2'))
+      connection.stub(:server_version).and_return(Mongo::ServerVersion.new('1.3.4'))
       lambda { MongoDoc::Connection.send(:verify_server_version, connection) }.should raise_error(MongoDoc::UnsupportedServerVersionError)
     end
 
     it "returns when the server version is supported" do
-      connection.stub(:server_version).and_return(Mongo::ServerVersion.new('1.3.4'))
+      connection.stub(:server_version).and_return(Mongo::ServerVersion.new('1.4.0'))
       lambda { MongoDoc::Connection.send(:verify_server_version, connection) }.should_not raise_error(MongoDoc::UnsupportedServerVersionError)
     end
   end

data/spec/contexts/ids_spec.rb

@@ -16,7 +16,7 @@ describe "MongoDoc::Contexts::Ids" do
   context "#id_criteria" do
     context "single id" do
       let(:id) { 'a' * 24 }
-      let(:obj_id) { Mongo::ObjectID.from_string(id) }
+      let(:obj_id) { BSON::ObjectID.from_string(id) }
 
       it "converts strings to an object id" do
         criteria.should_receive(:id).with(obj_id)
@@ -32,7 +32,7 @@ describe "MongoDoc::Contexts::Ids" do
 
     context "mutliple ids" do
       let(:ids) { ['a' * 24, 'b' * 24] }
-      let(:obj_ids) { [Mongo::ObjectID.from_string(ids.first), Mongo::ObjectID.from_string(ids.last)] }
+      let(:obj_ids) { [BSON::ObjectID.from_string(ids.first), BSON::ObjectID.from_string(ids.last)] }
 
       it "converts strings to an object id" do
         criteria.should_receive(:id).with(obj_ids)

data/spec/document_spec.rb

@@ -1,7 +1,28 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 describe "MongoDoc::Document" do
 
+  describe "#_collection" do
+    class DocumentCollectionTest
+      include MongoDoc::Document
+    end
+
+    let(:doc) do
+      doc = DocumentCollectionTest.new
+      doc._root = stub
+      doc
+    end
+
+    before do
+      DocumentCollectionTest.stub(:collection).and_return('collection')
+    end
+
+    it "delegates to the root's collection" do
+      doc._root.should_receive :_collection
+      doc._collection
+    end
+  end
+
   context "satisfies form_for requirements" do
     class FormForTest
       include MongoDoc::Document
@@ -39,26 +60,7 @@ describe "MongoDoc::Document" do
     end
   end
 
-  context "validations" do
-    class SimpleValidationTest
-      include MongoDoc::Document
-
-      attr_accessor :data
-      validates_presence_of :data
-    end
-
-    it "are included by MongoDoc::Document" do
-      Validatable.should === SimpleValidationTest.new
-    end
-
-    it "valid? fails when a document is invalid" do
-      doc = SimpleValidationTest.new
-      doc.should_not be_valid
-      doc.should have(1).error_on(:data)
-    end
-  end
-
-  context "saving" do
+ context "saving" do
     class SaveRoot
       include MongoDoc::Document
 
@@ -368,6 +370,13 @@ describe "MongoDoc::Document" do
         end
       end
     end
+
+    describe "#hash_with_modifier_path_keys" do
+      it "returns a hash with the keys prepended with the modifier path" do
+        new_doc.stub(:_modifier_path).and_return('path.to.root')
+        new_doc.send(:hash_with_modifier_path_keys, :name => 1).should == {'path.to.root.name' => 1}
+      end
+    end
   end
 
   describe "bson" do
@@ -403,7 +412,7 @@ describe "MongoDoc::Document" do
     end
 
     it "includes the _id of the object" do
-      @doc._id = Mongo::ObjectID.new
+      @doc._id = BSON::ObjectID.new
       @doc.to_bson.should be_bson_eql({MongoDoc::BSON::CLASS_KEY => BSONTest.name, "_id" => @doc._id.to_bson, "other" => {MongoDoc::BSON::CLASS_KEY => OtherObject.name, "value" => @value}})
     end
 

data/spec/ext_spec.rb

@@ -1,6 +1,14 @@
 require 'spec_helper.rb'
 
 describe "Ruby Object Extensions" do
+  context "Rails3 support" do
+    describe "#singleton_class" do
+      it "is either defined or aliased" do
+        Object.new.should respond_to(:singleton_class)
+      end
+    end
+  end
+
   context "Conversions" do
     context "Boolean" do
       it "converts from a '1' to true" do

data/spec/root_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe "MongoDoc::Root" do
+  class RootTest
+    include MongoDoc::Root
+    attr_accessor_with_default(:_associations) {[]}
+    attr_accessor :association
+  end
+
+  let(:doc) { RootTest.new }
+
+  context "cascade properties" do
+    let(:prop_val) { stub }
+
+    %w(_modifier_path _root _selector_path).each do |prop|
+      it "sets the #{prop}" do
+        doc.send("#{prop}=", prop_val)
+        doc.send(prop).should == prop_val
+      end
+
+      it "sets the prop on any associations" do
+        doc.association = stub
+        doc.association.should_receive("#{prop}=").with(prop_val)
+        doc._associations = ['association']
+        doc.send("#{prop}=", prop_val)
+      end
+    end
+  end
+
+  describe "#_selector_path" do
+    it "defaults to ''" do
+      doc._selector_path.should == ''
+    end
+  end
+
+  describe "#_modifier_path" do
+    it "defaults to ''" do
+      doc._modifier_path.should == ''
+    end
+  end
+end

data/spec/validations_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe MongoDoc::Validations do
+
+  class ValidationTest
+    include MongoDoc::Document
+
+    attr_accessor :data
+    validates_presence_of :data
+  end
+
+  context "requirements" do
+    subject { ValidationTest.new }
+
+    it { should respond_to(:valid?) }
+    it { should respond_to(:errors) }
+
+    it "is included by Document" do
+      MongoDoc::Validations.should === subject
+    end
+  end
+
+  context "validations" do
+    it "valid? fails when a document is invalid" do
+      doc = ValidationTest.new
+      doc.should_not be_valid
+      doc.should have(1).error_on(:data)
+    end
+  end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 2
-  version: 0.4.2
+  - 5
+  - 5
+  version: 0.5.5
 platform: ruby
 authors: 
 - Les Hill
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-23 00:00:00 -04:00
+date: 2010-04-08 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,13 +40,13 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 19
+        - 20
         - 1
-        version: 0.19.1
+        version: 0.20.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: mongo_ext
+  name: bson
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
@@ -54,15 +54,29 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 19
+        - 20
         - 1
-        version: 0.19.1
+        version: 0.20.1
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: durran-validatable
+  name: bson_ext
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 20
+        - 1
+        version: 0.20.1
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: durran-validatable
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
@@ -72,11 +86,11 @@ dependencies:
         - 1
         version: 2.0.1
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: leshill-will_paginate
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
@@ -86,11 +100,11 @@ dependencies:
         - 11
         version: 2.3.11
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
@@ -100,13 +114,13 @@ dependencies:
         - 0
         version: 1.3.0
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
@@ -114,7 +128,7 @@ dependencies:
         - 2
         version: 0.6.2
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 description: ODM for MongoDB
 email: leshill@gmail.com
 executables: []
@@ -138,6 +152,7 @@ files:
 - examples/simple_document.rb
 - examples/simple_object.rb
 - features/collections.feature
+- features/embed_hash.feature
 - features/finders.feature
 - features/indexes.feature
 - features/mongodb.yml
@@ -150,6 +165,7 @@ files:
 - features/step_definitions/collection_steps.rb
 - features/step_definitions/document_steps.rb
 - features/step_definitions/documents.rb
+- features/step_definitions/embed_hash_steps.rb
 - features/step_definitions/finder_steps.rb
 - features/step_definitions/index_steps.rb
 - features/step_definitions/json_steps.rb
@@ -188,6 +204,7 @@ files:
 - lib/mongo_doc/ext/date_time.rb
 - lib/mongo_doc/ext/dbref.rb
 - lib/mongo_doc/ext/hash.rb
+- lib/mongo_doc/ext/min_max_keys.rb
 - lib/mongo_doc/ext/nil_class.rb
 - lib/mongo_doc/ext/numeric.rb
 - lib/mongo_doc/ext/object.rb
@@ -199,8 +216,9 @@ files:
 - lib/mongo_doc/finders.rb
 - lib/mongo_doc/index.rb
 - lib/mongo_doc/matchers.rb
-- lib/mongo_doc/query.rb
+- lib/mongo_doc/root.rb
 - lib/mongo_doc/scope.rb
+- lib/mongo_doc/validations.rb
 - lib/mongo_doc/validations/macros.rb
 - lib/mongo_doc/validations/validates_embedded.rb
 - lib/mongoid/contexts/enumerable.rb
@@ -226,13 +244,15 @@ files:
 - mongo_doc.gemspec
 - mongod.example.yml
 - mongodb.example.yml
-- perf/mongo_doc_runner.rb
-- perf/ruby_driver_runner.rb
+- perf/mongo_doc_object.rb
+- perf/mongo_document.rb
+- perf/ruby_driver.rb
 - script/console
 - spec/array_including_argument_matcher.rb
 - spec/associations/collection_proxy_spec.rb
 - spec/associations/document_proxy_spec.rb
 - spec/associations/hash_proxy_spec.rb
+- spec/associations/proxy_base_spec.rb
 - spec/associations_spec.rb
 - spec/attributes_accessor_spec.rb
 - spec/attributes_spec.rb
@@ -256,10 +276,11 @@ files:
 - spec/mongodb.yml
 - spec/mongodb_pairs.yml
 - spec/new_record_spec.rb
-- spec/query_spec.rb
+- spec/root_spec.rb
 - spec/scope_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/validations_spec.rb
 has_rdoc: true
 homepage: http://github.com/leshill/mongodoc
 licenses: []
@@ -295,6 +316,7 @@ test_files:
 - spec/associations/collection_proxy_spec.rb
 - spec/associations/document_proxy_spec.rb
 - spec/associations/hash_proxy_spec.rb
+- spec/associations/proxy_base_spec.rb
 - spec/associations_spec.rb
 - spec/attributes_accessor_spec.rb
 - spec/attributes_spec.rb
@@ -316,8 +338,9 @@ test_files:
 - spec/index_spec.rb
 - spec/matchers_spec.rb
 - spec/new_record_spec.rb
-- spec/query_spec.rb
+- spec/root_spec.rb
 - spec/scope_spec.rb
 - spec/spec_helper.rb
+- spec/validations_spec.rb
 - examples/simple_document.rb
 - examples/simple_object.rb

data/lib/mongo_doc/query.rb

@@ -1,7 +0,0 @@
-module MongoDoc
-  module Query
-    def self.set_modifier(bson_hash)
-      {'$set' => bson_hash}
-    end
-  end
-end