Merge pull request #34 from codacy/remove-extra-chars-from-url

Remove extra characters from commit uuid

Author: rtfpessoa

circle.yml

@@ -3,7 +3,6 @@ dependencies:
     - git config --global user.email "ci@codacy.com"
     - git config --global user.name "Codacy CI"
   override:
-    - rvm install 1.9.3-p551
     - rvm install 2.0.0-p648
     - rvm install 2.1.10
     - rvm install 2.2.5

codacy-coverage.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = ENV['PUBLISH_VERSION'] || '1.0.dev'.freeze
 
-  gem.required_ruby_version = '>= 1.9'
+  gem.required_ruby_version = '>= 2'
 
   gem.add_runtime_dependency 'simplecov'
 

lib/codacy/client.rb

@@ -11,7 +11,7 @@ def self.post_results(parsed_result)
       project_token = ENV['CODACY_PROJECT_TOKEN']
       codacy_base_api = ENV['CODACY_BASE_API_URL'] || 'https://api.codacy.com'
       commit = Codacy::Git.commit_id
-      url = codacy_base_api + '/2.0/coverage/' + commit + '/ruby'
+      create_url(codacy_base_api, commit)
 
       result = parsed_result.to_json
 
@@ -51,5 +51,10 @@ def self.send_request(url, content, project_token, redirects = 3)
     def self.logger
       Codacy::Configuration.logger
     end
+
+    def self.create_url(codacy_base_api, commit)
+      commit = commit.gsub(/[^[:alnum:]]/, "")
+      codacy_base_api + '/2.0/coverage/' + commit + '/ruby'
+    end
   end
 end

scripts/ci.sh

@@ -2,11 +2,6 @@
 
 set -e
 
-rvm use 1.9.3-p551
-ruby -v
-bundle install --gemfile Gemfile.ruby-19
-bundle exec rspec
-
 rvm use 2.0.0-p648
 ruby -v
 bundle install

spec/codacy/client_spec.rb

@@ -0,0 +1,17 @@
+require "spec_helper"
+
+describe Codacy::ClientAPI do
+  describe 'create url' do
+      it 'checks if the url is correct.' do
+        codacy_base_api = 'https://api.codacy.com'
+
+        expected_commit_uuid = "9a7d25976a11f2a145f8fee7c4e4ad58b621d560"
+        expected_url = Codacy::ClientAPI.create_url(codacy_base_api, expected_commit_uuid)
+        
+        wrong_commit_uuid = "'9a7d25976a11f2a145f8fee7c4e4ad58b621d560'"
+        fixed_url = Codacy::ClientAPI.create_url(codacy_base_api, wrong_commit_uuid)
+        
+        expect(fixed_url).to eq expected_url
+    end
+  end
+end