sinatra-google-auth 0.0.8 → 1.0.0

data/Gemfile

@@ -5,4 +5,5 @@ gemspec
 
 group :development do
   gem 'turn'
+  gem 'sinatra'
 end

data/README.md

@@ -93,12 +93,12 @@ end
 
 Configure your Google OpenID endpoint via setting the ENV var `GOOGLE_AUTH_URL`
 
-    $ export GOOGLE_AUTH_URL=http://myurl.com/openid
+    $ export GOOGLE_AUTH_DOMAIN=heroku.com
 
 or before requiring
 
 ```ruby
-ENV['GOOGLE_AUTH_URL'] = 'http://myurl.com/openid'
+ENV['GOOGLE_AUTH_URL'] = 'heroku.com'
 
 require 'sinatra'
 require 'sinatra/google-auth'

data/lib/sinatra/google-auth/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module GoogleAuth
-    VERSION = '0.0.8'
+    VERSION = '1.0.0'
   end
 end

data/lib/sinatra/google-auth.rb

@@ -1,4 +1,5 @@
-require 'omniauth-openid'
+require 'omniauth-google-apps'
+require 'openid/store/filesystem'
 
 module Sinatra
   module GoogleAuth
@@ -9,11 +10,11 @@ module Sinatra
       end
 
       def call(env)
-        if env['rack.session']["user"] || env['REQUEST_PATH'] =~ /^\/auth\/google/
+        if env['rack.session']["user"] || env['REQUEST_PATH'] =~ /^\/auth\/google_apps/
           @app.call(env)
         else
           env['rack.session']['google-auth-redirect'] = env['REQUEST_PATH']
-          return [301, {'Content-Type' => 'text/html', 'Location' => '/auth/google'}, []]
+          return [301, {'Content-Type' => 'text/html', 'Location' => '/auth/google_apps'}, []]
         end
       end
     end
@@ -23,9 +24,9 @@ module Sinatra
         unless session["user"]
           session['google-auth-redirect'] = request.path
           if settings.absolute_redirect?
-            redirect "/auth/google"
+            redirect "/auth/google_apps"
           else
-            redirect to "/auth/google"
+            redirect to "/auth/google_apps"
           end
         end
       end
@@ -47,10 +48,13 @@ module Sinatra
     end
 
     def self.registered(app)
-      raise "Must supply ENV var GOOGLE_AUTH_URL" unless ENV['GOOGLE_AUTH_URL']
+      raise "Must supply ENV var GOOGLE_AUTH_DOMAIN" unless ENV['GOOGLE_AUTH_DOMAIN']
       app.helpers GoogleAuth::Helpers
       app.use ::Rack::Session::Cookie, :secret => secret
-      app.use ::OmniAuth::Strategies::OpenID, :name => "google", :identifier => ENV['GOOGLE_AUTH_URL']
+      app.use ::OmniAuth::Builder do
+        provider :google_apps, domain: ENV['GOOGLE_AUTH_DOMAIN']
+      end
+
       app.set :absolute_redirect, false
 
       app.get "/auth/:provider/callback" do

data/sinatra-google-auth.gemspec

@@ -15,5 +15,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Sinatra::GoogleAuth::VERSION
 
-  gem.add_dependency 'omniauth-openid'
+  gem.add_dependency 'omniauth-google-apps'
+  gem.add_dependency 'oa-openid'
 end

data/test/classic_sytle.rb

@@ -0,0 +1,9 @@
+require 'bundler'
+
+require 'sinatra'
+require 'sinatra/google-auth'
+
+get '*' do
+  authenticate
+  'hello'
+end

data/test/classic_sytle.ru

@@ -0,0 +1,9 @@
+require 'bundler'
+
+require 'sinatra'
+require 'sinatra/google-auth'
+
+get '*' do
+  authenticate
+  'hello'
+end

data/test/modular_middleware.ru

@@ -0,0 +1,15 @@
+require 'bundler'
+
+require 'sinatra/base'
+require 'sinatra/google-auth'
+
+class App < Sinatra::Base
+  register Sinatra::GoogleAuth
+  use Sinatra::GoogleAuth::Middleware
+
+  get '*' do
+    'hello'
+  end
+end
+
+run App

data/test/user_test.ru

@@ -0,0 +1,19 @@
+require 'bundler'
+
+require 'sinatra'
+require 'sinatra/google-auth'
+
+class App < Sinatra::Base
+  register Sinatra::GoogleAuth
+
+  def on_user(info)
+    puts info.inspect
+  end
+
+  get '*' do
+    authenticate
+    'hello'
+  end
+end
+
+run App

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-google-auth
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-13 00:00:00.000000000Z
+date: 2012-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: omniauth-openid
-  requirement: &70306476335880 !ruby/object:Gem::Requirement
+  name: omniauth-google-apps
+  requirement: &70101722473520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,18 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70306476335880
+  version_requirements: *70101722473520
+- !ruby/object:Gem::Dependency
+  name: oa-openid
+  requirement: &70101722472800 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70101722472800
 description: Drop-in google auth for sinatra apps
 email:
 - christopher.continanza@gmail.com
@@ -38,6 +49,10 @@ files:
 - lib/sinatra/google-auth.rb
 - lib/sinatra/google-auth/version.rb
 - sinatra-google-auth.gemspec
+- test/classic_sytle.rb
+- test/classic_sytle.ru
+- test/modular_middleware.ru
+- test/user_test.ru
 homepage: ''
 licenses: []
 post_install_message: 
@@ -62,4 +77,8 @@ rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Helpers and routes for google open-id authentication for Sinatra.
-test_files: []
+test_files:
+- test/classic_sytle.rb
+- test/classic_sytle.ru
+- test/modular_middleware.ru
+- test/user_test.ru