ruby_doozer 0.7.1 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53d62af2e149701f6286454279bc9a3c0926f8fe
-  data.tar.gz: fddfe20acb8c854bce8978cf42f5a8454015ac2f
+  metadata.gz: e83acc597055a875d20c92d037fb992d0166273b
+  data.tar.gz: 0cb9e70c5cc7b9130f681e7cbbc3fb126f195304
 SHA512:
-  metadata.gz: abd6b9d7abf264cc78177280166a03e6fa46b390a479d8eb33a73b4f6b249a87899d1b8479a0571dd529eef756789e4aa4ace209ab24c45aae11fcd02b679257
-  data.tar.gz: 754a8d03f0cd1be7ab4bcc4a09960e503a530bb2617888bc0494313f0f28a28c68ffa3d63ad615357d3baffc774a36a02a1074aa30ab881b5f5df48e5e3fa024
+  metadata.gz: 5e11dac52b461cb60a837a9483adf82b5dcd5ef258bd1fd7f5e3100e3e338dde029c1225bdc8721a446aa488a2511ef91b32869cafe06c6c240e29cd5fc60c31
+  data.tar.gz: 9582f130e14f81ae57af645d0d317819afe0f522385b4972742dde16d2b9353a36c21b3b8aa263c313d7e60bfa4d384b34227bfdd563d8546fa91436065f2dce

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 group :test do
   gem "shoulda"

data/Gemfile.lock

@@ -1,35 +1,34 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
-    atomic (1.0.2)
-    bourne (1.4.0)
-      mocha (~> 0.13.2)
+    activesupport (4.0.0)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    atomic (1.1.10)
     gene_pool (1.3.0)
-    i18n (0.6.1)
-    metaclass (0.0.1)
-    mocha (0.13.3)
-      metaclass (~> 0.0.1)
-    multi_json (1.7.2)
-    rake (10.0.4)
+    i18n (0.6.4)
+    minitest (4.7.5)
+    multi_json (1.7.7)
+    rake (10.1.0)
     resilient_socket (0.5.0)
       semantic_logger (>= 2.1)
     ruby_protobuf (0.4.11)
     semantic_logger (2.1.0)
-      sync_attr (>= 0.1.1)
+      sync_attr (>= 1.0)
       thread_safe (>= 0.1.0)
-    shoulda (3.4.0)
+    shoulda (3.5.0)
       shoulda-context (~> 1.0, >= 1.0.1)
-      shoulda-matchers (~> 1.0, >= 1.4.1)
-    shoulda-context (1.1.0)
-    shoulda-matchers (1.5.6)
+      shoulda-matchers (>= 1.4.1, < 3.0)
+    shoulda-context (1.1.4)
+    shoulda-matchers (2.2.0)
       activesupport (>= 3.0.0)
-      bourne (~> 1.3)
-    sync_attr (0.1.1)
-    thread_safe (0.1.0)
+    sync_attr (1.0.0)
+    thread_safe (0.1.2)
       atomic
+    tzinfo (0.3.37)
 
 PLATFORMS
   ruby

data/lib/ruby_doozer/client.rb

@@ -156,6 +156,7 @@ module RubyDoozer
       walk('/ctl/node/*/addr') do |path, value, revision|
         hosts << value unless hosts.include? value
       end
+      hosts
     end
 
     # Wait for changes to the supplied path
@@ -229,4 +230,4 @@ module RubyDoozer
     end
 
   end
-end
+end

data/lib/ruby_doozer/json/deserializer.rb

@@ -6,7 +6,7 @@ module RubyDoozer
     # Deserialize from JSON entries in Doozer
     module Deserializer
       def self.deserialize(value)
-        return nil unless value
+        return value if value.nil? || (value == '')
 
         if value.strip.start_with?('{') || value.strip.start_with?('[{')
           symbolize(MultiJson.load(value))

data/lib/ruby_doozer/registry.rb

@@ -83,7 +83,7 @@ module RubyDoozer
     #     Maximum size of the connection pool to doozer
     #     Default: 10
     #
-    def initialize(params)
+    def initialize(params, &block)
       params = params.dup
       @root = params.delete(:root) || params.delete(:root_path)
       raise "Missing mandatory parameter :root" unless @root
@@ -120,6 +120,10 @@ module RubyDoozer
         RubyDoozer::Client.new(@doozer_config)
       end
 
+      # Go through entire registry based on the supplied root path passing
+      # all the values to supplied block
+      each_pair(&block) if block
+
       # Generate warning log entries for any unknown configuration options
       params.each_pair {|k,v| logger.warn "Ignoring unknown configuration option: #{k}"}
     end
@@ -162,8 +166,9 @@ module RubyDoozer
     def each_pair(&block)
       key = "#{@root}/**"
       doozer_pool.with_connection do |doozer|
-        doozer.walk(key) do |key, value, revision|
-          block.call(relative_key(key), @deserializer.deserialize(value))
+        current_revision = doozer.current_revision
+        doozer.walk(key, current_revision) do |key, value, revision|
+          block.call(relative_key(key), @deserializer.deserialize(value), revision)
         end
       end
     end
@@ -250,7 +255,7 @@ module RubyDoozer
       "#{@root}/#{relative_key}"
     end
 
-    # Returns the full key given a relative key
+    # Returns the relative key given a full key
     def relative_key(full_key)
       full_key.sub(@root_with_trail, '')
     end
@@ -310,7 +315,7 @@ module RubyDoozer
 
         case node.flags
         when 4
-          changed(key,  @deserializer.deserialize(node.value), node.rev)
+          changed(key, @deserializer.deserialize(node.value), node.rev)
         when 8
           deleted(key, node.rev)
         else

data/lib/ruby_doozer/version.rb

@@ -1,3 +1,3 @@
 module RubyDoozer #:nodoc
-  VERSION = "0.7.1"
+  VERSION = "0.8.1"
 end

data/test/registry_test.rb

@@ -18,7 +18,7 @@ class RegistryTest < Test::Unit::TestCase
   context RubyDoozer::Registry do
     setup do
       @date      = Date.parse('2013-04-04')
-      @time      = Time.at(1365102658)
+      @time      = Time.at(1365102658).utc
       @test_data = {
         'bar'                     => 'test',
         'one'                     => 'one',
@@ -49,7 +49,7 @@ class RegistryTest < Test::Unit::TestCase
           'false'                   => 'false',
           'true'                    => 'true',
           'child'                   => "{\":symbol_with_underscores\":\":and_a_value\",\":this\":\"is\",\":an\":[\"array\",\":symbol\",{\":smallest\":{\"a\":\"b\",\":c\":\":d\"}}]}",
-          'all_types'               => "{\"bar\":\"test\",\"one\":\"one\",\"string_with_underscores\":\"and_a_value\",\"two\":\":two\",\"integer\":\"10\",\"float\":\"10.5\",\"date\":\"2013-04-04\",\"time\":\"2013-04-04 15:10:58 -0400\",\"false\":\"false\",\"true\":\"true\",\"child\":{\":symbol_with_underscores\":\":and_a_value\",\":this\":\"is\",\":an\":[\"array\",\":symbol\",{\":smallest\":{\"a\":\"b\",\":c\":\":d\"}}]}}"
+          'all_types'               => "{\"bar\":\"test\",\"one\":\"one\",\"string_with_underscores\":\"and_a_value\",\"two\":\":two\",\"integer\":\"10\",\"float\":\"10.5\",\"date\":\"2013-04-04\",\"time\":\"2013-04-04 19:10:58 UTC\",\"false\":\"false\",\"true\":\"true\",\"child\":{\":symbol_with_underscores\":\":and_a_value\",\":this\":\"is\",\":an\":[\"array\",\":symbol\",{\":smallest\":{\"a\":\"b\",\":c\":\":d\"}}]}}"
         }
       end
 
@@ -190,4 +190,4 @@ class RegistryTest < Test::Unit::TestCase
     end
   end
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_doozer
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.1
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-05 00:00:00.000000000 Z
+date: 2013-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic_logger
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Doozer Ruby Client