lib/draper/view_context.rb in draper-0.18.0 vs lib/draper/view_context.rb in draper-1.0.0.beta1

@@ -1,7 +1,13 @@
 module Draper
   module ViewContext
+    def view_context
+      super.tap do |context|
+        Draper::ViewContext.current = context
+      end
+    end
+
     def self.current_controller
       Thread.current[:current_controller] || ApplicationController.new
     end
 
     def self.current_controller=(controller)
@@ -14,24 +20,11 @@
 
     def self.current=(context)
       Thread.current[:current_view_context] = context
     end
 
-    def view_context
-      super.tap do |context|
-        Draper::ViewContext.current = context
-      end
-    end
-
-    private
-
     def self.build_view_context
       current_controller.view_context.tap do |context|
-        context.instance_eval do
-          def url_options
-            ActionMailer::Base.default_url_options
-          end
-        end unless context.request
         if defined?(ActionController::TestRequest)
           context.controller.request ||= ActionController::TestRequest.new
           context.request            ||= context.controller.request
           context.params             ||= {}
         end