mongo_mapper 0.6.6 → 0.6.7

data/VERSION

@@ -1 +1 @@
-0.6.6
+0.6.7

data/lib/mongo_mapper.rb

@@ -67,31 +67,6 @@ module MongoMapper
     end
   end
   
-  # @api private
-  module Finders
-    def dynamic_find(finder, args)
-      attributes = {}
-      finder.attributes.each_with_index do |attr, index|
-        attributes[attr] = args[index]
-      end
-      
-      options = args.extract_options!.merge(attributes)
-      result  = find(finder.finder, options)
-
-      if result.nil?
-        if finder.bang
-          raise DocumentNotFound, "Couldn't find Document with #{attributes.inspect} in collection named #{collection.name}"
-        end
-
-        if finder.instantiator
-          self.send(finder.instantiator, attributes)
-        end
-      else
-        result
-      end
-    end
-  end
-  
   # @api private
   def self.use_time_zone?
     Time.respond_to?(:zone) && Time.zone ? true : false
@@ -102,23 +77,13 @@ module MongoMapper
     use_time_zone? ? Time.zone : Time
   end
   
+  # @api private
   def self.normalize_object_id(value)
     value.is_a?(String) ? Mongo::ObjectID.from_string(value) : value
   end
 end
 
 require 'mongo_mapper/support'
-require 'mongo_mapper/associations'
-require 'mongo_mapper/associations/base'
-require 'mongo_mapper/associations/proxy'
-require 'mongo_mapper/associations/many_documents_proxy'
-require 'mongo_mapper/associations/belongs_to_proxy'
-require 'mongo_mapper/associations/belongs_to_polymorphic_proxy'
-require 'mongo_mapper/associations/many_proxy'
-require 'mongo_mapper/associations/many_polymorphic_proxy'
-require 'mongo_mapper/associations/many_embedded_proxy'
-require 'mongo_mapper/associations/many_embedded_polymorphic_proxy'
-require 'mongo_mapper/associations/many_documents_as_proxy'
 require 'mongo_mapper/callbacks'
 require 'mongo_mapper/finder_options'
 require 'mongo_mapper/dirty'
@@ -132,3 +97,14 @@ require 'mongo_mapper/rails_compatibility/document'
 require 'mongo_mapper/rails_compatibility/embedded_document'
 require 'mongo_mapper/embedded_document'
 require 'mongo_mapper/document'
+require 'mongo_mapper/associations'
+require 'mongo_mapper/associations/base'
+require 'mongo_mapper/associations/proxy'
+require 'mongo_mapper/associations/collection'
+require 'mongo_mapper/associations/many_documents_proxy'
+require 'mongo_mapper/associations/belongs_to_proxy'
+require 'mongo_mapper/associations/belongs_to_polymorphic_proxy'
+require 'mongo_mapper/associations/many_polymorphic_proxy'
+require 'mongo_mapper/associations/many_embedded_proxy'
+require 'mongo_mapper/associations/many_embedded_polymorphic_proxy'
+require 'mongo_mapper/associations/many_documents_as_proxy'

data/lib/mongo_mapper/associations/base.rb

@@ -87,7 +87,7 @@ module MongoMapper
               elsif as?
                 ManyDocumentsAsProxy
               else
-                ManyProxy
+                ManyDocumentsProxy
               end
             end
           else

data/lib/mongo_mapper/associations/belongs_to_polymorphic_proxy.rb

@@ -4,30 +4,22 @@ module MongoMapper
       def replace(doc)
         if doc
           doc.save if doc.new?
-          id, type = doc._id, doc.class.name
+          id, type = doc.id, doc.class.name
         end
         
-        @owner.send("#{@association.foreign_key}=", id)
-        @owner.send("#{@association.type_key_name}=", type)
+        owner[reflection.foreign_key] = id
+        owner[reflection.type_key_name] = type
         reset
       end
       
       protected
         def find_target
-          if proxy_id && proxy_class
-            proxy_class.find_by_id(proxy_id)
-          end
+          return nil if association_class.nil? || owner[reflection.foreign_key].nil?
+          association_class.first(:id => owner[reflection.foreign_key])
         end
         
-        def proxy_id
-          @proxy_id ||= @owner.send(@association.foreign_key)
-        end
-        
-        def proxy_class
-          @proxy_class ||= begin
-            klass = @owner.send(@association.type_key_name)
-            klass && klass.constantize
-          end
+        def association_class
+          proxy_owner[reflection.type_key_name] ? proxy_owner[reflection.type_key_name].constantize : nil
         end
     end
   end

data/lib/mongo_mapper/associations/belongs_to_proxy.rb

@@ -4,18 +4,17 @@ module MongoMapper
       def replace(doc)
         if doc
           doc.save if doc.new?
-          id = doc._id
+          id = doc.id
         end
-
-        @owner.send("#{@association.foreign_key}=", id)
+        
+        owner[reflection.foreign_key] = id
         reset
       end
 
       protected
         def find_target
-          if association_id = @owner.send(@association.foreign_key)
-            @association.klass.find_by_id(association_id)
-          end
+          return nil if owner[reflection.foreign_key].nil?
+          klass.first(:id => owner[reflection.foreign_key])
         end
     end
   end

data/lib/mongo_mapper/associations/collection.rb

@@ -0,0 +1,19 @@
+module MongoMapper
+  module Associations
+    class Collection < Proxy
+      def to_ary
+        load_target
+        if target.is_a?(Array)
+          target.to_ary
+        else
+          Array(target)
+        end
+      end
+      
+      def reset
+        super
+        target = []
+      end
+    end
+  end
+end

data/lib/mongo_mapper/associations/many_documents_as_proxy.rb

@@ -3,22 +3,23 @@ module MongoMapper
     class ManyDocumentsAsProxy < ManyDocumentsProxy
       protected
         def scoped_conditions
-          {as_type_name => @owner.class.name, as_id_name => @owner._id}
+          {type_key_name => owner.class.name, id_key_name => owner.id}
         end
 
         def apply_scope(doc)
           ensure_owner_saved
-          doc.send("#{as_type_name}=", @owner.class.name)
-          doc.send("#{as_id_name}=", @owner._id)
+          doc[type_key_name] = owner.class.name
+          doc[id_key_name] = owner.id
           doc
         end
-
-        def as_type_name
-          @as_type_name ||= @association.options[:as].to_s + "_type"
+        
+      private
+        def type_key_name
+          "#{options[:as]}_type"
         end
-
-        def as_id_name
-          @as_id_name ||= @association.options[:as].to_s + "_id"
+        
+        def id_key_name
+          "#{options[:as]}_id"
         end
     end
   end

data/lib/mongo_mapper/associations/many_documents_proxy.rb

@@ -1,9 +1,6 @@
 module MongoMapper
   module Associations
-    class ManyDocumentsProxy < Proxy
-      delegate :klass, :to => :@association
-      delegate :collection, :to => :klass
-      
+    class ManyDocumentsProxy < Collection
       include ::MongoMapper::Finders
       
       def find(*args)
@@ -37,7 +34,8 @@ module MongoMapper
       end
 
       def replace(docs)
-        @target.map(&:destroy) if load_target
+        load_target
+        target.map(&:destroy)
         docs.each { |doc| apply_scope(doc).save }
         reset
       end
@@ -85,24 +83,14 @@ module MongoMapper
         end
         reset
       end
-      
-      def method_missing(method, *args)
-        finder = DynamicFinder.new(method)
-        
-        if finder.found?
-          dynamic_find(finder, args)
-        else
-          super
-        end
-      end
-      
+
       protected
         def scoped_conditions
-          {self.foreign_key => @owner._id}
+          {self.foreign_key => owner.id}
         end
         
         def scoped_options(options)
-          @association.finder_options.merge(options).merge(scoped_conditions)
+          reflection.finder_options.merge(options).merge(scoped_conditions)
         end
 
         def find_target
@@ -110,17 +98,17 @@ module MongoMapper
         end
 
         def ensure_owner_saved
-          @owner.save if @owner.new?
+          owner.save if owner.new?
         end
 
         def apply_scope(doc)
           ensure_owner_saved
-          doc.send("#{self.foreign_key}=", @owner._id)
+          doc[foreign_key] = owner.id
           doc
         end
 
         def foreign_key
-          @association.options[:foreign_key] || @owner.class.name.underscore.gsub("/", "_") + "_id"
+          options[:foreign_key] || owner.class.name.underscore.gsub("/", "_") + "_id"
         end
     end
   end

data/lib/mongo_mapper/associations/many_embedded_polymorphic_proxy.rb

@@ -1,16 +1,14 @@
 module MongoMapper
   module Associations
-    class ManyEmbeddedPolymorphicProxy < Proxy
-      def replace(v)
-        @_values = v.map do |doc_or_hash|
-          if doc_or_hash.kind_of?(EmbeddedDocument)
-            doc = doc_or_hash
-            {@association.type_key_name => doc.class.name}.merge(doc.attributes)
+    class ManyEmbeddedPolymorphicProxy < Collection
+      def replace(values)
+        @_values = values.map do |v|
+          if v.kind_of?(EmbeddedDocument)
+            v.attributes.merge(reflection.type_key_name => v.class.name)
           else
-            doc_or_hash
+            v
           end
         end
-        
         reset
       end
 
@@ -22,10 +20,10 @@ module MongoMapper
         end
         
         def polymorphic_class(doc)
-          if class_name = doc[@association.type_key_name]
+          if class_name = doc[reflection.type_key_name]
             class_name.constantize
           else
-            @association.klass
+            klass
           end
         end
     end

data/lib/mongo_mapper/associations/many_embedded_proxy.rb

@@ -1,13 +1,15 @@
 module MongoMapper
   module Associations
-    class ManyEmbeddedProxy < Proxy
-      def replace(v)
-        @_values = v.map { |e| e.kind_of?(EmbeddedDocument) ? e.attributes : e }
+    class ManyEmbeddedProxy < Collection
+      def replace(values)
+        @_values = values.map do |v|
+          v.kind_of?(EmbeddedDocument) ? v.attributes : v
+        end
         reset
       end
 
       def build(attributes={})
-        doc = @association.klass.new(attributes)
+        doc = klass.new(attributes)
         assign_root_document(doc)
         self << doc
         doc
@@ -16,15 +18,14 @@ module MongoMapper
       # TODO: test that both string and oid version work
       def find(id)
         load_target
-        @target.detect { |item| item.id.to_s == id || item.id == id }
+        target.detect { |item| item.id.to_s == id || item.id == id }
       end
 
       def <<(*docs)
-        if load_target
-          docs.each do |doc|
-            assign_root_document(doc)
-            @target << doc
-          end
+        load_target
+        docs.each do |doc|
+          assign_root_document(doc)
+          target << doc
         end
       end
       alias_method :push, :<<
@@ -32,15 +33,15 @@ module MongoMapper
 
       private
         def find_target
-          (@_values || []).map do |e|
-            child = @association.klass.new(e)
+          (@_values || []).map do |v|
+            child = klass.new(v)
             assign_root_document(child)
             child
           end
         end
 
         def root_document
-          @owner._root_document || @owner
+          owner._root_document || owner
         end
 
         def assign_root_document(*docs)

data/lib/mongo_mapper/associations/many_polymorphic_proxy.rb

@@ -3,7 +3,7 @@ module MongoMapper
     class ManyPolymorphicProxy < ManyDocumentsProxy
       private
         def apply_scope(doc)
-          doc.send("#{@association.type_key_name}=", doc.class.name)
+          doc[reflection.type_key_name] = doc.class.name
           super
         end
     end

data/lib/mongo_mapper/associations/proxy.rb

@@ -1,67 +1,100 @@
 module MongoMapper
   module Associations
-    class Proxy < BasicObject
-      attr_reader :owner, :association
+    class Proxy
+      alias :proxy_respond_to? :respond_to?
+      alias :proxy_extend :extend
       
-      def initialize(owner, association)
-        @owner = owner
-        @association = association
-        @association.options[:extend].each { |ext| class << self; self; end.instance_eval { include ext } }
+      instance_methods.each { |m| undef_method m unless m =~ /(^__|^nil\?$|^send$|proxy_|^object_id$)/ }
+      
+      attr_reader :owner, :reflection, :target
+      
+      alias :proxy_owner :owner
+      alias :proxy_target :target
+      alias :proxy_reflection :reflection
+      
+      delegate :klass, :to => :proxy_reflection
+      delegate :options, :to => :proxy_reflection
+      delegate :collection, :to => :klass
+      
+      def initialize(owner, reflection)
+        @owner, @reflection = owner, reflection
+        Array(reflection.options[:extend]).each { |ext| proxy_extend(ext) }
         reset
       end
-
-      def respond_to?(*methods)
-        (load_target && @target.respond_to?(*methods))
+      
+      def inspect
+        load_target
+        target.inspect
       end
-
-      def reset
-        @target = nil
+      
+      def loaded?
+        @loaded
       end
-
-      def reload_target
-        reset
+      
+      def loaded
+        @loaded = true
+      end
+            
+      def nil?
         load_target
-        self
+        target.nil?
       end
-
-      def send(method, *args)
-        metaclass_instance_methods = class << self; self; end.instance_methods
-        
-        if metaclass_instance_methods.any? { |m| m.to_s == method.to_s }
-          return __send__(method, *args)
-        end
-        
+      
+      def blank?
         load_target
-        @target.send(method, *args)
+        target.blank?
       end
-
+      
+      def reload
+        reset
+        load_target
+        self unless target.nil?
+      end
+      
       def replace(v)
         raise NotImplementedError
       end
-      
-      def inspect
-        load_target
-        @target.inspect
+
+      def reset
+        @loaded = false
+        target = nil
+      end
+
+      def respond_to?(*args)
+        proxy_respond_to?(*args) || (load_target && target.respond_to?(*args))
+      end
+
+      def send(method, *args)
+        if proxy_respond_to?(method)
+          super
+        else
+          load_target
+          target.send(method, *args)
+        end
       end
       
-      def nil?
+      def ===(other)
         load_target
-        @target.nil?
+        other === target
       end
       
       protected
         def method_missing(method, *args, &block)
           if load_target
-            if block.nil?
-              @target.send(method, *args)
+            if block_given?
+              target.send(method, *args)  { |*block_args| block.call(*block_args) }
             else
-              @target.send(method, *args)  { |*block_args| block.call(*block_args) }
+              target.send(method, *args)
             end
           end
         end
 
         def load_target
-          @target ||= find_target
+          @target = find_target unless loaded?
+          loaded
+          @target
+        rescue MongoMapper::DocumentNotFound
+          reset
         end
 
         def find_target

data/lib/mongo_mapper/document.rb

@@ -316,18 +316,6 @@ module MongoMapper
         superclass.respond_to?(:keys) && superclass.keys.has_key?('_type')
       end
 
-      protected
-        def method_missing(method, *args)
-          finder = DynamicFinder.new(method)
-
-          if finder.found?
-            meta_def(finder.method) { |*args| dynamic_find(finder, args) }
-            send(finder.method, *args)
-          else
-            super
-          end
-        end
-
       private
         def create_indexes_for(key)
           ensure_index key.name if key.options[:index]
@@ -438,7 +426,10 @@ module MongoMapper
       end
 
       def reload
-        self.class.find(_id)
+        doc = self.class.find(_id)
+        self.class.associations.each { |name, assoc| send(name).reset }
+        self.attributes = doc.attributes
+        self
       end
 
     private

data/lib/mongo_mapper/dynamic_finder.rb

@@ -1,4 +1,39 @@
 module MongoMapper
+  # @api private
+  module Finders
+    def dynamic_find(finder, args)
+      attributes = {}
+      finder.attributes.each_with_index do |attr, index|
+        attributes[attr] = args[index]
+      end
+      
+      options = args.extract_options!.merge(attributes)
+      
+      if result = find(finder.finder, options)
+        result
+      else
+        if finder.raise?
+          raise DocumentNotFound, "Couldn't find Document with #{attributes.inspect} in collection named #{collection.name}"
+        end
+        
+        if finder.instantiator
+          self.send(finder.instantiator, attributes)
+        end
+      end
+    end
+    
+    protected
+      def method_missing(method, *args, &block)
+        finder = DynamicFinder.new(method)
+
+        if finder.found?
+          dynamic_find(finder, args)
+        else
+          super
+        end
+      end
+  end
+  
   class DynamicFinder
     attr_reader :method, :attributes, :finder, :bang, :instantiator
 
@@ -6,12 +41,16 @@ module MongoMapper
       @method = method
       @finder = :first
       @bang   = false
-      match()
+      match
     end
 
     def found?
       @finder.present?
     end
+    
+    def raise?
+      bang == true
+    end
 
     protected
       def match

data/lib/mongo_mapper/pagination.rb

@@ -1,6 +1,8 @@
 module MongoMapper
   module Pagination
-    class PaginationProxy < BasicObject
+    class PaginationProxy
+      instance_methods.each { |m| undef_method m unless m =~ /(^__|^nil\?$|proxy_|^object_id$)/ }
+      
       attr_accessor :subject
       attr_reader :total_entries, :per_page, :current_page
       alias limit per_page

data/lib/mongo_mapper/support.rb

@@ -1,9 +1,5 @@
 require 'set'
 
-class BasicObject #:nodoc:
-  instance_methods.each { |m| undef_method m unless m =~ /(^__|instance_eval)/ }
-end unless defined?(BasicObject)
-
 class Array
   def self.to_mongo(value)
     value = value.respond_to?(:lines) ? value.lines : value

data/lib/mongo_mapper/validations.rb

@@ -32,7 +32,7 @@ module MongoMapper
       def where_conditions(instance)
         conditions = {}
         unless case_sensitive
-          conditions.merge!({'$where' => "this.#{attribute}.toLowerCase() == '#{instance[attribute].downcase}'"})
+          conditions.merge!({'$where' => "this.#{attribute}.toLowerCase() == '#{instance[attribute].to_s.downcase}'"})
         end
         conditions
       end

data/mongo_mapper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongo_mapper}
-  s.version = "0.6.6"
+  s.version = "0.6.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]
-  s.date = %q{2009-12-05}
+  s.date = %q{2009-12-13}
   s.default_executable = %q{mmconsole}
   s.email = %q{nunemaker@gmail.com}
   s.executables = ["mmconsole"]
@@ -29,12 +29,12 @@ Gem::Specification.new do |s|
      "lib/mongo_mapper/associations/base.rb",
      "lib/mongo_mapper/associations/belongs_to_polymorphic_proxy.rb",
      "lib/mongo_mapper/associations/belongs_to_proxy.rb",
+     "lib/mongo_mapper/associations/collection.rb",
      "lib/mongo_mapper/associations/many_documents_as_proxy.rb",
      "lib/mongo_mapper/associations/many_documents_proxy.rb",
      "lib/mongo_mapper/associations/many_embedded_polymorphic_proxy.rb",
      "lib/mongo_mapper/associations/many_embedded_proxy.rb",
      "lib/mongo_mapper/associations/many_polymorphic_proxy.rb",
-     "lib/mongo_mapper/associations/many_proxy.rb",
      "lib/mongo_mapper/associations/proxy.rb",
      "lib/mongo_mapper/callbacks.rb",
      "lib/mongo_mapper/dirty.rb",
@@ -57,10 +57,10 @@ Gem::Specification.new do |s|
      "test/functional/associations/test_belongs_to_polymorphic_proxy.rb",
      "test/functional/associations/test_belongs_to_proxy.rb",
      "test/functional/associations/test_many_documents_as_proxy.rb",
+     "test/functional/associations/test_many_documents_proxy.rb",
      "test/functional/associations/test_many_embedded_polymorphic_proxy.rb",
      "test/functional/associations/test_many_embedded_proxy.rb",
      "test/functional/associations/test_many_polymorphic_proxy.rb",
-     "test/functional/associations/test_many_proxy.rb",
      "test/functional/test_associations.rb",
      "test/functional/test_binary.rb",
      "test/functional/test_callbacks.rb",
@@ -76,8 +76,9 @@ Gem::Specification.new do |s|
      "test/support/custom_matchers.rb",
      "test/support/timing.rb",
      "test/test_helper.rb",
+     "test/unit/associations/test_base.rb",
+     "test/unit/associations/test_proxy.rb",
      "test/unit/serializers/test_json_serializer.rb",
-     "test/unit/test_association_base.rb",
      "test/unit/test_document.rb",
      "test/unit/test_dynamic_finder.rb",
      "test/unit/test_embedded_document.rb",
@@ -101,10 +102,10 @@ Gem::Specification.new do |s|
     "test/functional/associations/test_belongs_to_polymorphic_proxy.rb",
      "test/functional/associations/test_belongs_to_proxy.rb",
      "test/functional/associations/test_many_documents_as_proxy.rb",
+     "test/functional/associations/test_many_documents_proxy.rb",
      "test/functional/associations/test_many_embedded_polymorphic_proxy.rb",
      "test/functional/associations/test_many_embedded_proxy.rb",
      "test/functional/associations/test_many_polymorphic_proxy.rb",
-     "test/functional/associations/test_many_proxy.rb",
      "test/functional/test_associations.rb",
      "test/functional/test_binary.rb",
      "test/functional/test_callbacks.rb",
@@ -120,8 +121,9 @@ Gem::Specification.new do |s|
      "test/support/custom_matchers.rb",
      "test/support/timing.rb",
      "test/test_helper.rb",
+     "test/unit/associations/test_base.rb",
+     "test/unit/associations/test_proxy.rb",
      "test/unit/serializers/test_json_serializer.rb",
-     "test/unit/test_association_base.rb",
      "test/unit/test_document.rb",
      "test/unit/test_dynamic_finder.rb",
      "test/unit/test_embedded_document.rb",

data/test/functional/associations/{test_many_proxy.rb → test_many_documents_proxy.rb}

@@ -1,7 +1,7 @@
 require 'test_helper'
 require 'models'
 
-class ManyProxyTest < Test::Unit::TestCase
+class ManyDocumentsProxyTest < Test::Unit::TestCase
   def setup
     Project.collection.remove
     Status.collection.remove
@@ -37,16 +37,16 @@ class ManyProxyTest < Test::Unit::TestCase
     project.statuses.concat Status.new(:name => 'concat')
     
     project = project.reload
-    project.statuses[0].project_id.should == project._id
-    project.statuses[1].project_id.should == project._id
-    project.statuses[2].project_id.should == project._id
+    project.statuses[0].project_id.should == project.id
+    project.statuses[1].project_id.should == project.id
+    project.statuses[2].project_id.should == project.id
   end
   
   context "build" do
     should "assign foreign key" do
       project = Project.create
       status = project.statuses.build
-      status.project_id.should == project._id
+      status.project_id.should == project.id
     end
 
     should "allow assigning attributes" do
@@ -60,7 +60,7 @@ class ManyProxyTest < Test::Unit::TestCase
     should "assign foreign key" do
       project = Project.create
       status = project.statuses.create(:name => 'Foo!')
-      status.project_id.should == project._id
+      status.project_id.should == project.id
     end
     
     should "save record" do
@@ -81,7 +81,7 @@ class ManyProxyTest < Test::Unit::TestCase
     should "assign foreign key" do
       project = Project.create
       status = project.statuses.create!(:name => 'Foo!')
-      status.project_id.should == project._id
+      status.project_id.should == project.id
     end
     
     should "save record" do
@@ -205,11 +205,14 @@ class ManyProxyTest < Test::Unit::TestCase
     context "dynamic finders" do
       should "work with single key" do
         @project1.statuses.find_by_name('New').should == @brand_new
+        @project1.statuses.find_by_name!('New').should == @brand_new
         @project2.statuses.find_by_name('In Progress').should == @in_progress
+        @project2.statuses.find_by_name!('In Progress').should == @in_progress
       end
       
       should "work with multiple keys" do
         @project1.statuses.find_by_name_and_position('New', 1).should == @brand_new
+        @project1.statuses.find_by_name_and_position!('New', 1).should == @brand_new
         @project1.statuses.find_by_name_and_position('New', 2).should be_nil
       end
       
@@ -315,25 +318,25 @@ class ManyProxyTest < Test::Unit::TestCase
     
     context "with one id" do
       should "work for id in association" do
-        @project1.statuses.find(@complete._id).should == @complete
+        @project1.statuses.find(@complete.id).should == @complete
       end
       
       should "not work for id not in association" do
         lambda {
-          @project1.statuses.find!(@archived._id)
+          @project1.statuses.find!(@archived.id)
         }.should raise_error(MongoMapper::DocumentNotFound)
       end
     end
     
     context "with multiple ids" do
       should "work for ids in association" do
-        statuses = @project1.statuses.find(@brand_new._id, @complete._id)
+        statuses = @project1.statuses.find(@brand_new.id, @complete.id)
         statuses.should == [@brand_new, @complete]
       end
       
       should "not work for ids not in association" do
         lambda {
-          @project1.statuses.find!(@brand_new._id, @complete._id, @archived._id)
+          @project1.statuses.find!(@brand_new.id, @complete.id, @archived.id)
         }.should raise_error(MongoMapper::DocumentNotFound)
       end
     end

data/test/functional/associations/test_many_embedded_proxy.rb

@@ -26,7 +26,7 @@ class ManyEmbeddedProxyTest < Test::Unit::TestCase
     project.addresses << chi
     project.save
 
-    project = project.reload
+    project.reload
     project.addresses.size.should == 2
     project.addresses[0].should == sb
     project.addresses[1].should == chi
@@ -47,7 +47,7 @@ class ManyEmbeddedProxyTest < Test::Unit::TestCase
     doc = @document.new(:person => meg)
     doc.save
     
-    doc = doc.reload
+    doc.reload
     doc.person.name.should == 'Meg'
     doc.person.child.name.should == 'Steve'
     doc.person.child.child.name.should == 'Linda'
@@ -70,7 +70,7 @@ class ManyEmbeddedProxyTest < Test::Unit::TestCase
     pet_lover.pets[1].species.should == "Siberian Husky"
     pet_lover.save.should be_true
     
-    pet_lover = pet_lover.reload
+    pet_lover.reload
     pet_lover.name.should == "Mr. Pet Lover"
     pet_lover.pets[0].name.should == "Jimmy"
     pet_lover.pets[0].species.should == "Cocker Spainel"
@@ -89,19 +89,17 @@ class ManyEmbeddedProxyTest < Test::Unit::TestCase
     end
 
     should "persist all embedded documents" do
-      meg = Person.new(:name => "Meg")
+      meg    = Person.new(:name => "Meg")
       sparky = Pet.new(:name => "Sparky", :species => "Dog")
-      koda = Pet.new(:name => "Koda", :species => "Dog")
+      koda   = Pet.new(:name => "Koda", :species => "Dog")
 
       doc = @document.new
-
       meg.pets << sparky
       meg.pets << koda
-
       doc.people << meg
       doc.save
 
-      doc = doc.reload
+      doc.reload
       doc.people.first.name.should == "Meg"
       doc.people.first.pets.should_not == []
       doc.people.first.pets.first.name.should == "Sparky"
@@ -111,11 +109,9 @@ class ManyEmbeddedProxyTest < Test::Unit::TestCase
     end
 
     should "create a reference to the root document for all embedded documents before save" do
-      meg = Person.new(:name => "Meg")
+      meg    = Person.new(:name => "Meg")
       sparky = Pet.new(:name => "Sparky", :species => "Dog")
-
-      doc = @document.new
-
+      doc    = @document.new
       doc.people << meg
       meg.pets << sparky
 
@@ -125,12 +121,12 @@ class ManyEmbeddedProxyTest < Test::Unit::TestCase
 
     should "create a reference to the root document for all embedded documents" do
       sparky = Pet.new(:name => "Sparky", :species => "Dog")
-      meg = Person.new(:name => "Meg", :pets => [sparky])
-      doc = @document.new
+      meg    = Person.new(:name => "Meg", :pets => [sparky])
+      doc    = @document.new
       doc.people << meg
       doc.save
 
-      doc = doc.reload
+      doc.reload
       doc.people.first._root_document.should == doc
       doc.people.first.pets.first._root_document.should == doc
     end

data/test/functional/test_associations.rb

@@ -40,5 +40,5 @@ class AssociationsTest < Test::Unit::TestCase
     
     post1 = post1.reload
     post1.tags.should == [tag1]
-  end  
+  end
 end

data/test/functional/test_document.rb

@@ -32,7 +32,9 @@ class DocumentTest < Test::Unit::TestCase
 
     should "not fail" do
       doc = @document.new(:file => nil)
-      doc.save
+      lambda {
+        doc.save
+      }.should_not raise_error
     end
   end
 
@@ -1178,13 +1180,47 @@ class DocumentTest < Test::Unit::TestCase
 
   context "reload" do
     setup do
-      @doc_instance_1 = @document.create({:first_name => 'Ryan', :last_name => 'Koopmans', :age => '37'})
-      @doc_instance_2 = @document.update(@doc_instance_1._id, {:age => '39'})
+      @foo_class = Class.new do
+        include MongoMapper::Document
+        key :name
+      end
+      @foo_class.collection.remove
+      
+      @bar_class = Class.new do
+        include MongoMapper::EmbeddedDocument
+        key :name
+      end
+      
+      @document.many :foos, :class => @foo_class
+      @document.many :bars, :class => @bar_class
+      
+      @instance = @document.create({
+        :age => 39,
+        :foos => [@foo_class.new(:name => '1')],
+        :bars => [@bar_class.new(:name => '1')],
+      })
     end
 
-    should "load fresh information from the database" do
-      @doc_instance_1.age.should == 37
-      @doc_instance_1.reload.age.should == 39
+    should "reload keys from the database" do
+      @instance.age = 37
+      @instance.age.should == 37
+      @instance.reload
+      @instance.age.should == 39
+    end
+    
+    should "reset all associations" do
+      @instance.foos.expects(:reset).at_least_once
+      @instance.bars.expects(:reset).at_least_once
+      @instance.reload
+    end
+    
+    should "reinstantiate embedded associations" do
+      @instance.reload
+      @instance.bars.first.name.should == '1'
+    end
+    
+    should "return self" do
+      @instance.reload.object_id.should == @instance.object_id
     end
   end
 end

data/test/functional/test_validations.rb

@@ -246,20 +246,29 @@ class ValidationsTest < Test::Unit::TestCase
       doc2.should_not have_error_on(:name)
     end
 
-    should "fail on entries that differ only in case if :case_sensitive => false" do
-      document = Class.new do
-        include MongoMapper::Document
-        set_collection_name 'test'
+    context "with :case_sensitive => false" do
+      setup do
+        @document = Class.new do
+          include MongoMapper::Document
+          set_collection_name 'test'
 
-        key :name
-        validates_uniqueness_of :name, :case_sensitive => false
+          key :name
+          validates_uniqueness_of :name, :case_sensitive => false
+        end
       end
+      
+      should "fail on entries that differ only in case" do
+        doc = @document.new("name" => "BLAMMO")
+        doc.save.should be_true
 
-      doc = document.new("name" => "BLAMMO")
-      doc.save.should be_true
+        doc2 = @document.new("name" => "blammo")
+        doc2.should have_error_on(:name)
+      end
 
-      doc2 = document.new("name" => "blammo")
-      doc2.should have_error_on(:name)
+      should "not raise an error if value is nil" do
+        doc = @document.new("name" => nil)
+        lambda { doc.valid? }.should_not raise_error
+      end
     end
 
     context "scoped by a single attribute" do

data/test/unit/{test_association_base.rb → associations/test_base.rb}

@@ -132,9 +132,9 @@ class AssociationBaseTest < Test::Unit::TestCase
   end
   
   context "proxy_class" do
-    should "be ManyProxy for many" do      
+    should "be ManyDocumentsProxy for many" do      
       base = Base.new(:many, :statuses)
-      base.proxy_class.should == ManyProxy
+      base.proxy_class.should == ManyDocumentsProxy
     end
     
     should "be ManyPolymorphicProxy for polymorphic many" do

data/test/unit/associations/test_proxy.rb

@@ -0,0 +1,91 @@
+require 'test_helper'
+
+class FakeNilProxy < MongoMapper::Associations::Proxy
+  def find_target; nil end
+end
+
+class FakeBlankProxy < MongoMapper::Associations::Proxy
+  def find_target; '' end
+end
+
+class FakeProxy < MongoMapper::Associations::Proxy
+  def find_target
+    [1, 2]
+  end
+end
+
+class ProxyTest < Test::Unit::TestCase
+  def setup
+    @owner = mock('owner')
+    @owner.stubs(:new?).returns(false)
+    @association = mock('association')
+    @association.stubs(:options).returns({:extend => []})
+
+    @proxy       = FakeProxy.new(@owner, @association)
+    @nil_proxy   = FakeNilProxy.new(@owner, @association)
+    @blank_proxy = FakeBlankProxy.new(@owner, @association)
+  end
+  
+  should 'return true for === target' do
+    @proxy = FakeProxy.new(@owner, @association)
+    @proxy.should === Array
+  end
+  
+  should "set target to nil when reset is called" do
+    @proxy.reset
+    @proxy.target.should be_nil
+  end
+  
+  should "be able to inspect the proxy" do
+    @proxy.inspect.should == '[1, 2]'
+  end
+  
+  context "nil?" do
+    should "be true if nil" do
+      @nil_proxy.nil?.should be_true
+    end
+    
+    should "be false if not nil" do
+      @proxy.nil?.should be_false
+    end
+  end
+  
+  context "blank?" do
+    should "be true if blank" do
+      @blank_proxy.blank?.should be_true
+    end
+    
+    should "be false if not blank" do
+      @proxy.blank?.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
+    @proxy.respond_to?(:gsub).should be_false
+  end
+  
+  should "alias proxy owner to owner" do
+    @proxy.proxy_owner.should == @owner
+  end
+  
+  should "alias proxy target to target" do
+    @proxy.proxy_target.should == @target
+  end
+  
+  context "send" do
+    should "work if proxy responds to method" do
+      @proxy.send(:reset)
+      @proxy.target.should be_nil
+    end
+    
+    should "work if the target responds to the method" do
+      @proxy.send(:size).should == 2
+    end
+    
+    should "not work if neither the proxy or target respond to method" do
+      lambda { @proxy.send(:gsub) }.should raise_error
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_mapper
 version: !ruby/object:Gem::Version 
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-05 00:00:00 -05:00
+date: 2009-12-13 00:00:00 -05:00
 default_executable: mmconsole
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -103,12 +103,12 @@ files:
 - lib/mongo_mapper/associations/base.rb
 - lib/mongo_mapper/associations/belongs_to_polymorphic_proxy.rb
 - lib/mongo_mapper/associations/belongs_to_proxy.rb
+- lib/mongo_mapper/associations/collection.rb
 - lib/mongo_mapper/associations/many_documents_as_proxy.rb
 - lib/mongo_mapper/associations/many_documents_proxy.rb
 - lib/mongo_mapper/associations/many_embedded_polymorphic_proxy.rb
 - lib/mongo_mapper/associations/many_embedded_proxy.rb
 - lib/mongo_mapper/associations/many_polymorphic_proxy.rb
-- lib/mongo_mapper/associations/many_proxy.rb
 - lib/mongo_mapper/associations/proxy.rb
 - lib/mongo_mapper/callbacks.rb
 - lib/mongo_mapper/dirty.rb
@@ -131,10 +131,10 @@ files:
 - test/functional/associations/test_belongs_to_polymorphic_proxy.rb
 - test/functional/associations/test_belongs_to_proxy.rb
 - test/functional/associations/test_many_documents_as_proxy.rb
+- test/functional/associations/test_many_documents_proxy.rb
 - test/functional/associations/test_many_embedded_polymorphic_proxy.rb
 - test/functional/associations/test_many_embedded_proxy.rb
 - test/functional/associations/test_many_polymorphic_proxy.rb
-- test/functional/associations/test_many_proxy.rb
 - test/functional/test_associations.rb
 - test/functional/test_binary.rb
 - test/functional/test_callbacks.rb
@@ -150,8 +150,9 @@ files:
 - test/support/custom_matchers.rb
 - test/support/timing.rb
 - test/test_helper.rb
+- test/unit/associations/test_base.rb
+- test/unit/associations/test_proxy.rb
 - test/unit/serializers/test_json_serializer.rb
-- test/unit/test_association_base.rb
 - test/unit/test_document.rb
 - test/unit/test_dynamic_finder.rb
 - test/unit/test_embedded_document.rb
@@ -197,10 +198,10 @@ test_files:
 - test/functional/associations/test_belongs_to_polymorphic_proxy.rb
 - test/functional/associations/test_belongs_to_proxy.rb
 - test/functional/associations/test_many_documents_as_proxy.rb
+- test/functional/associations/test_many_documents_proxy.rb
 - test/functional/associations/test_many_embedded_polymorphic_proxy.rb
 - test/functional/associations/test_many_embedded_proxy.rb
 - test/functional/associations/test_many_polymorphic_proxy.rb
-- test/functional/associations/test_many_proxy.rb
 - test/functional/test_associations.rb
 - test/functional/test_binary.rb
 - test/functional/test_callbacks.rb
@@ -216,8 +217,9 @@ test_files:
 - test/support/custom_matchers.rb
 - test/support/timing.rb
 - test/test_helper.rb
+- test/unit/associations/test_base.rb
+- test/unit/associations/test_proxy.rb
 - test/unit/serializers/test_json_serializer.rb
-- test/unit/test_association_base.rb
 - test/unit/test_document.rb
 - test/unit/test_dynamic_finder.rb
 - test/unit/test_embedded_document.rb

data/lib/mongo_mapper/associations/many_proxy.rb

@@ -1,6 +0,0 @@
-module MongoMapper
-  module Associations
-    class ManyProxy < ManyDocumentsProxy
-    end
-  end
-end