zk_recipes 0.2.0.pre2 → 0.2.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b8809248fbdaf59b179335291fb0dbd4c720a5d
-  data.tar.gz: 94272b92ac88c8f58370d3d6e9f4a8d8ce2df2c3
+  metadata.gz: 2179e521a73b7b5dddd99f2a71b59d1e0e45f7ab
+  data.tar.gz: 57eb0dd89e3dfdaff8686685c5c817a1488bcc68
 SHA512:
-  metadata.gz: efb4cd174c22e51ea51258de0e25a3b34b97ac9ae1e779798f38023bd326fdd314571c95e7b3bbd0caaede333d2e77018c9f8be1f4b16dd3d678d6fc50501707
-  data.tar.gz: ada75f39f7481da1daa5fed9dcd5b9e2de7615befc8c59045e11893bb7bc690097452f5ae5b788a65ce87789a25690888764d07cfa8df6c71ed42bdf98001dfb
+  metadata.gz: d0b8037e3b1db1c3439a1a4fd59d8fa0c8b420251529cd4325ce24c4d8bbcce0449e7c665828260369378fb3ef3f2144a24d500e8a79196107f998d9264d5675
+  data.tar.gz: f03676a91ab7fec0127054bf9e6e13ee180e5869fe65687907cae72113491d4f626f33f6694609591312cceeb527cff9e4d9213ae5d785eabdcd0324c701a7c9

data/CHANGELOG.md

@@ -4,6 +4,8 @@
 
 This version includes BREAKING CHANGES. See below
 
+- BREAKING CHANGE: rename fetch_existing to fetch_valid, it checks the path
+  exists AND the value successfully deserialized.
 - cleanup logging
 - Make `on_connected` lighter: `on_connected` gets called for every watch when
   a connection flaps. Make the happy path `on_connected` faster.

data/lib/zk_recipes/cache.rb

@@ -123,9 +123,9 @@ module ZkRecipes
     end
     alias_method :[], :fetch
 
-    def fetch_existing(path)
+    def fetch_valid(path)
       cached = @cache.fetch(path)
-      cached.value if cached.stat&.exists?
+      cached.value if cached.valid?
     rescue KeyError
       raise PathError, "no registered path=#{path.inspect}"
     end
@@ -149,7 +149,7 @@ module ZkRecipes
 
       unless stat.exists?
         value = @registered_values.fetch(path).default_value
-        @cache[path] = CachedPath.new(value, stat)
+        @cache[path] = CachedPath.new(value, stat: stat)
         debug("no node, setting watch path=#{path}")
         instrument_params[:value] = value
         ActiveSupport::Notifications.instrument(AS_NOTIFICATION, instrument_params)
@@ -162,6 +162,7 @@ module ZkRecipes
       instrument_params[:version] = stat.version
       instrument_params[:data_length] = stat.data_length
 
+      valid = true
       value = begin
         registered_value = @registered_values.fetch(path)
         instrument_params[:value] = registered_value.deserialize(raw_value)
@@ -169,11 +170,11 @@ module ZkRecipes
         error("deserialization error path=#{path} stat=#{stat.inspect} exception=#{e.inspect} #{e.backtrace.inspect}")
         instrument_params[:error] = e
         instrument_params[:raw_value] = raw_value
+        valid = false
         registered_value.default_value
       end
 
-      # TODO if there is a deserialization error, do we want to indicate that on the CachedPath?
-      @cache[path] = CachedPath.new(value, stat)
+      @cache[path] = CachedPath.new(value, stat: stat, valid: valid)
 
       ActiveSupport::Notifications.instrument(AS_NOTIFICATION, instrument_params)
       debug { "update_cache path=#{path} raw_value=#{raw_value.inspect} value=#{value.inspect} stat=#{stat.inspect}" }
@@ -203,7 +204,18 @@ module ZkRecipes
       EOM
     end
 
-    CachedPath = Struct.new(:value, :stat)
+    class CachedPath
+      attr_reader :value, :stat
+      def initialize(value, stat: nil, valid: false)
+        @value = value
+        @stat = stat
+        @valid = valid
+      end
+
+      def valid?
+        @valid
+      end
+    end
 
     class RegisteredPath < Struct.new(:default_value, :deserializer)
       def deserialize(raw)

data/lib/zk_recipes/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ZkRecipes
-  VERSION = "0.2.0.pre2"
+  VERSION = "0.2.0.pre3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zk_recipes
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre2
+  version: 0.2.0.pre3
 platform: ruby
 authors:
 - Andrew Lazarus
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-11 00:00:00.000000000 Z
+date: 2017-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport