pubsubhubbub 0.1.1 → 0.2.0

data/Rakefile

@@ -1,20 +1,9 @@
-require 'rake'
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "pubsubhubbub"
-    gemspec.summary = "Asynchronous PubSubHubbub client for Ruby"
-    gemspec.description = gemspec.summary
-    gemspec.email = "ilya@igvita.com"
-    gemspec.homepage = "http://github.com/igrigorik/pubsubhubbub"
-    gemspec.authors = ["Ilya Grigorik"]
-    gemspec.add_dependency('eventmachine', '>= 0.12.9')
-    gemspec.add_dependency('em-http-request', '>= 0.1.5')
-    gemspec.rubyforge_project = "pubsubhubbub"
-  end
+require 'rspec/core/rake_task'
 
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
-end
+desc "Run all RSpec tests"
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/lib/pubsubhubbub.rb

@@ -1,10 +1,8 @@
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 
-require "rubygems"
 require "eventmachine"
 require "em-http"
 require "cgi"
+require "uri"
 
-%w[ client ].each do |file|
-  require "pubsubhubbub/#{file}"
-end
+require "pubsubhubbub/client"

data/lib/pubsubhubbub/client.rb

@@ -7,19 +7,21 @@
 module EventMachine
   class PubSubHubbub
     include EventMachine::Deferrable
+    include EventMachine::HttpEncoding
 
     HEADERS = {"User-Agent" => "PubSubHubbub Ruby", "Content-Type" => "application/x-www-form-urlencoded"}
 
-    def initialize(hub)
+    def initialize(hub, options={})
+      @headers = HEADERS.merge(options[:head]) if options[:head]
       @hub = hub.kind_of?(URI) ? hub : URI::parse(hub)
     end
 
     def publish(*feeds)
       data = feeds.flatten.collect do |feed|
-        {'hub.url' => feed, 'hub.mode' => 'publish'}.to_params
+        form_encode_body({'hub.url' => feed, 'hub.mode' => 'publish'})
       end.join("&")
 
-      request(:body => data, :head => HEADERS)
+      request(:body => data, :head => @headers)
     end
 
     # These command will work only if the callback URL supports confirmation.
@@ -28,31 +30,31 @@ module EventMachine
 
     private
 
-      def command(cmd, feed, callback, options)
-        options['hub.verify'] ||= "sync"
-        params = {'hub.topic' => feed, 'hub.mode' => cmd, 'hub.callback' => callback}.merge(options).to_params
+    def command(cmd, feed, callback, options)
+      options['hub.verify'] ||= "sync"
+      params = {'hub.topic' => feed, 'hub.mode' => cmd, 'hub.callback' => callback}.merge(options)
+      params = form_encode_body(params)
 
-        request(:body => params, :head => HEADERS)
-      end
+      request(:body => params, :head => @headers)
+    end
 
-      def request(opts)
-        r = http_request(opts)
+    def request(opts)
+      r = http_request(opts)
+      r.errback { fail }
 
-        r.callback do
-          if r.response_header.status == 204
-            succeed r
-          else
-            fail r
-          end
+      r.callback do
+        if r.response_header.status == 204
+          succeed r
+        else
+          fail r
         end
-
-        r.errback { fail }
-        r
-
       end
 
-      def http_request(opts)
-        EventMachine::HttpRequest.new(@hub).post opts
-      end
+      r
+    end
+
+    def http_request(opts)
+      EventMachine::HttpRequest.new(@hub).post opts
+    end
   end
 end

data/lib/pubsubhubbub/version.rb

@@ -0,0 +1,5 @@
+module EventMachine
+  class PubSubHubbub
+    VERSION = '0.2.0'
+  end
+end

data/{test/test_client.rb → spec/client_spec.rb}

@@ -1,5 +1,4 @@
-require 'rubygems'
-require 'spec'
+# require 'rubygems'
 require 'eventmachine'
 require 'lib/pubsubhubbub'
 
@@ -10,6 +9,29 @@ describe EventMachine::PubSubHubbub do
     fail
   end
 
+  describe "protected hub" do
+    it "should accept basic auth options" do
+
+      EventMachine::HttpRequest.should_receive(:new).and_return(req = mock('request').as_null_object)
+      req.should_receive(:post).with(
+        :body => anything,
+        :head => hash_including(
+          'authorization'=> ['username','password']
+        )
+      ).and_return(req)
+      req.stub!(:callback) {EventMachine.stop}
+
+      EventMachine.run {
+        pub = EventMachine::PubSubHubbub.new('http://example.com/hub', :head => {'authorization' => ['username','password']})
+        pub.subscribe 'http://example.com/feed', 'http://example.com/callback'
+        pub.callback {
+          sub.response_header.status.should == 204
+          EM.stop
+        }
+      }
+    end
+  end
+
   it "should publish single feed to hub" do
     EventMachine.run {
       pub = EventMachine::PubSubHubbub.new('http://pubsubhubbub.appspot.com/publish').publish "http://www.test.com/"
@@ -34,29 +56,29 @@ describe EventMachine::PubSubHubbub do
       }
     }
   end
-  
+
   it "should subscribe a single feed to hub" do
     EventMachine.run {
       sub = EventMachine::PubSubHubbub.new('http://pubsubhubbub.appspot.com/').subscribe "http://blog.superfeedr.com/atom.xml", "http://superfeedr.com/hubbub", {}
-      
+
       sub.errback { failed }
       sub.callback {
         sub.response_header.status.should == 204
         EventMachine.stop
       }
-    }    
+    }
   end
-  
+
   it "should unsubscribe a single feed to hub" do
     EventMachine.run {
       sub = EventMachine::PubSubHubbub.new('http://pubsubhubbub.appspot.com/').unsubscribe "http://blog.superfeedr.com/atom.xml", "http://superfeedr.com/hubbub", {}
-      
+
       sub.errback { failed }
       sub.callback {
         sub.response_header.status.should == 204
         EventMachine.stop
       }
-    }    
+    }
   end
 
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Ilya Grigorik
@@ -14,62 +14,89 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-01 00:00:00 -04:00
+date: 2011-03-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 12
-        - 9
-        version: 0.12.9
+        version: "0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: em-http-request
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 1
-        - 5
-        version: 0.1.5
+        version: "0"
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
 description: Asynchronous PubSubHubbub client for Ruby
-email: ilya@igvita.com
+email: 
+- ilya@igvita.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
 - README.rdoc
 - Rakefile
 - VERSION
 - lib/pubsubhubbub.rb
 - lib/pubsubhubbub/client.rb
-- test/test_client.rb
+- lib/pubsubhubbub/version.rb
+- spec/client_spec.rb
 has_rdoc: true
 homepage: http://github.com/igrigorik/pubsubhubbub
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -77,6 +104,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -86,9 +114,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: pubsubhubbub
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Asynchronous PubSubHubbub client for Ruby
 test_files: 
-- test/test_client.rb
+- spec/client_spec.rb