prefab-cloud-ruby 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67f20b7bcbe0cb24df27ec2e6cee485469dfeb15
-  data.tar.gz: 9f298fdd808db6787e89814ef01e750870ae2f7f
+  metadata.gz: 9c342824c82e95d283502c651dc00f331cf16d60
+  data.tar.gz: c0bd693c52c833155ba15b64fffe73addcb09786
 SHA512:
-  metadata.gz: 2c1d7f77547a3c66e62dd9dda07c8e5cf74a374f1335f6318bfdd6c138999692c7ef1d231a7c8cea988eaa2888c63af46ee9779650d4eab2ab2d486f3de5a212
-  data.tar.gz: 3c3d1be6a3c50f2d9550612277b4b969547a89393fcdfb3c9cf98ce138579668bc68f24a672892d100ee7ac9df941f0773fbc2a7d6d92b866854393b6b4fd453
+  metadata.gz: 369f79bd3bdec23b408b1d01dcba47e54b7ba72fdc8c4d0bc09032ec118cf18262839b0a9d8a1e7a220a593824bfac205ccec63498df940f1cfd8f54679f0d1d
+  data.tar.gz: 48a74a43324b96a9fe22c8d040ab69edf19285ee64ac2352b102eff70ec3777a89146f8a363e1fdf74ed5ee5c1fd3b19eea937396ac1f425c70297f33d668b01

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/prefab/config_client.rb

@@ -100,7 +100,6 @@ module Prefab
 
     def load_checkpoint_from_s3
       url = "#{@s3_cloud_front}/#{@base_client.api_key.gsub("|", "/")}"
-      puts url
       resp = Faraday.get url
       if resp.status == 200
         deltas = Prefab::ConfigDeltas.decode(resp.body)

data/lib/prefab/config_resolver.rb

@@ -1,5 +1,7 @@
 module Prefab
   class ConfigResolver
+    NAMESPACE_DELIMITER = ".".freeze
+    NAME_KEY_DELIMITER = ":".freeze
 
     def initialize(base_client, config_loader)
       @lock = Concurrent::ReadWriteLock.new
@@ -14,7 +16,7 @@ module Prefab
       @lock.with_read_lock do
         @local_store.each do |k, v|
           value = v[:value]
-          str << "|#{k}| |#{value_of(value)}|#{value_of(value).class}\n"
+          str << "|#{k}| in #{v[:namespace]} |#{value_of(value)}|#{value_of(value).class}\n"
         end
       end
       str
@@ -52,24 +54,37 @@ module Prefab
       end
     end
 
+    # Should client a.b.c see key in namespace a.b? yes
+    # Should client a.b.c see key in namespace a.b.c? yes
+    # Should client a.b.c see key in namespace a.b.d? no
+    # Should client a.b.c see key in namespace ""? yes
+    #
+    def starts_with_ns?(key_namespace, client_namespace)
+      zipped = key_namespace.split(NAMESPACE_DELIMITER).zip(client_namespace.split(NAMESPACE_DELIMITER))
+      zipped.map do |k, c|
+        (k.nil? || k.empty?) || c == k
+      end.all?
+    end
+
     def make_local
       store = {}
       @config_loader.calc_config.each do |prop, value|
         property = prop
-        namespace = ""
-        split = prop.split(":")
+        key_namespace = ""
+
+        split = prop.split(NAME_KEY_DELIMITER)
 
         if split.size > 1
-          property = split[1..-1].join
-          namespace = split[0]
+          property = split[1..-1].join(NAME_KEY_DELIMITER)
+          key_namespace = split[0]
         end
 
-        if (namespace == "") || @namespace.start_with?(namespace)
+        if starts_with_ns?(key_namespace, @namespace)
           existing = store[property]
           if existing.nil?
-            store[property] = { namespace: namespace, value: value }
-          elsif existing[:namespace].split(".").size < namespace.split(".").size
-            store[property] = { namespace: namespace, value: value }
+            store[property] = { namespace: key_namespace, value: value }
+          elsif existing[:namespace].split(NAMESPACE_DELIMITER).size < key_namespace.split(NAMESPACE_DELIMITER).size
+            store[property] = { namespace: key_namespace, value: value }
           end
         end
       end

data/prefab-cloud-ruby.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: prefab-cloud-ruby 0.3.0 ruby lib
+# stub: prefab-cloud-ruby 0.4.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "prefab-cloud-ruby".freeze
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Jeff Dwyer".freeze]
-  s.date = "2019-01-30"
+  s.date = "2019-02-16"
   s.description = "RateLimits & Config as a service".freeze
   s.email = "jdwyer@prefab.cloud".freeze
   s.extra_rdoc_files = [

data/test/test_config_loader.rb

@@ -25,8 +25,6 @@ class TestConfigLoader < Minitest::Test
     assert_equal 5, @loader.highwater_mark
   end
 
-
-
   def test_keeps_most_recent
     assert_equal 0, @loader.highwater_mark
     @loader.set(Prefab::ConfigDelta.new(id: 1, key: "sample_int", value: Prefab::ConfigValue.new(int: 1)))

data/test/test_config_resolver.rb

@@ -18,7 +18,6 @@ class TestConfigResolver < Minitest::Test
       @resolver = Prefab::ConfigResolver.new(MockBaseClient.new, @loader)
       assert_equal "value_none", @resolver.get("key")
 
-
       @resolverA = resolver_for_namespace("projectA", @loader)
       assert_equal "valueA", @resolverA.get("key")
 
@@ -37,6 +36,71 @@ class TestConfigResolver < Minitest::Test
     end
   end
 
+  def test_starts_with_ns
+    @loader = MockConfigLoader.new
+    @loader.stub :calc_config, {} do
+      resolver = Prefab::ConfigResolver.new(MockBaseClient.new, @loader)
+      assert resolver.send(:starts_with_ns?, "", "a")
+      assert resolver.send(:starts_with_ns?, "a", "a")
+      assert resolver.send(:starts_with_ns?, "a", "a.b")
+      assert !resolver.send(:starts_with_ns?, "a.b", "a")
+
+      assert resolver.send(:starts_with_ns?, "corp", "corp.proj.proja")
+      assert resolver.send(:starts_with_ns?, "corp.proj", "corp.proj.proja")
+      assert resolver.send(:starts_with_ns?, "corp.proj.proja", "corp.proj.proja")
+      assert !resolver.send(:starts_with_ns?, "corp.proj.projb", "corp.proj.proja")
+
+      # corp:a:b is not a real delimited namespace
+      assert !resolver.send(:starts_with_ns?, "corp", "corp:a:b")
+      assert resolver.send(:starts_with_ns?, "foo", "foo.baz")
+      assert resolver.send(:starts_with_ns?, "foo.baz", "foo.baz")
+      assert !resolver.send(:starts_with_ns?, "foo.baz", "foo.bazz")
+    end
+  end
+
+  # colons are not allowed in keys, but verify behavior anyway
+  def test_keys_with_colons
+    @loader = MockConfigLoader.new
+    loaded_values = {
+      "Key:With:Colons" => Prefab::ConfigValue.new(string: "value"),
+      "proj:apikey" => Prefab::ConfigValue.new(string: "v2")
+    }
+
+    @loader.stub :calc_config, loaded_values do
+
+      r = resolver_for_namespace("foo", @loader)
+      assert_nil r.get("apikey")
+
+      r = resolver_for_namespace("proj", @loader)
+      assert_equal "v2", r.get("apikey")
+
+      r = resolver_for_namespace("", @loader)
+      assert_nil r.get("apikey")
+
+
+      @resolverKeyWith = resolver_for_namespace("Ket:With", @loader)
+      assert_nil @resolverKeyWith.get("Colons")
+      assert_nil @resolverKeyWith.get("With:Colons")
+      assert_nil @resolverKeyWith.get("Key:With:Colons")
+
+      @resolverKeyWithExtra = resolver_for_namespace("Key:With:Extra", @loader)
+      puts @resolverKeyWithExtra.to_s
+      assert_nil @resolverKeyWithExtra.get("Colons")
+      assert_nil @resolverKeyWithExtra.get("With:Colons")
+      assert_nil @resolverKeyWithExtra.get("Key:With:Colons")
+
+      @resolverKey = resolver_for_namespace("Key", @loader)
+      assert_equal "value", @resolverKey.get("With:Colons")
+      assert_nil @resolverKey.get("Colons")
+      assert_nil @resolverKey.get("Key:With:Colons")
+
+      @resolverWithProperlySegmentedNamespace = resolver_for_namespace("Key.With.Extra", @loader)
+      assert_nil @resolverWithProperlySegmentedNamespace.get("Colons")
+      assert_equal "value", @resolverWithProperlySegmentedNamespace.get("With:Colons")
+      assert_nil @resolverWithProperlySegmentedNamespace.get("Key:With:Colons")
+    end
+  end
+
   def resolver_for_namespace(namespace, loader)
     Prefab::ConfigResolver.new(MockBaseClient.new(namespace: namespace), loader)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prefab-cloud-ruby
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-30 00:00:00.000000000 Z
+date: 2019-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby