hancock 0.0.6 → 0.0.7

data/README.md

@@ -27,7 +27,6 @@ Your Rackup File
 ================
     #  thin start -p PORT -R config.ru
     require 'rubygems'
-    gem 'sinatra', '~>0.9.1.1'
     require 'hancock'
     gem 'atmos-sinatra-ditties', '~>0.0.3'
     require 'sinatra/ditties'
@@ -107,7 +106,6 @@ Here's how you setup most frameworks as consumers.  In a production environment
 
 Possibilities
 =============
-* single sign off
 * some kinda awesome [oauth][oauth] hooks
 
 Sponsored By

data/Rakefile

@@ -6,7 +6,7 @@ require 'spec/rake/spectask'
 require 'cucumber/rake/task'
 
 GEM = "hancock"
-GEM_VERSION = "0.0.6"
+GEM_VERSION = "0.0.7"
 AUTHOR = ["Corey Donohoe", "Tim Carey-Smith"]
 EMAIL = [ "atmos@atmos.org", "tim@spork.in" ]
 HOMEPAGE = "http://github.com/atmos/hancock"
@@ -25,18 +25,27 @@ spec = Gem::Specification.new do |s|
   s.homepage = HOMEPAGE
 
   # Uncomment this to add a dependency
-  s.add_dependency "dm-core", "~>0.9.10"
-  s.add_dependency "ruby-openid", "~>2.1.2"
-  s.add_dependency "sinatra", "~>0.9.1.1"
-  s.add_dependency "guid", "~>0.1.1"
+  s.add_dependency "ruby-openid",     "~>2.1.4"
+  s.add_dependency "sinatra",         "~>0.9.2"
+  s.add_dependency "haml",            "~>2.0.9"
+  s.add_dependency "guid",            "~>0.1.1"
+
+  s.add_dependency "dm-core",         "~>0.9.11"
+  s.add_dependency "dm-types",        "~>0.9.11"
+  s.add_dependency "dm-timestamps",   "~>0.9.11"
+  s.add_dependency "dm-validations",  "~>0.9.11"
 
   s.require_path = 'lib'
   s.autorequire = GEM
-  s.files = %w(LICENSE README.md Rakefile) + Dir.glob("{lib,spec}/**/*")
+  s.files = %w(LICENSE README.md Rakefile) + Dir.glob("{features,lib,spec}/**/*")
 end
 
 task :default => [:spec, :features]
 
+task :development_deps do |t|
+  system("sudo gem install webrat rack-test do_sqlite3")
+end
+
 desc "Run specs"
 Spec::Rake::SpecTask.new do |t|
   t.spec_files = FileList['spec/**/*_spec.rb']
@@ -63,10 +72,8 @@ 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'
+  t.rcov_opts << '--exclude' << '.gem/,spec,features,examples'
 end

data/{spec/features → features}/sessions.feature

@@ -21,9 +21,9 @@ Feature: Logging In to an SSO Account
       When I request authentication
       Then I should see the login form
       When I login
-      Then I should be redirected to the sso provider root on login
+      Then I should see a list of consumers
     Scenario: logging in with a bad return_to cookie set
       Given a valid consumer and user exists
       Then I login
       When I request the login page
-      Then I should be redirected to the sso provider root
+      Then I should see a list of consumers

data/{spec/features → features}/signup.feature

@@ -23,4 +23,3 @@ Feature: Signing Up for an SSO Account
       When I signup with valid info
       Then I should receive a registration url via email
       When I hit the registration url and provide a password
-      Then I should be redirected to the sso provider root

data/{spec/features → features}/step_definitions/sessions_steps.rb

@@ -1,12 +1,13 @@
 Given /^a valid consumer and user exists$/ do
   @consumer = ::Hancock::Consumer.gen(:internal)
   @user     = ::Hancock::User.gen
-  get '/sso/logout'  # log us out if we're logged in
 end
 
 Then /^I login$/ do
-  post "/sso/login", :email => @user.email,
-                     :password => @user.password
+  fill_in :email,    :with => @user.email
+  fill_in :password, :with => @user.password
+
+  click_button 'Login'
 end
 
 Then /^I should be redirected to the consumer app to start the handshake$/ do
@@ -16,21 +17,14 @@ Then /^I should be redirected to the consumer app to start the handshake$/ do
   redirection.query_values['id'].to_i.should eql(@user.id)
 end
 
-Then /^I should be redirected to the sso provider root on login$/ do
-  last_response.headers['Location'].should eql('/')
-  follow_redirect!
-end
-
 When /^I request the landing page$/ do
-  get '/'
+  visit '/'
 end
 
 Then /^I should see a list of consumers$/ do
-  last_response.headers['Location'].should eql('/')
-  follow_redirect!
+  last_response.should have_selector("h3:contains('#{@user.first_name} #{@user.last_name}')")
 end
 
 When /^I request the login page$/ do
-  get '/sso/login'
-  pp last_response
+  visit '/sso/login'
 end

data/{spec/features → features}/step_definitions/signup_steps.rb

@@ -2,7 +2,6 @@ Given /^I am not logged in on the sso provider$/ do
   @user = Hancock::User.new(:email      => /\w+@\w+\.\w{2,3}/.gen.downcase,
                             :first_name => /\w+/.gen.capitalize,
                             :last_name  => /\w+/.gen.capitalize)
-  get "/sso/logout"
 end
 
 Given /^a valid consumer exists$/ do
@@ -10,11 +9,11 @@ Given /^a valid consumer exists$/ do
 end
 
 Given /^I request authentication$/ do
-  get "/sso/login"
+  visit "/sso/login"
 end
 
 Given /^I request authentication returning to the consumer app$/ do
-  get "/sso/login?return_to=#{@consumer.url}"
+  visit "/sso/login?return_to=#{@consumer.url}"
 end
 
 Then /^I should see the login form$/ do
@@ -22,7 +21,7 @@ Then /^I should see the login form$/ do
 end
 
 Given /^I click signup$/ do
-  get "/sso/signup"
+  visit "/sso/signup"
 end
 
 Then /^I should see the signup form$/ do
@@ -30,10 +29,11 @@ Then /^I should see the signup form$/ do
 end
 
 Given /^I signup with valid info$/ do
-  post "/sso/signup", 'email'      => @user.email,
-                      'first_name' => @user.first_name,
-                      'last_name'  => @user.last_name
-  last_response.status.should eql(200)
+  fill_in :email,      :with => @user.email
+  fill_in :first_name, :with => @user.first_name
+  fill_in :last_name,  :with => @user.last_name
+
+  click_button 'Signup'
 end
 
 Then /^I should receive a registration url via email$/ do
@@ -42,13 +42,12 @@ Then /^I should receive a registration url via email$/ do
 end
 
 Given /^I hit the registration url and provide a password$/ do
-  get @confirmation_url
-  post @confirmation_url, 'user[password]' => @user.password,
-                          'used[password_confirmation]' => @user.password
-end
+  visit @confirmation_url
+
+  fill_in :password,               :with => @user.password
+  fill_in :password_confirmation,  :with => @user.password
 
-Then /^I should be redirected to the sso provider root$/ do
-  last_response.headers['Location'].should eql('/')
+  click_button 'Am I Done Yet?'
 end
 
 Then /^I should be redirected to the consumer app$/ do

data/{spec/features → features}/step_definitions/sso_steps.rb

@@ -1,7 +1,6 @@
 When /^I am logged in on the sso provider$/ do
   @identity_url = "http://example.org/sso/users/#{@user.id}"
-  post "/sso/login", :email => @user.email,
-                     :password => @user.password
+  Then "I login"
 end
 
 When /^I request the sso page with a checkid mode of checkIDSetup$/ do

data/{spec/features → features}/support/env.rb

@@ -1,8 +1,6 @@
-require File.expand_path(File.dirname(__FILE__)+'/../../spec_helper')
+require File.expand_path(File.dirname(__FILE__)+'/../../spec/spec_helper')
 require 'haml'
 
-Hancock::App.set :environment, :development
-
 World do
   def app
     @app = Rack::Builder.new do
@@ -14,3 +12,13 @@ World do
   include Webrat::Matchers
   include Hancock::Matchers
 end
+
+class Webrat::Field
+  def escaped_value
+    @value.to_s
+  end
+end
+
+Before do
+  visit '/sso/logout'  # log us out if we're logged in
+end

data/lib/hancock.rb

@@ -1,26 +1,27 @@
 require 'rubygems'
 
-gem 'dm-core', '~>0.9.10'
+gem 'dm-core', '~>0.9.11'
 require 'dm-core'
 require 'dm-validations'
 require 'dm-timestamps'
 
-gem 'ruby-openid', '~>2.1.2'
+gem 'ruby-openid', '~>2.1.4'
 require 'openid'
 require 'openid/store/filesystem'
 require 'openid/extensions/sreg'
 
-gem 'sinatra', '~>0.9.1.1'
+gem 'sinatra', '~>0.9.2'
 require 'sinatra/base'
-
-gem 'sinatra-ditties', '~>0.0.3'
-require 'sinatra/ditties'
+gem 'haml'
+require 'haml/engine'
+require 'sass'
 
 gem 'guid', '~>0.1.1'
 require 'guid'
 
 module Hancock; end
 
+require File.expand_path(File.dirname(__FILE__)+'/mailer')
 require File.expand_path(File.dirname(__FILE__)+'/models/user')
 require File.expand_path(File.dirname(__FILE__)+'/models/consumer')
 require File.expand_path(File.dirname(__FILE__)+'/sinatra/hancock/defaults')
@@ -44,4 +45,3 @@ module Hancock
     register Sinatra::Hancock::OpenIDServer
   end
 end
-

data/lib/mailer.rb

@@ -0,0 +1,155 @@
+# Shamelssly stolen from Merb::Mailer
+# http://merbivore.com
+
+require 'net/smtp'
+require 'mailfactory'
+require 'tlsmail'
+
+Net::SMTP.enable_tls(OpenSSL::SSL::VERIFY_NONE)
+
+class MailFactory
+  attr_reader :html, :text
+end
+
+module Sinatra
+  # = Sinatra::Mailer
+  #
+  # Adds an #email method to your email handlers, that receives a hash of
+  # values to create your email.
+  #
+  # For example:
+  #
+  #   post "/signup" do
+  #     # sign up the user, and then:
+  #     email :to      => @user.email,
+  #           :from    => "awesomeness@example.com",
+  #           :subject => "Welcome to Awesomeness!",
+  #           :body    => haml(:some_template)
+  #   end
+  #
+  # == Configuration
+  #
+  # This plugin is very dirty yet :) Since it's just a port to Sinatra of
+  # Merb::Mailer[merbivore.com/documentation/1.0/doc/rdoc/merb-mailer-1.0].
+  # So the configuration is not Sinatra-y, yet. But we'll get to that.
+  #
+  # == Using SMTP
+  #
+  #  Sinatra::Mailer.config = {
+  #    :host   => 'smtp.yourserver.com',
+  #    :port   => '25',
+  #    :user   => 'user',
+  #    :pass   => 'pass',
+  #    :auth   => :plain # :plain, :login, :cram_md5, the default is no auth
+  #    :domain => "localhost.localdomain" # HELO domain provided by the client
+  #  }
+  #
+  # == Using Gmail SMTP
+  #
+  # You need smtp-tls[http://github.com/ambethia/smtp-tls], a gem that improves
+  # Net::HTTP to add support for secure servers such as Gmail.
+  #
+  #  require "smtp-tls"
+  #
+  #  Sinatra::Mailer.config = {
+  #    :host => 'smtp.gmail.com',
+  #    :port => '587',
+  #    :user => 'user@gmail.com',
+  #    :pass => 'pass',
+  #    :auth => :plain
+  #  }
+  #
+  # Make sure that when you call your #email method you pass the
+  # +:text+ option and not +:body+.
+  #
+  # == Using sendmail
+  #
+  #  Sinatra::Mailer.config = {:sendmail_path => '/somewhere/odd'}
+  #  Sinatra::Mailer.delivery_method = :sendmail
+  #
+  # == Credits
+  #
+  # This has been blatantly adapted from
+  # Merb::Mailer[merbivore.com/documentation/1.0/doc/rdoc/merb-mailer-1.0]
+  # so all credit is theirs, I just ported it to Sinatra.
+  module Mailer
+    class << self
+      attr_accessor :config, :delivery_method
+    end
+
+    def email(mail_options={})
+      Email.new(mail_options).deliver!
+    end
+
+    class Email
+      attr_accessor :mail, :config
+      def self.deliveries=(value)
+        @deliveries = value
+      end
+      def self.deliveries
+        @deliveries ||= [ ]
+      end
+
+      # Sends the mail using sendmail.
+      def sendmail
+        sendmail = IO.popen("#{config[:sendmail_path]} #{@mail.to}", 'w+')
+        sendmail.puts @mail.to_s
+        sendmail.close
+      end
+
+      # Sends the mail using SMTP.
+      def net_smtp
+        Net::SMTP.start(config[:host], config[:port].to_i, config[:domain],
+                        config[:user], config[:pass], config[:auth]) { |smtp|
+          smtp.send_message(@mail.to_s, @mail.from.first, @mail.to.to_s.split(/[,;]/))
+        }
+      end
+
+      def test_send
+        self.class.deliveries << @mail
+      end
+
+      # Delivers the mail with the specified delivery method, defaulting to
+      # net_smtp.
+      def deliver!
+        send(Mailer.delivery_method || :net_smtp)
+      end
+
+      # ==== Parameters
+      # file_or_files<File, Array[File]>:: File(s) to attach.
+      # filename<String>::
+      # type<~to_s>::
+      #   The attachment MIME type. If left out, it will be determined from
+      #   file_or_files.
+      # headers<String, Array>:: Additional attachment headers.
+      #
+      # ==== Raises
+      # ArgumentError::
+      #   file_or_files was not a File or an Array of File instances.
+      def attach(file_or_files, filename = file_or_files.is_a?(File) ? File.basename(file_or_files.path) : nil,
+        type = nil, headers = nil)
+        if file_or_files.is_a?(Array)
+          file_or_files.each {|k,v| @mail.add_attachment_as k, *v}
+        else
+          raise ArgumentError, "You did not pass in a file. Instead, you sent a #{file_or_files.class}" if !file_or_files.is_a?(File)
+          @mail.add_attachment_as(file_or_files, filename, type, headers)
+        end
+      end
+
+      # ==== Parameters
+      # o<Hash{~to_s => Object}>:: Configuration commands to send to MailFactory.
+      def initialize(o={})
+        self.config = Mailer.config || {:sendmail_path => '/usr/sbin/sendmail'}
+        o[:rawhtml] = o.delete(:html)
+        m = MailFactory.new()
+        o.each { |k,v| m.send "#{k}=", v }
+        @mail = m
+      end
+
+    end
+  end
+
+  class EventContext
+    include Mailer
+  end
+end

data/spec/acceptance/signing_up_spec.rb

@@ -1,51 +1,11 @@
 require File.expand_path(File.dirname(__FILE__)+'/../spec_helper')
 
 describe "visiting /sso/signup" do
-  def app
-    Hancock::App
-  end
   before(:each) do
     @user = Hancock::User.new(:email      => /\w+@\w+\.\w{2,3}/.gen.downcase,
                               :first_name => /\w+/.gen.capitalize,
                               :last_name  => /\w+/.gen.capitalize)
   end
-  describe "when signing up" do
-    it "should sign the user up" do
-      get '/sso/signup'
-
-      post '/sso/signup', :email => @user.email,
-                          :first_name => @user.first_name,
-                          :last_name => @user.last_name
-
-      confirmation_url = last_response.body.to_s.match(%r!/sso/register/\w{40}!)
-      confirmation_url.should_not be_nil
-
-      get "#{confirmation_url}"
-      password = /\w+{9,32}/.gen
-
-      last_response.body.to_s.should have_selector("form[action='#{confirmation_url}']")
-
-      post "#{confirmation_url}", :password => password, :password_confirmation => password
-      follow_redirect!
-
-      last_response.body.to_s.should have_selector("h3:contains('Hello #{@user.first_name} #{@user.last_name}')")
-    end
-
-    describe "and form hacking" do
-      it "should be unauthorized" do
-        get '/sso/signup'
-
-        post '/sso/signup', :email => @user.email,
-                            :first_name => @user.first_name,
-                            :last_name => @user.last_name
-
-        fake_url = /\w+{9,40}/.gen
-        get "/sso/register/#{fake_url}"
-        last_response.body.to_s.should match(/BadRequest/)
-      end
-    end
-  end
-
   if ENV['WATIR']
     begin
       require 'safariwatir'

data/spec/matchers.rb

@@ -42,12 +42,14 @@ module Hancock
       include Webrat::Methods
       include Webrat::Matchers
       include Spec::Matchers
+
       def matches?(target)
-        target.header['Content-Type'].should eql('application/xrds+xml')
+        target.headers['Content-Type'].should eql('application/xrds+xml')
         target.body.should have_xpath("//xrd/service[uri='http://example.org/sso']")
         target.body.should have_xpath("//xrd/service[type='http://specs.openid.net/auth/2.0/server']")
         true
       end
+
       def failure_message
         puts "Expected a identity provider yadis document"
       end

data/spec/spec_helper.rb

@@ -2,15 +2,14 @@ require 'rubygems'
 require 'pp'
 gem 'rspec', '~>1.2.0'
 require 'spec'
-require 'sinatra/test'
 require 'dm-sweatshop'
 
 $:.push File.join(File.dirname(__FILE__), '..', 'lib')
 require 'hancock'
-gem 'webrat', '~>0.4.2'
-require 'webrat/sinatra'
+gem 'webrat', '~>0.4.4'
+require 'webrat'
 
-gem 'rack-test', '~>0.1.0'
+gem 'rack-test', '~>0.3.0'
 require 'rack/test'
 
 require File.expand_path(File.dirname(__FILE__) + '/app')
@@ -23,9 +22,9 @@ Sinatra::Mailer.delivery_method = :test_send
 
 Webrat.configure do |config|
   if ENV['SELENIUM'].nil?
-    config.mode = :sinatra
+    config.mode = :rack_test
   else
-    gem 'selenium-client', '~>1.2.10'
+    gem 'selenium-client', '~>1.2.15'
     config.mode = :selenium
     config.application_framework = :sinatra
     config.application_port = 4567

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hancock
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Corey Donohoe
@@ -10,38 +10,38 @@ autorequire: hancock
 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 
-  name: dm-core
+  name: ruby-openid
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.10
+        version: 2.1.4
     version: 
 - !ruby/object:Gem::Dependency 
-  name: ruby-openid
+  name: sinatra
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.1.2
+        version: 0.9.2
     version: 
 - !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: haml
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.1.1
+        version: 2.0.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: guid
@@ -53,6 +53,46 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.1.1
     version: 
+- !ruby/object:Gem::Dependency 
+  name: dm-core
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.9.11
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: dm-types
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.9.11
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: dm-timestamps
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.9.11
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: dm-validations
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.9.11
+    version: 
 description: A gem that provides a Single Sign On server
 email: 
 - atmos@atmos.org
@@ -68,7 +108,17 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- features/sessions.feature
+- features/signup.feature
+- features/sso.feature
+- features/step_definitions
+- features/step_definitions/sessions_steps.rb
+- features/step_definitions/signup_steps.rb
+- features/step_definitions/sso_steps.rb
+- features/support
+- features/support/env.rb
 - lib/hancock.rb
+- lib/mailer.rb
 - lib/models
 - lib/models/consumer.rb
 - lib/models/user.rb
@@ -90,16 +140,6 @@ files:
 - spec/acceptance
 - spec/acceptance/signing_up_spec.rb
 - spec/app.rb
-- spec/features
-- spec/features/sessions.feature
-- spec/features/signup.feature
-- spec/features/sso.feature
-- spec/features/step_definitions
-- spec/features/step_definitions/sessions_steps.rb
-- spec/features/step_definitions/signup_steps.rb
-- spec/features/step_definitions/sso_steps.rb
-- spec/features/support
-- spec/features/support/env.rb
 - spec/fixtures.rb
 - spec/matchers.rb
 - spec/spec_helper.rb