sinatra_omniauth 1.0.0 → 1.0.1

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/lib/sinatra/omniauth.rb

@@ -155,8 +155,7 @@ module SinatraOmniAuth
     app.get '/auth' do
       @authentications_possible = settings.omniauth
 
-      if current_user
-        @authentication_current = current_auth
+      if current_user and @authentication_current = current_auth
         @authentications_available = current_user.authentications.all(:order => [ :provider.desc ])
         @authentications_unused = @authentications_available.
           reject do|a|
@@ -282,14 +281,17 @@ module SinatraOmniAuth
     end
 
     # authentication
-    app.delete '/auth/:id' do
+    app.delete '/auth/:provider' do
       authenticate_user!
 
       # remove an authentication authentication linked to the current user
-      @authentication = current_user.authentications.get(params[:id])
+      provider = params[:provider]
+      @authentication = current_user.authentications.first(:provider => provider)
 
-      if session[:authentication_provider] == @authentication.provider
-        flash.error = 'You can\'t delete this authorization because you are currently signed in with it!'
+      if !@authentication
+        pass
+      elsif session[:authentication_provider] == @authentication.provider
+        flash.error = 'You can\'t delete your authorization through #{provider.capitalize} because you are currently signed in with it!'
       else
         @authentication.destroy
       end

data/sinatra_omniauth.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_omniauth}
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   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-10}
+  s.date = %q{2011-08-17}
   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 = [

data/views/auth.haml

@@ -33,7 +33,7 @@
             .authentication.available{:style=>"background-image: url(/images/authbuttons/#{a.provider}_32.png)",:onclick=>"location = '/auth/#{a.provider}';"}
               .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
+              %a.remove{:href=>"/auth/#{a.provider}", :method => :delete, :rel => 'nofollow', :'data-confirm' => 'Are you sure you want to remove this authentication option?'} x
 
       %section.join
         - if current_user

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_omniauth
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Clifford Heath
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-10 00:00:00 Z
+date: 2011-08-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement