offline_consul-client 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7947f2ad814dbf05831a6e0fc0550ba4a0ec26c9
-  data.tar.gz: 9c7e5bd38424bbf61b6ec9a86ced4ac04e4428a9
+  metadata.gz: 7a224f7ff4d5849b3da62357983eff37d340dd34
+  data.tar.gz: e81df1790630c58fbe9351895be6e3e01f66c2b9
 SHA512:
-  metadata.gz: 3f4a33326b230a8304e504c27c8411c7f39a78e19234c36baadbd15d0f58ecfe2514ff404b9f3b97e6feb3bd8732a3730433d8c48769cdc42563c4cac27460b4
-  data.tar.gz: a56ec50d30dafc28a65c81fe9f1867050bf9d2ad59b06628902008b71a3d14304cc29e2107fd5699307eb99e39c26cf7e3ecd6454e8c69a598f58ea7f0d21b85
+  metadata.gz: 76b3156624259716fd1f1716fbc519b3470f4ea62a66b45c18ae77dededac9af5a7ce10374d0145882db441ed70de977e4ce4883551cfe18ce118265f1198a9a
+  data.tar.gz: b06c3496e34238d6aa3ddd024285c9fc4ef454396638e94880627129943862318ef995ae0268eb412e7f2d474d2187c6889979e829b61c68038f948cac8a1592

data/lib/consul/client/version.rb

@@ -1,5 +1,5 @@
 module Consul
   module Client
-    VERSION = "0.1.2"
+    VERSION = "0.2.0"
   end
 end

data/lib/consul/client.rb

@@ -14,38 +14,52 @@ module Consul
       @@config ||= Config.new
     end
 
-    def self.online_read(keypath, recurse=false)
-      response = http.get("/kv" + path(keypath) + (recurse ? '?recurse' : ''))
-      keyname = File.basename(keypath)
-      if response.length == 1 && response.keys.first == keyname
-        response = response.data[keyname]
-      end
-      decode_r(response)
+    def self.online_read(keypath, opts={})
+      response = http.get("/kv" + path(keypath) + (opts[:recursive] ? '?recurse' : ''))
     end
 
-    def self.offline_read(keypath, recurse=false)
-      files = if recurse
+    def self.offline_read(keypath, opts={})
+      files = if opts[:recursive]
                 Dir.glob(File.join(local_path, path(keypath) + '*'))
               else
                 [File.join(local_path, path(keypath) + ".yaml")]
               end
 
-      response = Hash[files.map do |filename|
-        [File.basename(filename).sub(/\.yaml$/, ''), File.open(filename){ |f| Consul::Data.new('Value' => Base64.encode64(f.read) )}]
-      end]
-      keyname = File.basename(keypath)
-      if response.length == 1 && response.keys.first == keyname
-        response = response[keyname]
+      key_data = files.map do |filename|
+        {}.tap do |data|
+          data['LockIndex']   = 0
+          data['Key']         = File.basename(filename).sub(/\.yaml$/, '')
+          data['Flags']       = 0
+          data['Value']       = Base64.encode64(File.read(filename))
+          data['CreateIndex'] = 0
+          data['ModifyIndex'] = 0
+        end
       end
-      decode_r(response)
+
+      response = Response.new(FakeNetHttpResponse.new(Psych.dump(key_data)))
     end
 
-    def self.read(keypath, recurse=false)
-      if is_online?
-        online_read(keypath, recurse)
+    def self.read(keypath, opts={})
+      obj = read_obj(keypath, opts)
+      if obj.respond_to?(:value)
+        obj.value
       else
-        offline_read(keypath, recurse)
+        Hash[obj.map{|k,v| [k, v.value] }]
+      end
+    end
+
+    def self.read_obj(keypath, opts={})
+      response = if is_online?
+                   online_read(keypath, opts)
+                 else
+                   offline_read(keypath, opts)
+                 end
+
+      keyname = File.basename(keypath)
+      if response.length == 1 && response.keys.first == keyname
+        response = response[keyname]
       end
+      response
     end
 
     def self.online_write(keypath,data=nil,path_mimic=false)

data/lib/consul/data.rb

@@ -1,22 +1,31 @@
 require 'base64'
+require 'forwardable'
 
 module Consul
   class Data
+    extend Forwardable
+
+    def_delegators :value, :to_a, :to_h, :to_i, :to_f, :to_s
 
     def initialize(response_hash)
       @response = response_hash
     end
 
     def value
-      Base64.decode64(hash_map('Value'))
+      text = Base64.decode64(hash_map('Value'))
+      begin
+        decoded = Consul::Client.decode(text)
+      rescue Psych::DisallowedClass, Psych::SyntaxError
+      end
+      decoded || text
     end
 
     def flags
       hash_map(__callee__)
     end
-    [:lock_index, :create_index, :modify_index, :session].each{ |a| alias_method a, :flags }
+    [:key, :lock_index, :create_index, :modify_index, :session].each{ |a| alias_method a, :flags }
 
-    private 
+    private
     def hash_map(key)
       @response[key.to_s.split('_').map{ |w| w.capitalize }.join]
     end

data/lib/consul/response.rb

@@ -9,7 +9,8 @@ module Consul
 
     attr_reader :response, :data
     def_delegators :response, :body, :code, :code_type
-    def_delegators :data, :keys, :values, :each, :to_a, :length
+    def_delegators :data, :keys, :values, :each, :to_a, :length, :map, :[]
+    def_delegators :to_ruby, :to_h, :to_a
 
     class KeyError < RuntimeError; end
 
@@ -47,7 +48,7 @@ module Consul
       elsif response.code_type == Net::HTTPNotFound
         raise KeyError, "Requested key not found"
       else
-        raise "Requeste failed"
+        raise "Request failed"
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: offline_consul-client
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Jason Scholl
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-10 00:00:00.000000000 Z
+date: 2016-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler