warden-github 0.12.0 → 0.12.1

data/README.md

@@ -7,6 +7,11 @@ To test it out on localhost set your callback url to 'http://localhost:9292/auth
 
 There's an example app in [spec/app.rb](/atmos/warden-github/blob/master/spec/app.rb).
 
+Using with GitHub Enterprise
+============================
+
+Export the `OCTOKIT_API_ENDPOINT` environmental variable to the URL of your enterprise install.
+
 The Extension in Action
 =======================
     % gem install bundler

data/config.ru

@@ -9,7 +9,7 @@ rescue LoadError
 end
 
 Bundler.require(:runtime, :test)
-#require "debugger"
+require "ruby-debug"
 
 $LOAD_PATH << File.dirname(__FILE__) + '/lib'
 require File.expand_path(File.join(File.dirname(__FILE__), 'lib', 'warden-github'))

data/lib/warden-github/strategy.rb

@@ -54,7 +54,7 @@ Warden::Strategies.add(:github) do
   end
 
   def user_info_for(token)
-    @user_info ||= RestClient.get("https://api.github.com/user", :params => {:access_token => token})
+    @user_info ||= RestClient.get(github_api_uri + "/user", :params => {:access_token => token})
   end
 
   def callback_url
@@ -72,4 +72,12 @@ Warden::Strategies.add(:github) do
     proto = "http" if proto.nil?
     "#{proto}://#{request.host}#{port_part}#{suffix}"
   end
+
+  def github_api_uri
+    if ENV['OCTOKIT_API_ENDPOINT']
+      ENV['OCTOKIT_API_ENDPOINT']
+    else
+      "https://api.github.com"
+    end
+  end
 end

data/lib/warden-github/version.rb

@@ -1,5 +1,5 @@
 module Warden
   module Github
-    VERSION = "0.12.0"
+    VERSION = "0.12.1"
   end
 end

data/spec/app.rb

@@ -13,7 +13,7 @@ module Example
       manager[:github_client_id]    = ENV['GITHUB_CLIENT_ID']     || 'ee9aa24b64d82c21535a'
       manager[:github_secret]       = ENV['GITHUB_CLIENT_SECRET'] || 'ed8ff0c54067aefb808dab1ca265865405d08d6f'
 
-      manager[:github_scopes]       = 'repo'
+      manager[:github_scopes]       = ''
       manager[:github_oauth_domain] = ENV['GITHUB_OAUTH_DOMAIN'] || 'https://github.com'
       manager[:github_callback_url] = '/auth/github/callback'
     end
@@ -34,9 +34,9 @@ module Example
       ensure_authenticated
       <<-EOS
       <h2>Hello There, #{user.name}!</h2>
-      <h3>Rails Org Member: #{user.organization_member?('github')}.</h3>
-      <h3>Publicized Rails Org Member: #{user.publicized_organization_member?('github')}.</h3>
-      <h3>Rails Committer Team Member: #{user.team_member?(135235)}.</h3>
+      <h3>Rails Org Member: #{user.organization_member?('rails')}.</h3>
+      <h3>Publicized Rails Org Member: #{user.publicized_organization_member?('rails')}.</h3>
+      <h3>Rails Committer Team Member: #{user.team_member?(632)}.</h3>
       EOS
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: warden-github
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 45
   prerelease: 
   segments: 
   - 0
   - 12
-  - 0
-  version: 0.12.0
+  - 1
+  version: 0.12.1
 platform: ruby
 authors: 
 - Corey Donohoe
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-30 00:00:00 -08:00
+date: 2013-01-28 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency