diplomat 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b0b78c3defb59f640674929aa84736f259b301d
-  data.tar.gz: 57dc6f99df3cb29304ac35a3c0154cdc3476bb25
+  metadata.gz: 16afe93a848c61faa819d4e4a30cf6ff7ba25047
+  data.tar.gz: 49389f757e990d27619c4c5863c00d3691e0fdad
 SHA512:
-  metadata.gz: 5622c913dcec5213b2fb595ab1e9f9fc4d869502f9b95d7e1794980203511c000a16966e98d6a32abe7e77852f8308b4bf52031e8b19651518a832dc785dae3a
-  data.tar.gz: 0f2e7d0534fa3fd79a497a01b126b3b1251c3fb4a949d447c949bb8968c5e626e8963df0a70c8afd0864491e463e370fa3dd51d72c3ac7728970994e95ae86f6
+  metadata.gz: 5bcd8d4eb6b4675bcc99d0bb2aba4240d3e710c316403529bca27f898fb6597721f654ef0dfeda98e4c1ded9f4ef1f2526eb1b52ce0968c554d943f2536e05cb
+  data.tar.gz: 9488168bcc6a5f9527a42f9f5d4e1806696a63e9cb8403aaa9ec5ea38e694e3e6e11b07e58d435def608836bf4fb839d03ca5663697884136b1f1494df1aa38f

data/README.md

@@ -82,6 +82,21 @@ foo_service = Diplomat::Service.get('foo', :all)
 # => [#<OpenStruct Node="hotel", Address="1.2.3.4", ServiceID="hotel_foo", ServiceName="foo", ServiceTags=["foo"], ServicePort=5432>,#<OpenStruct Node="indigo", Address="1.2.3.5", ServiceID="indigo_foo", ServiceName="foo", ServiceTags=["foo"], ServicePort=5432>]
 ```
 
+### Custom configuration
+
+You can create a custom configuration using the following syntax:
+
+```ruby
+Diplomat.configure do |config|
+  # Set up a custom Consul URL
+  config.url = "localhost:8888"
+  # Set up a custom Faraday Middleware
+  config.middleware = MyCustomMiddleware
+end
+```
+
+This is traditionally kept inside the `config/initializers` directory if you're using rails. The middleware allows you to customise what happens when faraday sends and receives data. This can be useful if you want to instrument your use of diplomat, for example. You can read more about Faraday's custom middleware [here](http://stackoverflow.com/a/20973008).
+
 ### Todo
 
  - Updating docs with latest changes

data/lib/diplomat/service.rb

@@ -7,9 +7,29 @@ module Diplomat
     # Get a service by it's key
     # @param key [String] the key
     # @param scope [Symbol] :first or :all results
+    # @param options [Hash] :wait string for wait time and :index for index of last query
+    # @param meta [Hash] output structure containing header information about the request (index)
     # @return [OpenStruct] all data associated with the service
-    def get key, scope=:first
-      ret = @conn.get "/v1/catalog/service/#{key}"
+    def get key, scope=:first, options=nil, meta=nil
+
+      qs = ""
+      sep = "?"
+      if options and options[:wait]
+        qs = "#{qs}#{sep}wait=#{options[:wait]}"
+        sep = "&"
+      end
+      if options and options[:index]
+        qs = "#{qs}#{sep}index=#{options[:index]}"
+        sep = "&"
+      end
+
+      ret = @conn.get "/v1/catalog/service/#{key}#{qs}"
+
+      if meta and ret.headers
+        meta[:index] = ret.headers["x-consul-index"]
+        meta[:knownleader] = ret.headers["x-consul-knownleader"]
+        meta[:lastcontact] = ret.headers["x-consul-lastcontact"]
+      end
 
       if scope == :all
         return JSON.parse(ret.body).map { |service| OpenStruct.new service }

data/lib/diplomat/version.rb

@@ -1,3 +1,3 @@
 module Diplomat
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diplomat
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - John Hamelink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-20 00:00:00.000000000 Z
+date: 2015-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -205,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Diplomat is a simple wrapper for Consul