mongomodel 0.4.9 → 0.5.0

data/lib/mongomodel/version.rb

@@ -1,3 +1,3 @@
 module MongoModel
-  VERSION = "0.4.9"
+  VERSION = "0.5.0"
 end

data/spec/mongomodel/attributes/store_spec.rb

@@ -27,7 +27,7 @@ module MongoModel
       properties[:as]      = MongoModel::Properties::Property.new(:as, String, :as => '_custom_as')
       properties
     end
-    let(:instance) { mock('instance', :properties => properties) }
+    let(:instance) { double('instance', :properties => properties) }
     
     subject { Attributes::Store.new(instance) }
     
@@ -143,9 +143,9 @@ module MongoModel
           },
         :datetime =>
           {
-            Time.local(2008, 5, 14, 1, 2, 3, 123456) => Time.local(2008, 5, 14, 1, 2, 3, 0).to_datetime,
+            Time.local(2008, 5, 14, 1, 2, 3, 123456) => Time.local(2008, 5, 14, 1, 2, 3, 123000).to_datetime,
             Date.civil(2009, 11, 15)                 => DateTime.civil(2009, 11, 15, 0, 0, 0, 0),
-            "Sat Jan 01 20:15:01.123456 UTC 2000"    => DateTime.civil(2000, 1, 1, 20, 15, 1, 0),
+            "Sat Jan 01 20:15:01.123456 UTC 2000"    => DateTime.civil(2000, 1, 1, 20, 15, Rational(1123, 1000), 0),
             "2009/3/4"                               => DateTime.civil(2009, 3, 4, 0, 0, 0, 0),
             "09:34"                                  => lambda { |t| t.hour == 9 && t.min == 34 },
             "5:21pm"                                 => lambda { |t| t.hour == 17 && t.min == 21 },
@@ -291,13 +291,14 @@ module MongoModel
         subject[:array] = [ 123, 'abc', 45.67, true, :bar, CustomClass.new('custom in array') ]
         subject[:date] = Date.civil(2009, 11, 15)
         subject[:time] = Time.local(2008, 5, 14, 1, 2, 3, 4, 0.5)
+        subject[:datetime] = DateTime.civil(2000, 1, 1, 20, 15, Rational(1123456, 1000000), 0)
         subject[:rational] = Rational(2, 3)
         subject[:openstruct] = OpenStruct.new(:abc => 123)
         subject[:custom] = CustomClass.new('custom')
         subject[:as] = "As property"
         subject[:non_property] = "Hello World"
         subject[:custom_non_property] = CustomClass.new('custom non property')
-      
+        
         subject.to_mongo.should include({
           'string' => 'string',
           'integer' => 42,
@@ -307,7 +308,8 @@ module MongoModel
           'hash' => { :foo => 'bar', :custom => { :name => 'custom in hash' } },
           'array' => [ 123, 'abc', 45.67, true, :bar, { :name => 'custom in array' } ],
           'date' => "2009/11/15",
-          'time' => Time.local(2008, 5, 14, 1, 2, 3, 4, 0),
+          'time' => Time.local(2008, 5, 14, 1, 2, 3, 4, 0).utc,
+          'datetime' => Time.utc(2000, 1, 1, 20, 15, 1, 123000),
           'rational' => "2/3",
           'openstruct' => { :abc => 123 },
           'custom' => { :name => 'custom' },
@@ -328,6 +330,7 @@ module MongoModel
           'array' => [ 123, 'abc', 45.67, true, :bar ],
           'date' => Time.utc(2009, 11, 15),
           'time' => Time.local(2008, 5, 14, 1, 2, 3, 4, 0.5),
+          'datetime' => Time.utc(2000, 1, 1, 20, 15, 1, 123000),
           'rational' => "2/3",
           'openstruct' => { "foo" => "bar" },
           'custom' => { :name => 'custom' },
@@ -344,6 +347,7 @@ module MongoModel
         subject[:array].should == [ 123, 'abc', 45.67, true, :bar ]
         subject[:date].should == Date.civil(2009, 11, 15)
         subject[:time].should == Time.local(2008, 5, 14, 1, 2, 3, 4, 0)
+        subject[:datetime].should == DateTime.civil(2000, 1, 1, 20, 15, Rational(1123, 1000), 0)
         subject[:rational].should == Rational(2, 3)
         subject[:openstruct].should == OpenStruct.new(:foo => "bar")
         subject[:custom].should == CustomClass.new('custom')

data/spec/mongomodel/concerns/activemodel_spec.rb

@@ -1,22 +1,22 @@
 require 'spec_helper'
 
 module MongoModel
-  shared_examples_for "ActiveModel" do
-    require 'test/unit/assertions'
-    include Test::Unit::Assertions
-    
-    include ActiveModel::Lint::Tests
-    
-    ActiveModel::Lint::Tests.public_instance_methods.map{|m| m.to_s}.grep(/^test/).each do |m|
-      example m.gsub('_',' ') do
-        send m
+  specs_for(Document, EmbeddedDocument) do
+    shared_examples_for "ActiveModel" do
+      require 'test/unit/assertions'
+      include Test::Unit::Assertions
+
+      include ActiveModel::Lint::Tests
+
+      ActiveModel::Lint::Tests.public_instance_methods.map{|m| m.to_s}.grep(/^test/).each do |m|
+        example m.gsub('_',' ') do
+          send m
+        end
       end
+
+      let(:model) { subject }
     end
     
-    let(:model) { subject }
-  end
-  
-  specs_for(Document, EmbeddedDocument) do
     define_class(:TestModel, described_class)
     subject { TestModel.new }
         

data/spec/mongomodel/concerns/associations/belongs_to_spec.rb

@@ -1,77 +1,77 @@
 require 'spec_helper'
 
-module MongoModel
-  shared_examples_for "assigning correct class to belongs_to association" do
-    define_class(:User, Document)
-    define_class(:SpecialUser, :User)
+module MongoModel  
+  specs_for(Document, EmbeddedDocument) do
+    shared_examples_for "assigning correct class to belongs_to association" do
+      define_class(:User, Document)
+      define_class(:SpecialUser, :User)
 
-    let(:user) { User.create! }
-    let(:special_user) { SpecialUser.create! }
-    
-    context "when uninitialized" do
-      it "is nil" do
-        subject.user.should be_nil
-      end
-      
-      it "is settable" do
-        subject.user = user
-        subject.user.should == user
-      end
-      
-      it "is not truthy" do
-        subject.user.should_not be_truthy
-      end
-      
-      describe "setting a subclass type" do
-        it "sets successfully" do
-          subject.user = special_user
-          subject.user.should == special_user
+      let(:user) { User.create! }
+      let(:special_user) { SpecialUser.create! }
+
+      context "when uninitialized" do
+        it "is nil" do
+          subject.user.should be_nil
         end
-      end
-    end
-    
-    context "when loading from database" do
-      subject { Article.new(:user => user) }
-      
-      if specing?(EmbeddedDocument)
-        define_class(:ArticleParent, Document) do
-          property :article, Article
+
+        it "is settable" do
+          subject.user = user
+          subject.user.should == user
+        end
+
+        it "is not truthy" do
+          subject.user.should_not be_truthy
+        end
+
+        describe "setting a subclass type" do
+          it "sets successfully" do
+            subject.user = special_user
+            subject.user.should == special_user
+          end
         end
-        
-        let(:parent) { ArticleParent.create!(:article => subject) }
-        let(:reloaded) { ArticleParent.find(parent.id).article }
-      else
-        before(:each) { subject.save! }
-        let(:reloaded) { Article.find(subject.id) }
-      end
-      
-      it "accesses the user through the association" do
-        reloaded.user.should == user
-      end
-      
-      it "is truthy" do
-        subject.user.should be_truthy
-      end
-      
-      it "allows the user to be reloaded" do
-        user = reloaded.user.target
-        
-        user.should equal(reloaded.user.target)
-        user.should equal(reloaded.user.target)
-        user.should_not equal(reloaded.user(true).target)
       end
-      
-      describe "setting a subclass type" do
-        subject { Article.new(:user => special_user) }
-        
-        it "loads successfully" do
-          reloaded.user.should == special_user
+
+      context "when loading from database" do
+        subject { Article.new(:user => user) }
+
+        if specing?(EmbeddedDocument)
+          define_class(:ArticleParent, Document) do
+            property :article, Article
+          end
+
+          let(:parent) { ArticleParent.create!(:article => subject) }
+          let(:reloaded) { ArticleParent.find(parent.id).article }
+        else
+          before(:each) { subject.save! }
+          let(:reloaded) { Article.find(subject.id) }
+        end
+
+        it "accesses the user through the association" do
+          reloaded.user.should == user
+        end
+
+        it "is truthy" do
+          subject.user.should be_truthy
+        end
+
+        it "allows the user to be reloaded" do
+          user = reloaded.user.target
+
+          user.should equal(reloaded.user.target)
+          user.should equal(reloaded.user.target)
+          user.should_not equal(reloaded.user(true).target)
+        end
+
+        describe "setting a subclass type" do
+          subject { Article.new(:user => special_user) }
+
+          it "loads successfully" do
+            reloaded.user.should == special_user
+          end
         end
       end
     end
-  end
-  
-  specs_for(Document, EmbeddedDocument) do
+    
     describe "belongs_to association" do
       define_class(:Article, described_class) do
         belongs_to :user

data/spec/mongomodel/concerns/associations/has_many_by_ids_spec.rb

@@ -13,130 +13,130 @@ module MongoModel
     end
   end
   
-  shared_examples_for "accessing and manipulating a has_many :by => :ids association" do
-    it "accesses chapters" do
-      subject.chapters.should == [chapter1, chapter2]
-    end
-    
-    it "accesses chapter ids through association" do
-      subject.chapters.ids.should == [chapter1.id, chapter2.id]
-    end
-    
-    it "has chapter ids" do
-      subject.chapter_ids.should == [chapter1.id, chapter2.id]
-    end
-    
-    it "adds chapters with <<" do
-      subject.chapters << chapter3
-      subject.chapters.should == [chapter1, chapter2, chapter3]
-      subject.chapter_ids.should == [chapter1.id, chapter2.id, chapter3.id]
-    end
-    
-    it "adds/change chapters with []=" do
-      subject.chapters[2] = chapter3
-      subject.chapters.should == [chapter1, chapter2, chapter3]
-      subject.chapter_ids.should == [chapter1.id, chapter2.id, chapter3.id]
-    end
-    
-    it "adds chapters with concat" do
-      subject.chapters.concat([chapter3])
-      subject.chapters.should == [chapter1, chapter2, chapter3]
-      subject.chapter_ids.should == [chapter1.id, chapter2.id, chapter3.id]
-    end
-    
-    it "inserts chapters" do
-      subject.chapters.insert(1, chapter3)
-      subject.chapters.should == [chapter1, chapter3, chapter2]
-      subject.chapter_ids.should == [chapter1.id, chapter3.id, chapter2.id]
-    end
-    
-    it "replaces chapters" do
-      subject.chapters.replace([chapter2, chapter3])
-      subject.chapters.should == [chapter2, chapter3]
-      subject.chapter_ids.should == [chapter2.id, chapter3.id]
-    end
-    
-    it "adds chapters with push" do
-      subject.chapters.push(chapter3)
-      subject.chapters.should == [chapter1, chapter2, chapter3]
-      subject.chapter_ids.should == [chapter1.id, chapter2.id, chapter3.id]
-    end
-    
-    it "adds chapters with unshift" do
-      subject.chapters.unshift(chapter3)
-      subject.chapters.should == [chapter3, chapter1, chapter2]
-      subject.chapter_ids.should == [chapter3.id, chapter1.id, chapter2.id]
-    end
-    
-    it "clears chapters" do
-      subject.chapters.clear
-      subject.chapters.should be_empty
-      subject.chapter_ids.should be_empty
-    end
-    
-    it "removes chapters with delete" do
-      subject.chapters.delete(chapter1)
-      subject.chapters.should == [chapter2]
-      subject.chapter_ids.should == [chapter2.id]
-    end
-    
-    it "removes chapters with delete_at" do
-      subject.chapters.delete_at(0)
-      subject.chapters.should == [chapter2]
-      subject.chapter_ids.should == [chapter2.id]
-    end
-    
-    it "removes chapters with delete_if" do
-      subject.chapters.delete_if { |c| c.id == chapter1.id }
-      subject.chapters.should == [chapter2]
-      subject.chapter_ids.should == [chapter2.id]
-    end
-    
-    it "builds a chapter" do
-      chapter4 = subject.chapters.build(:id => '4')
-      subject.chapters.should == [chapter1, chapter2, chapter4]
-      subject.chapter_ids.should == [chapter1.id, chapter2.id, chapter4.id]
-      
-      chapter4.should be_a_new_record
-      chapter4.id.should == '4'
-    end
-    
-    it "creates a chapter" do
-      chapter4 = subject.chapters.create(:id => '4')
-      subject.chapters.should == [chapter1, chapter2, chapter4]
-      subject.chapter_ids.should == [chapter1.id, chapter2.id, chapter4.id]
-      
-      chapter4.should_not be_a_new_record
-      chapter4.id.should == '4'
-    end
-    
-    it "finds chapters" do
-      # Create bogus chapters
-      Chapter.create!(:id => '999')
-      Chapter.create!(:id => '998')
-      
-      result = subject.chapters.order(:id.desc)
-      result.should == [chapter2, chapter1]
-    end
-    
-    describe "adding a non-chapter" do
-      def self.should_raise(message, &block)
-        it "raises an AsssociationTypeMismatch error when #{message}" do
-          lambda { instance_eval(&block) }.should raise_error(AssociationTypeMismatch, "expected instance of Chapter but got NonChapter")
+  specs_for(Document, EmbeddedDocument) do
+    shared_examples_for "accessing and manipulating a has_many :by => :ids association" do
+      it "accesses chapters" do
+        subject.chapters.should == [chapter1, chapter2]
+      end
+
+      it "accesses chapter ids through association" do
+        subject.chapters.ids.should == [chapter1.id, chapter2.id]
+      end
+
+      it "has chapter ids" do
+        subject.chapter_ids.should == [chapter1.id, chapter2.id]
+      end
+
+      it "adds chapters with <<" do
+        subject.chapters << chapter3
+        subject.chapters.should == [chapter1, chapter2, chapter3]
+        subject.chapter_ids.should == [chapter1.id, chapter2.id, chapter3.id]
+      end
+
+      it "adds/change chapters with []=" do
+        subject.chapters[2] = chapter3
+        subject.chapters.should == [chapter1, chapter2, chapter3]
+        subject.chapter_ids.should == [chapter1.id, chapter2.id, chapter3.id]
+      end
+
+      it "adds chapters with concat" do
+        subject.chapters.concat([chapter3])
+        subject.chapters.should == [chapter1, chapter2, chapter3]
+        subject.chapter_ids.should == [chapter1.id, chapter2.id, chapter3.id]
+      end
+
+      it "inserts chapters" do
+        subject.chapters.insert(1, chapter3)
+        subject.chapters.should == [chapter1, chapter3, chapter2]
+        subject.chapter_ids.should == [chapter1.id, chapter3.id, chapter2.id]
+      end
+
+      it "replaces chapters" do
+        subject.chapters.replace([chapter2, chapter3])
+        subject.chapters.should == [chapter2, chapter3]
+        subject.chapter_ids.should == [chapter2.id, chapter3.id]
+      end
+
+      it "adds chapters with push" do
+        subject.chapters.push(chapter3)
+        subject.chapters.should == [chapter1, chapter2, chapter3]
+        subject.chapter_ids.should == [chapter1.id, chapter2.id, chapter3.id]
+      end
+
+      it "adds chapters with unshift" do
+        subject.chapters.unshift(chapter3)
+        subject.chapters.should == [chapter3, chapter1, chapter2]
+        subject.chapter_ids.should == [chapter3.id, chapter1.id, chapter2.id]
+      end
+
+      it "clears chapters" do
+        subject.chapters.clear
+        subject.chapters.should be_empty
+        subject.chapter_ids.should be_empty
+      end
+
+      it "removes chapters with delete" do
+        subject.chapters.delete(chapter1)
+        subject.chapters.should == [chapter2]
+        subject.chapter_ids.should == [chapter2.id]
+      end
+
+      it "removes chapters with delete_at" do
+        subject.chapters.delete_at(0)
+        subject.chapters.should == [chapter2]
+        subject.chapter_ids.should == [chapter2.id]
+      end
+
+      it "removes chapters with delete_if" do
+        subject.chapters.delete_if { |c| c.id == chapter1.id }
+        subject.chapters.should == [chapter2]
+        subject.chapter_ids.should == [chapter2.id]
+      end
+
+      it "builds a chapter" do
+        chapter4 = subject.chapters.build(:id => '4')
+        subject.chapters.should == [chapter1, chapter2, chapter4]
+        subject.chapter_ids.should == [chapter1.id, chapter2.id, chapter4.id]
+
+        chapter4.should be_a_new_record
+        chapter4.id.should == '4'
+      end
+
+      it "creates a chapter" do
+        chapter4 = subject.chapters.create(:id => '4')
+        subject.chapters.should == [chapter1, chapter2, chapter4]
+        subject.chapter_ids.should == [chapter1.id, chapter2.id, chapter4.id]
+
+        chapter4.should_not be_a_new_record
+        chapter4.id.should == '4'
+      end
+
+      it "finds chapters" do
+        # Create bogus chapters
+        Chapter.create!(:id => '999')
+        Chapter.create!(:id => '998')
+
+        result = subject.chapters.order(:id.desc)
+        result.should == [chapter2, chapter1]
+      end
+
+      describe "adding a non-chapter" do
+        def self.should_raise(message, &block)
+          it "raises an AsssociationTypeMismatch error when #{message}" do
+            lambda { instance_eval(&block) }.should raise_error(AssociationTypeMismatch, "expected instance of Chapter but got NonChapter")
+          end
         end
+
+        should_raise("assigning an array containing non-chapters") { subject.chapters = [nonchapter] }
+        should_raise("adding a non-chapter using <<") { subject.chapters << nonchapter }
+        should_raise("adding non-chapters with concat") { subject.chapters.concat([nonchapter]) }
+        should_raise("inserting chapters") { subject.chapters.insert(1, nonchapter) }
+        should_raise("replacing chapters") { subject.chapters.replace([nonchapter]) }
+        should_raise("addding chapters with push") { subject.chapters.push(nonchapter) }
+        should_raise("addding chapters with unshift") { subject.chapters.unshift(nonchapter) }
       end
-      
-      should_raise("assigning an array containing non-chapters") { subject.chapters = [nonchapter] }
-      should_raise("adding a non-chapter using <<") { subject.chapters << nonchapter }
-      should_raise("adding non-chapters with concat") { subject.chapters.concat([nonchapter]) }
-      should_raise("inserting chapters") { subject.chapters.insert(1, nonchapter) }
-      should_raise("replacing chapters") { subject.chapters.replace([nonchapter]) }
-      should_raise("addding chapters with push") { subject.chapters.push(nonchapter) }
-      should_raise("addding chapters with unshift") { subject.chapters.unshift(nonchapter) }
     end
-  end
-  
-  specs_for(Document, EmbeddedDocument) do
+    
     describe "has_many :by => :ids association" do
       define_class(:Chapter, Document)
       define_class(:IllustratedChapter, :Chapter)
@@ -186,6 +186,13 @@ module MongoModel
         end
         
         it_should_behave_like "accessing and manipulating a has_many :by => :ids association"
+        
+        context "when child objects are destroyed" do
+          it "does not load the deleted child objects" do
+            chapter1.destroy
+            subject.chapters.should === [chapter2]
+          end
+        end
       end
       
       describe "with :dependent => :destroy option" do