RubyGems - sinatra_auth_github - Versions diffs - 0.0.16 → 0.1.0 - Mend

sinatra_auth_github 0.0.16 → 0.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

data/.gitignore +2 -0
data/lib/sinatra/auth/github.rb +54 -13
data/lib/sinatra/auth/views/401.html +10 -0
data/lib/sinatra/auth/views/securocat.png +0 -0
data/sinatra_auth_github.gemspec +2 -2
data/spec/app.rb +9 -23
metadata +9 -7

data/.gitignore CHANGED Viewed

@@ -3,3 +3,5 @@ coverage
 pkg
 .DS_Store
 Gemfile.lock
+*.gem
+vendor

data/lib/sinatra/auth/github.rb CHANGED Viewed

@@ -5,12 +5,18 @@ require 'rest_client'
 module Sinatra
   module Auth
     module Github
-      VERSION = "0.0.14"
+      VERSION = "0.1.0"
       class BadAuthentication < Sinatra::Base
+        helpers do
+          def unauthorized_template
+            @unauthenticated_template ||= File.read(File.join(File.dirname(__FILE__), "views", "401.html"))
+          end
+        end
         get '/unauthenticated' do
           status 403
-          "Unable to authenticate, sorry bud."
+          unauthorized_template
         end
       end
@@ -35,22 +41,53 @@ module Sinatra
           warden.user
         end
-        # API Requests
+        # Send a V3 API GET request to path
+        #
+        # path - the path on api.github.com to hit
+        #
+        # Returns a rest client response object
+        #
+        # Examples
+        #   github_raw_request("/user")
+        #   # => RestClient::Response
+        def github_raw_request(path)
+          RestClient.get("https://api.github.com/#{path}", :params => { :access_token => github_user.token }, :accept => :json)
+        end
+        # Send a V3 API GET request to path and JSON parse the response body
+        #
+        # path - the path on api.github.com to hit
+        #
+        # Returns a parsed JSON response
+        #
+        # Examples
+        #   github_raw_request("/user")
+        #   # => { 'login' => 'atmos', ... }
         def github_request(path)
-          response = RestClient.get "https://github.com/api/v2/json/#{path}", :params => { :access_token => github_user.token }, :accept => :json
-          JSON.parse(response.body)
+          JSON.parse(github_raw_request(path))
         end
-        # Access Inquiries
+        # See if the user is a member of the named organization
+        #
+        # name - the organization name
+        #
+        # Returns: true if the uesr has access, false otherwise
         def github_organization_access?(name)
-          orgs = github_request("user/show/#{github_user.login}/organizations")["organizations"]
-          orgs.map { |org| org["login"] }.include?(name)
+          orgs = github_request("orgs/#{name}/members")
+          orgs.map { |org| org["login"] }.include?(github_user.login)
+        rescue RestClient::Unauthorized, RestClient::ResourceNotFound => e
+          false
         end
-        def github_organization_team_access?(name, team)
-          members = github_request("teams/#{team}/members")["users"]
+        # See if the user is a member of the team id
+        #
+        # team_id - the team's id
+        #
+        # Returns: true if the uesr has access, false otherwise
+        def github_team_access?(team_id)
+          members = github_request("teams/#{team_id}/members")
           members.map { |user| user["login"] }.include?(github_user.login)
-        rescue RestClient::Unauthorized => e
+        rescue RestClient::Unauthorized, RestClient::ResourceNotFound => e
           false
         end
@@ -60,9 +97,9 @@ module Sinatra
           halt([401, "Unauthorized User"]) unless github_organization_access?(name)
         end
-        def github_organization_team_authenticate!(name, team)
+        def github_team_authenticate!(team_id)
           authenticate!
-          halt([401, "Unauthorized User"]) unless github_organization_team_access?(name, team)
+          halt([401, "Unauthorized User"]) unless github_team_access?(team_id)
         end
         def _relative_url_for(path)
@@ -89,6 +126,10 @@ module Sinatra
           authenticate!
           redirect _relative_url_for('/')
         end
+        app.get '/_images/securocat.png' do
+          send_file(File.join(File.dirname(__FILE__), "views", "securocat.png"))
+        end
       end
     end
   end

data/lib/sinatra/auth/views/401.html ADDED Viewed

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8" />
+  <title>Denied</title>
+</head>
+<body>
+  <center><img src="/_images/securocat.png" /></center>
+</body>
+</html>

data/lib/sinatra/auth/views/securocat.png ADDED Viewed

Binary file

data/sinatra_auth_github.gemspec CHANGED Viewed

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 Gem::Specification.new do |s|
   s.name        = "sinatra_auth_github"
-  s.version     = "0.0.16"
+  s.version     = "0.1.0"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Corey Donohoe"]
   s.email       = ["atmos@atmos.org"]
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.add_dependency "sinatra",       "~>1.0"
   s.add_dependency "rest-client",   "~>1.6.1"
-  s.add_dependency "warden-github", "~>0.0.9"
+  s.add_dependency "warden-github", "~>0.1.0"
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec",     "~>1.3.0"

data/spec/app.rb CHANGED Viewed

@@ -4,31 +4,17 @@ module Example
   class App < Sinatra::Base
     enable :sessions
-    set  :github_options, {
-                            # GitHub Provided secrets
-                            :secret       => ENV['GITHUB_CLIENT_SECRET'],
-                            :client_id    => ENV['GITHUB_CLIENT_ID'],
-                            # How much info you need about the user
-                            :scopes       => 'user,offline_access,repo',
-                            # restrict access to a members of organization named
-                            :organization => "github",
-                            # restrict access to specific team on an organization
-                            :team         => nil # || 42
-                           }
+    set :github_options, {
+                            :secret    => ENV['GITHUB_CLIENT_SECRET'],
+                            :client_id => ENV['GITHUB_CLIENT_ID'],
+                            :scopes    => 'user,offline_access,repo' # repo is need for org auth :\
+                          }
     register Sinatra::Auth::Github
-    before do
-      # authenticate!
-      # halt([401, "Unauthorized User"]) unless github_organization_member?
-    end
     helpers do
       def repos
-        github_request("repos/show/#{github_user.login}")
+        github_request("user/repos")
       end
     end
@@ -42,9 +28,9 @@ module Example
       "Hello There, #{github_user.name}! You have access to the #{params['id']} organization."
     end
-    get '/orgs/:org_id/team/:id' do
-      github_organization_team_authenticate!(params['org_id'], params['id'])
-      "Hello There, #{github_user.name}! You have access to the #{params['id']} team under the #{params['org_id']} organization."
+    get '/teams/:id' do
+      github_team_authenticate!(params['id'])
+      "Hello There, #{github_user.name}! You have access to the #{params['id']} team."
     end
     get '/logout' do

metadata CHANGED Viewed

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: sinatra_auth_github
 version: !ruby/object:Gem::Version
-  hash: 63
+  hash: 27
   prerelease:
   segments:
   - 0
+  - 1
   - 0
-  - 16
-  version: 0.0.16
+  version: 0.1.0
 platform: ruby
 authors:
 - Corey Donohoe
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-05-16 00:00:00 -07:00
+date: 2011-06-22 00:00:00 -07:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -57,12 +57,12 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        hash: 13
+        hash: 27
         segments:
         - 0
+        - 1
         - 0
-        - 9
-        version: 0.0.9
+        version: 0.1.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency
@@ -187,6 +187,8 @@ files:
 - Rakefile
 - config.ru
 - lib/sinatra/auth/github.rb
+- lib/sinatra/auth/views/401.html
+- lib/sinatra/auth/views/securocat.png
 - lib/sinatra_auth_github.rb
 - sinatra_auth_github.gemspec
 - spec/app.rb