sinatra-google-auth 1.1.0 → 1.2.0

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+vendor

data/Gemfile

@@ -3,6 +3,10 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in sinatra-google-auth.gemspec
 gemspec
 
+gem "ruby-openid",
+  :git => "git://github.com/kendagriff/ruby-openid.git",
+  :ref => "79beaa419d4754e787757f2545331509419e222e"
+
 group :development do
   gem 'turn'
   gem 'sinatra'

data/README.md

@@ -8,6 +8,25 @@ Add this line to your application's Gemfile:
 
     gem 'sinatra-google-auth'
 
+
+### Temporary Workaround
+
+Google has changed their implementation that requires a patch to the `ruby-openid` gem.
+
+See here for discussion:
+https://github.com/openid/ruby-openid/issues/51
+
+For now, you have to add:
+
+    gem "ruby-openid",
+      :git => "git://github.com/kendagriff/ruby-openid.git",
+      :ref => "79beaa419d4754e787757f2545331509419e222e"
+
+To your Gemfile if you're getting an OmniAuth Error
+
+
+### Installation Continued
+
 And then execute:
 
     $ bundle

data/lib/sinatra/google-auth.rb

@@ -52,9 +52,7 @@ module Sinatra
       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::Builder do
-        provider :google_apps, domain: ENV['GOOGLE_AUTH_DOMAIN']
-      end
+      app.use OmniAuth::Strategies::GoogleApps, :domain => ENV['GOOGLE_AUTH_DOMAIN'], :store => nil
 
       app.set :absolute_redirect, false
 

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

@@ -1,5 +1,5 @@
 module Sinatra
   module GoogleAuth
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
   end
 end

data/sinatra-google-auth.gemspec

@@ -16,5 +16,5 @@ Gem::Specification.new do |gem|
   gem.version       = Sinatra::GoogleAuth::VERSION
 
   gem.add_dependency 'omniauth-google-apps'
-  gem.add_dependency 'oa-openid'
+  gem.add_dependency 'ruby-openid'
 end

data/test/routed_middleware.ru

@@ -0,0 +1,22 @@
+require 'bundler'
+
+require 'sinatra/base'
+require 'sinatra/google-auth'
+
+class Admin < Sinatra::Base
+  register Sinatra::GoogleAuth
+  use Sinatra::GoogleAuth::Middleware
+
+  get '*' do
+    'welcome to the admin section'
+  end
+end
+
+class App < Sinatra::Base
+  get '/' do
+    "Public facing part"
+  end
+end
+
+map("/") { run App }
+map("/admin") { run Admin }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-google-auth
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-06 00:00:00.000000000 Z
+date: 2013-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-google-apps
@@ -28,7 +28,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: oa-openid
+  name: ruby-openid
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -62,6 +62,7 @@ files:
 - test/classic_sytle.rb
 - test/classic_sytle.ru
 - test/modular_middleware.ru
+- test/routed_middleware.ru
 - test/user_test.ru
 homepage: ''
 licenses: []
@@ -77,7 +78,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2097094025027831867
+      hash: -2083577921601217896
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -86,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2097094025027831867
+      hash: -2083577921601217896
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -97,4 +98,5 @@ test_files:
 - test/classic_sytle.rb
 - test/classic_sytle.ru
 - test/modular_middleware.ru
+- test/routed_middleware.ru
 - test/user_test.ru