kennel 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b10b16c02058b7b1ad4f44992cf5f996be952d9d38a6d17ecbae4d728c78948
-  data.tar.gz: 2ec630b10f6efc6e1ae04fa8844198105f6446cbd542c8dfdd5302c7a18de354
+  metadata.gz: 3e43bf6c13b6d2a685fcf95514d82c81e1098d6db77935acea0da93e84f254a5
+  data.tar.gz: f9e811a29df09405227c4ba1a86817bb61c5af1a8034e3da8cc25765af7be4b0
 SHA512:
-  metadata.gz: 1127d43e65c93542fea552a8bb682b86da4dccda055d1a3f6123d2a3d5996d5b34617c4940bf797b448f4396392e1813a937de01ad5967a60991ab62cefcc704
-  data.tar.gz: 1c5e5f78cdae0f91d6a2d7f7241bf2a8dc90c7b499bba091c9d8d27225314779550c625cb299ff0109fbfd8894ccdf527e904a3a335d0d8d4b9958f4993d2d31
+  metadata.gz: 12f4c9c346e439140cd7a13a0c3706c537f381096c0f0a0df2b7d9ed9616c63f9382d2b76a8e929f98998396d1b3430c615e211696860d6424122d3f36ba9a81
+  data.tar.gz: 5e2e46c85246c3f3c35721e76a2005a7d8e6f3cd195688e181a80972713318f0ffb01125741a94d38985252b5112609eb5d4e289b2dea52ca8070ab2d41b6558

data/lib/kennel/file_cache.rb

@@ -1,35 +1,52 @@
 # frozen_string_literal: true
 
 # cache that reads everything from a single file
-# to avoid doing multiple disk reads while interating all definitions
+# to avoid doing multiple disk reads while iterating all definitions
 # it also replaces updated keys and has an overall expiry to not keep deleted things forever
 module Kennel
   class FileCache
-    def initialize(file)
+    def initialize(file, cache_version)
       @file = file
-      @data =
-        begin
-          Marshal.load(File.read(@file)) # rubocop:disable Security/MarshalLoad
-        rescue StandardError
-          {}
-        end
+      @cache_version = cache_version
       @now = Time.now.to_i
       @expires = @now + (30 * 24 * 60 * 60) # 1 month
-      @data.reject! { |_, (_, _, ex)| ex < @now } # expire old data
     end
 
-    def fetch(key, version)
+    def open
+      load_data
+      expire_old_data
+      yield self
+    ensure
+      persist
+    end
+
+    def fetch(key, key_version)
       old_value, old_version = @data[key]
-      return old_value if old_version == version
+      return old_value if old_version == [key_version, @cache_version]
 
       new_value = yield
-      @data[key] = [new_value, version, @expires]
+      @data[key] = [new_value, [key_version, @cache_version], @expires]
       new_value
     end
 
+    private
+
+    def load_data
+      @data = begin
+        Marshal.load(File.read(@file)) # rubocop:disable Security/MarshalLoad
+      rescue StandardError
+        {}
+      end
+    end
+
     def persist
-      FileUtils.mkdir_p(File.dirname(@file))
+      dir = File.dirname(@file)
+      FileUtils.mkdir_p(dir) unless File.directory?(dir)
       File.write(@file, Marshal.dump(@data))
     end
+
+    def expire_old_data
+      @data.reject! { |_, (_, _, ex)| ex < @now }
+    end
   end
 end

data/lib/kennel/models/dash.rb

@@ -51,10 +51,7 @@ module Kennel
         actual[:graphs].each do |g|
           g[:definition].delete(:status)
         end
-
-        # NOTE: we might not trigger an update since the api never returns aggregator ... maybe datadog fixes their api
-        # as temporary workaround change something else about the dash to force an update
-        Utils.presence(super&.reject { |op, key| op == "+" && key.end_with?(".aggregator") })
+        super
       end
 
       def url(id)

data/lib/kennel/syncer.rb

@@ -93,10 +93,9 @@ module Kennel
       result[api_resource.to_sym] || result
     end
 
-    def details_cache
-      cache = FileCache.new CACHE_FILE
-      yield cache
-      cache.persist
+    def details_cache(&block)
+      cache = FileCache.new CACHE_FILE, Kennel::VERSION
+      cache.open(&block)
     end
 
     def download_definitions

data/lib/kennel/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Kennel
-  VERSION = "1.7.0"
+  VERSION = "1.7.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-12 00:00:00.000000000 Z
+date: 2018-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday