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,25 +16,28 @@ 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
 

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/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/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

@@ -21,6 +21,14 @@ class BelongsToProxyTest < Test::Unit::TestCase
     @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_one_proxy.rb

@@ -23,13 +23,28 @@ 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 "unset the association" do

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

metadata

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