Merge pull request #65 from mtchavez/47-ssl-verify

Request overriding

Author: mtchavez

CHANGELOG.md

@@ -3,6 +3,7 @@
 * CircleCi::RecentBuilds#get - Replaces old CircleCi#organization endpoint to return all recent builds
 * Remove CircleCi#organization for CircleCi::RecentBuilds#get
 * CircleCi::Project#recent_builds - Takes params to supply limit, offset, and filter query params
+* RestClient::Request overrides or configuration per request is configurable via Config.request_overrides hash
 
 # Version 0.2.2 - (2016-02-26)
 

README.md

@@ -44,6 +44,17 @@ CircleCi.configure do |config|
 end
 ```
 
+Overriding request settings such as not verifying SSL
+
+```ruby
+CircleCi.configure do |config|
+  config.token = ENV['CIRCLECI_TOKEN']
+  config.request_overrides = {
+    verify_ssl: false
+  }
+end
+```
+
 ## API Endpoints
 
 * [User](#user)

lib/circleci/config.rb

@@ -9,7 +9,7 @@ class Config
     DEFAULT_URI = "#{DEFAULT_HOST}/api/#{DEFAULT_VERSION}".freeze
     DEFAULT_PORT = 80
 
-    attr_accessor :token, :host, :port, :version
+    attr_accessor :token, :host, :port, :request_overrides, :version
 
     ##
     #
@@ -19,6 +19,7 @@ def initialize
       @host = DEFAULT_HOST
       @port = DEFAULT_PORT
       @version = DEFAULT_VERSION
+      @request_overrides = {}
     end
 
     def uri

lib/circleci/http.rb

@@ -36,15 +36,20 @@ def build_params(params = {})
     end
 
     def create_request_args(http_verb, url, body)
-      return [http_verb, url, body, headers] if http_verb == 'post'
-      [http_verb, url, headers]
+      args = {
+        method: http_verb.to_sym,
+        url: url,
+        headers: headers }
+      args[:payload] = body if http_verb == 'post'
+      args.merge!(@config.request_overrides)
+      args
     end
 
     def request(http_verb, path, body = {})
       url  = "#{@config.uri}#{path}"
       args = create_request_args http_verb, url, body
 
-      RestClient.send(*args) do |res, _, raw_res|
+      RestClient::Request.execute(args) do |res, _, raw_res|
         body = res.body.to_s
         body.force_encoding(Encoding::UTF_8)
         code = raw_res.code.to_i

spec/spec_helper.rb

@@ -27,6 +27,9 @@
   config.before do
     CircleCi.configure do |c|
       c.token = ENV['TOKEN']
+      c.request_overrides = {
+        verify_ssl: false
+      }
     end
   end
 end