lib/merb-flash.rb in teamon-merb-flash-0.1.1 vs lib/merb-flash.rb in teamon-merb-flash-0.1.2

@@ -3,46 +3,9 @@
 
   # Merb gives you a Merb::Plugins.config hash...feel free to put your stuff in your piece of it
   Merb::Plugins.config[:merb_flash] = {}
   
   Merb::BootLoader.before_app_loads do
-    class Merb::Request
-      def message
-        @_message ||= {}
-      end
-      
-      def message=(msg)
-        @_message = msg
-      end
-    end
-
-    class Merb::Controller
-      before :process_flash
-
-      alias :orig_redirect :redirect
-
-      def redirect(url, opts = {})
-        if opts[:message]
-          msg = opts.delete(:message)
-          unless msg.is_a?(Hash)
-            if msg.is_a?(String)
-              msg = Mash.new(:notice => msg)
-            else
-              raise ArgumentError
-            end
-          end
-          session[:flash] = msg
-        end
-
-        orig_redirect(url, opts)
-      end
-
-      protected
-
-      def process_flash
-        request.message = session[:flash]
-        session[:flash] = {}
-      end
-    end
+    require 'merb-flash/request_controller.rb'
   end
   
 end
\ No newline at end of file