rack-superfeedr 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/rack-superfeedr.rb

@@ -36,6 +36,11 @@ module Rack
       end
       endpoint = opts[:hub] || SUPERFEEDR_ENDPOINT
       opts.delete(:hub)
+
+      if endpoint == SUPERFEEDR_ENDPOINT
+        opts[:userpwd] = "#{@params[:login]}:#{@params[:password]}"
+      end
+
       response = ::Typhoeus::Request.post(endpoint,
       opts.merge({
         :params => {
@@ -49,10 +54,6 @@ module Rack
         }
       }))
 
-      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
@@ -107,7 +108,9 @@ module Rack
       }
       @verifications = {}
       @params = params
+      @params[:port] = 80 unless params[:port]
       @app = app
+      @base_path = params[:base_path] || '/superfeedr/feed/'
       block.call(self)
       self
     end
@@ -125,7 +128,7 @@ module Rack
 
     def call(env)
       req = Rack::Request.new(env)
-      if env['REQUEST_METHOD'] == 'GET' && feed_id = env['PATH_INFO'].match(/\/superfeedr\/feed\/(.*)/)
+      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
@@ -138,7 +141,7 @@ module Rack
           # By default, we accept all
           Rack::Response.new(req.params['hub.challenge'], 200).finish
         end
-      elsif env['REQUEST_METHOD'] == 'POST' && feed_id = env['PATH_INFO'].match(/\/superfeedr\/feed\/(.*)/)
+      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
@@ -169,8 +172,10 @@ module Rack
     protected
 
     def generate_callback(url, feed_id)
-      URI::HTTP.build({:host => @params[:host], :path => "/superfeedr/feed/#{feed_id}" }).to_s
+      scheme = params[:scheme] || 'http'
+      URI::HTTP.build({:scheme => scheme, :host => @params[:host], :path => "#{@base_path}#{feed_id}", :port => @params[:port] }).to_s
     end
 
   end
+
 end

metadata

@@ -2,7 +2,7 @@
 name: rack-superfeedr
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - julien51
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-07-03 00:00:00 Z
+date: 2013-09-05 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: 1522793861721834200
+      hash: 3043805682238365043
       segments: 
       - 0
       version: "0"