rack-superfeedr 0.0.5 → 0.1.0

data/Gemfile.lock

@@ -7,12 +7,12 @@ GEM
       git (>= 1.2.5)
       rake
     mime-types (1.17.2)
-    nokogiri (1.5.0)
-    rack (1.4.0)
+    nokogiri (1.5.6)
+    rack (1.5.2)
     rake (0.9.2.2)
     rcov (0.9.11)
     shoulda (2.11.3)
-    typhoeus (0.3.3)
+    typhoeus (0.6.2)
       mime-types
 
 PLATFORMS

data/Rakefile

@@ -45,7 +45,7 @@ end
 
 task :default => :test
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.1.0

data/examples/sinatra_app.rb

@@ -1,13 +1,14 @@
 require 'sinatra'
-require 'rack-superfeedr'
+require(File.join(File.dirname(__FILE__), '..', 'lib', 'rack-superfeedr.rb'))
 
-use Rack::Superfeedr, { :host => "1pqz.showoff.io", :login => "demo", :password => "demo", :format => "json", :async => false } do |superfeedr|
+
+use Rack::Superfeedr, { :host => "pstx.showoff.io", :login => "demo", :password => "demo", :format => "json", :async => false } do |superfeedr|
   set :superfeedr, superfeedr # so that we can use `settings.superfeedr` to access the superfeedr object in our application.
-  
+
   superfeedr.on_notification do |notification|
     puts notification.to_s # You probably want to persist that data in some kind of data store...
   end
-  
+
 end
 
 get '/hi' do
@@ -15,7 +16,12 @@ get '/hi' do
 end
 
 get '/subscribe' do
-  settings.superfeedr.subscribe("http://push-pub.appspot.com/feed") 
+  subscription = settings.superfeedr.subscribe("http://push-pub.appspot.com/feed")
+  if !subscription
+    settings.superfeedr.error
+  else
+    'Subscribed'
+  end
 end
 
 get '/unsubscribe' do

data/lib/rack-superfeedr.rb

@@ -3,18 +3,28 @@ require 'typhoeus'
 require 'json'
 require 'nokogiri'
 
+
 module Rack
+
+
   ##
   # This is a Rack Middleware that can be used in your rack-compatible web framework (Rails, Sinatra...) to perform subscriptions over at superfeedr
   # using the PubSubHubbub API.
   class Superfeedr
-    
+
     SUPERFEEDR_ENDPOINT = "https://superfeedr.com/hubbub"
-    
+
+    ##
+    # Shows the latest error received by the API.
+    # Useful when a subscription or unsubscription request fails.
+    def error
+      @error
+    end
+
     ##
     # Subscribe you to a url. id is optional, but recommanded has a unique identifier for this url. It will be used to help you identify which feed
     # is concerned by a notification.
-    # The optional block will be called to let you confirm the subscription (or not). 
+    # The optional block will be called to let you confirm the subscription (or not).
     # It returns true if the subscription was successful (or will be confirmed if you used async => true in the options), false otherwise.
     # You can also pass an opts third argument that will be merged with the options used in Typhoeus's Request (https://github.com/dbalatero/typhoeus)
     # A useful option is :verbose => true for example.
@@ -24,10 +34,10 @@ module Rack
         @verifications[feed_id] ||= {}
         @verifications[feed_id]['subscribe'] = block
       end
-      response = Typhoeus::Request.post(SUPERFEEDR_ENDPOINT, 
+      response = ::Typhoeus::Request.post(SUPERFEEDR_ENDPOINT,
       opts.merge({
         :params => {
-          :'hub.mode' => 'subscribe', 
+          :'hub.mode' => 'subscribe',
           :'hub.verify' => @params[:async] ? 'async' : 'sync',
           :'hub.topic' => url,
           :'hub.callback' =>  generate_callback(url, feed_id)
@@ -35,9 +45,9 @@ module Rack
         :headers => {
           :Accept => @params[:format] == "json" ? "application/json" : "application/atom+xml"
         },
-        :username => @params[:login], 
-        :password => @params[:password]
+        :userpwd => "#{@params[:login]}:#{@params[:password]}"
       }))
+      @error = response.body
       @params[:async] && response.code == 202 || response.code == 204 # We return true to indicate the status.
     end
 
@@ -53,17 +63,17 @@ module Rack
         @verifications[feed_id] ||= {}
         @verifications[feed_id]['unsubscribe'] = block
       end
-      response = Typhoeus::Request.post(SUPERFEEDR_ENDPOINT, 
+      response = ::Typhoeus::Request.post(SUPERFEEDR_ENDPOINT,
       opts.merge({
         :params => {
-          :'hub.mode' => 'unsubscribe', 
+          :'hub.mode' => 'unsubscribe',
           :'hub.verify' => @params[:async] ? 'async' : 'sync',
           :'hub.topic' => url,
           :'hub.callback' =>  generate_callback(url, feed_id)
         },
-        :username => @params[:login], 
-        :password => @params[:password]
+        :userpwd => "#{@params[:login]}:#{@params[:password]}"
       }))
+      @error = response.body
       @params[:async] && response.code == 202 || response.code == 204 # We return true to indicate the status.
     end
 
@@ -72,7 +82,7 @@ module Rack
     # - the payload itself (ATOM or JSON, based on what you selected in the params)
     # - the id for the feed, if you used any upon subscription
     def on_notification(&block)
-      @callback = block 
+      @callback = block
     end
 
     ##
@@ -114,7 +124,11 @@ module Rack
       elsif env['REQUEST_METHOD'] == 'POST' && feed_id = env['PATH_INFO'].match(/\/superfeedr\/feed\/(.*)/)
         # Notification
         content = nil
-        content_type = env["CONTENT_TYPE"].split(";").first
+        if env["CONTENT_TYPE"]
+          content_type = env["CONTENT_TYPE"].split(";").first
+        else
+          content_type = "application/atom+xml" #default?
+        end
         if content_type == "application/json"
           # Let's parse the body as JSON
           content = JSON.parse(req.body.read)
@@ -130,13 +144,13 @@ module Rack
       else
         @app.call(env)
       end
-    end  
-    
+    end
+
     protected
-    
+
     def generate_callback(url, feed_id)
       URI::HTTP.build({:host => @params[:host], :path => "/superfeedr/feed/#{feed_id}" }).to_s
     end
-    
+
   end
 end

data/rack-superfeedr.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["julien51"]
-  s.date = "2012-03-21"
+  s.date = "2013-03-10"
   s.description = "A gem that provides a rack middleware to interract with Superfeedr's API. "
   s.email = "julien@superfeedr.com"
   s.extra_rdoc_files = [

metadata

@@ -1,135 +1,137 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rack-superfeedr
-version: !ruby/object:Gem::Version
-  version: 0.0.5
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.1.0
 platform: ruby
-authors:
+authors: 
 - julien51
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-21 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-03-10 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rack
-  requirement: &2173704720 !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *2173704720
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: nokogiri
-  requirement: &2173703740 !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *2173703740
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: typhoeus
-  requirement: &2173702920 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *2173702920
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: shoulda
-  requirement: &2173696420 !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *2173696420
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &2173694500 !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2173694500
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &2173692300 !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2173692300
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: rcov
-  requirement: &2173681780 !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *2173681780
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: rack
-  requirement: &2173680800 !ruby/object:Gem::Requirement
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *2173680800
-- !ruby/object:Gem::Dependency
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: nokogiri
-  requirement: &2173679660 !ruby/object:Gem::Requirement
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *2173679660
-- !ruby/object:Gem::Dependency
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
   name: typhoeus
-  requirement: &2173678620 !ruby/object:Gem::Requirement
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *2173678620
-description: ! 'A gem that provides a rack middleware to interract with Superfeedr''s
-  API. '
+  version_requirements: *id010
+description: "A gem that provides a rack middleware to interract with Superfeedr's API. "
 email: julien@superfeedr.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - LICENSE.txt
 - README.rdoc
-files:
+files: 
 - .document
 - Gemfile
 - Gemfile.lock
@@ -143,31 +145,34 @@ files:
 - test/helper.rb
 - test/test_rack-superfeedr.rb
 homepage: http://rubygems.org/gems/rack-superfeedr
-licenses:
+licenses: 
 - MIT
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 4506397640397812530
+      segments: 
       - 0
-      hash: 3721893544241889941
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: A gem that provides a rack middleware to interract with Superfeedr's API.
 test_files: []
+