Changeset 1142

Timestamp:

12/30/07 18:01:58 (1 year ago)

Author:

e.@brainspl.at

Message:

fix get_args.rb for new ruby2ruby. closes #382 [tmm1]

Files:

• trunk/lib/merb/core_ext/get_args.rb (modified) (1 diff)
• trunk/lib/merb/mixins/general_controller.rb (modified) (1 diff)
• trunk/lib/merb/test/helper.rb (modified) (1 diff)

trunk/lib/merb/core_ext/get_args.rb

@@ -25 +25 @@
-    def get_args
-      arg_node = deep_array_node(:args)
+      return nil unless arg_node
-      args = arg_node.arg_nodes
-      default_node = arg_node.deep_array_node(:block)

trunk/lib/merb/mixins/general_controller.rb

@@ -100 +100 @@
-        raise "URL could not be constructed. Route symbol not found: #{symbol.inspect}" 
-      end
+
-      path = route.generate(new_params, params)
-      keys = route.symbol_segments
+      
-      if new_params.is_a? Hash
-        if ext = format_extension(new_params)

trunk/lib/merb/test/helper.rb

@@ -14 +14 @@
-      end
-
-      # Turn a named route into a string with the path
-      # This is the same method as is found in the controller
-      def url(name, *args)
-        Merb::Router.generate(name, *args)
-      end
-
-
-      # For integration/functional testing
-
-
-      def request(verb, path)
-        response = StringIO.new