Removing decorator for method missing - cleaner code

lib/mongoid/associations/belongs_to.rb

@@ -2,7 +2,9 @@
 module Mongoid #:nodoc:
   module Associations #:nodoc:
     class BelongsTo #:nodoc:
-      include Decorator
+
+      delegate :==, :to => :document
+      attr_reader :document, :options
 
       # Creates the new association by setting the internal
       # document as the passed in Document. This should be the
@@ -16,8 +18,7 @@ class BelongsTo #:nodoc:
       # document: The parent +Document+
       # options: The association options
       def initialize(document, options)
-        @document = document
-        decorate!
+        @document, @options = document, options
       end
 
       # Returns the parent document. The id param is present for
@@ -27,6 +28,11 @@ def find(id)
         @document
       end
 
+      # Delegate all missing methods over to the parent +Document+.
+      def method_missing(name, *args)
+        @document.send(name, *args)
+      end
+
       class << self
         # Creates the new association by setting the internal
         # document as the passed in Document. This should be the

lib/mongoid/associations/has_one.rb

@@ -2,16 +2,13 @@
 module Mongoid #:nodoc:
   module Associations #:nodoc:
     class HasOne #:nodoc:
-      include Decorator
 
-      delegate :valid?, :to => :document
-
-      attr_accessor :parent, :options
+      delegate :==, :to => :document
+      attr_reader :document, :parent, :options
 
       # Build a new object for the association.
       def build(attributes)
         @document = attributes.assimilate(@parent, @options)
-        decorate!
         self
       end
 
@@ -38,10 +35,14 @@ def initialize(document, attributes, options)
         @parent, @options = document, options
         unless attributes.nil?
           @document = attributes.assimilate(@parent, @options)
-          decorate!
         end
       end
 
+      # Delegate all missing methods over to the +Document+.
+      def method_missing(name, *args)
+        @document.send(name, *args)
+      end
+
       class << self
         # Preferred method of instantiating a new +HasOne+, since nil values
         # will be handled properly.