rack-superfeedr 0.1.0 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.3

data/lib/rack-superfeedr.rb

@@ -34,7 +34,9 @@ module Rack
         @verifications[feed_id] ||= {}
         @verifications[feed_id]['subscribe'] = block
       end
-      response = ::Typhoeus::Request.post(SUPERFEEDR_ENDPOINT,
+      endpoint = opts[:hub] || SUPERFEEDR_ENDPOINT
+      opts.delete(:hub)
+      response = ::Typhoeus::Request.post(endpoint,
       opts.merge({
         :params => {
           :'hub.mode' => 'subscribe',
@@ -44,9 +46,13 @@ module Rack
         },
         :headers => {
           :Accept => @params[:format] == "json" ? "application/json" : "application/atom+xml"
-        },
-        :userpwd => "#{@params[:login]}:#{@params[:password]}"
+        }
       }))
+
+      if endpoint == SUPERFEEDR_ENDPOINT
+        opts[:userpwd] = "#{@params[:login]}:#{@params[:password]}"
+      end
+
       @error = response.body
       @params[:async] && response.code == 202 || response.code == 204 # We return true to indicate the status.
     end
@@ -106,6 +112,17 @@ module Rack
       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
+    end
+
     def call(env)
       req = Rack::Request.new(env)
       if env['REQUEST_METHOD'] == 'GET' && feed_id = env['PATH_INFO'].match(/\/superfeedr\/feed\/(.*)/)
@@ -124,6 +141,8 @@ module Rack
       elsif env['REQUEST_METHOD'] == 'POST' && feed_id = env['PATH_INFO'].match(/\/superfeedr\/feed\/(.*)/)
         # 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
@@ -131,13 +150,14 @@ module Rack
         end
         if content_type == "application/json"
           # Let's parse the body as JSON
-          content = JSON.parse(req.body.read)
+          content = JSON.parse(body)
         elsif content_type == "application/atom+xml"
           # Let's parse the body as ATOM using nokogiri
-          content = Nokogiri.XML(req.body.read)
+          content = Nokogiri.XML(body)
         end
         # Let's now send that data back to the user.
-        if !@callback.call(content, feed_id[1])
+        info = Hashie::Mash.new(req: req, body: body)
+        if !@callback.call(content, feed_id[1], info)
           # We need to unsubscribe the user
         end
         Rack::Response.new("Thanks!", 200).finish

data/rack-superfeedr.gemspec

@@ -50,6 +50,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rack>, [">= 0"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
       s.add_runtime_dependency(%q<typhoeus>, [">= 0"])
+      s.add_runtime_dependency(%q<hashie>, [">= 0"])
     else
       s.add_dependency(%q<rack>, [">= 0"])
       s.add_dependency(%q<nokogiri>, [">= 0"])

metadata

@@ -2,7 +2,7 @@
 name: rack-superfeedr
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.1.3
 platform: ruby
 authors: 
 - julien51
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-10 00:00:00 Z
+date: 2013-07-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -157,7 +157,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4506397640397812530
+      hash: 1522793861721834200
       segments: 
       - 0
       version: "0"