heroku-bouncer 0.2.0 → 0.2.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0404185bf3da1eecc4a7e9009a715c2adb5a220e
+  data.tar.gz: dc7d6fb8e45947c9d58419d7b0d7d446bd1cdc6c
+SHA512:
+  metadata.gz: 9f464a678eebff16cd70e25991fd75bab614f3985e1bbf4ce82adef7524f6a7c16c33ab71495935eb22982a08f25c0f5b7563af4fc628807a40263a28669df4c
+  data.tar.gz: 2f2e046e1259375465c2048466f7a2bd0c5f6e6ce4069b13e43cb476da6db00d33ce6fd36e62354376556342e48fcb20508c55357145a010365c37160e24494b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    heroku-bouncer (0.1.0)
+    heroku-bouncer (0.2.1)
       faraday (~> 0.8)
       multi_json (~> 1.0)
       omniauth-heroku (>= 0.1.0)
@@ -10,13 +10,13 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    faraday (0.8.6)
+    faraday (0.8.7)
       multipart-post (~> 1.1)
-    hashie (1.2.0)
+    hashie (2.0.5)
     httpauth (0.2.0)
-    jwt (0.1.7)
+    jwt (0.1.8)
       multi_json (>= 1.5)
-    multi_json (1.6.1)
+    multi_json (1.7.7)
     multipart-post (1.2.0)
     oauth2 (0.8.1)
       faraday (~> 0.8)
@@ -24,8 +24,8 @@ GEM
       jwt (~> 0.1.4)
       multi_json (~> 1.0)
       rack (~> 1.2)
-    omniauth (1.1.3)
-      hashie (~> 1.2)
+    omniauth (1.1.4)
+      hashie (>= 1.2, < 3)
       rack
     omniauth-heroku (0.1.1)
       omniauth (~> 1.0)
@@ -36,11 +36,11 @@ GEM
     rack (1.5.2)
     rack-protection (1.5.0)
       rack
-    sinatra (1.3.5)
+    sinatra (1.4.3)
       rack (~> 1.4)
-      rack-protection (~> 1.3)
-      tilt (~> 1.3, >= 1.3.3)
-    tilt (1.3.5)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
+    tilt (1.4.1)
 
 PLATFORMS
   ruby

data/README.md

@@ -79,7 +79,9 @@ logging in again.
 
 Don't want to OAuth on every request? Use a middleware to conditionally
 enable this middleware, like
-[`Rack::Builder`](http://rack.rubyforge.org/doc/Rack/Builder.html).
+[Rack::Builder](http://rack.rubyforge.org/doc/Rack/Builder.html).
+Alternatively, [use inheritance to extend the middleware to act any way
+you like](https://gist.github.com/wuputah/5534428).
 
 ## There be dragons
 

data/lib/heroku/bouncer.rb

@@ -55,17 +55,16 @@ class Heroku::Bouncer < Sinatra::Base
   get '/auth/heroku/callback' do
     session[:user] = true
     token = request.env['omniauth.auth']['credentials']['token']
-    store(:token, token) if @expose_token
     if @expose_email || @expose_user || @herokai_only
       user = fetch_user(token)
-      store(:user, user) if @expose_user
-      store(:email, user['email']) if @expose_email
-
       if @herokai_only && !user['email'].end_with?("@heroku.com")
         url = @herokai_only.is_a?(String) ? @herokai_only : 'https://www.heroku.com'
         redirect to(url) and return
       end
+      store(:user, user) if @expose_user
+      store(:email, user['email']) if @expose_email
     end
+    store(:token, token) if @expose_token
     redirect to(session.delete(:return_to) || '/')
   end
 

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: heroku-bouncer
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+  version: 0.2.1
 platform: ruby
 authors:
 - Jonathan Dance
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-14 00:00:00.000000000 Z
+date: 2013-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-heroku
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -90,27 +81,26 @@ files:
 - Rakefile
 homepage: https://github.com/heroku/heroku-bouncer
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Requires Heroku OAuth on all requests.
 test_files:
 - Gemfile