sinatra_auth_github 0.13.3 → 0.14.0

data/.gitignore

@@ -5,3 +5,4 @@ pkg
 Gemfile.lock
 *.gem
 vendor
+.ruby-version

data/README.md

@@ -28,11 +28,11 @@ There's an example app in [spec/app.rb](/spec/app.rb).
 Example App Functionality
 =========================
 
-You can simply authenticate via GitHub by hitting http://localhost:9292
+You can simply authenticate via GitHub by hitting http://localhost:9393
 
-You can check organization membership by hitting http://localhost:9292/orgs/github
+You can check organization membership by hitting http://localhost:9393/orgs/github
 
-You can check team membership by hitting http://localhost:9292/teams/42
+You can check team membership by hitting http://localhost:9393/teams/42
 
 All unsuccessful authentication requests get sent to the securocat denied page.
 
@@ -56,4 +56,11 @@ Extension Options
 * `:client_id`    - The client id that GitHub provides
 * `:failure_app`  - A Sinatra::Base class that has a route for `/unauthenticated`, Useful for overriding the securocat default page.
 * `:callback_url` - The path that GitHub posts back to, defaults to `/auth/github/callback`.
-* `:oauth_domain` - The scheme and host that's GitHub's endpoint, defaults to `https://github.com`
+
+Enterprise Authentication
+=========================
+
+Under the hood, the `warden-github` portion is powered by octokit.  If you find yourself wanting to connect to a GitHub Enterprise installation you'll need to export two environmental variables.
+
+* OCTOKIT_WEB_ENDPOINT - The web endpoint for OAuth, defaults to https://github.com
+* OCTOKIT_API_ENDPOINT - The API endpoint for authenticated requests, defaults to https://api.github.com

data/Rakefile

@@ -1,19 +1,12 @@
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 require 'rubygems/specification'
 require 'date'
-require 'bundler/setup'
+require 'bundler'
 
 task :default => [:spec]
 
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 desc "Run specs"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.spec_opts = %w(-fs --color)
-  t.spec_opts << '--loadby' << 'random'
-
-  t.rcov_opts << '--exclude' << 'spec,.bundle'
-  t.rcov = ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true
-  t.rcov_opts << '--text-summary'
-  t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
+RSpec::Core::RakeTask.new do |t|
+  t.pattern = 'spec/**/*_spec.rb'
 end

data/lib/sinatra/auth/github/test/test_helper.rb

@@ -18,7 +18,8 @@ module Sinatra
                  'name'    => "Test User",
                  'email'   => "test@example.com",
                  'company' => "GitHub",
-                 'gravatar_id' => 'https://a249.e.akamai.net/assets.github.com/images/gravatars/gravatar-140.png'
+                 'gravatar_id' => 'a'*32,
+                 'avatar_url'  => 'https://a249.e.akamai.net/assets.github.com/images/gravatars/gravatar-140.png?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-user-420.png'
               }
               default_attrs.merge! attrs
               User.new(default_attrs)

data/lib/sinatra/auth/github/version.rb

@@ -1,7 +1,7 @@
 module Sinatra
   module Auth
     module Github
-      VERSION = "0.13.3"
+      VERSION = "0.14.0"
     end
   end
 end

data/lib/sinatra/auth/github.rb

@@ -146,16 +146,17 @@ module Sinatra
 
       def self.registered(app)
         app.use AccessDenied
+        app.use BadAuthentication
+
         app.use Warden::Manager do |manager|
           manager.default_strategies :github
 
-          manager.failure_app           = app.github_options[:failure_app] || BadAuthentication
+          manager.failure_app     = app.github_options[:failure_app] || BadAuthentication
 
-          manager[:github_secret]       = app.github_options[:secret]       || ENV['GITHUB_CLIENT_SECRET']
-          manager[:github_scopes]       = app.github_options[:scopes]       || ''
-          manager[:github_client_id]    = app.github_options[:client_id]    || ENV['GITHUB_CLIENT_ID']
-          manager[:github_oauth_domain] = app.github_options[:oauth_domain] || ENV['GITHUB_OAUTH_DOMAIN'] || 'https://github.com'
-          manager[:github_callback_url] = app.github_options[:callback_url] || '/auth/github/callback'
+          manager[:client_secret] = app.github_options[:secret]       || ENV['GITHUB_CLIENT_SECRET']
+          manager[:scopes]        = app.github_options[:scopes]       || ''
+          manager[:client_id]     = app.github_options[:client_id]    || ENV['GITHUB_CLIENT_ID']
+          manager[:redirect_uri]  = app.github_options[:callback_url] || '/auth/github/callback'
         end
 
         app.helpers Helpers

data/sinatra_auth_github.gemspec

@@ -15,14 +15,13 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "sinatra_auth_github"
 
   s.add_dependency "sinatra",       "~>1.0"
-  s.add_dependency "warden-github", "~>0.13.1"
+  s.add_dependency "warden-github", "~>0.14.0"
 
   s.add_development_dependency "rake"
-  s.add_development_dependency "rspec",     "~>2.0.0"
+  s.add_development_dependency "rspec",     "~>2.4.0"
   s.add_development_dependency "shotgun"
   s.add_development_dependency "randexp",   "~>0.1.5"
   s.add_development_dependency "rack-test", "~>0.5.3"
-  s.add_development_dependency "debugger"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/app.rb

@@ -1,5 +1,4 @@
 require 'pp'
-require 'debugger'
 
 module Example
   class App < Sinatra::Base

data/spec/login_spec.rb

@@ -22,4 +22,10 @@ describe "Logged in users" do
     last_response.status.should eql(302)
     last_response.headers['Location'].should =~ %r{^https://github\.com/login/oauth/authorize}
   end
+
+  it "shows the securocat when github returns an oauth error" do
+    get "/auth/github/callback?error=redirect_uri_mismatch"
+    follow_redirect!
+    last_response.body.should =~ %r{securocat\.png}
+  end
 end

data/spec/quality_spec.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
 describe "The library itself" do
-  Rspec::Matchers.define :have_no_tab_characters do
+  RSpec::Matchers.define :have_no_tab_characters do
     match do |filename|
       @failing_lines = []
       File.readlines(filename).each_with_index do |line,number|
@@ -15,7 +15,7 @@ describe "The library itself" do
     end
   end
 
-  Rspec::Matchers.define :have_no_extraneous_spaces do
+  RSpec::Matchers.define :have_no_extraneous_spaces do
     match do |filename|
       @failing_lines = []
       File.readlines(filename).each_with_index do |line,number|

data/spec/spec_helper.rb

@@ -3,9 +3,6 @@ require "bundler/setup"
 $:.push File.join(File.dirname(__FILE__), '..', 'lib')
 
 require 'pp'
-require 'rack/test'
-require 'ruby-debug'
-
 require 'rack/test'
 
 require 'sinatra/auth/github'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra_auth_github
 version: !ruby/object:Gem::Version
-  version: 0.13.3
+  version: 0.14.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-19 00:00:00.000000000 Z
+date: 2013-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: shotgun
   requirement: !ruby/object:Gem::Requirement
@@ -123,22 +123,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.3
-- !ruby/object:Gem::Dependency
-  name: debugger
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: A sinatra extension for easy oauth integration with github
 email:
 - atmos@atmos.org