sinatra_omniauth 0.1.0 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/sinatra/omniauth.rb

@@ -156,6 +156,14 @@ module SinatraOmniAuth
     end
 
     app.get '/auth/:authentication/callback' do
+      callback
+    end
+
+    app.post '/auth/:authentication/callback' do
+      callback
+    end
+
+    app.send(:define_method, :callback) do
       # callback: success
       # This handles signing in and adding an authentication authentication to existing accounts itself
 
@@ -173,7 +181,7 @@ module SinatraOmniAuth
 
       # create a new regularised authentication hash
       @authhash = Hash.new
-      oaeuh = omniauth['extra']['user_hash']
+      oaeuh = omniauth['extra'] && omniauth['extra']['user_hash']
       oaui = omniauth['user_info']
       if authentication_route == 'facebook'
         @authhash[:email] = oaeuh['email'] || ''

data/models/authentication.rb

@@ -6,7 +6,7 @@ class Authentication
   property :id, Serial
   property :user_id, Integer
   property :provider, String
-  property :uid, String
-  property :user_name, String
-  property :user_email, String
+  property :uid, String, :length => 240
+  property :user_name, String, :length => 240
+  property :user_email, String, :length => 240
 end

data/omniauth.yml

@@ -11,9 +11,12 @@
   name: Facebook
   key: "--- enter your key here ---"
   secret: --- enter your secret here ---
-  client_options:
-    ssl:
-      ca_file: /opt/local/etc/ssl/certs/ca-certificates.crt
+  :client_options:
+    :ssl:
+      # For OS/X:
+      :ca_file: /opt/local/etc/ssl/certs/ca-certificates.crt
+      # For Linux:
+      # :ca_file: /etc/ssl/certs
 
 - 
   provider: google
@@ -35,24 +38,24 @@
   name: GitHub
   key: --- enter your key here ---
   secret: --- enter your secret here ---
+  :client_options:
+    :ssl:
+      # For OS/X:
+      :ca_file: /opt/local/etc/ssl/certs/ca-certificates.crt
+      # For Linux:
+      # :ca_file: /etc/ssl/certs
 
 - 
   provider: openid
   # Generic OpenID:
   name: OpenID
   store: ./tmp
-  key: --- enter your key here ---
-  secret: --- enter your secret here ---
-
 
 - 
   provider: openid
   name: MyOpenID
   store: ./tmp
   identifier: 'myopenid.com'
-  key: --- enter your key here ---
-  secret: --- enter your secret here ---
-
 
 - 
   provider: openid
@@ -61,7 +64,6 @@
   key: --- enter your key here ---
   secret: --- enter your secret here ---
 
-
 - 
   provider: openid
   name: AOL

data/sinatra_omniauth.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_omniauth}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Clifford Heath}]

data/views/auth.haml

@@ -39,7 +39,7 @@
         - if @authentications_possible.size > 0
           .clear
             - @authentications_possible.each do |authentication|
-              .authentication{:style=>"background-image: url(/images/authbuttons/#{authentication['provider']}_32.png)",:onclick=>"location = '/auth/#{authentication['provider']}';"}
+              .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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_omniauth
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Clifford Heath