sinatra_auth_gmail 0.0.1 → 0.1.1

data/README.md

@@ -1,7 +1,7 @@
-sinatra_gmail_auth
+sinatra_auth_gmail
 ==================
 
-A sinatra app the provides a gem that...
+A sinatra app that lets you authenticate users via gmail.
 
 Developing
 ==========
@@ -14,15 +14,32 @@ Gemfile
     gem "sinatra_auth_gmail"
     # vim:ft=ruby
 
-Example
--------
-    module Fooby
-      class App < Sinatra::Base
-        register Sinatra::Auth::Gmail
-          get '/' do
-            authorize!
-            haml "%h2= 'Hello There, #{gmail_user.full_name}!'"
-          end
-        end
+Example config.ru
+-----------------
+    require 'rubygems'
+    require 'bundler'
+
+    Bundler.setup
+    Bundler.require
+
+    class MyFirstGmailApp < Sinatra::Base
+      use Rack::Session::Cookie
+      register Sinatra::Auth::Gmail
+
+      get '/' do
+        authorize!
+        haml "%h2= 'Hello There, #{gmail_user.full_name}!'"
       end
     end
+
+    run MyFirstGmailApp
+
+Executing
+---------
+    % bundle install
+    % bundle exec rackup
+
+Visiting
+--------
+    % open http://localhost:9292
+

data/Rakefile

@@ -19,7 +19,7 @@ Spec::Rake::SpecTask.new do |t|
 end
 
 GEM = "sinatra_auth_gmail"
-GEM_VERSION = "0.0.1"
+GEM_VERSION = "0.1.1"
 AUTHOR = "Corey Donohoe"
 EMAIL = "atmos@atmos.org"
 HOMEPAGE = "http://github.com/atmos/sinatra_auth_gmail"

data/lib/sinatra/auth/gmail.rb

@@ -1,7 +1,7 @@
 module Sinatra
   module Auth
     module Gmail
-      class BadAuthentication < Sinatra::Default
+      class BadAuthentication < Sinatra::Base
         get '/unauthenticated' do
           status 403
           haml "%h3= 'Unable to authenticate, sorry bud.'"
@@ -9,20 +9,39 @@ module Sinatra
       end
 
       module Helpers
+        def warden
+          env['warden']
+        end
+
         def authorized?
-          env['warden'].authenticate!
+          puts "authorized? depricated.  Use authenticate! instead"
+          authenticate!
+        end
+
+        def authenticate!(*args)
+          warden.authenticate!(*args)
+        end
+
+        def authenticated?(*args)
+          warden.authenticated?(*args)
         end
 
         def authorize!
-          throw(:warden) unless authorized?
+          puts "authorize! is depricated. Use authenticate! instead"
+          warden.authenticate!
         end
 
         def logout!
-          env['warden'].logout
+          warden.logout
         end
 
         def gmail_user
-          env['warden'].user
+          puts "gmail_user is depricated.  Use google_user instead"
+          google_user
+        end
+
+        def google_user
+          warden.user
         end
       end
 
@@ -33,6 +52,7 @@ module Sinatra
 
           manager[:google_apps_endpoint] = 'http://www.google.com/accounts/o8/id'
         end
+
         app.helpers Helpers
 
         app.get '/logout' do
@@ -45,15 +65,15 @@ module Sinatra
         register Sinatra::Auth::Gmail
 
         before do
-          authorize!
+          authenticate!
         end
 
         get '/' do
-          haml "%h2= 'Hello There, #{gmail_user.full_name}!'"
+          haml "%h2= 'Hello There, #{google_user.full_name}!'"
         end
 
         get '/another_route' do
-          haml "%h2= 'Hello There, #{gmail_user.full_name}!'"
+          haml "%h2= 'Hello There, #{google_user.full_name}!'"
         end
       end
     end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_auth_gmail
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Corey Donohoe
@@ -9,49 +14,64 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-09 00:00:00 -08:00
+date: 2010-04-09 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: haml
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 2
+        - 0
         version: 2.2.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: sinatra
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.4
-    version: 
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.1
-    version: 
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: warden-googleapps
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.0.3
-    version: 
+        segments: 
+        - 0
+        - 0
+        - 5
+        version: 0.0.5
+  type: :runtime
+  version_requirements: *id004
 description: A sinatra extension that provides authentication for GMail authentication
 email: atmos@atmos.org
 executables: []
@@ -79,18 +99,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A sinatra extension that provides authentication for GMail authentication