ruby_doozer 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef156e41c4d70417b9ccb4128c22b817c926c474
-  data.tar.gz: c8c054bea13c4933368e12838526de1febe4e37a
+  metadata.gz: b15a0cb9ca75e17c5abe248f29b83f418570240b
+  data.tar.gz: 70fa3e7ccf86e679789a9f7858d80e90c5fada89
 SHA512:
-  metadata.gz: 9483ea907342682619bb3e44a5bffa9c63b0f9519fedc9ced96b7e4b579fe07c2e6ab73f259a6711db5ad1f9f0b130f8d84187336523ac8660030121f57d81ef
-  data.tar.gz: 8c5c70714dff4fe12c1cb7fda7573bcb37cb73f927f388460a6e0772d66d3e07778ea218d4d730b6c89af09255b7404e125c890a235eee3550fdb9b0cceca1b0
+  metadata.gz: b71b533217dfc507366609a9a2dcf16fd0bd9451bc26b9fd07c22594e5e044e76a1b38a7ef105ddbeba08b08092fb0b95e7e2636f29b292342ed88c827055c5e
+  data.tar.gz: 86ed713d400eb0980ceb7c6d0da3171e9b84432d06c51eedc3049499b033d9f987d2dc537982f4840b7bb51bb3c725f4a243a91f41f1ca2c311ff6349902d647

data/lib/ruby_doozer/cached_registry.rb

@@ -29,14 +29,14 @@ module RubyDoozer
     #
     def initialize(params)
       super
-      @registry = ThreadSafe::Hash.new
+      @cache = ThreadSafe::Hash.new
 
       path = "#{@root_path}/**"
       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|
-          @registry[relative_path(node.path)] = node.value
+          set_cached_value(relative_path(node.path), node.value)
         end
       end
 
@@ -46,7 +46,7 @@ module RubyDoozer
 
     # Retrieve the latest value from a specific path from the registry
     def [](path)
-      @registry[path]
+      @cache[path]
     end
 
     # Iterate over every key, value pair in the registry at the root_path
@@ -56,17 +56,17 @@ module RubyDoozer
     def each_pair(&block)
       # Have to duplicate the registry otherwise changes to the registry will
       # interfere with the iterator
-      @registry.dup.each_pair(&block)
+      @cache.dup.each_pair(&block)
     end
 
     # Returns [Array<String>] all paths in the registry
     def paths
-      @registry.keys
+      @cache.keys
     end
 
     # Returns a copy of the registry as a Hash
     def to_h
-      @registry.dup
+      @cache.dup
     end
 
     # When an entry is created the block will be called
@@ -96,12 +96,29 @@ module RubyDoozer
     ############################
     protected
 
+    # Sets the internal value for a specific key
+    # Called on startup to fill the internal registry and then every time a value
+    # changes in doozer
+    # This method can be replaced by derived Registries to change the format of
+    # the registry
+    def set_cached_value(doozer_path, value)
+      @cache[doozer_path] = value
+    end
+
+    # Returns the internal value for a specific key
+    # Called every time a value changes in doozer
+    # This method can be replaced by derived Registries to change the format of
+    # the registry
+    def get_cached_value(doozer_path)
+      @cache[doozer_path]
+    end
+
     # The path has been added or updated in the registry
     def changed(path, value)
-      previous_value = @registry[path]
+      previous_value = get_cached_value(path)
 
       # Update in memory copy
-      @registry[path] = value
+      set_cached_value(path, value)
 
       # It is an update if we already have a value
       if previous_value

data/lib/ruby_doozer/client.rb

@@ -9,6 +9,11 @@ module RubyDoozer
     include SemanticLogger::Loggable
 
     # Create a resilient client connection to a Doozer server
+    #
+    # Since Doozer does not support '_' and it is very prevalent in Ruby, all
+    # '_' passed in the path will be converted to '-' when calling doozer.
+    # All paths in doozer that contain '-' on the way back from doozer will be
+    # converted to '_'
     def initialize(params={})
       # User configurable options
       params[:read_timeout]           ||= 5
@@ -187,6 +192,8 @@ module RubyDoozer
 
     # Send the protobuf Request to Doozer
     def send(request)
+      # Translate path so that underscores are converted to minuses
+      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
@@ -199,7 +206,10 @@ module RubyDoozer
       # First strip the additional header indicating the size of the subsequent response
       head = @socket.read(4,nil,timeout)
       length = head.unpack("N")[0]
-      Response.new.parse_from_string(@socket.read(length))
+      response = Response.new.parse_from_string(@socket.read(length))
+      # Translate returned path so that minuses are converted to underscores
+      response.path.gsub!('_', '-')
+      response
     end
 
   end

data/lib/ruby_doozer/version.rb

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

data/test/client_test.rb

@@ -49,17 +49,20 @@ class ClientTest < Test::Unit::TestCase
         assert @client.current_revision >= 0
       end
 
-      should "successfully set and get data" do
-        new_revision = @client.set('/test/foo', 'value')
-        result = @client.get('/test/foo')
-        assert_equal 'value', result.value
-        assert_equal new_revision, result.rev
-      end
+      ['/test/foo', '/test/with_underscores'].each do |path|
+
+        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
+        end
 
-      should "successfully set and get data using array operators" do
-        @client['/test/foo'] = 'value2'
-        result = @client['/test/foo']
-        assert_equal 'value2', result
+        should "successfully set and get data using array operators in #{path}" do
+          @client[path] = 'value2'
+          result = @client[path]
+          assert_equal 'value2', result
+        end
       end
 
       should "fetch directories in a path" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_doozer
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-29 00:00:00.000000000 Z
+date: 2013-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic_logger