@@ -8,6 +8,8 @@ module EventMachine class PubSubHubbub include EventMachine::Deferrable + HEADERS = {"User-Agent" => "PubSubHubbub Ruby", "Content-Type" => "application/x-www-form-urlencoded"} + def initialize(hub) @hub = hub.kind_of?(URI) ? hub : URI::parse(hub) end @@ -17,7 +19,7 @@ module EventMachine {'hub.url' => feed, 'hub.mode' => 'publish'}.to_params end.join("&") - r = EventMachine::HttpRequest.new(@hub).post :body => data + r = EventMachine::HttpRequest.new(@hub).post :body => data, :head => HEADERS r.callback { if r.response_header.status == 204 succeed r @@ -30,52 +32,29 @@ module EventMachine r end - ## - # This will work only if ythe callback URL supports confirmation. - def subscribe(feed, callback, options = {}) - options['hub.verify'] ||= "sync" - - params = {'hub.topic' => feed, 'hub.mode' => 'subscribe', 'hub.callback' => callback}.merge(options).to_params + # These command will work only if the callback URL supports confirmation. + def subscribe(feed, callback, options = {}); command('subscribe', feed, callback, options); end + def unsubscribe(feed, callback, options = {}); command('unsubscribe', feed, callback, options); end - r = EventMachine::HttpRequest.new(@hub).post :body => params, :head => {"User-Agent" => "PubSubHubbub Ruby", "Content-Type" => "application/x-www-form-urlencoded", "Content-Length" => params.size } - - r.callback { - if r.response_header.status == 204 - succeed r - else - fail r - end - } - - r.errback { - fail - } - r - end + private - ## - # This will work only if ythe callback URL supports confirmation. - def unsubscribe(feed, callback, options = {}) + def command(cmd, feed, callback, options) options['hub.verify'] ||= "sync" - - params = {'hub.topic' => feed, 'hub.mode' => 'unsubscribe', 'hub.callback' => callback}.merge(options).to_params - - r = EventMachine::HttpRequest.new(@hub).post :body => params, :head => {"User-Agent" => "PubSubHubbub Ruby", "Content-Type" => "application/x-www-form-urlencoded", "Content-Length" => params.size } - - r.callback { + + params = {'hub.topic' => feed, 'hub.mode' => cmd, 'hub.callback' => callback}.merge(options).to_params + r = EventMachine::HttpRequest.new(@hub).post :body => params, :head => HEADERS + + r.callback { if r.response_header.status == 204 succeed r else fail r end } - - r.errback { - fail - } + + r.errback { fail } r end - - end -end + end +end \ No newline at end of file lib/pubsubhubbub/client.rb @@ -14,7 +14,7 @@ describe EventMachine::PubSubHubbub do EventMachine.run { pub = EventMachine::PubSubHubbub.new('http://pubsubhubbub.appspot.com/publish').publish "http://www.test.com/" - pub.errback { fail } + pub.errback { failed } pub.callback { pub.response_header.status.should == 204 EventMachine.stop @@ -27,7 +27,7 @@ describe EventMachine::PubSubHubbub do feeds = ['http://www.test.com', 'http://www.test.com/2'] pub = EventMachine::PubSubHubbub.new('http://pubsubhubbub.appspot.com/publish').publish feeds - pub.errback { fail } + pub.errback { failed } pub.callback { pub.response_header.status.should == 204 EventMachine.stop @@ -39,7 +39,7 @@ describe EventMachine::PubSubHubbub do EventMachine.run { sub = EventMachine::PubSubHubbub.new('http://pubsubhubbub.appspot.com/').subscribe "http://blog.superfeedr.com/atom.xml", "http://superfeedr.com/hubbub", {} - sub.errback { fail } + sub.errback { failed } sub.callback { sub.response_header.status.should == 204 EventMachine.stop @@ -51,7 +51,7 @@ describe EventMachine::PubSubHubbub do EventMachine.run { sub = EventMachine::PubSubHubbub.new('http://pubsubhubbub.appspot.com/').unsubscribe "http://blog.superfeedr.com/atom.xml", "http://superfeedr.com/hubbub", {} - sub.errback { fail } + sub.errback { failed } sub.callback { sub.response_header.status.should == 204 EventMachine.stop test/test_client.rb 05c7345ad52cd2252657aa334528a6efc7788928 Ilya Grigorik ilya@igvita.com http://github.com/igrigorik/PubSubHubbub/commit/216fafd6cae3b6939fe70433f26bbcbea3920d48 216fafd6cae3b6939fe70433f26bbcbea3920d48 2009-07-26T11:49:38-07:00 2009-07-26T11:49:38-07:00 refactor subscribe/unsubscribe 16c212cc995807ad79111fc7245d2412d3d1f276 Ilya Grigorik ilya@igvita.com