hancock-client 0.0.4 → 0.0.5

data/README.md

@@ -27,24 +27,25 @@ Application
 The goal is to make it simple to write sso enabled apps.
 
     require 'rubygems'
-    require 'sinatra'
-    require 'sinatra/base'
     require 'hancock-client'
+    require 'logger'
 
-    run Hancock::Client
-    class ConsumerApp < Hancock::Client::Default
-      set :sso_url, 'http://hancock.atmos.org/sso'
+    # OpenID writes to STDERR by default.  This is closed under passenger so
+    # to make this reliable you should have openid write failures somewhere.
+    OpenID::Util.logger = Logger.new(Dir.tmpdir + "/openid.log")
 
-      set :views,  'views'
-      set :public, 'public'
-      set :environment, :production
+    class HancockClientDemo < Sinatra::Default
+      set :views,  File.dirname(__FILE__) + '/views'
+      set :public, File.dirname(__FILE__) + '/public'
+      use Hancock::Client::Default do |sso|
+        sso.sso_url = 'http://hancock.atmos.org/sso'
+      end
 
       get '/' do
-      redirect '/login' unless session[:user_id]
-      haml(%Q{%h3= "#{session[:first_name]} #{session[:last_name]} - #{session[:email]}"})
+        haml(%Q{%h3= "#{session[:first_name]} #{session[:last_name]} - #{session[:email]}"})
       end
     end
 
-    run ConsumerApp
+    run HancockClientDemo
 
 [sinatra]: http://www.sinatrarb.com

data/Rakefile

@@ -6,7 +6,7 @@ require 'spec/rake/spectask'
 require 'cucumber/rake/task'
 
 GEM = "hancock-client"
-GEM_VERSION = "0.0.4"
+GEM_VERSION = "0.0.5"
 AUTHOR = "Corey Donohoe"
 EMAIL = ['atmos@atmos.org', 'tim@spork.in']
 HOMEPAGE = "http://github.com/atmos/hancock-client"
@@ -25,8 +25,8 @@ spec = Gem::Specification.new do |s|
   s.homepage = HOMEPAGE
 
   # Uncomment this to add a dependency
-  s.add_dependency "sinatra", ">=0.9.1.1"
-  s.add_dependency "ruby-openid", ">=2.1.2"
+  s.add_dependency "sinatra", ">=0.9.1.3"
+  s.add_dependency "ruby-openid", ">=2.1.6"
 
   s.require_path = 'lib'
   s.autorequire = GEM

data/lib/hancock-client.rb

@@ -1,10 +1,8 @@
-gem 'sinatra', '~>0.9.1'
+gem 'sinatra', '~>0.9.1.3'
 require 'rack'
 require 'sinatra/base'
-gem 'dm-core', '~>0.9.10'
-require 'dm-core'
 
-gem 'ruby-openid', '>=2.1.2'
+gem 'ruby-openid', '>=2.1.6'
 require 'openid'
 
 gem 'haml', '~>2.0.9'
@@ -14,11 +12,26 @@ require File.dirname(__FILE__)+'/sinatra/hancock/sso'
 
 module Hancock
   module Client
-    class Default < ::Sinatra::Default
+    class Default < ::Sinatra::Base
       enable :sessions
+      disable :raise_errors
+
       set :sso_url, nil
 
+      def sso_url=(url)
+        options.sso_url = url
+      end
+
       register Sinatra::Hancock::SSO
+
+      get '*' do
+        if session[:user_id]
+          forward
+        else
+          session[:return_to] = request.path_info
+          redirect "#{options.sso_url}/login?return_to=#{absolute_url('/sso/login')}"
+        end
+      end
     end
   end
 end

data/lib/rack-openid.rb

@@ -87,7 +87,7 @@ module Rack
           return redirect_to(url)
         rescue ::OpenID::OpenIDError, Timeout::Error => e
           env[RESPONSE] = MissingResponse.new
-          return self.call(env)
+          return @app.call(env)
         end
       end
 

data/lib/sinatra/hancock/sso.rb

@@ -19,12 +19,11 @@ module Sinatra
       def self.registered(app)
         app.use(Rack::OpenID)
         app.helpers Hancock::SSO::Helpers
-        app.enable  :sessions
-        app.disable :raise_errors
         app.before do 
-          unless request.path_info == '/sso/login'
-            throw(:halt, [302, {'Location' => '/sso/login'}, '']) unless session[:user_id]
-          end
+          next if request.path_info == '/sso/login'
+          next if request.path_info == '/sso/logout'
+          next if session[:user_id]
+          throw(:halt, [302, {'Location' => '/sso/login'}, ''])
         end
 
         app.get '/sso/login' do
@@ -63,5 +62,4 @@ module Sinatra
       end
     end
   end
-  register Hancock::SSO
 end

data/spec/hancock_sinatra_spec.rb

@@ -1,10 +1,14 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
 describe Sinatra::Hancock::SSO do
+
   it "should protect the root url" do
     get '/'
     last_response.headers['Location'].should eql('/sso/login')
+    get last_response.headers['Location']
+    last_response.headers['Location'].should eql('http://localhost:20000/login?return_to=http://example.org/sso/login')
   end
+
   it "should greet the user when authenticated" do
     pending
     get '/'

data/spec/spec_helper.rb

@@ -15,15 +15,18 @@ require 'rack/test'
 
 require 'hancock-client'
 
-require File.dirname(__FILE__)+'/client'
-
 Spec::Runner.configure do |config|
   config.include(Rack::Test::Methods)
   config.include(Webrat::Methods)
   config.include(Webrat::Matchers)
   def app
     @app = Rack::Builder.new do
-      run Hancock::Spec::Client
+      use Hancock::Client::Default do |sso|
+        sso.sso_url = 'http://localhost:20000'
+      end
+      map '/' do
+        run Proc.new {|env| [200, {'Content-Type' => 'text/html', 'Content-Length' => '5'}, ['HELLO']] }
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hancock-client
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Corey Donohoe
@@ -9,7 +9,7 @@ autorequire: hancock-client
 bindir: bin
 cert_chain: []
 
-date: 2009-03-23 00:00:00 -06:00
+date: 2009-04-29 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.1.1
+        version: 0.9.1.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: ruby-openid
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.1.2
+        version: 2.1.6
     version: 
 description: Hancock SSO rack middleware written in sinatra
 email: 
@@ -52,7 +52,6 @@ files:
 - lib/sinatra
 - lib/sinatra/hancock
 - lib/sinatra/hancock/sso.rb
-- spec/client.rb
 - spec/features
 - spec/features/signing_up.feature
 - spec/features/step_definitions

data/spec/client.rb

@@ -1,24 +0,0 @@
-require 'sinatra/base'
-
-module Hancock
-  module Spec
-    class Client < ::Hancock::Client::Default
-      set :environment, :development
-      get '/' do
-        haml(<<-HAML
-%table
-  %thead
-    %tr
-      %td Key
-      %td Value
-  %tbody
-    - session.keys.sort { |a,b| a.to_s <=> b.to_s }.each do |key|
-      %tr
-        %td= key
-        %td= session[key]
-HAML
-)
-      end
-    end
-  end
-end