Changeset 6722

Timestamp:

05/12/07 04:18:46 (2 years ago)

Author:

ulysses

Message:

Add ActionController::Routing::Helpers, a module to contain common URL helpers such as polymorphic_url.

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/integration.rb (modified) (1 diff)
• trunk/actionpack/lib/action_controller/routing.rb (modified) (4 diffs)
• trunk/actionpack/lib/action_controller/url_rewriter.rb (modified) (1 diff)
• trunk/actionpack/test/controller/action_pack_assertions_test.rb (modified) (1 diff)
• trunk/actionpack/test/controller/routing_test.rb (modified) (3 diffs)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Add ActionController::Routing::Helpers, a module to contain common URL helpers such as polymorphic_url. [Nicholas Seckar]
-
-* Included the HttpAuthentication plugin as part of core (ActionController::HttpAuthentication::Basic) [DHH]

trunk/actionpack/lib/action_controller/integration.rb

@@ -76 +76 @@
-          # install the named routes in this session instance.
-          klass = class<<self; self; end
-named_routes.install
+install_helpers
-
-          # the helpers are made protected by default--we make them public for

trunk/actionpack/lib/action_controller/routing.rb

@@ -253 +253 @@
-    mattr_accessor :controller_paths
-    self.controller_paths = []
-
+
+
+
+
+
-    class << self
-      def with_controllers(names)
@@ -1135 +1139 @@
-        clear!
-        yield Mapper.new(self)
-named_routes.install
-
-
+install_helpers
+
+    
-      def clear!
-        routes.clear
@@ -1144 +1148 @@
-        @routes_by_controller = nil
-      end
+      
+      def install_helpers(destinations = [ActionController::Base, ActionView::Base])
+        Array(destinations).each { |d| d.send :include, Helpers }
+        named_routes.install(destinations)
+      end
-
-      def empty?
@@ -1153 +1162 @@
-        clear!
-        load_routes!
-named_routes.install
+install_helpers
-      end
-
-      alias reload load!
-
+
-      def load_routes!
-        if defined?(RAILS_ROOT) && defined?(::ActionController::Routing::Routes) && self == ::ActionController::Routing::Routes

trunk/actionpack/lib/action_controller/url_rewriter.rb

@@ -22 +22 @@
-    
-    def self.included(base) #:nodoc:
-named_routes.install
+install_helpers
-      base.mattr_accessor :default_url_options
-      base.default_url_options ||= default_url_options

trunk/actionpack/test/controller/action_pack_assertions_test.rb

@@ -210 +210 @@
-        map.connect   ':controller/:action/:id'
-      end
-named_routes.install
+install_helpers
-
-      process :redirect_to_named_route

trunk/actionpack/test/controller/routing_test.rb

@@ -208 +208 @@
-    x = Class.new
-    x.send(:define_method, :url_for) {|x| x}
-named_routes.install
+install_helpers
-    x
-  end
@@ -1418 +1418 @@
-
-    klass = Class.new(MockController)
-named_routes.install
+install_helpers
-    klass.new(set)
-  end
@@ -1886 +1886 @@
-  end
-  
+  def test_routing_helper_module
+    assert_kind_of Module, ActionController::Routing::Helpers
+    
+    h = ActionController::Routing::Helpers
+    c = Class.new
+    assert ! c.ancestors.include?(h)
+    ActionController::Routing::Routes.install_helpers c
+    assert c.ancestors.include?(h)
+  end
+  
-end