Extract repeated methods into single method in api

Author: cltweedie

lib/bitbucket_rest_api/api.rb

@@ -80,6 +80,11 @@ def method_missing(method, *args, &block) # :nodoc:
       end
     end
 
+    def update_and_validate_user_repo_params(user_name, repo_name)
+      _update_user_repo_params(user_name, repo_name)
+      _validate_user_repo_params(user, repo) unless user? && repo?
+    end
+
     def _update_user_repo_params(user_name, repo_name=nil) # :nodoc:
       self.user = user_name || self.user
       self.repo = repo_name || self.repo

lib/bitbucket_rest_api/repos/default_reviewers.rb

@@ -9,8 +9,7 @@ class Repos::DefaultReviewers < API
     #  bitbucket.repos.default_reviewers.list 'user-name', 'repo-name' { |reviewer| ... }
     #
     def list(user_name, repo_name, params={})
-      _update_user_repo_params(user_name, repo_name)
-      _validate_user_repo_params(user, repo) unless user? && repo?
+      update_and_validate_user_repo_params(user_name, repo_name)
       normalize! params
 
       response = get_request("/2.0/repositories/#{user_name}/#{repo_name}/default-reviewers", params)
@@ -26,8 +25,7 @@ def list(user_name, repo_name, params={})
     #  bitbucket.repos.default_reviewers.get 'user-name', 'repo-name', 'reviewer-username'
     #
     def get(user_name, repo_name, reviewer_username, params={})
-      _update_user_repo_params(user_name, repo_name)
-      _validate_user_repo_params(user, repo) unless user? && repo?
+      update_and_validate_user_repo_params(user_name, repo_name)
       normalize! params
 
       get_request("/2.0/repositories/#{user_name}/#{repo_name}/default-reviewers/#{reviewer_username}", params)
@@ -40,8 +38,7 @@ def get(user_name, repo_name, reviewer_username, params={})
     #  bitbucket.repos.default_reviewers.add 'user-name', 'repo-name', 'reviewer-username'
     #
     def add(user_name, repo_name, reviewer_username, params={})
-      _update_user_repo_params(user_name, repo_name)
-      _validate_user_repo_params(user, repo) unless user? && repo?
+      update_and_validate_user_repo_params(user_name, repo_name)
       normalize! params
 
       put_request("/2.0/repositories/#{user_name}/#{repo_name}/default-reviewers/#{reviewer_username}", params)
@@ -54,10 +51,8 @@ def add(user_name, repo_name, reviewer_username, params={})
     #  bitbucket.repos.default_reviewers.remove 'user-name', 'repo-name', 'reviewer-username'
     #
     def remove(user_name, repo_name, reviewer_username, params={})
-      _update_user_repo_params(user_name, repo_name)
-      _validate_user_repo_params(user, repo) unless user? && repo?
+      update_and_validate_user_repo_params(user_name, repo_name)
       normalize! params
-
       delete_request("/2.0/repositories/#{user_name}/#{repo_name}/default-reviewers/#{reviewer_username}", params)
     end
   end