julien51-pubsubhubbub 0.1 → 0.1.1

data/lib/pubsubhubbub/client.rb

@@ -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

data/pubsubhubbub.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'pubsubhubbub'
-  s.version = '0.1'
+  s.version = '0.1.1'
   s.date = '2009-06-28'
   s.summary = 'Ruby / Asynchronous PubSubHubbub Client'
   s.description = s.summary
@@ -9,7 +9,7 @@ spec = Gem::Specification.new do |s|
   s.has_rdoc = true
   s.authors = ["Ilya Grigorik"]
   s.add_dependency('eventmachine', '>= 0.12.2')
-  s.add_dependency('em-http-request', '>= 0.1.6')
+  s.add_dependency('julien51-em-http-request', '>= 0.1.10')
   s.rubyforge_project = "pubsubhubbub"
 
   # ruby -rpp -e' pp `git ls-files`.split("\n") '

data/test/test_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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: julien51-pubsubhubbub
 version: !ruby/object:Gem::Version 
-  version: "0.1"
+  version: 0.1.1
 platform: ruby
 authors: 
 - Ilya Grigorik
@@ -23,14 +23,14 @@ dependencies:
         version: 0.12.2
     version: 
 - !ruby/object:Gem::Dependency 
-  name: em-http-request
+  name: julien51-em-http-request
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.6
+        version: 0.1.10
     version: 
 description: Ruby / Asynchronous PubSubHubbub Client
 email: ilya@igvita.com