reenhanced_bitbucket_api 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1a895c33b9ba283852dbf0d5af066a2acbaa05f
-  data.tar.gz: 9773125535fa33ff8f10a20a3b379b7615701e7c
+  metadata.gz: f2178492c596e3ffcfb3b03ef8e73b137953f901
+  data.tar.gz: cd635c715d33fe9253d3a568b935102fd029f99d
 SHA512:
-  metadata.gz: 8fd84a1de59f109e782b11f6b0839555a2cf93f452ee7342642e2bb6a9a43c407354f044d2ee50c50a5dae37984d135b0c87533213781b3defb863ea1cd0d537
-  data.tar.gz: 6456a8bbe344e0856f392c1e90cc7deec072d5a8dead1c7a8c039a8537249edc149d5b6706136e29c0f9dd803b94891c9166c36a6d16d2488b1a464220e2c7dd
+  metadata.gz: d22c626f262033048a2343df7ac90d418b4b8a04d5101b24cd5c65494aa186dd1660ede36b21e69bbf49ff6990d0bcc5c31b39c960cb26c2b6d541903dc6c3a3
+  data.tar.gz: c89b629dcdaa899a8bf3de1cf9c5a55afe695e14d113bc889dc59d1669b484662ecd84fea237532c03fc7c263ce81c21baaca964889e9e49ef26fdcd226172d4

data/lib/bitbucket_rest_api/api.rb

@@ -58,7 +58,7 @@ module BitBucket
       options = BitBucket.configuration.fetch.merge(options)
       self.current_options = options
       if self.class.instance_variable_get('@version') == '2.0'
-        options[:endpoint] = BitBucket.endpoint.gsub(/\/api\/[0-9.]+/, "/api/2.0")
+        options[:endpoint] = BitBucket.endpoint_v2
       end
       BitBucket.configuration.property_names.each do |key|
         send("#{key}=", options[key])

data/lib/bitbucket_rest_api/client/repos/pull_requests/comments.rb

@@ -10,10 +10,11 @@ module BitBucket
     #  bitbucket = BitBucket.new
     #  bitbucket.repos.pull_requests.comments.all 'user-name', 'repo-name', 'pull-request-id'
     #
-    def list(user_name, repo_name, pull_request_id)
-      _update_user_repo_params(user_name, repo_name)
-      _validate_user_repo_params(user, repo) unless user? && repo?
-      _validate_presence_of pull_request_id
+    def list(*args)
+      arguments(args, required: [:user, :repo, :pull_request_id])
+      user            = arguments.user
+      repo            = arguments.repo
+      pull_request_id = arguments.pull_request_id
 
       response = get_request("/repositories/#{user}/#{repo.downcase}/pullrequests/#{pull_request_id}/comments")
       return response unless block_given?
@@ -27,11 +28,12 @@ module BitBucket
     #  @bitbucket = BitBucket.new
     #  @bitbucket.repos.pull_requests.comments.get 'user-name', 'repo-name', 'pull-request-id')
     #
-    def get(user_name, repo_name, pull_request_id, comment_id)
-      _update_user_repo_params(user_name, repo_name)
-      _validate_user_repo_params(user, repo) unless user? && repo?
-      _validate_presence_of pull_request_id
-      _validate_presence_of comment_id
+    def get(*args)
+      arguments(args, required: [:user, :repo, :pull_request_id, :comment_id])
+      user            = arguments.user
+      repo            = arguments.repo
+      pull_request_id = arguments.pull_request_id
+      comment_id      = arguments.comment_id
 
       get_request("/repositories/#{user}/#{repo.downcase}/pullrequests/#{pull_request_id}/comments/#{comment_id}")
     end

data/lib/bitbucket_rest_api/client/repos/pull_requests.rb

@@ -6,8 +6,12 @@ module BitBucket
     # Load all the modules after initializing Repos to avoid superclass mismatch
     require_all 'bitbucket_rest_api/client/repos/pull_requests',
       'comments',
-      'commits',
-      'activity'
+      'commits'
+
+    REQUIRED_PULL_REQUEST_OPTIONS = %w[
+      title
+      source
+    ]
 
     VALID_PULL_REQUEST_PARAM_NAMES = %w[
       title
@@ -34,17 +38,16 @@ module BitBucket
     #  <tt>:state</tt> - Optional - State of the pull request (OPEN, MERGED, DECLINED)
     #
     def list(*args)
-      args = { user: self.user, repo: self.repo.downcase, state: 'OPEN'}.merge(Hash[*args])
-      #_update_user_repo_params(user_name, repo_name)
-      #_validate_user_repo_params(user, repo) unless user? && repo?
-      params = arguments([args], required: [:user, :repo]) do
-        assert_values VALID_PULL_REQUEST_STATE_VALUES
-      end.params
+      arguments(args, required: [:user, :repo], optional: [:state])
+      params = arguments.params
+      user   = arguments.user
+      repo   = arguments.repo
 
+      params['state'] ||= 'OPEN'
       # Bitbucket requires the state to be all caps or it returns all
-      params['state'] = params['state'].upcase
+      params['state']   = params['state'].upcase
 
-      response = get_request("/repositories/#{args[:user]}/#{args[:repo]}/pullrequests", params)
+      response = get_request("/repositories/#{user}/#{repo}/pullrequests/", params)
 
       return response unless block_given?
       response.each { |el| yield el }
@@ -57,14 +60,10 @@ module BitBucket
     #  bitbucket = BitBucket.new
     #  bitbucket.repos.pull_requests.find 'user-name', 'repo-name', 'pull-request-id'
     #
-    def get(user_name, repo_name, pull_request_id, params={ })
-      _update_user_repo_params(user_name, repo_name)
-      _validate_user_repo_params(user, repo) unless user? && repo?
-      _validate_presence_of pull_request_id
+    def get(*args)
+      arguments(args, required: [:user, :repo, :pull_request_id])
 
-      normalize! params
-
-      get_request("/repositories/#{user}/#{repo.downcase}/pullrequests/#{pull_request_id}", params)
+      get_request("/repositories/#{arguments.user}/#{arguments.repo.downcase}/pullrequests/#{arguments.pull_request_id}", arguments.params)
     end
 
     alias :find :get
@@ -82,8 +81,8 @@ module BitBucket
     #  * <tt>[{ "username": "accountname" }]</tt>
     #
     # = Examples
-    #  bitbucket = BitBucket.new :user => 'user-name', :repo => 'repo-name'
-    #  bitbucket.repos.pull_requests.create
+    #  bitbucket = BitBucket.new
+    #  bitbucket.repos.pull_requests.create 'user-name', 'repo-name',
     #    "title" => "Fixes a bug",
     #    "description" => "Fixes not being able to see anything.",
     #    "source" => { "branch" => { "name" => "bug-fixes" } },
@@ -91,15 +90,13 @@ module BitBucket
     #    "reviewers" => [ { "username" => "octocat" } ],
     #    "close_source_branch" => true
     #
-    def create(user_name, repo_name, params={})
-      _update_user_repo_params(user_name, repo_name)
-      _validate_user_repo_params(user, repo) unless user? && repo?
-
-      normalize! params
-      filter! VALID_PULL_REQUEST_PARAM_NAMES , params
-      assert_required_keys(%w[ title source ], params)
+    def create(*args)
+      arguments(args, required: [:user, :repo]) do
+        permit VALID_PULL_REQUEST_PARAM_NAMES
+        assert_required REQUIRED_PULL_REQUEST_OPTIONS
+      end
 
-      post_request("/repositories/#{user}/#{repo.downcase}/pullrequests/", params)
+      post_request("/repositories/#{arguments.user}/#{arguments.repo.downcase}/pullrequests", arguments.params)
     end
 
     # Edit a pull request
@@ -121,13 +118,17 @@ module BitBucket
     #    "reviewers" => [ { "username" => "octocat" } ],
     #    "close_source_branch" => true
     #
-    def update(user_name, repo_name, pull_request_id, params={})
-      _update_user_repo_params(user_name, repo_name)
-      _validate_user_repo_params(user, repo) unless user? && repo?
-      _validate_presence_of pull_request_id
+    def update(*args)
+      arguments(args, required: [:user, :repo, :pull_request_id]) do
+        permit VALID_PULL_REQUEST_PARAM_NAMES
+      end
+
+      user            = arguments.user
+      repo            = arguments.repo
+      pull_request_id = arguments.pull_request_id
 
       # BitBucket will drop any data if it is not included, so we have to check for pre-existing data
-      existing_pull = get(user_name, repo_name, pull_request_id)
+      existing_pull = get(user, repo, pull_request_id)
       existing_pull_data = {
         'title' => existing_pull.title,
         'description' => existing_pull.description,
@@ -137,10 +138,7 @@ module BitBucket
         'reviewers' => existing_pull.reviewers,
         'close_source_branch' => existing_pull.close_source_branch
       }
-      params = normalize!(existing_pull_data).merge!(normalize!(params))
-
-      filter! VALID_PULL_REQUEST_PARAM_NAMES.reject{|param| param == 'source'}, params
-      assert_required_keys(%w[ title ], params)
+      params = normalize!(existing_pull_data).merge!(normalize!(arguments.params))
 
       put_request("/repositories/#{user}/#{repo.downcase}/pullrequests/#{pull_request_id}/", params)
     end
@@ -153,11 +151,9 @@ module BitBucket
     #  bitbucket.repos.pull_requests.reject 'user-name', 'repo-name', 'pull-request-id'
     #
     def decline(user_name, repo_name, pull_request_id)
-      _update_user_repo_params(user_name, repo_name)
-      _validate_user_repo_params(user, repo) unless user? && repo?
-      _validate_presence_of pull_request_id
+      arguments(args, required: [:user, :repo, :pull_request_id])
 
-      post_request("/repositories/#{user}/#{repo}/pullrequests/#{pull_request_id}/decline")
+      post_request("/repositories/#{arguments.user}/#{arguments.repo}/pullrequests/#{arguments.pull_request_id}/decline")
     end
     alias :reject :decline
 
@@ -168,11 +164,9 @@ module BitBucket
     #  bitbucket.repos.pull_requests.approve 'user-name', 'repo-name', 'pull-request-id'
     #
     def approve(user_name, repo_name, pull_request_id)
-      _update_user_repo_params(user_name, repo_name)
-      _validate_user_repo_params(user, repo) unless user? && repo?
-      _validate_presence_of pull_request_id
+      arguments(args, required: [:user, :repo, :pull_request_id])
 
-      post_request("/repositories/#{user}/#{repo}/pullrequests/#{pull_request_id}/approve")
+      post_request("/repositories/#{arguments.user}/#{arguments.repo}/pullrequests/#{arguments.pull_request_id}/approve")
     end
 
     # Get the diff for a pull request
@@ -182,11 +176,9 @@ module BitBucket
     #  bitbucket.repos.pull_requests.diff 'user-name', 'repo-name', 'pull-request-id'
     #
     def diff(user_name, repo_name, pull_request_id)
-      _update_user_repo_params(user_name, repo_name)
-      _validate_user_repo_params(user, repo) unless user? && repo?
-      _validate_presence_of pull_request_id
+      arguments(args, required: [:user, :repo, :pull_request_id])
 
-      get_request("/repositories/#{user}/#{repo}/pullrequests/#{pull_request_id}/diff")
+      get_request("/repositories/#{arguments.user}/#{arguments.repo}/pullrequests/#{arguments.pull_request_id}/diff")
     end
 
     # Get a log of all activity for a pull request
@@ -195,11 +187,13 @@ module BitBucket
     #  bitbucket = BitBucket.new
     #  bitbucket.repos.pull_requests.activity 'user-name', 'repo-name'
     #
-    def activity(user_name, repo_name)
-      _update_user_repo_params(user_name, repo_name)
-      _validate_user_repo_params(user, repo) unless user? && repo?
+    def activity(*args)
+      arguments(args, required: [:user, :repo, :pull_request_id])
+
+      response = get_request("/repositories/#{arguments.user}/#{arguments.repo}/pullrequests/#{arguments.pull_request_id}/activity")
 
-      get_request("/repositories/#{user}/#{repo}/pullrequests/activity")
+      return response unless block_given?
+      response.each { |el| yield el }
     end
   end # Repos::PullRequests
 end # BitBucket

data/lib/bitbucket_rest_api/configuration.rb

@@ -32,6 +32,7 @@ module BitBucket
 
     # The endpoint used to connect to BitBucket if none is set, in the event that BitBucket is ever available on location
     property :endpoint, default: 'https://bitbucket.org/api/1.0'.freeze
+    property :endpoint_v2, default: 'https://api.bitbucket.org/2.0'.freeze
 
     # The value sent in the http header for 'User-Agent' if none is set
     property :user_agent, default: "BitBucket Ruby Gem #{BitBucket::VERSION::STRING}".freeze

data/lib/bitbucket_rest_api/middleware.rb

@@ -11,11 +11,11 @@ module BitBucket
     def self.default(options = {})
       api = options[:api]
       proc do |builder|
-        builder.use Faraday::Request::Multipart
+        builder.use BitBucket::Request::Jsonize
         builder.use Faraday::Request::UrlEncoded
-        builder.use FaradayMiddleware::OAuth, {:consumer_key => api.client_id, :consumer_secret => api.client_secret, :token => api.oauth_token, :token_secret => api.oauth_secret} if api.client_id? and api.client_secret?
+        builder.use Faraday::Request::Multipart
+        builder.use BitBucket::Request::OAuth, {:consumer_key => api.client_id, :consumer_secret => api.client_secret, :token => api.oauth_token, :token_secret => api.oauth_secret} if api.client_id? and api.client_secret?
         builder.use BitBucket::Request::BasicAuth, api.authentication if api.basic_authed?
-        builder.use FaradayMiddleware::EncodeJson
 
         builder.use Faraday::Response::Logger if ENV['DEBUG']
         #builder.use BitBucket::Response::Helpers

data/lib/bitbucket_rest_api/pagination.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-
 module BitBucket
 
   # A module that decorates response with pagination helpers
@@ -7,7 +6,7 @@ module BitBucket
     include BitBucket::Constants
 
     def paginated?
-      body.is_a?(Hash) and body[PARAM_PAGE].nil?
+      body.is_a?(Hash) and !body[PARAM_PAGE].nil?
     end
 
     # Return page links
@@ -22,10 +21,10 @@ module BitBucket
     # instances or just per given request.
     #
     def auto_paginate(auto=false)
-      if (current_api.auto_pagination? || auto)
+      if paginated? and (current_api.auto_pagination? || auto)
         resources_bodies = []
         each_page do |resource|
-          if resource.body.respond_to?(:values)
+          if resource.body.respond_to?(:values) and resource.body[:values]
             resources_bodies += resource.body[:values].collect {|value| ::Hashie::Mash.new(value) }
           else
             resources_bodies += Array(resource.body)

data/lib/bitbucket_rest_api/version.rb

@@ -4,7 +4,7 @@ module BitBucket
   module VERSION
     MAJOR = 0
     MINOR = 3
-    PATCH = 0
+    PATCH = 1
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reenhanced_bitbucket_api
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Mike Cochran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2015-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -158,7 +158,6 @@ files:
 - lib/bitbucket_rest_api/client/repos/following.rb
 - lib/bitbucket_rest_api/client/repos/keys.rb
 - lib/bitbucket_rest_api/client/repos/pull_requests.rb
-- lib/bitbucket_rest_api/client/repos/pull_requests/activity.rb
 - lib/bitbucket_rest_api/client/repos/pull_requests/comments.rb
 - lib/bitbucket_rest_api/client/repos/pull_requests/commits.rb
 - lib/bitbucket_rest_api/client/repos/services.rb
@@ -239,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Ruby wrapper for the BitBucket API supporting OAuth and Basic Authentication

data/lib/bitbucket_rest_api/client/repos/pull_requests/activity.rb

@@ -1,22 +0,0 @@
-# encoding: utf-8
-
-module BitBucket
-  class Client::Repos::PullRequests::Activity < API
-    @version = '2.0'
-
-    # Get the activity for a pull request
-    #
-    # = Examples
-    #  bitbucket = BitBucket.new
-    #  bitbucket.repos.pull_requests.activity 'user-name', 'repo-name', 'pull-request-id'
-    #
-    def list(user_name, repo_name, pull_request_id)
-      _update_user_repo_params(user_name, repo_name)
-      _validate_user_repo_params(user, repo) unless user? && repo?
-      _validate_presence_of pull_request_id
-
-      get_request("/repositories/#{user}/#{repo}/pullrequests/#{pull_request_id}/activity")
-    end
-    alias :all :list
-  end
-end