diplomat 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 445d464dc2988296098c16f891bb2b46720f692c
-  data.tar.gz: a4ee11cee9896935714210c1c59e7ddeb61cf986
+  metadata.gz: 2dd54168c7c65cea06154d8f9e4ba3e69bab7c04
+  data.tar.gz: 42f4033666bbe21e3ee2e47008d544be6dd573d4
 SHA512:
-  metadata.gz: 1aed47485771894373cb7d45962d25462ac052943ae8a8be07c1b8e2cd44243f78c82f9872dff1036394da000f304391b0bebd26c6e4cf9cacb00f59e87f8b96
-  data.tar.gz: 7d81ef5a30156f58b43bb3668b40c2f8c0291f024d9146c50720d02d856b71541d2927c17027ccbf7e6740dafb2d5598b65ff947e7b45ab8aa9576d36425d930
+  metadata.gz: ef4255c1bfd8befb00b543d681bbdfb10c757941b6beda2bf42e582574537198ccf16496ef79e2fd80ac7db9e6225b44c95d4196b49dcd887744ee505489985e
+  data.tar.gz: 46854909ad71908ccb8de42fefb8b97c9be1889011f830d7180d9fd01b11e0ec0cb39b869ea389754d88dc74e0723e0acece5330c0edde8bd24a2fcab3162dad

data/README.md

@@ -184,6 +184,8 @@ Diplomat.configure do |config|
   config.middleware = MyCustomMiddleware
   # Connect into consul with custom access token (ACL)
   config.acl_token =  "xxxxxxxx-yyyy-zzzz-1111-222222222222"
+  # Set extra Faraday configuration options
+  config.options = {ssl: { version: :TLSv1_2 }}
 end
 ```
 
@@ -194,7 +196,7 @@ This is traditionally kept inside the `config/initializers` directory if you're
 -  [ ] Updating Docs with latest changes
 -  [ ] Using custom objects for response objects (instead of openStruct)
 -  [ ] PUTing and DELETEing services
--  [ ] Custom SSL Cert Middleware for faraday
+-  [x] Custom SSL Cert Middleware for faraday
 -  [x] Allowing the custom configuration of the consul url to connect to
 -  [x] Deleting Keys
 -  [x] Listing available services

data/lib/diplomat/configuration.rb

@@ -1,15 +1,17 @@
 module Diplomat
   class Configuration
     attr_accessor :middleware
-    attr_accessor :url, :acl_token
+    attr_accessor :url, :acl_token, :options
 
     # Override defaults for configuration
     # @param url [String] consul's connection URL
     # @param acl_token [String] a connection token used when making requests to consul
-    def initialize(url="http://localhost:8500", acl_token=nil)
+    # @param options [Hash] extra options to configure Faraday::Connection
+    def initialize(url="http://localhost:8500", acl_token=nil, options = {})
       @middleware = []
       @url = url
       @acl_token = acl_token
+      @options = options
     end
 
     # Define a middleware for Faraday

data/lib/diplomat/rest_client.rb

@@ -58,7 +58,7 @@ module Diplomat
     end
 
     def build_connection(api_connection, raise_error=false)
-      return api_connection || Faraday.new(:url => Diplomat.configuration.url) do |faraday|
+      return api_connection || Faraday.new(Diplomat.configuration.url, Diplomat.configuration.options) do |faraday|
         faraday.adapter  Faraday.default_adapter
         faraday.request  :url_encoded
         faraday.response :raise_error unless raise_error

data/lib/diplomat/version.rb

@@ -1,3 +1,3 @@
 module Diplomat
-  VERSION = "0.11.0"
+  VERSION = "0.12.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diplomat
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - John Hamelink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-24 00:00:00.000000000 Z
+date: 2015-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler