mongo_doc 0.6.17 → 0.6.18

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mongo_doc (0.6.17)
+    mongo_doc (0.6.18)
       activemodel (>= 3.0.0.beta.4)
       activesupport (>= 3.0.0.beta.4)
       bson (>= 1.0.0)

data/README.textile

@@ -1,6 +1,6 @@
 h1. MongoDoc
 
-Version: 0.6.17 2010/08/11
+Version: 0.6.18 2010/08/15
 
 h2. Notes
 

data/VERSION

@@ -1 +1 @@
-0.6.17
+0.6.18

data/features/db_references.feature

@@ -0,0 +1,21 @@
+Feature: DBReferences
+
+  Background:
+    Given an empty Character document collection
+    And a Character document named 'Fry' :
+      | Name          |
+      | Philip J. Fry |
+    And an empty Address document collection
+    And an Address document named 'office' :
+      | City              |
+      | New New York City |
+    And an Address document named 'old_office' :
+      | City          |
+      | New York City |
+
+  Scenario: Automatically dereferences in db_references association
+    When I save the document 'office'
+    And 'Fry' references 'office' as 'address'
+    And I save the document 'Fry'
+    And the document 'Fry' is reloaded
+    Then 'Fry' refers to 'office' as 'address'

data/features/step_definitions/documents.rb

@@ -52,3 +52,10 @@ end
 class VIP < Person
   attr_accessor :title
 end
+
+class Character
+  include MongoDoc::Document
+
+  attr_accessor :name
+  db_references :address
+end

data/lib/mongo_doc/references.rb

@@ -1,6 +1,7 @@
 module MongoDoc
   module References
-    # Declare a reference to another +Document+.
+    # Declare a reference to another +Document+. Use this when you have a
+    # simple reference or a single polymorphic collection.
     #
     # * classname:: name of +Document+ type as an +underscore+ symbol or string
     # * options:: +:as+ specifies the name of the attribute
@@ -32,5 +33,46 @@ module MongoDoc
 
       alias_method_chain "#{attr_name}_id=", :reference
     end
+
+
+    # Declare a +DBRef+ to another +Document+. A +DBRef+ can be in any
+    # collection and can point to an instance of any class.
+    #
+    # * name:: name of the attribute
+    def db_references(name)
+
+      attr_accessor "#{name}_ref".to_sym, :type => ::BSON::DBRef
+
+      module_eval(<<-RUBY, __FILE__, __LINE__)
+        def #{name}_ref_with_reference=(value)       # def address_ref_with_reference=(value)
+          @#{name} = nil                             #   @address = nil
+          self.#{name}_ref_without_reference = value #   self.address_ref_without_reference = value
+        end                                          # end
+
+        def #{name}
+          @#{name} ||= if #{name}_ref.nil?        # @address ||= if address_name_ref.nil?
+              nil                                 #     nil
+            else                                  #   else
+              self.class.dereference(#{name}_ref) #     self.class.dereference(address_name_ref)
+            end                                   #   end
+        end
+
+        def #{name}=(value)                                  # def address=(value)
+          @#{name} = value                                   # @address = value
+          self.#{name}_ref = if value.nil?                   # self.address_ref = if value.nil?
+              nil                                            #     nil
+            else                                             #   else
+              ::BSON::DBRef.new(value.class.collection_name, #     ::BSON::DBRef.new(value.collection_name,
+                value._id)                                   #       value._id)
+            end                                              #   end
+        end                                                  # end
+      RUBY
+
+      alias_method_chain "#{name}_ref=", :reference
+    end
+
+    def dereference(db_ref)
+      MongoDoc::Collection.new(db_ref.namespace).find_one(db_ref.object_id)
+    end
   end
 end

data/lib/mongo_doc.rb

@@ -3,7 +3,7 @@ require 'active_support'
 require 'active_support/core_ext'
 
 module MongoDoc
-  VERSION = '0.6.17'
+  VERSION = '0.6.18'
 end
 
 require 'mongo_doc/connection'

data/mongo_doc.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongo_doc}
-  s.version = "0.6.17"
+  s.version = "0.6.18"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Les Hill"]
-  s.date = %q{2010-08-11}
+  s.date = %q{2010-08-15}
   s.description = %q{ODM for MongoDB}
   s.email = %q{leshill@gmail.com}
   s.extra_rdoc_files = [
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
      "examples/simple_document.rb",
      "examples/simple_object.rb",
      "features/collections.feature",
+     "features/db_references.feature",
      "features/embed_hash.feature",
      "features/finders.feature",
      "features/indexes.feature",

data/spec/references_spec.rb

@@ -33,6 +33,23 @@ describe MongoDoc::References do
         Person._keys.should include(:address_id)
       end
     end
+
+    context "setting the id" do
+      class Person
+        include MongoDoc::Document
+
+        references :address
+      end
+
+      let(:address) { Address.new(:_id => BSON::ObjectID.new) }
+      let(:person) { Person.new }
+
+      it "resets the object to nil" do
+        person.address = address
+        person.address_id = nil
+        person.address.should be_nil
+      end
+    end
   end
 
   context "Named Reference" do
@@ -63,20 +80,50 @@ describe MongoDoc::References do
     end
   end
 
-  describe "setting the id" do
+  context "DBRef Reference" do
     class Person
       include MongoDoc::Document
 
-      references :address
+      db_references :address
     end
 
     let(:address) { Address.new(:_id => BSON::ObjectID.new) }
     let(:person) { Person.new }
+    subject { person }
 
-    it "resets the object to nil" do
-      person.address = address
-      person.address_id = nil
-      person.address.should be_nil
+    context "Object accessor" do
+      it { should respond_to(:address) }
+      it { should respond_to(:address=) }
+
+      it "is not part of the persistent key set" do
+        Person._keys.should_not include(:address)
+      end
+    end
+
+    context "DBRef accessor" do
+      it { should respond_to(:address_ref) }
+      it { should respond_to(:address_ref=) }
+
+      it "is part of the persistent key set" do
+        Person._keys.should include(:address_ref)
+      end
+    end
+
+    context "setting the object" do
+      it "sets the reference" do
+        person.address = address
+        person.address_ref.namespace.should == Address.collection_name
+        person.address_ref.object_id.should == address._id
+      end
+    end
+
+    context "setting the reference" do
+
+      it "resets the object to nil" do
+        person.address = address
+        person.address_ref = nil
+        person.address.should be_nil
+      end
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_doc
 version: !ruby/object:Gem::Version 
-  hash: 37
+  hash: 35
   prerelease: false
   segments: 
   - 0
   - 6
-  - 17
-  version: 0.6.17
+  - 18
+  version: 0.6.18
 platform: ruby
 authors: 
 - Les Hill
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-11 00:00:00 -04:00
+date: 2010-08-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -193,6 +193,7 @@ files:
 - examples/simple_document.rb
 - examples/simple_object.rb
 - features/collections.feature
+- features/db_references.feature
 - features/embed_hash.feature
 - features/finders.feature
 - features/indexes.feature