@@ -8,9 +8,9 @@ require 'merb-core/test/tasks/spectasks' NAME = "blog-slice" AUTHOR = "Maxime Guilbot for Ekohe" EMAIL = "maxime@ekohe.com" -HOMEPAGE = "http://merbivore.com/" +HOMEPAGE = "http://ekohe.com/" SUMMARY = "Blog Slice is a very basic blogging system" -GEM_VERSION = "0.9.10" +GEM_VERSION = "1.0.10" spec = Gem::Specification.new do |s| s.rubyforge_project = 'merb' @@ -24,7 +24,7 @@ spec = Gem::Specification.new do |s| s.author = AUTHOR s.email = EMAIL s.homepage = HOMEPAGE - s.add_dependency('merb-slices', '>= 0.9.10') + s.add_dependency('merb-slices', '>= 1.0.10') s.require_path = 'lib' s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec,app,public,stubs}/**/*") end Rakefile @@ -1,3 +1,5 @@ +require "xmlrpc/server" + class BlogSlice::Posts < BlogSlice::Application provides :html, :xml, :rss before :authorization_required, :exclude => [:index, :show, :feed, :trackback] @@ -26,6 +28,11 @@ class BlogSlice::Posts < BlogSlice::Application end def show + # This is a pingback-enabled resource, so we return the X-Pingback header + self.headers.merge!({'X-Pingback' => (blog_options[:host] + slice_url(:pingback))}) + + return "" if request.method == :head + # Increase view count @post.update_attributes(:views_count => ((@post.views_count || 0) + 1)) @@ -87,6 +94,47 @@ class BlogSlice::Posts < BlogSlice::Application end end + def pingback + xmlrpc = XMLRPC::BasicServer.new + + xmlrpc.add_handler("pingback.ping") do |source_url, target_url| + Linkback.new(:source_url => source_url, :target_url => target_url, :type => 'linkback').handle_linkback + end + puts self.request.inspect + + xml_response = xmlrpc.process(request.raw_post) + + # Log the error if there is one + parser = XMLRPC::XMLParser::XMLStreamParser.new + ret = parser.parseMethodResponse(xml_response) + Merb.logger.info("XMLRPC fault raised. Code: #{ret[1].faultCode}: Message: #{ret[1].faultString}") unless ret[0] + + self.headers["Content-Type"] = "text/xml; charset=utf-8" + + render xml_response, :layout => false + + # answer = <<-ANSWER + # <?xml version="1.0"?> + # <methodResponse> + # <fault> + # <value> + # <struct> + # <member> + # <name>faultCode</name> + # <value><int>0</int></value> + # </member> + # <member> + # <name>faultString</name> + # <value><string>Too many parameters.</string></value> + # </member> + # </struct> + # </value> + # </fault> + # </methodResponse> + # ANSWER + # render answer + end + protected def get_post app/controllers/posts.rb @@ -1,3 +1,6 @@ +require 'hpricot' +require 'open-uri' + class Linkback include DataMapper::Resource include DataMapper::Timestamp @@ -25,4 +28,23 @@ class Linkback def outgoing? self.direction == true end + + def handle_linkback + begin + #source_html = open(source_uri) if source_uri =~ /^http:\/\// + #@parser = Hpricot(source_html) + + self.title = "bla" # FIXME + #return 17 unless @linking_node = find_linking_node_to(target_uri) + #@excerpt = excerpt_content_to(@linking_node, target_uri) + self.excerpt = "bla" # FIXME + self.save + #return 33 unless save_pingback # invoke the outside callback. + return "Ping from #{source_uri} to #{target_uri} registered. Thanks for linking to us." + ### TODO: let save_callback propagate other error codes. + + rescue SocketError, OpenURI::HTTPError => e + return 16 + end + end end \ No newline at end of file app/models/linkback.rb @@ -1,5 +1,6 @@ - throw_content :head do %link{:rel => 'alternate', :type => 'application/rss+xml', :title => "Comments RSS 2.0", :href => resource(@post, :comments, :feed)} + ="<link rel=\"pingback\" href=\"#{(blog_options[:host] + slice_url(:pingback))}\" />" - comment_status = ((@post.comments.size == 1) ? "One Comment" : (((@post.comments.size==0) ? 'No' : @post.comments.size.to_s) + ' Comments')) .post{:id => "post_#{@post.id}"} app/views/posts/show.html.haml @@ -1,10 +1,8 @@ - throw_content :title do - = link blog_options[:blog_title], :to => slice_url(:posts) - \/ Tags #tags - @tags.each do |tag| - - unless tag.posts.empty? + - unless (tag.posts.count == 0) %span{:class => "size_#{tag.size}"} - = link tag.name, :to => resource(tag) \ No newline at end of file + = link tag.name, :to => resource(tag), :title => pluralize('Post', tag.posts.count) \ No newline at end of file app/views/tags/index.html.haml @@ -22,7 +22,7 @@ if defined?(Merb::Plugins) # Slice metadata self.description = "Blog Slice is a very basic blogging system" - self.version = "0.9.10" + self.version = "0.9.11" self.author = "Maxime Guilbot for Ekohe" Merb.add_mime_type :rss, nil, %w[text/xml] @@ -74,7 +74,10 @@ if defined?(Merb::Plugins) end scope.resources :categories, :identify => :slug scope.resources :tags, :identify => :slug + + scope.match("/posts/:slug", :method => :head).to(:controller => 'posts', :action => 'show').name(:show_post_head) + scope.match("/pingback").to(:controller => 'posts', :action => 'pingback').name(:pingback) scope.match("/feed").to(:controller => 'posts', :action => 'feed', :format => 'rss').name(:feed) scope.match("/dashboard").to(:controller => 'dashboard', :action => 'dashboard').name(:dashboard) scope.match("/moderate_comments").to(:controller => 'comments', :action => 'moderate').name(:moderate_comments) @@ -110,9 +113,10 @@ if defined?(Merb::Plugins) dependency "merb-simple-forms" dependency "RedCloth" dependency "BlueCloth" - dependency "merb_builder" + dependency "merb-builder" dependency "merb-mailer" - require "will_paginate" + gem 'will_paginate', '~> 3.0.0' + require 'will_paginate' require 'blog-slice/text_rendering' end \ No newline at end of file lib/blog-slice.rb @@ -14,6 +14,24 @@ namespace :slices do task :migrate do end + desc "Send Pingback" + task :send_pingback do + # From http://github.com/apotonick/pingback_engine/ + require 'xmlrpc/client' + + server = XMLRPC::Client.new2("http://localhost:4000/pingback") + + ok, param = server.call2("pingback.ping", ARGV[0], ARGV[1]) + + if ok then + puts "Response: #{param}" + else + puts "Error:" + puts param.faultCode + puts param.faultString + end + end + desc "Generate data" task :generate_data => :merb_env do include DataMapper::Sweatshop::Unique lib/blog-slice/slicetasks.rb @@ -37,8 +37,8 @@ describe "categories/index, authorized" do it "should display links for editing and destroying categories" do @body.should have_tag(:a, :href => '/categories/anilopyrin/edit') @body.should have_tag(:a, :href => '/categories/colorable/edit') - @body.should have_tag(:a, :href => '/categories/anilopyrin', :method => :delete) - @body.should have_tag(:a, :href => '/categories/colorable', :method => :delete) + @body.should have_tag(:a, :href => '/categories/anilopyrin', :method => 'delete') + @body.should have_tag(:a, :href => '/categories/colorable', :method => 'delete') end end @@ -80,8 +80,8 @@ describe "categories/index, authorized" do it "should display links for editing and destroying categories" do @body.should_not have_tag(:a, :href => '/categories/anilopyrin/edit') @body.should_not have_tag(:a, :href => '/categories/colorable/edit') - @body.should_not have_tag(:a, :href => '/categories/anilopyrin', :method => :delete) - @body.should_not have_tag(:a, :href => '/categories/colorable', :method => :delete) + @body.should_not have_tag(:a, :href => '/categories/anilopyrin', :method => 'delete') + @body.should_not have_tag(:a, :href => '/categories/colorable', :method => 'delete') end end spec/views/categories/index.html.haml_spec.rb @@ -23,15 +23,15 @@ describe "comments/form" do end it "should have a text field for the author" do - @body.should have_tag(:input, :type => :text, :name => 'comment[author]') + @body.should have_tag(:input, :type => 'text', :name => 'comment[author]') end it "should have a text field for the url" do - @body.should have_tag(:input, :type => :text, :name => 'comment[url]') + @body.should have_tag(:input, :type => 'text', :name => 'comment[url]') end it "should have a text field for the email" do - @body.should have_tag(:input, :type => :text, :name => 'comment[email]') + @body.should have_tag(:input, :type => 'text', :name => 'comment[email]') end it "should have a text area for the content" do spec/views/comments/form.html.haml_spec.rb @@ -26,7 +26,7 @@ describe "posts/form" do end it "should have a text field for the title" do - @body.should have_tag(:input, :type => :text, :id => 'post_title') + @body.should have_tag(:input, :type => 'text', :id => 'post_title') end it "should have a text area for the content" do @@ -38,7 +38,7 @@ describe "posts/form" do end it "should have a tag text field for the tags" do - @body.should have_tag(:input, :type => :text, :id => 'post_tags_list') + @body.should have_tag(:input, :type => 'text', :id => 'post_tags_list') end it "should have a multiple checkboxes for selecting categories" do spec/views/posts/form.html.haml_spec.rb @@ -174,5 +174,10 @@ describe "posts/show not authorized" do render @body.should have_tag(:a, :href => '/posts/my-first-post/trackback') end + + it "should render the link rel='pingback' for pingback enabled resources" do + render + @body.should have_tag(:link, :rel => 'pingback', :href => 'http://www.example.org/pingback') + end end spec/views/posts/show.html.haml_spec.rb @@ -23,8 +23,6 @@ describe "posts/trackback_help" do end it "should display a input textfield with the trackback url inside" do - @body.should have_tag("input", :type => 'text') do |input| - input.should contain("/posts/my-first-post/trackback") - end + @body.should have_tag("input", :type => 'text', :value => "http://www.example.org/posts/my-first-post/trackback") end end \ No newline at end of file spec/views/posts/trackback_help.html.haml_spec.rb @@ -13,9 +13,11 @@ describe 'tags/index' do @controller = BlogSlice::Tags.new(fake_request) first_tag = Tag.new(:id => 1, :slug => 'chocolate', :name => 'Chocolate') - first_tag.stub!(:posts).and_return([1]) + posts = [1] + posts.stub!(:count).and_return(1) + first_tag.stub!(:posts).and_return(posts) second_tag = Tag.new(:id => 2, :slug => 'technology', :name => 'Technology') - second_tag.stub!(:posts).and_return([1]) + second_tag.stub!(:posts).and_return(posts) @controller.instance_variable_set(:@tags, [first_tag, second_tag]) spec/views/tags/index.html.haml_spec.rb 543c48bb7da9abdbeeac5f27f1e2bbf4b096a182 Maxime Guilbot maxime@ekohe.com http://github.com/maxime/blog-slice/commit/86a36c3494e71bc57c56987c871bf621c9e2db33 86a36c3494e71bc57c56987c871bf621c9e2db33 2009-05-16T08:40:42-07:00 2009-05-16T08:40:42-07:00 Version 0.9.11 Fixed some compatibility issues with Merb 1.0.11 and will_paginate ee64d84f96a940bed37867de32a5c0959145f569 Maxime Guilbot maxime@ekohe.com