Don't go through yoda on the bindings anymore

mongoid · Jul 26, 2011 · 7387c38 · 7387c38
1 parent ee1bdaf
commit 7387c38
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/lib/mongoid/relations/bindings/referenced/in.rb b/lib/mongoid/relations/bindings/referenced/in.rb
@@ -22,16 +22,16 @@ def bind
             unless binding?
               binding do
                 inverse = metadata.inverse(target)
-                base.do_or_do_not(metadata.foreign_key_setter, target.id)
+                base.send(metadata.foreign_key_setter, target.id)
                 if metadata.inverse_type
-                  base.do_or_do_not(metadata.inverse_type_setter, target.class.model_name)
+                  base.send(metadata.inverse_type_setter, target.class.model_name)
                 end
                 if inverse
-                  base.metadata = target.reflect_on_association(inverse)
+                  base.metadata = metadata.inverse_metadata(target)
                   if base.referenced_many?
-                    target.do_or_do_not(inverse).push(base)
+                    target.send(inverse).push(base)
                   else
-                    target.do_or_do_not(metadata.inverse_setter(target), base)
+                    target.send(metadata.inverse_setter(target), base)
                   end
                 end
               end
@@ -50,10 +50,17 @@ def bind
           def unbind
             unless binding?
               binding do
-                base.do_or_do_not(metadata.foreign_key_setter, nil)
-                target.do_or_do_not(metadata.inverse_setter(target), nil)
+                inverse = metadata.inverse(target)
+                base.send(metadata.foreign_key_setter, nil)
                 if metadata.inverse_type
-                  base.do_or_do_not(metadata.inverse_type_setter, nil)
+                  base.send(metadata.inverse_type_setter, nil)
+                end
+                if inverse
+                  if base.referenced_many?
+                    target.send(inverse).delete(base)
+                  else
+                    target.send(metadata.inverse_setter(target), nil)
+                  end
                 end
               end
             end

diff --git a/lib/mongoid/relations/bindings/referenced/one.rb b/lib/mongoid/relations/bindings/referenced/one.rb
@@ -21,8 +21,8 @@ class One < Binding
           def bind
             unless binding?
               binding do
-                target.do_or_do_not(metadata.foreign_key_setter, base.id)
-                target.do_or_do_not(metadata.inverse_setter, base)
+                target.send(metadata.foreign_key_setter, base.id)
+                target.send(metadata.inverse_setter, base)
                 if metadata.type
                   target.send(metadata.type_setter, base.class.model_name)
                 end
@@ -42,8 +42,8 @@ def bind
           def unbind
             unless binding?
               binding do
-                target.do_or_do_not(metadata.foreign_key_setter, nil)
-                target.do_or_do_not(metadata.inverse_setter, nil)
+                target.send(metadata.foreign_key_setter, nil)
+                target.send(metadata.inverse_setter, nil)
                 if metadata.type
                   target.send(metadata.type_setter, nil)
                 end