mrkurt-mongo_mapper 0.6.9 → 0.6.10

data/VERSION

@@ -1 +1 @@
-0.6.9
+0.6.10

data/lib/mongo_mapper/associations.rb

@@ -40,6 +40,12 @@ module MongoMapper
             value
           end
           
+          if association.one? || association.belongs_to?
+            define_method("#{association.name}?") do
+              get_proxy(association).present?
+            end
+          end
+          
           if association.options[:dependent] && association.many? && !association.embeddable?
             after_destroy do |doc|
               case association.options[:dependent]

data/lib/mongo_mapper/associations/one_proxy.rb

@@ -16,31 +16,34 @@ module MongoMapper
       def replace(doc)
         load_target
         
-        if !@target.nil? && @target != doc
-          if options[:dependent] && !@target.new?
+        if !target.nil? && target != doc
+          if options[:dependent] && !target.new?
             case options[:dependent]
               when :delete
-                @target.delete
+                target.delete
               when :destroy
-                @target.destroy
+                target.destroy
               when :nullify
-                @target[foreign_key] = nil
-                @target.save
+                target[foreign_key] = nil
+                target.save
             end
           end
         end
         
-        if doc
+        reset
+        
+        unless doc.nil?
           owner.save if owner.new?
           doc[foreign_key] = owner.id
           doc.save if doc.new?
-          reset
+          loaded
+          @target = doc
         end
       end
 
       protected
         def find_target
-          target_class.first(foreign_key => owner.id)
+          target_class.first(reflection.finder_options.merge(foreign_key => owner.id))
         end
         
         def instantiate_target(instantiator, attrs={})
@@ -50,7 +53,7 @@ module MongoMapper
         end
         
         def target_class
-          @target_class ||= options[:class] || (options[:class_name] || association.name.to_s.camelize).constantize
+          @target_class ||= options[:class] || (options[:class_name] || reflection.name.to_s.camelize).constantize
         end
         
         def foreign_key

data/lib/mongo_mapper/associations/proxy.rb

@@ -17,7 +17,7 @@ module MongoMapper
       delegate :collection, :to => :klass
       
       def initialize(owner, reflection)
-        @owner, @reflection = owner, reflection
+        @owner, @reflection, @loaded = owner, reflection, false
         Array(reflection.options[:extend]).each { |ext| proxy_extend(ext) }
         reset
       end
@@ -45,6 +45,11 @@ module MongoMapper
         target.blank?
       end
       
+      def present?
+        load_target
+        target.present?
+      end
+      
       def reload
         reset
         load_target
@@ -57,7 +62,7 @@ module MongoMapper
 
       def reset
         @loaded = false
-        target = nil
+        @target = nil
       end
 
       def respond_to?(*args)

data/lib/mongo_mapper/document.rb

@@ -437,7 +437,7 @@ module MongoMapper
       def prep_lock_version
         if lock_version_field
           old = read_attribute(lock_version_field)
-          v = Time.now.to_f
+          v = (Time.now.to_f * 1000).ceil.to_s
           write_attribute lock_version_field, v
           old
         else
@@ -472,6 +472,7 @@ module MongoMapper
           
           if result.is_a? Array
             if current_version && result[0][0]['updatedExisting'] == false
+              write_attribute lock_version_field, current_version
               raise StaleDocumentError.new
             end
           elsif lock_version_field

data/mongo_mapper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongo_mapper}
-  s.version = "0.6.9"
+  s.version = "0.6.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]
-  s.date = %q{2010-01-01}
+  s.date = %q{2010-01-02}
   s.default_executable = %q{mmconsole}
   s.email = %q{nunemaker@gmail.com}
   s.executables = ["mmconsole"]

data/mrkurt-mongo_mapper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mrkurt-mongo_mapper}
-  s.version = "0.6.9"
+  s.version = "0.6.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker", "Kurt Mackey"]
-  s.date = %q{2010-01-02}
+  s.date = %q{2010-01-09}
   s.default_executable = %q{mmconsole}
   s.email = %q{mrkurt@gmail.com}
   s.executables = ["mmconsole"]

data/test/functional/associations/test_belongs_to_polymorphic_proxy.rb

@@ -12,6 +12,14 @@ class BelongsToPolymorphicProxyTest < Test::Unit::TestCase
     status.target.nil?.should be_true
     status.target.inspect.should == "nil"
   end
+  
+  should "have boolean presence method" do
+    status = Status.new
+    status.target?.should be_false
+    
+    status.target = Project.new(:name => 'mongomapper')
+    status.target?.should be_true
+  end
 
   should "be able to replace the association" do
     status = Status.new(:name => 'Foo!')

data/test/functional/associations/test_belongs_to_proxy.rb

@@ -3,24 +3,26 @@ require 'models'
 
 class BelongsToProxyTest < Test::Unit::TestCase
   def setup    
-    @post_class = Class.new do
-      include MongoMapper::Document
-    end
-    
-    @comment_class = Class.new do
-      include MongoMapper::Document
+    @post_class = Doc()
+    @comment_class = Doc do
       key :post_id, String
     end
-    @comment_class.belongs_to :post, :class => @post_class
     
-    @post_class.collection.remove
-    @comment_class.collection.remove
+    @comment_class.belongs_to :post, :class => @post_class
   end
   
   should "default to nil" do
     @comment_class.new.post.nil?.should be_true
   end
   
+  should "have boolean presence method" do
+    comment = @comment_class.new(:name => 'Foo!')
+    comment.post?.should be_false
+    
+    comment.post = @post_class.new(:name => 'mongomapper')
+    comment.post?.should be_true
+  end
+  
   should "be able to replace the association" do
     post = @post_class.new(:name => 'mongomapper')
     comment = @comment_class.new(:name => 'Foo!', :post => post)

data/test/functional/associations/test_many_embedded_proxy.rb

@@ -33,12 +33,9 @@ class ManyEmbeddedProxyTest < Test::Unit::TestCase
   end
   
   should "allow embedding arbitrarily deep" do
-    @document = Class.new do
-      include MongoMapper::Document
-      set_collection_name 'test'
+    @document = Doc do
       key :person, Person
     end
-    @document.collection.remove
     
     meg = Person.new(:name => "Meg")
     meg.child = Person.new(:name => "Steve")
@@ -80,12 +77,9 @@ class ManyEmbeddedProxyTest < Test::Unit::TestCase
 
   context "embedding many embedded documents" do
     setup do
-      @document = Class.new do
-        include MongoMapper::Document
-        set_collection_name 'test'
+      @document = Doc do
         many :people
       end
-      @document.collection.remove
     end
 
     should "persist all embedded documents" do
@@ -142,20 +136,16 @@ class ManyEmbeddedProxyTest < Test::Unit::TestCase
   
   context "extending the association" do
     setup do
-      @address_class = Class.new do
-        include MongoMapper::EmbeddedDocument
+      @address_class = EDoc do
         key :address, String
         key :city, String
         key :state, String
         key :zip, Integer
       end
       
-      @project_class = Class.new do
-        include MongoMapper::Document
+      @project_class = Doc do
         key :name, String
       end
-      
-      @project_class.collection.remove
     end
     
     should "work using a block passed to many" do

data/test/functional/associations/test_one_proxy.rb

@@ -2,18 +2,10 @@ require 'test_helper'
 
 class OneProxyTest < Test::Unit::TestCase
   def setup
-    @post_class = Class.new do
-      include MongoMapper::Document
-      def self.name; 'Post' end
-    end
-    
-    @author_class = Class.new do
-      include MongoMapper::Document
+    @post_class = Doc('Post')
+    @author_class = Doc do
       key :post_id, ObjectId
     end
-    
-    @post_class.collection.remove
-    @author_class.collection.remove
   end
   
   should "default to nil" do
@@ -23,13 +15,39 @@ class OneProxyTest < Test::Unit::TestCase
   
   should "be able to replace the association" do
     @post_class.one :author, :class => @author_class
+    
     post = @post_class.new
-    author = @author_class.new
+    author = @author_class.new(:name => 'Frank')
     post.author = author
     post.reload
     
     post.author.should == author
     post.author.nil?.should be_false
+    
+    new_author = @author_class.new(:name => 'Emily')
+    post.author = new_author
+    post.author.should == new_author
+  end
+  
+  should "have boolean method for testing presence" do
+    @post_class.one :author, :class => @author_class
+    
+    post = @post_class.new
+    post.author?.should be_false
+    
+    post.author = @author_class.new(:name => 'Frank')
+    post.author?.should be_true
+  end
+  
+  should "work with criteria" do
+    @post_class.one :primary_author, :class => @author_class, :primary => true
+    @post_class.one :author, :class => @author_class
+    
+    post = @post_class.create
+    author = @author_class.create(:name => 'Frank', :primary => false, :post_id => post.id)
+    primary = @author_class.create(:name => 'Bill', :primary => true, :post_id => post.id)
+    post.author.should == author
+    post.primary_author.should == primary
   end
   
   should "unset the association" do

data/test/functional/test_binary.rb

@@ -2,12 +2,9 @@ require 'test_helper'
 
 class BinaryTest < Test::Unit::TestCase  
   should "serialize and deserialize correctly" do
-    klass = Class.new do
-      include MongoMapper::Document
-      set_collection_name 'test'
+    klass = Doc do
       key :contents, Binary
     end
-    klass.collection.remove
     
     doc = klass.new(:contents => '010101')
     doc.save
@@ -18,12 +15,9 @@ class BinaryTest < Test::Unit::TestCase
   
   context "Saving a document with a blank binary value" do
     setup do
-      @document = Class.new do
-        include MongoMapper::Document
-        set_collection_name 'test'
+      @document = Doc do
         key :file, Binary
       end
-      @document.collection.remove
     end
 
     should "not fail" do

data/test/functional/test_callbacks.rb

@@ -3,10 +3,7 @@ require 'test_helper'
 class CallbacksTest < Test::Unit::TestCase
   context "Defining and running callbacks" do
     setup do
-      @document = Class.new do
-        include MongoMapper::Document
-        set_collection_name 'test'
-        
+      @document = Doc do
         key :name, String
         
         [ :before_validation_on_create, :before_validation_on_update,
@@ -30,7 +27,6 @@ class CallbacksTest < Test::Unit::TestCase
           @history = nil
         end
       end
-      @document.collection.remove
     end
     
     should "get the order right for creating documents" do

data/test/functional/test_dirty.rb

@@ -3,12 +3,9 @@ require 'models'
 
 class DirtyTest < Test::Unit::TestCase
   def setup
-    @document = Class.new do
-      include MongoMapper::Document
-      set_collection_name 'test'
+    @document = Doc do
       key :phrase, String
     end
-    @document.collection.remove
     
     Status.collection.remove
     Project.collection.remove

data/test/functional/test_document.rb

@@ -3,8 +3,7 @@ require 'models'
 
 class DocumentTest < Test::Unit::TestCase
   def setup
-    @document = Class.new do
-      include MongoMapper::Document
+    @document = Doc do
       set_collection_name 'users'
 
       key :first_name, String
@@ -12,7 +11,6 @@ class DocumentTest < Test::Unit::TestCase
       key :age, Integer
       key :date, Date
     end
-    @document.collection.remove
   end
   
   context "Using key with type Array" do
@@ -143,12 +141,7 @@ class DocumentTest < Test::Unit::TestCase
     end
     
     should "not fail if no attributes provided" do
-      document = Class.new do
-        include MongoMapper::Document
-        set_collection_name 'test'
-      end
-      document.collection.remove
-      
+      document = Doc()
       lambda { document.create }.should change { document.count }.by(1)
     end
   end
@@ -541,11 +534,9 @@ class DocumentTest < Test::Unit::TestCase
     end
 
     should "return 0 if the collection does not exist" do
-      klass = Class.new do
-        include MongoMapper::Document
+      klass = Doc do
         set_collection_name 'foobarbazwickdoesnotexist'
       end
-      @document.collection.remove
 
       klass.count.should == 0
     end
@@ -649,15 +640,12 @@ class DocumentTest < Test::Unit::TestCase
     should "fail if wrong version (and locking enabled)" do
       @document.locking!
       doc = @document.create(:first_name => 'Blah')
-      doc2 = @document.find(doc.id)
-      doc.first_name = 'Bloop'
-      doc.save
-
-      doc2.first_name = 'Blip'
-
-      lambda{ doc2.save }.should raise_error(MongoMapper::StaleDocumentError)
-      doc.reload.first_name.should == 'Bloop'
+      attrs = {:_rev => "012345", :first_name => 'Blip'}
+      lambda{ doc.update_attributes(attrs) }.should raise_error(MongoMapper::StaleDocumentError)
+      doc._rev.should == attrs[:_rev] #ensures that the _rev is reset on a failed save
+      doc.reload.first_name.should == 'Blah'
     end
+
   end
 
   context "#update_attributes (new document)" do
@@ -730,12 +718,9 @@ class DocumentTest < Test::Unit::TestCase
   
   context "#save (with validations off)" do
     setup do
-      @document = Class.new do
-        include MongoMapper::Document
-        set_collection_name 'test'
+      @document = Doc do
         key :name, String, :required => true
       end
-      @document.collection.remove
     end
 
     should "insert document" do
@@ -755,13 +740,14 @@ class DocumentTest < Test::Unit::TestCase
     setup do
       MongoMapper.ensured_indexes = []
       
-      @document = Class.new do
-        include MongoMapper::Document
-        set_collection_name 'test'
+      @document = Doc do
         key :name, String
+        set_collection_name 'test_indexes'
         ensure_index :name, :unique => true
       end
-      @document.collection.drop_indexes
+      if @document.database.collection_names.include?(@document.collection.name)
+        @document.collection.drop_indexes
+      end
       
       MongoMapper.ensure_indexes!
     end
@@ -1078,14 +1064,11 @@ class DocumentTest < Test::Unit::TestCase
 
   context "#reload" do
     setup do
-      @foo_class = Class.new do
-        include MongoMapper::Document
+      @foo_class = Doc do
         key :name
       end
-      @foo_class.collection.remove
       
-      @bar_class = Class.new do
-        include MongoMapper::EmbeddedDocument
+      @bar_class = EDoc do
         key :name
       end
       

data/test/functional/test_embedded_document.rb

@@ -3,14 +3,11 @@ require 'models'
 
 class EmbeddedDocumentTest < Test::Unit::TestCase
   def setup
-    @document = Class.new do
-      include MongoMapper::Document
+    @document = Doc do
       set_collection_name 'users'
-
       key :first_name, String
       key :last_name, String
     end
-    @document.collection.remove
   end
     
   context "Saving a document with an embedded document" do
@@ -34,23 +31,13 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
     end
   end
   
-  context "Instantiating single collection inherited embedded documents" do
-    setup do
-      @document = Class.new do
-        include MongoMapper::Document
-        key :message, Message
-      end
-    end
-
-    should "work" do
-      doc1 = @document.create(:message => Enter.new)
-      doc2 = @document.create(:message => Exit.new)
-      doc3 = @document.create(:message => Chat.new)
-
-      doc1.reload.message.class.should be(Enter)
-      doc2.reload.message.class.should be(Exit)
-      doc3.reload.message.class.should be(Chat)
+  should "correctly instantiate single collection inherited embedded documents" do
+    document = Doc('Foo') do
+      key :message, Message
     end
+    
+    doc1 = document.create(:message => Enter.new)
+    doc1.reload.message.class.should be(Enter)
   end
   
   context "new?" do

data/test/functional/test_modifiers.rb

@@ -2,17 +2,13 @@ require 'test_helper'
 
 class ModifierTest < Test::Unit::TestCase
   def setup
-    @page_class = Class.new do
-      include MongoMapper::Document
-      
+    @page_class = Doc do
       key :title, String
       key :day_count, Integer, :default => 0
       key :week_count, Integer, :default => 0
       key :month_count, Integer, :default => 0
       key :tags, Array
     end
-    
-    @page_class.collection.remove
   end
   
   def assert_page_counts(page, day_count, week_count, month_count)

data/test/functional/test_pagination.rb

@@ -3,8 +3,7 @@ require 'test_helper'
 class PaginationTest < Test::Unit::TestCase
   context "Paginating" do
     setup do
-      @document = Class.new do
-        include MongoMapper::Document
+      @document = Doc do
         set_collection_name 'users'
 
         key :first_name, String
@@ -13,7 +12,6 @@ class PaginationTest < Test::Unit::TestCase
         
         def self.per_page; 1 end
       end
-      @document.collection.remove
       
       @doc1 = @document.create({:first_name => 'John', :last_name => 'Nunemaker', :age => '27'})
       @doc2 = @document.create({:first_name => 'Steve', :last_name => 'Smith', :age => '28'})

data/test/functional/test_string_id_compatibility.rb

@@ -2,19 +2,17 @@ require 'test_helper'
 
 class StringIdCompatibilityTest < Test::Unit::TestCase
   def setup
-    @note_class = Class.new do
-      include MongoMapper::EmbeddedDocument
+    @note_class = EDoc do
       key :_id, String
     end
     
-    @task_class = Class.new do
-      include MongoMapper::Document
+    @task_class = Doc do
       key :_id, String
       key :project_id, String
       belongs_to :project
     end
     
-    @project_class = Class.new do
+    @project_class = Doc do
       include MongoMapper::Document
       key :_id, String
     end
@@ -22,9 +20,6 @@ class StringIdCompatibilityTest < Test::Unit::TestCase
     @task_class.belongs_to :project, :class => @project_class
     @project_class.many :notes, :class => @note_class
     @project_class.many :tasks, :class => @task_class, :foreign_key => 'project_id'
-    
-    @project_class.collection.remove
-    @task_class.collection.remove
   end
   
   should "assign correct _id for documents" do

data/test/functional/test_validations.rb

@@ -3,12 +3,9 @@ require 'test_helper'
 class ValidationsTest < Test::Unit::TestCase  
   context "Saving a new document that is invalid" do
     setup do
-      @document = Class.new do
-        include MongoMapper::Document
-        set_collection_name 'test'
+      @document = Doc do
         key :name, String, :required => true
       end
-      @document.collection.remove
     end
     
     should "not insert document" do
@@ -27,12 +24,9 @@ class ValidationsTest < Test::Unit::TestCase
 
   context "Saving a document that is invalid (destructive)" do
     setup do
-      @document = Class.new do
-        include MongoMapper::Document
-        set_collection_name 'test'
+      @document = Doc do
         key :name, String, :required => true
       end
-      @document.collection.remove
     end
     
     should "raise error" do
@@ -43,12 +37,9 @@ class ValidationsTest < Test::Unit::TestCase
 
   context "Creating a document that is invalid (destructive)" do
     setup do
-      @document = Class.new do
-        include MongoMapper::Document
-        set_collection_name 'test'
+      @document = Doc do
         key :name, String, :required => true
       end
-      @document.collection.remove
     end
     
     should "raise error" do
@@ -63,12 +54,9 @@ class ValidationsTest < Test::Unit::TestCase
   
   context "Saving an existing document that is invalid" do
     setup do
-      @document = Class.new do
-        include MongoMapper::Document
-        set_collection_name 'test'
+      @document = Doc do
         key :name, String, :required => true
       end
-      @document.collection.remove
       
       @doc = @document.create(:name => 'John Nunemaker')
     end
@@ -88,16 +76,12 @@ class ValidationsTest < Test::Unit::TestCase
   
   context "Adding validation errors" do
     setup do
-      @document = Class.new do
-        include MongoMapper::Document
-        set_collection_name 'test'
-        
+      @document = Doc do
         key :action, String
         def action_present
           errors.add(:action, 'is invalid') if action.blank?
         end
       end
-      @document.collection.remove
     end
     
     should "work with validate_on_create callback" do
@@ -133,14 +117,10 @@ class ValidationsTest < Test::Unit::TestCase
   
   context "validating uniqueness of" do
     setup do
-      @document = Class.new do
-        include MongoMapper::Document
-        set_collection_name 'test'
-        
+      @document = Doc do
         key :name, String
         validates_uniqueness_of :name
       end
-      @document.collection.remove
     end
 
     should "not fail if object is new" do
@@ -149,10 +129,7 @@ class ValidationsTest < Test::Unit::TestCase
     end
 
     should "not fail when new object is out of scope" do
-      document = Class.new do
-        include MongoMapper::Document
-        set_collection_name 'test'
-        
+      document = Doc do
         key :name
         key :adult
         validates_uniqueness_of :name, :scope => :adult
@@ -162,7 +139,6 @@ class ValidationsTest < Test::Unit::TestCase
 
       doc2 = document.new("name" => "joe", :adult => false)
       doc2.should be_valid
-
     end
 
     should "allow to update an object" do
@@ -193,10 +169,7 @@ class ValidationsTest < Test::Unit::TestCase
     end
     
     should "allow multiple blank entries if :allow_blank => true" do
-      document = Class.new do
-        include MongoMapper::Document
-        set_collection_name 'test'
-        
+      document = Doc do
         key :name
         validates_uniqueness_of :name, :allow_blank => :true
       end
@@ -214,10 +187,7 @@ class ValidationsTest < Test::Unit::TestCase
     end
 
     should "allow entries that differ only in case by default" do
-      document = Class.new do
-        include MongoMapper::Document
-        set_collection_name 'test'
-
+      document = Doc do
         key :name
         validates_uniqueness_of :name
       end
@@ -231,10 +201,7 @@ class ValidationsTest < Test::Unit::TestCase
 
     context "with :case_sensitive => false" do
       setup do
-        @document = Class.new do
-          include MongoMapper::Document
-          set_collection_name 'test'
-
+        @document = Doc do
           key :name
           validates_uniqueness_of :name, :case_sensitive => false
         end
@@ -256,15 +223,11 @@ class ValidationsTest < Test::Unit::TestCase
 
     context "scoped by a single attribute" do
       setup do
-        @document = Class.new do
-          include MongoMapper::Document
-          set_collection_name 'test'
-          
+        @document = Doc do
           key :name, String
           key :scope, String
           validates_uniqueness_of :name, :scope => :scope
         end
-        @document.collection.remove
       end
 
       should "fail if the same name exists in the scope" do
@@ -296,16 +259,12 @@ class ValidationsTest < Test::Unit::TestCase
 
     context "scoped by a multiple attributes" do
       setup do
-        @document = Class.new do
-          include MongoMapper::Document
-          set_collection_name 'test'
-          
+        @document = Doc do
           key :name, String
           key :first_scope, String
           key :second_scope, String
           validates_uniqueness_of :name, :scope => [:first_scope, :second_scope]
         end
-        @document.collection.remove
       end
       
       should "fail if the same name exists in the scope" do
@@ -338,13 +297,9 @@ class ValidationsTest < Test::Unit::TestCase
   
   context "validates uniqueness of with :unique shortcut" do
     should "work" do
-      @document = Class.new do
-        include MongoMapper::Document
-        set_collection_name 'test'
-        
+      @document = Doc do
         key :name, String, :unique => true
       end
-      @document.collection.remove
       
       doc = @document.create(:name => 'John')
       doc.should_not have_error_on(:name)

data/test/test_helper.rb

@@ -16,6 +16,34 @@ require 'support/timing'
 
 class Test::Unit::TestCase
   include CustomMatchers
+  
+  cattr_accessor :mm_document_count
+  self.mm_document_count = 0
+  
+  def Doc(name=nil, &block)
+    Test::Unit::TestCase.mm_document_count += 1
+    
+    klass = Class.new do
+      include MongoMapper::Document
+      set_collection_name "test#{rand(20)}"
+      
+      if name
+        class_eval "def self.name; '#{name}' end"
+        class_eval "def self.to_s; '#{name}' end"
+      end
+      
+      class_eval(&block) if block_given?
+    end
+    klass.collection.remove
+    klass
+  end
+  
+  def EDoc(&block)
+    Class.new do
+      include MongoMapper::EmbeddedDocument
+      instance_eval(&block) if block_given?
+    end
+  end
 end
 
 test_dir = File.expand_path(File.dirname(__FILE__) + '/../tmp')

data/test/unit/associations/test_proxy.rb

@@ -53,6 +53,7 @@ class ProxyTest < Test::Unit::TestCase
   context "blank?" do
     should "be true if blank" do
       @blank_proxy.blank?.should be_true
+      @nil_proxy.blank?.should be_true
     end
     
     should "be false if not blank" do
@@ -60,6 +61,17 @@ class ProxyTest < Test::Unit::TestCase
     end
   end
   
+  context "present?" do
+    should "be true if present" do
+      @proxy.present?.should be_true
+    end
+    
+    should "be false if not present" do
+      @blank_proxy.present?.should be_false
+      @nil_proxy.present?.should be_false
+    end
+  end
+  
   should "delegate respond_to? to target" do
     @proxy.respond_to?(:each).should be_true
     @proxy.respond_to?(:size).should be_true

data/test/unit/test_document.rb

@@ -4,11 +4,7 @@ require 'models'
 class DocumentTest < Test::Unit::TestCase
   context "The Document Class" do
     setup do
-      @document = Class.new do
-        include MongoMapper::Document
-        set_collection_name 'test'
-      end
-      @document.collection.remove
+      @document = Doc()
     end
     
     should "have logger method" do
@@ -40,10 +36,7 @@ class DocumentTest < Test::Unit::TestCase
       @document.database_name.should == 'test2'
       @document.database.name.should == 'test2'
 
-      another_document = Class.new do
-        include MongoMapper::Document
-        set_collection_name 'test'
-      end
+      another_document = Doc()
       another_document.database.should == MongoMapper.database
     end
     
@@ -76,32 +69,28 @@ class DocumentTest < Test::Unit::TestCase
     should 'allow extensions to Document to be appended' do
       module Extension; def test_this_extension; end end
       MongoMapper::Document.append_extensions(Extension)
-      article = Class.new { include MongoMapper::Document }
-      
+      article = Doc()
       article.should respond_to(:test_this_extension)
     end
 
     should 'add appended extensions to classes that include Document before they are added' do
       module Extension; def test_this_extension; end end
-      article = Class.new { include MongoMapper::Document }
+      article = Doc()
       MongoMapper::Document.append_extensions(Extension)
-      
       article.should respond_to(:test_this_extension)
     end
 
     should 'allow inclusions to Document to be appended' do
       module Inclusion; def test_this_inclusion; end end
       MongoMapper::Document.append_inclusions(Inclusion)
-      article = Class.new { include MongoMapper::Document }
-      
+      article = Doc()
       article.new.should respond_to(:test_this_inclusion)
     end
 
     should 'add appended inclusions to classes that include Document before they are added' do
       module Inclusion; def test_this_inclusion; end end
-      article = Class.new { include MongoMapper::Document }
+      article = Doc()
       MongoMapper::Document.append_inclusions(Inclusion)
-      
       article.new.should respond_to(:test_this_inclusion)
     end
   end # Document class
@@ -128,14 +117,10 @@ class DocumentTest < Test::Unit::TestCase
 
   context "An instance of a document" do
     setup do
-      @document = Class.new do
-        include MongoMapper::Document
-        set_collection_name 'test'
-
+      @document = Doc do
         key :name, String
         key :age, Integer
       end
-      @document.collection.remove
     end
     
     should "have access to logger" do
@@ -169,13 +154,9 @@ class DocumentTest < Test::Unit::TestCase
       end
 
       should "set self to the root document on embedded documents" do        
-        klass = Class.new do
-          include MongoMapper::Document
-        end
+        klass = Doc()
+        pets = EDoc()
         
-        pets = Class.new do
-          include MongoMapper::EmbeddedDocument
-        end
         klass.many :pets, :class => pets
         
         doc = klass.new(:pets => [{}])
@@ -215,6 +196,7 @@ class DocumentTest < Test::Unit::TestCase
       setup do
         @oid = Mongo::ObjectID.new
       end
+      
       should "be equal if id and class are the same" do
         (@document.new('_id' => @oid) == @document.new('_id' => @oid)).should be(true)
       end
@@ -224,12 +206,8 @@ class DocumentTest < Test::Unit::TestCase
       end
 
       should "not be equal if id same but class different" do
-        @another_document = Class.new do
-          include MongoMapper::Document
-          set_collection_name 'test'
-        end
-
-        (@document.new('_id' => @oid) == @another_document.new('_id' => @oid)).should be(false)
+        another_document = Doc()
+        (@document.new('_id' => @oid) == another_document.new('_id' => @oid)).should be(false)
       end
     end
   end # instance of a document

data/test/unit/test_embedded_document.rb

@@ -35,9 +35,7 @@ end
 class EmbeddedDocumentTest < Test::Unit::TestCase 
   context "Including MongoMapper::EmbeddedDocument in a class" do
     setup do
-      @klass = Class.new do
-        include MongoMapper::EmbeddedDocument
-      end
+      @klass = EDoc()
     end
     
     should "give class access to logger" do
@@ -89,29 +87,16 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
     end
   end
   
-  context "looking up type constants" do
-    should "not raise an error" do
-      klass = Class.new do
-        include MongoMapper::EmbeddedDocument
-        key :file, Binary
-      end
-    end
-  end
-  
   context "parent_model" do
     should "be nil if none of parents ancestors include EmbeddedDocument" do
       parent = Class.new
-      document = Class.new(parent) do
-        include MongoMapper::EmbeddedDocument
-      end
+      document = Class.new(parent) { include MongoMapper::EmbeddedDocument }
       document.parent_model.should be_nil
     end
 
     should "work when other modules have been included" do
       grandparent = Class.new
-      parent = Class.new grandparent do
-        include MongoMapper::EmbeddedDocument
-      end
+      parent = Class.new(grandparent) { include MongoMapper::EmbeddedDocument }
       
       example_module = Module.new
       document = Class.new(parent) do
@@ -130,9 +115,7 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
   
   context "defining a key" do
     setup do
-      @document = Class.new do
-        include MongoMapper::EmbeddedDocument
-      end
+      @document = EDoc()
     end
     
     should "work with name" do
@@ -226,8 +209,7 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
 
   context "#inspect" do
     setup do
-      @document = Class.new do
-        include MongoMapper::Document
+      @document = Doc do
         key :animals
       end
     end
@@ -252,9 +234,7 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
   
   context "Applying default values for keys" do
     setup do
-      @document = Class.new do
-        include MongoMapper::EmbeddedDocument
-        
+      @document = EDoc do
         key :name,      String,   :default => 'foo'
         key :age,       Integer,  :default => 20
         key :net_worth, Float,    :default => 100.00
@@ -299,9 +279,7 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
 
   context "An instance of an embedded document" do
     setup do
-      @document = Class.new do
-        include MongoMapper::EmbeddedDocument
-
+      @document = EDoc do
         key :name, String
         key :age, Integer
       end
@@ -398,8 +376,7 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
     
     context "initialized when _type key present" do
       setup do
-        ::FooBar = Class.new do
-          include MongoMapper::EmbeddedDocument
+        ::FooBar = EDoc do
           key :_type, String
         end
       end
@@ -581,8 +558,7 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       end
       
       should "be overrideable by modules" do
-        @document = Class.new do
-          include MongoMapper::Document
+        @document = Doc do
           key :other_child, String
         end
         
@@ -656,8 +632,7 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       end
       
       should "be overrideable by modules" do
-        @document = Class.new do
-          include MongoMapper::Document
+        @document = Doc do
           key :other_child, String
         end
         
@@ -690,19 +665,16 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
         @oid = Mongo::ObjectID.new
       end
       should "be equal if id and class are the same" do
-        (@document.new('_id' => @oid) == @document.new('_id' => @oid)).should be(true)
+        (@document.new('_id' => @oid) == @document.new('_id' => @oid)).should be_true
       end
 
       should "not be equal if class same but id different" do
-        (@document.new('_id' => @oid) == @document.new('_id' => Mongo::ObjectID.new)).should be(false)
+        (@document.new('_id' => @oid) == @document.new('_id' => Mongo::ObjectID.new)).should be_false
       end
 
       should "not be equal if id same but class different" do
-        @another_document = Class.new do
-          include MongoMapper::Document
-        end
-
-        (@document.new('_id' => @oid) == @another_document.new('_id' => @oid)).should be(false)
+        another_document = Doc()
+        (@document.new('_id' => @oid) == another_document.new('_id' => @oid)).should be_false
       end
     end
   end # instance of a embedded document

data/test/unit/test_key.rb

@@ -82,10 +82,7 @@ class KeyTest < Test::Unit::TestCase
     end
     
     should "know if it is a embedded_document" do
-      klass = Class.new do
-        include MongoMapper::EmbeddedDocument
-      end
-      Key.new(:name, klass).embeddable?.should be_true
+      Key.new(:name, EDoc()).embeddable?.should be_true
     end
 
     should "know if it is not a embedded_document" do

data/test/unit/test_serializations.rb

@@ -2,8 +2,7 @@ require 'test_helper'
 
 class SerializationTest < Test::Unit::TestCase
   def setup
-    @document = Class.new do
-      include MongoMapper::EmbeddedDocument
+    @document = EDoc do
       key :name, String
       key :age, Integer
       key :awesome, Boolean

data/test/unit/test_time_zones.rb

@@ -3,8 +3,7 @@ require 'test_helper'
 class TimeZonesTest < Test::Unit::TestCase
   context "An instance of an embedded document" do
     setup do      
-      @document = Class.new do
-        include MongoMapper::EmbeddedDocument
+      @document = EDoc do
         key :name, String
         key :created_at, Time
       end

data/test/unit/test_validations.rb

@@ -2,14 +2,9 @@ require 'test_helper'
 
 class ValidationsTest < Test::Unit::TestCase
   context "Validations" do
-    
     context "on a Document" do
-    
       setup do
-        @document = Class.new do
-          include MongoMapper::Document
-          set_collection_name 'test'
-        end
+        @document = Doc()
       end
 
       context "Validating acceptance of" do
@@ -240,11 +235,8 @@ class ValidationsTest < Test::Unit::TestCase
     end # End on a Document
     
     context "On an EmbeddedDocument" do
-
       setup do
-        @embedded_doc = Class.new do
-          include MongoMapper::EmbeddedDocument
-        end
+        @embedded_doc = EDoc()
       end
 
       context "Validating acceptance of" do
@@ -478,10 +470,7 @@ class ValidationsTest < Test::Unit::TestCase
    
   context "Adding validation errors" do
     setup do
-      @document = Class.new do
-        include MongoMapper::Document
-        set_collection_name 'test'
-        
+      @document = Doc do
         key :action, String
         def action_present
           errors.add(:action, 'is invalid') if action.blank?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mrkurt-mongo_mapper
 version: !ruby/object:Gem::Version 
-  version: 0.6.9
+  version: 0.6.10
 platform: ruby
 authors: 
 - John Nunemaker
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-02 00:00:00 -06:00
+date: 2010-01-09 00:00:00 -06:00
 default_executable: mmconsole
 dependencies: 
 - !ruby/object:Gem::Dependency