mongo_doc 0.3.2 → 0.4.0

data/spec/document_spec.rb

@@ -6,7 +6,7 @@ describe "MongoDoc::Document" do
     class FormForTest
       include MongoDoc::Document
 
-      key :data
+      attr_accessor :data
     end
 
     before do
@@ -43,7 +43,7 @@ describe "MongoDoc::Document" do
     class SimpleValidationTest
       include MongoDoc::Document
 
-      key :data
+      attr_accessor :data
       validates_presence_of :data
     end
 
@@ -62,13 +62,13 @@ describe "MongoDoc::Document" do
     class SaveRoot
       include MongoDoc::Document
 
-      has_many :save_children
+      embed_many :save_children
     end
 
     class SaveChild
       include MongoDoc::Document
 
-      key :data
+      attr_accessor :data
     end
 
     before do
@@ -200,7 +200,7 @@ describe "MongoDoc::Document" do
     class CreateTest
       include MongoDoc::Document
 
-      key :data
+      attr_accessor :data
       validates_presence_of :data
     end
 
@@ -261,13 +261,13 @@ describe "MongoDoc::Document" do
     class UpdateAttributesRoot
       include MongoDoc::Document
 
-      has_one :update_attributes_child
+      embed :update_attributes_child
     end
 
     class UpdateAttributesChild
       include MongoDoc::Document
 
-      key :data
+      attr_accessor :data
     end
 
     let(:data) {'data'}
@@ -479,13 +479,13 @@ describe "MongoDoc::Document" do
     class BSONTest
       include MongoDoc::Document
 
-      key :other
+      attr_accessor :other
     end
 
     class BSONDerived < BSONTest
       include MongoDoc::Document
 
-      key :derived
+      attr_accessor :derived
     end
 
     class OtherObject
@@ -530,22 +530,22 @@ describe "MongoDoc::Document" do
     end
 
     context "associations" do
-      context "has_one" do
-        class TestHasOneBsonDoc
+      context "embed" do
+        class TestEmbedBsonDoc
           include MongoDoc::Document
 
-          has_one :subdoc
+          embed :subdoc
         end
 
-        class SubHasOneBsonDoc
+        class SubEmbedBsonDoc
           include MongoDoc::Document
 
-          key :attr
+          attr_accessor :attr
         end
 
         it "#to_bson renders a bson representation of the document" do
-          doc = TestHasOneBsonDoc.new
-          subdoc = SubHasOneBsonDoc.new(:attr => "value")
+          doc = TestEmbedBsonDoc.new
+          subdoc = SubEmbedBsonDoc.new(:attr => "value")
           bson = doc.to_bson
           bson["subdoc"] = subdoc.to_bson
           doc.subdoc = subdoc
@@ -553,29 +553,29 @@ describe "MongoDoc::Document" do
         end
 
         it "roundtrips" do
-          doc = TestHasOneBsonDoc.new
-          subdoc = SubHasOneBsonDoc.new(:attr => "value")
+          doc = TestEmbedBsonDoc.new
+          subdoc = SubEmbedBsonDoc.new(:attr => "value")
           doc.subdoc = subdoc
           MongoDoc::BSON.decode(doc.to_bson).should == doc
         end
       end
 
-      context "has_many" do
+      context "embed_many" do
 
-        class SubHasManyBsonDoc
+        class SubEmbedManyBsonDoc
           include MongoDoc::Document
 
-          key :attr
+          attr_accessor :attr
         end
 
-        class TestHasManyBsonDoc
+        class TestEmbedManyBsonDoc
           include MongoDoc::Document
-          has_many :subdoc, :class_name => 'SubHasManyBsonDoc'
+          embed_many :subdoc, :class_name => 'SubEmbedManyBsonDoc'
         end
 
         it "#to_bson renders a bson representation of the document" do
-          doc = TestHasManyBsonDoc.new
-          subdoc = SubHasManyBsonDoc.new(:attr => "value")
+          doc = TestEmbedManyBsonDoc.new
+          subdoc = SubEmbedManyBsonDoc.new(:attr => "value")
           bson = doc.to_bson
           bson["subdoc"] = [subdoc].to_bson
           doc.subdoc = subdoc
@@ -583,14 +583,14 @@ describe "MongoDoc::Document" do
         end
 
         it "roundtrips" do
-          doc = TestHasManyBsonDoc.new
-          subdoc = SubHasManyBsonDoc.new(:attr => "value")
+          doc = TestEmbedManyBsonDoc.new
+          subdoc = SubEmbedManyBsonDoc.new(:attr => "value")
           doc.subdoc = subdoc
           MongoDoc::BSON.decode(doc.to_bson).should == doc
         end
 
         it "roundtrips the proxy" do
-          doc = TestHasManyBsonDoc.new(:subdoc => SubHasManyBsonDoc.new(:attr => "value"))
+          doc = TestEmbedManyBsonDoc.new(:subdoc => SubEmbedManyBsonDoc.new(:attr => "value"))
           MongoDoc::Associations::CollectionProxy.should === MongoDoc::BSON.decode(doc.to_bson).subdoc
         end
       end

data/spec/embedded_save_spec.rb

@@ -4,19 +4,19 @@ describe "Saving embedded documents" do
   class NestedDocsRoot
     include MongoDoc::Document
 
-    has_many :nested_children
+    embed_many :nested_children
   end
 
   class NestedChild
     include MongoDoc::Document
 
-    has_one :leaf
+    embed :leaf
   end
 
   class LeafDoc
     include MongoDoc::Document
 
-    key :data
+    attr_accessor :data
   end
 
   let(:leaf) do
@@ -42,7 +42,7 @@ describe "Saving embedded documents" do
   end
 
   context "update_attributes naive" do
-    context "with no has_many, update_attributes" do
+    context "with no embed_many, update_attributes" do
       let(:root) { NestedChild.new(:leaf => leaf) }
 
       it "calls the root document's _naive_update_attributes with a full attribute path and not safe" do
@@ -56,7 +56,7 @@ describe "Saving embedded documents" do
       end
     end
 
-    context "with has_many, update_attributes" do
+    context "with embed_many, update_attributes" do
       let(:root) { NestedDocsRoot.new(:nested_children => [NestedChild.new(:leaf => leaf)]) }
 
       it "calls the root document's _naive_update_attributes with a full attribute path and not safe" do
@@ -78,7 +78,7 @@ describe "Saving embedded documents" do
       leaf.stub(:_id).and_return(leaf_id)
     end
 
-    context "with no has_many, update_attributes" do
+    context "with no embed_many, update_attributes" do
       let(:root) { NestedChild.new(:leaf => leaf) }
 
       it "calls the root document's _strict_update_attributes with a full attribute path and not safe" do
@@ -92,7 +92,7 @@ describe "Saving embedded documents" do
       end
     end
 
-    context "with has_many, update_attributes" do
+    context "with embed_many, update_attributes" do
       let(:root) { NestedDocsRoot.new(:nested_children => [NestedChild.new(:leaf => leaf)]) }
 
       it "calls the root document's _naive_update_attributes with a full attribute path and not safe" do

data/spec/finders_spec.rb

@@ -4,7 +4,7 @@ describe MongoDoc::Finders do
   class FindersTest
     include MongoDoc::Document
 
-    key :data
+    attr_accessor :data
   end
 
   let(:criteria) { stub('criteria').as_null_object }

data/spec/new_record_spec.rb

@@ -8,10 +8,10 @@ describe "MongoDoc::Document _id and #new_record?" do
   class Parent
     include MongoDoc::Document
 
-    has_one :child
-    has_many :children
+    embed :child
+    embed_many :children
 
-    key :data
+    attr_accessor :data
 
     validates_presence_of :data
   end
@@ -20,7 +20,7 @@ describe "MongoDoc::Document _id and #new_record?" do
   let(:collection) { stub('collection', :save => id) }
   let(:child) { Child.new }
 
-  context "as a has_one child" do
+  context "as a embed child" do
     it "when added to the parent is a new record" do
       Parent.new(:data => 'data', :child => child)
       child.should be_new_record
@@ -70,7 +70,7 @@ describe "MongoDoc::Document _id and #new_record?" do
     end
   end
 
-  context "as a has_many child" do
+  context "as a embed_many child" do
     it "when added to the parent is a new record" do
       parent = Parent.new(:data => 'data')
       parent.children << child

data/spec/scope_spec.rb

@@ -11,8 +11,8 @@ describe MongoDoc::Scope do
   class ScopeTest
     include MongoDoc::Document
 
-    key :active
-    key :count
+    attr_accessor :active
+    attr_accessor :count
 
     scope :active, where(:active => true)
     scope :count_lte_one, where(:count.lte => 1) do

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 2
-  version: 0.3.2
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Les Hill
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-11 00:00:00 -05:00
+date: 2010-03-13 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -160,6 +160,7 @@ files:
 - features/support/support.rb
 - features/using_criteria.feature
 - lib/mongo_doc.rb
+- lib/mongo_doc/associations.rb
 - lib/mongo_doc/associations/collection_proxy.rb
 - lib/mongo_doc/associations/document_proxy.rb
 - lib/mongo_doc/associations/hash_proxy.rb
@@ -225,6 +226,7 @@ files:
 - spec/associations/collection_proxy_spec.rb
 - spec/associations/document_proxy_spec.rb
 - spec/associations/hash_proxy_spec.rb
+- spec/associations_spec.rb
 - spec/attributes_accessor_spec.rb
 - spec/attributes_spec.rb
 - spec/bson_matchers.rb
@@ -285,6 +287,7 @@ test_files:
 - spec/associations/collection_proxy_spec.rb
 - spec/associations/document_proxy_spec.rb
 - spec/associations/hash_proxy_spec.rb
+- spec/associations_spec.rb
 - spec/attributes_accessor_spec.rb
 - spec/attributes_spec.rb
 - spec/bson_matchers.rb