prefab-cloud-ruby 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fef66a6ac50710f11854f9168c30573ef3fea74acd9089308d1a70ac754f584
-  data.tar.gz: 7b424813748667165d263f0869cf0a93c56d9f0fdafe60f22799b358f3f5688a
+  metadata.gz: 56f869e526c34a5e949e257b7d3bad480e9bfc35a32c228c00edf27bd1ffd0e1
+  data.tar.gz: 34e5775b22b085295618be7f9c411923d3b643e16032ee70c7dc6340fed6009b
 SHA512:
-  metadata.gz: 03d9230267363cc51962c3a244f39cc9b6e6bda7da3c6e9b460ed195330d3035840f69fc2837f66b86a4c05d6b830a14db56aee4578fa5e13e580c7be89fa6c8
-  data.tar.gz: 1b084b6f4b8180069a214a6edcaeb5d23c1afb234f5161870a6b11d5d2841a1d05683f65eeb94c9cd6b92cd02d70296e2abb9d430d2f1c6143ee2d0224ae3b85
+  metadata.gz: d5ce5a0a3c1dc3d0d8e258da5da8cd9f12975d8232c0775a39a205cbfb464074bf0fda9c7467d5bdbc4d04a4020d48aa68a816eaf1714ea5c3863a299178b2ac
+  data.tar.gz: 5123db89a4947143ceff5e29f30cd655870193c6ec8afaa7eca9f2fb85d61c1da2eae18a1fd31fbd3ae5c580a4e438c93c330ecb54fffdaf05b94259b6dc96ec

data/VERSION

@@ -1 +1 @@
-0.14.0
+0.15.0

data/lib/prefab/client.rb

@@ -5,7 +5,7 @@ module Prefab
     BASE_SLEEP_SEC = 0.5
     NO_DEFAULT_PROVIDED = :no_default_provided
 
-    attr_reader :project_id, :shared_cache, :stats, :namespace, :interceptor, :api_key, :prefab_api_url, :options
+    attr_reader :shared_cache, :stats, :namespace, :interceptor, :api_key, :prefab_api_url, :options
 
     def initialize(options = Prefab::Options.new)
       @options = options
@@ -15,12 +15,10 @@ module Prefab
       @stubs = {}
 
       if @options.local_only?
-        @project_id = 0
         log_internal Logger::INFO, "Prefab Running in Local Mode"
       else
         @api_key = @options.api_key
-        raise Prefab::Errors::InvalidApiKeyError.new(@api_key) if @api_key.nil? || @api_key.empty? || api_key.count("-") != 3
-        @project_id = @api_key.split("-")[0].to_i # unvalidated, but that's ok. APIs only listen to the actual passwd
+        raise Prefab::Errors::InvalidApiKeyError.new(@api_key) if @api_key.nil? || @api_key.empty? || api_key.count("-") < 1
         @interceptor = Prefab::AuthInterceptor.new(@api_key)
         @prefab_api_url = @options.prefab_api_url
         @prefab_grpc_url = @options.prefab_grpc_url
@@ -82,10 +80,6 @@ module Prefab
       end
     end
 
-    def cache_key(post_fix)
-      "prefab:#{project_id}:#{post_fix}"
-    end
-
     def reset!
       @stubs.clear
       @_channel = nil

data/lib/prefab/config_client.rb

@@ -6,6 +6,7 @@ module Prefab
     RECONNECT_WAIT = 5
     DEFAULT_CHECKPOINT_FREQ_SEC = 60
     SSE_READ_TIMEOUT = 300
+    AUTH_USER = "authuser"
 
     def initialize(base_client, timeout)
       @base_client = base_client
@@ -149,14 +150,14 @@ module Prefab
 
     def load_checkpoint_api_cdn
       key_hash = Murmur3.murmur3_32(@base_client.api_key)
-      url = "#{@options.url_for_api_cdn}/api/v1/configs/#{@base_client.project_id}/#{key_hash}/0"
+      url = "#{@options.url_for_api_cdn}/api/v1/configs/0/#{key_hash}/0"
       conn = if Faraday::VERSION[0].to_i >= 2
                Faraday.new(url) do |conn|
-                 conn.request :authorization, :basic, @base_client.project_id, @base_client.api_key
+                 conn.request :authorization, :basic, AUTH_USER, @base_client.api_key
                end
              else
                Faraday.new(url) do |conn|
-                 conn.request :basic_auth, @base_client.project_id, @base_client.api_key
+                 conn.request :basic_auth, AUTH_USER, @base_client.api_key
                end
              end
       load_url(conn, :remote_cdn_api)
@@ -178,6 +179,7 @@ module Prefab
     end
 
     def load_configs(configs, source)
+      project_id = configs.config_service_pointer.project_id
       project_env_id = configs.config_service_pointer.project_env_id
       @config_resolver.project_env_id = project_env_id
       starting_highwater_mark = @config_loader.highwater_mark
@@ -186,7 +188,7 @@ module Prefab
         @config_loader.set(config, source)
       end
       if @config_loader.highwater_mark > starting_highwater_mark
-        @base_client.log_internal Logger::INFO, "Found new checkpoint with highwater id #{@config_loader.highwater_mark} from #{source} in project #{@base_client.project_id} environment: #{project_env_id} and namespace: '#{@namespace}'"
+        @base_client.log_internal Logger::INFO, "Found new checkpoint with highwater id #{@config_loader.highwater_mark} from #{source} in project #{project_id} environment: #{project_env_id} and namespace: '#{@namespace}'"
       else
         @base_client.log_internal Logger::DEBUG, "Checkpoint with highwater id #{@config_loader.highwater_mark} from #{source}. No changes.", "prefab.config_client.load_configs"
       end
@@ -225,7 +227,7 @@ module Prefab
     end
 
     def start_sse_streaming_connection_thread(start_at_id)
-      auth = "#{@base_client.project_id}:#{@base_client.api_key}"
+      auth = "#{AUTH_USER}:#{@base_client.api_key}"
       auth_string = Base64.strict_encode64(auth)
       headers = {
         "x-prefab-start-at-id": start_at_id,

data/lib/prefab/feature_flag_client.rb

@@ -116,7 +116,7 @@ module Prefab
     end
 
     def get_user_pct(feature, lookup_key)
-      to_hash = "#{@base_client.project_id}#{feature}#{lookup_key}"
+      to_hash = "#{feature}#{lookup_key}"
       int_value = Murmur3.murmur3_32(to_hash)
       int_value / MAX_32_FLOAT
     end

data/lib/prefab/logger_client.rb

@@ -19,7 +19,7 @@ module Prefab
     end
 
     def add_internal(severity, message = nil, progname = nil, loc, &block)
-      path = get_path(loc.absolute_path, loc.base_label)
+      path = get_loc_path(loc)
       log_internal(message, path, progname, severity, &block)
     end
 
@@ -121,15 +121,19 @@ module Prefab
       val(closest_log_level_match)
     end
 
+    def get_loc_path(loc)
+      loc_path = loc.absolute_path || loc.to_s
+      get_path(loc_path, loc.base_label)
+    end
+
     # sanitize & clean the path of the caller so the key
     # looks like log_level.app.models.user
     def get_path(absolute_path, base_label)
       path = (absolute_path || UNKNOWN).dup
       path.slice! Dir.pwd
+      path.gsub!(/(.*)?(?=\/lib)/im, "") # replace everything before first lib
 
-      path.gsub!(/.*?(?=\/lib\/)/im, "")
-
-      path = path.gsub("/", SEP).gsub(".rb", "") + SEP + base_label
+      path = path.gsub("/", SEP).gsub(/.rb.*/, "") + SEP + base_label
       path.slice! ".lib"
       path.slice! SEP
       path

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.14.0 ruby lib
+# stub: prefab-cloud-ruby 0.15.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "prefab-cloud-ruby".freeze
-  s.version = "0.14.0"
+  s.version = "0.15.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 = "2022-08-15"
+  s.date = "2022-08-28"
   s.description = "RateLimits & Config as a service".freeze
   s.email = "jdwyer@prefab.cloud".freeze
   s.extra_rdoc_files = [

data/test/test_feature_flag_client.rb

@@ -37,10 +37,10 @@ class TestFeatureFlagClient < Minitest::Test
     # weights above chosen to be 86% in variant_idx 2. and 14% in variant_idx 1.
     # since hashes high is 86.32 > 86 it just falls outside the 86% range and gets false
 
-    # "1FlagNamehashes high" hashes to 86.322% through dist
+    # "FlagNamevery high hash" hashes to 88.8602812% through dist
     assert_equal false,
-                 evaluate(feature, "hashes high", [], flag, variants)
-    # "1FlagNamehashes low" hashes to 44.547% through dist
+                 evaluate(feature, "very high hash", [], flag, variants)
+    # "FlagNamehashes low" hashes to 42.7934% through dist
     assert_equal true,
                  evaluate(feature, "hashes low", [], flag, variants)
 

data/test/test_logger.rb

@@ -4,6 +4,7 @@ require 'test_helper'
 class TestCLogger < Minitest::Test
   def setup
     Prefab::LoggerClient.send(:public, :get_path)
+    Prefab::LoggerClient.send(:public, :get_loc_path)
     Prefab::LoggerClient.send(:public, :level_of)
     @logger = Prefab::LoggerClient.new($stdout)
   end
@@ -16,6 +17,27 @@ class TestCLogger < Minitest::Test
     assert_equal "active_support.log_subscriber.info",
                  @logger.get_path("/Users/jdwyah/.rvm/gems/ruby-2.3.3@forcerank/gems/activesupport-4.1.16/lib/active_support/log_subscriber.rb",
                                   "info")
+    assert_equal "active_support.log_subscriber.info",
+                 @logger.get_path("/Users/jeffdwyer/.asdf/installs/ruby/3.1.2/lib/ruby/gems/3.1.0/gems/activesupport-7.0.2.4/lib/active_support/log_subscriber.rb:130:in `info'",
+                                  "info")
+  end
+
+  def test_loc_resolution
+    backtrace_location = Struct.new(:absolute_path, :base_label, :string) do
+      def to_s
+        string
+      end
+    end # https://ruby-doc.org/core-3.0.0/Thread/Backtrace/Location.html
+
+    # verify that even if the Thread::Backtrace::Location does not have an absolute_location, we do our best
+    assert_equal "active_support.log_subscriber.info",
+                 @logger.get_loc_path(backtrace_location.new(nil,
+                                                             "info",
+                                                             "/Users/jeffdwyer/.asdf/installs/ruby/3.1.2/lib/ruby/gems/3.1.0/gems/activesupport-7.0.2.4/lib/active_support/log_subscriber.rb:130:in `info'"))
+    assert_equal "test_l.info",
+                 @logger.get_loc_path(backtrace_location.new("/Users/jdwyah/Documents/workspace/RateLimitInc/prefab-cloud-ruby/lib/test_l.rb",
+                                                             "info",
+                                                             "/Users/jeffdwyer/.asdf/installs/ruby/3.1.2/lib/ruby/gems/3.1.0/gems/activesupport-7.0.2.4/lib/active_support/log_subscriber.rb:130:in `info'"))
   end
 
   def test_level_of

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prefab-cloud-ruby
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-15 00:00:00.000000000 Z
+date: 2022-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby