prefab-cloud-ruby 0.2.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57dd1f5909bf80cd820396d039c2d1560faf55e6
-  data.tar.gz: d2e6192bf1126aadc4aaa49e23728cfbaaf2a689
+  metadata.gz: fa80ee91d95324b503253f95a12deb9b0db91291
+  data.tar.gz: 0315d992eb2a87073998e1d7db4864a8c3da289c
 SHA512:
-  metadata.gz: 61ff17aeda32522ed65ace11b48b955f87eeb69cc9ccc781c3dfecca66161469a93a96db42559919f347e4998b3d42038890dd22219e2ec722a01eb61323b6cf
-  data.tar.gz: 87b2c0a1a2544cd9c7f93fdda3d1e96028424642e5d6fd9dd8fd3c9c334ef5f146d5ba0fe006ebb6fa27ad6e7bee6488d92dedcb2546b516e2dec61e71121509
+  metadata.gz: e43a7a8dafbfd3a9e6c12cd93b57bed2ee8fd738406fdba166c5eddad03154de66d9150285961f8c08da58d0754fde385b8b68e0bb22f9a27de8441f231a429a
+  data.tar.gz: c3586f0e6b689e0ee5b1fd86e621d79ffab5a2263cf977c004fd7a4618cea403059f075f719a86d5a0b4533a16e398e3acb35dff9ca0930082fb81266ef1e545

data/.envrc

@@ -0,0 +1,2 @@
+export AWS_ACCESS_KEY_ID=
+export AWS_SECRET_ACCESS_KEY=

data/Gemfile

@@ -1,8 +1,8 @@
 source "https://rubygems.org"
 
-gem 'grpc', '~> 1.17.1'
 gem 'concurrent-ruby', '~> 1.0', '>= 1.0.5'
-gem 'aws-sdk-s3', '~> 1'
+gem 'faraday'
+gem 'grpc'
 
 group :development do
   gem 'grpc-tools', '~> 1.17.1'

data/Gemfile.lock

@@ -1,52 +1,42 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.0)
+    activesupport (5.2.4.5)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
-    aws-partitions (1.86.0)
-    aws-sdk-core (3.20.2)
-      aws-partitions (~> 1.0)
-      aws-sigv4 (~> 1.0)
-      jmespath (~> 1.0)
-    aws-sdk-kms (1.5.0)
-      aws-sdk-core (~> 3)
-      aws-sigv4 (~> 1.0)
-    aws-sdk-s3 (1.10.0)
-      aws-sdk-core (~> 3)
-      aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.0)
-    aws-sigv4 (1.0.2)
-    builder (3.2.3)
-    concurrent-ruby (1.0.5)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    builder (3.2.4)
+    concurrent-ruby (1.1.8)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    docile (1.3.0)
-    faraday (0.15.4)
+    docile (1.3.5)
+    faraday (1.3.0)
+      faraday-net_http (~> 1.0)
       multipart-post (>= 1.2, < 3)
-    git (1.5.0)
-    github_api (0.18.2)
+      ruby2_keywords
+    faraday-net_http (1.0.1)
+    git (1.8.1)
+      rchardet (~> 1.8)
+    github_api (0.19.0)
       addressable (~> 2.4)
       descendants_tracker (~> 0.0.4)
-      faraday (~> 0.8)
+      faraday (>= 0.8, < 2)
       hashie (~> 3.5, >= 3.5.2)
       oauth2 (~> 1.0)
-    google-protobuf (3.6.1)
-    googleapis-common-protos-types (1.0.2)
-      google-protobuf (~> 3.0)
-    grpc (1.17.1)
-      google-protobuf (~> 3.1)
-      googleapis-common-protos-types (~> 1.0.0)
+    google-protobuf (3.15.6)
+    googleapis-common-protos-types (1.0.6)
+      google-protobuf (~> 3.14)
+    grpc (1.36.0)
+      google-protobuf (~> 3.14)
+      googleapis-common-protos-types (~> 1.0)
     grpc-tools (1.17.1)
     hashie (3.6.0)
-    highline (2.0.1)
-    i18n (1.0.1)
+    highline (2.0.3)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
-    jmespath (1.4.0)
     json (1.8.6)
     juwelier (2.4.9)
       builder
@@ -60,52 +50,53 @@ GEM
       rake
       rdoc
       semver2
-    jwt (2.1.0)
+    jwt (2.2.2)
     kamelcase (0.0.2)
       semver2 (~> 3)
     mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    multi_json (1.13.1)
+    minitest (5.14.4)
+    multi_json (1.15.0)
     multi_xml (0.6.0)
-    multipart-post (2.0.0)
-    nokogiri (1.10.1)
+    multipart-post (2.1.1)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
-    oauth2 (1.4.1)
-      faraday (>= 0.8, < 0.16.0)
+    oauth2 (1.4.7)
+      faraday (>= 0.8, < 2.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    psych (3.1.0)
-    public_suffix (3.0.3)
-    rack (2.0.6)
-    rake (12.3.2)
+    psych (3.3.1)
+    public_suffix (4.0.6)
+    rack (2.2.3)
+    rake (13.0.3)
+    rchardet (1.8.0)
     rdoc (3.12.2)
       json (~> 1.4)
+    ruby2_keywords (0.0.4)
     semver2 (3.4.2)
-    shoulda (3.5.0)
-      shoulda-context (~> 1.0, >= 1.0.1)
-      shoulda-matchers (>= 1.4.1, < 3.0)
-    shoulda-context (1.2.2)
-    shoulda-matchers (2.8.0)
-      activesupport (>= 3.0.0)
-    simplecov (0.16.1)
+    shoulda (4.0.0)
+      shoulda-context (~> 2.0)
+      shoulda-matchers (~> 4.0)
+    shoulda-context (2.0.0)
+    shoulda-matchers (4.5.1)
+      activesupport (>= 4.2.0)
+    simplecov (0.18.5)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
+      simplecov-html (~> 0.11)
+    simplecov-html (0.12.3)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  aws-sdk-s3 (~> 1)
   bundler (~> 1.0)
   concurrent-ruby (~> 1.0, >= 1.0.5)
-  grpc (~> 1.17.1)
+  faraday
+  grpc
   grpc-tools (~> 1.17.1)
   juwelier (~> 2.4.9)
   rdoc (~> 3.12)

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.6.0

data/lib/prefab-cloud-ruby.rb

@@ -1,5 +1,6 @@
 require "concurrent/atomics"
 require 'concurrent'
+require 'faraday'
 require 'openssl'
 require 'prefab_pb'
 require 'prefab_services_pb'
@@ -11,7 +12,7 @@ require 'prefab/config_client'
 require 'prefab/feature_flag_client'
 require 'prefab/logger_client'
 require 'prefab/auth_interceptor'
+require 'prefab/cancellable_interceptor'
 require 'prefab/noop_cache'
 require 'prefab/noop_stats'
 require 'prefab/murmer3'
-require 'aws-sdk-s3'

data/lib/prefab/auth_interceptor.rb

@@ -1,29 +1,31 @@
-class AuthInterceptor < GRPC::ClientInterceptor
-  def initialize(api_key)
-    version = File.exist?('VERSION') ? File.read('VERSION').chomp : ""
-    @client = "prefab-cloud-ruby.#{version}".freeze
-    @api_key = api_key
-  end
+module Prefab
+  class AuthInterceptor < GRPC::ClientInterceptor
+    def initialize(api_key)
+      version = File.exist?('VERSION') ? File.read('VERSION').chomp : ""
+      @client = "prefab-cloud-ruby.#{version}".freeze
+      @api_key = api_key
+    end
 
-  def request_response(request:, call:, method:, metadata:, &block)
-    shared(metadata, &block)
-  end
+    def request_response(request:, call:, method:, metadata:, &block)
+      shared(metadata, &block)
+    end
 
-  def client_streamer(requests:, call:, method:, metadata:, &block)
-    shared(metadata, &block)
-  end
+    def client_streamer(requests:, call:, method:, metadata:, &block)
+      shared(metadata, &block)
+    end
 
-  def server_streamer(request:, call:, method:, metadata:, &block)
-    shared(metadata, &block)
-  end
+    def server_streamer(request:, call:, method:, metadata:, &block)
+      shared(metadata, &block)
+    end
 
-  def bidi_streamer(requests:, call:, method:, metadata:, &block)
-    shared(metadata, &block)
-  end
+    def bidi_streamer(requests:, call:, method:, metadata:, &block)
+      shared(metadata, &block)
+    end
 
-  def shared(metadata)
-    metadata['auth'] = @api_key
-    metadata['client'] = @client
-    yield
+    def shared(metadata)
+      metadata['auth'] = @api_key
+      metadata['client'] = @client
+      yield
+    end
   end
 end

data/lib/prefab/cancellable_interceptor.rb

@@ -0,0 +1,47 @@
+module Prefab
+  class CancellableInterceptor < GRPC::ClientInterceptor
+    WAIT_SEC = 3
+
+    def initialize(base_client)
+      @base_client = base_client
+    end
+
+    def cancel
+      @call.instance_variable_get("@wrapped").instance_variable_get("@call").cancel
+      i = 0
+      while (i < WAIT_SEC) do
+        if @call.instance_variable_get("@wrapped").cancelled?
+          @base_client.log_internal Logger::DEBUG, "Cancelled streaming."
+          return
+        else
+          @base_client.log_internal Logger::DEBUG, "Unable to cancel streaming. Trying again"
+          @call.instance_variable_get("@wrapped").instance_variable_get("@call").cancel
+          i += 1
+          sleep(1)
+        end
+      end
+      @base_client.log_internal Logger::INFO, "Unable to cancel streaming."
+    end
+
+    def request_response(request:, call:, method:, metadata:, &block)
+      shared(call, &block)
+    end
+
+    def client_streamer(requests:, call:, method:, metadata:, &block)
+      shared(call, &block)
+    end
+
+    def server_streamer(request:, call:, method:, metadata:, &block)
+      shared(call, &block)
+    end
+
+    def bidi_streamer(requests:, call:, method:, metadata:, &block)
+      shared(call, &block)
+    end
+
+    def shared(call)
+      @call = call
+      yield
+    end
+  end
+end

data/lib/prefab/client.rb

@@ -27,7 +27,7 @@ module Prefab
       @api_key = api_key
       @account_id = api_key.split("|")[0].to_i
       @namespace = namespace
-      @interceptor = AuthInterceptor.new(api_key)
+      @interceptor = Prefab::AuthInterceptor.new(api_key)
       @stubs = {}
 
       at_exit do
@@ -91,13 +91,13 @@ module Prefab
       "prefab:#{account_id}:#{post_fix}"
     end
 
-    private
-
     def reset!
       @stubs.clear
       @_channel = nil
     end
 
+    private
+
     def stub_for(service, timeout)
       @stubs["#{service}_#{timeout}"] ||= service::Stub.new(nil,
                                                             nil,

data/lib/prefab/config_client.rb

@@ -2,6 +2,7 @@ module Prefab
   class ConfigClient
     RECONNECT_WAIT = 5
     DEFAULT_CHECKPOINT_FREQ_SEC = 60
+    DEFAULT_S3CF_BUCKET = 'http://d2j4ed6ti5snnd.cloudfront.net'
 
     def initialize(base_client, timeout)
       @base_client = base_client
@@ -14,13 +15,16 @@ module Prefab
       @config_resolver = Prefab::ConfigResolver.new(@base_client, @config_loader)
 
       @initialization_lock.acquire_write_lock
-      @s3 = Aws::S3::Resource.new(region: 'us-east-1')
 
+      @cancellable_interceptor = Prefab::CancellableInterceptor.new(@base_client)
+
+      @s3_cloud_front = ENV["PREFAB_S3CF_BUCKET"] || DEFAULT_S3CF_BUCKET
       load_checkpoint
       start_checkpointing_thread
     end
 
     def start_streaming
+      @streaming = true
       start_api_connection_thread(@config_loader.highwater_mark)
     end
 
@@ -64,13 +68,12 @@ module Prefab
       @_stub = Prefab::ConfigService::Stub.new(nil,
                                                nil,
                                                channel_override: @base_client.channel,
-                                               interceptors: [@base_client.interceptor])
+                                               interceptors: [@base_client.interceptor, @cancellable_interceptor])
     end
 
     # Bootstrap out of the cache
     # returns the high-watermark of what was in the cache
     def load_checkpoint
-
       success = load_checkpoint_from_config
 
       if !success
@@ -99,11 +102,14 @@ module Prefab
     end
 
     def load_checkpoint_from_s3
-      resp = @s3.bucket('prefab-cloud-checkpoints-prod').object(@base_client.api_key.gsub("|", "/")).get
-      deltas = Prefab::ConfigDeltas.decode(resp.body.read)
-      load_deltas(deltas, :s3)
-    rescue Aws::S3::Errors::NoSuchKey
-      @base_client.log_internal Logger::INFO, "No S3 checkpoint. Plan may not support this."
+      url = "#{@s3_cloud_front}/#{@base_client.api_key.gsub("|", "/")}"
+      resp = Faraday.get url
+      if resp.status == 200
+        deltas = Prefab::ConfigDeltas.decode(resp.body)
+        load_deltas(deltas, :s3)
+      else
+        @base_client.log_internal Logger::INFO, "No S3 checkpoint. Response #{resp.status} Plan may not support this."
+      end
     end
 
 
@@ -151,8 +157,14 @@ module Prefab
                                                     start_at_id: start_at_id)
       @base_client.log_internal Logger::DEBUG, "start api connection thread #{start_at_id}"
       @base_client.stats.increment("prefab.config.api.start")
+
       @api_connection_thread = Thread.new do
-        while true do
+        at_exit do
+          @streaming = false
+          @cancellable_interceptor.cancel
+        end
+
+        while @streaming do
           begin
             resp = stub.get_config(config_req)
             resp.each do |r|
@@ -163,12 +175,16 @@ module Prefab
               finish_init!(:streaming)
             end
           rescue => e
-            @base_client.log_internal Logger::INFO, ("config client encountered #{e.message} pausing #{RECONNECT_WAIT}")
-            reset
-            sleep(RECONNECT_WAIT)
+            if @streaming
+              level = e.code == 1 ? Logger::DEBUG : Logger::INFO
+              @base_client.log_internal level, ("config client encountered #{e.message} pausing #{RECONNECT_WAIT}")
+              reset
+              sleep(RECONNECT_WAIT)
+            end
           end
         end
       end
+
     end
   end
 end

data/lib/prefab/config_loader.rb

@@ -55,7 +55,7 @@ module Prefab
 
     def load_local_overrides
       override_dir = ENV['PREFAB_CONFIG_OVERRIDE_DIR'] || Dir.home
-      load_glob(File.join(override_dir, ".prefab*config-overrides.yaml"))
+      load_glob(File.join(override_dir, ".prefab*config.yaml"))
     end
 
     def load_glob(glob)

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.2.0 ruby lib
+# stub: prefab-cloud-ruby 0.6.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "prefab-cloud-ruby".freeze
-  s.version = "0.2.0"
+  s.version = "0.6.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 = "2021-03-23"
   s.description = "RateLimits & Config as a service".freeze
   s.email = "jdwyer@prefab.cloud".freeze
   s.extra_rdoc_files = [
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
     "README.md"
   ]
   s.files = [
+    ".envrc",
     ".ruby-version",
     "Gemfile",
     "Gemfile.lock",
@@ -29,6 +30,7 @@ Gem::Specification.new do |s|
     "compile_protos.sh",
     "lib/prefab-cloud-ruby.rb",
     "lib/prefab/auth_interceptor.rb",
+    "lib/prefab/cancellable_interceptor.rb",
     "lib/prefab/client.rb",
     "lib/prefab/config_client.rb",
     "lib/prefab/config_loader.rb",
@@ -60,7 +62,7 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<concurrent-ruby>.freeze, [">= 1.0.5", "~> 1.0"])
       s.add_runtime_dependency(%q<faraday>.freeze, [">= 0"])
-      s.add_runtime_dependency(%q<grpc>.freeze, ["~> 1.17.1"])
+      s.add_runtime_dependency(%q<grpc>.freeze, [">= 0"])
       s.add_development_dependency(%q<grpc-tools>.freeze, ["~> 1.17.1"])
       s.add_development_dependency(%q<shoulda>.freeze, [">= 0"])
       s.add_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
@@ -70,7 +72,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<concurrent-ruby>.freeze, [">= 1.0.5", "~> 1.0"])
       s.add_dependency(%q<faraday>.freeze, [">= 0"])
-      s.add_dependency(%q<grpc>.freeze, ["~> 1.17.1"])
+      s.add_dependency(%q<grpc>.freeze, [">= 0"])
       s.add_dependency(%q<grpc-tools>.freeze, ["~> 1.17.1"])
       s.add_dependency(%q<shoulda>.freeze, [">= 0"])
       s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
@@ -81,7 +83,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<concurrent-ruby>.freeze, [">= 1.0.5", "~> 1.0"])
     s.add_dependency(%q<faraday>.freeze, [">= 0"])
-    s.add_dependency(%q<grpc>.freeze, ["~> 1.17.1"])
+    s.add_dependency(%q<grpc>.freeze, [">= 0"])
     s.add_dependency(%q<grpc-tools>.freeze, ["~> 1.17.1"])
     s.add_dependency(%q<shoulda>.freeze, [">= 0"])
     s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])

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.2.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Jeff Dwyer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-01-30 00:00:00.000000000 Z
+date: 2021-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -48,16 +48,16 @@ dependencies:
   name: grpc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.17.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.17.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: grpc-tools
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,7 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
+- ".envrc"
 - ".ruby-version"
 - Gemfile
 - Gemfile.lock
@@ -160,6 +161,7 @@ files:
 - compile_protos.sh
 - lib/prefab-cloud-ruby.rb
 - lib/prefab/auth_interceptor.rb
+- lib/prefab/cancellable_interceptor.rb
 - lib/prefab/client.rb
 - lib/prefab/config_client.rb
 - lib/prefab/config_loader.rb
@@ -183,7 +185,7 @@ homepage: http://github.com/prefab-cloud/prefab-cloud-ruby
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -198,9 +200,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.6.14
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Prefab Ruby Infrastructure
 test_files: []