github_api 0.13.1 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6826e6aa63062a779729043a6e29bf543e53eb13
-  data.tar.gz: cd5c5dafd529f688fc8ec51693bad0a6fff24912
+  metadata.gz: 8762ba3a592b9f1ad2f523a8cf8259350755350c
+  data.tar.gz: 3fe0fe09e1afad532bbf9238fb6096bd653c1a50
 SHA512:
-  metadata.gz: 3bfd3e4f3a4dbbb82090b52d20ff2606609fe0b3dda8d838e7dff3258518c88955308ae9a87ffa46f613b5a5d32bda58e020b83089f9483dddf601f340addfbf
-  data.tar.gz: 46e9bc11f2d8021f9640c37720b0022134c766f4313ddbcd103efa441b895773a8720733c0bf39ac4dd102987aefb4a41375f2b4b34d78ad10a6d570027b2712
+  metadata.gz: 80323205b6a85c10d0097661da59785fb23a36873efb03179bf4c94bf25349d0bfc23825db0d49a7c80725765bd96291e4f28693fe2f2392dadc3543ab0a08bd
+  data.tar.gz: eda22421e5cba3767aeb28c655b62096e82c6c389e202d549dd795adc301103f57e7ac78c1bf76f89bca2dc22e8fb586d1881751a08de7dee42a41870b117b82

data/README.md

@@ -1,22 +1,22 @@
 <div align="center">
-  <a href="http://peter-murach.github.io/github/"><img width="136" src="https://github.com/peter-murach/github/raw/master/icons/github_api.png" alt="github api logo" /></a>
+  <a href="http://piotrmurach.github.io/github/"><img width="136" src="https://github.com/piotrmurach/github/raw/master/icons/github_api.png" alt="github api logo" /></a>
 </div>
 # GithubAPI
 [![Gem Version](https://badge.fury.io/rb/github_api.svg)][gem]
-[![Build Status](https://secure.travis-ci.org/peter-murach/github.svg?branch=master)][travis]
-[![Code Climate](https://codeclimate.com/github/peter-murach/github/badges/gpa.svg)][codeclimate]
-[![Coverage Status](https://coveralls.io/repos/peter-murach/github/badge.svg?branch=master)][coverage]
-[![Inline docs](http://inch-ci.org/github/peter-murach/github.svg)][inchpages]
-[![Dependency Status](https://gemnasium.com/peter-murach/github.svg?travis)][gemnasium]
+[![Build Status](https://secure.travis-ci.org/piotrmurach/github.svg?branch=master)][travis]
+[![Code Climate](https://codeclimate.com/github/piotrmurach/github/badges/gpa.svg)][codeclimate]
+[![Coverage Status](https://coveralls.io/repos/piotrmurach/github/badge.svg?branch=master)][coverage]
+[![Inline docs](http://inch-ci.org/github/piotrmurach/github.svg)][inchpages]
+[![Dependency Status](https://gemnasium.com/piotrmurach/github.svg?travis)][gemnasium]
 
 [gem]: http://badge.fury.io/rb/github_api
-[travis]: http://travis-ci.org/peter-murach/github
-[codeclimate]: https://codeclimate.com/github/peter-murach/github
-[coverage]: https://coveralls.io/r/peter-murach/github
-[inchpages]: http://inch-ci.org/github/peter-murach/github
-[gemnasium]: https://gemnasium.com/peter-murach/github
+[travis]: http://travis-ci.org/piotrmurach/github
+[codeclimate]: https://codeclimate.com/github/piotrmurach/github
+[coverage]: https://coveralls.io/r/piotrmurach/github
+[inchpages]: http://inch-ci.org/github/piotrmurach/github
+[gemnasium]: https://gemnasium.com/piotrmurach/github
 
-[Website](http://peter-murach.github.io/github/) | [Wiki](https://github.com/peter-murach/github/wiki) | [RDocs](http://rubydoc.info/github/peter-murach/github/master/frames)
+[Website](http://piotrmurach.github.io/github/) | [Wiki](https://github.com/piotrmurach/github/wiki) | [RDocs](http://rubydoc.info/github/piotrmurach/github/master/frames)
 
 A Ruby client for the official GitHub API.
 
@@ -87,7 +87,7 @@ gem "github_api"
 To start using the gem, you can either perform requests directly on `Github` namespace:
 
 ```ruby
-Github.repos.list user: 'peter-murach'
+Github.repos.list user: 'piotrmurach'
 ```
 
 or create a new client instance like so
@@ -99,7 +99,7 @@ github = Github.new
 and then call api methods, for instance, to list a given user repositories do
 
 ```ruby
-github.repos.list user: 'peter-murach'
+github.repos.list user: 'piotrmurach'
 ```
 
 ### 1.1 API Navigation
@@ -108,7 +108,7 @@ The **github_api** closely mirrors the [GitHub API](https://developer.github.com
 
 ```ruby
 github = Github.new
-github.repos.contents.create 'peter-murach', 'finite_machine', 'hello.rb',
+github.repos.contents.create 'piotrmurach', 'finite_machine', 'hello.rb',
                              path: 'hello.rb',
                              content: "puts 'hello ruby'"
 ```
@@ -116,16 +116,16 @@ github.repos.contents.create 'peter-murach', 'finite_machine', 'hello.rb',
 The whole library reflects the same api navigation. Therefore, if you need to list releases for a repository do:
 
 ```ruby
-github.repos.releases.list 'peter-murach', 'finite_machine'
+github.repos.releases.list 'piotrmurach', 'finite_machine'
 ```
 
 or to list a user's followers:
 
 ```ruby
-github.users.followers.list 'peter-murach'
+github.users.followers.list 'piotrmurach'
 ```
 
-The code base has been extensively documented with examples of how to use each method. Please refer to the [documentation](http://rubydoc.info/github/peter-murach/github/master/frames) under the `Github::Client` class name.
+The code base has been extensively documented with examples of how to use each method. Please refer to the [documentation](http://rubydoc.info/github/piotrmurach/github/master/frames) under the `Github::Client` class name.
 
 Alternatively, you can find out which methods are supported by an api by calling `actions` on a class or instance. For example, in order to find out available endpoints for `Github::Client::Repos::Contents` api call `actions` method:
 
@@ -140,10 +140,10 @@ The code base is modular. This means that you can work specifically with a given
 
 ```ruby
 starring = Github::Client::Activity::Starring.new oauth_token: token
-starring.star 'peter-murach', 'github'
+starring.star 'piotrmurach', 'github'
 ```
 
-Please refer to the [documentation](http://rubydoc.info/github/peter-murach/github/master/frames) and look under `Github::Client` to see all available classes.
+Please refer to the [documentation](http://rubydoc.info/github/piotrmurach/github/master/frames) and look under `Github::Client` to see all available classes.
 
 ### 1.3 Arguments
 
@@ -153,20 +153,20 @@ Arguments can be passed directly inside the method called. The `required` argume
 
 ```ruby
 issues = Github::Client::Issues.new
-issues.milestones.list 'peter-murach', 'github', state: 'open'
+issues.milestones.list 'piotrmurach', 'github', state: 'open'
 ```
 
 In the previous example, the order of arguments is important. However, each method also allows you to specify `required` arguments using hash symbols and thus remove the need for ordering. Therefore, the same example could be rewritten like so:
 
 ```ruby
 issues = Github::Client::Issues.new
-issues.milestones.list user: 'peter-murach', repo: 'github', state: 'open'
+issues.milestones.list user: 'piotrmurach', repo: 'github', state: 'open'
 ```
 
 Furthermore, `required` arguments can be passed during instance creation:
 
 ```ruby
-issues = Github::Client::Issues.new user: 'peter-murach', repo: 'github'
+issues = Github::Client::Issues.new user: 'piotrmurach', repo: 'github'
 issues.milestones.list state: 'open'
 ```
 
@@ -174,13 +174,13 @@ Similarly, the `required` arguments for the request can be passed inside the cur
 
 ```ruby
 issues = Github::Client::Issues.new
-issues.milestones(user: 'peter-murach', repo: 'github').list state: 'open'
+issues.milestones(user: 'piotrmurach', repo: 'github').list state: 'open'
 ```
 
 But why limit ourselves? You can mix and match arguments, for example:
 
 ```ruby
-issues = Github::Client::Issues.new user: 'peter-murach'
+issues = Github::Client::Issues.new user: 'piotrmurach'
 issues.milestones(repo: 'github').list
 issues.milestones(repo: 'tty').list
 ```
@@ -189,18 +189,18 @@ You can also use a bit of syntactic sugar whereby "username/repository" can be p
 
 ```ruby
 issues = Github::Client::Issues.new
-issues.milestones('peter-murach/github').list
-issues.milestones.list 'peter-murach/github'
+issues.milestones('piotrmurach/github').list
+issues.milestones.list 'piotrmurach/github'
 ```
 
 Finally, use the `with` scope to clearly denote your requests
 
 ```ruby
 issues = Github::Client::Issues.new
-issues.milestones.with(user: 'peter-murach', repo: 'github').list
+issues.milestones.with(user: 'piotrmurach', repo: 'github').list
 ```
 
-Please consult the method [documentation](http://rubydoc.info/github/peter-murach/github/master/frames) or [GitHub specification](https://developer.github.com/v3/) to see which arguments are required and what are the option parameters.
+Please consult the method [documentation](http://rubydoc.info/github/piotrmurach/github/master/frames) or [GitHub specification](https://developer.github.com/v3/) to see which arguments are required and what are the option parameters.
 
 ### 1.4 Response Querying
 
@@ -210,7 +210,7 @@ For example, when request is issued to list all the branches on a given reposito
 
 ```ruby
 repos = Github::Client::Repos.new
-repos.branches user: 'peter-murach', repo: 'github' do |branch|
+repos.branches user: 'piotrmurach', repo: 'github' do |branch|
   puts branch.name
 end
 ```
@@ -220,7 +220,7 @@ end
 The `ResponseWrapper` allows you to call json attributes directly as method calls. there is no magic here, all calls are delegated to the response body. Therefore, you can directly inspect request body by calling `body` method on the `ResponseWrapper` like so:
 
 ```ruby
-response = repos.branches user: 'peter-murach', repo: 'github'
+response = repos.branches user: 'piotrmurach', repo: 'github'
 response.body  # => Array of branches
 ```
 
@@ -229,7 +229,7 @@ response.body  # => Array of branches
 Each response comes packaged with methods allowing for inspection of HTTP start line and headers. For example, to check for rate limits and status codes do:
 
 ```ruby
-response = Github::Client::Repos.branches 'peter-murach', 'github'
+response = Github::Client::Repos.branches 'piotrmurach', 'github'
 response.headers.ratelimit_limit     # "5000"
 response.headers.ratelimit_remaining # "4999"
 response.headers.status              # "200"
@@ -243,7 +243,7 @@ response.headers.cache_control       # "public, max-age=60, s-maxage=60"
 If you want to verify if the response was success, namely, that the `200` code was returned call the `success?` like so:
 
 ```ruby
-response = Github::Client::Repos.branches 'peter-murach', 'github'
+response = Github::Client::Repos.branches 'piotrmurach', 'github'
 response.success?  # => true
 ```
 
@@ -267,7 +267,7 @@ In order to set custom media types for a request use the accept header. By using
 
 ```ruby
 issues = Github::Client::Issues.new
-issues.get 'peter-murach', 'github', 108, accept: 'application/vnd.github.raw'
+issues.get 'piotrmurach', 'github', 108, accept: 'application/vnd.github.raw'
 ```
 
 ## 2 Configuration
@@ -282,7 +282,7 @@ The configuration options can be set by using the `configure` helper
 Github.configure do |c|
   c.basic_auth = "login:password"
   c.adapter    = :typheous
-  c.user       = 'peter-murach'
+  c.user       = 'piotrmurach'
   c.repo       = 'finite_machine'
 end
 ```
@@ -302,7 +302,7 @@ or simply by passing hash of options to an instance like so
 ```ruby
 github = Github.new basic_auth: 'login:password',
                     adapter: :typheous,
-                    user: 'peter-murach',
+                    user: 'piotrmurach',
                     repo: 'finite_machine'
 ```
 
@@ -384,7 +384,7 @@ You can now configure cache parameters as follows
 
 ```ruby
 Github.configure do |config|
-  config.stack do |builder|
+  config.stack = proc do |builder|
     builder.use Faraday::HttpCache, store: Rails.cache
   end
 end
@@ -452,7 +452,7 @@ To list the scopes that the particular GitHub API action checks for do:
 
 ```ruby
 repos = Github::Client::Repos.new
-response = repos.list user: 'peter-murach'
+response = repos.list user: 'piotrmurach'
 response.headers.accepted_oauth_scopes  # => ['delete_repo', 'repo', 'public_repo']
 ```
 
@@ -679,8 +679,8 @@ The `mock` tests are in the `spec` directory and their primary concern is to tes
 
 ## Development
 
-Questions or problems? Please post them on the [issue tracker](https://github.com/peter-murach/github/issues). You can contribute changes by forking the project and submitting a pull request. You can ensure the tests are passing by running `bundle` and `rake`.
+Questions or problems? Please post them on the [issue tracker](https://github.com/piotrmurach/github/issues). You can contribute changes by forking the project and submitting a pull request. You can ensure the tests are passing by running `bundle` and `rake`.
 
 ## Copyright
 
-Copyright (c) 2011-2014 Piotr Murach. See LICENSE.txt for further details.
+Copyright (c) 2011-2016 Piotr Murach. See LICENSE.txt for further details.

data/lib/github_api/client/activity/feeds.rb

@@ -2,7 +2,6 @@
 
 module Github
   class Client::Activity::Feeds < API
-
     # List all the feeds available to the authenticated user.
     #
     # @see https://developer.github.com/v3/activity/feeds/#list-feeds

data/lib/github_api/client/activity/notifications.rb

@@ -2,7 +2,6 @@
 
 module Github
   class Client::Activity::Notifications < API
-
     # List your notifications
     #
     # List all notifications for the current user, grouped by repository.

data/lib/github_api/client/gists.rb

@@ -5,18 +5,13 @@ module Github
 
     require_all 'github_api/client/gists', 'comments'
 
-    REQUIRED_GIST_INPUTS = %w[
-      description
-      public
-      files
-      content
-    ].freeze
-
     # Access to Gists::Comments API
     namespace :comments
 
     # List a user's gists
     #
+    # @see https://developer.github.com/v3/gists/#list-a-users-gists
+    #
     # @example
     #  github = Github.new
     #  github.gists.list user: 'user-name'
@@ -30,6 +25,8 @@ module Github
     #
     # List all public gists
     #
+    # @see https://developer.github.com/v3/gists/#list-all-public-gists
+    #
     #  github = Github.new
     #  github.gists.list :public
     #
@@ -49,13 +46,15 @@ module Github
       return response unless block_given?
       response.each { |el| yield el }
     end
-    alias :all :list
+    alias_method :all, :list
 
     # List the authenticated user's starred gists
     #
+    # @see https://developer.github.com/v3/gists/#list-starred-gists
+    #
     # @example
-    #  github = Github.new oauth_token: '...'
-    #  github.gists.starred
+    #   github = Github.new oauth_token: '...'
+    #   github.gists.starred
     #
     # @return [Hash]
     #
@@ -69,9 +68,19 @@ module Github
 
     # Get a single gist
     #
+    # @see https://developer.github.com/v3/gists/#get-a-single-gist
+    #
     # @example
-    #  github = Github.new
-    #  github.gists.get 'gist-id'
+    #   github = Github.new
+    #   github.gists.get 'gist-id'
+    #
+    # Get a specific revision of gist
+    #
+    # @see https://developer.github.com/v3/gists/#get-a-specific-revision-of-a-gist
+    #
+    # @example
+    #   github = Github.new
+    #   github.gists.get 'gist-id', sha: '
     #
     # @return [Hash]
     #
@@ -79,12 +88,18 @@ module Github
     def get(*args)
       arguments(args, required: [:id])
 
-      get_request("/gists/#{arguments.id}", arguments.params)
+      if (sha = arguments.params.delete('sha'))
+        get_request("/gists/#{arguments.id}/#{sha}")
+      else
+        get_request("/gists/#{arguments.id}", arguments.params)
+      end
     end
-    alias :find :get
+    alias_method :find, :get
 
     # Create a gist
     #
+    # @see https://developer.github.com/v3/gists/#create-a-gist
+    #
     # @param [Hash] params
     # @option params [String] :description
     #   Optional string
@@ -112,15 +127,15 @@ module Github
     #
     # @api public
     def create(*args)
-      arguments(args) do
-        assert_required REQUIRED_GIST_INPUTS
-      end
+      arguments(args)
 
       post_request("/gists", arguments.params)
     end
 
     # Edit a gist
     #
+    # @see https://developer.github.com/v3/gists/#edit-a-gist
+    #
     # @param [Hash] params
     # @option [String] :description
     #   Optional string
@@ -162,6 +177,8 @@ module Github
 
     # List gist commits
     #
+    # @see https://developer.github.com/v3/gists/#list-gist-commits
+    #
     # @example
     #  github = Github.new
     #  github.gists.commits 'gist-id'
@@ -177,6 +194,8 @@ module Github
 
     # Star a gist
     #
+    # @see https://developer.github.com/v3/gists/#star-a-gist
+    #
     # @example
     #  github = Github.new
     #  github.gists.star 'gist-id'
@@ -190,6 +209,8 @@ module Github
 
     # Unstar a gist
     #
+    # @see https://developer.github.com/v3/gists/#unstar-a-gist
+    #
     # @xample
     #  github = Github.new
     #  github.gists.unstar 'gist-id'
@@ -203,10 +224,13 @@ module Github
 
     # Check if a gist is starred
     #
-    # = Examples
-    #  github = Github.new
-    #  github.gists.starred? 'gist-id'
+    # @see https://developer.github.com/v3/gists/#check-if-a-gist-is-starred
     #
+    # @example
+    #   github = Github.new
+    #   github.gists.starred? 'gist-id'
+    #
+    # @api public
     def starred?(*args)
       arguments(args, required: [:id])
       get_request("/gists/#{arguments.id}/star", arguments.params)
@@ -225,14 +249,16 @@ module Github
     def fork(*args)
       arguments(args, required: [:id])
 
-      post_request("/gists/#{arguments.id}/fork", arguments.params)
+      post_request("/gists/#{arguments.id}/forks", arguments.params)
     end
 
     # List gist forks
     #
+    # @see https://developer.github.com/v3/gists/#list-gist-forks
+    #
     # @example
-    #  github = Github.new
-    #  github.gists.forks 'gist-id'
+    #   github = Github.new
+    #   github.gists.forks 'gist-id'
     #
     # @api public
     def forks(*args)
@@ -245,6 +271,8 @@ module Github
 
     # Delete a gist
     #
+    # @see https://developer.github.com/v3/gists/#delete-a-gist
+    #
     # @example
     #  github = Github.new
     #  github.gists.delete 'gist-id'

data/lib/github_api/client/gists/comments.rb

@@ -2,22 +2,13 @@
 
 module Github
   class Client::Gists::Comments < API
-
-    REQUIRED_GIST_COMMENT_OPTIONS = %w[
-      body
-    ].freeze
-
-    VALID_GIST_COMMENT_OPTIONS = %w[
-      body
-      mime_type
-      resource
-    ].freeze
-
     # List comments on a gist
     #
+    # @see https://developer.github.com/v3/gists/comments/#list-comments-on-a-gist
+    #
     # @example
-    #  github = Github.new
-    #  github.gists.comments.list 'gist-id'
+    #   github = Github.new
+    #   github.gists.comments.list 'gist-id'
     #
     # @return [Hash]
     #
@@ -25,76 +16,83 @@ module Github
     def list(*args)
       arguments(args, required: [:gist_id])
 
-      response = get_request("/gists/#{arguments.gist_id}/comments", arguments.params)
+      response = get_request("/gists/#{arguments.gist_id}/comments",
+                             arguments.params)
       return response unless block_given?
       response.each { |el| yield el }
     end
-    alias :all :list
+    alias_method :all, :list
 
     # Get a single comment
     #
+    # @see https://developer.github.com/v3/gists/comments/#get-a-single-comment
+    #
     # @example
-    #  github = Github.new
-    #  github.gists.comments.get 'gist-id', 'comment-id'
+    #   github = Github.new
+    #   github.gists.comments.get 'gist-id', 'comment-id'
     #
     # @api public
     def get(*args)
       arguments(args, required: [:gist_id, :id])
 
-      get_request("/gists/#{arguments.gist_id}/comments/#{arguments.id}", arguments.params)
+      get_request("/gists/#{arguments.gist_id}/comments/#{arguments.id}",
+                  arguments.params)
     end
-    alias :find :get
+    alias_method :find, :get
 
     # Create a comment
     #
+    # @see https://developer.github.com/v3/gists/comments/#create-a-comment
+    #
     # @param [Hash] params
     # @option params [String] :body
     #   Required. The comment text.
     #
     # @example
-    #  github = Github.new
-    #  github.gists.comments.create 'gist-id'
+    #   github = Github.new
+    #   github.gists.comments.create 'gist-id'
     #
     # @api public
     def create(*args)
-      arguments(args, required: [:gist_id]) do
-        permit VALID_GIST_COMMENT_OPTIONS
-        assert_required REQUIRED_GIST_COMMENT_OPTIONS
-      end
+      arguments(args, required: [:gist_id])
 
       post_request("/gists/#{arguments.gist_id}/comments", arguments.params)
     end
 
     # Edit a comment
     #
+    # @see https://developer.github.com/v3/gists/comments/#edit-a-comment
+    #
     # @param [Hash] params
     # @option params [String] :body
     #   Required. The comment text.
     #
     # @example
-    #  github = Github.new
-    #  github.gists.comments.edit 'gist-id', 'comment-id'
+    #   github = Github.new
+    #   github.gists.comments.edit 'gist-id', 'comment-id'
     #
     # @api public
     def edit(*args)
-      arguments(args, required: [:gist_id, :id]) do
-        permit VALID_GIST_COMMENT_OPTIONS
-        assert_required REQUIRED_GIST_COMMENT_OPTIONS
-      end
+      arguments(args, required: [:gist_id, :id])
 
-      patch_request("/gists/#{arguments.gist_id}/comments/#{arguments.id}", arguments.params)
+      patch_request("/gists/#{arguments.gist_id}/comments/#{arguments.id}",
+                    arguments.params)
     end
 
     # Delete a comment
     #
+    # @see https://developer.github.com/v3/gists/comments/#delete-a-comment
+    #
     # @xample
-    #  github = Github.new
-    #  github.gists.comments.delete 'gist-id', 'comment-id'
+    #   github = Github.new
+    #   github.gists.comments.delete 'gist-id', 'comment-id'
     #
+    # @api public
     def delete(*args)
       arguments(args, required: [:gist_id, :id])
 
-      delete_request("/gists/#{arguments.gist_id}/comments/#{arguments.id}", arguments.params)
+      delete_request("/gists/#{arguments.gist_id}/comments/#{arguments.id}",
+                     arguments.params)
     end
   end # Gists::Comments
 end # Github

data/lib/github_api/client/pull_requests.rb

@@ -3,24 +3,7 @@
 module Github
   class Client::PullRequests < API
 
-    require_all 'github_api/client/pull_requests',
-      'comments'
-
-    VALID_REQUEST_PARAM_NAMES = %w[
-      title
-      body
-      base
-      head
-      state
-      issue
-      commit_message
-      mime_type
-      resource
-    ].freeze
-
-    VALID_REQUEST_PARAM_VALUES = {
-      'state' => %w[ open closed all ]
-    }
+    require_all 'github_api/client/pull_requests', 'comments'
 
     # Access to PullRequests::Comments API
     namespace :comments
@@ -38,16 +21,14 @@ module Github
     #
     # @api public
     def list(*args)
-      arguments(args, required: [:user, :repo]) do
-        permit VALID_REQUEST_PARAM_NAMES
-        assert_values VALID_REQUEST_PARAM_VALUES
-      end
+      arguments(args, required: [:user, :repo])
 
-      response = get_request("/repos/#{arguments.user}/#{arguments.repo}/pulls", arguments.params)
+      response = get_request("/repos/#{arguments.user}/#{arguments.repo}/pulls",
+                             arguments.params)
       return response unless block_given?
       response.each { |el| yield el }
     end
-    alias :all :list
+    alias_method :all, :list
 
     # Get a single pull request
     #
@@ -63,12 +44,12 @@ module Github
 
       get_request("/repos/#{arguments.user}/#{arguments.repo}/pulls/#{arguments.number}", arguments.params)
     end
-    alias :find :get
+    alias_method :find, :get
 
     # Create a pull request
     #
     # @param [Hash] params
-    # @option params [String] :title 
+    # @option params [String] :title
     #   Required string
     # @option params [String] :body
     #   Optional string
@@ -102,11 +83,10 @@ module Github
     #
     # @api public
     def create(*args)
-      arguments(args, required: [:user, :repo]) do
-        permit VALID_REQUEST_PARAM_NAMES
-      end
+      arguments(args, required: [:user, :repo])
 
-      post_request("/repos/#{arguments.user}/#{arguments.repo}/pulls", arguments.params)
+      post_request("/repos/#{arguments.user}/#{arguments.repo}/pulls",
+                   arguments.params)
     end
 
     # Update a pull request
@@ -129,10 +109,7 @@ module Github
     #
     # @api public
     def update(*args)
-      arguments(args, required: [:user, :repo, :number]) do
-        permit VALID_REQUEST_PARAM_NAMES
-        assert_values VALID_REQUEST_PARAM_VALUES
-      end
+      arguments(args, required: [:user, :repo, :number])
 
       patch_request("/repos/#{arguments.user}/#{arguments.repo}/pulls/#{arguments.number}", arguments.params)
     end
@@ -183,11 +160,19 @@ module Github
       false
     end
 
+    PREVIEW_MEDIA = 'application/vnd.github.polaris-preview+json'.freeze # :nodoc:
+
     # Merge a pull request(Merge Button)
     #
     # @param [Hash] params
+    # @option params [String] :commit_title
+    #   Optional string - The first line of the message that will be used for the merge commit
     # @option params [String] :commit_message
     #   Optional string - The message that will be used for the merge commit
+    # @option params [String] :sha
+    #   Optional string - The SHA that pull request head must match to allow merge
+    # @option params [Boolean] :squash
+    #   Optional boolean - Commit a single commit to the head branch.
     #
     # @example
     #  github = Github.new
@@ -195,11 +180,11 @@ module Github
     #
     # @api public
     def merge(*args)
-      arguments(args, required: [:user, :repo, :number]) do
-        permit VALID_REQUEST_PARAM_NAMES
-      end
+      arguments(args, required: [:user, :repo, :number])
+      params = arguments.params
+      params['accept'] ||= PREVIEW_MEDIA
 
-      put_request("/repos/#{arguments.user}/#{arguments.repo}/pulls/#{arguments.number}/merge", arguments.params)
+      put_request("/repos/#{arguments.user}/#{arguments.repo}/pulls/#{arguments.number}/merge", params)
     end
   end # PullRequests
 end # Github

data/lib/github_api/client/pull_requests/comments.rb

@@ -2,17 +2,6 @@
 
 module Github
   class Client::PullRequests::Comments < API
-
-    VALID_REQUEST_COM_PARAM_NAMES = %w[
-      body
-      commit_id
-      path
-      position
-      in_reply_to
-      mime_type
-      resource
-    ].freeze
-
     # List comments on a pull request
     #
     # @example
@@ -51,7 +40,7 @@ module Github
       return response unless block_given?
       response.each { |el| yield el }
     end
-    alias :all :list
+    alias_method :all, :list
 
     # Get a single comment for pull requests
     #
@@ -71,7 +60,7 @@ module Github
 
       get_request("/repos/#{arguments.user}/#{arguments.repo}/pulls/comments/#{arguments.number}", arguments.params)
     end
-    alias :find :get
+    alias_method :find, :get
 
     # Create a pull request comment
     #
@@ -110,9 +99,7 @@ module Github
     #
     # @api public
     def create(*args)
-      arguments(args, required: [:user, :repo, :number]) do
-        permit VALID_REQUEST_COM_PARAM_NAMES
-      end
+      arguments(args, required: [:user, :repo, :number])
 
       post_request("/repos/#{arguments.user}/#{arguments.repo}/pulls/#{arguments.number}/comments", arguments.params)
     end
@@ -130,9 +117,7 @@ module Github
     #
     # @api public
     def edit(*args)
-      arguments(args, required: [:user, :repo, :number]) do
-        permit VALID_REQUEST_COM_PARAM_NAMES
-      end
+      arguments(args, required: [:user, :repo, :number])
 
       patch_request("/repos/#{arguments.user}/#{arguments.repo}/pulls/comments/#{arguments.number}", arguments.params)
     end
@@ -149,17 +134,5 @@ module Github
 
       delete_request("/repos/#{arguments.user}/#{arguments.repo}/pulls/comments/#{arguments.number}", arguments.params)
     end
-
-  private
-
-    # To let user know that the params supplied are wrong before request is made
-    def _validate_reply_to(params)
-      if params['in_reply_to'] && !assert_required_keys(%w[ body in_reply_to ], params)
-        raise ArgumentError, "Required params are: #{%w[ body in_reply_to].join(',')}"
-
-      elsif !assert_required_keys(VALID_REQUEST_COM_PARAM_NAMES - %w[ in_reply_to ], params)
-        raise ArgumentError, "Required params are: #{VALID_REQUEST_COM_PARAM_NAMES.join(', ')}"
-      end
-    end
   end # PullRequests::Comments
 end # Github

data/lib/github_api/client/repos.rb

@@ -132,6 +132,9 @@ module Github
         permit %w[ user org type sort direction since ]
       end
       params = arguments.params
+      unless params.symbolize_keys[:per_page]
+        params.merge!(Pagination.per_page_as_param(current_options[:per_page]))
+      end
 
       response = if (user_name = params.delete('user') || user)
         get_request("/users/#{user_name}/repos", params)

data/lib/github_api/connection.rb

@@ -59,8 +59,7 @@ module Github
     def connection(api, options = {})
       connection_options = default_options(options)
       clear_cache unless options.empty?
-      builder = api.stack ? api.stack : stack(options.merge!(api: api))
-      connection_options.merge!(builder: builder)
+      connection_options.merge!(builder: stack(options.merge!(api: api)))
       connection_options.deep_merge!(options[:connection_options]) if options[:connection_options]
       if ENV['DEBUG']
         p "Connection options : \n"

data/lib/github_api/error/service_error.rb

@@ -1,32 +1,30 @@
 # encoding: utf-8
-# require 'multi_json'
-require 'github_api/jsonable'
+
+require 'json'
 
 module Github
   # Raised when GitHub returns any of the HTTP status codes
   module Error
     class ServiceError < GithubError
-      include ::Github::Jsonable
-
       attr_reader :http_headers, :body, :status
 
       MIN_BODY_LENGTH = 2
 
       def initialize(response)
         @http_headers = response[:response_headers]
-        message       = parse_response(response)
-        super(message)
+        @body         = parse_body(response[:body])
+        @status       = response[:status]
+
+        super(create_message(response))
       end
 
-      def parse_response(response)
-        @body   = parse_body(response[:body])
-        @status = response[:status]
-        "#{response[:method].to_s.upcase} #{response[:url].to_s}: #{@status} #{@body}"
+      def create_message(response)
+        "#{response[:method].to_s.upcase} #{response[:url]}: #{@status} #{@body}"
       end
 
       def decode_body(body)
         if body.respond_to?(:to_str) && body.length >= MIN_BODY_LENGTH
-           decode body, symbolize_keys: true
+          JSON.parse(body, symbolize_names: true)
         else
           body
         end
@@ -41,11 +39,7 @@ module Github
           body[:error]
         elsif body[:errors]
           error = Array(body[:errors]).first
-          if error.kind_of?(Hash)
-            error[:message]
-          else
-            error
-          end
+          error.is_a?(Hash) ? error[:message] : error
         elsif body[:message]
           body[:message]
         else
@@ -62,7 +56,6 @@ module Github
           descendants.map { |klass| [klass.new({}).http_status_code, klass] }
         ]
       end
-
-    end
+    end # ServiceError
   end # Error
 end # Github

data/lib/github_api/middleware.rb

@@ -24,6 +24,9 @@ module Github
           builder.use Github::Response::Jsonize
           builder.use Github::Response::AtomParser
         end
+        if api.stack
+          api.stack.call(builder)
+        end
         builder.use Github::Response::RaiseError
         builder.adapter options[:adapter]
       end

data/lib/github_api/pagination.rb

@@ -91,6 +91,16 @@ module Github
       page_iterator.next?
     end
 
+    # Handle pagination params when they are not passed directly
+    #
+    def self.per_page_as_param(per_page_config)
+      params = {}
+      if (per_page_config != Github::Configuration.property_set[:per_page])
+        params[:per_page] = per_page_config unless per_page_config.nil?
+      end
+      params
+    end
+
     private
 
     # Internally used page iterator

data/lib/github_api/response/jsonize.rb

@@ -1,16 +1,15 @@
 # encoding: utf-8
 
 require 'faraday'
-require 'github_api/jsonable'
+require 'json'
 
 module Github
   class Response::Jsonize < Response
-    include Github::Jsonable
 
-    dependency 'multi_json'
+    dependency 'json'
 
     define_parser do |body|
-      Github::Jsonable.decode body
+      JSON.parse(body)
     end
 
     def parse(body)
@@ -22,7 +21,7 @@ module Github
       when 'false'
         false
       else
-        self.class.parser.call body
+        self.class.parser.call(body)
       end
     end
   end # Response::Jsonize

data/lib/github_api/response_wrapper.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 module Github
-
   # A class responsible for proxing to faraday response
   class ResponseWrapper
     extend Forwardable
@@ -130,7 +129,7 @@ module Github
 
     # Check if method is defined on the body
     #
-    def respond_to?(method_name)
+    def respond_to?(method_name, include_all = false)
       if self.has_key?(method_name.to_s)
         true
       else

data/lib/github_api/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Github
-  VERSION = "0.13.1"
+  VERSION = "0.14.0"
 end # Github

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github_api
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.14.0
 platform: ruby
 authors:
 - Piotr Murach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-20 00:00:00.000000000 Z
+date: 2016-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -58,26 +58,6 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: '0.10'
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.7.5
-    - - <
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.7.5
-    - - <
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: oauth2
   requirement: !ruby/object:Gem::Requirement
@@ -236,7 +216,6 @@ files:
 - lib/github_api/error/validations.rb
 - lib/github_api/error.rb
 - lib/github_api/ext/faraday.rb
-- lib/github_api/jsonable.rb
 - lib/github_api/middleware.rb
 - lib/github_api/mime_type.rb
 - lib/github_api/normalizer.rb
@@ -274,7 +253,7 @@ files:
 - lib/github_api.rb
 - LICENSE.txt
 - README.md
-homepage: http://peter-murach.github.io/github/
+homepage: http://piotrmurach.github.io/github/
 licenses:
 - MIT
 metadata: {}

data/lib/github_api/jsonable.rb

@@ -1,18 +0,0 @@
-# encoding: utf-8
-
-require 'multi_json'
-
-module Github
-  module Jsonable
-    extend self
-
-    def decode(*args)
-      return unless args.first
-      if MultiJson.respond_to?(:load)
-        MultiJson.load *args
-      else
-        MultiJson.decode *args
-      end
-    end
-  end
-end