diplomat 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a3ab874e23af2f1bb2b948042ad44f7d2e5f8b0
-  data.tar.gz: e1475ee44c0a29db12fe3aef0d3b315db42f0b63
+  metadata.gz: 781ef66fd58770259245d9d3624499232db1cdbe
+  data.tar.gz: cffd83536d1936f5f1189129fbf1d238a1555c8b
 SHA512:
-  metadata.gz: ada6d5c84b4499c4c8578cd435a6c5eb33462a3216a9869f5c6f6910d9c5b3a0213ac29723e6fbc7617bab7940c6654d707b83ade1b60e56b7c582c72d187801
-  data.tar.gz: e412d9cfdb1177412c186295573362dd58c6c94dd2904c593cdb2fcabb01ff629af03e31bb3d182f9311db256e71464595fd615f304c168b5b0935bb77e167a5
+  metadata.gz: b5b01504b9b8c7f8aac4f08e13837a36018ea7005a198e4d0dfba97568ff65f3417ed8ef33d061f2a2a2ba5adb421ad7ef691018f0e7883a714a798e0a823f1d
+  data.tar.gz: 38034ad0d2add4cbb6368ba65af19c6ee066daa56b39fa8a3f12674d269240527e75765fd4648c17b2ca3b4de556299ed556e55d27475e6e72dc59a30b26e21e

data/README.md

@@ -39,10 +39,12 @@ production:
 
 [See here](http://www.consul.io/intro/). I managed to roll it out on my production machines with the help of [Ansible](http://www.ansible.com/) in one working day.
 
-### Which versions of Ruby does Diplomat support?
+### Which versions of Ruby does Diplomat support? Where did my ruby 1.9 compatibility go?
 
 Check out [Travis](https://travis-ci.org/WeAreFarmGeek/diplomat) to see which versions of ruby we currently test when we're making builds.
 
+We've dropped ruby 1.9 support. You can still depend on Diplomat by directly using the `ruby-1.9-compatible` branch on github, although be advised it's not actively maintained anymore.
+
 ## Usage
 
 [The most up to date place to read about the API is here.](http://rubydoc.info/github/WeAreFarmGeek/diplomat)
@@ -76,7 +78,6 @@ foo = Diplomat::Kv.get('foo', :dc => 'dc-west')
 ```
 
 You can also retrieve values recursively:
-
 ```ruby
 Diplomat::Kv.put('foo/a', 'lorem')
 Diplomat::Kv.put('foo/b', 'ipsum')
@@ -86,11 +87,21 @@ Diplomat::Kv.get('foo/', recurse: true)
 # => [{:key=>"foo/a", :value=>"lorem"}, {:key=>"foo/b", :value=>"ipsum"}, {:key=>"foo/c", :value=>"dolor"}]
 ```
 
+
 Or list all available keys:
 
 ```ruby
 Diplomat::Kv.get('/', :keys => true) # => ['foo/a', 'foo/b']
 ```
+You can convert the consul data to a ruby hash
+```ruby
+Diplomat::Kv.put('foo/a', 'lorem')
+Diplomat::Kv.put('foo/b', 'ipsum')
+Diplomat::Kv.put('foo/c', 'dolor')
+
+Diplomat::Kv.get('foo/', recurse: true, convert_to_hash: true)
+# => {"foo"=>{"a"=>"lorem", "b"=>"ipsum", "c"=>"dolor"}}
+```
 
 ### Nodes
 

data/lib/diplomat/health.rb

@@ -46,11 +46,13 @@ module Diplomat
     # @param s [String] the service
     # @param options [Hash] :dc string for dc specific query
     # @param options [Hash] :state string for specific service state
+    # @param options [Hash] :tag string for specific tag
     # @return [OpenStruct] all data associated with the node
     def service s, options=nil
       url = ["/v1/health/service/#{s}"]
       url << use_named_parameter('dc', options[:dc]) if options and options[:dc]
       url << options[:state] if options and options[:state]
+      url << use_named_parameter('tag', options[:tag]) if options and options[:tag]
 
       # If the request fails, it's probably due to a bad path
       # so return a PathNotFound error. 

data/lib/diplomat/kv.rb

@@ -20,6 +20,7 @@ module Diplomat
     # @option options [Boolean] :decode_values Return consul response with decoded values.
     # @option options [String] :separator List only up to a given separator. Only applies when combined with :keys option.
     # @option options [Boolean] :nil_values If to return keys/dirs with nil values
+    # @option options [Boolean] :convert_to_hash Take the data returned from consul and build a hash
     # @option options [Callable] :transformation funnction to invoke on keys values
     # @param not_found [Symbol] behaviour if the key doesn't exist;
     #   :reject with exception, :return degenerate value, or :wait for it to appear
@@ -81,6 +82,9 @@ module Diplomat
             if @options and @options[:decode_values]
               return decode_values
             end
+            if @options and @options[:convert_to_hash]
+              return convert_to_hash(return_value(return_nil_values, transformation))
+            end
             return return_value(return_nil_values, transformation)
           when :wait
             index = raw.headers["x-consul-index"]
@@ -127,11 +131,13 @@ module Diplomat
     # @param key [String] the key
     # @param options [Hash] the query params
     # @option options [String] :dc Target datacenter
+    # @option options [Boolean] :recurse If to make recursive get or not
     # @return [OpenStruct]
     def delete key, options=nil
       @key = key
       @options = options
       url = ["/v1/kv/#{@key}"]
+      url += recurse_get(@options)
       url += check_acl_token
       url += dc(@options)
       @raw = @conn.delete concat_url url

data/lib/diplomat/node.rb

@@ -25,7 +25,7 @@ module Diplomat
       rescue Faraday::ClientError
         raise Diplomat::PathNotFound
       end
-      return JSON.parse(ret.body)
+      return OpenStruct.new JSON.parse(ret.body)
     end
 
     # Get all the nodes

data/lib/diplomat/rest_client.rb

@@ -43,9 +43,35 @@ module Diplomat
       # @param *args Arguments list
       # @return [Boolean]
       def method_missing(meth_id, *args)
-        access_method?(meth_id) ? new.send(meth_id, *args) : super
+        if access_method?(meth_id)
+          new.send(meth_id, *args)
+        else
+
+          # See https://bugs.ruby-lang.org/issues/10969
+          begin
+            super
+          rescue NameError => err
+            raise NoMethodError, err
+          end
+        end
+      end
+
+      # Make `respond_to?` aware of method short-cuts.
+      #
+      # @param meth_id [Symbol] the tested method
+      # @oaram with_private if private methods should be tested too
+      def respond_to?(meth_id, with_private = false)
+        access_method?(meth_id) || super
       end
 
+      # Make `respond_to_missing` aware of method short-cuts. This is needed for
+      # {#method} to work on these, which is helpful for testing purposes.
+      #
+      # @param meth_id [Symbol] the tested method
+      # @oaram with_private if private methods should be tested too
+      def respond_to_missing?(meth_id, with_private = false)
+        access_method?(meth_id) || super
+      end
     end
 
     private
@@ -69,6 +95,44 @@ module Diplomat
       end
     end
 
+    #Converts k/v data into ruby hash
+    def convert_to_hash(data)
+      collection = []
+      master     = {}
+      data.each do |item|
+        split_up = item[:key].split ?/
+        sub_hash = {}
+        temp = nil
+        real_size = split_up.size - 1
+        for i in 0..real_size do
+           if i == 0
+              temp = {}
+              sub_hash[split_up[i]] = temp
+              next
+           end
+           if i == real_size
+              temp[split_up[i]] = item[:value]
+           else
+              new_h = {}
+              temp[split_up[i]] = new_h
+              temp = new_h
+           end
+         end
+         collection << sub_hash
+      end
+
+      collection.each do |h|
+         n = deep_merge(master, h)
+         master = n
+      end
+      master
+    end
+
+    def deep_merge(first, second)
+        merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
+        first.merge(second, &merger)
+    end
+
     # Parse the body, apply it to the raw attribute
     def parse_body
       return JSON.parse(@raw.body) if @raw.status == 200

data/lib/diplomat/version.rb

@@ -1,3 +1,3 @@
 module Diplomat
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diplomat
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - John Hamelink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-08 00:00:00.000000000 Z
+date: 2016-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler