ruby_doozer 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb1a71fd888931d010aeffdf2a732c921672a28d
-  data.tar.gz: e31970bb09b093c59ee6e221dd302c4ce1a00d81
+  metadata.gz: 53d62af2e149701f6286454279bc9a3c0926f8fe
+  data.tar.gz: fddfe20acb8c854bce8978cf42f5a8454015ac2f
 SHA512:
-  metadata.gz: a8a41f827035cf8a419c4eaa3f95965d6aa390660d6d0af404bd3971bbb7ffaaa0203ffd2bb5ad9e0ee770b9247d3c1425a5faebfe16e2279a63c55b7db46e81
-  data.tar.gz: 24666f05f96fda73696d672ff0d4b1a83b27d0e4ab5dca2248eb0bf3ea50aa2ee7dac854d446dccf1cc792c736231597fe4f4cb81ac2b7731484488523c51846
+  metadata.gz: abd6b9d7abf264cc78177280166a03e6fa46b390a479d8eb33a73b4f6b249a87899d1b8479a0571dd529eef756789e4aa4ace209ab24c45aae11fcd02b679257
+  data.tar.gz: 754a8d03f0cd1be7ab4bcc4a09960e503a530bb2617888bc0494313f0f28a28c68ffa3d63ad615357d3baffc774a36a02a1074aa30ab881b5f5df48e5e3fa024

data/lib/ruby_doozer/cached_registry.rb

@@ -41,7 +41,7 @@ module RubyDoozer
         @current_revision = doozer.current_revision
         # Fetch all the configuration information from Doozer and set the internal copy
         doozer.walk(key, @current_revision) do |key, value, revision|
-          set_cached_value(relative_key(key), value)
+          set_cached_value(relative_key(key), @deserializer.deserialize(value))
         end
       end
 

data/lib/ruby_doozer/json/serializer.rb

@@ -7,6 +7,8 @@ module RubyDoozer
       def self.serialize(value)
         if value.is_a?(Hash) || value.is_a?(Array)
           MultiJson.encode(desymbolize(value))
+        elsif value.is_a?(Symbol)
+          desymbolize_symbol(value)
         else
           value.to_s
         end

data/lib/ruby_doozer/version.rb

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

data/test/cached_registry_test.rb

@@ -16,17 +16,32 @@ SemanticLogger.add_appender('test.log') if SemanticLogger.appenders.size == 0
 # Unit Test for RubyDoozer::Client
 class CachedRegistryTest < Test::Unit::TestCase
   context RubyDoozer::CachedRegistry do
-    context "with test data" do
+    setup do
+      @date      = Date.parse('2013-04-04')
+      @time      = Time.at(1365102658)
+      @test_data = {
+        'bar'                     => 'test',
+        'one'                     => 'one',
+        'string_with_underscores' => 'and_a_value',
+        'two'                     => :two,
+        'integer'                 => 10,
+        'float'                   => 10.5,
+        'date'                    => @date,
+        'time'                    => @time,
+        'false'                   => false,
+        'true'                    => true,
+        'child'                   => { :symbol_with_underscores  => :and_a_value, :this => 'is', :an => ['array', :symbol, :smallest => {'a' => 'b', :c => :d}]}
+      }
+  #    @test_data['all_types'] = @test_data.dup
+    end
+    context "with cached registry" do
       setup do
-        @test_data = {
-          'bar' => 'test',
-          'one' => 'one',
-          'two' => 'two',
-        }
-        # Doozer does not allow '_' in path names
-        @root_path = "/registrytest"
-        @registry = RubyDoozer::CachedRegistry.new(:root_path => @root_path)
-        @test_data.each_pair {|k,v| @registry[k] = v}
+        # Pre-load 'child' into registry before registry is created
+        registry = RubyDoozer::Registry.new(:root => "/registrytest")
+        registry['child'] = @test_data['child']
+        registry.finalize
+        @registry = RubyDoozer::CachedRegistry.new(:root => "/registrytest")
+        @test_data.each_pair {|k,v| @registry[k] = v unless k == 'child'}
         # Give doozer time to send back the changes
         sleep 0.5
       end
@@ -39,22 +54,30 @@ class CachedRegistryTest < Test::Unit::TestCase
         end
       end
 
-      should "have complete registry" do
+      should 'have pre-loaded element' do
+        assert_hash_equal @test_data['child'], @registry['child']
+      end
+
+      should "#[]" do
         @test_data.each_pair do |k,v|
           assert_equal v, @registry[k], "Expected #{k}=>#{v}, #{@registry.to_h.inspect}"
         end
       end
 
-      should "iterate over complete registry" do
-        @registry.each_pair do |k,v|
-          assert_equal v, @test_data[k], "Registry #{k}=>#{v}, #{@registry.to_h.inspect}"
-        end
+      should "#each_pair" do
+        h = {}
+        @registry.each_pair {|k,v| h[k] = v}
+        assert_hash_equal @test_data, h
+      end
+
+      should "#to_h" do
+        assert_hash_equal @test_data, @registry.to_h
       end
 
-      should "successfully set and retrieve data" do
+      should "#[]=" do
         @registry['three'] = 'value'
         # Give doozer time to send back the change
-        sleep 0.5
+        sleep 0.3
         result = @registry['three']
         assert_equal 'value', result
       end
@@ -160,4 +183,16 @@ class CachedRegistryTest < Test::Unit::TestCase
     end
 
   end
+
+  # Verify that two hashes match
+  def assert_hash_equal(expected, actual)
+    assert_equal expected.size, actual.size, "Actual hash only has #{actual.size} elements when it should have #{expected.size}. Expected:#{expected.inspect}, Actual#{actual.inspect}"
+    expected.each_pair do |k,v|
+      if v.is_a?(Hash)
+        assert_hash_equal(v, actual[k])
+      else
+        assert_equal expected[k], actual[k], "Expected: #{expected.inspect}, Actual:#{actual.inspect}"
+      end
+    end
+  end
 end

data/test/registry_test.rb

@@ -16,47 +16,89 @@ SemanticLogger.add_appender('test.log') if SemanticLogger.appenders.size == 0
 # Unit Test for RubyDoozer::Client
 class RegistryTest < Test::Unit::TestCase
   context RubyDoozer::Registry do
-    context "with test data" do
+    setup do
+      @date      = Date.parse('2013-04-04')
+      @time      = Time.at(1365102658)
+      @test_data = {
+        'bar'                     => 'test',
+        'one'                     => 'one',
+        'string_with_underscores' => 'and_a_value',
+        'two'                     => :two,
+        'integer'                 => 10,
+        'float'                   => 10.5,
+        'date'                    => @date,
+        'time'                    => @time,
+        'false'                   => false,
+        'true'                    => true,
+        'child'                   => { :symbol_with_underscores  => :and_a_value, :this => 'is', :an => ['array', :symbol, :smallest => {'a' => 'b', :c => :d}]}
+      }
+      @test_data['all_types'] = @test_data.dup
+    end
+
+    context "serialization" do
       setup do
-        @test_data = {
-          'bar' => 'test',
-          'one' => 'one',
-          'two' => 'two',
+        @json = {
+          'bar'                     => 'test',
+          'one'                     => 'one',
+          'string_with_underscores' => 'and_a_value',
+          'two'                     => ':two',
+          'integer'                 => '10',
+          'float'                   => '10.5',
+          'date'                    => @date.to_s,
+          'time'                    => @time.to_s,
+          '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\"}}]}}"
         }
-        # Doozer does not allow '_' in path names
-        @root_path = "/registrytest"
-        @client = RubyDoozer::Client.new(:server => 'localhost:8046')
-        @test_data.each_pair {|k,v| @client.set("#{@root_path}/#{k}",v)}
+      end
 
-        @registry = RubyDoozer::Registry.new(:root_path => @root_path)
+      should ".serialize" do
+        @test_data.each_pair do |k,v|
+          assert_equal @json[k], RubyDoozer::Json::Serializer.serialize(v), "Key: #{k}"
+        end
+      end
+
+      should ".deserialize" do
+        @json.each_pair do |k,v|
+          assert_equal @test_data[k], RubyDoozer::Json::Deserializer.deserialize(v), "Key: #{k}"
+        end
+      end
+    end
+
+    context "with registry" do
+      setup do
+        @registry = RubyDoozer::Registry.new(:root => "/registrytest")
+        @test_data.each_pair {|k,v| @registry[k] = v}
       end
 
       def teardown
-        @registry.finalize if @registry
-        if @client
-          @test_data.each_pair do |k,v|
-            @client.delete("#{@root_path}/#{k}")
-          end
-          @client.delete("#{@root_path}/three")
-          @client.close
+        if @registry
+          @test_data.each_pair {|k,v| @registry.delete(k)}
+          @registry.delete("three")
+          @registry.finalize
         end
       end
 
-      should "have complete registry" do
+      should "#[]" do
         @test_data.each_pair do |k,v|
           assert_equal v, @registry[k], "Expected #{k}=>#{v}, #{@registry.to_h.inspect}"
         end
       end
 
-      should "iterate over complete registry" do
-        @registry.each_pair do |k,v|
-          assert_equal v, @test_data[k], "Registry #{k}=>#{v}, #{@registry.to_h.inspect}"
-        end
+      should "#each_pair" do
+        h = {}
+        @registry.each_pair {|k,v| h[k] = v}
+        assert_hash_equal @test_data, h
+      end
+
+      should "#to_h" do
+        assert_hash_equal @test_data, @registry.to_h
       end
 
-      should "successfully set and retrieve data" do
+      should "#[]=" do
         @registry['three'] = 'value'
-        # Allow doozer to send back the change
+        # Give doozer time to send back the change
         sleep 0.3
         result = @registry['three']
         assert_equal 'value', result
@@ -136,4 +178,16 @@ class RegistryTest < Test::Unit::TestCase
 
     end
   end
+
+  # Verify that two hashes match
+  def assert_hash_equal(expected, actual)
+    expected.each_pair do |k,v|
+      if v.is_a?(Hash)
+        assert_hash_equal(v, actual[k])
+      else
+        assert_equal expected[k], actual[k], "Expected: #{expected.inspect}, Actual:#{actual.inspect}"
+      end
+    end
+  end
+
 end

metadata

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