Changeset 1668

Timestamp:

02/29/08 00:26:28 (3 months ago)

Author:

pdcawley

Message:

More UrlPolicy? work.

Files:

• trunk/app/controllers/comments_controller.rb (modified) (1 diff)
• trunk/app/controllers/feedback_controller.rb (modified) (2 diffs)
• trunk/app/controllers/trackbacks_controller.rb (modified) (1 diff)
• trunk/app/models/comment.rb (modified) (1 diff)
• trunk/app/models/url_policy.rb (modified) (2 diffs)
• trunk/spec/models/url_policy_spec.rb (modified) (2 diffs)

trunk/app/controllers/comments_controller.rb

@@ -14 +14 @@
-      else
-        redirect_to article_path(@article)
+      end
+    end
+  end
+
+  def show
+    @comment = @article.comments.find_by_guid(params[:id])
+
+    respond_to do |format|
+      format.html do
+        redirect_to article_path(@article) + "\##{dom_id(@comment)}"
-      end
-    end

trunk/app/controllers/feedback_controller.rb

@@ -4 +4 @@
-  session :new_session => false
-  before_filter :login_required, :only => [:update, :destroy]
-
+, :show
-
-  cache_sweeper :blog_sweeper
@@ -13 +13 @@
-      format.html do
-        if params[:article_id]
-this_blog.requested_article
+Article.find_by_params_hash
-          redirect_to "#{article_path(article)}\##{@page_title.underscore}"
-        else

trunk/app/controllers/trackbacks_controller.rb

@@ -30 +30 @@
-    @trackbacks =
-      if params[:article_id]
-this_blog.requested_article
+Article.find_by_params_hash
-      else
-        this_blog.published_trackbacks.find(:all, this_blog.rss_limit_params(:order => 'created_at DESC'))

trunk/app/models/comment.rb

@@ -50 +50 @@
-  end
-
+  def to_params(builder)
+    builder.comment_params(self)
+  end
+
+  def to_param
+    guid
+  end
+
-  protected
-

trunk/app/models/url_policy.rb

@@ -18 +18 @@
-    with_options(:only_path => true) do |o|
-      case args.first
+      when nil
+        raise ArgumentError, "Argument cannot be nil"
-      when ActiveRecord::Base
-        o.url_for_object(*args)
@@ -55 +57 @@
-  end
-
+  def comment_params(comment)
+    returning(:controller => 'comments', :action => 'show') do |params|
+      article_params(comment.article).each do |k,v|
+        next if k == :controller || k == :action
+        params["article_#{k}".to_sym] = v
+      end
+      params[:id] = comment.to_param
+    end
+  end
-end

trunk/spec/models/url_policy_spec.rb

@@ -10 +10 @@
-  end
-
-
+articles/
-    UrlPolicy.instance.url_for(contents(:article3)).should == '/articles/2004/06/01/article-3'
+  end
+
+  it "#url_for(<comment on article 3>).should == /2004/06/01/article-3/comments/#\{comment.guid}" do
+    article = contents(:article3)
+    comment = article.comments.build(:author => 'Piers Cawley', :body => "body")
+    comment.save(false)
+    UrlPolicy.instance.url_for(comment).should == "/articles/2004/06/01/article-3/comments/#{comment.guid}"
-  end
-
@@ -18 +25 @@
-  end
-
-
+articles/
-    UrlPolicy.instance.edit_url_for(contents(:article3)).should == '/articles/2004/06/01/article-3/edit'
-  end