hancock-client 0.0.6 → 0.0.7

data/Rakefile

@@ -6,7 +6,7 @@ require 'spec/rake/spectask'
 require 'cucumber/rake/task'
 
 GEM = "hancock-client"
-GEM_VERSION = "0.0.6"
+GEM_VERSION = "0.0.7"
 AUTHOR = "Corey Donohoe"
 EMAIL = ['atmos@atmos.org', 'tim@spork.in']
 HOMEPAGE = "http://github.com/atmos/hancock-client"
@@ -25,9 +25,9 @@ spec = Gem::Specification.new do |s|
   s.homepage = HOMEPAGE
 
   # Uncomment this to add a dependency
-  s.add_dependency "sinatra", ">=0.9.1.3"
-  s.add_dependency "ruby-openid", ">=2.1.6"
-
+  s.add_dependency "sinatra",     "~>0.9.2"
+  s.add_dependency "ruby-openid", "~>2.1.6"
+  s.add_dependency "haml",        "~>2.0.9"
   s.require_path = 'lib'
   s.autorequire = GEM
   s.files = %w(LICENSE README.md Rakefile) + Dir.glob("{lib,spec}/**/*")
@@ -61,8 +61,6 @@ 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'

data/lib/hancock-client.rb

@@ -1,5 +1,4 @@
-gem 'sinatra', '~>0.9.1.3'
-require 'rack'
+gem 'sinatra', '~>0.9.2'
 require 'sinatra/base'
 
 gem 'ruby-openid', '>=2.1.6'
@@ -15,13 +14,13 @@ module Hancock
     class Default < ::Sinatra::Base
       enable :sessions
       disable :raise_errors
+      disable :show_exceptions
 
       set :sso_url, nil
 
       def sso_url=(url)
         options.sso_url = url
       end
-
       register Sinatra::Hancock::SSO
     end
   end

data/lib/sinatra/hancock/sso.rb

@@ -19,6 +19,11 @@ module Sinatra
       def self.registered(app)
         app.use(Rack::OpenID)
         app.helpers Hancock::SSO::Helpers
+
+        app.not_found do
+          next if session[:user_id]
+        end
+
         app.before do 
           next if request.path_info == '/sso/login'
           next if request.path_info == '/sso/logout'

data/spec/hancock_sinatra_spec.rb

@@ -9,26 +9,14 @@ describe Sinatra::Hancock::SSO do
     last_response.headers['Location'].should eql('http://localhost:20000/login?return_to=http://example.org/sso/login')
   end
 
-  it "should protect the root url from HTTP post" do
-    post '/'
-    last_response.headers['Location'].should eql('/sso/login')
-  end
-
-  it "should protect the root url from HTTP head" do
-    head '/'
-    last_response.headers['Location'].should eql('/sso/login')
+  %w(get post put head delete).each do |verb|
+    it "should protect the root url from HTTP #{verb}" do
+      send(verb, '/')
+      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
   end
-
-  it "should protect the root url from HTTP put" do
-    put '/'
-    last_response.headers['Location'].should eql('/sso/login')
-  end
-
-  it "should protect the root url from HTTP delete" do
-    delete '/'
-    last_response.headers['Location'].should eql('/sso/login')
-  end
-
   it "should greet the user when authenticated" do
     pending
     get '/'

data/spec/spec_helper.rb

@@ -7,10 +7,8 @@ gem 'webrat', '~>0.4.2'
 require 'webrat'
 require 'dm-sweatshop'
 
-gem 'sinatra', '~>0.9.1.3'
-require 'sinatra/base'
 require 'sinatra/hancock/sso'
-gem 'rack-test', '~>0.1.0'
+gem 'rack-test', '~>0.3.0'
 require 'rack/test'
 
 require 'hancock-client'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hancock-client
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Corey Donohoe
@@ -9,7 +9,7 @@ autorequire: hancock-client
 bindir: bin
 cert_chain: []
 
-date: 2009-05-01 00:00:00 -06:00
+date: 2009-06-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,9 +18,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.1.3
+        version: 0.9.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: ruby-openid
@@ -28,10 +28,20 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         version: 2.1.6
     version: 
+- !ruby/object:Gem::Dependency 
+  name: haml
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.0.9
+    version: 
 description: Hancock SSO rack middleware written in sinatra
 email: 
 - atmos@atmos.org
@@ -51,13 +61,8 @@ files:
 - lib/rack-openid.rb
 - lib/sinatra
 - lib/sinatra/hancock
+- lib/sinatra/hancock/mock.rb
 - lib/sinatra/hancock/sso.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

data/spec/features/signing_up.feature

@@ -1,17 +0,0 @@
-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

@@ -1,62 +0,0 @@
-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

@@ -1,21 +0,0 @@
-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