mongo_mapper 0.12.0 → 0.13.0.beta1

data/{test/functional/test_document.rb → spec/functional/document_spec.rb}

@@ -1,8 +1,8 @@
-require 'test_helper'
-require 'models'
+require 'spec_helper'
+require 'support/models'
 
-class DocumentTest < Test::Unit::TestCase
-  def setup
+describe "Document" do
+  before do
     @document = Doc do
       key :first_name, String
       key :last_name, String
@@ -12,22 +12,22 @@ class DocumentTest < Test::Unit::TestCase
   end
 
   context "array key" do
-    setup do
+    before do
       @document.key :tags, Array
     end
 
-    should "give correct default" do
+    it "should give correct default" do
       doc = @document.new
       doc.tags.should == []
     end
 
-    should "work with assignment" do
+    it "should work with assignment" do
       doc = @document.new
       doc.tags = %w(foo bar)
       doc.tags.should == %w(foo bar)
     end
 
-    should "work with assignment after saving" do
+    it "should work with assignment after saving" do
       doc = @document.new
       doc.tags = %w(foo bar)
       doc.save
@@ -35,20 +35,20 @@ class DocumentTest < Test::Unit::TestCase
       doc.reload.tags.should == %w(foo bar)
     end
 
-    should "work with assignment then <<" do
+    it "should work with assignment then <<" do
       doc = @document.new
       doc.tags = []
       doc.tags << "foo"
       doc.tags.should == ["foo"]
     end
 
-    should "work with <<" do
+    it "should work with <<" do
       doc = @document.new
       doc.tags << "foo"
       doc.tags.should == ["foo"]
     end
 
-    should "work with << then save" do
+    it "should work with << then save" do
       doc = @document.new
       doc.tags << "foo"
       doc.tags << "bar"
@@ -59,30 +59,30 @@ class DocumentTest < Test::Unit::TestCase
   end
 
   context "hash key" do
-    setup do
+    before do
       @document.key :foo, Hash
     end
 
-    should "give correct default" do
+    it "should give correct default" do
       doc = @document.new
       doc.foo.should == {}
     end
 
-    should "work with []=" do
+    it "should work with []=" do
       doc = @document.new
       doc.foo["quux"] = "bar"
       doc.foo["quux"].should == "bar"
       doc.foo.should == { "quux" => "bar" }
     end
 
-    should "work with indifferent access" do
+    it "should work with indifferent access" do
       doc = @document.new
       doc.foo = {:baz => 'bar'}
       doc.foo[:baz].should == 'bar'
       doc.foo['baz'].should == 'bar'
     end
 
-    should "work with indifferent access after save" do
+    it "should work with indifferent access after save" do
       doc = @document.new
       doc.foo = {:baz => 'bar'}
       doc.save
@@ -94,17 +94,17 @@ class DocumentTest < Test::Unit::TestCase
   end
 
   context "custom type key with default" do
-    setup do
+    before do
       @document.key :window, WindowSize, :default => WindowSize.new(600, 480)
     end
 
-    should "default to default" do
+    it "should default to default" do
       doc = @document.new
       doc.window.should == WindowSize.new(600, 480)
 
     end
 
-    should "save and load from mongo" do
+    it "should save and load from mongo" do
       doc = @document.new
       doc.save
 
@@ -114,74 +114,74 @@ class DocumentTest < Test::Unit::TestCase
   end
 
   context "key with proc default value" do
-    setup do
+    before do
       @document.key :proc_default, String, :default => lambda { return 'string' }
     end
 
-    should "detect and run proc default" do
+    it "should detect and run proc default" do
       doc = @document.new
       doc.proc_default.should == 'string'
     end
 
-    should "save and load from mongo" do
+    it "should save and load from mongo" do
       doc = @document.create
       doc = doc.reload
       doc.proc_default.should == 'string'
     end
   end
 
-  should "have instance method for collection" do
+  it "should have instance method for collection" do
     @document.new.collection.name.should == @document.collection.name
   end
 
-  should "have instance method for database" do
+  it "should have instance method for database" do
     @document.new.database.should == @document.database
   end
 
   context "#destroyed?" do
-    setup do
+    before do
       @doc1 = @document.create(:first_name => 'John', :last_name => 'Nunemaker', :age => '27')
     end
 
-    should "be true if deleted" do
+    it "should be true if deleted" do
       @doc1.delete
-      assert @doc1.destroyed?
+      @doc1.should be_destroyed
     end
 
-    should "be true if destroyed" do
+    it "should be true if destroyed" do
       @doc1.destroy
-      assert @doc1.destroyed?
+      @doc1.should be_destroyed
     end
 
-    should "be false if not deleted or destroyed" do
-      assert ! @doc1.destroyed?
+    it "should be false if not deleted or destroyed" do
+      @doc1.should_not be_destroyed
     end
   end
 
   context "#persisted?" do
-    setup do
+    before do
       @doc = @document.new(:first_name => 'John', :last_name => 'Nunemaker', :age => '27')
     end
 
-    should "be false if new" do
+    it "should be false if new" do
       @doc.should_not be_persisted
     end
 
-    should "be false if destroyed" do
+    it "should be false if destroyed" do
       @doc.save
       @doc.destroy
       @doc.should be_destroyed
       @doc.should_not be_persisted
     end
 
-    should "be true if not new or destroyed" do
+    it "should be true if not new or destroyed" do
       @doc.save
       @doc.should be_persisted
     end
   end
 
   context "#reload" do
-    setup do
+    before do
       @foo_class = Doc do
         key :name
       end
@@ -204,56 +204,56 @@ class DocumentTest < Test::Unit::TestCase
       })
     end
 
-    should "reload keys from the database" do
+    it "should reload keys from the database" do
       @instance.age = 37
       @instance.age.should == 37
       @instance.reload
       @instance.age.should == 39
     end
 
-    should "reset many associations" do
-      @instance.foos.expects(:reset).at_least_once
-      @instance.bars.expects(:reset).at_least_once
+    it "should reset many associations" do
+      @instance.foos.should_receive(:reset).at_least(1).times
+      @instance.bars.should_receive(:reset).at_least(1).times
       @instance.reload
     end
 
-    should "reset belongs_to association" do
+    it "should reset belongs_to association" do
       @instance.foo = nil
       @instance.reload
       @instance.foo.should_not be_nil
     end
 
-    should "reset one association" do
+    it "should reset one association" do
       @instance.bar = nil
       @instance.reload
       @instance.bar.should_not be_nil
     end
 
-    should "reset nil one association" do
+    it "should reset nil one association" do
     end
 
-    should "reinstantiate embedded associations" do
+    it "should reinstantiate embedded associations" do
       @instance.reload
       @instance.bars.first.name.should == '1'
     end
 
-    should "return self" do
+    it "should return self" do
       @instance.reload.object_id.should == @instance.object_id
     end
 
-    should "raise DocumentNotFound if not found" do
+    it "should raise DocumentNotFound if not found" do
       @instance.destroy
-      assert_raises(MongoMapper::DocumentNotFound) { @instance.reload }
+      expect { @instance.reload }.to raise_error(MongoMapper::DocumentNotFound)
     end
 
-    should "clear keys that were removed from the database" do
+    it "should clear keys that were removed from the database" do
       @instance.unset(:age)
       @instance.reload.age.should be_nil
     end
   end
 
   context "database has keys not defined in model" do
-    setup do
+    before do
       @id = BSON::ObjectId.new
       @document.collection.insert({
         :_id            => @id,
@@ -265,7 +265,7 @@ class DocumentTest < Test::Unit::TestCase
       })
     end
 
-    should "assign all keys from database" do
+    it "should assign all keys from database" do
       doc = @document.find(@id)
       doc.first_name.should == 'John'
       doc.last_name.should == 'Nunemaker'
@@ -275,8 +275,8 @@ class DocumentTest < Test::Unit::TestCase
     end
   end
 
-  should "not walk ObjectSpace when creating a model" do
-    ObjectSpace.expects(:each_object).never
+  it "should not walk ObjectSpace when creating a model" do
+    ObjectSpace.should_receive(:each_object).never
     Doc()
   end
 end

data/spec/functional/dumpable_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+require 'active_support/cache/memory_store'
+
+describe "Documents with the Dumpable plugin" do
+  let(:doc) { Doc { key :foo, String } }
+  let(:answer) { Answer.create(:body => "answer body") }
+  let(:store)  { ActiveSupport::Cache::MemoryStore.new(:size => 1.megabyte) }
+
+  it "should be able to be marshalled" do
+    expect { Marshal.dump(answer) }.to_not raise_error
+  end
+
+  it "should be able to be unmarshalled" do
+    dumped = Marshal.dump(answer)
+    reconstituted_answer = Marshal.load(dumped)
+    reconstituted_answer.attributes.should == answer.attributes
+  end
+
+  it "should be able to be saved in a Rails cache" do
+    fetched = store.fetch("foo") { Answer.find(answer._id) }
+    fetched.body.should == "answer body"
+    fetched._id.should == answer._id
+  end
+end

data/{test/functional/test_dynamic_querying.rb → spec/functional/dynamic_querying_spec.rb}

@@ -1,7 +1,7 @@
-require 'test_helper'
+require 'spec_helper'
 
-class DynamicQueryingTest < Test::Unit::TestCase
-  def setup
+describe "Dynamic Querying" do
+  before do
     @document = Doc do
       scope :nunes, where(:last_name => 'Nunemaker')
 
@@ -16,59 +16,59 @@ class DynamicQueryingTest < Test::Unit::TestCase
     @doc3 = @document.create(:first_name => 'Steph',  :last_name => 'Nunemaker', :age => 26)
   end
 
-  should "find document based on argument" do
+  it "should find document based on argument" do
     @document.find_by_first_name('John').should == @doc1
     @document.find_by_last_name('Nunemaker', :order => 'age desc').should == @doc1
     @document.find_by_age(27).should == @doc1
   end
 
-  should "not raise error" do
+  it "should not raise error" do
     @document.find_by_first_name('Mongo').should be_nil
   end
 
-  should "define a method for each key" do
+  it "should define a method for each key" do
     @document.methods(false).select { |e| e =~ /^find_by_/ }.size == @document.keys.size
   end
 
-  should "find document based on all arguments" do
+  it "should find document based on all arguments" do
     @document.find_by_first_name_and_last_name_and_age('John', 'Nunemaker', 27).should == @doc1
   end
 
-  should "not find the document if an argument is wrong" do
+  it "should not find the document if an argument is wrong" do
     @document.find_by_first_name_and_last_name_and_age('John', 'Nunemaker', 28).should be_nil
   end
 
-  should "find all documents based on arguments" do
+  it "should find all documents based on arguments" do
     docs = @document.find_all_by_last_name('Nunemaker')
     docs.should be_kind_of(Array)
     docs.should include(@doc1)
     docs.should include(@doc3)
   end
 
-  should "initialize document with given arguments" do
+  it "should initialize document with given arguments" do
     doc = @document.find_or_initialize_by_first_name_and_last_name('David', 'Cuadrado')
     doc.should be_new
     doc.first_name.should == 'David'
   end
 
-  should "not initialize document if document is found" do
+  it "should not initialize document if document is found" do
     doc = @document.find_or_initialize_by_first_name('John')
     doc.should_not be_new
   end
 
-  should "create document with given arguments" do
+  it "should create document with given arguments" do
     doc = @document.find_or_create_by_first_name_and_last_name('David', 'Cuadrado')
     doc.should_not be_new
     doc.first_name.should == 'David'
   end
 
-  should "raise error if document is not found when using !" do
+  it "should raise error if document is not found when using !" do
     lambda {
       @document.find_by_first_name_and_last_name!(1,2)
     }.should raise_error(MongoMapper::DocumentNotFound)
   end
 
-  should "work on scopes" do
+  it "should work on scopes" do
     @document.nunes.find_by_first_name('Steph').should == @doc3
     @document.nunes.find_all_by_first_name('Steph').should == [@doc3]
   end

data/{test/functional/test_embedded_document.rb → spec/functional/embedded_document_spec.rb}

@@ -1,8 +1,8 @@
-require 'test_helper'
-require 'models'
+require 'spec_helper'
+require 'support/models'
 
-class EmbeddedDocumentTest < Test::Unit::TestCase
-  def setup
+describe "EmbeddedDocument" do
+  before do
     @klass = Doc('Person') do
       key :name, String
     end
@@ -20,11 +20,11 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
   end
 
   context "Saving a document with a key that is an embedded document" do
-    setup do
+    before do
       @klass.key :foo, @address_class
     end
 
-    should "embed embedded document" do
+    it "should embed embedded document" do
       address = @address_class.new(:city => 'South Bend', :state => 'IN')
       doc = @klass.create(:foo => address)
       doc.foo.city.should == 'South Bend'
@@ -35,7 +35,7 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       doc.foo.state.should == 'IN'
     end
 
-    should "assign _parent_document and _root_document" do
+    it "should assign _parent_document and _root_document" do
       address = @address_class.new(:city => 'South Bend', :state => 'IN')
       address._parent_document.should be_nil
       doc = @klass.create(:foo => address)
@@ -43,7 +43,7 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       address._root_document.should be(doc)
     end
 
-    should "assign _parent_document and _root_document when loading" do
+    it "should assign _parent_document and _root_document when loading" do
       address = @address_class.new(:city => 'South Bend', :state => 'IN')
       doc = @klass.create(:foo => address)
       doc.reload
@@ -52,7 +52,7 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
     end
   end
 
-  should "correctly instantiate single collection inherited embedded documents" do
+  it "should correctly instantiate single collection inherited embedded documents" do
     document = Doc('Foo') do
       key :message, Message
     end
@@ -62,24 +62,24 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
   end
 
   context "new? (embedded key)" do
-    setup do
+    before do
       @klass.key :foo, @address_class
     end
 
-    should "be true until document is created" do
+    it "should be true until document is created" do
       address = @address_class.new(:city => 'South Bend', :state => 'IN')
       doc = @klass.new(:foo => address)
       address.new?.should be_true
     end
 
-    should "be false after document is saved" do
+    it "should be false after document is saved" do
       address = @address_class.new(:city => 'South Bend', :state => 'IN')
       doc = @klass.new(:foo => address)
       doc.save
       doc.foo.new?.should be_false
     end
 
-    should "be false when loaded from database" do
+    it "should be false when loaded from database" do
       address = @address_class.new(:city => 'South Bend', :state => 'IN')
       doc = @klass.new(:foo => address)
       doc.save
@@ -90,28 +90,28 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
   end
 
   context "new? (embedded many association)" do
-    setup do
+    before do
       @doc = @klass.new(:pets => [{:name => 'poo bear'}])
     end
 
-    should "be true until document is saved" do
+    it "should be true until document is saved" do
       @doc.should be_new
       @doc.pets.first.should be_new
     end
 
-    should "be false after document is saved" do
+    it "should be false after document is saved" do
       @doc.save
       @doc.pets.first.should_not be_new
     end
 
-    should "be false when loaded from database" do
+    it "should be false when loaded from database" do
       @doc.save
       @doc.pets.first.should_not be_new
       @doc.reload
       @doc.pets.first.should_not be_new
     end
 
-    should "be true until existing document is saved" do
+    it "should be true until existing document is saved" do
       @doc.save
       pet = @doc.pets.build(:name => 'Rasmus')
       pet.new?.should be_true
@@ -121,14 +121,14 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
   end
 
   context "new? (nested embedded many association)" do
-    setup do
+    before do
       @pet_klass.many :addresses, :class=> @address_class
       @doc = @klass.new
       @doc.pets.build(:name => 'Rasmus')
       @doc.save
     end
 
-    should "be true until existing document is saved" do
+    it "should be true until existing document is saved" do
       address = @doc.pets.first.addresses.build(:city => 'Holland', :state => 'MI')
       address.new?.should be_true
       @doc.save
@@ -137,12 +137,12 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
   end
 
   context "new? (embedded one association)" do
-    setup do
+    before do
       @klass.one :address, :class => @address_class
       @doc = @klass.new
     end
 
-    should "be true until existing document is saved" do
+    it "should be true until existing document is saved" do
       @doc.save
       @doc.build_address(:city => 'Holland', :state => 'MI')
       @doc.address.new?.should be_true
@@ -152,14 +152,14 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
   end
 
   context "new? (nested embedded one association)" do
-    setup do
+    before do
       @pet_klass.one :address, :class => @address_class
       @doc = @klass.new
       @doc.pets.build(:name => 'Rasmus')
       @doc.save
     end
 
-    should "be true until existing document is saved" do
+    it "should be true until existing document is saved" do
       address = @doc.pets.first.build_address(:city => 'Holland', :stats => 'MI')
       address.new?.should be_true
       @doc.save
@@ -168,16 +168,16 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
   end
 
   context "#destroyed?" do
-    setup do
+    before do
       @doc = @klass.create(:pets => [@pet_klass.new(:name => 'sparky')])
     end
 
-    should "be false if root document is not destroyed" do
+    it "should be false if root document is not destroyed" do
       @doc.should_not be_destroyed
       @doc.pets.first.should_not be_destroyed
     end
 
-    should "be true if root document is destroyed" do
+    it "should be true if root document is destroyed" do
       @doc.destroy
       @doc.should be_destroyed
       @doc.pets.first.should be_destroyed
@@ -185,28 +185,28 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
   end
 
   context "#persisted?" do
-    setup do
+    before do
       @doc = @klass.new(:name => 'persisted doc', :pets => [@pet_klass.new(:name => 'persisted pet')])
     end
 
-    should "be false if new" do
+    it "should be false if new" do
       @doc.pets.first.should_not be_persisted
     end
 
-    should "be false if destroyed" do
+    it "should be false if destroyed" do
       @doc.save
       @doc.destroy
       @doc.pets.first.should be_destroyed
       @doc.pets.first.should_not be_persisted
     end
 
-    should "be true if not new or destroyed" do
+    it "should be true if not new or destroyed" do
       @doc.save
       @doc.pets.first.should be_persisted
     end
   end
 
-  should "be able to save" do
+  it "should be able to save" do
     person = @klass.create
 
     pet = @pet_klass.new(:name => 'sparky')
@@ -219,18 +219,18 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
     person.pets.first.should == pet
   end
 
-  should "be able to save!" do
+  it "should be able to save!" do
     person = @klass.create
 
     pet = @pet_klass.new(:name => 'sparky')
     person.pets << pet
     pet.should be_new
 
-    person.expects(:save!)
+    person.should_receive(:save!)
     pet.save!
   end
 
-  should "be able to dynamically add new keys and save" do
+  it "should be able to dynamically add new keys and save" do
     person = @klass.create
 
     pet = @pet_klass.new(:name => 'sparky', :crazy_key => 'crazy')
@@ -241,7 +241,7 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
     person.pets.first.crazy_key.should == 'crazy'
   end
 
-  should "be able to update_attribute" do
+  it "should be able to update_attribute" do
     pet = @pet_klass.new(:name => 'sparky')
     person = @klass.create(:pets => [pet])
     person.reload
@@ -253,7 +253,7 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
     person.pets.first.name.should == 'koda'
   end
 
-  should "be able to update_attributes" do
+  it "should be able to update_attributes" do
     pet = @pet_klass.new(:name => 'sparky')
     person = @klass.create(:pets => [pet])
     person.reload
@@ -265,24 +265,33 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
     person.pets.first.name.should == 'koda'
   end
 
-  should "be able to update_attributes!" do
+  it "should be able to update_attributes!" do
     person = @klass.create(:pets => [@pet_klass.new(:name => 'sparky')])
     person.reload
     pet = person.pets.first
 
     attributes = {:name => 'koda'}
-    pet.expects(:attributes=).with(attributes)
-    pet.expects(:save!)
+    pet.should_receive(:attributes=).with(attributes)
+    pet.should_receive(:save!)
     pet.update_attributes!(attributes)
   end
 
-  should "have database instance method that is equal to root document" do
+  it "should have database instance method that is equal to root document" do
     person = @klass.create(:pets => [@pet_klass.new(:name => 'sparky')])
     person.pets.first.database.should == person.database
   end
 
-  should "have collection instance method that is equal to root document" do
+  it "should have collection instance method that is equal to root document" do
     person = @klass.create(:pets => [@pet_klass.new(:name => 'sparky')])
     person.pets.first.collection.name.should == person.collection.name
   end
+
+  it "should not fail if the source document contains nils in the embedded document list" do
+    @klass.collection.insert(:pets => [nil, {:name => "Sasha"}])
+    expect { @klass.all.first.pets }.to_not raise_error
+    @klass.all.first.pets.tap do |pets|
+      pets.length.should == 1
+      pets[0].name.should == "Sasha"
+    end
+  end
 end