sinatra_omniauth 0.2.2 → 1.0.0

data/Gemfile

@@ -1,17 +1,21 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
 gem 'sinatra'
-gem 'omniauth'
+gem 'omniauth', '~> 0.2.2'
 gem 'dm-core'
 gem 'dm-migrations'
 #gem 'dm-sqlite-adapter'
 gem 'dm-postgres-adapter'
 gem 'sqlite3'
 gem 'rack-flash'
+gem 'uuidtools'
+gem 'haml', '>=3.1.1'
 
 group :development do
-  gem "bundler", ">= 1.0.0"
-  gem "jeweler", "~> 1.6.2"
-  gem "rcov", ">= 0"
-  gem "rdoc", ">= 2.4.0"
+  gem 'bundler', '>= 1.0.0'
+  gem 'jeweler', '~> 1.6.2'
+  gem 'rcov', '>= 0'
+  gem 'rdoc', '>= 2.4.0'
+  gem 'ruby-debug'
+  gem 'dm-sqlite-adapter'
 end

data/Gemfile.lock

@@ -2,6 +2,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     addressable (2.2.6)
+    columnize (0.3.4)
     data_objects (0.10.6)
       addressable (~> 2.1)
     dm-core (1.1.0)
@@ -14,61 +15,69 @@ GEM
     dm-postgres-adapter (1.1.0)
       dm-do-adapter (~> 1.1.0)
       do_postgres (~> 0.10.2)
+    dm-sqlite-adapter (1.1.0)
+      dm-do-adapter (~> 1.1.0)
+      do_sqlite3 (~> 0.10.2)
     do_postgres (0.10.6)
       data_objects (= 0.10.6)
+    do_sqlite3 (0.10.6)
+      data_objects (= 0.10.6)
     faraday (0.6.1)
       addressable (~> 2.2.4)
       multipart-post (~> 1.1.0)
       rack (>= 1.1.0, < 2)
     git (1.2.5)
+    haml (3.1.2)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
     mime-types (1.16)
     multi_json (0.0.5)
     multipart-post (1.1.3)
     net-ldap (0.1.1)
     nokogiri (1.4.7)
-    oa-basic (0.2.3)
+    oa-basic (0.2.2)
       multi_json (~> 0.0.2)
       nokogiri (~> 1.4.2)
-      oa-core (= 0.2.3)
+      oa-core (= 0.2.2)
       rest-client (~> 1.6.0)
-    oa-core (0.2.3)
+    oa-core (0.2.2)
       rack (~> 1.1)
-    oa-enterprise (0.2.3)
+    oa-enterprise (0.2.2)
       net-ldap (~> 0.1.1)
       nokogiri (~> 1.4.2)
-      oa-core (= 0.2.3)
+      oa-core (= 0.2.2)
       pyu-ruby-sasl (~> 0.0.3.1)
       rubyntlm (~> 0.1.1)
-    oa-more (0.2.3)
+    oa-more (0.2.2)
       multi_json (~> 0.0.2)
-      oa-core (= 0.2.3)
+      oa-core (= 0.2.2)
       rest-client (~> 1.6.0)
-    oa-oauth (0.2.3)
+    oa-oauth (0.2.2)
       faraday (~> 0.6.1)
-      multi_json (>= 0.0.5)
+      multi_json (~> 0.0.2)
       nokogiri (~> 1.4.2)
-      oa-core (= 0.2.3)
+      oa-core (= 0.2.2)
       oauth (~> 0.4.0)
       oauth2 (~> 0.3.0)
-    oa-openid (0.2.3)
-      oa-core (= 0.2.3)
+    oa-openid (0.2.2)
+      oa-core (= 0.2.2)
       rack-openid (~> 1.2.0)
       ruby-openid-apps-discovery
     oauth (0.4.5)
     oauth2 (0.3.0)
       faraday (~> 0.6.0)
       multi_json (~> 0.0.4)
-    omniauth (0.2.3)
-      oa-basic (= 0.2.3)
-      oa-core (= 0.2.3)
-      oa-enterprise (= 0.2.3)
-      oa-more (= 0.2.3)
-      oa-oauth (= 0.2.3)
-      oa-openid (= 0.2.3)
+    omniauth (0.2.2)
+      oa-basic (= 0.2.2)
+      oa-core (= 0.2.2)
+      oa-enterprise (= 0.2.2)
+      oa-more (= 0.2.2)
+      oa-oauth (= 0.2.2)
+      oa-openid (= 0.2.2)
     pyu-ruby-sasl (0.0.3.3)
     rack (1.3.2)
     rack-flash (0.1.2)
@@ -77,10 +86,16 @@ GEM
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
     rake (0.9.2)
-    rcov (0.9.9)
+    rbx-require-relative (0.0.5)
+    rcov (0.9.10)
     rdoc (3.9.1)
     rest-client (1.6.3)
       mime-types (>= 1.16)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
     ruby-openid (2.1.8)
     ruby-openid-apps-discovery (1.2.0)
       ruby-openid (>= 2.1.7)
@@ -90,6 +105,7 @@ GEM
       tilt (< 2.0, >= 1.2.2)
     sqlite3 (1.3.4)
     tilt (1.3.2)
+    uuidtools (2.1.2)
 
 PLATFORMS
   ruby
@@ -99,10 +115,14 @@ DEPENDENCIES
   dm-core
   dm-migrations
   dm-postgres-adapter
+  dm-sqlite-adapter
+  haml (>= 3.1.1)
   jeweler (~> 1.6.2)
-  omniauth
+  omniauth (~> 0.2.2)
   rack-flash
   rcov
   rdoc (>= 2.4.0)
+  ruby-debug
   sinatra
   sqlite3
+  uuidtools

data/VERSION

@@ -1 +1 @@
-0.2.2
+1.0.0

data/config.ru

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Driver program for Sinatra Omniauth gem.
+# Driver program for SinatraOmniAuth gem.
 # You don't need to use this in your program, it just demonstrates the minimum to get things running
 #
 
@@ -8,18 +8,21 @@ require 'sinatra'
 require 'dm-core'
 require 'dm-migrations'
 require 'dm-sqlite-adapter'
+require 'sinatra/omniauth'
+require 'ruby-debug'; Debugger.start
 
 DataMapper::Logger.new($stdout, :debug)
 DataMapper.setup(:default, "sqlite3://#{Dir.pwd}/omniauth_sinatra.sqlite3")
 
 DataMapper.auto_upgrade!
 
-app = Sinatra::Omniauth.new
+class SinatraOmniAuthTestApp < Sinatra::Base
+  set :public, Dir.getwd
+  set :omniauth, YAML.load_file(File.dirname(__FILE__)+"/omniauth.yml")
+  enable :sessions
 
-# Set up API keys:
-app.settings.set :omniauth, {
-  :facebook => []
-  # etc...
-}
+  register SinatraOmniAuth
+end
 
+app = SinatraOmniAuthTestApp.new
 run app

data/css/auth.css

@@ -1,4 +1,7 @@
 /* Authentication "badge" */
+.authentications > * {
+  padding: 1em 1em;
+}
 .authentication {
 	position: relative;
 	display: inline-block;

data/lib/sinatra/omniauth.rb

@@ -23,6 +23,7 @@
 #
 #       require 'sinatra/omniauth'
 #
+#       enable :sessions
 #       set :omniauth, YAML.load_file(File.dirname(__FILE__)+"/omniauth.yml")
 #
 #       register SinatraOmniAuth
@@ -91,11 +92,26 @@ require 'rack-flash'
 module SinatraOmniAuth
   module Helpers
     def current_user
-      @current_user ||= User.get(session[:user_id]) if session[:user_id]
+      session.delete :authentication_id   # Clean up old auth values
+      begin
+        if session[:user_id] && session[:authentication_provider]
+          @current_auth ||= Authentication.first(:user_id => session[:user_id], :provider => session[:authentication_provider])
+          @current_user ||= @current_auth.user
+        end
+        return @current_user if @current_user
+      rescue      # Invalid cookie value formats?
+        @current_user = nil
+        @current_auth = nil
+      end
+
+      # Clean up any old/bad cookie values:
+      session.delete :user_id
+      session.delete :authentication_provider
     end
 
     def current_auth
-      @current_auth ||= Authentication.get(session[:authentication_id]) if session[:authentication_id]
+      current_user
+      @current_auth
     end
 
     def authenticate_user!
@@ -140,11 +156,11 @@ module SinatraOmniAuth
       @authentications_possible = settings.omniauth
 
       if current_user
-        @authentication_current = Authentication.get(session[:authentication_id])
+        @authentication_current = current_auth
         @authentications_available = current_user.authentications.all(:order => [ :provider.desc ])
         @authentications_unused = @authentications_available.
           reject do|a|
-            a.id == @authentication_current.id
+            a.provider == @authentication_current.provider
           end
         @authentications_possible = @authentications_possible.dup.
           reject do |a|
@@ -219,12 +235,12 @@ module SinatraOmniAuth
       if current_user
         if auth
           flash.notice = 'You are now signed in using your' + @authhash[:provider].capitalize + ' account'
-          session[:authentication_id] = auth.id     # They're now signed in using the new account
+          session[:authentication_provider] = auth.provider   # They're now signed in using the new account
           redirect to('/auth/signedin')  # Already signed in, and we already had this authentication
         else
           auth = current_user.authentications.create!(:provider => @authhash[:provider], :uid => @authhash[:uid], :user_name => @authhash[:name], :user_email => @authhash[:email])
           flash.notice = 'Your ' + @authhash[:provider].capitalize + ' account has been added for signing in at this site.'
-          session[:authentication_id] = auth.id     # They're now signed in using the new account
+          session[:authentication_provider] = auth.provider   # They're now signed in using the new account
           session[:user_name] = @authhash[:name] if @authhash[:name] != ''
           redirect to('/auth/signedin')
         end
@@ -233,7 +249,7 @@ module SinatraOmniAuth
           # Signin existing user
           # in the session his user id and the authentication id used for signing in is stored
           session[:user_id] = auth.user.id
-          session[:authentication_id] = auth.id
+          session[:authentication_provider] = auth.provider   # They're now signed in using the new account
           session[:user_name] = @authhash[:name] if @authhash[:name] != ''
 
           flash.notice = 'Signed in successfully via ' + @authhash[:provider].capitalize + '.'
@@ -245,7 +261,7 @@ module SinatraOmniAuth
         session[:user_id] = @current_user.id
         session[:user_name] = @authhash[:name] if @authhash[:name] != ''
         auth = current_user.authentications.create!(:provider => @authhash[:provider], :uid => @authhash[:uid], :user_name => @authhash[:name], :user_email => @authhash[:email])
-        session[:authentication_id] = auth.id
+        session[:authentication_provider] = auth.provider
         redirect to('/auth/welcome')
       end
     end
@@ -258,12 +274,9 @@ module SinatraOmniAuth
     app.get '/auth/signout' do
       authenticate_user!
 
-      session[:user_id] = nil
-      session[:user_name] = nil
-      session[:authentication_id] = nil
       session.delete :user_id
       session.delete :user_name
-      session.delete :authentication_id
+      session.delete :authentication_provider
       flash.notice = 'You have been signed out'
       redirect to('/')
     end
@@ -275,7 +288,7 @@ module SinatraOmniAuth
       # remove an authentication authentication linked to the current user
       @authentication = current_user.authentications.get(params[:id])
 
-      if session[:authentication_id] == @authentication.id
+      if session[:authentication_provider] == @authentication.provider
         flash.error = 'You can\'t delete this authorization because you are currently signed in with it!'
       else
         @authentication.destroy

data/models/authentication.rb

@@ -1,12 +1,15 @@
 class Authentication
   include DataMapper::Resource
 
-  belongs_to :user
+  belongs_to :user, :key => true
 
-  property :id, Serial
-  property :user_id, Integer
-  property :provider, String
+  # Authentication provider:
+  property :provider, String, :key => true
+
+  # User ID allocated by that provider:
   property :uid, String, :length => 240
+
+  # User name and email:
   property :user_name, String, :length => 240
-  property :user_email, String, :length => 240
+  property :user_email, String, :length => 240, :index => true
 end

data/models/user.rb

@@ -1,11 +1,9 @@
+require 'uuidtools'
+
 class User
   include DataMapper::Resource
 
-  devise :registerable,   # handles signing up users through a registration process, also edit/destroy account.
-         :rememberable,   # "Remember me" from a cookie
-         :trackable       # Tracks sign in count, timestamps and IP address
-
-  property :id, Serial
+  property :id, UUID, :key => true, :required => true, :default => proc { UUIDTools::UUID.random_create }
 
   # Each user may log in using different methods:
   has n, :authentications

data/omniauth.yml

@@ -61,13 +61,9 @@
   provider: openid
   name: Yahoo
   identifier: 'yahoo.com'
-  key: --- enter your key here ---
-  secret: --- enter your secret here ---
 
 - 
   provider: openid
   name: AOL
   identifier: 'openid.aol.com'
-  key: --- enter your key here ---
-  secret: --- enter your secret here ---
 

data/sinatra_omniauth.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_omniauth}
-  s.version = "0.2.2"
+  s.version = "1.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Clifford Heath}]
-  s.date = %q{2011-08-08}
+  s.date = %q{2011-08-10}
   s.description = %q{This Sinatra extension, derived from omniauth_pure by Marcus Proske, adds OmniAuth authorization to your Sinatra application, so your users can login using FaceBook, Twitter and many other authorization providers, as long as you supply the API keys. It uses DataMapper and HAML.}
   s.email = %q{clifford.heath@gmail.com}
   s.extra_rdoc_files = [
@@ -26,61 +26,58 @@ Gem::Specification.new do |s|
     "VERSION",
     "config.ru",
     "css/auth.css",
-    "lib/models/authorization.rb",
-    "lib/models/user.rb",
+    "images/authbuttons/aol_128.png",
+    "images/authbuttons/aol_256.png",
+    "images/authbuttons/aol_32.png",
+    "images/authbuttons/aol_64.png",
+    "images/authbuttons/basecamp_128.png",
+    "images/authbuttons/basecamp_256.png",
+    "images/authbuttons/basecamp_32.png",
+    "images/authbuttons/basecamp_64.png",
+    "images/authbuttons/campfire_128.png",
+    "images/authbuttons/campfire_256.png",
+    "images/authbuttons/campfire_32.png",
+    "images/authbuttons/campfire_64.png",
+    "images/authbuttons/facebook_128.png",
+    "images/authbuttons/facebook_256.png",
+    "images/authbuttons/facebook_32.png",
+    "images/authbuttons/facebook_64.png",
+    "images/authbuttons/github_128.png",
+    "images/authbuttons/github_256.png",
+    "images/authbuttons/github_32.png",
+    "images/authbuttons/github_64.png",
+    "images/authbuttons/google_128.png",
+    "images/authbuttons/google_256.png",
+    "images/authbuttons/google_32.png",
+    "images/authbuttons/google_64.png",
+    "images/authbuttons/linkedin_128.png",
+    "images/authbuttons/linkedin_256.png",
+    "images/authbuttons/linkedin_32.png",
+    "images/authbuttons/linkedin_64.png",
+    "images/authbuttons/myspace_128.png",
+    "images/authbuttons/myspace_256.png",
+    "images/authbuttons/myspace_32.png",
+    "images/authbuttons/myspace_64.png",
+    "images/authbuttons/openid_128.png",
+    "images/authbuttons/openid_256.png",
+    "images/authbuttons/openid_32.png",
+    "images/authbuttons/openid_64.png",
+    "images/authbuttons/presently_128.png",
+    "images/authbuttons/presently_256.png",
+    "images/authbuttons/presently_32.png",
+    "images/authbuttons/presently_64.png",
+    "images/authbuttons/twitter_128.png",
+    "images/authbuttons/twitter_256.png",
+    "images/authbuttons/twitter_32.png",
+    "images/authbuttons/twitter_64.png",
+    "images/authbuttons/yahoo_128.png",
+    "images/authbuttons/yahoo_256.png",
+    "images/authbuttons/yahoo_32.png",
+    "images/authbuttons/yahoo_64.png",
     "lib/sinatra/omniauth.rb",
     "models/authentication.rb",
     "models/user.rb",
     "omniauth.yml",
-    "public/css/omniauth.css",
-    "public/images/authbuttons/aol_128.png",
-    "public/images/authbuttons/aol_256.png",
-    "public/images/authbuttons/aol_32.png",
-    "public/images/authbuttons/aol_64.png",
-    "public/images/authbuttons/basecamp_128.png",
-    "public/images/authbuttons/basecamp_256.png",
-    "public/images/authbuttons/basecamp_32.png",
-    "public/images/authbuttons/basecamp_64.png",
-    "public/images/authbuttons/campfire_128.png",
-    "public/images/authbuttons/campfire_256.png",
-    "public/images/authbuttons/campfire_32.png",
-    "public/images/authbuttons/campfire_64.png",
-    "public/images/authbuttons/facebook_128.png",
-    "public/images/authbuttons/facebook_256.png",
-    "public/images/authbuttons/facebook_32.png",
-    "public/images/authbuttons/facebook_64.png",
-    "public/images/authbuttons/github_128.png",
-    "public/images/authbuttons/github_256.png",
-    "public/images/authbuttons/github_32.png",
-    "public/images/authbuttons/github_64.png",
-    "public/images/authbuttons/google_128.png",
-    "public/images/authbuttons/google_256.png",
-    "public/images/authbuttons/google_32.png",
-    "public/images/authbuttons/google_64.png",
-    "public/images/authbuttons/linkedin_128.png",
-    "public/images/authbuttons/linkedin_256.png",
-    "public/images/authbuttons/linkedin_32.png",
-    "public/images/authbuttons/linkedin_64.png",
-    "public/images/authbuttons/myspace_128.png",
-    "public/images/authbuttons/myspace_256.png",
-    "public/images/authbuttons/myspace_32.png",
-    "public/images/authbuttons/myspace_64.png",
-    "public/images/authbuttons/openid_128.png",
-    "public/images/authbuttons/openid_256.png",
-    "public/images/authbuttons/openid_32.png",
-    "public/images/authbuttons/openid_64.png",
-    "public/images/authbuttons/presently_128.png",
-    "public/images/authbuttons/presently_256.png",
-    "public/images/authbuttons/presently_32.png",
-    "public/images/authbuttons/presently_64.png",
-    "public/images/authbuttons/twitter_128.png",
-    "public/images/authbuttons/twitter_256.png",
-    "public/images/authbuttons/twitter_32.png",
-    "public/images/authbuttons/twitter_64.png",
-    "public/images/authbuttons/yahoo_128.png",
-    "public/images/authbuttons/yahoo_256.png",
-    "public/images/authbuttons/yahoo_32.png",
-    "public/images/authbuttons/yahoo_64.png",
     "sinatra_omniauth.gemspec",
     "test/helper.rb",
     "test/test_sinatra_omniauth.rb",
@@ -97,41 +94,53 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<sinatra>, [">= 0"])
-      s.add_runtime_dependency(%q<omniauth>, [">= 0"])
+      s.add_runtime_dependency(%q<omniauth>, ["~> 0.2.2"])
       s.add_runtime_dependency(%q<dm-core>, [">= 0"])
       s.add_runtime_dependency(%q<dm-migrations>, [">= 0"])
       s.add_runtime_dependency(%q<dm-postgres-adapter>, [">= 0"])
       s.add_runtime_dependency(%q<sqlite3>, [">= 0"])
       s.add_runtime_dependency(%q<rack-flash>, [">= 0"])
+      s.add_runtime_dependency(%q<uuidtools>, [">= 0"])
+      s.add_runtime_dependency(%q<haml>, [">= 3.1.1"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, [">= 2.4.0"])
+      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
+      s.add_development_dependency(%q<dm-sqlite-adapter>, [">= 0"])
     else
       s.add_dependency(%q<sinatra>, [">= 0"])
-      s.add_dependency(%q<omniauth>, [">= 0"])
+      s.add_dependency(%q<omniauth>, ["~> 0.2.2"])
       s.add_dependency(%q<dm-core>, [">= 0"])
       s.add_dependency(%q<dm-migrations>, [">= 0"])
       s.add_dependency(%q<dm-postgres-adapter>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<rack-flash>, [">= 0"])
+      s.add_dependency(%q<uuidtools>, [">= 0"])
+      s.add_dependency(%q<haml>, [">= 3.1.1"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<rdoc>, [">= 2.4.0"])
+      s.add_dependency(%q<ruby-debug>, [">= 0"])
+      s.add_dependency(%q<dm-sqlite-adapter>, [">= 0"])
     end
   else
     s.add_dependency(%q<sinatra>, [">= 0"])
-    s.add_dependency(%q<omniauth>, [">= 0"])
+    s.add_dependency(%q<omniauth>, ["~> 0.2.2"])
     s.add_dependency(%q<dm-core>, [">= 0"])
     s.add_dependency(%q<dm-migrations>, [">= 0"])
     s.add_dependency(%q<dm-postgres-adapter>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<rack-flash>, [">= 0"])
+    s.add_dependency(%q<uuidtools>, [">= 0"])
+    s.add_dependency(%q<haml>, [">= 3.1.1"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<rdoc>, [">= 2.4.0"])
+    s.add_dependency(%q<ruby-debug>, [">= 0"])
+    s.add_dependency(%q<dm-sqlite-adapter>, [">= 0"])
   end
 end
 

data/views/auth.haml

@@ -2,23 +2,29 @@
 %html(lang="en-au")
   %head
     %meta(charset="utf-8")
-    = include_stylesheets :auth
-    = include_javascripts :jquery
+    %link(rel="stylesheet" href="css/auth.css" media="screen" type="text/css")
+    %script(href="http://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js" type="text/javascript")
     %title APRIMO Sign In
 
   %body
+    - if flash.error || flash.notice
+      = flash.error || flash.notice
+
     .authentications
       - if current_user
         %section.current
-          = current_auth.user_name+','
-          you are currently signed in using your
+          You are currently signed in using as
+          = current_auth.user_name
+          using your
           .authentication.current{:style=>"background-image: url(/images/authbuttons/#{@authentication_current.provider}_32.png)"}
             .provider= @authentication_current.provider.titleize
             .uid= @authentication_current.uid
           account.
+
         %section.logout
           %a.signout{:href=>'/auth/signout'}Click here
           to sign out.
+
         %section.alternatives
           - if @authentications_available.size > 1
             .clear
@@ -28,6 +34,7 @@
               .provider= a.provider.titleize
               .uid= a.uid
               %a.remove{:href=>"/auth/#{a.id}", :method => :delete, :rel => 'nofollow', :'data-confirm' => 'Are you sure you want to remove this authentication option?'} x
+
       %section.join
         - if current_user
           - if @authentications_possible.size > 0
@@ -41,16 +48,17 @@
             - @authentications_possible.each do |authentication|
               .authentication{:style=>"background-image: url(/images/authbuttons/#{authentication['provider']}_32.png)",:onclick=>"location = '/auth/#{(a = authentication['provider']) == 'openid' ? authentication['name'].downcase : a}';"}
                 .provider= authentication['name']
-        - if !current_user
-          %p.clear
-            Don't have any of these accounts? Get your
-            %a{href='http://www.myopenid.com/'} MyOpenID
-            or
-            %a{href='http://mail.google.com/mail/signup'} GoogleID
-            now!
-            If you want to learn more about OpenID or find more OpenID providers,
-            you can get more information at
-            %a{href='http://myopenid.net/'} openid.net
+
+      - if !current_user
+        %p.clear
+          Don't have any of these accounts? Get your
+          %a(href='http://www.myopenid.com/') MyOpenID
+          or
+          %a(href='http://mail.google.com/mail/signup') GoogleID
+          now!
+          If you want to learn more about OpenID or find more OpenID providers,
+          you can get more information at
+          %a(href='http://myopenid.net/') openid.net
 
   %script{:type=>'text/javascript'}
     $(document).ready(function() {

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_omniauth
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 23
   prerelease: 
   segments: 
+  - 1
   - 0
-  - 2
-  - 2
-  version: 0.2.2
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Clifford Heath
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-08 00:00:00 Z
+date: 2011-08-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -35,12 +35,14 @@ dependencies:
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 19
         segments: 
         - 0
-        version: "0"
+        - 2
+        - 2
+        version: 0.2.2
   prerelease: false
   type: :runtime
   requirement: *id002
@@ -117,6 +119,36 @@ dependencies:
   name: rack-flash
 - !ruby/object:Gem::Dependency 
   version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :runtime
+  requirement: *id008
+  name: uuidtools
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 3
+        - 1
+        - 1
+        version: 3.1.1
+  prerelease: false
+  type: :runtime
+  requirement: *id009
+  name: haml
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -129,10 +161,10 @@ dependencies:
         version: 1.0.0
   prerelease: false
   type: :development
-  requirement: *id008
+  requirement: *id010
   name: bundler
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -145,10 +177,10 @@ dependencies:
         version: 1.6.2
   prerelease: false
   type: :development
-  requirement: *id009
+  requirement: *id011
   name: jeweler
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -159,10 +191,10 @@ dependencies:
         version: "0"
   prerelease: false
   type: :development
-  requirement: *id010
+  requirement: *id012
   name: rcov
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -175,8 +207,36 @@ dependencies:
         version: 2.4.0
   prerelease: false
   type: :development
-  requirement: *id011
+  requirement: *id013
   name: rdoc
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id014
+  name: ruby-debug
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id015 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id015
+  name: dm-sqlite-adapter
 description: This Sinatra extension, derived from omniauth_pure by Marcus Proske, adds OmniAuth authorization to your Sinatra application, so your users can login using FaceBook, Twitter and many other authorization providers, as long as you supply the API keys. It uses DataMapper and HAML.
 email: clifford.heath@gmail.com
 executables: []
@@ -196,61 +256,58 @@ files:
 - VERSION
 - config.ru
 - css/auth.css
-- lib/models/authorization.rb
-- lib/models/user.rb
+- images/authbuttons/aol_128.png
+- images/authbuttons/aol_256.png
+- images/authbuttons/aol_32.png
+- images/authbuttons/aol_64.png
+- images/authbuttons/basecamp_128.png
+- images/authbuttons/basecamp_256.png
+- images/authbuttons/basecamp_32.png
+- images/authbuttons/basecamp_64.png
+- images/authbuttons/campfire_128.png
+- images/authbuttons/campfire_256.png
+- images/authbuttons/campfire_32.png
+- images/authbuttons/campfire_64.png
+- images/authbuttons/facebook_128.png
+- images/authbuttons/facebook_256.png
+- images/authbuttons/facebook_32.png
+- images/authbuttons/facebook_64.png
+- images/authbuttons/github_128.png
+- images/authbuttons/github_256.png
+- images/authbuttons/github_32.png
+- images/authbuttons/github_64.png
+- images/authbuttons/google_128.png
+- images/authbuttons/google_256.png
+- images/authbuttons/google_32.png
+- images/authbuttons/google_64.png
+- images/authbuttons/linkedin_128.png
+- images/authbuttons/linkedin_256.png
+- images/authbuttons/linkedin_32.png
+- images/authbuttons/linkedin_64.png
+- images/authbuttons/myspace_128.png
+- images/authbuttons/myspace_256.png
+- images/authbuttons/myspace_32.png
+- images/authbuttons/myspace_64.png
+- images/authbuttons/openid_128.png
+- images/authbuttons/openid_256.png
+- images/authbuttons/openid_32.png
+- images/authbuttons/openid_64.png
+- images/authbuttons/presently_128.png
+- images/authbuttons/presently_256.png
+- images/authbuttons/presently_32.png
+- images/authbuttons/presently_64.png
+- images/authbuttons/twitter_128.png
+- images/authbuttons/twitter_256.png
+- images/authbuttons/twitter_32.png
+- images/authbuttons/twitter_64.png
+- images/authbuttons/yahoo_128.png
+- images/authbuttons/yahoo_256.png
+- images/authbuttons/yahoo_32.png
+- images/authbuttons/yahoo_64.png
 - lib/sinatra/omniauth.rb
 - models/authentication.rb
 - models/user.rb
 - omniauth.yml
-- public/css/omniauth.css
-- public/images/authbuttons/aol_128.png
-- public/images/authbuttons/aol_256.png
-- public/images/authbuttons/aol_32.png
-- public/images/authbuttons/aol_64.png
-- public/images/authbuttons/basecamp_128.png
-- public/images/authbuttons/basecamp_256.png
-- public/images/authbuttons/basecamp_32.png
-- public/images/authbuttons/basecamp_64.png
-- public/images/authbuttons/campfire_128.png
-- public/images/authbuttons/campfire_256.png
-- public/images/authbuttons/campfire_32.png
-- public/images/authbuttons/campfire_64.png
-- public/images/authbuttons/facebook_128.png
-- public/images/authbuttons/facebook_256.png
-- public/images/authbuttons/facebook_32.png
-- public/images/authbuttons/facebook_64.png
-- public/images/authbuttons/github_128.png
-- public/images/authbuttons/github_256.png
-- public/images/authbuttons/github_32.png
-- public/images/authbuttons/github_64.png
-- public/images/authbuttons/google_128.png
-- public/images/authbuttons/google_256.png
-- public/images/authbuttons/google_32.png
-- public/images/authbuttons/google_64.png
-- public/images/authbuttons/linkedin_128.png
-- public/images/authbuttons/linkedin_256.png
-- public/images/authbuttons/linkedin_32.png
-- public/images/authbuttons/linkedin_64.png
-- public/images/authbuttons/myspace_128.png
-- public/images/authbuttons/myspace_256.png
-- public/images/authbuttons/myspace_32.png
-- public/images/authbuttons/myspace_64.png
-- public/images/authbuttons/openid_128.png
-- public/images/authbuttons/openid_256.png
-- public/images/authbuttons/openid_32.png
-- public/images/authbuttons/openid_64.png
-- public/images/authbuttons/presently_128.png
-- public/images/authbuttons/presently_256.png
-- public/images/authbuttons/presently_32.png
-- public/images/authbuttons/presently_64.png
-- public/images/authbuttons/twitter_128.png
-- public/images/authbuttons/twitter_256.png
-- public/images/authbuttons/twitter_32.png
-- public/images/authbuttons/twitter_64.png
-- public/images/authbuttons/yahoo_128.png
-- public/images/authbuttons/yahoo_256.png
-- public/images/authbuttons/yahoo_32.png
-- public/images/authbuttons/yahoo_64.png
 - sinatra_omniauth.gemspec
 - test/helper.rb
 - test/test_sinatra_omniauth.rb

data/lib/models/authorization.rb

@@ -1,16 +0,0 @@
-require 'dm-core'
-require 'dm-timestamps'
-
-class Authorization
-  include DataMapper::Resource
-  belongs_to :user
-
-  property :id,          Serial
-  property :user_id,     Integer
-  property :provider,    String
-  property :uid,         String
-  property :uname,       String
-  property :uemail,      String
-  property :created_at,  DateTime
-  property :updated_at,  DateTime
-end

data/lib/models/user.rb

@@ -1,14 +0,0 @@
-require 'dm-core'
-require 'dm-timestamps'
-
-class User
-  include DataMapper::Resource
-  
-  property :id,          Serial
-  property :name,        String
-  property :email,       String
-  property :created_at,  DateTime
-  property :updated_at,  DateTime
-
-  has n, :authorizations
-end

data/public/css/omniauth.css

@@ -1,34 +0,0 @@
-/* Authentication "badge" */
-.authentication {
-	position: relative;
-	display: inline-block;
-	padding: 0.2em 2em 0.2em 0.5em;
-	background-color: #EEE;
-	border-radius: 0.5em; border: 2px black;
-	-webkit-box-shadow: 0 0 5px #000; -moz-box-shadow: 0 0 5px #000; box-shadow: 0 0 5px #000;
-}
-.authentication {
-	background-repeat: no-repeat;
-	background-position: left center;
-}
-.authentication * {
-	margin-left: 32px;
-}
-.authentication .provider {
-	font-weight: bold;
-}
-.authentication a {   /* The X to delete this authentication method */
-	position: absolute;
-	right: 0.3em;
-	top: 0px;
-}
-
-/* Alternate auth providers */
-.auth_provider {
-	position: relative;
-	display: inline-block;
-	text-align: center;
-}
-.auth_provider * {
-	display:block;
-}