ruby_doozer 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b15a0cb9ca75e17c5abe248f29b83f418570240b
-  data.tar.gz: 70fa3e7ccf86e679789a9f7858d80e90c5fada89
+  metadata.gz: d5d47ee0a6102bf34e1c122195959b683d1675a5
+  data.tar.gz: 6ffff10b2c3fc0081eb883bca20a8ea0eb9a8203
 SHA512:
-  metadata.gz: b71b533217dfc507366609a9a2dcf16fd0bd9451bc26b9fd07c22594e5e044e76a1b38a7ef105ddbeba08b08092fb0b95e7e2636f29b292342ed88c827055c5e
-  data.tar.gz: 86ed713d400eb0980ceb7c6d0da3171e9b84432d06c51eedc3049499b033d9f987d2dc537982f4840b7bb51bb3c725f4a243a91f41f1ca2c311ff6349902d647
+  metadata.gz: ee567d9875f26659295fbffcc7a492702168c5063889f8c7492786f916241f295c5b9b667e3be0db26d5736eb8c4fb7b912401e237db891c20e43bec33d08b76
+  data.tar.gz: 5e4a09132f67ae2b43c5b839897eb4925b66168c606f2013687c19da464bde398e6d15e02a4a8f3319f0eee84cc1da1c6b108197930427a47534189cac0304be

data/lib/ruby_doozer/cached_registry.rb

@@ -35,8 +35,8 @@ module RubyDoozer
       doozer_pool.with_connection do |doozer|
         @current_revision = doozer.current_revision
         # Fetch all the configuration information from Doozer and set the internal copy
-        doozer.walk(path, @current_revision).each do |node|
-          set_cached_value(relative_path(node.path), node.value)
+        doozer.walk(path, @current_revision) do |path, value, revision|
+          set_cached_value(relative_path(path), value)
         end
       end
 

data/lib/ruby_doozer/client.rb

@@ -109,27 +109,39 @@ module RubyDoozer
       invoke(Request.new(:path => secret, :verb => Request::Verb::ACCESS))
     end
 
-    # Returns every entry in the supplied path
+    # Iterate over every entry in the supplied path
     # path can also contain wildcard characters such as '*'
+    #
+    # Parameters:
+    #   path
+    #     The path including wildcard specifiers
+    #     The path must begin with '/'
+    #     The path can contain any of the following wildcard specifiers:
+    #       **            Includes the directory and it's children
+    #       *             Only values with that path
+    #     Example paths:
+    #       /**
+    #       /*
+    #       /configs/**
+    #       /ctl/node/*/addr
+    #
     # Example:
-    #   hosts = []
-    #   walk('/ctl/node/*/addr', current_revision).each do |node|
-    #     hosts << node.value unless hosts.include? node.value
+    #   client.walk('/**') do |path, value, revision|
+    #     puts "Found: #{path} => #{value}, Revision: #{revision}"
     #   end
-    def walk(path, rev = nil, offset = 0)
-      paths = []
+    def walk(path, rev = nil, offset = 0, &block)
+      paths = block ? nil : []
       revision = rev || current_revision
       # Resume walk on network connection failure
       @socket.retry_on_connection_failure do
         while true
           send(Request.new(:path => path, :rev => revision , :offset => offset, :verb => Request::Verb::WALK))
           response = read
-          if response.err_code
+          if response.err_code != 0
             break if response.err_code == Response::Err::RANGE
-          else
-            raise ResponseError.new("#{Response::Err.name_by_value(response.err_code)}: #{response.err_detail}") if response.err_code != 0
+            raise ResponseError.new("#{Response::Err.name_by_value(response.err_code)}: #{response.err_detail}")
           end
-          paths << response
+          block ? block.call(response.path, response.value, response.rev) : paths << response
           offset += 1
         end
       end
@@ -140,8 +152,8 @@ module RubyDoozer
     # representing another Doozer server that can be connected to
     def doozer_hosts
       hosts = []
-      walk('/ctl/node/*/addr', current_revision).each do |node|
-        hosts << node.value unless hosts.include? node.value
+      walk('/ctl/node/*/addr') do |path, value, revision|
+        hosts << value unless hosts.include? value
       end
     end
 
@@ -193,11 +205,13 @@ module RubyDoozer
     # Send the protobuf Request to Doozer
     def send(request)
       # Translate path so that underscores are converted to minuses
-      request.path.gsub!('_', '-')
+      # Don't change the original input value
+      request.path = request.path.gsub('_', '-')
       request.tag = 0
       data = request.serialize_to_string
       # An additional header is added to the request indicating the size of the request
       head = [data.length].pack("N")
+      logger.trace('Sending') {request.to_hash}
       @socket.write(head+data)
     end
 
@@ -208,7 +222,8 @@ module RubyDoozer
       length = head.unpack("N")[0]
       response = Response.new.parse_from_string(@socket.read(length))
       # Translate returned path so that minuses are converted to underscores
-      response.path.gsub!('_', '-')
+      response.path.gsub!('-', '_')
+      logger.trace('Received') {response.to_hash}
       response
     end
 

data/lib/ruby_doozer/registry.rb

@@ -156,8 +156,8 @@ module RubyDoozer
     def each_pair(&block)
       path = "#{@root_path}/**"
       doozer_pool.with_connection do |doozer|
-        doozer.walk(path, doozer.current_revision).each do |node|
-          block.call(relative_path(node.path), node.value)
+        doozer.walk(path) do |path, value, revision|
+          block.call(relative_path(path), value)
         end
       end
     end

data/lib/ruby_doozer/version.rb

@@ -1,3 +1,3 @@
 module RubyDoozer #:nodoc
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/test/client_test.rb

@@ -34,6 +34,8 @@ class ClientTest < Test::Unit::TestCase
     end
 
     context "with client connection" do
+      PATHS = ['/test/foo', '/test/with_underscores', '/test/deeper_one/and_again_with_multiple']
+
       setup do
         @client = RubyDoozer::Client.new(:server => 'localhost:8046')
       end
@@ -41,7 +43,7 @@ class ClientTest < Test::Unit::TestCase
       def teardown
         if @client
           @client.close
-          @client.delete('/test/foo')
+          PATHS.each {|path| @client.delete(path)}
         end
       end
 
@@ -49,19 +51,37 @@ class ClientTest < Test::Unit::TestCase
         assert @client.current_revision >= 0
       end
 
-      ['/test/foo', '/test/with_underscores'].each do |path|
+      context "successfully set and get data" do
+        PATHS.each do |path|
+          should "in #{path}" do
+            new_revision = @client.set(path, 'value')
+            result = @client.get(path)
+            assert_equal 'value', result.value
+            assert_equal new_revision, result.rev
+          end
+
+          should "successfully set and get data using array operators in #{path}" do
+            @client[path] = 'value2'
+            result = @client[path]
+            assert_equal 'value2', result
+          end
+        end
+      end
 
-        should "successfully set and get data in #{path}" do
-          new_revision = @client.set(path, 'value')
-          result = @client.get(path)
-          assert_equal 'value', result.value
-          assert_equal new_revision, result.rev
+      context "with a directory tree" do
+        setup do
+          PATHS.each {|path| @client[path] = path}
         end
 
-        should "successfully set and get data using array operators in #{path}" do
-          @client[path] = 'value2'
-          result = @client[path]
-          assert_equal 'value2', result
+        should "walk" do
+          # Fetch all the configuration information from Doozer and set the internal copy
+          count = 0
+          @client.walk('/test/**') do |path, value, revision|
+            assert_equal true, PATHS.include?(path)
+            assert_equal path, value
+            count += 1
+          end
+          assert_equal PATHS.size, count
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_doozer
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Reid Morrison