diff --git a/lib/draper/decorator.rb b/lib/draper/decorator.rb
index d7ce452..fb8e75d 100755
--- a/lib/draper/decorator.rb
+++ b/lib/draper/decorator.rb
@@ -157,21 +157,12 @@ module Draper
     end
 
     def method_missing(method, *args, &block)
-      super unless allow?(method)
-
-      if source.respond_to?(method)
-        self.class.send :define_method, method do |*args, &blokk|
-          source.send method, *args, &blokk
-        end
-
-        send method, *args, &block
+      if allow?(method) && source.respond_to?(method)
+        self.class.define_proxy(method)
+        send(method, *args, &block)
       else
         super
       end
-
-    rescue NoMethodError => no_method_error
-      super if no_method_error.name == method
-      raise no_method_error
     end
 
     # For ActiveModel compatibilty
@@ -184,7 +175,13 @@ module Draper
       source.to_param
     end
 
-  private
+    private
+
+    def self.define_proxy(method)
+      define_method(method) do |*args, &block|
+        source.send(method, *args, &block)
+      end
+    end
 
     def self.security
       @security ||= Security.new
diff --git a/spec/draper/decorator_spec.rb b/spec/draper/decorator_spec.rb
index fc9b986..9222129 100755
--- a/spec/draper/decorator_spec.rb
+++ b/spec/draper/decorator_spec.rb
@@ -210,56 +210,11 @@ describe Draper::Decorator do
     end
   end
 
-  describe "method selection" do
-    it "echos the methods of the wrapped class" do
-      source.methods.each do |method|
-        subject.respond_to?(method.to_sym, true).should be_true
-      end
+  describe "#to_param" do
+    it "proxies to the source" do
+      source.stub(:to_param).and_return(42)
+      subject.to_param.should == 42
     end
-
-    it "not override a defined method with a source method" do
-      DecoratorWithApplicationHelper.new(source).length.should == "overridden"
-    end
-
-    it "not copy the .class, .inspect, or other existing methods" do
-      source.class.should_not == subject.class
-      source.inspect.should_not == subject.inspect
-      source.to_s.should_not == subject.to_s
-    end
-
-    context "when an ActiveModel descendant" do
-      it "always proxy to_param if it is not defined on the decorator itself" do
-        source.stub(:to_param).and_return(1)
-        Draper::Decorator.new(source).to_param.should == 1
-      end
-
-      it "always proxy id if it is not defined on the decorator itself" do
-        source.stub(:id).and_return(123456789)
-        Draper::Decorator.new(source).id.should == 123456789
-      end
-
-      it "always proxy errors if it is not defined on the decorator itself" do
-        Draper::Decorator.new(source).errors.should be_an_instance_of ActiveModel::Errors
-      end
-
-      it "never proxy to_param if it is defined on the decorator itself" do
-        source.stub(:to_param).and_return(1)
-        DecoratorWithSpecialMethods.new(source).to_param.should == "foo"
-      end
-
-      it "never proxy id if it is defined on the decorator itself" do
-        source.stub(:id).and_return(123456789)
-        DecoratorWithSpecialMethods.new(source).id.should == 1337
-      end
-
-      it "never proxy errors if it is defined on the decorator itself" do
-        DecoratorWithSpecialMethods.new(source).errors.should be_an_instance_of Array
-      end
-    end
-  end
-
-  it "wrap source methods so they still accept blocks" do
-    subject.block{"marker"}.should == "marker"
   end
 
   describe "#==" do
@@ -270,13 +225,104 @@ describe Draper::Decorator do
   end
 
   describe "#respond_to?" do
-    # respond_to? is called by some proxies (id, to_param, errors).
-    # This is, why I stub it this way.
-    it "delegates to the decorated model" do
-      other = Draper::Decorator.new(source)
-      source.stub(:respond_to?).and_return(false)
-      source.should_receive(:respond_to?).with(:whatever, true).once.and_return("mocked")
-      subject.respond_to?(:whatever, true).should == "mocked"
+    subject { Class.new(ProductDecorator).new(source) }
+
+    it "returns true for its own methods" do
+      subject.should respond_to :awesome_title
+    end
+
+    it "returns true for the source's methods" do
+      subject.should respond_to :title
+    end
+
+    context "with include_private" do
+      it "returns true for its own private methods" do
+        subject.respond_to?(:awesome_private_title, true).should be_true
+      end
+
+      it "returns true for the source's private methods" do
+        subject.respond_to?(:private_title, true).should be_true
+      end
+    end
+
+    context "with method security" do
+      it "respects allows" do
+        subject.class.allows :hello_world
+
+        subject.should respond_to :hello_world
+        subject.should_not respond_to :goodnight_moon
+      end
+
+      it "respects denies" do
+        subject.class.denies :goodnight_moon
+
+        subject.should respond_to :hello_world
+        subject.should_not respond_to :goodnight_moon
+      end
+
+      it "respects denies_all" do
+        subject.class.denies_all
+
+        subject.should_not respond_to :hello_world
+        subject.should_not respond_to :goodnight_moon
+      end
+    end
+  end
+
+  describe "method proxying" do
+    subject { Class.new(ProductDecorator).new(source) }
+
+    it "does not proxy methods that are defined on the decorator" do
+      subject.overridable.should be :overridden
+    end
+
+    it "does not proxy methods inherited from Object" do
+      subject.inspect.should_not be source.inspect
+    end
+
+    it "proxies missing methods that exist on the source" do
+      source.stub(:hello_world).and_return(:proxied)
+      subject.hello_world.should be :proxied
+    end
+
+    it "adds proxied methods to the decorator when they are used" do
+      subject.methods.should_not include :hello_world
+      subject.hello_world
+      subject.methods.should include :hello_world
+    end
+
+    it "passes blocks to proxied methods" do
+      subject.block{"marker"}.should == "marker"
+    end
+
+    it "does not confuse Kernel#Array" do
+      Array(subject).should be_a Array
+    end
+
+    context "with method security" do
+      it "respects allows" do
+        source.stub(:hello_world, :goodnight_moon).and_return(:proxied)
+        subject.class.allows :hello_world
+
+        subject.hello_world.should be :proxied
+        expect{subject.goodnight_moon}.to raise_error NameError
+      end
+
+      it "respects denies" do
+        source.stub(:hello_world, :goodnight_moon).and_return(:proxied)
+        subject.class.denies :goodnight_moon
+
+        subject.hello_world.should be :proxied
+        expect{subject.goodnight_moon}.to raise_error NameError
+      end
+
+      it "respects denies_all" do
+        source.stub(:hello_world, :goodnight_moon).and_return(:proxied)
+        subject.class.denies_all
+
+        expect{subject.hello_world}.to raise_error NameError
+        expect{subject.goodnight_moon}.to raise_error NameError
+      end
     end
   end
 
@@ -316,7 +362,7 @@ describe Draper::Decorator do
       decorator.sample_link.should == "<a href=\"/World\">Hello</a>"
     end
 
-    it "is able to use the pluralize helper" do
+    it "is able to use the truncate helper" do
       decorator.sample_truncate.should == "Once..."
     end
 
@@ -325,44 +371,6 @@ describe Draper::Decorator do
     end
   end
 
-  describe "#method_missing" do
-    context "with an isolated decorator class" do
-      let(:decorator_class) { Class.new(Decorator) }
-      subject{ decorator_class.new(source) }
-
-      context "when #hello_world is called again" do
-        it "proxies method directly after first hit" do
-          subject.methods.should_not include(:hello_world)
-          subject.hello_world
-          subject.methods.should include(:hello_world)
-        end
-      end
-
-      context "when #hello_world is called for the first time" do
-        it "hits method missing" do
-          subject.should_receive(:method_missing)
-          subject.hello_world
-        end
-      end
-    end
-
-    context "when the delegated method calls a non-existant method" do
-      it "should not try to delegate to non-existant methods to not confuse Kernel#Array" do
-        Array(subject).should be_kind_of(Array)
-      end
-
-      it "raises the correct NoMethodError" do
-        begin
-          subject.some_action
-        rescue NoMethodError => e
-          e.name.should_not == :some_action
-        else
-          fail("No exception raised")
-        end
-      end
-    end
-  end
-
   it "pretends to be the source class" do
     subject.kind_of?(source.class).should be_true
     subject.is_a?(source.class).should be_true
diff --git a/spec/support/samples/product.rb b/spec/support/samples/product.rb
index a9ad562..a613723 100644
--- a/spec/support/samples/product.rb
+++ b/spec/support/samples/product.rb
@@ -77,4 +77,12 @@ class Product < ActiveRecord::Base
     Product.new
   end
 
+  def overridable
+    :overridable
+  end
+
+  private
+
+  def private_title
+  end
 end
diff --git a/spec/support/samples/product_decorator.rb b/spec/support/samples/product_decorator.rb
index 2dd1a8f..1019877 100644
--- a/spec/support/samples/product_decorator.rb
+++ b/spec/support/samples/product_decorator.rb
@@ -5,6 +5,15 @@ class ProductDecorator < Draper::Decorator
     "Awesome Title"
   end
 
+  def overridable
+    :overridden
+  end
+
   def self.my_class_method
   end
+
+  private
+
+  def awesome_private_title
+  end
 end