Merge pull request #60 from cltweedie/improving_coverage

Improving coverage

Author: dmgarland

bitbucket_rest_api.gemspec

@@ -23,11 +23,12 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'simple_oauth'
 
   gem.add_development_dependency 'rspec', '>= 0'
+  gem.add_development_dependency 'rack-test'
   gem.add_development_dependency 'webmock', '~> 1.8.0'
   gem.add_development_dependency 'vcr', '~> 2.2.0'
   gem.add_development_dependency 'simplecov', '~> 0.6.1'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'bundler'
-  gem.add_development_dependency 'pry-debugger'
+  gem.add_development_dependency 'pry-byebug'
   gem.add_development_dependency 'mocha'
 end

lib/bitbucket_rest_api/api.rb

@@ -6,7 +6,6 @@
 require 'bitbucket_rest_api/request'
 require 'bitbucket_rest_api/core_ext/hash'
 require 'bitbucket_rest_api/core_ext/array'
-require 'bitbucket_rest_api/compatibility'
 require 'bitbucket_rest_api/api/actions'
 require 'bitbucket_rest_api/api_factory'
 

lib/bitbucket_rest_api/api/actions.rb

@@ -31,17 +31,5 @@ def api_methods_in(klass)
       methods
     end
 
-    def append_arguments(method)
-      _method = self.method(method)
-      if _method.arity == 0
-        args = "()"
-      elsif _method.arity > 0
-        args = "(few)"
-      else
-        args = "(else)"
-      end
-      args
-    end
-
   end # API
 end # BitBucket

lib/bitbucket_rest_api/client.rb

@@ -16,8 +16,7 @@ def issues(options = {})
 
     # An API for users to manage their own tokens.
     def oauth(options = {})
-      raise "Unimpletmented"
-      #@oauth ||= ApiFactory.new 'Authorizations', options
+      @oauth ||= ApiFactory.new 'Request::OAuth', options
     end
     alias :authorizations :oauth
 
@@ -27,8 +26,7 @@ def teams(options = {})
     end
 
     def pull_requests(options = {})
-      raise "Unimplemented"
-      #@pull_requests ||= ApiFactory.new 'PullRequests', options
+      @pull_requests ||= ApiFactory.new 'Repos::PullRequest', options
     end
 
     def repos(options = {})

lib/bitbucket_rest_api/compatibility.rb

@@ -69,13 +69,13 @@ def services
       @services ||= ApiFactory.new 'Repos::Services'
     end
     def forks
-      @services ||= ApiFactory.new 'Repos::Forks'
+      @forks ||= ApiFactory.new 'Repos::Forks'
     end
     def commits
-      @services ||=ApiFactory.new 'Repos::Commits'
+      @commits ||=ApiFactory.new 'Repos::Commits'
     end
     def download
-      @services ||=ApiFactory.new "Repos::Download"
+      @download ||=ApiFactory.new "Repos::Download"
     end
 
     # Access to Repos::PullRequests API

lib/bitbucket_rest_api/repos.rb

@@ -2,19 +2,19 @@
 
 module BitBucket
   class Repos::Download < API
-     REQUIRED_KEY_PARAM_NAMES = %w[ commit_hash ].freeze
-def get(user_name, repo_name, params={})
-      _update_user_repo_params(user_name, repo_name)
-      _validate_user_repo_params(user, repo) unless user? && repo?
-#       normalize! params
-#       assert_required_keys(REQUIRED_KEY_PARAM_NAMES, params)
-  
-#https://bitbucket.org/jhanley85/eternum_canvas_demo/get/fd931f96f12d.zip
-  "https://bitbucket.org/#{user}/#{repo.downcase}/get/#{params[:commit_hash]}.tar.gz"
+    REQUIRED_KEY_PARAM_NAMES = %w[ commit_hash ].freeze
+    def get(user_name, repo_name, params={})
+          _update_user_repo_params(user_name, repo_name)
+          _validate_user_repo_params(user, repo) unless user? && repo?
+    #       normalize! params
+    #       assert_required_keys(REQUIRED_KEY_PARAM_NAMES, params)
+
+    #https://bitbucket.org/jhanley85/eternum_canvas_demo/get/fd931f96f12d.zip
+      "https://bitbucket.org/#{user}/#{repo.downcase}/get/#{params[:commit_hash]}.tar.gz"
     end
-    
-    
-    
+
+
+
 
 
   end # Repos::Keys

lib/bitbucket_rest_api/repos/download.rb

@@ -13,17 +13,19 @@ class OAuth < Faraday::Middleware
 
       def call(env)
         # Extract parameters from the query
+        request = Rack::Request.new env
+        env[:url] = URI.parse(request.url) if env[:url].nil?
         params = {  }.update query_params(env[:url])
 
         if (@token and @secret) and (!@token.empty? and !@secret.empty?)
           access_token = ::OAuth::AccessToken.new(@consumer, @token, @secret)
           env[:url].query = build_query params
-          
+
           puts oauth_helper.header
           puts oauth_helper.header.class
           env[:request_headers].merge!(AUTH_HEADER => oauth_helper.header)
         end
-          
+
           env[:url].query = build_query params
 
 

lib/bitbucket_rest_api/request/oauth.rb

@@ -3,6 +3,10 @@
 describe BitBucket::Authorization do
   let(:oauth_api) { BitBucket::API.new(oauth_token: 'example_oauth_token') }
   let(:basic_auth_api) { BitBucket::API.new(basic_auth: 'example_login:example_password') }
+  let(:basic_auth_api_hash) do
+    BitBucket::API.new(
+      basic_auth: { login: 'example_login', password: 'example_password' })
+  end
   let(:login_and_password_api) do
     BitBucket::API.new(
       login:      'example_login',
@@ -12,43 +16,52 @@
   end
 
   describe '#authenticated?' do
-    context 'context: oauth authentication' do
-      it 'should return true of oauth is used' do
+    context 'oauth authentication' do
+      it 'should return true if oauth is used' do
         expect(oauth_api.authenticated?).to eq(true)
       end
     end
 
-    context 'context: basic authentication' do
+    context 'basic authentication' do
       it 'should return true if basic authentication is used' do
         expect(basic_auth_api.authenticated?).to eq(true)
       end
     end
   end
 
   describe '#basic_authed?' do
-    context 'context: with basic_auth' do
+    context 'with basic_auth' do
       it 'should return true if basic_auth is set' do
         expect(basic_auth_api.basic_authed?).to eq(true)
+        expect(basic_auth_api_hash.basic_authed?).to eq(true)
       end
     end
 
-    context 'context: with login and password' do
+    context 'with login and password' do
       it 'should return true if a login and password are set' do
         expect(login_and_password_api.basic_authed?).to eq(true)
       end
     end
   end
 
   describe '#authentication' do
-    context 'context: with basic_auth' do
+    context 'with basic_auth as a string' do
       it 'should return a hash containing the value for :basic_auth' do
         expectation = { basic_auth: 'example_login:example_password' }
 
         expect(basic_auth_api.authentication).to eq(expectation)
       end
     end
 
-    context 'context: with login and password' do
+    context 'with basic_auth as a hash' do
+      it 'should return a hash containing the value for :basic_auth' do
+        expectation = { basic_auth: { login: 'example_login', password: 'example_password'} }
+
+        expect(basic_auth_api_hash.authentication).to eq(expectation)
+      end
+    end
+
+    context 'with login and password' do
       it 'should return a hash containing values for :login and :password' do
         expectation = { login: 'example_login', password: 'example_password' }
 

spec/bitbucket_rest_api/authorization_spec.rb

@@ -9,5 +9,7 @@
     expect(client.users).to be_a BitBucket::Users
     expect(client.user_api).to be_a BitBucket::User
     expect(client.invitations).to be_a BitBucket::Invitations
+    expect(client.pull_requests).to be_a BitBucket::Repos::PullRequest
+    expect(client.oauth).to be_a BitBucket::Request::OAuth
   end
 end