rack-superfeedr 0.2.1 → 0.3.0

data/Gemfile

@@ -1,16 +1,16 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 # Add dependencies required to use your gem here.
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 gem 'rack'
 gem 'nokogiri', ">=1.6.1"
-gem 'typhoeus', ">=0.6.7"
-
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "shoulda", ">= 0"
-  gem "bundler", ">= 1.0.0"
-  gem "jeweler", ">= 1.6.4"
+  gem 'shoulda', '>= 0'
+  gem 'turn'
+  gem 'bundler', '>= 1.0.0'
+  gem 'jeweler', '>= 1.6.4'
+  gem 'thin'
 end

data/Gemfile.lock

@@ -1,36 +1,34 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (4.0.2)
-      i18n (~> 0.6, >= 0.6.4)
+    activesupport (4.0.8)
+      i18n (~> 0.6, >= 0.6.9)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    addressable (2.3.5)
-    atomic (1.1.14)
+    addressable (2.3.6)
+    ansi (1.4.3)
     builder (3.2.2)
-    descendants_tracker (0.0.3)
-    ethon (0.6.2)
-      ffi (>= 1.3.0)
-      mime-types (~> 1.18)
-    faraday (0.8.9)
-      multipart-post (~> 1.2.0)
-    ffi (1.9.3)
-    git (1.2.6)
-    github_api (0.11.1)
+    daemons (1.1.9)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    eventmachine (1.0.3)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    git (1.2.7)
+    github_api (0.12.0)
       addressable (~> 2.3)
-      descendants_tracker (~> 0.0.1)
+      descendants_tracker (~> 0.0.4)
       faraday (~> 0.8, < 0.10)
-      hashie (>= 1.2)
+      hashie (>= 3.2)
       multi_json (>= 1.7.5, < 2.0)
-      nokogiri (~> 1.6.0)
+      nokogiri (~> 1.6.3)
       oauth2
-    hashie (2.0.5)
-    highline (1.6.20)
-    httpauth (0.2.0)
-    i18n (0.6.9)
-    jeweler (2.0.0)
+    hashie (3.2.0)
+    highline (1.6.21)
+    i18n (0.6.11)
+    jeweler (2.0.1)
       builder
       bundler (>= 1.0)
       git (>= 1.2.5)
@@ -40,38 +38,39 @@ GEM
       rake
       rdoc
     json (1.8.1)
-    jwt (0.1.8)
-      multi_json (>= 1.5)
-    mime-types (1.25.1)
-    mini_portile (0.5.2)
+    jwt (1.0.0)
+    mini_portile (0.6.0)
     minitest (4.7.5)
-    multi_json (1.8.4)
+    multi_json (1.10.1)
     multi_xml (0.5.5)
-    multipart-post (1.2.0)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
-    oauth2 (0.9.2)
-      faraday (~> 0.8)
-      httpauth (~> 0.2)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
+    multipart-post (2.0.0)
+    nokogiri (1.6.3.1)
+      mini_portile (= 0.6.0)
+    oauth2 (1.0.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
     rack (1.5.2)
-    rake (10.1.1)
+    rake (10.3.2)
     rdoc (4.1.1)
       json (~> 1.4)
     shoulda (3.5.0)
       shoulda-context (~> 1.0, >= 1.0.1)
       shoulda-matchers (>= 1.4.1, < 3.0)
-    shoulda-context (1.1.6)
-    shoulda-matchers (2.4.0)
+    shoulda-context (1.2.1)
+    shoulda-matchers (2.6.2)
       activesupport (>= 3.0.0)
-    thread_safe (0.1.3)
-      atomic
-    typhoeus (0.6.7)
-      ethon (~> 0.6.2)
-    tzinfo (0.3.38)
+    thin (1.6.2)
+      daemons (>= 1.0.9)
+      eventmachine (>= 1.0.0)
+      rack (>= 1.0.0)
+    thread_safe (0.3.4)
+    turn (0.9.7)
+      ansi
+      minitest (~> 4)
+    tzinfo (0.3.40)
 
 PLATFORMS
   ruby
@@ -82,4 +81,5 @@ DEPENDENCIES
   nokogiri (>= 1.6.1)
   rack
   shoulda
-  typhoeus (>= 0.6.7)
+  thin
+  turn

data/README.rdoc

@@ -3,6 +3,8 @@
 A gem that provides a rack middleware to interact with {Superfeedr}[http://superfeedr.com/]'s PubSubHubbub API. It let you *subscribe*, *unsubscribe* and *receive* incoming feed notifications.
 This should work with any Rack-compatible framework, as well as fully managed platforms like {Heroku}[http://www.heroku.com/].
 
+Warning : version 0.3 (July 2014) introduces a lot of breaking changes compared to previous versions. Upgrade carefully!
+
 == Installing
 
     gem install rack-superfeedr
@@ -11,7 +13,7 @@ This should work with any Rack-compatible framework, as well as fully managed pl
 
 You first need a {subscriber account}[http://superfeedr.com/subscriber] with Superfeedr.
 
-*Warning* : your web application needs to be accessible for Superfeedr to send notifications. If you want to test it locally, we suggest you use it with a tool like {showoff}[https://showoff.io/] which will make your local port accessible from the outside world.
+*Warning* : your web application needs to be accessible for Superfeedr to send notifications. If you want to test it locally, we suggest you use it with a tool like {Passsageway}[https://www.runscope.com/docs/passageway] which will make your local port accessible from the outside world.
 
 === Sinatra
 
@@ -23,12 +25,10 @@ Tested with Rails 3.2, but should work with any Rails version that supports Rack
 
 Install the gem (using bundle), and then in <code>config/application.rb</code>, inside the <code>class Application < Rails::Application</code> block, just add the following line.
 
-  config.middleware.use Rack::Superfeedr, { :host => DOMAIN, :login => SUPERFEEDR_LOGIN, :password => SUPERFEEDR_PASSWORD} do |superfeedr|
-    Superfeedr = superfeedr
+  config.middleware.use Rack::Superfeedr do |superfeedr|
+  ...
   end
 
-You can then access the Superfeedr object anywhere in your rails application with <code>YOUR_APP::Application::Superfeedr</code>.
-
 
 == Contributing
  

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/examples/sinatra_app.rb

@@ -1,30 +1,44 @@
 require 'sinatra'
-require(File.join(File.dirname(__FILE__), '..', 'lib', 'rack-superfeedr.rb'))
+require (File.join(File.dirname(__FILE__), '..', 'lib', 'rack-superfeedr.rb'))
 
 
-use Rack::Superfeedr, { :host => "pstx.showoff.io", :login => "julien", :password => "f8054b405e68aa2067df25fb21665bab", :format => "json", :async => false } do |superfeedr|
-  set :superfeedr, superfeedr # so that we can use `settings.superfeedr` to access the superfeedr object in our application.
+# Configure the middleware
+Rack::Superfeedr.host = "37cb3f2fe113.a.passageway.io"
+Rack::Superfeedr.login = "demo"
+Rack::Superfeedr.password = "8ac38a53cc32f71a6445e880f76fc865"
 
-  superfeedr.on_notification do |notification|
-    puts notification.to_s # You probably want to persist that data in some kind of data store...
+
+use Rack::Superfeedr do |superfeedr|
+
+  superfeedr.on_notification do |feed_id, body, url, request|
+    puts "------"
+    puts feed_id # You need to have supplied one upon subscription
+    puts "------"
+    puts body # The body of the notification, a JSON or ATOM string, based on the subscription. Use the Rack::Request object for details
+    puts "------"
+    puts url # The feed url
+    puts "------"
   end
 
 end
 
+ # Maybe serve the data you saved from Superfeedr's handler.
 get '/hi' do
-  "Hello World!" # Maybe serve the data you saved from Superfeedr's handler.
+  "Hello World!"
 end
 
+# Subscription
+# Will subscribe to "http://push-pub.appspot.com/feed" and retrieve past items
+# The block will yield the result: its body (useful for error or when retrieveing, a success flag and the Net::HTTP::Post)
 get '/subscribe' do
-  subscription = settings.superfeedr.subscribe("http://push-pub.appspot.com/feed", 9999, { verbose: true, retrieve: true })
-  if !subscription
-    settings.superfeedr.error
-  else
-    'Subscribed'
+  Rack::Superfeedr.subscribe("http://push-pub.appspot.com/feed", 9999, {retrieve: true }) do |body, success, response|
+    body
   end
 end
 
+# Unsubscription
+# Wull unsubscribe
 get '/unsubscribe' do
-  settings.superfeedr.unsubscribe("http://push-pub.appspot.com/feed")
+  Rack::Superfeedr.unsubscribe("http://push-pub.appspot.com/feed")
 end
 

data/lib/rack-superfeedr.rb

@@ -1,8 +1,6 @@
 require 'base64'
-require 'typhoeus'
-require 'json'
-require 'nokogiri'
-
+require 'net/http'
+require 'uri'
 
 module Rack
 
@@ -12,85 +10,79 @@ module Rack
   # using the PubSubHubbub API.
   class Superfeedr
 
-    SUPERFEEDR_ENDPOINT = "https://push.superfeedr.com"
+    @@superfeedr_endpoint = "https://push.superfeedr.com/"
+    @@port = 80
+    @@host = 'my-app.com'
+    @@base_path = '/superfeedr/feed/'
+    @@scheme = 'http'
+    @@login = nil
+    @@password = nil
 
-    ##
-    # Shows the latest error received by the API.
-    # Useful when a subscription or unsubscription request fails.
-    def error
-      @error
+    def self.superfeedr_endpoint= _superfeedr_endpoint
+      @@superfeedr_endpoint = _superfeedr_endpoint
     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).
-    # 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.
-    # If you supply a retrieve option, the content of the feed will be retrieved from Superfeedr as well and your on_notification callback will 
-    # will be called with the content of the feed.
-    def subscribe(url, id = nil, opts = {}, &block)
-      feed_id = "#{id ? id : Base64.urlsafe_encode64(url)}"
-      if block
-        @verifications[feed_id] ||= {}
-        @verifications[feed_id]['subscribe'] = block
-      end
-      endpoint = opts[:hub] || SUPERFEEDR_ENDPOINT
-      opts.delete(:hub)
+    def self.port= _port
+      @@port = _port
+    end
 
-      retrieve = opts[:retrieve] || false
-      opts.delete(:retrieve)
+    def self.host= _host
+      @@host = _host
+    end
 
+    def self.base_path= _base_path
+      @@base_path = _base_path
+    end
 
-      if endpoint == SUPERFEEDR_ENDPOINT
-        opts[:userpwd] = "#{@params[:login]}:#{@params[:password]}"
-      end
+    def self.scheme= _scheme
+      @@scheme = _scheme
+    end
 
+    def self.login= _login
+      @@login = _login
+    end
 
-      opts = opts.merge({
-        :params => {
-          :'hub.mode' => 'subscribe',
-          :'hub.topic' => url,
-          :'hub.callback' =>  generate_callback(url, feed_id)
-        },
-        :headers => {
-          :Accept => @params[:format] == "json" ? "application/json" : "application/atom+xml"
-        }
-      })
+    def self.password= _password
+      @@password = _password
+    end
 
-      if retrieve
-        opts[:params][:retrieve] = true
+    ##
+    # Subscribe you to a url. id is optional but strongly recommanded has a unique identifier for this url. It will be used to help you identify which feed
+    # is concerned by a notification.
+    # A 3rd options argument can be supplied with
+    # - retrive => true if you want to retrieve the previous items in the feed
+    # - format => 'json' or 'atom' to specify the format of the notifications, defaults to atom
+    # - secret => a secret string used to compyte HMAC signatures so you can check that the data is coming from Superfeedr
+    # - sync => true (defaults to false) if you want to perfrom a verification of intent syncrhonously
+    # - async => true  (defaults to false) if you want to perfrom a verification of intent asyncrhonously
+    # - hub => if you want to use an explicit hub, defaults to Superfeedr's http://push.superfeedr.com
+    # It yields 3 arguments to a block:
+    # - body of the response (useful if you used the retrieve option)
+    # - success flag 
+    # - response (useful to debug failed requests mostly)
+    def self.subscribe(url, id = nil, opts = {}, &blk)
+      endpoint = opts[:hub] || @@superfeedr_endpoint
+      request = prep_request(url, id, endpoint, opts)
+
+      if opts[:retrieve]
+        request['retrieve'] = true
+      end
+      
+      if opts[:format] == "json"
+        request['format'] = "json"
       end
 
-      opts[:params][:'hub.verify'] = @params[:async] ? 'async' : 'sync'
-
-      response = ::Typhoeus::Request.post(endpoint, opts)
-
-      @error = response.body
-      if !retrieve
-        @params[:async] && response.code == 202 || response.code == 204 # We return true to indicate the status.
+      if opts[:secret]
+        request['hub.secret'] = opts[:secret]
       else
-
-        if response.code == 200
-
-          if  @params[:format] != "json"
-            content = Nokogiri.XML(response.body)
-          else
-            content = JSON.parse(response.body)
-          end
-          # Let's now send that data back to the user.
-          if defined? Hashie::Mash
-            info = Hashie::Mash.new(req: req, body: body)
-          end
-          if !@callback.call(content, feed_id, info)
-            # We need to unsubscribe the user
-          end
-          true
-        else
-          false
-        end
+        request['hub.secret'] = "WHAT DO WE PICK? A UNIQUE SCRET THE CALLBACK? SO WE CAN USE THAT ON NOTIFS?" 
       end
+      
+      request['hub.mode'] = 'subscribe'
+
+      response = http_post(endpoint, request)
+
+      blk.call(response.body, opts[:async] && Integer(response.code) == 202 || Integer(response.code) == 204 || opts[:retrieve] && Integer(response.code) == 200, response) if blk
     end
 
     ##
@@ -98,108 +90,94 @@ module Rack
     # The optional block will be called to let you confirm the subscription (or not). This is not applicable for if you use params[:async] => true
     # It returns true if the unsubscription 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.
-    def unsubscribe(url, id = nil, opts = {}, &block)
-      feed_id = "#{id ? id : Base64.urlsafe_encode64(url)}"
-      if block
-        @verifications[feed_id] ||= {}
-        @verifications[feed_id]['unsubscribe'] = block
-      end
-      response = ::Typhoeus::Request.post(SUPERFEEDR_ENDPOINT,
-      opts.merge({
-        :params => {
-          :'hub.mode' => 'unsubscribe',
-          :'hub.verify' => @params[:async] ? 'async' : 'sync',
-          :'hub.topic' => url,
-          :'hub.callback' =>  generate_callback(url, feed_id)
-        },
-        :userpwd => "#{@params[:login]}:#{@params[:password]}"
-      }))
-      @error = response.body
-      @params[:async] && response.code == 202 || response.code == 204 # We return true to indicate the status.
+    
+    ##
+    # Subscribe you to a url. id needs to match the id you used to subscribe. 
+    # A 3rd options argument can be supplied with
+    # - sync => true (defaults to false) if you want to perfrom a verification of intent syncrhonously
+    # - async => true  (defaults to false) if you want to perfrom a verification of intent asyncrhonously
+    # - hub => if you want to use an explicit hub, defaults to Superfeedr's http://push.superfeedr.com
+    # It yields 3 arguments to a block:
+    # - body of the response (useful to debug failed notifications)
+    # - success flag 
+    # - response (useful to debug failed requests mostly)
+    def self.unsubscribe(url, id = nil, opts = {}, &blk)
+      endpoint = opts[:hub] || @@superfeedr_endpoint
+      request = prep_request(url, id, endpoint, opts)
+
+      request['hub.mode'] = 'unsubscribe'
+
+      response = http_post(endpoint, request)
+
+      blk.call(response.body, opts[:async] && Integer(response.code) == 202 || Integer(response.code) == 204, response) if blk
     end
 
     ##
-    # This allows you to define what happens with the notifications. The block passed in argument is called for each notification, with 2 arguments
-    # - 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
+    # This allows you to define what happens with the notifications. The block passed in argument is called for each notification, with 4 arguments
+    # - feed_id (used in subscriptions)
+    # - body (Atom or JSON) based on subscription
+    # - url (optional... if the hub supports that, Superfeedr does)
+    # - Rack::Request object. Useful for debugging and checking signatures
     def on_notification(&block)
       @callback = block
     end
 
     ##
-    # When using this Rack, you need to supply the following params (2nd argument):
-    # - :host (the host for your web app. Used to build the callback urls.)
-    # - :login
-    # - :password
-    # - :format (atom|json, atom being default)
-    # - :async (true|false), false is default. You need to set that to false if you're using platforms like Heroku that may disallow concurrency.
-    def initialize(app, params = {}, &block)
-      raise ArgumentError, 'Missing :host in params' unless params[:host]
-      raise ArgumentError, 'Missing :login in params' unless params[:login]
-      raise ArgumentError, 'Missing :password in params' unless params[:password]
-      @callback = Proc.new { |notification, feed_id|
-        # Bh default, do nothing
-      }
-      @verifications = {}
-      @params = params
-      @params[:port] = 80 unless params[:port]
+    # This allows you to define what happens with verification of intents
+    # It's a block called with 
+    # - mode: subscribe|unsubscribe
+    # - Feed id (if available/supplied upon subscription)
+    # - Feed url
+    # - request (the Rack::Request object, should probably not be used, except for debugging)
+    # If the block returns true, subscription will be confirmed
+    # If it returns false, it will be denied
+    def on_verification(&block)
+      @verification = block
+    end
+
+    ##
+    # Initializes the Rack Middleware
+    # Make sure you define the following class attribues before that:
+    # Rack::Superfeedr.superfeedr_endpoint => https://push.superfeedr.com, defaults (do not change!)
+    # Rack::Superfeedr.host => Host for your application, used to build callback urls
+    # Rack::Superfeedr.port =>  Port for your application, used to build callback urls, defaults to
+    # Rack::Superfeedr.base_path => Base path for callback urls. Defauls to  '/superfeedr/feed/'
+    # Rack::Superfeedr.scheme => Scheme to build callback urls, defaults to 'http'
+    # Rack::Superfeedr.login => Superfeedr login
+    # Rack::Superfeedr.password => Superfeedr password
+    def initialize(app, &block)
       @app = app
-      @base_path = params[:base_path] || '/superfeedr/feed/'
+      reset
       block.call(self)
       self
     end
 
-    def reset(params = {})
-      raise ArgumentError, 'Missing :host in params' unless params[:host]
-      raise ArgumentError, 'Missing :login in params' unless params[:login]
-      raise ArgumentError, 'Missing :password in params' unless params[:password]
-      @params = params
-    end
-
-    def params
-      @params
+    ##
+    # Resets.
+    def reset 
+      @callback = Proc.new { |feed_id, body, url, request|
+        # Nothing to do by default!
+      }
+      @verification = Proc.new { |mode, feed_id, url, request|
+        true # Accept all by default!
+      }
     end
 
+    ##
+    # Called by Rack!
     def call(env)
       req = Rack::Request.new(env)
-      if env['REQUEST_METHOD'] == 'GET' && feed_id = env['PATH_INFO'].match(/#{@base_path}(.*)/)
-        # Verification of intent!
-        if @verifications[feed_id[1]] && verification = @verifications[feed_id[1]][req.params['hub.mode']]
-          # Check with the user
-          if verification.call(req.params['hub.topic'], feed_id[1])
-            Rack::Response.new(req.params['hub.challenge'], 200).finish
-          else
-            Rack::Response.new("not valid", 404).finish
-          end
-        else
-          # By default, we accept all
+      if env['REQUEST_METHOD'] == 'GET' && feed_id = env['PATH_INFO'].match(/#{@@base_path}(.*)/)
+        puts "----"
+        puts req.params['hub.mode'], feed_id[1], req.params['hub.topic']
+        puts "----"
+        if @verification.call(req.params['hub.mode'], feed_id[1], req.params['hub.topic'], req)
           Rack::Response.new(req.params['hub.challenge'], 200).finish
-        end
-      elsif env['REQUEST_METHOD'] == 'POST' && feed_id = env['PATH_INFO'].match(/#{@base_path}(.*)/)
-        # Notification
-        content = nil
-        # Body is a stream, not a string, so capture it once and save it
-        body = req.body.read
-        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(body)
-        elsif content_type == "application/atom+xml"
-          # Let's parse the body as ATOM using nokogiri
-          content = Nokogiri.XML(body)
-        end
-        # Let's now send that data back to the user.
-        if defined? Hashie::Mash
-          info = Hashie::Mash.new(req: req, body: body)
-        end
-        if !@callback.call(content, feed_id[1], info)
-          # We need to unsubscribe the user
+          Rack::Response.new("not valid", 404).finish
         end
+      elsif env['REQUEST_METHOD'] == 'POST' && feed_id = env['PATH_INFO'].match(/#{@@base_path}(.*)/)
+        @callback.call(feed_id[1], req.body.read, req.env['HTTP_X_PUBSUBHUBBUB_TOPIC'], req)
         Rack::Response.new("Thanks!", 200).finish
       else
         @app.call(env)
@@ -208,11 +186,45 @@ module Rack
 
     protected
 
-    def generate_callback(url, feed_id)
-      scheme = params[:scheme] || 'http'
-      URI::HTTP.build({:scheme => scheme, :host => @params[:host], :path => "#{@base_path}#{feed_id}", :port => @params[:port] }).to_s
+    def self.prep_request(url, id, endpoint, opts)
+      feed_id = "#{id ? id : Base64.urlsafe_encode64(url)}"
+
+      request = {
+        'hub.topic' => url,
+        'hub.callback' =>  generate_callback(url, feed_id)
+      }
+
+      if endpoint == @@superfeedr_endpoint && @@login && @@password
+        request['authorization'] = Base64.encode64( "#{@@login}:#{@@password}" ).chomp
+      end
+
+      if opts[:async]
+        request['hub.verify'] = 'async'
+      end
+
+      if opts[:sync]
+        request['hub.verify'] = 'sync'
+      end
+
+      request
     end
 
-  end
+    def self.http_post(url, opts)
+      uri = URI.parse URI.encode(url)
+      uri.path=='/' if uri.path.empty?
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+      request = Net::HTTP::Post.new uri.request_uri
+      request.set_form_data (opts||{})
+      http.request(request)
+    end
 
+    def self.generate_callback(url, feed_id)
+      if @@scheme == "https"
+        URI::HTTPS.build({:scheme => @@scheme, :host => @@host, :path => "#{@@base_path}#{feed_id}", :port => @@port }).to_s
+      else
+        URI::HTTP.build({:scheme => @@scheme, :host => @@host, :path => "#{@@base_path}#{feed_id}", :port => @@port }).to_s
+      end
+    end
+  end
 end

data/rack-superfeedr.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rack-superfeedr"
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["julien51"]
-  s.date = "2014-06-10"
+  s.date = "2014-07-29"
   s.description = "A gem that provides a rack middleware to interract with Superfeedr's API. "
   s.email = "julien@superfeedr.com"
   s.extra_rdoc_files = [
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://rubygems.org/gems/rack-superfeedr"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.25"
+  s.rubygems_version = "1.8.23.2"
   s.summary = "A gem that provides a rack middleware to interract with Superfeedr's API."
 
   if s.respond_to? :specification_version then
@@ -42,25 +42,28 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rack>, [">= 0"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 1.6.1"])
-      s.add_runtime_dependency(%q<typhoeus>, [">= 0.6.7"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<turn>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_development_dependency(%q<jeweler>, [">= 1.6.4"])
+      s.add_development_dependency(%q<thin>, [">= 0"])
     else
       s.add_dependency(%q<rack>, [">= 0"])
       s.add_dependency(%q<nokogiri>, [">= 1.6.1"])
-      s.add_dependency(%q<typhoeus>, [">= 0.6.7"])
       s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<turn>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_dependency(%q<jeweler>, [">= 1.6.4"])
+      s.add_dependency(%q<thin>, [">= 0"])
     end
   else
     s.add_dependency(%q<rack>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 1.6.1"])
-    s.add_dependency(%q<typhoeus>, [">= 0.6.7"])
     s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<turn>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])
     s.add_dependency(%q<jeweler>, [">= 1.6.4"])
+    s.add_dependency(%q<thin>, [">= 0"])
   end
 end
 

data/test/helper.rb

@@ -13,6 +13,3 @@ require 'shoulda'
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rack-superfeedr'
-
-class Test::Unit::TestCase
-end

data/test/test_rack-superfeedr.rb

@@ -1,7 +1,131 @@
-require 'helper'
+require 'rack'
+require_relative 'helper.rb'
+
+# To run tests locally, we're using runscope's passageway which proxies requests inside the firewall. (make sure you bind to port 4567)
+HOST = '37cb3f2fe113.a.passageway.io'
+PORT = 80
+# Also, we need superfeedr credentials.
+LOGIN = 'demo'
+PASSWORD = '8ac38a53cc32f71a6445e880f76fc865'
+
+
+class MyRackApp
+	def call(env)
+		puts env.inspect
+		[ 200, {'Content-Type' => 'text/plain'}, ['hello world'] ]
+	end
+end
+
+def notified(url, feed_id, details)
+	puts url, feed_id, details
+end
+
+# Run an app in a thread
+Thread.new do
+	Rack::Handler::WEBrick.run(Rack::Superfeedr.new(MyRackApp.new) do |superfeedr|
+	
+	superfeedr.on_verification do |mode, feed_id, url, request|
+		if mode == 'subscribe' && feed_id == 'accept-subscribe'
+			true
+		elsif mode == 'unsubscribe' && feed_id == 'accept-unsubscribe'
+			true
+		else
+			false
+		end
+	end	
+
+	superfeedr.on_notification do |url, feed_id, details|
+		notified(url, feed_id, details)
+	end	
+
+
+	end, :Port => 4567) 
+end
+sleep 3
+
+# Configure the middleware
+Rack::Superfeedr.host = HOST
+Rack::Superfeedr.port = PORT
+Rack::Superfeedr.login = LOGIN
+Rack::Superfeedr.password = PASSWORD
 
 class TestRackSuperfeedr < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
+
+	context "Subscribing" do
+
+		should "yield true with a simple subscribe" do 
+			Rack::Superfeedr.subscribe('http://push-pub.appspot.com/feed', '12345') do |body, success, response|
+				success || flunk("Fail")
+			end
+		end
+
+		should "support sync mode and call the verification callback before yielding true" do 
+			Rack::Superfeedr.subscribe('http://push-pub.appspot.com/feed', 'accept-subscribe', {:sync => true}) do |body, success, response|
+				puts body
+				success || flunk("Fail")
+			end
+		end
+
+		should "support sync mode and call the verification callback before yielding false if verification fails" do 
+			Rack::Superfeedr.subscribe('http://push-pub.appspot.com/feed', 'refuse-subscribe', {:sync => true}) do |body, success, response|
+				!success || flunk('Fail')
+			end
+		end
+
+		should "support async mode and yield true" do 
+			Rack::Superfeedr.subscribe('http://push-pub.appspot.com/feed', 'refuse-subscribe', {:async => true}) do |body, success, response|
+				success || flunk("Fail")
+			end
+		end
+
+		should "return the content of Atom subscriptions with retrieve" do 
+			Rack::Superfeedr.subscribe('http://push-pub.appspot.com/feed', '1234', {:retrieve => true}) do |body, success, response|
+				assert_equal "application/atom+xml", response['Content-Type']
+				success || flunk("Fail")
+				assert body # Some XML
+			end
+		end
+
+		should "return the content of Json subscriptions with retrieve" do 
+			response = Rack::Superfeedr.subscribe('http://push-pub.appspot.com/feed', '1234', {:format => "json", :retrieve => true})  do |body, success, response|
+				assert_equal "application/json; charset=utf-8", response['Content-Type']
+				success || flunk("Fail")
+				assert body
+			end
+		end
+
+	end
+
+	context "Unsubscribing" do
+		should 'successfully unsubscribe with 204 when not using sync nor asyc' do
+			Rack::Superfeedr.unsubscribe('http://push-pub.appspot.com/feed', '12345') do |body, success, response|
+				success || flunk("Fail")
+			end
+		end
+
+		should 'successfully unsubscribe with 204 when using sync when verification yields true' do
+			Rack::Superfeedr.unsubscribe('http://push-pub.appspot.com/feed', 'accept-unsubscribe', {:sync => true}) do |body, success, response|
+				success || flunk("Fail")
+			end
+		end
+
+		should 'fail to unsubscribe with 204 when using sync when verification yields false'  do
+			Rack::Superfeedr.unsubscribe('http://push-pub.appspot.com/feed', 'refuse-unsubscribe', {:sync => true}) do |body, success, response|
+				!success || flunk('Fail')
+			end
+		end
+
+		should 'return 202 when using async' do
+			Rack::Superfeedr.unsubscribe('http://push-pub.appspot.com/feed', 'accept-unsubscribe', {:async => true}) do |body, success, response|
+				success || flunk("Fail")
+			end
+		end
+	end
+
+	context "Notifications" do
+		should 'handle json notifications' 
+		should 'handle atom notifications'
+		should 'handle error notification (with no entry in them)'
+	end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-superfeedr
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-10 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -44,23 +44,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.6.1
 - !ruby/object:Gem::Dependency
-  name: typhoeus
+  name: shoulda
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.6.7
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.6.7
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: shoulda
+  name: turn
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -107,6 +107,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.4
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! 'A gem that provides a rack middleware to interract with Superfeedr''s
   API. '
 email: julien@superfeedr.com
@@ -143,7 +159,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 48070522357503993
+      hash: 1778305000862886852
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -152,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23.2
 signing_key: 
 specification_version: 3
 summary: A gem that provides a rack middleware to interract with Superfeedr's API.