hancock 0.0.3 → 0.0.4

data/README.md

@@ -29,6 +29,7 @@ Your Rackup File
     require 'rubygems'
     gem 'sinatra', '~>0.9.1.1'
     require 'hancock'
+    gem 'atmos-sinatra-ditties', '~>0.0.3'
     require 'sinatra/ditties'
 
     DataMapper.setup(:default, "sqlite3:///#{Dir.pwd}/development.db")
@@ -42,23 +43,16 @@ Your Rackup File
       :domain => "example.com" # the HELO domain provided by the client to the server
     }
 
-    if ENV['MIGRATE_ME']
-        DataMapper.auto_migrate!
-        Hancock::Consumer.create(:url => 'http://localhost:3000/sso/login', :label => 'Local Dev', :internal => false)
-        Hancock::Consumer.create(:url => 'http://localhost:4000/sso/login', :label => 'Local Dev', :internal => false)
-        Hancock::Consumer.create(:url => 'http://localhost:5000/sso/login', :label => 'Local Dev', :internal => false)
-    end
-
     class Dragon < Hancock::App
       set :views,  'views'
       set :public, 'public'
       set :environment, :production
 
       set :provider_name, 'Example SSO Provider'
-      set :do_not_reply, 'sso@atmos.org'
+      set :do_not_reply,  'sso@atmos.org'
 
       get '/' do
-        redirect '/sso/login' unless session[:user_id]
+        redirect '/sso/login' unless session[:hancock_server_user_id]
         erb "<h2>Hello <%= session[:first_name] %><!-- <%= session.inspect %>"
       end
     end
@@ -76,7 +70,11 @@ Installation
 You need a few gems to function
 
     % sudo gem install dm-core do_sqlite3
-    % sudo gem install sinatra guid rspec ruby-openid webrat
+    % sudo gem install sinatra ruby-openid 
+    % sudo gem install atmos-sinatra-ditties
+
+You need a few extra gems to run the specs
+    % sudo gem install rspec webrat rack-test cucumber
 
 Deployment Setup
 ================
@@ -98,14 +96,14 @@ Consult the datamapper documentation if you need to connect to something other
 than sqlite.  This runs the initial user migration to bootstrap your db.
 
     >> Hancock::Consumer.create(:url => 'http://hr.example.com/sso/login', :label => 'Human Resources', :internal => true)
-    => #<Hancock::Consumer id=1 url="http://hr.example.com/sso/login" label="Human Resources" internal=true>
-
-This portion setup a consumer application that will be allowed access to the SSO
-server.  You need to explicitly add each application you wish to grant access to.
-
-On the horizon
-==============
-* signup with email based validation
+    => ...
+    >> Hancock::Consumer.create(:url => 'http://localhost:3000/sso/login', :label => 'Local Rails Dev', :internal => false)
+    => ...
+    >> Hancock::Consumer.create(:url => 'http://localhost:4000/sso/login', :label => 'Local Merb Dev', :internal => false)
+    => ...
+    >> Hancock::Consumer.create(:url => 'http://localhost:4567/sso/login', :label => 'Local Sinatra Dev', :internal => false)
+
+Here's how you setup most frameworks as consumers.  In a production environment you'd lock this down
 
 Possibilities
 =============

data/Rakefile

@@ -6,7 +6,7 @@ require 'spec/rake/spectask'
 require 'cucumber/rake/task'
 
 GEM = "hancock"
-GEM_VERSION = "0.0.3"
+GEM_VERSION = "0.0.4"
 AUTHOR = ["Corey Donohoe", "Tim Carey-Smith"]
 EMAIL = [ "atmos@atmos.org", "tim@spork.in" ]
 HOMEPAGE = "http://github.com/atmos/hancock"

data/lib/sinatra/hancock/openid_server.rb

@@ -28,7 +28,7 @@ module Sinatra
 
           case web_response.code
           when 302
-            session.delete(:return_to)
+            session.delete(:hancock_server_return_to)
             redirect web_response.headers['location']
           else
             web_response.body
@@ -60,14 +60,14 @@ module Sinatra
             begin
               oidreq = server.decode_request(params)
             rescue OpenID::Server::ProtocolError => e
-              oidreq = session[:last_oidreq]
+              oidreq = session[:hancock_server_last_oidreq]
             end
             throw(:halt, [400, 'Bad Request']) unless oidreq
 
             oidresp = nil
             if oidreq.kind_of?(OpenID::Server::CheckIDRequest)
-              session[:last_oidreq] = oidreq
-              session[:return_to] = absolute_url('/sso')
+              session[:hancock_server_last_oidreq] = oidreq
+              session[:hancock_server_return_to] = absolute_url('/sso')
 
               ensure_authenticated
               unless oidreq.identity == url_for_user

data/lib/sinatra/hancock/sessions.rb

@@ -8,16 +8,17 @@ module Sinatra
 
       module Helpers
         def session_user
-          session['user_id'].nil? ? nil : ::Hancock::User.get(session['user_id'])
+          session['hancock_server_user_id'].nil? ? 
+            nil : ::Hancock::User.get(session['hancock_server_user_id'])
         end
 
         def ensure_authenticated
-          if trust_root = session['return_to'] || params['return_to']
+          if trust_root = session['hancock_server_return_to'] || params['return_to']
             if ::Hancock::Consumer.allowed?(trust_root)
               if session_user
                 redirect "#{trust_root}?id=#{session_user.id}"
               else
-                session['return_to'] = trust_root
+                session['hancock_server_return_to'] = trust_root
               end
             else
               forbidden!
@@ -37,10 +38,10 @@ module Sinatra
         app.post '/sso/login' do
           @user = ::Hancock::User.authenticate(params['email'], params['password'])
           if @user
-            session['user_id'] = @user.id
+            session['hancock_server_user_id'] = @user.id
           end
           ensure_authenticated
-          redirect session['return_to'] || '/'
+          redirect session['hancock_server_return_to'] || '/'
         end
 
         app.get '/sso/logout' do

data/lib/sinatra/hancock/users.rb

@@ -10,7 +10,7 @@ module Sinatra
         def user_by_token(token)
           user = ::Hancock::User.first(:access_token => token)
           throw(:halt, [400, 'BadRequest']) unless user
-          session['user_id'] = user.id
+          session['hancock_server_user_id'] = user.id
           user
         end
 
@@ -49,8 +49,8 @@ HAML
                                  :access_token => nil,
                                  :password => params['password'],
                                  :password_confirmation => params['password_confirmation'])
-          destination = session.delete('return_to') || '/'
-          session.reject! { |key,value| key != 'user_id' }
+          destination = session.delete('hancock_server_return_to') || '/'
+          session.reject! { |key,value| key != 'hancock_server_user_id' }
           redirect destination
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hancock
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Corey Donohoe
@@ -10,7 +10,7 @@ autorequire: hancock
 bindir: bin
 cert_chain: []
 
-date: 2009-03-21 00:00:00 -06:00
+date: 2009-03-23 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency