hancock-client 0.0.2 → 0.0.3

data/Rakefile

@@ -3,13 +3,14 @@ require 'rake/gempackagetask'
 require 'rubygems/specification'
 require 'date'
 require 'spec/rake/spectask'
+require 'cucumber/rake/task'
 
 GEM = "hancock-client"
-GEM_VERSION = "0.0.2"
+GEM_VERSION = "0.0.3"
 AUTHOR = "Corey Donohoe"
 EMAIL = ['atmos@atmos.org', 'tim@spork.in']
 HOMEPAGE = "http://github.com/atmos/hancock-client"
-SUMMARY = "A gem that SSO enables sinatra applications with hancock"
+SUMMARY = "Hancock SSO rack middleware written in sinatra"
 
 spec = Gem::Specification.new do |s|
   s.name = GEM
@@ -56,3 +57,14 @@ task :make_spec do
     file.puts spec.to_ruby
   end
 end
+
+Cucumber::Rake::Task.new(:features) do |t|
+  t.libs << 'lib'
+  t.cucumber_opts = "--format pretty"
+  t.step_list    = 'spec/features/**/*.rb'
+  t.feature_list = 'spec/features/**/*.feature'
+  t.rcov = true
+  t.rcov_opts << '--text-summary'
+  t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
+  t.rcov_opts << '--exclude' << '.gem/,spec,examples'
+end

data/lib/hancock-client.rb

@@ -7,20 +7,18 @@ require 'dm-core'
 gem 'ruby-openid', '>=2.1.2'
 require 'openid'
 
+gem 'haml', '~>2.0.9'
+require 'haml'
+
 require File.dirname(__FILE__)+'/sinatra/hancock/sso'
 
 module Hancock
   module Client
     class Default < ::Sinatra::Default
       enable :sessions
-      cattr_accessor :sso_url
+      set :sso_url, nil
 
       register Sinatra::Hancock::SSO
-
-      def self.sso_configure(&block)
-        yield self
-      end
     end
   end
 end
-

data/lib/sinatra/hancock/sso.rb

@@ -5,10 +5,6 @@ module Sinatra
   module Hancock
     module SSO
       module Helpers
-        def sso_url
-          @app.class.sso_url
-        end
-
         def absolute_url(suffix = nil)
           port_part = case request.scheme
                       when "http"
@@ -25,12 +21,12 @@ module Sinatra
         app.helpers Hancock::SSO::Helpers
         app.enable  :sessions
         app.disable :raise_errors
-        app.before { ensure_sso_authenticated unless request.path_info =~ %r!^/sso/log(in|out)! }
+#        app.before { ensure_sso_authenticated unless request.path_info =~ %r!^/sso/log(in|out)! }
 
         app.get '/sso/login' do
           if contact_id = params['id']
             response['WWW-Authenticate'] = Rack::OpenID.build_header(
-              :identifier => "#{sso_url}/users/#{contact_id}",
+              :identifier => "#{options.sso_url}/users/#{contact_id}",
               :trust_root => absolute_url('/sso/login')
             )
             throw :halt, [401, 'got openid?']
@@ -52,13 +48,13 @@ module Sinatra
               throw :halt, [503, "Error: #{openid.status}"]
             end
           else
-            redirect "#{sso_url}/login?return_to=#{absolute_url('/sso/login')}"
+            redirect "#{options.sso_url}/login?return_to=#{absolute_url('/sso/login')}"
           end
         end
 
         app.get '/sso/logout' do
           session.clear
-          redirect "#{sso_url}/logout"
+          redirect "#{options.sso_url}/logout"
         end
       end
     end

data/spec/client.rb

@@ -3,11 +3,20 @@ require 'sinatra/base'
 module Hancock
   module Spec
     class Client < ::Hancock::Client::Default
+      set :environment, :development
       get '/' do
         redirect '/sso/login' unless session[:user_id]
         haml(<<-HAML
-%p
-  Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+%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

data/spec/features/signing_up.feature

@@ -0,0 +1,17 @@
+Feature: Signing Up for an SSO Account
+  In order to get users involved
+  As a new user
+  Scenario: Signing Up
+    When I request a page on the Site
+    And I am redirected to the SSO Server
+    Then I should click the signup button
+    When the page loads I should see a signup form
+    Then I fill out the required information
+    And click submit
+    Then I should receive a registration URL
+    When I click on the registration URL
+    Then I should be prompted to enter my new password
+    When I provide a new password 
+    And click Am I Done Yet?
+    Then I should be redirected back to the consumer application
+    Then I should know a little bit about myself as a user

data/spec/features/step_definitions/signup_steps.rb

@@ -0,0 +1,62 @@
+When /^I request a page on the Site$/ do
+  browser.goto('http://localhost:4567/sso/logout')
+  browser.goto('http://localhost:4567/')
+end
+
+And /^I am redirected to the SSO Server$/ do
+  true
+end
+
+Then /^I should click the signup button$/ do
+  browser.link(:url, "#{sso_server}/signup").click
+end
+
+When /^the page loads I should see a signup form$/ do
+  browser.html.should have_selector("input[type='text'][name='first_name']")
+end
+
+Then /^I fill out the required information$/ do
+  @email = /\w+@\w+\.\w{2,3}/.gen.downcase
+  @first_name, @last_name = /\w+/.gen.capitalize, /\w+/.gen.capitalize
+  browser.text_field(:name, :first_name).set(@first_name)
+  browser.text_field(:name, :last_name).set(@last_name)
+  browser.text_field(:name, :email).set(@email)
+end
+
+And /^click submit$/ do
+  browser.button(:value, 'Signup').click
+end
+
+Then /^I should receive a registration URL$/ do
+  @register_url = browser.html.match(%r!#{sso_server}/register/\w{40}!).to_s
+  @register_url.should_not eql('')
+  @password = /\w+{9,32}/.gen
+end
+
+When /^I click on the registration URL$/ do
+  browser.goto(@register_url)
+end
+
+Then /^I should be prompted to enter my new password$/ do
+  true
+end
+
+When /^I provide a new password$/ do
+  browser.text_field(:name, :password).set(@password)
+  browser.text_field(:name, :password_confirmation).set(@password)
+end
+
+And /^click Am I Done Yet\?$/ do
+  browser.button(:value, 'Am I Done Yet?').click
+end
+
+Then /^I should be redirected back to the consumer application$/ do
+  true
+end
+
+Then /^I should know a little bit about myself as a user$/ do
+  browser.html.should have_selector "h1:contains('Hancock Client: Sinatra')"
+  browser.have_selector "td:contains('#{@email}')"
+  browser.have_selector "td:contains('#{@first_name}')"
+  browser.have_selector "td:contains('#{@last_name}')"
+end

data/spec/features/support/env.rb

@@ -0,0 +1,21 @@
+require File.expand_path(File.dirname(__FILE__)+'/../../spec_helper')
+gem 'safariwatir', '~>0.3.3'
+require 'safariwatir'
+
+World do
+  def sso_server
+    @sso_server ||= 'http://hancock.atmos.org/sso'
+  end
+  def browser
+    @browser ||= Watir::Safari.new
+  end
+
+  def app
+    @app = Rack::Builder.new do
+      run Hancock::Spec::Client
+    end
+  end
+  include Rack::Test::Methods
+  include Webrat::Methods
+  include Webrat::Matchers
+end

data/spec/hancock_sinatra_spec.rb

@@ -3,10 +3,11 @@ require File.dirname(__FILE__) + '/spec_helper'
 describe Sinatra::Hancock::SSO do
   it "should protect the root url" do
     get '/'
-    @response.headers['Location'].should eql('/sso/login')
+    last_response.headers['Location'].should eql('/sso/login')
   end
   it "should greet the user when authenticated" do
-    get '/', { }, :session => {:user_id => 42}
-    @response.body.should have_selector('p')
+    pending
+    get '/'
+    last_response.body.should have_selector('p')
   end
 end

data/spec/spec_helper.rb

@@ -9,20 +9,23 @@ require 'dm-sweatshop'
 
 gem 'sinatra', '~>0.9.1'
 require 'sinatra/base'
-require 'sinatra/test'
 require 'sinatra/hancock/sso'
+gem 'rack-test', '~>0.1.0'
+require 'rack/test'
 
 require 'hancock-client'
 
 require File.dirname(__FILE__)+'/client'
 
 Spec::Runner.configure do |config|
-  config.include(Sinatra::Test)
+  config.include(Rack::Test::Methods)
   config.include(Webrat::Methods)
   config.include(Webrat::Matchers)
-  config.before(:each) do
+  def app
     @app = Rack::Builder.new do
       run Hancock::Spec::Client
     end
   end
+  #config.before(:each) do
+  #end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hancock-client
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Corey Donohoe
@@ -9,7 +9,7 @@ autorequire: hancock-client
 bindir: bin
 cert_chain: []
 
-date: 2009-03-20 00:00:00 -06:00
+date: 2009-03-21 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.1.2
     version: 
-description: A gem that SSO enables sinatra applications with hancock
+description: Hancock SSO rack middleware written in sinatra
 email: 
 - atmos@atmos.org
 - tim@spork.in
@@ -53,6 +53,12 @@ files:
 - lib/sinatra/hancock
 - lib/sinatra/hancock/sso.rb
 - spec/client.rb
+- spec/features
+- spec/features/signing_up.feature
+- spec/features/step_definitions
+- spec/features/step_definitions/signup_steps.rb
+- spec/features/support
+- spec/features/support/env.rb
 - spec/hancock_sinatra_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -80,6 +86,6 @@ rubyforge_project:
 rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
-summary: A gem that SSO enables sinatra applications with hancock
+summary: Hancock SSO rack middleware written in sinatra
 test_files: []