octokit 1.25.0 → 2.0.0.pre

data/lib/octokit/client/{pulls.rb → pull_requests.rb}

@@ -1,17 +1,22 @@
 module Octokit
   class Client
-    module Pulls
+
+    # Methods for the Pull Requests API
+    #
+    # @see http://developer.github.com/v3/pulls/
+    module PullRequests
       # List pull requests for a repository
       #
       # @see http://developer.github.com/v3/pulls/#list-pull-requests
       # @param repo [String, Hash, Repository] A GitHub repository
       # @param options [Hash] Method options
       # @option options [String] :state `open` or `closed`. Default is `open`.
-      # @return [Array<Hashie::Mash>] Array of pulls
+      # @return [Array<Sawyer::Resource>] Array of pulls
       # @example
       #   Octokit.pull_requests('rails/rails')
-      def pull_requests(repo, state='open', options={})
-        get("repos/#{Repository.new(repo)}/pulls", options.merge({:state => state}))
+      def pull_requests(repo, state = nil, options={})
+        options[:state] = state if state
+        get "repos/#{Repository.new(repo)}/pulls", options
       end
       alias :pulls :pull_requests
 
@@ -20,9 +25,9 @@ module Octokit
       # @see http://developer.github.com/v3/pulls/#get-a-single-pull-request
       # @param repo [String, Hash, Repository] A GitHub repository
       # @param number [Integer] Number of the pull request to fetch
-      # @return [Hashie::Mash] Pull request info
+      # @return [Sawyer::Resource] Pull request info
       def pull_request(repo, number, options={})
-        get("repos/#{Repository.new(repo)}/pulls/#{number}", options)
+        get "repos/#{Repository.new(repo)}/pulls/#{number}", options
       end
       alias :pull :pull_request
 
@@ -37,7 +42,7 @@ module Octokit
       # @param head [String] The branch (or git ref) where your changes are implemented.
       # @param title [String] Title for the pull request
       # @param body [String] The body for the pull request. Supports GFM.
-      # @return [Hashie::Mash] The newly created pull request
+      # @return [Sawyer::Resource] The newly created pull request
       def create_pull_request(repo, base, head, title, body, options={})
         pull = {
           :base  => base,
@@ -45,7 +50,7 @@ module Octokit
           :title => title,
           :body  => body,
         }
-        post("repos/#{Repository.new(repo)}/pulls", options.merge(pull))
+        post "repos/#{Repository.new(repo)}/pulls", options.merge(pull)
       end
 
       # Create a pull request from existing issue
@@ -58,24 +63,31 @@ module Octokit
       #                      a merge to a base of another repo.
       # @param head [String] The branch (or git ref) where your changes are implemented.
       # @param issue [Integer] Number of Issue on which to base this pull request
-      # @return [Hashie::Mash] The newly created pull request
+      # @return [Sawyer::Resource] The newly created pull request
       def create_pull_request_for_issue(repo, base, head, issue, options={})
         pull = {
           :base  => base,
           :head  => head,
           :issue => issue
         }
-        post("repos/#{Repository.new(repo)}/pulls", options.merge(pull))
+        post "repos/#{Repository.new(repo)}/pulls", options.merge(pull)
       end
 
       # Update a pull request
-      #
-      # @param repo [String, Hash, Repository] A GitHub repository.
-      # @param id [Integer] Id of pull request to update.
-      # @param title [String] Title for the pull request.
-      # @param body [String] Body content for pull request. Supports GFM.
-      # @param state [String] State of the pull request. `open` or `closed`.
-      # @return [Hashie::Mash] Hash representing updated pull request.
+      # @overload update_pull_request(repo, id, title=nil, body=nil, state=nil, options={})
+      #   @deprecated
+      #   @param repo [String, Hash, Repository] A GitHub repository.
+      #   @param number [Integer] Number of pull request to update.
+      #   @param title [String] Title for the pull request.
+      #   @param body [String] Body content for pull request. Supports GFM.
+      #   @param state [String] State of the pull request. `open` or `closed`.
+      # @overload update_pull_request(repo, id,  options={})
+      #   @param repo [String, Hash, Repository] A GitHub repository.
+      #   @param number [Integer] Number of pull request to update.
+      #   @option options [String] :title Title for the pull request.
+      #   @option options [String] :body Body for the pull request.
+      #   @option options [String] :state State for the pull request.
+      # @return [Sawyer::Resource] Hash representing updated pull request.
       # @see http://developer.github.com/v3/pulls/#update-a-pull-request
       # @example
       #   @client.update_pull_request('pengwynn/octokit', 67, 'new title', 'updated body', 'closed')
@@ -83,25 +95,37 @@ module Octokit
       #   @client.update_pull_request('pengwynn/octokit', 67, nil, nil, 'open')
       # @example Empty body by passing empty string
       #   @client.update_pull_request('pengwynn/octokit', 67, nil, '')
-      def update_pull_request(repo, id, title=nil, body=nil, state=nil, options={})
-        options.merge!({
-          :title => title,
-          :body => body,
-          :state => state
-        })
-        options.reject! { |_, value| value.nil? }
-        patch("repos/#{Repository.new repo}/pulls/#{id}", options)
+      def update_pull_request(*args)
+        arguments = Octokit::Arguments.new(args)
+        repo   = arguments.shift
+        number = arguments.shift
+        title  = arguments.shift
+        body   = arguments.shift
+        state  = arguments.shift
+        patch "repos/#{Repository.new repo}/pulls/#{number}", arguments.options
       end
 
+      # Close a pull request
+      #
+      # @param repo [String, Hash, Repository] A GitHub repository.
+      # @param number [Integer] Number of pull request to update.
+      # @return [Sawyer::Resource] Hash representing updated pull request.
+      # @see http://developer.github.com/v3/pulls/#update-a-pull-request
+      # @example
+      #   @client.close_pull_request('pengwynn/octokit', 67)
+      def close_pull_request(repo, number, options={})
+        options.merge! :state => 'closed'
+        update_pull_request(repo, number, options)
+      end
 
       # List commits on a pull request
       #
       # @see http://developer.github.com/v3/pulls/#list-commits-on-a-pull-request
       # @param repo [String, Hash, Repository] A GitHub repository
       # @param number [Integer] Number of pull request
-      # @return [Array<Hashie::Mash>] List of commits
+      # @return [Array<Sawyer::Resource>] List of commits
       def pull_request_commits(repo, number, options={})
-        get("repos/#{Repository.new(repo)}/pulls/#{number}/commits", options)
+        get "repos/#{Repository.new(repo)}/pulls/#{number}/commits", options
       end
       alias :pull_commits :pull_request_commits
 
@@ -141,10 +165,10 @@ module Octokit
       # @see http://developer.github.com/v3/pulls/#list-comments-on-a-pull-request
       # @param repo [String, Hash, Repository] A GitHub repository
       # @param number [Integer] Number of pull request
-      # @return [Array<Hashie::Mash>] List of comments
+      # @return [Array<Sawyer::Resource>] List of comments
       def pull_request_comments(repo, number, options={})
         # return the comments for a pull request
-        get("repos/#{Repository.new(repo)}/pulls/#{number}/comments", options)
+        get "repos/#{Repository.new(repo)}/pulls/#{number}/comments", options
       end
       alias :pull_comments   :pull_request_comments
       alias :review_comments :pull_request_comments
@@ -153,12 +177,12 @@ module Octokit
       #
       # @param repo [String, Hash, Repository] A GitHub repository
       # @param comment_id [Integer] Id of comment to get
-      # @return [Hashie::Mash] Hash representing the comment
+      # @return [Sawyer::Resource] Hash representing the comment
       # @see http://developer.github.com/v3/pulls/comments/#get-a-single-comment
       # @example
       #   @client.pull_request_comment("pengwynn/octkit", 1903950)
       def pull_request_comment(repo, comment_id, options={})
-        get("repos/#{Repository.new repo}/pulls/comments/#{comment_id}", options)
+        get "repos/#{Repository.new repo}/pulls/comments/#{comment_id}", options
       end
       alias :pull_comment   :pull_request_comment
       alias :review_comment :pull_request_comment
@@ -171,7 +195,7 @@ module Octokit
       # @param commit_id [String] Sha of the commit to comment on.
       # @param path [String] Relative path of the file to comment on.
       # @param position [Integer] Line index in the diff to comment on.
-      # @return [Hashie::Mash] Hash representing the new comment
+      # @return [Sawyer::Resource] Hash representing the new comment
       # @see http://developer.github.com/v3/pulls/comments/#create-a-comment
       # @example
       #   @client.create_pull_request_comment("pengwynn/octokit", 163, ":shipit:",
@@ -183,7 +207,7 @@ module Octokit
           :path => path,
           :position => position
         })
-        post("repos/#{Repository.new repo}/pulls/#{pull_id}/comments", options)
+        post "repos/#{Repository.new repo}/pulls/#{pull_id}/comments", options
       end
       alias :create_pull_comment :create_pull_request_comment
       alias :create_view_comment :create_pull_request_comment
@@ -194,7 +218,7 @@ module Octokit
       # @param pull_id [Integer] Pull request id
       # @param body [String] Comment contents
       # @param comment_id [Integer] Comment id to reply to
-      # @return [Hashie::Mash] Hash representing new comment
+      # @return [Sawyer::Resource] Hash representing new comment
       # @see http://developer.github.com/v3/pulls/comments/#create-a-comment
       # @example
       #   @client.create_pull_request_comment_reply("pengwynn/octokit", 1903950, "done.")
@@ -203,7 +227,7 @@ module Octokit
           :body => body,
           :in_reply_to => comment_id
         })
-        post("repos/#{Repository.new repo}/pulls/#{pull_id}/comments", options)
+        post "repos/#{Repository.new repo}/pulls/#{pull_id}/comments", options
       end
       alias :create_pull_reply   :create_pull_request_comment_reply
       alias :create_review_reply :create_pull_request_comment_reply
@@ -213,7 +237,7 @@ module Octokit
       # @param repo [String, Hash, Repository] A GitHub repository
       # @param comment_id [Integer] Id of the comment to update
       # @param body [String] Updated comment content
-      # @return [Hashie::Mash] Hash representing the updated comment
+      # @return [Sawyer::Resource] Hash representing the updated comment
       # @see http://developer.github.com/v3/pulls/comments/#edit-a-comment
       # @example
       #   @client.update_pull_request_comment("pengwynn/octokit", 1903950, ":shipit:")
@@ -242,9 +266,9 @@ module Octokit
       # @see http://developer.github.com/v3/pulls/#list-files-on-a-pull-request
       # @param repo [String, Hash, Repository] A GitHub repository
       # @param number [Integer] Number of pull request
-      # @return [Array<Hashie::Mash>] List of files
+      # @return [Array<Sawyer::Resource>] List of files
       def pull_request_files(repo, number, options={})
-        get("repos/#{Repository.new(repo)}/pulls/#{number}/files", options)
+        get "repos/#{Repository.new(repo)}/pulls/#{number}/files", options
       end
       alias :pull_files :pull_request_files
 
@@ -254,9 +278,9 @@ module Octokit
       # @param repo [String, Hash, Repository] A GitHub repository
       # @param number [Integer] Number of pull request
       # @param commit_message [String] Optional commit message for the merge commit
-      # @return [Array<Hashie::Mash>] Merge commit info if successful
+      # @return [Array<Sawyer::Resource>] Merge commit info if successful
       def merge_pull_request(repo, number, commit_message='', options={})
-        put("repos/#{Repository.new(repo)}/pulls/#{number}/merge", options.merge({:commit_message => commit_message}))
+        put "repos/#{Repository.new(repo)}/pulls/#{number}/merge", options.merge({:commit_message => commit_message})
       end
 
       # Check pull request merge status
@@ -266,7 +290,7 @@ module Octokit
       # @param number [Integer] Number of pull request
       # @return [Boolean] True if the pull request has been merged
       def pull_merged?(repo, number, options={})
-        boolean_from_response(:get, "repos/#{Repository.new(repo)}/pulls/#{number}/merge", options)
+        boolean_from_response :get, "repos/#{Repository.new(repo)}/pulls/#{number}/merge", options
       end
       alias :pull_request_merged? :pull_merged?
 

data/lib/octokit/client/rate_limit.rb

@@ -1,18 +1,52 @@
 module Octokit
   class Client
+
+    # Methods for API rate limiting info
+    #
+    # @see http://developer.github.com/v3/#rate-limiting
     module RateLimit
 
-      def ratelimit(options={})
-        headers = request(:get, "rate_limit", options).headers
-        return headers["X-RateLimit-Limit"].to_i
+      # Get rate limit info from last response if available
+      # or make a new request to fetch rate limit
+      #
+      # @see http://developer.github.com/v3/#rate-limiting
+      # @return [Octokit::RateLimit] Rate limit info
+      def rate_limit(options={})
+        return rate_limit! if last_response.nil?
+
+        Octokit::RateLimit.from_response(last_response)
+      end
+      alias ratelimit rate_limit
+
+      # Get number of rate limted requests remaining
+      #
+      # @see http://developer.github.com/v3/#rate-limiting
+      # @return [Fixnum] Number of requests remaining in this period
+      def rate_limit_remaining(options={})
+        puts "Deprecated: Please use .rate_limit.remaining"
+        rate_limit.remaining
+      end
+      alias ratelimit_remaining rate_limit_remaining
+
+      # Refresh rate limit info by making a new request
+      #
+      # @see http://developer.github.com/v3/#rate-limiting
+      # @return [Octokit::RateLimit] Rate limit info
+      def rate_limit!(options={})
+        get "rate_limit"
+        Octokit::RateLimit.from_response(last_response)
       end
-      alias rate_limit ratelimit
+      alias ratelimit! rate_limit!
 
-      def ratelimit_remaining(options={})
-        headers = request(:get, "rate_limit", options).headers
-        return headers["X-RateLimit-Remaining"].to_i
+      # Refresh rate limit info and get number of rate limted requests remaining
+      #
+      # @see http://developer.github.com/v3/#rate-limiting
+      # @return [Fixnum] Number of requests remaining in this period
+      def rate_limit_remaining!(options={})
+        puts "Deprecated: Please use .rate_limit!.remaining"
+        rate_limit!.remaining
       end
-      alias rate_limit_remaining ratelimit_remaining
+      alias ratelimit_remaining! rate_limit_remaining!
 
     end
   end

data/lib/octokit/client/refs.rb

@@ -1,17 +1,23 @@
 module Octokit
   class Client
+
+    # Methods for References for Git Data API
+    #
+    # @see http://developer.github.com/v3/git/refs/
     module Refs
 
       # List all refs for a given user and repo
       #
       # @param repo [String, Repository, Hash] A GitHub repository
       # @param namespace [String] The ref namespace, e.g. <tt>tag</tt> or <tt>heads</tt>
-      # @return [Array] A list of references matching the repo and the namespace
+      # @return [Array<Sawyer::Resource>] A list of references matching the repo and the namespace
       # @see http://developer.github.com/v3/git/refs/
       # @example Fetch all refs for sferik/rails_admin
       #   Octokit.refs("sferik/rails_admin")
-      def refs(repo, namespace="", options={})
-        get("repos/#{Repository.new(repo)}/git/refs/#{namespace}", options)
+      def refs(repo, namespace = nil, options={})
+        path = "repos/#{Repository.new(repo)}/git/refs"
+        path += "/#{namespace}" unless namespace.nil?
+        get path, options
       end
       alias :list_refs :refs
       alias :references :refs
@@ -21,12 +27,12 @@ module Octokit
       #
       # @param repo [String, Repository, Hash] A GitHub repository
       # @param ref [String] The ref, e.g. <tt>tags/v0.0.3</tt>
-      # @return [Reference] The reference matching the given repo and the ref id
+      # @return [Sawyer::Resource] The reference matching the given repo and the ref id
       # @see http://developer.github.com/v3/git/refs/
       # @example Fetch tags/v0.0.3 for sferik/rails_admin
       #   Octokit.ref("sferik/rails_admin","tags/v0.0.3")
       def ref(repo, ref, options={})
-        get("repos/#{Repository.new(repo)}/git/refs/#{ref}", options)
+        get "repos/#{Repository.new(repo)}/git/refs/#{ref}", options
       end
       alias :reference :ref
 
@@ -35,7 +41,7 @@ module Octokit
       # @param repo [String, Repository, Hash] A GitHub repository
       # @param ref [String] The ref, e.g. <tt>tags/v0.0.3</tt>
       # @param sha [String] A SHA, e.g. <tt>827efc6d56897b048c772eb4087f854f46256132</tt>
-      # @return [Array] The list of references, already containing the new one
+      # @return [Array<Sawyer::Resource>] The list of references, already containing the new one
       # @see http://developer.github.com/v3/git/refs/
       # @example Create refs/heads/master for octocat/Hello-World with sha 827efc6d56897b048c772eb4087f854f46256132
       #   Octokit.create_ref("octocat/Hello-World","heads/master", "827efc6d56897b048c772eb4087f854f46256132")
@@ -44,7 +50,7 @@ module Octokit
           :ref  => "refs/#{ref}",
           :sha  => sha
         }
-        post("repos/#{Repository.new(repo)}/git/refs", options.merge(parameters))
+        post "repos/#{Repository.new(repo)}/git/refs", options.merge(parameters)
       end
       alias :create_reference :create_ref
 
@@ -54,7 +60,7 @@ module Octokit
       # @param ref [String] The ref, e.g. <tt>tags/v0.0.3</tt>
       # @param sha [String] A SHA, e.g. <tt>827efc6d56897b048c772eb4087f854f46256132</tt>
       # @param force [Boolean] A flag indicating one wants to force the update to make sure the update is a fast-forward update.
-      # @return [Array] The list of references updated
+      # @return [Array<Sawyer::Resource>] The list of references updated
       # @see http://developer.github.com/v3/git/refs/
       # @example Force update heads/sc/featureA for octocat/Hello-World with sha aa218f56b14c9653891f9e74264a383fa43fefbd
       #   Octokit.update_ref("octocat/Hello-World","heads/sc/featureA", "aa218f56b14c9653891f9e74264a383fa43fefbd")
@@ -63,7 +69,7 @@ module Octokit
           :sha  => sha,
           :force => force
         }
-        patch("repos/#{Repository.new(repo)}/git/refs/#{ref}", options.merge(parameters))
+        patch "repos/#{Repository.new(repo)}/git/refs/#{ref}", options.merge(parameters)
       end
       alias :update_reference :update_ref
 
@@ -76,7 +82,7 @@ module Octokit
       # @example Delete tags/v0.0.3 for sferik/rails_admin
       #   Octokit.delete_ref("sferik/rails_admin","tags/v0.0.3")
       def delete_ref(repo, ref, options={})
-        boolean_from_response(:delete, "repos/#{Repository.new(repo)}/git/refs/#{ref}", options)
+        boolean_from_response :delete, "repos/#{Repository.new(repo)}/git/refs/#{ref}", options
       end
       alias :delete_reference :delete_ref
 

data/lib/octokit/client/repositories.rb

@@ -1,16 +1,11 @@
 module Octokit
   class Client
+
+    # Methods for the Repositories API
+    #
+    # @see http://developer.github.com/v3/repos/
     module Repositories
 
-      # Legacy repository search
-      #
-      # @see http://developer.github.com/v3/search/#search-repositories
-      # @param q [String] Search keyword
-      # @return [Array<Hashie::Mash>] List of repositories found
-      def search_repositories(q, options={})
-        get("legacy/repos/search/#{q}", options)['repositories']
-      end
-      alias :search_repos :search_repositories
 
       # Check if a repository exists
       #
@@ -27,7 +22,7 @@ module Octokit
       #
       # @see http://developer.github.com/v3/repos/#get
       # @param repo [String, Hash, Repository] A GitHub repository
-      # @return [Hashie::Mash] Repository information
+      # @return [Sawyer::Resource] Repository information
       def repository(repo, options={})
         get "repos/#{Repository.new repo}", options
       end
@@ -46,9 +41,11 @@ module Octokit
       # @option options [String] :has_wiki `true` enables wiki for this repo, `false` disables wiki.
       # @option options [String] :has_downloads `true` enables downloads for this repo, `false` disables downloads.
       # @option options [String] :default_branch Update the default branch for this repository.
-      # @return [Hashie::Mash] Repository information
+      # @return [Sawyer::Resource] Repository information
       def edit_repository(repo, options={})
-        patch "repos/#{Repository.new repo}", options
+        repo = Repository.new(repo)
+        options[:name] ||= repo.name
+        patch "repos/#{repo}", options
       end
       alias :edit :edit_repository
       alias :update_repository :edit_repository
@@ -61,12 +58,12 @@ module Octokit
       #
       # @see http://developer.github.com/v3/repos/#list-your-repositories
       # @param username [String] Optional username for which to list repos
-      # @return [Array<Hashie::Mash>] List of repositories
+      # @return [Array<Sawyer::Resource>] List of repositories
       def repositories(username=nil, options={})
         if username.nil?
-          get 'user/repos', options
+          paginate 'user/repos', options
         else
-          get "users/#{username}/repos", options
+          paginate "users/#{username}/repos", options
         end
       end
       alias :list_repositories :repositories
@@ -83,10 +80,9 @@ module Octokit
       # @param options [Hash] Optional options
       # @option options [Integer] :since The integer ID of the last Repository
       #   that you’ve seen.
-      #
-      # @return [Array] List of repositories.
+      # @return [Array<Sawyer::Resource>] List of repositories.
       def all_repositories(options={})
-        get 'repositories', options
+        paginate 'repositories', options
       end
 
       # Star a repository
@@ -95,7 +91,7 @@ module Octokit
       # @return [Boolean] `true` if successfully starred
       # @see http://developer.github.com/v3/activity/starring/#star-a-repository
       def star(repo, options={})
-        boolean_from_response(:put, "user/starred/#{Repository.new repo}", options)
+        boolean_from_response :put, "user/starred/#{Repository.new repo}", options
       end
 
       # Unstar a repository
@@ -104,7 +100,7 @@ module Octokit
       # @return [Boolean] `true` if successfully unstarred
       # @see http://developer.github.com/v3/activity/starring/#unstar-a-repository
       def unstar(repo, options={})
-        boolean_from_response(:delete, "user/starred/#{Repository.new repo}", options)
+        boolean_from_response :delete, "user/starred/#{Repository.new repo}", options
       end
 
       # Watch a repository
@@ -114,7 +110,7 @@ module Octokit
       # @deprecated Use #star instead
       # @see http://developer.github.com/v3/activity/watching/#watch-a-repository-legacy
       def watch(repo, options={})
-        boolean_from_response(:put, "user/watched/#{Repository.new repo}", options)
+        boolean_from_response :put, "user/watched/#{Repository.new repo}", options
       end
 
       # Unwatch a repository
@@ -124,13 +120,13 @@ module Octokit
       # @deprecated Use #unstar instead
       # @see http://developer.github.com/v3/activity/watching/#stop-watching-a-repository-legacy
       def unwatch(repo, options={})
-        boolean_from_response(:delete, "user/watched/#{Repository.new repo}", options)
+        boolean_from_response :delete, "user/watched/#{Repository.new repo}", options
       end
 
       # Fork a repository
       #
       # @param repo [String, Hash, Repository] A GitHub repository
-      # @return [Hashie::Mash] Repository info for the new fork
+      # @return [Sawyer::Resource] Repository info for the new fork
       # @see http://developer.github.com/v3/repos/forks/#create-a-fork
       def fork(repo, options={})
         post "repos/#{Repository.new repo}/forks", options
@@ -149,7 +145,7 @@ module Octokit
       # @option options [Integer] :team_id The id of the team that will be granted access to this repository. This is only valid when creating a repo in an organization.
       # @option options [Boolean] :auto_init `true` to create an initial commit with empty README. Default is `false`.
       # @option options [String] :gitignore_template Desired language or platform .gitignore template to apply. Ignored if auto_init parameter is not provided.
-      # @return [Hashie::Mash] Repository info for the new repository
+      # @return [Sawyer::Resource] Repository info for the new repository
       # @see http://developer.github.com/v3/repos/#create
       def create_repository(name, options={})
         organization = options.delete :organization
@@ -172,14 +168,14 @@ module Octokit
       # @param repo [String, Hash, Repository] A GitHub repository
       # @return [Boolean] `true` if repository was deleted
       def delete_repository(repo, options={})
-        boolean_from_response(:delete, "repos/#{Repository.new repo}", options)
+        boolean_from_response :delete, "repos/#{Repository.new repo}", options
       end
       alias :delete_repo :delete_repository
 
       # Hide a public repository
       #
       # @param repo [String, Hash, Repository] A GitHub repository
-      # @return [Hashie::Mash] Updated repository info
+      # @return [Sawyer::Resource] Updated repository info
       def set_private(repo, options={})
         # GitHub Api for setting private updated to use private attr, rather than public
         update_repository repo, options.merge({ :private => true })
@@ -188,7 +184,7 @@ module Octokit
       # Unhide a private repository
       #
       # @param repo [String, Hash, Repository] A GitHub repository
-      # @return [Hashie::Mash] Updated repository info
+      # @return [Sawyer::Resource] Updated repository info
       def set_public(repo, options={})
         # GitHub Api for setting private updated to use private attr, rather than public
         update_repository repo, options.merge({ :private => false })
@@ -197,17 +193,16 @@ module Octokit
       # Get deploy keys on a repo
       #
       # Requires authenticated client.
-      # 
+      #
       # @param repo [String, Hash, Repository] A GitHub repository
-      # @return [Array<Hashie::Mash>] Array of hashes representing deploy keys.
-      # @see Octokit::Client
+      # @return [Array<Sawyer::Resource>] Array of hashes representing deploy keys.
       # @see http://developer.github.com/v3/repos/keys/#get
       # @example
       #   @client.deploy_keys('pengwynn/octokit')
       # @example
       #   @client.list_deploy_keys('pengwynn/octokit')
       def deploy_keys(repo, options={})
-        get "repos/#{Repository.new repo}/keys", options
+        paginate "repos/#{Repository.new repo}/keys", options
       end
       alias :list_deploy_keys :deploy_keys
 
@@ -218,8 +213,7 @@ module Octokit
       # @param repo [String, Hash, Repository] A GitHub repository.
       # @param title [String] Title reference for the deploy key.
       # @param key [String] Public key.
-      # @return [Hashie::Mash] Hash representing newly added key.
-      # @see Octokit::Client
+      # @return [Sawyer::Resource] Hash representing newly added key.
       # @see http://developer.github.com/v3/repos/keys/#create
       # @example
       #    @client.add_deploy_key('pengwynn/octokit', 'Staging server', 'ssh-rsa AAA...')
@@ -234,12 +228,11 @@ module Octokit
       # @param repo [String, Hash, Repository] A GitHub repository.
       # @param id [Integer] Id of the deploy key to remove.
       # @return [Boolean] True if key removed, false otherwise.
-      # @see Octokit::Client
       # @see http://developer.github.com/v3/repos/keys/#delete
       # @example
       #   @client.remove_deploy_key('pengwynn/octokit', 100000)
       def remove_deploy_key(repo, id, options={})
-        boolean_from_response(:delete, "repos/#{Repository.new repo}/keys/#{id}", options)
+        boolean_from_response :delete, "repos/#{Repository.new repo}/keys/#{id}", options
       end
 
       # List collaborators
@@ -247,8 +240,7 @@ module Octokit
       # Requires authenticated client for private repos.
       #
       # @param repo [String, Hash, Repository] A GitHub repository.
-      # @return [Array<Hashie::Mash>] Array of hashes representing collaborating users.
-      # @see Octokit::Client
+      # @return [Array<Sawyer::Resource>] Array of hashes representing collaborating users.
       # @see http://developer.github.com/v3/repos/collaborators/#list
       # @example
       #   Octokit.collaborators('pengwynn/octokit')
@@ -257,7 +249,7 @@ module Octokit
       # @example
       #   @client.collabs('pengwynn/octokit')
       def collaborators(repo, options={})
-        get "repos/#{Repository.new repo}/collaborators", options
+        paginate "repos/#{Repository.new repo}/collaborators", options
       end
       alias :collabs :collaborators
 
@@ -268,14 +260,13 @@ module Octokit
       # @param repo [String, Hash, Repository] A GitHub repository.
       # @param collaborator [String] Collaborator GitHub username to add.
       # @return [Boolean] True if collaborator added, false otherwise.
-      # @see Octokit::Client
       # @see http://developer.github.com/v3/repos/collaborators/#add-collaborator
       # @example
       #   @client.add_collaborator('pengwynn/octokit', 'holman')
       # @example
       #   @client.add_collab('pengwynn/octokit', 'holman')
       def add_collaborator(repo, collaborator, options={})
-        boolean_from_response(:put, "repos/#{Repository.new repo}/collaborators/#{collaborator}", options)
+        boolean_from_response :put, "repos/#{Repository.new repo}/collaborators/#{collaborator}", options
       end
       alias :add_collab :add_collaborator
 
@@ -286,14 +277,13 @@ module Octokit
       # @param repo [String, Hash, Repository] A GitHub repository.
       # @param collaborator [String] Collaborator GitHub username to remove.
       # @return [Boolean] True if collaborator removed, false otherwise.
-      # @see Octokit::Client
       # @see http://developer.github.com/v3/repos/collaborators/#remove-collaborator
       # @example
       #   @client.remove_collaborator('pengwynn/octokit', 'holman')
       # @example
       #   @client.remove_collab('pengwynn/octokit', 'holman')
       def remove_collaborator(repo, collaborator, options={})
-        boolean_from_response(:delete, "repos/#{Repository.new repo}/collaborators/#{collaborator}", options)
+        boolean_from_response :delete, "repos/#{Repository.new repo}/collaborators/#{collaborator}", options
       end
       alias :remove_collab :remove_collaborator
 
@@ -302,8 +292,7 @@ module Octokit
       # Requires authenticated client that is an owner or collaborator of the repo.
       #
       # @param repo [String, Hash, Repository] A GitHub repository.
-      # @return [Array<Hashie::Mash>] Array of hashes representing teams.
-      # @see Octokit::Client
+      # @return [Array<Sawyer::Resource>] Array of hashes representing teams.
       # @see http://developer.github.com/v3/repos/#list-teams
       # @example
       #   @client.repository_teams('octokit/pengwynn')
@@ -312,7 +301,7 @@ module Octokit
       # @example
       #   @client.teams('octokit/pengwynn')
       def repository_teams(repo, options={})
-        get "repos/#{Repository.new repo}/teams", options
+        paginate "repos/#{Repository.new repo}/teams", options
       end
       alias :repo_teams :repository_teams
       alias :teams :repository_teams
@@ -323,17 +312,17 @@ module Octokit
       #
       # @param repo [String, Hash, Repository] A GitHub repository.
       # @param anon [Boolean] Set true to include annonymous contributors.
-      # @return [Array<Hashie::Mash>] Array of hashes representing users.
-      # @see Octokit::Client
+      # @return [Array<Sawyer::Resource>] Array of hashes representing users.
       # @see http://developer.github.com/v3/repos/#list-contributors
       # @example
       #   Octokit.contributors('pengwynn/octokit', true)
       # @example
       #   Octokit.contribs('pengwynn/octokit')
       # @example
-      #   @client.contribs('pengwynn/octokit') 
-      def contributors(repo, anon=false, options={})
-        get "repos/#{Repository.new repo}/contributors", options.merge(:anon => anon)
+      #   @client.contribs('pengwynn/octokit')
+      def contributors(repo, anon = nil, options={})
+        options[:anon] = 1 if anon.to_s[/1|true/]
+        paginate "repos/#{Repository.new repo}/contributors", options
       end
       alias :contribs :contributors
 
@@ -342,34 +331,31 @@ module Octokit
       # Requires authenticated client for private repos.
       #
       # @param repo [String, Hash, Repository] A GitHub repository.
-      # @return [Array<Hashie::Mash>] Array of hashes representing users.
-      # @see Octokit::Client
+      # @return [Array<Sawyer::Resource>] Array of hashes representing users.
       # @see http://developer.github.com/v3/repos/starring/#list-stargazers
       # @example
       #   Octokit.stargazers('pengwynn/octokit')
       # @example
       #   @client.stargazers('pengwynn/octokit')
       def stargazers(repo, options={})
-        get "repos/#{Repository.new repo}/stargazers", options
+        paginate "repos/#{Repository.new repo}/stargazers", options
       end
 
-      # @deprecated Use #stargazers instead
+      # @deprecated Use {#stargazers} instead
       #
-      # List watchers of repo.  
+      # List watchers of repo.
       #
       # Requires authenticated client for private repos.
       #
       # @param repo [String, Hash, Repository] A GitHub repository.
-      # @return [Array<Hashie::Mash>] Array of hashes representing users.
-      # @see Octokit::Client::Repositories#stargazers
-      # @see Octokit::Client
+      # @return [Array<Sawyer::Resource>] Array of hashes representing users.
       # @see http://developer.github.com/v3/repos/watching/#list-watchers
       # @example
       #   Octokit.watchers('pengwynn/octokit')
       # @example
       #   @client.watchers('pengwynn/octokit')
       def watchers(repo, options={})
-        get "repos/#{Repository.new repo}/watchers", options
+        paginate "repos/#{Repository.new repo}/watchers", options
       end
 
       # List forks
@@ -377,8 +363,7 @@ module Octokit
       # Requires authenticated client for private repos.
       #
       # @param repo [String, Hash, Repository] A GitHub repository.
-      # @return [Array<Hashie::Mash>] Array of hashes representing repos.
-      # @see Octokit::Client
+      # @return [Array<Sawyer::Resource>] Array of hashes representing repos.
       # @see http://developer.github.com/v3/repos/forks/#list-forks
       # @example
       #   Octokit.forks('pengwynn/octokit')
@@ -387,7 +372,7 @@ module Octokit
       # @example
       #   @client.forks('pengwynn/octokit')
       def forks(repo, options={})
-        get "repos/#{Repository.new repo}/forks", options
+        paginate "repos/#{Repository.new repo}/forks", options
       end
       alias :network :forks
 
@@ -396,15 +381,14 @@ module Octokit
       # Requires authenticated client for private repos.
       #
       # @param repo [String, Hash, Repository] A GitHub repository.
-      # @return [Array<Hashie::Mash>] Array of Hashes representing languages.
-      # @see Octokit::Client
+      # @return [Array<Sawyer::Resource>] Array of Hashes representing languages.
       # @see http://developer.github.com/v3/repos/#list-languages
       # @example
       #   Octokit.langauges('pengwynn/octokit')
       # @example
       #   @client.languages('pengwynn/octokit')
       def languages(repo, options={})
-        get "repos/#{Repository.new repo}/languages", options
+        paginate "repos/#{Repository.new repo}/languages", options
       end
 
       # List tags
@@ -412,15 +396,14 @@ module Octokit
       # Requires authenticated client for private repos.
       #
       # @param repo [String, Hash, Repository] A GitHub repository.
-      # @return [Array<Hashie::Mash>] Array of hashes representing tags.
-      # @see Octokit::Client
+      # @return [Array<Sawyer::Resource>] Array of hashes representing tags.
       # @see http://developer.github.com/v3/repos/#list-tags
       # @example
       #   Octokit.tags('pengwynn/octokit')
       # @example
       #   @client.tags('pengwynn/octokit')
       def tags(repo, options={})
-        get "repos/#{Repository.new repo}/tags", options
+        paginate "repos/#{Repository.new repo}/tags", options
       end
 
       # List branches
@@ -428,22 +411,21 @@ module Octokit
       # Requires authenticated client for private repos.
       #
       # @param repo [String, Hash, Repository] A GitHub repository.
-      # @return [Array<Hashie::Mash>] Array of hashes representing branches.
-      # @see Octokit::Client
+      # @return [Array<Sawyer::Resource>] Array of hashes representing branches.
       # @see http://developer.github.com/v3/repos/#list-branches
       # @example
       #   Octokit.branches('pengwynn/octokit')
       # @example
       #   @client.branches('pengwynn/octokit')
       def branches(repo, options={})
-        get "repos/#{Repository.new repo}/branches", options
+        paginate "repos/#{Repository.new repo}/branches", options
       end
 
       # Get a single branch from a repository
       #
       # @param repo [String, Hash, Repository] A GitHub repository.
       # @param branch [String] Branch name
-      # @return [Branch] The branch requested, if it exists
+      # @return [Sawyer::Resource] The branch requested, if it exists
       # @see http://developer.github.com/v3/repos/#get-branch
       # @example Get branch 'master` from pengwynn/octokit
       #   Octokit.branch("pengwynn/octokit", "master")
@@ -457,13 +439,12 @@ module Octokit
       # Requires authenticated client.
       #
       # @param repo [String, Hash, Repository] A GitHub repository.
-      # @return [Array<Hashie::Mash>] Array of hashes representing hooks.
-      # @see Octokit::Client
+      # @return [Array<Sawyer::Resource>] Array of hashes representing hooks.
       # @see http://developer.github.com/v3/repos/hooks/#list
       # @example
       #   @client.hooks('pengwynn/octokit')
       def hooks(repo, options={})
-        get "repos/#{Repository.new repo}/hooks", options
+        paginate "repos/#{Repository.new repo}/hooks", options
       end
 
       # Get single hook
@@ -472,8 +453,7 @@ module Octokit
       #
       # @param repo [String, Hash, Repository] A GitHub repository.
       # @param id [Integer] Id of the hook to get.
-      # @return [Hashie::Mash] Hash representing hook.
-      # @see Octokit::Client
+      # @return [Sawyer::Resource] Hash representing hook.
       # @see http://developer.github.com/v3/repos/hooks/#get-single-hook
       # @example
       #   @client.hook('pengwynn/octokit', 100000)
@@ -495,8 +475,7 @@ module Octokit
       #   events the hook is triggered for.
       # @option options [Boolean] :active Determines whether the hook is
       #   actually triggered on pushes.
-      # @return [Hashie::Mash] Hook info for the new hook
-      # @see Octokit::Client
+      # @return [Sawyer::Resource] Hook info for the new hook
       # @see https://api.github.com/hooks
       # @see https://github.com/github/github-services
       # @see http://developer.github.com/v3/repos/hooks/#create-a-hook
@@ -529,7 +508,7 @@ module Octokit
       # @param config [Hash] A Hash containing key/value pairs to provide
       #   settings for this hook. These settings vary between the services and
       #   are defined in the {https://github.com/github/github-services github-services} repo.
-      # @option options [Array<String>] :events ('["push"]') Determines what 
+      # @option options [Array<String>] :events ('["push"]') Determines what
       #   events the hook is triggered for.
       # @option options [Array<String>] :add_events Determines a list of events
       #   to be added to the list of events that the Hook triggers for.
@@ -537,8 +516,7 @@ module Octokit
       #   to be removed from the list of events that the Hook triggers for.
       # @option options [Boolean] :active Determines whether the hook is
       #   actually triggered on pushes.
-      # @return [Hashie::Mash] Hook info for the updated hook
-      # @see Octokit::Client
+      # @return [Sawyer::Resource] Hook info for the updated hook
       # @see https://api.github.com/hooks
       # @see https://github.com/github/github-services
       # @see http://developer.github.com/v3/repos/hooks/#edit-a-hook
@@ -568,12 +546,11 @@ module Octokit
       # @param repo [String, Hash, Repository] A GitHub repository.
       # @param id [Integer] Id of the hook to remove.
       # @return [Boolean] True if hook removed, false otherwise.
-      # @see Octokit::Client
       # @see http://developer.github.com/v3/repos/hooks/#delete-a-hook
       # @example
       #   @client.remove_hook('pengwynn/octokit', 1000000)
       def remove_hook(repo, id, options={})
-        boolean_from_response(:delete, "repos/#{Repository.new repo}/hooks/#{id}", options)
+        boolean_from_response :delete, "repos/#{Repository.new repo}/hooks/#{id}", options
       end
 
       # Test hook
@@ -582,35 +559,20 @@ module Octokit
       #
       # @param repo [String, Hash, Repository] A GitHub repository.
       # @param id [Integer] Id of the hook to test.
-      # @return [nil]
-      # @see Octokit::Client
+      # @return [Boolean] Success
       # @see http://developer.github.com/v3/repos/hooks/#test-a-hook
       # @example
       #   @client.test_hook('pengwynn/octokit', 1000000)
       def test_hook(repo, id, options={})
-        boolean_from_response(:post, "repos/#{Repository.new repo}/hooks/#{id}/tests", options)
+        boolean_from_response :post, "repos/#{Repository.new repo}/hooks/#{id}/tests", options
       end
 
-      # Get all Issue Events for a given Repository
-      #
-      # @param repo [String, Repository, Hash] A GitHub repository
-      #
-      # @return [Array] Array of all Issue Events for this Repository
-      # @see http://developer.github.com/v3/issues/events/#list-events-for-a-repository
-      # @example Get all Issue Events for Octokit
-      #   Octokit.repository_issue_events("pengwynn/octokit")
-      def repository_issue_events(repo, options={})
-        get "repos/#{Repository.new repo}/issues/events", options
-      end
-      alias :repo_issue_events :repository_issue_events
-
       # List users available for assigning to issues.
       #
       # Requires authenticated client for private repos.
       #
       # @param repo [String, Hash, Repository] A GitHub repository.
-      # @return [Array<Hashie::Mash>] Array of hashes representing users.
-      # @see Octokit::Client
+      # @return [Array<Sawyer::Resource>] Array of hashes representing users.
       # @see http://developer.github.com/v3/issues/assignees/#list-assignees
       # @example
       #   Octokit.repository_assignees('pengwynn/octokit')
@@ -619,7 +581,7 @@ module Octokit
       # @example
       #   @client.repository_assignees('pengwynn/octokit')
       def repository_assignees(repo, options={})
-        get "repos/#{Repository.new repo}/assignees", options
+        paginate "repos/#{Repository.new repo}/assignees", options
       end
       alias :repo_assignees :repository_assignees
 
@@ -628,40 +590,33 @@ module Octokit
       # @param repo [String, Hash, Repository] A GitHub repository.
       # @param assignee [String] User login to check
       # @return [Boolean] True if assignable on project, false otherwise.
-      # @see Octokit::Client
       # @see http://developer.github.com/v3/issues/assignees/#check-assignee
       # @example
       #   Octokit.check_assignee('pengwynn/octokit', 'andrew')
       def check_assignee(repo, assignee, options={})
-        boolean_from_response(:get, "repos/#{Repository.new repo}/assignees/#{assignee}", options)
+        boolean_from_response :get, "repos/#{Repository.new repo}/assignees/#{assignee}", options
       end
 
       # List watchers subscribing to notifications for a repo
       #
       # @param repo [String, Hash, Repository] A GitHub repository.
-      #
-      # @return [Array] Array of users watching.
-      #
+      # @return [Array<Sawyer::Resource>] Array of users watching.
       # @see http://developer.github.com/v3/activity/watching/#list-watchers
-      #
       # @example
       #   @client.subscribers("pengwynn/octokit")
       def subscribers(repo, options={})
-        get("repos/#{Repository.new repo}/subscribers", options)
+        paginate "repos/#{Repository.new repo}/subscribers", options
       end
 
       # Get a repository subscription
       #
       # @param repo [String, Hash, Repository] A GitHub repository.
-      #
-      # @return [Hashie::Mash] Repository subscription.
-      #
+      # @return [Sawyer::Resource] Repository subscription.
       # @see http://developer.github.com/v3/activity/watching/#get-a-repository-subscription
-      #
       # @example
       #   @client.subscription("pengwynn/octokit")
       def subscription(repo, options={})
-        get("repos/#{Repository.new repo}/subscription", options)
+        get "repos/#{Repository.new repo}/subscription", options
       end
 
       # Update repository subscription
@@ -671,32 +626,26 @@ module Octokit
       #
       # @option options [Boolean] :subscribed Determines if notifications
       #   should be received from this repository.
-      #
       # @option options [Boolean] :ignored Deterimines if all notifications
       #   should be blocked from this repository.
-      #
-      # @return [Hashie::Mash] Updated repository subscription.
-      #
+      # @return [Sawyer::Resource] Updated repository subscription.
       # @see http://developer.github.com/v3/activity/watching/#set-a-repository-subscription
-      #
       # @example Subscribe to notifications for a repository
       #   @client.update_subscription("pengwynn/octokit", {subscribed: true})
       def update_subscription(repo, options={})
-        put("repos/#{Repository.new repo}/subscription", options)
+        put "repos/#{Repository.new repo}/subscription", options
       end
 
       # Delete a repository subscription
       #
       # @param repo [String, Hash, Repository] A GitHub repository.
-      #
       # @return [Boolean] True if subscription deleted, false otherwise.
-      #
       # @see http://developer.github.com/v3/activity/watching/#delete-a-repository-subscription
       #
       # @example
       #   @client.delete_subscription("pengwynn/octokit")
       def delete_subscription(repo, options={})
-        boolean_from_response(:delete, "repos/#{Repository.new repo}/subscription", options)
+        boolean_from_response :delete, "repos/#{Repository.new repo}/subscription", options
       end
 
     end