codeclimate-services 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0054c90b880e5234b968e1d7b22d6e8ce96f6ba
-  data.tar.gz: 7da2b030334e81ed263492809232d5a5eac4f999
+  metadata.gz: 62974a5f010b848b43edd501e04b3fd7e7efcc81
+  data.tar.gz: 6bf203a29ac168df6c9e420c47b180b9bca13660
 SHA512:
-  metadata.gz: 073441465b05c723b544409b507af2a5309d558657ff959e1d6317ebc2f393340bb67c9b72903dc860dcb996fba2d3b8ea6348f6cc5be18b30dc7f77c579b8fd
-  data.tar.gz: ab3e9b5ed0e03521974c27e810e5121f895157ce6096af705c86b2faac124e5189dda5aebe2b4486159f2d3999fbb51a4bc3ddf5731015dcfbd1f83686c618bd
+  metadata.gz: 2a0eb59655aff194805a6ec28ffb5275d2f038585cdbb0df9cd3e927808e6ea67fa61603fcbd46bdd66aa7e1617e3cf8d6a18f6ecd532465a06a1dc824fcd21c
+  data.tar.gz: cfb76a9402d0ee2edb54378b2a4735b8f01586b37739281cd507b9e6844289ecb19a6fe378bae4241553f2f4f1de42b7b2b0dd218d9a42b79adc136ac6536d6b

data/.ruby-version

@@ -1 +1 @@
-ruby-2.0.0-p353
+ruby-2.2.2

data/lib/cc/service/http.rb

@@ -4,6 +4,8 @@ require "cc/service/response_check"
 module CC::Service::HTTP
   extend ActiveSupport::Concern
 
+  REDIRECT_CODES = [302, 307]
+
   module ClassMethods
     def default_http_options
       @@default_http_options ||= {
@@ -20,15 +22,19 @@ module CC::Service::HTTP
   end
 
   def service_post(url, body = nil, headers = nil, &block)
-    block ||= lambda{|*args| Hash.new }
+    block ||= lambda{|*_args| Hash.new }
     response = raw_post(url, body, headers)
-    {
-      ok: response.success?,
-      params: body.as_json,
-      endpoint_url: url,
-      status: response.status,
-      message: "Success"
-    }.merge(block.call(response))
+    formatted_post_response(response, url, body).merge(block.call(response))
+  end
+
+  def service_post_with_redirects(url, body = nil, headers = nil, &block)
+    block ||= lambda{|*_args| Hash.new }
+    response = raw_post(url, body, headers)
+    if REDIRECT_CODES.include?(response.status)
+      response = raw_post(response.headers["location"], body, headers)
+    end
+
+    formatted_post_response(response, url, body).merge(block.call(response))
   end
 
   def raw_get(url = nil, params = nil, headers = nil)
@@ -84,4 +90,13 @@ module CC::Service::HTTP
     @ca_file ||= ENV.fetch("CODECLIMATE_CA_FILE", File.expand_path('../../../../config/cacert.pem', __FILE__))
   end
 
+  def formatted_post_response(response, url, body)
+    {
+      ok: response.success?,
+      params: body.as_json,
+      endpoint_url: url,
+      status: response.status,
+      message: "Success",
+    }
+  end
 end

data/lib/cc/services/version.rb

@@ -1,5 +1,5 @@
 module CC
   module Services
-    VERSION = "1.1.0"
+    VERSION = "1.2.0"
   end
 end

data/test/helper.rb

@@ -43,6 +43,14 @@ class CC::Service::TestCase < Test::Unit::TestCase
     ).service_post(*args)
   end
 
+  def service_post_with_redirects(*args)
+    service(
+      CC::Service,
+      { data: "my data" },
+      event(:quality, to: "D", from: "C")
+    ).service_post_with_redirects(*args)
+  end
+
   def stub_http(url, response = nil, &block)
     block ||= lambda{|*args| response }
     @stubs.post(url, &block)

data/test/service_test.rb

@@ -45,6 +45,21 @@ class TestService < CC::Service::TestCase
     assert_equal 200, response[:status]
   end
 
+  def test_post_redirect_success
+    stub_http("/my/test/url", [307, {"Location" => "/my/redirect/url"}, '{"ok": false, "redirect": true}'])
+    stub_http("/my/redirect/url", [200, {}, '{"ok": true, "thing": "123"}'])
+
+    response = service_post_with_redirects("/my/test/url", {token: "1234"}.to_json, {}) do |response|
+      body = JSON.parse(response.body)
+      { thing: body["thing"] }
+    end
+
+    assert_true response[:ok]
+    assert_equal '{"token":"1234"}', response[:params]
+    assert_equal "/my/test/url", response[:endpoint_url]
+    assert_equal 200, response[:status]
+  end
+
   def test_post_http_failure
     stub_http("/my/wrong/url", [404, {}, ""])
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codeclimate-services
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Bryan Helmkamp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-29 00:00:00.000000000 Z
+date: 2016-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -42,98 +42,98 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Service classes for Code Climate
@@ -143,9 +143,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -227,17 +227,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Service classes for Code Climate