warden-github 0.14.0 → 1.0.0

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+v1.0.0 2013/09/03
+-----------------
+
+* Explicitly require Octokit 2.1.1
+* Fixups for moving to octokit 2.1.1

data/lib/warden/github/oauth.rb

@@ -59,7 +59,7 @@ module Warden
       end
 
       def build_uri(path, params)
-        URI(Octokit::Configuration::DEFAULT_WEB_ENDPOINT).tap do |uri|
+        URI(Octokit.web_endpoint).tap do |uri|
           uri.path = path
           uri.query = encode_params(normalize_params(params))
         end

data/lib/warden/github/user.rb

@@ -6,8 +6,12 @@ module Warden
       ATTRIBUTES = %w[id login name gravatar_id email company site_admin].freeze
 
       def self.load(access_token)
-        api = Octokit::Client.new(:oauth_token => access_token)
-        data = Hash[api.user.to_hash.select { |k,_| ATTRIBUTES.include?(k) }]
+        api  = Octokit::Client.new(:access_token => access_token)
+        data =  { }
+
+        api.user.to_hash.each do |k,v|
+          data[k.to_s] = v if ATTRIBUTES.include?(k.to_s)
+        end
 
         new(data, access_token)
       end
@@ -55,40 +59,27 @@ module Warden
       #
       # Returns: true if the user has access, false otherwise
       def team_member?(team_id)
-        memberships.fetch_membership(:team, team_id) do
-          # TODO: Use next line as method body once pengwynn/octokit#206 is public.
-          # api.team_member?(team_id, login)
-
-          begin
-            # A user is only able to query for team members if they're a member.
-            # Thus, if querying does succeed, they will be in the list and
-            # checking the list won't be necessary.
-            api.team_members(team_id)
-            true
-          rescue Octokit::NotFound
-            false
-          end
-        end
+        api.team_member?(team_id, login)
       end
 
       # Identify GitHub employees/staff members.
       #
       # Returns: true if the authenticated user is a GitHub employee, false otherwise
       def site_admin?
-        site_admin || false
+        !!site_admin
       end
 
       # Access the GitHub API from Octokit
       #
       # Octokit is a robust client library for the GitHub API
-      # https://github.com/pengwynn/octokit
+      # https://github.com/octokit/octokit.rb
       #
       # Returns a cached client object for easy use
       def api
         # Don't cache instance for now because of a ruby marshaling bug present
         # in MRI 1.9.3 (Bug #7627) that causes instance variables to be
         # marshaled even when explicitly specifying #marshal_dump.
-        Octokit::Client.new(:login => login, :oauth_token => token)
+        Octokit::Client.new(:login => login, :access_token => token)
       end
 
       private

data/lib/warden/github/version.rb

@@ -1,5 +1,5 @@
 module Warden
   module GitHub
-    VERSION = "0.14.0"
+    VERSION = "1.0.0"
   end
 end

data/spec/unit/config_spec.rb

@@ -4,7 +4,7 @@ describe Warden::GitHub::Config do
   let(:warden_scope) { :test_scope }
 
   let(:env) do
-    { 'warden' => stub(:config => warden_config) }
+    { 'warden' => double(:config => warden_config) }
   end
 
   let(:warden_config) do
@@ -16,7 +16,7 @@ describe Warden::GitHub::Config do
   end
 
   let(:request) do
-    stub(:url => 'http://example.com/the/path', :path => '/the/path')
+    double(:url => 'http://example.com/the/path', :path => '/the/path')
   end
 
   subject(:config) do

data/spec/unit/oauth_spec.rb

@@ -15,7 +15,7 @@ describe Warden::GitHub::OAuth do
   describe '#authorize_uri' do
     it 'contains the base uri' do
       oauth.authorize_uri.to_s.should \
-        include Octokit::Configuration::DEFAULT_WEB_ENDPOINT
+        include Octokit.web_endpoint
     end
 
     %w[ client_id state redirect_uri ].each do |name|

data/spec/unit/user_spec.rb

@@ -34,7 +34,7 @@ describe Warden::GitHub::User do
 
       api.should be_an Octokit::Client
       api.login.should eq user.login
-      api.oauth_token.should eq user.token
+      api.access_token.should eq user.token
     end
   end
 
@@ -65,11 +65,10 @@ describe Warden::GitHub::User do
   describe '#team_member?' do
     context 'when user is not member' do
       it 'returns false' do
-        api = double
+        api = double()
         user.stub(:api => api)
 
-        # api.stub(:team_member?, [123, user.login]).and_raise(Octokit::NotFound.new({}))
-        api.stub(:team_members, [123]).and_raise(Octokit::NotFound.new({}))
+        api.stub(:team_member?).with(123, user.login).and_return(false)
 
         user.should_not be_team_member(123)
       end
@@ -77,10 +76,9 @@ describe Warden::GitHub::User do
 
     context 'when user is member' do
       it 'returns true' do
-        api = double
+        api = double()
         user.stub(:api => api)
-        # api.stub(:team_member?, [123, user.login])
-        api.stub(:team_members, [123])
+        api.stub(:team_member?).with(123, user.login).and_return(true)
 
         user.should be_team_member(123)
       end
@@ -94,7 +92,7 @@ describe Warden::GitHub::User do
 
       Octokit::Client.
         should_receive(:new).
-        with(:oauth_token => token).
+        with(:access_token => token).
         and_return(client)
       client.should_receive(:user).and_return(attrs)
 

data/warden-github.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "warden-github"
 
   s.add_dependency "warden",    ">1.0"
-  s.add_dependency "octokit",   ">=1.22.0"
+  s.add_dependency "octokit",   ">2.1.0"
 
   s.add_development_dependency "rack",      "~>1.4.1"
   s.add_development_dependency "rake"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: warden-github
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-25 00:00:00.000000000 Z
+date: 2013-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: warden
@@ -32,17 +32,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ! '>'
       - !ruby/object:Gem::Version
-        version: 1.22.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ! '>'
       - !ruby/object:Gem::Version
-        version: 1.22.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -213,6 +213,7 @@ files:
 - .gitignore
 - .rspec
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENSE.md
 - README.md