mongoid 1.2.10 → 1.2.11

data/VERSION

@@ -1 +1 @@
-1.2.10
+1.2.11

data/lib/mongoid/associations/has_many_related.rb

@@ -64,10 +64,27 @@ module Mongoid #:nodoc:
       def initialize(document, options, target = nil)
         @parent, @klass = document, options.klass
         @foreign_key = options.foreign_key
-        @target = target || @klass.all(:conditions => { @foreign_key => document.id })
+        @base = lambda { @klass.all(:conditions => { @foreign_key => document.id }) }
+        @target = target || @base.call
         extends(options)
       end
 
+      # Override the default behavior to allow the criteria to get reset on
+      # each call into the association.
+      #
+      # Example:
+      #
+      #   person.posts.where(:title => "New")
+      #   person.posts # resets the criteria
+      #
+      # Returns:
+      #
+      # A Criteria object or Array.
+      def method_missing(name, *args, &block)
+        @target = @base.call unless @target.is_a?(Array)
+        @target.send(name, *args, &block)
+      end
+
       # Delegates to <<
       def push(*objects)
         self << objects

data/mongoid.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "1.2.10"
+  s.version = "1.2.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]

data/spec/integration/mongoid/associations_spec.rb

@@ -216,10 +216,33 @@ describe Mongoid::Associations do
 
         end
 
-      end
+        context "calling criteria methods" do
 
-    end
+          before do
+            @post.title = "New Title"
+            @post.save
+          end
+
+          it "returns the proper object for the criteria" do
+            posts = @from_db.posts.where(:title => "New Title")
+            posts.size.should == 1
+          end
+
+          context "when calling with a new criteria" do
 
+            before do
+              @from_db.posts.create(:title => "Other Title")
+            end
+
+            it "does not retain the old criteria" do
+              @from_db.posts.where(:title => "New Title").size.should == 1
+              @from_db.posts.size.should == 2
+              @from_db.posts.where(:title => "Other Title").size.should == 1
+            end
+          end
+        end
+      end
+    end
   end
 
   context "nested embedded associations" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 2
-  - 10
-  version: 1.2.10
+  - 11
+  version: 1.2.11
 platform: ruby
 authors: 
 - Durran Jordan