Changeset 1042

Timestamp:

11/24/07 14:13:19 (1 year ago)

Author:

e.@brainspl.at

Message:

do not allow query string params to override url params. so /foo/bar/42?id=24 ... params[:id].should == 42 not 24, closes #299

Files:

• trunk/lib/merb/request.rb (modified) (1 diff)
• trunk/spec/merb/dispatch_spec.rb (modified) (1 diff)

trunk/lib/merb/request.rb

@@ -98 +98 @@
-    def params
-      @params ||= begin
-route_params.to_mash.merge(body_and_query_params)  
+body_and_query_params.to_mash.merge(route_params)
-        h.merge!(multipart_params) if self.class.parse_multipart_params && multipart_params
-        h.merge!(json_params) if self.class.parse_json_params && json_params

trunk/spec/merb/dispatch_spec.rb

@@ -26 +26 @@
-    end
-  end
+  
+  it "should not overwrite url params with query string params" do
+    controller, action = request(:get, '/foo/bar/42?id=24')
+    controller.class.should == Foo
+    action.should == "bar"
+    controller.params[:id].should == '42'
+  end  
-  
-  it "should not allow private and protected methods to be called" do