warden-github 0.4.4 → 0.5.0

data/lib/warden-github/user.rb

@@ -1,3 +1,6 @@
+require 'yajl'
+require 'rest-client'
+
 module Warden
   module Github
     module Oauth
@@ -28,7 +31,7 @@ module Warden
         #
         # Returns: true if the user is publicized as an org member
         def publicized_organization_member?(org_name)
-          members = github_request("orgs/#{name}/public_members")
+          members = github_request("orgs/#{org_name}/public_members")
           members.map { |org| org["login"] }.include?(login)
         rescue RestClient::Forbidden, RestClient::Unauthorized, RestClient::ResourceNotFound => e
           false
@@ -39,9 +42,9 @@ module Warden
         # name - the organization name
         #
         # Returns: true if the user has access, false otherwise
-        def organization_member?(name)
-          orgs = github_request("orgs/#{name}/members")
-          orgs.map { |org| org["login"] }.include?(github_user.login)
+        def organization_member?(org_name)
+          orgs = github_request("orgs/#{org_name}/members")
+          orgs.map { |org| org["login"] }.include?(login)
         rescue RestClient::Forbidden, RestClient::Unauthorized, RestClient::ResourceNotFound => e
           false
         end
@@ -83,6 +86,15 @@ module Warden
         def github_raw_request(path)
           RestClient.get("#{github_api_uri}/#{path}", :params => { :access_token => token }, :accept => :json)
         end
+
+        private
+        def github_api_uri
+          if ENV['GITHUB_OAUTH_API_DOMAIN']
+            ENV['GITHUB_OAUTH_API_DOMAIN']
+          else
+            "https://api.github.com"
+          end
+        end
       end
     end
   end

data/lib/warden-github/version.rb

@@ -1,5 +1,5 @@
 module Warden
   module Github
-    VERSION = "0.4.4"
+    VERSION = "0.5.0"
   end
 end

data/spec/app.rb

@@ -32,7 +32,12 @@ module Example
 
     get '/' do
       ensure_authenticated
-      "Hello There, #{user.name}!"
+      <<-EOS
+      <h2>Hello There, #{user.name}!</h2>
+      <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
 
     get '/redirect_to' do

data/warden-github.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |s|
   s.add_dependency "json",   "~>1.5"
   s.add_dependency "warden", "~>1.0"
   s.add_dependency "oauth2", "~>0.5.2"
+  s.add_dependency "rest-client", "~>1.6.1"
+  s.add_dependency "yajl-ruby",     "~>1.1"
 
   s.add_development_dependency "rack",      "~>1.4.0"
   s.add_development_dependency "rake"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: warden-github
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 11
   prerelease: 
   segments: 
   - 0
-  - 4
-  - 4
-  version: 0.4.4
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Corey Donohoe
@@ -65,9 +65,40 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rack
+  name: rest-client
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 6
+        - 1
+        version: 1.6.1
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: yajl-ruby
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 1
+        version: "1.1"
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rack
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -79,11 +110,11 @@ dependencies:
         - 0
         version: 1.4.0
   type: :development
-  version_requirements: *id004
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -93,11 +124,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -109,11 +140,11 @@ dependencies:
         - 0
         version: 2.8.0
   type: :development
-  version_requirements: *id006
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: webrat
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -123,11 +154,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id007
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: sinatra
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -137,11 +168,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id008
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: shotgun
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -151,11 +182,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id009
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: addressable
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -167,11 +198,11 @@ dependencies:
         - 0
         version: 2.2.0
   type: :development
-  version_requirements: *id010
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: rack-test
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -183,7 +214,7 @@ dependencies:
         - 3
         version: 0.5.3
   type: :development
-  version_requirements: *id011
+  version_requirements: *id013
 description: A warden strategy for easy oauth integration with github
 email: 
 - atmos@atmos.org