octokit 4.25.1 → 6.0.0

data/lib/octokit/client/projects.rb

@@ -4,7 +4,7 @@ module Octokit
   class Client
     # Methods for Projects API
     #
-    # @see https://developer.github.com/v3/repos/projects
+    # @see https://docs.github.com/en/rest/projects
     module Projects
       # List projects for a repository
       #
@@ -16,8 +16,7 @@ module Octokit
       # @example
       #   @client.projects('octokit/octokit.rb')
       def projects(repo, options = {})
-        opts = ensure_api_media_type(:projects, options)
-        paginate "#{Repository.path repo}/projects", opts
+        paginate "#{Repository.path repo}/projects", options
       end
 
       # Create a project
@@ -35,9 +34,8 @@ module Octokit
       # @example Create project with name and body
       #   @client.create_project('octokit/octokit.rb', 'bugs be gone', body: 'Fix all the bugs @joeyw creates')
       def create_project(repo, name, options = {})
-        opts = ensure_api_media_type(:projects, options)
-        opts[:name] = name
-        post "#{Repository.path repo}/projects", opts
+        options[:name] = name
+        post "#{Repository.path repo}/projects", options
       end
 
       # List organization projects
@@ -50,8 +48,7 @@ module Octokit
       # @example
       #   @client.org_projects("octokit")
       def org_projects(org, options = {})
-        opts = ensure_api_media_type(:projects, options)
-        paginate "orgs/#{org}/projects", opts
+        paginate "orgs/#{org}/projects", options
       end
       alias organization_projects org_projects
 
@@ -69,9 +66,8 @@ module Octokit
       # @example Create a project with name and body
       #   @client.create_org_project("octokit", "octocan", body: 'Improve clients')
       def create_org_project(org, name, options = {})
-        opts = ensure_api_media_type(:projects, options)
-        opts[:name] = name
-        post "orgs/#{org}/projects", opts
+        options[:name] = name
+        post "orgs/#{org}/projects", options
       end
       alias create_organization_project create_org_project
 
@@ -83,8 +79,7 @@ module Octokit
       # @example
       #   Octokit.project(123942)
       def project(id, options = {})
-        opts = ensure_api_media_type(:projects, options)
-        get "projects/#{id}", opts
+        get "projects/#{id}", options
       end
 
       # Update a project
@@ -99,8 +94,7 @@ module Octokit
       # @example Update project name
       #   @client.update_project(123942, name: 'New name')
       def update_project(id, options = {})
-        opts = ensure_api_media_type(:projects, options)
-        patch "projects/#{id}", opts
+        patch "projects/#{id}", options
       end
 
       # Delete a project
@@ -113,8 +107,7 @@ module Octokit
       # @example
       #   @client.delete_project(123942)
       def delete_project(id, options = {})
-        opts = ensure_api_media_type(:projects, options)
-        boolean_from_response :delete, "projects/#{id}", opts
+        boolean_from_response :delete, "projects/#{id}", options
       end
 
       # List project columns
@@ -125,8 +118,7 @@ module Octokit
       # @example
       #   @client.project_columns(123942)
       def project_columns(id, options = {})
-        opts = ensure_api_media_type(:projects, options)
-        paginate "projects/#{id}/columns", opts
+        paginate "projects/#{id}/columns", options
       end
 
       # Create a project column
@@ -140,9 +132,8 @@ module Octokit
       # @example
       #   @client.create_project_column(123942, "To Dones")
       def create_project_column(id, name, options = {})
-        opts = ensure_api_media_type(:projects, options)
-        opts[:name] = name
-        post "projects/#{id}/columns", opts
+        options[:name] = name
+        post "projects/#{id}/columns", options
       end
 
       # Get a project column by ID
@@ -153,8 +144,7 @@ module Octokit
       # @example
       #   Octokit.project_column(30294)
       def project_column(id, options = {})
-        opts = ensure_api_media_type(:projects, options)
-        get "projects/columns/#{id}", opts
+        get "projects/columns/#{id}", options
       end
 
       # Update a project column
@@ -168,9 +158,8 @@ module Octokit
       # @example
       #   @client.update_project_column(30294, "new column name")
       def update_project_column(id, name, options = {})
-        opts = ensure_api_media_type(:projects, options)
-        opts[:name] = name
-        patch "projects/columns/#{id}", opts
+        options[:name] = name
+        patch "projects/columns/#{id}", options
       end
 
       # Delete a project column
@@ -183,8 +172,7 @@ module Octokit
       # @example
       #   @client.delete_project_column(30294)
       def delete_project_column(id, options = {})
-        opts = ensure_api_media_type(:projects, options)
-        boolean_from_response :delete, "projects/columns/#{id}", opts
+        boolean_from_response :delete, "projects/columns/#{id}", options
       end
 
       # Move a project column
@@ -200,9 +188,8 @@ module Octokit
       # @example
       #   @client.move_project_column(30294, "last")
       def move_project_column(id, position, options = {})
-        opts = ensure_api_media_type(:projects, options)
-        opts[:position] = position
-        post "projects/columns/#{id}/moves", opts
+        options[:position] = position
+        post "projects/columns/#{id}/moves", options
       end
 
       # List columns cards
@@ -215,8 +202,7 @@ module Octokit
       # @example
       #   @client.column_cards(30294)
       def column_cards(id, options = {})
-        opts = ensure_api_media_type(:projects, options)
-        paginate "projects/columns/#{id}/cards", opts
+        paginate "projects/columns/#{id}/cards", options
       end
 
       # Create project card
@@ -238,8 +224,7 @@ module Octokit
       # @example Create a project card for an repository issue
       #   @client.create_project_card(123495, content_id: 1, content_type: 'Issue')
       def create_project_card(id, options = {})
-        opts = ensure_api_media_type(:projects, options)
-        post "projects/columns/#{id}/cards", opts
+        post "projects/columns/#{id}/cards", options
       end
 
       # Get a project card
@@ -252,8 +237,7 @@ module Octokit
       # @example
       #   @client.project_card(123495)
       def project_card(id, options = {})
-        opts = ensure_api_media_type(:projects, options)
-        get "projects/columns/cards/#{id}", opts
+        get "projects/columns/cards/#{id}", options
       end
 
       # Update a project card
@@ -269,8 +253,7 @@ module Octokit
       # @example
       #   @client.update_project_card(12345, note: 'new note')
       def update_project_card(id, options = {})
-        opts = ensure_api_media_type(:projects, options)
-        patch "projects/columns/cards/#{id}", opts
+        patch "projects/columns/cards/#{id}", options
       end
 
       # Move a project card
@@ -290,9 +273,8 @@ module Octokit
       # @example Move a card to the top of another column
       #   @client.move_project_card(123495, 'top', column_id: 59402)
       def move_project_card(id, position, options = {})
-        opts = ensure_api_media_type(:projects, options)
-        opts[:position] = position
-        post "projects/columns/cards/#{id}/moves", opts
+        options[:position] = position
+        post "projects/columns/cards/#{id}/moves", options
       end
 
       # Delete a project card
@@ -305,8 +287,7 @@ module Octokit
       # @example
       #   @client.delete_project_card(123495)
       def delete_project_card(id, options = {})
-        opts = ensure_api_media_type(:projects, options)
-        boolean_from_response :delete, "projects/columns/cards/#{id}", opts
+        boolean_from_response :delete, "projects/columns/cards/#{id}", options
       end
     end # Projects
   end

data/lib/octokit/client/pub_sub_hubbub.rb

@@ -18,11 +18,11 @@ module Octokit
       #   client.subscribe("https://github.com/joshk/devise_imapable/events/push", "github://Email?address=josh.kalderimis@gmail.com")
       def subscribe(topic, callback, secret = nil)
         options = {
-          "hub.callback": callback,
-          "hub.mode": 'subscribe',
-          "hub.topic": topic
+          'hub.callback': callback,
+          'hub.mode': 'subscribe',
+          'hub.topic': topic
         }
-        options.merge!("hub.secret": secret) unless secret.nil?
+        options.merge!('hub.secret': secret) unless secret.nil?
 
         response = pub_sub_hubbub_request(options)
 
@@ -40,9 +40,9 @@ module Octokit
       #   client.unsubscribe("https://github.com/joshk/devise_imapable/events/push", "github://Email?address=josh.kalderimis@gmail.com")
       def unsubscribe(topic, callback)
         options = {
-          "hub.callback": callback,
-          "hub.mode": 'unsubscribe',
-          "hub.topic": topic
+          'hub.callback': callback,
+          'hub.mode': 'unsubscribe',
+          'hub.topic': topic
         }
         response = pub_sub_hubbub_request(options)
 

data/lib/octokit/client/pull_requests.rb

@@ -276,6 +276,17 @@ module Octokit
       end
       alias pull_files pull_request_files
 
+      # Update a pull request branch
+      #
+      # @see https://developer.github.com/v3/pulls/#update-a-pull-request-branch
+      # @param repo [Integer, String, Hash, Repository] A GitHub repository
+      # @param number [Integer] Number of pull request
+      # @param options [Hash] Optional parameters (e.g. expected_head_sha)
+      # @return [Boolean] True if the pull request branch has been updated
+      def update_pull_request_branch(repo, number, options = {})
+        boolean_from_response(:put, "#{Repository.path repo}/pulls/#{number}/update-branch", options)
+      end
+
       # Merge a pull request
       #
       # @see https://developer.github.com/v3/pulls/#merge-a-pull-request-merge-button

data/lib/octokit/client/reactions.rb

@@ -17,7 +17,6 @@ module Octokit
       #
       # @return [Array<Sawyer::Resource>] Array of Hashes representing the reactions.
       def commit_comment_reactions(repo, id, options = {})
-        options = ensure_api_media_type(:reactions, options)
         get "#{Repository.path repo}/comments/#{id}/reactions", options
       end
 
@@ -34,7 +33,7 @@ module Octokit
       #
       # @return [<Sawyer::Resource>] Hash representing the reaction
       def create_commit_comment_reaction(repo, id, reaction, options = {})
-        options = ensure_api_media_type(:reactions, options.merge(content: reaction))
+        options = options.merge(content: reaction)
         post "#{Repository.path repo}/comments/#{id}/reactions", options
       end
 
@@ -49,7 +48,6 @@ module Octokit
       #
       # @return [Array<Sawyer::Resource>] Array of Hashes representing the reactions.
       def issue_reactions(repo, number, options = {})
-        options = ensure_api_media_type(:reactions, options)
         get "#{Repository.path repo}/issues/#{number}/reactions", options
       end
 
@@ -67,7 +65,7 @@ module Octokit
       #
       # @return [<Sawyer::Resource>] Hash representing the reaction.
       def create_issue_reaction(repo, number, reaction, options = {})
-        options = ensure_api_media_type(:reactions, options.merge(content: reaction))
+        options = options.merge(content: reaction)
         post "#{Repository.path repo}/issues/#{number}/reactions", options
       end
 
@@ -83,7 +81,6 @@ module Octokit
       #
       # @return [Array<Sawyer::Resource>] Array of Hashes representing the reactions.
       def issue_comment_reactions(repo, id, options = {})
-        options = ensure_api_media_type(:reactions, options)
         get "#{Repository.path repo}/issues/comments/#{id}/reactions", options
       end
 
@@ -101,7 +98,7 @@ module Octokit
       #
       # @return [<Sawyer::Resource>] Hashes representing the reaction.
       def create_issue_comment_reaction(repo, id, reaction, options = {})
-        options = ensure_api_media_type(:reactions, options.merge(content: reaction))
+        options = options.merge(content: reaction)
         post "#{Repository.path repo}/issues/comments/#{id}/reactions", options
       end
 
@@ -117,7 +114,6 @@ module Octokit
       #
       # @return [Array<Sawyer::Resource>] Array of Hashes representing the reactions.
       def pull_request_review_comment_reactions(repo, id, options = {})
-        options = ensure_api_media_type(:reactions, options)
         get "#{Repository.path repo}/pulls/comments/#{id}/reactions", options
       end
 
@@ -135,7 +131,7 @@ module Octokit
       #
       # @return [<Sawyer::Resource>] Hash representing the reaction.
       def create_pull_request_review_comment_reaction(repo, id, reaction, options = {})
-        options = ensure_api_media_type(:reactions, options.merge(content: reaction))
+        options = options.merge(content: reaction)
         post "#{Repository.path repo}/pulls/comments/#{id}/reactions", options
       end
 
@@ -150,7 +146,6 @@ module Octokit
       #
       # @return [Boolean] Return true if reaction was deleted, false otherwise.
       def delete_reaction(id, options = {})
-        options = ensure_api_media_type(:reactions, options)
         boolean_from_response :delete, "reactions/#{id}", options
       end
     end

data/lib/octokit/client/refs.rb

@@ -77,9 +77,7 @@ module Octokit
       # @see https://developer.github.com/v3/git/refs/#update-a-reference
       # @example Force update heads/sc/featureA for octocat/Hello-World with sha aa218f56b14c9653891f9e74264a383fa43fefbd
       #   Octokit.update_ref("octocat/Hello-World", "heads/sc/featureA", "aa218f56b14c9653891f9e74264a383fa43fefbd")
-      # @example Fast-forward update heads/sc/featureA for octocat/Hello-World with sha aa218f56b14c9653891f9e74264a383fa43fefbd
-      #   Octokit.update_ref("octocat/Hello-World", "heads/sc/featureA", "aa218f56b14c9653891f9e74264a383fa43fefbd", false)
-      def update_ref(repo, ref, sha, force = true, options = {})
+      def update_ref(repo, ref, sha, force = false, options = {})
         parameters = {
           sha: sha,
           force: force

data/lib/octokit/client/repositories.rb

@@ -13,9 +13,7 @@ module Octokit
       # @return [Boolean]
       def repository?(repo, options = {})
         !!repository(repo, options)
-      rescue Octokit::InvalidRepository
-        false
-      rescue Octokit::NotFound
+      rescue Octokit::InvalidRepository, Octokit::NotFound
         false
       end
 
@@ -47,9 +45,6 @@ module Octokit
       # @return [Sawyer::Resource] Repository information
       def edit_repository(repo, options = {})
         repo = Repository.new(repo)
-        if options.include? :is_template
-          options = ensure_api_media_type(:template_repositories, options)
-        end
         options[:name] ||= repo.name
         patch "repos/#{repo}", options
       end
@@ -160,9 +155,6 @@ module Octokit
         opts = options.dup
         organization = opts.delete :organization
         opts.merge! name: name
-        if opts.include? :is_template
-          opts = ensure_api_media_type(:template_repositories, opts)
-        end
 
         if organization.nil?
           post 'user/repos', opts
@@ -195,7 +187,6 @@ module Octokit
       # @param options [Array<Integer>] :team_ids ID of the team or teams to add to the repository. Teams can only be added to organization-owned repositories.
       # @return [Sawyer::Resource] Repository info for the transferred repository
       def transfer_repository(repo, new_owner, options = {})
-        options = ensure_api_media_type(:transfer_repository, options)
         post "#{Repository.path repo}/transfer", options.merge({ new_owner: new_owner })
       end
       alias transfer_repo transfer_repository
@@ -211,7 +202,6 @@ module Octokit
       # @return [Sawyer::Resource] Repository info for the new repository
       def create_repository_from_template(repo, name, options = {})
         options.merge! name: name
-        options = ensure_api_media_type(:template_repositories, options)
         post "#{Repository.path repo}/generate", options
       end
       alias create_repo_from_template create_repository_from_template
@@ -431,8 +421,7 @@ module Octokit
       # @example List topics for octokit/octokit.rb
       #   client.topics('octokit/octokit.rb')
       def topics(repo, options = {})
-        opts = ensure_api_media_type(:topics, options)
-        paginate "#{Repository.path repo}/topics", opts
+        paginate "#{Repository.path repo}/topics", options
       end
 
       # Replace all topics for a repository
@@ -448,8 +437,7 @@ module Octokit
       # @example Clear all topics for octokit/octokit.rb
       #   client.replace_all_topics('octokit/octokit.rb', [])
       def replace_all_topics(repo, names, options = {})
-        opts = ensure_api_media_type(:topics, options)
-        put "#{Repository.path repo}/topics", opts.merge(names: names)
+        put "#{Repository.path repo}/topics", options.merge(names: names)
       end
 
       # List contributors to a repo
@@ -601,10 +589,9 @@ module Octokit
       # @example
       #   @client.protect_branch('octokit/octokit.rb', 'master', foo)
       def protect_branch(repo, branch, options = {})
-        opts = ensure_api_media_type(:branch_protection, options)
-        opts[:restrictions] ||= nil
-        opts[:required_status_checks] ||= nil
-        put "#{Repository.path repo}/branches/#{branch}/protection", opts
+        options[:restrictions] ||= nil
+        options[:required_status_checks] ||= nil
+        put "#{Repository.path repo}/branches/#{branch}/protection", options
       end
 
       # Get branch protection summary
@@ -617,12 +604,9 @@ module Octokit
       # @example
       #   @client.branch_protection('octokit/octokit.rb', 'master')
       def branch_protection(repo, branch, options = {})
-        opts = ensure_api_media_type(:branch_protection, options)
-        begin
-          get "#{Repository.path repo}/branches/#{branch}/protection", opts
-        rescue Octokit::BranchNotProtected
-          nil
-        end
+        get "#{Repository.path repo}/branches/#{branch}/protection", options
+      rescue Octokit::BranchNotProtected
+        nil
       end
 
       # Unlock a single branch from a repository
@@ -636,8 +620,7 @@ module Octokit
       # @example
       #   @client.unprotect_branch('octokit/octokit.rb', 'master')
       def unprotect_branch(repo, branch, options = {})
-        opts = ensure_api_media_type(:branch_protection, options)
-        boolean_from_response :delete, "#{Repository.path repo}/branches/#{branch}/protection", opts
+        boolean_from_response :delete, "#{Repository.path repo}/branches/#{branch}/protection", options
       end
 
       # Rename a single branch from a repository
@@ -763,8 +746,7 @@ module Octokit
       # @example
       #   @client.vulnerability_alerts_enabled?("octokit/octokit.rb")
       def vulnerability_alerts_enabled?(repo, options = {})
-        opts = ensure_api_media_type(:vulnerability_alerts, options)
-        boolean_from_response(:get, "#{Repository.path repo}/vulnerability-alerts", opts)
+        boolean_from_response(:get, "#{Repository.path repo}/vulnerability-alerts", options)
       end
 
       # Enable vulnerability alerts for a repository
@@ -777,8 +759,7 @@ module Octokit
       # @example Enable vulnerability alerts for a repository
       #   @client.enable_vulnerability_alerts("octokit/octokit.rb")
       def enable_vulnerability_alerts(repo, options = {})
-        opts = ensure_api_media_type(:vulnerability_alerts, options)
-        boolean_from_response(:put, "#{Repository.path repo}/vulnerability-alerts", opts)
+        boolean_from_response(:put, "#{Repository.path repo}/vulnerability-alerts", options)
       end
 
       # Disable vulnerability alerts for a repository
@@ -791,8 +772,7 @@ module Octokit
       # @example Disable vulnerability alerts for a repository
       #   @client.disable_vulnerability_alerts("octokit/octokit.rb")
       def disable_vulnerability_alerts(repo, options = {})
-        opts = ensure_api_media_type(:vulnerability_alerts, options)
-        boolean_from_response(:delete, "#{Repository.path repo}/vulnerability-alerts", opts)
+        boolean_from_response(:delete, "#{Repository.path repo}/vulnerability-alerts", options)
       end
     end
   end

data/lib/octokit/client/reviews.rb

@@ -161,7 +161,7 @@ module Octokit
         # TODO(5.0): remove deprecated behavior
         if reviewers.is_a?(Array)
           octokit_warn(
-            'Deprecated: Octokit::Client#request_pull_request_review '\
+            'Deprecated: Octokit::Client#request_pull_request_review ' \
             "no longer takes a separate :reviewers argument.\n" \
             'Please update your call to pass :reviewers and :team_reviewers as part of the options hash.'
           )
@@ -194,7 +194,7 @@ module Octokit
         # TODO(5.0): remove deprecated behavior
         if !reviewers.empty? && !options.empty?
           octokit_warn(
-            'Deprecated: Octokit::Client#delete_pull_request_review_request '\
+            'Deprecated: Octokit::Client#delete_pull_request_review_request ' \
             "no longer takes a separate :reviewers argument.\n" \
             'Please update your call to pass :reviewers and :team_reviewers as part of the options hash.'
           )

data/lib/octokit/client/search.rb

@@ -31,7 +31,6 @@ module Octokit
       # @return [Sawyer::Resource] Search results object
       # @see https://developer.github.com/v3/search/#search-commits
       def search_commits(query, options = {})
-        options = ensure_api_media_type(:commit_search, options)
         search 'search/commits', query, options
       end
 
@@ -64,6 +63,20 @@ module Octokit
       end
       alias search_repos search_repositories
 
+      # Search topics
+      #
+      # @param query [String] Search term and qualifiers
+      # @param options [Hash] Sort and pagination options
+      # @option options [String] :sort Sort field
+      # @option options [String] :order Sort order (asc or desc)
+      # @option options [Integer] :page Page of paginated results
+      # @option options [Integer] :per_page Number of items per page
+      # @return [Sawyer::Resource] Search results object
+      # @see https://developer.github.com/v3/search/#search-topics
+      def search_topics(query, options = {})
+        search 'search/topics', query, options
+      end
+
       # Search users
       #
       # @param query [String] Search term and qualifiers

data/lib/octokit/client/source_import.rb

@@ -42,7 +42,7 @@ module Octokit
           octokit_warn 'Octokit#start_source_import vcs parameter is now an option, please update your call before the next major Octokit version update.'
           arguments.options.merge!(vcs: vcs)
         end
-        options = ensure_api_media_type(:source_imports, arguments.options.merge(vcs_url: vcs_url))
+        options = arguments.options.merge(vcs_url: vcs_url)
         put "#{Repository.path arguments.repo}/import", options
       end
 
@@ -55,7 +55,6 @@ module Octokit
       # @example
       #   @client.source_import_progress("octokit/octokit.rb")
       def source_import_progress(repo, options = {})
-        options = ensure_api_media_type(:source_imports, options)
         get "#{Repository.path repo}/import", options
       end
 
@@ -76,7 +75,6 @@ module Octokit
       #    :vcs_password  => "secret"
       #   })
       def update_source_import(repo, options = {})
-        options = ensure_api_media_type(:source_imports, options)
         patch "#{Repository.path repo}/import", options
       end
 
@@ -91,7 +89,6 @@ module Octokit
       # @example
       #   @client.source_import_commit_authors("octokit/octokit.rb")
       def source_import_commit_authors(repo, options = {})
-        options = ensure_api_media_type(:source_imports, options)
         get "#{Repository.path repo}/import/authors", options
       end
 
@@ -111,7 +108,7 @@ module Octokit
       #     :name => "Hubot the Robot"
       #   })
       def map_source_import_commit_author(author_url, values, options = {})
-        options = ensure_api_media_type(:source_imports, options.merge(values))
+        options = options.merge(values)
         patch author_url, options
       end
 
@@ -124,7 +121,6 @@ module Octokit
       # @example
       #   @client.cancel_source_import("octokit/octokit.rb")
       def cancel_source_import(repo, options = {})
-        options = ensure_api_media_type(:source_imports, options)
         boolean_from_response :delete, "#{Repository.path repo}/import", options
       end
 
@@ -139,7 +135,6 @@ module Octokit
       # @example
       #   @client.source_import_large_files("octokit/octokit.rb")
       def source_import_large_files(repo, options = {})
-        options = ensure_api_media_type(:source_imports, options)
         get "#{Repository.path repo}/import/large_files", options
       end
 
@@ -153,7 +148,7 @@ module Octokit
       # @example
       #   @client.opt_in_source_import_lfs("octokit/octokit.rb", "opt_in")
       def set_source_import_lfs_preference(repo, use_lfs, options = {})
-        options = ensure_api_media_type(:source_imports, options.merge(use_lfs: use_lfs))
+        options = options.merge(use_lfs: use_lfs)
         patch "#{Repository.path repo}/import/lfs", options
       end
     end

data/lib/octokit/client/tokens.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Octokit
+  class Client
+    # Method to check scopes
+    #
+    # @see https://developer.github.com/v3/oauth_authorizations/#oauth-authorizations-api
+    module Tokens
+      # Check scopes for a token
+      #
+      # @param token [String] GitHub OAuth token
+      # @param options [Hash] Header params for request
+      # @return [Array<String>] OAuth scopes
+      # @see https://developer.github.com/v3/oauth/#scopes
+      def scopes(token = @access_token, options = {})
+        options = options.dup
+        raise ArgumentError, 'Access token required' if token.nil?
+
+        auth = { 'Authorization' => "token #{token}" }
+        headers = (options.delete(:headers) || {}).merge(auth)
+
+        agent.call(:get, 'user', headers: headers)
+             .headers['X-OAuth-Scopes']
+             .to_s
+             .split(',')
+             .map(&:strip)
+             .sort
+      end
+    end
+  end
+end

data/lib/octokit/client/traffic.rb

@@ -14,8 +14,7 @@ module Octokit
       # @example
       #   @client.top_referrers('octokit/octokit.rb')
       def top_referrers(repo, options = {})
-        opts = ensure_api_media_type(:traffic, options)
-        get "#{Repository.path repo}/traffic/popular/referrers", opts
+        get "#{Repository.path repo}/traffic/popular/referrers", options
       end
 
       # Get the top 10 popular contents over the last 14 days
@@ -26,8 +25,7 @@ module Octokit
       # @example
       #   @client.top_paths('octokit/octokit.rb')
       def top_paths(repo, options = {})
-        opts = ensure_api_media_type(:traffic, options)
-        get "#{Repository.path repo}/traffic/popular/paths", opts
+        get "#{Repository.path repo}/traffic/popular/paths", options
       end
 
       # Get the total number of views and breakdown per day or week for the
@@ -43,8 +41,7 @@ module Octokit
       # @example Views per week
       #   @client.views('octokit/octokit.rb', per: 'week')
       def views(repo, options = {})
-        opts = ensure_api_media_type(:traffic, options)
-        get "#{Repository.path repo}/traffic/views", opts
+        get "#{Repository.path repo}/traffic/views", options
       end
 
       # Get the total number of clones and breakdown per day or week for the
@@ -60,8 +57,7 @@ module Octokit
       # @example Clones per week
       #   @client.clones('octokit/octokit.rb', per: 'week')
       def clones(repo, options = {})
-        opts = ensure_api_media_type(:traffic, options)
-        get "#{Repository.path repo}/traffic/clones", opts
+        get "#{Repository.path repo}/traffic/clones", options
       end
     end
   end