Changeset 1128

Timestamp:

12/22/07 14:07:06 (1 year ago)

Author:

e.@brainspl.at

Message:

fix url(:post, @post) where @post responds to :to_param. use to_param instead of id when available

Files:

• trunk/Rakefile (modified) (1 diff)
• trunk/lib/merb/router.rb (modified) (1 diff)
• trunk/spec/fixtures/models/router_spec_models.rb (modified) (1 diff)
• trunk/spec/spec_helpers/url_shared_behaviour.rb (modified) (1 diff)

trunk/Rakefile

@@ -130 +130 @@
-Spec::Rake::SpecTask.new('rcov') do |t|
-  t.spec_opts = ["--format", "specdoc", "--colour"]
+  t.rcov_opts = ["--exclude","gems"]
-  t.spec_files = Dir['spec/**/*_spec.rb'].sort
-  t.libs = ['lib', 'server/lib' ]

trunk/lib/merb/router.rb

@@ -142 +142 @@
-                params[segment] || fallback[segment]
-              else
-
+
+
+
-                  params.send(segment)
-                else

trunk/spec/fixtures/models/router_spec_models.rb

@@ -19 +19 @@
-  end  
-end
+
+
+class Blog
+  def id
+    42
+  end
+  def to_param
+    "hello#{id}"
+  end
+end    

trunk/spec/spec_helpers/url_shared_behaviour.rb

@@ -56 +56 @@
-  it "should handle an object as the second arg" do
-    c = new_url_controller(@resource_routes, :controller => "blogs", :action => "show")
-
-
+
-    url = c.url(:blog, blog)
-7
+hello42
-  end
-  
-  it "should point to /blogs/:blog_id if @blog is not new_record" do
-    c = new_url_controller(@resource_routes, :controller => "blogs", :action => "index")
-
-
+
-    blog.should_receive(:new_record?).once.and_return(false)
-    url = c.url(:blog, blog)
-7
+hello42
-  end
-  
-  it "should point to /blogs/ if @blog is new_record" do
-    c = new_url_controller(@resource_routes, :controller => "blogs", :action => "index")
-mock("blog")
+Blog.new
-    blog.should_receive(:new_record?).once.and_return(true)
-    url = c.url(:blog, blog)