app/views/dashboard/_linkbacks.html.haml
app/views/linkbacks/_linkback.html.haml
spec/views/posts/trackback_help.html.haml_spec.rb
@@ -3,7 +3,7 @@ class BlogSlice::Dashboard < BlogSlice::Application
before :authorization_required
def dashboard
- @dashboard = {:left => [:numbers, :posts, :drafts], :right => [:tags, :comments]}
+ @dashboard = {:left => [:numbers, :posts, :drafts, :linkbacks], :right => [:tags, :comments]}
render
end
end
\ No newline at end of file
app/controllers/dashboard.rb
@@ -1,5 +1,6 @@
class BlogSlice::Linkbacks < BlogSlice::Application
before :get_post
+ before :authorization_required
# provides :xml, :yaml, :js
def index
@@ -13,48 +14,22 @@ class BlogSlice::Linkbacks < BlogSlice::Application
display @linkback
end
- def new
- only_provides :html
- @linkback = Linkback.new
- display @linkback, :form
- end
-
- def edit
- only_provides :html
+ def destroy
@linkback = (@post ? @post.linkbacks.get(params[:id]) : Linkback.get(params[:id]))
raise NotFound unless @linkback
- display @linkback, :form
- end
-
- def create
- @linkback = Linkback.new(params[:linkback])
- @linkback.post = @post
- if @linkback.save
- redirect (@post ? resource(@post, @linkback) : resource(@linkback)), :message => {:notice => "Linkback was successfully created"}
+ if @linkback.destroy
+ redirect (@post ? resource(@post, :linkbacks) : resource(:linkbacks))
else
- message[:error] = "Linkback failed to be created"
- display @linkback, :form
+ raise InternalServerError
end
end
- def update
+ def approve
@linkback = (@post ? @post.linkbacks.get(params[:id]) : Linkback.get(params[:id]))
raise NotFound unless @linkback
- if @linkback.update_attributes(params[:linkback])
- redirect (@post ? resource(@post, @linkback) : resource(@linkback))
- else
- display @linkback, :form
- end
- end
- def destroy
- @linkback = (@post ? @post.linkbacks.get(params[:id]) : Linkback.get(params[:id]))
- raise NotFound unless @linkback
- if @linkback.destroy
- redirect (@post ? resource(@post, :linkbacks) : resource(:linkbacks))
- else
- raise InternalServerError
- end
+ @linkback.update_attributes(:approved => true)
+ redirect slice_url(:dashboard), :message => {:notice => "Linkback has been approved"}
end
protected
app/controllers/linkbacks.rb
@@ -34,6 +34,9 @@ class BlogSlice::Posts < BlogSlice::Application
@comments = @post.comments
@comment = Comment.new
+
+ @linkbacks = @post.linkbacks.all(:approved => true, :order => [:created_at.desc])
+
display @post
end
@@ -68,7 +71,7 @@ class BlogSlice::Posts < BlogSlice::Application
if request.method == :get
render :trackback_help
elsif request.method == :post
- attributes = {:source_url => params[:url], :type => 'trackback', :direction => true}
+ attributes = {:source_url => params[:url], :type => 'trackback', :direction => true, :post_id => @post.id}
[:title, :excerpt, :blog_name].each do |key|
attributes.merge!({key => params[key]}) if params[key] and !params[key].empty?
app/controllers/posts.rb
@@ -58,6 +58,13 @@ module Merb
::BlogSlice.slice_path_for(type, *segments)
end
+ def pluralize(word, number)
+ if number == 1
+ "#{number} #{word}"
+ else
+ "#{number} #{Extlib::Inflection.pluralize(word)}"
+ end
+ end
end
end
end
\ No newline at end of file
app/helpers/application_helper.rb
@@ -11,7 +11,7 @@ module Merb
{:published_at => {:control => :date_and_time}},
{:separator => {:label => "Options"}},
{:allow_comments => {:control => :checkbox, :label => false, :after => "Enable Comments"}},
- {:allow_trackbacks => {:control => :checkbox, :label => false, :after => "Enable Trackbacks"}},
+ {:allow_linkbacks => {:control => :checkbox, :label => false, :after => "Enable Linkbacks (Trackbacks & Pingbacks)"}},
{:status => {:control => :select, :collection => post_status_collection}}
],
:slice => true}
app/helpers/posts_helper.rb
@@ -1,5 +1,6 @@
class Linkback
include DataMapper::Resource
+ include DataMapper::Timestamp
property :id, Serial
property :blog_name, String
@@ -12,6 +13,9 @@ class Linkback
property :direction, Boolean, :default => true # true is incoming, false is outgoing
+ property :created_at, Time
+ property :updated_at, Time
+
belongs_to :post
def incoming?
app/models/linkback.rb
@@ -11,7 +11,7 @@ class Post
property :views_count, Integer, :default => 0
property :allow_comments, Boolean, :default => true
- property :allow_trackbacks, Boolean, :default => true
+ property :allow_linkbacks, Boolean, :default => true
property :status, Integer, :default => 0
app/models/post.rb
@@ -1,9 +1,7 @@
- throw_content :title do
+ = link "#{blog_options[:blog_title]}'s", :to => resource(:posts), :title => "Visit Site"
Dashboard
-%p
- = link 'Visit site', :to => resource(:posts)
-
#dashboard
.left
- @dashboard[:left].each do |p|
app/views/dashboard/dashboard.html.haml
@@ -1,4 +1,4 @@
-%h1
+- throw_content :title do
- if @post
= link 'Posts', :to => resource(:posts)
\/
@@ -31,17 +31,11 @@
/ Why there is a clone here? to force the association proxy to give me the real object
%td= link linkback.post.identify, :to => resource(linkback.post.clone) if linkback.post
%td
- = link 'Edit', :to => (@post ? resource(@post, linkback, :edit) : resource(linkback, :edit)), :class => 'edit action'
+ - unless linkback.approved
+ = link 'Approve', :to => (@post ? resource(@post, linkback, :approve) : resource(linkback, :approve)), :method => 'post', :class => 'edit action'
= link 'Delete', :to => (@post ? resource(@post, linkback) : resource(linkback)), :method => 'delete', :confirm => 'Are you sure?', :class => 'delete action'
- %p= link 'New', :to => (@post ? resource(@post, :linkbacks, :new) : url(:new_linkback)), :class => 'new action'
- else
%p
%span<>
- No linkback yet
- - if @post
-
- %span<>
- for this post
- ,
- = link 'create one?', :to => (@post ? resource(@post, :linkbacks, :new) : url(:new_linkback))
+ No linkback yet
\ No newline at end of file
app/views/linkbacks/index.html.haml
@@ -1,4 +1,4 @@
-%h1
+- throw_content :title do
- if @post
= link 'Posts', :to => resource(:posts)
\/
@@ -8,9 +8,6 @@
\/
= @linkback.blog_name
-%p= link 'Edit', :to => (@post ? resource(@post, @linkback, :edit) : resource(@linkback, :edit)), :class => 'edit action'
-
-
%p#blog_name
%strong Blog name
=h @linkback.blog_name
app/views/linkbacks/show.html.haml
@@ -34,8 +34,8 @@
.element= link tag.name, :to => resource(tag)
- if @post.tags.empty?
.element None
- - if @post.allow_trackbacks
- #trackback
+ - if @post.allow_linkbacks
+ #linkback
You can
= link 'trackback', :to => resource(@post, :trackback)
this post from your own site.
@@ -45,13 +45,18 @@
= link 'Edit', :to => resource(@post, :edit), :class => 'action edit'
= link 'Delete', :to => resource(@post), :method => 'delete', :confirm => "Are you sure?", :class => 'action delete'
+- if @post.allow_linkbacks and @linkbacks.size > 0
+ #linkbacks_part
+ .linkbacks_number= pluralize('Response', @linkbacks.size)
+ #linkbacks= partial 'linkbacks/linkback', :with => @linkbacks
+
- if @post.allow_comments
- #comments_part
- .comments_number= "#{@comments.size} Comment#{@comments.size != 1 ? "s" : ""}"
+ #comments_part
+ - unless @comments.empty?
+ .comments_number= pluralize('Comment', @comments.size)
- #comments= partial 'comments/comment', :with => @comments
+ #comments= partial 'comments/comment', :with => @comments
#new_comment_form
%h3 Leave a comment
- = render_form :comment
-%p= link 'Linkbacks', :to => url(:post_linkbacks, @post), :class => 'action view_children'
\ No newline at end of file
+ = render_form :comment
\ No newline at end of file
app/views/posts/show.html.haml
@@ -1 +1,16 @@
-%p You can use the trackback feature when you blog about this post.
\ No newline at end of file
+- throw_content :title do
+ = link @post.title, :to => resource(@post)
+ \/
+ Trackback URL
+
+%p You can send a trackback with your blogging platform if you write a blog article about this post.
+
+%p The trackback URL for this post is:
+
+%p
+ %input.trackback_url{:type => 'text', :value => (blog_options[:host] + resource(@post, :trackback)), :size => 90}
+
+%p
+ To know more about Trackback, check out this
+ %a{:href => 'http://en.wikipedia.org/wiki/Trackback', :target => '_blank'}> wikipedia article
+ \.
\ No newline at end of file
app/views/posts/trackback_help.html.haml
@@ -62,12 +62,16 @@ if defined?(Merb::Plugins)
comments.member :approve, :method => :post
end
- posts.resources :linkbacks
+ posts.resources :linkbacks do |linkbacks|
+ linkbacks.member :approve, :method => :post
+ end
posts.member :trackback
end
- scope.resources :linkbacks
+ scope.resources :linkbacks do |linkbacks|
+ linkbacks.member :approve, :method => :post
+ end
scope.resources :categories, :identify => :slug
scope.resources :tags, :identify => :slug
lib/blog-slice.rb
@@ -1,6 +1,6 @@
body {
font-family: Helvetica, Arial, "Lucida Sans Unicode", sans-serif;
- font-size: 11px;
+ font-size: 12px;
text-align: center; }
#container {
@@ -56,6 +56,9 @@ h2 {
margin-top: 0;
border: none; }
+a, a:active {
+ outline: none; }
+
#message {
margin: 0;
width: 615px; }
@@ -221,7 +224,20 @@ form div input#post_published_at_date {
.tags {
background: none; }
-.comments_number {
+#linkback {
+ clear: left;
+ font-family: Georgia, "Times New Roman", Times, serif;
+ font-weight: normal;
+ font-size: 1.1em;
+ color: #555555;
+ margin-left: 4px;
+ padding-top: 7px; }
+
+.linkback_url {
+ font-size: 1.2em;
+ padding: 2px; }
+
+.comments_number, .linkbacks_number {
font-size: 1.5em;
font-weight: bold;
margin-top: 60px;
@@ -229,28 +245,32 @@ form div input#post_published_at_date {
padding-bottom: 7px;
border-bottom: 1px solid #888888; }
-#comments_part {
+#comments_part, #linkbacks_part {
width: 470px; }
- #comments_part #comments .comment {
+ #comments_part #comments .comment, #comments_part #comments .linkback, #comments_part #linkbacks .comment, #comments_part #linkbacks .linkback, #linkbacks_part #comments .comment, #linkbacks_part #comments .linkback, #linkbacks_part #linkbacks .comment, #linkbacks_part #linkbacks .linkback {
margin-top: 15px;
margin-bottom: 15px;
padding-bottom: 15px;
background: url('/slices/blog-slice/images/grey_horizontal_line.gif') left bottom repeat-x; }
- #comments_part #comments .comment .author {
+ #comments_part #comments .comment .author, #comments_part #comments .comment .linkback_title, #comments_part #comments .linkback .author, #comments_part #comments .linkback .linkback_title, #comments_part #linkbacks .comment .author, #comments_part #linkbacks .comment .linkback_title, #comments_part #linkbacks .linkback .author, #comments_part #linkbacks .linkback .linkback_title, #linkbacks_part #comments .comment .author, #linkbacks_part #comments .comment .linkback_title, #linkbacks_part #comments .linkback .author, #linkbacks_part #comments .linkback .linkback_title, #linkbacks_part #linkbacks .comment .author, #linkbacks_part #linkbacks .comment .linkback_title, #linkbacks_part #linkbacks .linkback .author, #linkbacks_part #linkbacks .linkback .linkback_title {
font-family: Georgia, "Times New Roman", Times, serif;
font-size: 1.3em;
font-weight: bold; }
- #comments_part #comments .comment .author .date {
+ #comments_part #comments .comment .author .date, #comments_part #comments .comment .linkback_title .date, #comments_part #comments .linkback .author .date, #comments_part #comments .linkback .linkback_title .date, #comments_part #linkbacks .comment .author .date, #comments_part #linkbacks .comment .linkback_title .date, #comments_part #linkbacks .linkback .author .date, #comments_part #linkbacks .linkback .linkback_title .date, #linkbacks_part #comments .comment .author .date, #linkbacks_part #comments .comment .linkback_title .date, #linkbacks_part #comments .linkback .author .date, #linkbacks_part #comments .linkback .linkback_title .date, #linkbacks_part #linkbacks .comment .author .date, #linkbacks_part #linkbacks .comment .linkback_title .date, #linkbacks_part #linkbacks .linkback .author .date, #linkbacks_part #linkbacks .linkback .linkback_title .date {
font-family: Helvetica, Arial, "Lucida Sans Unicode", sans-serif;
color: #555555;
font-size: 0.8em;
font-weight: normal; }
- #comments_part #comments .comment .content {
+ #comments_part #comments .comment .content, #comments_part #comments .linkback .content, #comments_part #linkbacks .comment .content, #comments_part #linkbacks .linkback .content, #linkbacks_part #comments .comment .content, #linkbacks_part #comments .linkback .content, #linkbacks_part #linkbacks .comment .content, #linkbacks_part #linkbacks .linkback .content {
font-family: Georgia, "Times New Roman", Times, serif;
font-size: 1.2em;
margin-left: 15px; }
- #comments_part #comments .comment .content p {
+ #comments_part #comments .comment .content p, #comments_part #comments .linkback .content p, #comments_part #linkbacks .comment .content p, #comments_part #linkbacks .linkback .content p, #linkbacks_part #comments .comment .content p, #linkbacks_part #comments .linkback .content p, #linkbacks_part #linkbacks .comment .content p, #linkbacks_part #linkbacks .linkback .content p {
margin-left: 0; }
+ #comments_part #comments .linkback, #comments_part #linkbacks .linkback, #linkbacks_part #comments .linkback, #linkbacks_part #linkbacks .linkback {
+ background: none; }
+ #comments_part #comments .linkback .admin, #comments_part #linkbacks .linkback .admin, #linkbacks_part #comments .linkback .admin, #linkbacks_part #linkbacks .linkback .admin {
+ margin-top: 15px; }
#new_comment_form h3 {
font-size: 1.5em;
@@ -293,7 +313,8 @@ form div input#post_published_at_date {
#dashboard {
width: 100%;
- overflow: auto; }
+ overflow: auto;
+ margin-top: 15px; }
#dashboard .left, #dashboard .right {
width: 400px;
overflow: auto; }
@@ -366,6 +387,30 @@ form div input#post_published_at_date {
width: 90px; }
#dashboard .post .comments_count {
text-align: right; }
+ #dashboard .linkback .first_column {
+ width: 200px; }
+ #dashboard .linkback .first_column .source_title {
+ display: block;
+ float: none;
+ font-size: 1em; }
+ #dashboard .linkback .first_column .type {
+ display: block;
+ float: none;
+ font-size: 0.8em; }
+ #dashboard .linkback .second_column {
+ width: 105px; }
+ #dashboard .linkback .second_column .target_post {
+ display: block;
+ float: none;
+ font-size: 0.8em; }
+ #dashboard .linkback .second_column .created_at {
+ display: block;
+ float: none;
+ font-size: 0.8em; }
+ #dashboard .linkback .third_column {
+ font-size: 0.8em;
+ width: 70px;
+ text-align: right; }
.details {
margin-top: 15px;
@@ -399,3 +444,6 @@ form div input#post_published_at_date {
.pagination a {
padding: 3px 4px;
border: 1px solid #cccccc; }
+
+input.inplace_field {
+ width: 80px; }
public/stylesheets/master.css
@@ -24,7 +24,7 @@
body
:font-family Helvetica, Arial, "Lucida Sans Unicode", sans-serif
- :font-size 11px
+ :font-size 12px
:text-align center
#container
@@ -84,6 +84,11 @@ h2
:margin-top = 0
:border none
+// Firefox, removes dotted active links
+a, a:active
+ :outline none
+
+
// Messages
#message
:margin = 0
@@ -275,9 +280,22 @@ form
.tags
:background none
-// Comments
+#linkback
+ :clear left
+ :font-family Georgia, "Times New Roman", Times, serif
+ :font-weight normal
+ :font-size 1.1em
+ :color = !grey
+ :margin-left = 4px
+ :padding-top = !margin/2
+
+.linkback_url
+ :font-size = 1.2em
+ :padding 2px
-.comments_number
+// Comments & Linkbacks
+
+.comments_number, .linkbacks_number
:font-size 1.5em
:font-weight bold
:margin-top = !margin * 4
@@ -285,16 +303,16 @@ form
:padding-bottom = !margin / 2
:border-bottom = 1px solid #888
-#comments_part
+#comments_part, #linkbacks_part
:width = 470px
- #comments
- .comment
+ #comments, #linkbacks
+ .comment, .linkback
:margin-top = !margin
:margin-bottom = !margin
:padding-bottom = !margin
:background url('/slices/blog-slice/images/grey_horizontal_line.gif') left bottom repeat-x
- .author
+ .author, .linkback_title
:font-family Georgia, "Times New Roman", Times, serif
:font-size = 1.3em
:font-weight = bold
@@ -309,6 +327,10 @@ form
:margin-left = !margin
p
:margin-left 0
+ .linkback
+ :background none
+ .admin
+ :margin-top = !margin
#new_comment_form
h3
@@ -357,6 +379,7 @@ form
#dashboard
:width 100%
:overflow auto
+ :margin-top = !margin
.left, .right
:width 400px
:overflow auto
@@ -432,7 +455,34 @@ form
:width 90px
.comments_count
:text-align right
-
+ .linkback
+ .first_column
+ :width 200px
+ .source_title
+ :display block
+ :float none
+ :font-size 1em
+ .type
+ :display block
+ :float none
+ :font-size 0.8em
+
+ .second_column
+ :width 105px
+ .target_post
+ :display block
+ :float none
+ :font-size 0.8em
+ .created_at
+ :display block
+ :float none
+ :font-size 0.8em
+
+ .third_column
+ :font-size 0.8em
+ :width 70px
+ :text-align right
+
.details
:margin-top = !margin
:font-size 0.8em
@@ -473,4 +523,8 @@ form
a
:padding 3px 4px
:border = 1px solid !light_grey
-
+
+// In-place editor
+
+input.inplace_field
+ :width 80px
\ No newline at end of file
public/stylesheets/sass/master.sass
@@ -97,160 +97,7 @@ describe BlogSlice::Linkbacks, "show action" do
end
end
-describe BlogSlice::Linkbacks, "new action" do
- before :all do
- Merb::Router.prepare { |r| slice(:BlogSlice, :name_prefix => nil, :path_prefix => nil, :default_routes => false) } if standalone?
- end
-
- after :all do
- Merb::Router.reset! if standalone?
- end
-
- before :each do
- @linkback = mock("linkback")
- Linkback.stub!(:new).and_return(@linkback)
- end
-
- it "should have a route from /linkbacks/new GET" do
- request_to("/linkbacks/new", :get).should route_to("BlogSlice/linkbacks", :new)
- end
-
- def do_new
- dispatch_to(BlogSlice::Linkbacks, :new) do |controller|
- controller.stub!(:display)
- yield controller if block_given?
- end
- end
-
- it "should be successful" do
- do_new.should be_successful
- end
-
- it "should create a new Linkback object" do
- Linkback.should_receive(:new).with(no_args).and_return(@linkback)
- do_new
- end
-
- it "should assigns the Linkback object for the view" do
- do_new.assigns(:linkback).should == @linkback
- end
-
- it "should render the Linkback" do
- do_new do |controller|
- controller.should_receive(:display).with(@linkback, :form)
- end
- end
-end
-
-describe BlogSlice::Linkbacks, "edit action" do
- before :all do
- Merb::Router.prepare { |r| slice(:BlogSlice, :name_prefix => nil, :path_prefix => nil, :default_routes => false) } if standalone?
- end
-
- after :all do
- Merb::Router.reset! if standalone?
- end
-
- before :each do
- @linkback = mock("linkback")
- Linkback.stub!(:get).and_return(@linkback)
- end
-
- it "should have a route from /linkbacks/1/edit GET" do
- request_to("/linkbacks/1/edit", :get).should route_to("BlogSlice/linkbacks", :edit)
- end
-
- def do_edit
- dispatch_to(BlogSlice::Linkbacks, :edit, :id => 1) do |controller|
- controller.stub!(:display)
- yield controller if block_given?
- end
- end
-
- it "should be successful" do
- do_edit.should be_successful
- end
-
- it "should get the Linkback object" do
- Linkback.should_receive(:get).with("1").and_return(@linkback)
- do_edit
- end
-
- it "should raise NotFound if the Linkback object isn't found" do
- Linkback.stub!(:get).and_return(nil)
- lambda { do_edit }.should raise_error(Merb::ControllerExceptions::NotFound)
- end
-
- it "should assigns the Linkback object for the view" do
- do_edit.assigns(:linkback).should == @linkback
- end
-
- it "should render the Linkback" do
- do_edit do |controller|
- controller.should_receive(:display).with(@linkback, :form)
- end
- end
-end
-
-describe BlogSlice::Linkbacks, 'create action' do
- before :all do
- Merb::Router.prepare { |r| slice(:BlogSlice, :name_prefix => nil, :path_prefix => nil, :default_routes => false) } if standalone?
- end
-
- after :all do
- Merb::Router.reset! if standalone?
- end
-
- before :each do
- @linkback = Linkback.new
- @linkback.stub!(:save).and_return(true)
- @linkback.stub!(:id).and_return(1)
-
- Linkback.stub!(:new).and_return(@linkback)
- end
-
- it "should have a route from /linkbacks POST" do
- request_to("/linkbacks", :post).should route_to("BlogSlice/linkbacks", :create)
- end
-
- def attributes
- {"name" => "some name"}
- end
-
- def do_create
- dispatch_to(BlogSlice::Linkbacks, :create, :linkback => attributes) do |controller|
- controller.stub!(:display)
- yield controller if block_given?
- end
- end
-
- it "should create a new Linkback object" do
- Linkback.should_receive(:new).with(attributes).and_return(@linkback)
- do_create
- end
-
- it "should try to save the Linkback" do
- @linkback.should_receive(:save).with(no_args)
- do_create
- end
-
- it "should redirect to the newly created Linkback if successful" do
- do_create.should redirect_to(resource(@linkback), :message => {:notice => "Linkback was successfully created"})
- end
-
- it "should render the form if not successful" do
- @linkback.stub!(:save).and_return(false)
- do_create do |controller|
- controller.should_receive(:display).with(@linkback, :form)
- end
- end
-
- it "should assign the Linkback to the view" do
- do_create.assigns(:linkback).should == @linkback
- end
-end
-
-describe BlogSlice::Linkbacks, 'update' do
+describe BlogSlice::Linkbacks, 'destroy' do
before :all do
Merb::Router.prepare { |r| slice(:BlogSlice, :name_prefix => nil, :path_prefix => nil, :default_routes => false) } if standalone?
end
@@ -263,56 +110,46 @@ describe BlogSlice::Linkbacks, 'update' do
@linkback = Linkback.new(:id => "1")
Linkback.stub!(:get).and_return(@linkback)
- @linkback.stub!(:update_attributes).and_return(true)
- end
-
- it "should have a route from /linkbacks/1 PUT" do
- request_to("/linkbacks/1", :put).should route_to("BlogSlice/linkbacks", :update)
+ @linkback.stub!(:destroy).and_return(true)
end
- def attributes
- {"name" => "some name"}
+ it "should have a route from /linkbacks/1 DELETE" do
+ request_to("/linkbacks/1", :delete).should route_to("BlogSlice/linkbacks", :destroy)
end
- def do_update
- dispatch_to(BlogSlice::Linkbacks, :update, :id => 1, :linkback => attributes) do |controller|
- controller.stub!(:display)
+ def do_delete
+ dispatch_to(BlogSlice::Linkbacks, :destroy, :id => 1) do |controller|
yield controller if block_given?
end
end
it "should get the Linkback from the database" do
Linkback.should_receive(:get).and_return(@linkback)
- do_update
+ do_delete
end
it "should raise NotFound if the Linkback isn't found" do
Linkback.stub!(:get).and_return(nil)
- lambda { do_update }.should raise_error(Merb::ControllerExceptions::NotFound)
- end
-
- it "should try to save the Linkback" do
- @linkback.should_receive(:update_attributes).with(attributes)
- do_update
+ lambda { do_delete }.should raise_error(Merb::ControllerExceptions::NotFound)
end
- it "should redirect to the Linkback if successful" do
- do_update.should redirect_to("/linkbacks/1")
+ it "should try to delete the Linkback" do
+ @linkback.should_receive(:destroy)
+ do_delete
end
- it "should render the form if the Linkback can't be saved" do
- @linkback.stub!(:update_attributes).and_return(false)
- do_update do |controller|
- controller.should_receive(:display).with(@linkback, :form)
- end
+ it "should redirect to the BlogSlice::Linkbacks list if destroyed" do
+ do_delete.should redirect_to("/linkbacks")
end
- it "should assign the Linkback to the view" do
- do_update.assigns(:linkback).should == @linkback
+ it "should raise InternalServerError if failed" do
+ @linkback.stub!(:destroy).and_return(false)
+ lambda { do_delete }.should raise_error(Merb::ControllerExceptions::InternalServerError)
end
end
-describe BlogSlice::Linkbacks, 'destroy' do
+
+describe BlogSlice::Linkbacks, "approve action" do
before :all do
Merb::Router.prepare { |r| slice(:BlogSlice, :name_prefix => nil, :path_prefix => nil, :default_routes => false) } if standalone?
end
@@ -322,50 +159,44 @@ describe BlogSlice::Linkbacks, 'destroy' do
end
before :each do
- @linkback = Linkback.new(:id => "1")
+ @linkback = mock('linkback')
Linkback.stub!(:get).and_return(@linkback)
-
- @linkback.stub!(:destroy).and_return(true)
+ @linkback.stub!(:update_attributes)
end
- it "should have a route from /linkbacks/1 DELETE" do
- request_to("/linkbacks/1", :delete).should route_to("BlogSlice/linkbacks", :destroy)
+ it "should have a route from /linkbacks/1/approve POST" do
+ request_to('/linkbacks/1/approve', :post).should route_to("BlogSlice/linkbacks", :approve)
end
- def do_delete
- dispatch_to(BlogSlice::Linkbacks, :destroy, :id => 1) do |controller|
+ def do_approve
+ dispatch_to(BlogSlice::Linkbacks, :approve, :id => 1) do |controller|
+ controller.stub!(:display)
yield controller if block_given?
end
end
it "should get the Linkback from the database" do
- Linkback.should_receive(:get).and_return(@linkback)
- do_delete
+ Linkback.should_receive(:get).with("1").and_return(@linkback)
+ do_approve
end
it "should raise NotFound if the Linkback isn't found" do
Linkback.stub!(:get).and_return(nil)
- lambda { do_delete }.should raise_error(Merb::ControllerExceptions::NotFound)
+ lambda { do_approve }.should raise_error(Merb::ControllerExceptions::NotFound)
end
- it "should try to delete the Linkback" do
- @linkback.should_receive(:destroy)
- do_delete
- end
-
- it "should redirect to the BlogSlice::Linkbacks list if destroyed" do
- do_delete.should redirect_to("/linkbacks")
+ it "should approve the linkback" do
+ @linkback.should_receive(:update_attributes).with(:approved => true)
+ do_approve
end
- it "should raise InternalServerError if failed" do
- @linkback.stub!(:destroy).and_return(false)
- lambda { do_delete }.should raise_error(Merb::ControllerExceptions::InternalServerError)
+ it "should redirect to the dashboard" do
+ do_approve.should redirect_to('/dashboard')
end
end
-
# Nested
require File.dirname(__FILE__) + '/../spec_helper'
@@ -503,302 +334,6 @@ describe BlogSlice::Linkbacks, "show action" do
end
end
-describe BlogSlice::Linkbacks, "new action" do
- before :all do
- Merb::Router.prepare { |r| slice(:BlogSlice, :name_prefix => nil, :path_prefix => nil, :default_routes => false) } if standalone?
- end
-
- after :all do
- Merb::Router.reset! if standalone?
- end
-
- before :each do
- @post = mock('post')
- Post.stub!(:get).and_return(@post)
-
- @linkback = mock("linkback")
- Linkback.stub!(:new).and_return(@linkback)
- end
-
- it "should have a route from /posts/1/linkbacks/new GET" do
- request_to("/posts/1/linkbacks/new", :get).should route_to("BlogSlice/linkbacks", :new)
- end
-
- def do_new
- dispatch_to(BlogSlice::Linkbacks, :new, :slug => 1) do |controller|
- controller.stub!(:display)
- yield controller if block_given?
- end
- end
-
- it "should be successful" do
- do_new.should be_successful
- end
-
- it "should get the post from the database" do
- Post.should_receive(:get).with("1").and_return(@post)
- do_new
- end
-
- it "should raise NotFound if the post isn't found" do
- Post.stub!(:get).and_return(nil)
- lambda { do_new }.should raise_error(Merb::ControllerExceptions::NotFound)
- end
-
- it "should create a new linkback object" do
- Linkback.should_receive(:new).with(no_args).and_return(@linkback)
- do_new
- end
-
- it "should assigns the linkback object for the view" do
- do_new.assigns(:linkback).should == @linkback
- end
-
- it "should assign the post parent to the view" do
- do_new.assigns(:post).should == @post
- end
-
- it "should render the linkback" do
- do_new do |controller|
- controller.should_receive(:display).with(@linkback, :form)
- end
- end
-end
-
-describe BlogSlice::Linkbacks, "edit action" do
- before :all do
- Merb::Router.prepare { |r| slice(:BlogSlice, :name_prefix => nil, :path_prefix => nil, :default_routes => false) } if standalone?
- end
-
- after :all do
- Merb::Router.reset! if standalone?
- end
-
- before :each do
- @post = mock('post')
- Post.stub!(:get).and_return(@post)
-
- @linkbacks = mock('linkbacks')
- @post.stub!(:linkbacks).and_return(@linkbacks)
-
- @linkback = mock("linkback")
- @linkbacks.stub!(:get).and_return(@linkback)
- end
-
- it "should have a route from /posts/1/linkbacks/2/edit GET" do
- request_to("/posts/1/linkbacks/2/edit", :get).should route_to("BlogSlice/linkbacks", :edit)
- end
-
- def do_edit
- dispatch_to(BlogSlice::Linkbacks, :edit, :slug => 1, :id => 2) do |controller|
- controller.stub!(:display)
- yield controller if block_given?
- end
- end
-
- it "should be successful" do
- do_edit.should be_successful
- end
-
- it "should get the post from the database" do
- Post.should_receive(:get).with("1").and_return(@post)
- do_edit
- end
-
- it "should raise NotFound if the post isn't found" do
- Post.stub!(:get).and_return(nil)
- lambda { do_edit }.should raise_error(Merb::ControllerExceptions::NotFound)
- end
-
- it "should get the linkback object" do
- @post.should_receive(:linkbacks).with(no_args).and_return(@linkbacks)
- @linkbacks.should_receive(:get).with("2").and_return(@linkback)
- do_edit
- end
-
- it "should raise NotFound if the linkback object isn't found" do
- @linkbacks.stub!(:get).and_return(nil)
- lambda { do_edit }.should raise_error(Merb::ControllerExceptions::NotFound)
- end
-
- it "should assigns the linkback object for the view" do
- do_edit.assigns(:linkback).should == @linkback
- end
-
- it "should assign the post parent to the view" do
- do_edit.assigns(:post).should == @post
- end
-
- it "should render the linkback" do
- do_edit do |controller|
- controller.should_receive(:display).with(@linkback, :form)
- end
- end
-end
-
-describe BlogSlice::Linkbacks, 'create action' do
- before :all do
- Merb::Router.prepare { |r| slice(:BlogSlice, :name_prefix => nil, :path_prefix => nil, :default_routes => false) } if standalone?
- end
-
- after :all do
- Merb::Router.reset! if standalone?
- end
-
- before :each do
- @post = Post.new
- @post.stub!(:slug).and_return("1")
- Post.stub!(:get).with("1").and_return(@post)
-
- @linkback = Linkback.new
- @linkback.stub!(:save).and_return(true)
- @linkback.stub!(:id).and_return(2)
- Linkback.stub!(:new).and_return(@linkback)
- end
-
- it "should have a route from /posts/1/linkbacks POST" do
- request_to("/posts/1/linkbacks", :post).should route_to("BlogSlice/linkbacks", :create)
- end
-
- def attributes
- {"name" => "Expenses"}
- end
-
- def do_create
- dispatch_to(BlogSlice::Linkbacks, :create, :slug => 1, :linkback => attributes) do |controller|
- controller.stub!(:display)
- yield controller if block_given?
- end
- end
-
- it "should get the post from the database" do
- Post.should_receive(:get).with("1").and_return(@post)
- do_create
- end
-
- it "should raise NotFound if the post isn't found" do
- Post.stub!(:get).and_return(nil)
- lambda { do_create }.should raise_error(Merb::ControllerExceptions::NotFound)
- end
-
- it "should create a new linkback object" do
- Linkback.should_receive(:new).with(attributes).and_return(@linkback)
- do_create
- end
-
- it "should set the post" do
- @linkback.should_receive(:post=).with(@post)
- do_create
- end
-
- it "should try to save the linkback" do
- @linkback.should_receive(:save).with(no_args)
- do_create
- end
-
- it "should redirect to the newly created linkback if successful" do
- do_create.should redirect_to(resource(@post, @linkback), :message => {:notice => "Linkback was successfully created"})
- end
-
- it "should render the form if not successful" do
- @linkback.stub!(:save).and_return(false)
- do_create do |controller|
- controller.should_receive(:display).with(@linkback, :form)
- end.assigns(:linkback).should == @linkback
- end
-
- it "should assign the linkback to the view" do
- do_create.assigns(:linkback).should == @linkback
- end
-
- it "should assign the post parent to the view" do
- do_create.assigns(:post).should == @post
- end
-end
-
-describe BlogSlice::Linkbacks, 'update' do
- before :all do
- Merb::Router.prepare { |r| slice(:BlogSlice, :name_prefix => nil, :path_prefix => nil, :default_routes => false) } if standalone?
- end
-
- after :all do
- Merb::Router.reset! if standalone?
- end
-
- before :each do
- @post = Post.new(:id => "1")
- Post.stub!(:get).with("1").and_return(@post)
-
- @linkbacks = mock("linkbacks")
- @post.stub!(:linkbacks).and_return(@linkbacks)
-
- @linkback = Linkback.new(:id => "2")
- @linkbacks.stub!(:get).and_return(@linkback)
-
- @linkback.stub!(:update_attributes).and_return(true)
- end
-
- it "should have a route from /posts/1/linkbacks/2 PUT" do
- request_to("/posts/1/linkbacks/2", :put).should route_to("BlogSlice/linkbacks", :update)
- end
-
- def attributes
- {"name" => "Expenses"}
- end
-
- def do_update
- dispatch_to(BlogSlice::Linkbacks, :update, :slug => 1, :id => 2, :linkback => attributes) do |controller|
- controller.stub!(:display)
- yield controller if block_given?
- end
- end
-
- it "should get the post from the database" do
- Post.should_receive(:get).with("1").and_return(@post)
- do_update
- end
-
- it "should raise NotFound if the post isn't found" do
- Post.stub!(:get).and_return(nil)
- lambda { do_update }.should raise_error(Merb::ControllerExceptions::NotFound)
- end
-
- it "should get the linkback from the database" do
- @post.should_receive(:linkbacks).and_return(@linkbacks)
- @linkbacks.should_receive(:get).and_return(@linkback)
- do_update
- end
-
- it "should raise NotFound if the linkback isn't found" do
- @linkbacks.stub!(:get).and_return(nil)
- lambda { do_update }.should raise_error(Merb::ControllerExceptions::NotFound)
- end
-
- it "should try to save the linkback" do
- @linkback.should_receive(:update_attributes).with(attributes)
- do_update
- end
-
- it "should redirect to the linkback if successful" do
- do_update.should redirect_to("/posts/1/linkbacks/2")
- end
-
- it "should render the form if the linkback can't be saved" do
- @linkback.stub!(:update_attributes).and_return(false)
- do_update do |controller|
- controller.should_receive(:display).with(@linkback, :form)
- end
- end
-
- it "should assign the linkback to the view" do
- do_update.assigns(:linkback).should == @linkback
- end
-
- it "should assign the post parent to the view" do
- do_update.assigns(:post).should == @post
- end
-end
-
describe BlogSlice::Linkbacks, 'destroy' do
before :all do
Merb::Router.prepare { |r| slice(:BlogSlice, :name_prefix => nil, :path_prefix => nil, :default_routes => false) } if standalone?
spec/controllers/linkbacks_spec.rb
@@ -218,6 +218,10 @@ describe Post, 'show action' do
@new_comment = mock('new-comment')
Comment.stub!(:new).and_return(@new_comment)
+
+ @linkbacks = mock('linkbacks')
+ @post.stub!(:linkbacks).and_return(@linkbacks)
+ @linkbacks.stub!(:all).and_return([])
end
def do_get
@@ -278,6 +282,12 @@ describe Post, 'show action' do
do_get
end
+ it "should get the approved linkbacks of the post" do
+ @post.should_receive(:linkbacks).once.and_return(@linkbacks)
+ @linkbacks.should_receive(:all).with(:approved => true, :order => [:created_at.desc]).and_return([])
+ do_get
+ end
+
it "should assign the comments to the view" do
do_get.assigns(:comments).should == @comments
end
@@ -537,6 +547,7 @@ describe BlogSlice::Posts, 'trackback' do
before :each do
@post = mock('post')
@post.stub!(:title).and_return("my blog post")
+ @post.stub!(:id).and_return(1)
Post.stub!(:first).and_return(@post)
@linkback = mock('linkback')
@@ -581,7 +592,7 @@ describe BlogSlice::Posts, 'trackback' do
end
it "should create a linkback of type trackback" do
- Linkback.should_receive(:new).with(:type => 'trackback', :source_url => 'http://www.ekohe.com', :direction => true)
+ Linkback.should_receive(:new).with(:post_id => 1, :type => 'trackback', :source_url => 'http://www.ekohe.com', :direction => true)
do_post
end
spec/controllers/posts_spec.rb
@@ -22,7 +22,7 @@ describe Post do
:published_at,
:views_count,
:allow_comments,
- :allow_trackbacks,
+ :allow_linkbacks,
:status,
:created_at,
:updated_at].each do |column|
spec/models/post_spec.rb
@@ -12,8 +12,8 @@ describe "linkbacks/index" do
before(:each) do
@controller = BlogSlice::Linkbacks.new(fake_request)
- @first_linkback = Linkback.new({:type=>"absciss", :target_url=>"gastrostaxis", :title=>"usually", :source_url=>"Cymodoceaceae", :excerpt=>"Incidence pasteurism reedish plumoseness gangan sanctity", :id=>0, :blog_name=>"costochondral"})
- @second_linkback = Linkback.new({:type=>"antipathize", :target_url=>"forthcut", :title=>"boattail", :source_url=>"pistillid", :excerpt=>"Dixit delegable missmark rhinobatus tallowmaking consilience hectocotylize foster ureic conjubilant pyroligneous paean prelumbar transdermic alicia driveboat coscinodiscaceae mockernut escortage", :id=>1, :blog_name=>"Orion"})
+ @first_linkback = Linkback.new({:type=>"absciss", :target_url=>"gastrostaxis", :title=>"usually", :source_url=>"Cymodoceaceae", :excerpt=>"Incidence pasteurism reedish plumoseness gangan sanctity", :id=>0, :blog_name=>"costochondral", :approved => false})
+ @second_linkback = Linkback.new({:type=>"antipathize", :target_url=>"forthcut", :title=>"boattail", :source_url=>"pistillid", :excerpt=>"Dixit delegable missmark rhinobatus tallowmaking consilience hectocotylize foster ureic conjubilant pyroligneous paean prelumbar transdermic alicia driveboat coscinodiscaceae mockernut escortage", :id=>1, :blog_name=>"Orion", :approved => true})
@linkbacks = [@first_linkback, @second_linkback]
@@ -62,9 +62,9 @@ describe "linkbacks/index, post as parent" do
@post = Post.new(:slug => 'my-first-blog-post')
@controller.instance_variable_set(:@post, @post)
- @first_linkback = Linkback.new({:type=>"sylvanitic", :target_url=>"unharmonize", :title=>"misalienate", :source_url=>"tane", :excerpt=>"Disconcertment crumblet mineralizable loris plutonian precool amphicoelous brotheler loxodromism ice benzine chieftainship sporadic shikimic commutate embryonically", :id=>1, :blog_name=>"relieved"})
+ @first_linkback = Linkback.new({:type=>"sylvanitic", :target_url=>"unharmonize", :title=>"misalienate", :source_url=>"tane", :excerpt=>"Disconcertment crumblet mineralizable loris plutonian precool amphicoelous brotheler loxodromism ice benzine chieftainship sporadic shikimic commutate embryonically", :id=>1, :blog_name=>"relieved", :approved => true})
@first_linkback.stub!(:post).and_return(@post)
- @second_linkback = Linkback.new({:type=>"glimmerous", :target_url=>"heterogony", :title=>"precedentless", :source_url=>"fomes", :excerpt=>"Gormandize vaticanic ooecial blattiform narratory bepart shelleyana mercaptids transpalmar anticontagionist microphthalmus unseparable internode", :id=>4, :blog_name=>"Megaric"})
+ @second_linkback = Linkback.new({:type=>"glimmerous", :target_url=>"heterogony", :title=>"precedentless", :source_url=>"fomes", :excerpt=>"Gormandize vaticanic ooecial blattiform narratory bepart shelleyana mercaptids transpalmar anticontagionist microphthalmus unseparable internode", :id=>4, :blog_name=>"Megaric", :approved => false})
@second_linkback.stub!(:post).and_return(@post)
@linkbacks = [@first_linkback, @second_linkback]
spec/views/linkbacks/index.html.haml_spec.rb
@@ -49,8 +49,8 @@ describe "posts/form" do
@body.should have_tag(:input, :type => 'checkbox', :name => 'post[allow_comments]')
end
- it "should have a checkbox for enabling and disabling trackbacks" do
- @body.should have_tag(:input, :type => 'checkbox', :name => 'post[allow_trackbacks]')
+ it "should have a checkbox for enabling and disabling linkbacks" do
+ @body.should have_tag(:input, :type => 'checkbox', :name => 'post[allow_linkbacks]')
end
it "should have a select for selecting the status" do
spec/views/posts/form.html.haml_spec.rb
@@ -30,6 +30,7 @@ describe "posts/show authorized" do
def render
@controller.instance_variable_set(:@post, @post)
@controller.instance_variable_set(:@comments, sample_comments)
+ @controller.instance_variable_set(:@linkbacks, [])
@controller.instance_variable_set(:@comment, Comment.new)
@body = @controller.render(:show)
end
@@ -137,6 +138,7 @@ describe "posts/show not authorized" do
create_comments
@controller.instance_variable_set(:@post, @post)
@controller.instance_variable_set(:@comments, @post.comments)
+ @controller.instance_variable_set(:@linkbacks, [])
@controller.instance_variable_set(:@comment, Comment.new)
@controller.stub!(:authorized?).and_return(false)
end
@@ -162,13 +164,13 @@ describe "posts/show not authorized" do
end
it "should not display the trackback url if not allowed" do
- @post.allow_trackbacks = false
+ @post.allow_linkbacks = false
render
@body.should_not have_tag(:a, :href => '/posts/my-first-post/trackback')
end
it "should display the trackback url if allowed" do
- @post.allow_trackbacks = true
+ @post.allow_linkbacks = true
render
@body.should have_tag(:a, :href => '/posts/my-first-post/trackback')
end
spec/views/posts/show.html.haml_spec.rb
app/views/layout/application.html.haml
app/views/linkbacks/form.html.haml
spec/views/linkbacks/form.html.haml_spec.rb
d98ea6407ef32f4e22118ded613aa9f8ca89c11e
Maxime Guilbot
maxime@ekohe.com
http://github.com/maxime/blog-slice/commit/543c48bb7da9abdbeeac5f27f1e2bbf4b096a182
543c48bb7da9abdbeeac5f27f1e2bbf4b096a182
2009-01-20T15:35:08-08:00
2009-01-20T15:35:08-08:00
Trackback reception, moderation and display now working
d99309870d6863bc12e6dc61b4228972d992ac82
Maxime Guilbot
maxime@ekohe.com