prefab-cloud-ruby 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4ae024730e476fe81b2d5e1130bb13e0dfee4f6
-  data.tar.gz: aa819d0f9c64ffcd8826751d176133fce7a1a57e
+  metadata.gz: 005df99ad579e508b3b7a826ef11884b2b6495a9
+  data.tar.gz: b36bfa20a612c17628c12b57c01cde87dbfa25dc
 SHA512:
-  metadata.gz: c10adec4b6866caee1045830c4ad45f2f36b20011e3ed8c3d4670331e62f0b65b3b57bd91c0c19dbe9ce4e164787cc5717d622fbe8cbe6cbbca21e03e54bfcf0
-  data.tar.gz: e75c1d4c816f403e974e7b1f105d233fa1578e667d4cfaa804daea81e9ba633478cdba059dab2705ddc45721b3ee734edf1dd2d52dbb1990cc16bd4f28ef203b
+  metadata.gz: 7a60d508e8469950990c7d79d1095bc4c253f02a467fc50727d8cfd56263db3d5821e0fe6aa6f93e95ae2bb0782b7106a539203b4534b403eb21e4021b4ebe50
+  data.tar.gz: '0944f4059e6b9ec37fd652bd7c457e149a5facfc3426334af8b63001c2988ca3de97ea562dd4c10a3c1022e72c3c4fd35e1730a7fe0e23c29012ad6f426b3bf8'

data/VERSION

@@ -1 +1 @@
-0.0.10
+0.0.11

data/lib/prefab/config_client.rb

@@ -19,12 +19,16 @@ module Prefab
       @config_resolver.get(prop)
     end
 
-    def set(key, config_value, namespace = nil)
+    def upsert(key, config_value, namespace = nil, previous_key = nil)
       raise "key must not contain ':' set namespaces separately" if key.include? ":"
       raise "namespace must not contain ':'" if namespace&.include?(":")
       config_delta = Prefab::ConfigClient.value_to_delta(key, config_value, namespace)
-      Retry.it method(:stub_with_timeout), :upsert, config_delta, @timeout, method(:reset)
+      upsert_req = Prefab::UpsertRequest.new(config_delta: config_delta)
+      upsert_req.previous_key = previous_key if previous_key&.present?
+
+      Retry.it method(:stub_with_timeout), :upsert, upsert_req, @timeout, method(:reset)
       @config_loader.set(config_delta)
+      @config_loader.rm(previous_key) if previous_key&.present?
     end
 
     def reset

data/lib/prefab/config_loader.rb

@@ -18,7 +18,15 @@ module Prefab
     end
 
     def set(delta)
-      @api_config[delta.key] = delta
+      if delta.value.nil?
+        @api_config.delete(delta.key)
+      else
+        @api_config[delta.key] = delta
+      end
+    end
+
+    def rm(key)
+      @api_config.delete key
     end
 
     def get_api_deltas
@@ -64,13 +72,13 @@ module Prefab
     def value_from(raw)
       case raw
       when String
-        {string: raw}
+        { string: raw }
       when Integer
-        {int: raw}
+        { int: raw }
       when TrueClass, FalseClass
-        {bool: raw}
+        { bool: raw }
       when Float
-        {double: raw}
+        { double: raw }
       end
     end
   end

data/lib/prefab/feature_flag_client.rb

@@ -7,7 +7,7 @@ module Prefab
     end
 
     def upsert(feature_obj)
-      @base_client.config_client.set(feature_config_name(feature_obj.feature), Prefab::ConfigValue.new(feature_flag: feature_obj))
+      @base_client.config_client.upsert(feature_config_name(feature_obj.feature), Prefab::ConfigValue.new(feature_flag: feature_obj))
     end
 
     def feature_is_on?(feature_name)
@@ -46,7 +46,7 @@ module Prefab
     end
 
     def feature_config_name(feature)
-      "Feature.#{feature}"
+      feature
     end
 
   end

data/lib/prefab/retry.rb

@@ -1,5 +1,4 @@
 class Retry
-  DEFAULT_TIMEOUT = 10
   MAX_SLEEP_SEC = 10
   BASE_SLEEP_SEC = 0.5
 
@@ -13,13 +12,14 @@ class Retry
       attempts += 1
       return stub_factory.call.send(rpc, req)
     rescue => exception
+
       if Time.now - start_time > timeout
         raise exception
       end
-
       sleep_seconds = [BASE_SLEEP_SEC * (2 ** (attempts - 1)), MAX_SLEEP_SEC].min
       sleep_seconds = sleep_seconds * (0.5 * (1 + rand()))
       sleep_seconds = [BASE_SLEEP_SEC, sleep_seconds].max
+      puts "Sleep #{sleep_seconds} and Reset"
       sleep sleep_seconds
       reset.call
       retry

data/lib/prefab_pb.rb

@@ -26,6 +26,11 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
   add_message "prefab.ConfigDeltas" do
     repeated :deltas, :message, 1, "prefab.ConfigDelta"
   end
+  add_message "prefab.UpsertRequest" do
+    optional :account_id, :int64, 1
+    optional :config_delta, :message, 2, "prefab.ConfigDelta"
+    optional :previous_key, :string, 3
+  end
   add_message "prefab.LimitResponse" do
     optional :passed, :bool, 1
     optional :expires_at, :int64, 2
@@ -61,7 +66,6 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     value :MAXIMUM, 2
   end
   add_message "prefab.FeatureFlag" do
-    optional :feature, :string, 2
     optional :pct, :double, 3
     repeated :whitelisted, :string, 4
   end
@@ -87,15 +91,6 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     repeated :flags, :message, 1, "prefab.FeatureFlag"
     optional :cache_expiry, :int64, 2
   end
-  add_message "prefab.BucketWrite" do
-    optional :tokenBucket, :message, 1, "prefab.TokenBucket"
-    optional :bucket, :string, 2
-  end
-  add_message "prefab.TokenBucket" do
-    optional :current_value, :int64, 1
-    optional :time_key, :int64, 2
-    repeated :expiries, :int64, 3
-  end
   add_message "prefab.BufferedRequest" do
     optional :account_id, :int64, 1
     optional :method, :string, 2
@@ -127,6 +122,7 @@ module Prefab
   ConfigDelta = Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.ConfigDelta").msgclass
   ConfigValue = Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.ConfigValue").msgclass
   ConfigDeltas = Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.ConfigDeltas").msgclass
+  UpsertRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.UpsertRequest").msgclass
   LimitResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.LimitResponse").msgclass
   LimitResponse::LimitPolicyNames = Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.LimitResponse.LimitPolicyNames").enummodule
   LimitRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.LimitRequest").msgclass
@@ -136,8 +132,6 @@ module Prefab
   LimitDefinition::SafetyLevel = Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.LimitDefinition.SafetyLevel").enummodule
   LimitDefinitions = Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.LimitDefinitions").msgclass
   FeatureFlags = Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.FeatureFlags").msgclass
-  BucketWrite = Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.BucketWrite").msgclass
-  TokenBucket = Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.TokenBucket").msgclass
   BufferedRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.BufferedRequest").msgclass
   BatchRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.BatchRequest").msgclass
   OnFailure = Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.OnFailure").enummodule

data/lib/prefab_services_pb.rb

@@ -29,7 +29,7 @@ module Prefab
       self.service_name = 'prefab.ConfigService'
 
       rpc :GetConfig, ConfigServicePointer, stream(ConfigDeltas)
-      rpc :Upsert, ConfigDelta, ConfigServicePointer
+      rpc :Upsert, UpsertRequest, ConfigServicePointer
     end
 
     Stub = Service.rpc_stub_class

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.0.10 ruby lib
+# stub: prefab-cloud-ruby 0.0.11 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "prefab-cloud-ruby".freeze
-  s.version = "0.0.10"
+  s.version = "0.0.11"
 
   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 = "2018-01-12"
+  s.date = "2018-02-02"
   s.description = "RateLimits & Config as a service".freeze
   s.email = "jdwyer@prefab.cloud".freeze
   s.extra_rdoc_files = [

data/test/test_config_loader.rb

@@ -33,6 +33,18 @@ class TestConfigLoader < Minitest::Test
     assert_equal deltas, @loader.get_api_deltas
   end
 
+  def test_loading_tombstones_removes_entries
+    val = Prefab::ConfigValue.new(int: 456)
+    delta = Prefab::ConfigDelta.new(key: "sample_int", value: val)
+    @loader.set(delta)
+
+    delta = Prefab::ConfigDelta.new(key: "sample_int", value: nil)
+    @loader.set(delta)
+
+    deltas = Prefab::ConfigDeltas.new
+    assert_equal deltas, @loader.get_api_deltas
+  end
+
   private
 
   def should_be(type, value, key)

data/test/test_feature_flag_client.rb

@@ -5,60 +5,60 @@ class TestFeatureFlagClient < Minitest::Test
   def test_pct
     client = Prefab::FeatureFlagClient.new(MockBaseClient.new)
     Prefab::FeatureFlagClient.send(:public, :is_on?)
-
-    flag = Prefab::FeatureFlag.new(feature: "FlagName", pct: 0.5)
+    feature = "FlagName"
+    flag = Prefab::FeatureFlag.new( pct: 0.5)
 
     assert_equal false,
-                 client.is_on?(flag.feature, "hashes high", [], flag)
+                 client.is_on?(feature, "hashes high", [], flag)
 
     assert_equal true,
-                 client.is_on?(flag.feature, "hashes low", [], flag)
+                 client.is_on?(feature, "hashes low", [], flag)
   end
 
 
   def test_off
     client = Prefab::FeatureFlagClient.new(MockBaseClient.new)
     Prefab::FeatureFlagClient.send(:public, :is_on?)
-
-    flag = Prefab::FeatureFlag.new(feature: "FlagName", pct: 0)
+    feature = "FlagName"
+    flag = Prefab::FeatureFlag.new(pct: 0)
 
     assert_equal false,
-                 client.is_on?(flag.feature, "hashes high", [], flag)
+                 client.is_on?(feature, "hashes high", [], flag)
 
     assert_equal false,
-                 client.is_on?(flag.feature, "hashes low", [], flag)
+                 client.is_on?(feature, "hashes low", [], flag)
   end
 
 
   def test_on
     client = Prefab::FeatureFlagClient.new(MockBaseClient.new)
     Prefab::FeatureFlagClient.send(:public, :is_on?)
-
-    flag = Prefab::FeatureFlag.new(feature: "FlagName", pct: 1)
+    feature = "FlagName"
+    flag = Prefab::FeatureFlag.new(pct: 1)
 
     assert_equal true,
-                 client.is_on?(flag.feature, "hashes high", [], flag)
+                 client.is_on?(feature, "hashes high", [], flag)
 
     assert_equal true,
-                 client.is_on?(flag.feature, "hashes low", [], flag)
+                 client.is_on?(feature, "hashes low", [], flag)
   end
 
   def test_whitelist
     client = Prefab::FeatureFlagClient.new(MockBaseClient.new)
     Prefab::FeatureFlagClient.send(:public, :is_on?)
-
-    flag = Prefab::FeatureFlag.new(feature: "FlagName", pct: 0, whitelisted: ["beta", "user:1", "user:3"])
+    feature = "FlagName"
+    flag = Prefab::FeatureFlag.new(pct: 0, whitelisted: ["beta", "user:1", "user:3"])
 
     assert_equal false,
-                 client.is_on?(flag.feature, "anything", [], flag)
+                 client.is_on?(feature, "anything", [], flag)
     assert_equal true,
-                 client.is_on?(flag.feature, "anything", ["beta"], flag)
+                 client.is_on?(feature, "anything", ["beta"], flag)
     assert_equal true,
-                 client.is_on?(flag.feature, "anything", ["alpha", "beta"], flag)
+                 client.is_on?(feature, "anything", ["alpha", "beta"], flag)
     assert_equal true,
-                 client.is_on?(flag.feature, "anything", ["alpha", "user:1"], flag)
+                 client.is_on?(feature, "anything", ["alpha", "user:1"], flag)
     assert_equal false,
-                 client.is_on?(flag.feature, "anything", ["alpha", "user:2"], flag)
+                 client.is_on?(feature, "anything", ["alpha", "user:2"], flag)
 
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prefab-cloud-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-12 00:00:00.000000000 Z
+date: 2018-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grpc