rack-rpx 0.1.4 → 0.1.5

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/lib/rack-rpx.rb

@@ -1,12 +1,12 @@
-%w(rubygems net/http net/https rack json).each { |gem| require gem }
+%w(rubygems logger net/http net/https rack json).each { |gem| require gem }
 module Rack #:nodoc:
   
   # Rack Middleware for integrating RPX Now into your application
   #
   # Note: this *requires* that a Rack::Session middleware be enabled
-  #
-  class Rpx
+  class Rpx 
     RPX_LOGIN_URL = "https://rpxnow.com/api/v2/auth_info"
+    
     # Raised if an incompatible session is being used.
     class NoSession        < RuntimeError; end
     class LoginFailedError < RuntimeError; end
@@ -27,18 +27,18 @@ module Rack #:nodoc:
       # This is *the* method you want to call.
       #
       # After you're authorized and redirected back to your #redirect_to path, 
-      # you should be able to call get_access_token to get and hold onto 
+      # you should be able to call get_credentials to get and hold onto 
       # the access token for the user you've been authorized as.
-      # 
-      # You can use the token to make GET/POST/etc requests
       def get_credentials(token)
         Rack::Rpx.get_credentials(token)
       end
 
+      # This method will return to sign in with the widget.
       def login_widget_url(app_name=nil)
         "https://#{app_name}.rpxnow.com/openid/v2/signin?token_url=#{callback_url}"
       end      
-      
+
+      private 
       def callback_url
         "http://#{env['HTTP_HOST']}#{OPTIONS[:callback_path]}"
       end
@@ -47,7 +47,7 @@ module Rack #:nodoc:
     class << self
       def get_credentials(token)
         u = URI.parse(RPX_LOGIN_URL)
-        req = Net::HTTP::Post.new(u.path)
+        req = Net::HTTP::Post.new(u.path)        
         req.set_form_data({:token => token, :apiKey => OPTIONS[:api_key], :format => 'json', :extended => 'true'})
         http = Net::HTTP.new(u.host,u.port)
         http.use_ssl = true if u.scheme == 'https'
@@ -61,36 +61,25 @@ module Rack #:nodoc:
     def initialize app, *options
       @app = app
       OPTIONS.merge! options.pop
-      OPTIONS.each do |k,v|
-        Rack::Rpx.send(:define_method, k.to_s) {OPTIONS[k]}
-      end      
     end
     
     def call env      
       @req = Rack::Request.new env 
       raise NoSession, 'No compatible session.' unless env['rack.session']
       
-      if env['PATH_INFO'] ==  OPTIONS[:callback_path] &&  @req.post? then 
+      if env['PATH_INFO'] == OPTIONS[:callback_path] &&  @req.post? then 
         token = @req.params["token"]
-        set_credentials(env, token) if OPTIONS[:set_credentials] 
         login(env)
       elsif env['PATH_INFO'] == OPTIONS[:logout_path] then
         logout(env)
       end        
       @app.call(env)     
     end
-
-    def set_credentials(env, token)
-      env['rack.session']['credentials'] = self.get_credentials(token)
-    end
-
+    
     # This is the method that you should override if you want to
     # perform any operation just after the response from rpx now
-    # 
-    # You can use the token to make GET/POST/etc requests
     def login(env);  end
 
-
     # This is the method that you should override if you want to
     # perform any operation just before you reach the logout_path
     def logout(env); end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rack-rpx
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Pedro Del Gallego
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-17 00:00:00 +01:00
+date: 2010-01-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency