prefab-cloud-ruby 0.13.3 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc875095444727947594dfa96e7a4e59fbab20a14ec486fdd4b804b936aad374
-  data.tar.gz: 7af3f2155fdb85063c674b4f4bf3365b089e507789adf9eaa0ca5b4e206b9e19
+  metadata.gz: 82381e4b656d675f4b98ee11601cde1920637e52eb5b039814247500207b9fa5
+  data.tar.gz: 4ff8914774523e745d512d506cc42f20e71a657fd8191d82e7e6ba1878bf04c9
 SHA512:
-  metadata.gz: aff23956f0c34934a5702bd51517ac14111a7888ba99948537fb76fbcdf162abf6a032ae8caba5c902e06894b0f3bf5ffcf5a95efce9cf00210b4f333059e233
-  data.tar.gz: 21717c0f85eecd1972baf9fc1d8fa8b57d225da60eb6cba006b3ac4f288f4fab77c18f5d6a34e49ca8beb8835e22a520b3bc92b058658309d41db5eba9a05c86
+  metadata.gz: aac3fc04c779900ca92a6a859430a2fe7776bee90afba632456ff45e3bacb428dda61314d3cbf5a5b04ce61672e4591afb7ae0248b77352b381f52dcbbfb6f24
+  data.tar.gz: 5e2008ec802e2f32154bffb34804673187feb618a60edf2aba19666851787e14111e3d6e0fbeeebe8e3192cac56a32f3010b4d46ef507c3d16359886973ee90c

data/Gemfile

@@ -8,6 +8,7 @@ gem 'google-protobuf', :platforms => :ruby
 gem 'googleapis-common-protos-types', :platforms => :ruby
 
 group :development do
+  gem 'benchmark-ips'
   gem 'grpc-tools', :platforms => :ruby
   gem "rdoc", "~> 3.12"
   gem "bundler"

data/Gemfile.lock

@@ -3,6 +3,7 @@ GEM
   specs:
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
+    benchmark-ips (2.10.0)
     builder (3.2.4)
     concurrent-ruby (1.1.10)
     daemons (1.4.1)
@@ -109,6 +110,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  benchmark-ips
   bundler
   concurrent-ruby (~> 1.0, >= 1.0.5)
   faraday

data/VERSION

@@ -1 +1 @@
-0.13.3
+0.16.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

@@ -5,8 +5,8 @@ module Prefab
 
     RECONNECT_WAIT = 5
     DEFAULT_CHECKPOINT_FREQ_SEC = 60
-    DEFAULT_S3CF_BUCKET = 'http://d2j4ed6ti5snnd.cloudfront.net'
     SSE_READ_TIMEOUT = 300
+    AUTH_USER = "authuser"
 
     def initialize(base_client, timeout)
       @base_client = base_client
@@ -29,8 +29,6 @@ module Prefab
 
       @cancellable_interceptor = Prefab::CancellableInterceptor.new(@base_client)
 
-      @s3_cloud_front = ENV["PREFAB_S3CF_BUCKET"] || DEFAULT_S3CF_BUCKET
-
       if @options.local_only?
         finish_init!(:local_only)
       else
@@ -119,7 +117,6 @@ module Prefab
                                                interceptors: [@base_client.interceptor, @cancellable_interceptor])
     end
 
-    # try API first, if not, fallback to s3
     def load_checkpoint
       success = load_checkpoint_api_cdn
 
@@ -134,12 +131,6 @@ module Prefab
       if success
         return
       else
-        @base_client.log_internal Logger::INFO, "LoadCheckpoint: Fallback to S3"
-      end
-
-      success = load_checkpoint_from_s3
-
-      if !success
         @base_client.log_internal Logger::WARN, "No success loading checkpoints"
       end
     end
@@ -159,24 +150,19 @@ 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)
     end
 
-    def load_checkpoint_from_s3
-      url = "#{@s3_cloud_front}/#{@base_client.api_key.gsub("|", "/")}"
-      load_url(Faraday.new(url), :remote_s3)
-    end
-
     def load_url(conn, source)
       resp = conn.get('')
       if resp.status == 200
@@ -193,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
@@ -201,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
@@ -240,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/config_loader.rb

@@ -56,57 +56,59 @@ module Prefab
 
     def load_classpath_config
       classpath_dir = @prefab_options.prefab_config_classpath_dir
-      load_glob(File.join(classpath_dir, ".prefab*config.yaml"))
+      rtn = load_glob(File.join(classpath_dir, ".prefab.default.config.yaml"))
+      @prefab_options.prefab_envs.each do |env|
+        rtn = rtn.merge load_glob(File.join(classpath_dir, ".prefab.#{env}.config.yaml"))
+      end
+      rtn
     end
 
     def load_local_overrides
       override_dir = @prefab_options.prefab_config_override_dir
-      load_glob(File.join(override_dir, ".prefab*config.yaml"))
+      rtn = load_glob(File.join(override_dir, ".prefab.overrides.config.yaml"))
+      @prefab_options.prefab_envs.each do |env|
+        rtn = rtn.merge load_glob(File.join(override_dir, ".prefab.#{env}.config.yaml"))
+      end
+      rtn
     end
 
     def load_glob(glob)
       rtn = {}
       Dir.glob(glob).each do |file|
+        @base_client.log_internal Logger::INFO, "Load #{file}"
         yaml = load(file)
         yaml.each do |k, v|
-          if v.class == Hash
-            v.each do |env_k, env_v|
-              if k == @prefab_options.defaults_env
-                if env_v.class == Hash && env_v['feature_flag']
-                  rtn[env_k] = feature_flag_config(file, k, env_k, env_v)
-                else
-                  rtn[env_k] = {
-                    source: file,
-                    match: k,
-                    config: Prefab::Config.new(
-                      key: env_k,
-                      rows: [
-                        Prefab::ConfigRow.new(value: Prefab::ConfigValue.new(value_from(env_v)))
-                      ]
-                    )
-                  }
-                end
-              else
-                next
-              end
-            end
-          else
-            rtn[k] = {
-              source: file,
-              match: "default",
-              config: Prefab::Config.new(
-                key: k,
-                rows: [
-                  Prefab::ConfigRow.new(value: Prefab::ConfigValue.new(value_from(v)))
-                ]
-              )
-            }
-          end
+          load_kv(k, v, rtn, file)
         end
       end
       rtn
     end
 
+    def load_kv(k, v, rtn, file)
+      if v.class == Hash
+        if v['feature_flag']
+          rtn[k] = feature_flag_config(file, k, v)
+        else
+          v.each do |nest_k, nest_v|
+            nested_key = "#{k}.#{nest_k}"
+            nested_key = k if nest_k == "_"
+            load_kv(nested_key, nest_v, rtn, file)
+          end
+        end
+      else
+        rtn[k] = {
+          source: file,
+          match: "default",
+          config: Prefab::Config.new(
+            key: k,
+            rows: [
+              Prefab::ConfigRow.new(value: Prefab::ConfigValue.new(value_from(v)))
+            ]
+          )
+        }
+      end
+    end
+
     def load(filename)
       if File.exist? filename
         @base_client.log_internal Logger::INFO, "Load #{filename}"
@@ -130,11 +132,11 @@ module Prefab
       end
     end
 
-    def feature_flag_config(file, k, env_k, env_v)
+    def feature_flag_config(file, key, value)
       criteria = Prefab::Criteria.new(operator: 'ALWAYS_TRUE')
 
-      if env_v['criteria']
-        criteria = Prefab::Criteria.new(criteria_values(env_v['criteria']))
+      if value['criteria']
+        criteria = Prefab::Criteria.new(criteria_values(value['criteria']))
       end
 
       row = Prefab::ConfigRow.new(
@@ -154,16 +156,16 @@ module Prefab
         )
       )
 
-      unless env_v.has_key?('value')
-        raise Prefab::Error, "Feature flag config `#{env_k}` #{file} must have a `value`"
+      unless value.has_key?('value')
+        raise Prefab::Error, "Feature flag config `#{key}` #{file} must have a `value`"
       end
 
       {
         source: file,
-        match: k,
+        match: key,
         config: Prefab::Config.new(
-          key: env_k,
-          variants: [Prefab::FeatureFlagVariant.new(value_from(env_v['value']))],
+          key: key,
+          variants: [Prefab::FeatureFlagVariant.new(value_from(value['value']))],
           rows: [row]
         )
       }

data/lib/prefab/feature_flag_client.rb

@@ -116,38 +116,45 @@ 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
 
-    # def criteria_match?(rule, lookup_key, attributes)
-    #
-    # end
     def criteria_match?(criteria, lookup_key, attributes)
-      if criteria.operator == :ALWAYS_TRUE
-        return true
-      elsif criteria.operator == :LOOKUP_KEY_IN
-        return criteria.values.include?(lookup_key)
-      elsif criteria.operator == :LOOKUP_KEY_NOT_IN
-        return !criteria.values.include?(lookup_key)
-      elsif criteria.operator == :IN_SEG
-        return segment_matches(criteria.values, lookup_key, attributes).any?
-      elsif criteria.operator == :NOT_IN_SEG
-        return segment_matches(criteria.values, lookup_key, attributes).none?
-      elsif criteria.operator == :PROP_IS_ONE_OF
-        return criteria.values.include?(attributes[criteria.property]) || criteria.values.include?(attributes[criteria.property.to_sym])
-      elsif criteria.operator == :PROP_IS_NOT_ONE_OF
-        return !(criteria.values.include?(attributes[criteria.property]) || criteria.values.include?(attributes[criteria.property.to_sym]))
+      case criteria.operator
+      when :ALWAYS_TRUE
+        true
+      when :LOOKUP_KEY_IN
+        criteria.values.include?(lookup_key)
+      when :LOOKUP_KEY_NOT_IN
+        !criteria.values.include?(lookup_key)
+      when :IN_SEG
+        segment_matches?(criteria.values, lookup_key, attributes)
+      when :NOT_IN_SEG
+        !segment_matches?(criteria.values, lookup_key, attributes)
+      when :PROP_IS_ONE_OF
+        criteria.values.include?(attribute_value(attributes, criteria.property))
+      when :PROP_IS_NOT_ONE_OF
+        !criteria.values.include?(attribute_value(attributes, criteria.property))
+      when :PROP_ENDS_WITH_ONE_OF
+        criteria.values.any? { |value| attribute_value(attributes, criteria.property)&.end_with?(value) }
+      when :PROP_DOES_NOT_END_WITH_ONE_OF
+        criteria.values.none? { |value| attribute_value(attributes, criteria.property)&.end_with?(value) }
+      else
+        @base_client.log.info("Unknown Operator: #{criteria.operator}")
+        false
       end
-      @base_client.log.info("Unknown Operator")
-      false
     end
 
-    # evaluate each segment key and return whether each one matches
+    def attribute_value(attributes, property)
+      attributes[property] || attributes[property.to_sym]
+    end
+
+    # evaluate each segment key and return whether any match
     # there should be an associated segment available as a standard config obj
-    def segment_matches(segment_keys, lookup_key, attributes)
-      segment_keys.map do |segment_key|
+    def segment_matches?(segment_keys, lookup_key, attributes)
+      segment_keys.any? do |segment_key|
         segment = @base_client.config_client.get(segment_key)
         if segment.nil?
           @base_client.log.info("Missing Segment")
@@ -160,9 +167,9 @@ module Prefab
 
     # does a given segment match?
     def segment_match?(segment, lookup_key, attributes)
-      segment.criterion.map do |criteria|
+      segment.criterion.any? do |criteria|
         criteria_match?(criteria, lookup_key, attributes)
-      end.any?
+      end
     end
   end
 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/lib/prefab/options.rb

@@ -14,7 +14,7 @@ module Prefab
     attr_reader :on_init_failure
     attr_reader :prefab_config_override_dir
     attr_reader :prefab_config_classpath_dir
-    attr_reader :defaults_env
+    attr_reader :prefab_envs
 
     DEFAULT_LOG_FORMATTER = proc { |severity, datetime, progname, msg|
       "#{severity.ljust(5)} #{datetime}: #{progname} #{msg}\n"
@@ -50,7 +50,7 @@ module Prefab
       prefab_datasources: ENV['PREFAB_DATASOURCES'] == "LOCAL_ONLY" ? DATASOURCES::LOCAL_ONLY : DATASOURCES::ALL,
       prefab_config_override_dir: Dir.home,
       prefab_config_classpath_dir: ".",
-      defaults_env: ""
+      prefab_envs:  ENV['PREFAB_ENVS'].nil? ? [] : ENV['PREFAB_ENVS'].split(",")
     )
       # debugger
       @api_key = api_key
@@ -67,7 +67,7 @@ module Prefab
       @prefab_datasources = prefab_datasources
       @prefab_config_classpath_dir = prefab_config_classpath_dir
       @prefab_config_override_dir = prefab_config_override_dir
-      @defaults_env = defaults_env
+      @prefab_envs = Array(prefab_envs)
     end
 
     def local_only?

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.13.3 ruby lib
+# stub: prefab-cloud-ruby 0.16.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "prefab-cloud-ruby".freeze
-  s.version = "0.13.3"
+  s.version = "0.16.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-12"
+  s.date = "2022-09-01"
   s.description = "RateLimits & Config as a service".freeze
   s.email = "jdwyer@prefab.cloud".freeze
   s.extra_rdoc_files = [
@@ -54,7 +54,8 @@ Gem::Specification.new do |s|
     "lib/prefab_services_pb.rb",
     "prefab-cloud-ruby.gemspec",
     "run_test_harness_server.sh",
-    "test/.prefab.test.config.yaml",
+    "test/.prefab.default.config.yaml",
+    "test/.prefab.unit_tests.config.yaml",
     "test/harness_server.rb",
     "test/test_client.rb",
     "test/test_config_client.rb",
@@ -80,6 +81,7 @@ Gem::Specification.new do |s|
     s.add_runtime_dependency(%q<grpc>.freeze, [">= 0"])
     s.add_runtime_dependency(%q<google-protobuf>.freeze, [">= 0"])
     s.add_runtime_dependency(%q<googleapis-common-protos-types>.freeze, [">= 0"])
+    s.add_development_dependency(%q<benchmark-ips>.freeze, [">= 0"])
     s.add_development_dependency(%q<grpc-tools>.freeze, [">= 0"])
     s.add_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
     s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
@@ -93,6 +95,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<grpc>.freeze, [">= 0"])
     s.add_dependency(%q<google-protobuf>.freeze, [">= 0"])
     s.add_dependency(%q<googleapis-common-protos-types>.freeze, [">= 0"])
+    s.add_dependency(%q<benchmark-ips>.freeze, [">= 0"])
     s.add_dependency(%q<grpc-tools>.freeze, [">= 0"])
     s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
     s.add_dependency(%q<bundler>.freeze, [">= 0"])

data/test/.prefab.default.config.yaml

@@ -0,0 +1,2 @@
+sample: default sample value
+sample_bool: true

data/test/.prefab.unit_tests.config.yaml

@@ -0,0 +1,25 @@
+sample_int: 123
+sample_double: 12.12
+sample_bool: true
+false_value: false
+zero_value: 0
+sample_to_override: Foo
+prefab.log_level: debug
+sample: test sample value
+enabled_flag: true
+disabled_flag: false
+flag_with_a_value: { "feature_flag": "true", value: "all-features" }
+in_lookup_key: { "feature_flag": "true", value: true, criteria: { operator: LOOKUP_KEY_IN, values: [ "abc123", "xyz987" ] } }
+just_my_domain: { "feature_flag": "true", value: "new-version", criteria: { operator: PROP_IS_ONE_OF, property: "domain", values: [ "prefab.cloud", "example.com" ] } }
+nested:
+  values:
+    _: top level
+    string: nested value
+
+logging:
+  app:
+    _: error
+    controller:
+      hello:
+        _: warn
+        index: info

data/test/test_client.rb

@@ -89,7 +89,7 @@ class TestClient < Minitest::Test
     options = Prefab::Options.new(**{
       prefab_config_override_dir: "none",
       prefab_config_classpath_dir: "test",
-      defaults_env: "unit_tests",
+      prefab_envs: ["unit_tests"],
       prefab_datasources: Prefab::Options::DATASOURCES::LOCAL_ONLY
     }.merge(overrides))
 

data/test/test_config_client.rb

@@ -6,7 +6,7 @@ class TestConfigClient < Minitest::Test
     options = Prefab::Options.new(
       prefab_config_override_dir: "none",
       prefab_config_classpath_dir: "test",
-      defaults_env: "unit_tests",
+      prefab_envs: "unit_tests",
       prefab_datasources: Prefab::Options::DATASOURCES::LOCAL_ONLY
     )
 
@@ -32,6 +32,21 @@ class TestConfigClient < Minitest::Test
     assert_match(/couldn't initialize in 0.01 second timeout/, err.message)
   end
 
+  def test_prefab_envs_is_forgiving
+    assert_equal ["my_env"], Prefab::Options.new(
+      prefab_envs: "my_env",
+    ).prefab_envs
+
+    assert_equal ["my_env", "a_second_env"], Prefab::Options.new(
+      prefab_envs: ["my_env", "a_second_env"],
+    ).prefab_envs
+  end
+
+  def test_prefab_envs_env_var
+    ENV["PREFAB_ENVS"] = "one,two"
+    assert_equal ["one", "two"], Prefab::Options.new().prefab_envs
+  end
+
   def test_invalid_api_key_error
     options = Prefab::Options.new(
       api_key: "",

data/test/test_config_loader.rb

@@ -6,7 +6,7 @@ class TestConfigLoader < Minitest::Test
     options = Prefab::Options.new(
       prefab_config_override_dir: "none",
       prefab_config_classpath_dir: "test",
-      defaults_env: "unit_tests"
+      prefab_envs: "unit_tests"
     )
     @loader = Prefab::ConfigLoader.new(MockBaseClient.new(options))
   end
@@ -18,11 +18,19 @@ class TestConfigLoader < Minitest::Test
     should_be :double, 12.12, "sample_double"
   end
 
-  def test_load_in_no_default_env
+  def test_nested
+    should_be :string, "nested value", "nested.values.string"
+    should_be :string, "top level", "nested.values"
+    should_be :string, "error", "logging.app"
+    should_be :string, "warn", "logging.app.controller.hello"
+    should_be :string, "info", "logging.app.controller.hello.index"
+  end
+
+  def test_load_without_unit_test_env
     options = Prefab::Options.new(
       prefab_config_override_dir: "none",
       prefab_config_classpath_dir: "test",
-    # no defaults_env
+      # no prefab_envs
     )
     @loader = Prefab::ConfigLoader.new(MockBaseClient.new(options))
     should_be :string, "default sample value", "sample"

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)
 
@@ -299,6 +299,66 @@ class TestFeatureFlagClient < Minitest::Test
 
   end
 
+  def test_prop_ends_with_one_of
+    feature = "FlagName"
+
+    variants = [
+      Prefab::FeatureFlagVariant.new(bool: false),
+      Prefab::FeatureFlagVariant.new(bool: true)
+    ]
+    flag = Prefab::FeatureFlag.new(
+      active: true,
+      inactive_variant_idx: 1,
+      rules: [
+        Prefab::Rule.new(
+          criteria: Prefab::Criteria.new(operator: Prefab::Criteria::CriteriaOperator::PROP_ENDS_WITH_ONE_OF,
+                                         property: "email",
+                                         values: ["@example.com"]),
+          variant_weights: [
+            Prefab::VariantWeight.new(weight: 100, variant_idx: 2)
+          ]
+        )
+      ]
+    )
+
+    assert_equal false, evaluate(feature, "user:0", {}, flag, variants)
+    assert_equal true, evaluate(feature, "user:0", {email: "test@example.com"}, flag, variants)
+    assert_equal true, evaluate(feature, "user:0", {"email" => "test@example.com"}, flag, variants)
+  end
+
+  def test_prop_does_not_end_with_one_of
+    feature = "FlagName"
+
+    variants = [
+      Prefab::FeatureFlagVariant.new(bool: false),
+      Prefab::FeatureFlagVariant.new(bool: true)
+    ]
+    flag = Prefab::FeatureFlag.new(
+      active: true,
+      inactive_variant_idx: 1,
+      rules: [
+        Prefab::Rule.new(
+          criteria: Prefab::Criteria.new(operator: Prefab::Criteria::CriteriaOperator::PROP_DOES_NOT_END_WITH_ONE_OF,
+                                         property: "email",
+                                         values: ["@example.com"]),
+          variant_weights: [
+            Prefab::VariantWeight.new(weight: 100, variant_idx: 2)
+          ]
+        ),
+        Prefab::Rule.new(
+          criteria: Prefab::Criteria.new(operator: Prefab::Criteria::CriteriaOperator::ALWAYS_TRUE),
+          variant_weights: [
+            Prefab::VariantWeight.new(weight: 100, variant_idx: 1)
+          ]
+        )
+      ],
+    )
+
+    assert_equal true, evaluate(feature, "user:0", {}, flag, variants)
+    assert_equal false, evaluate(feature, "user:0", {email: "test@example.com"}, flag, variants)
+    assert_equal false, evaluate(feature, "user:0", {"email" => "test@example.com"}, flag, variants)
+  end
+
   def evaluate(feature_name, lookup_key, attributes, flag, variants)
     variant = @client.get_variant(feature_name, lookup_key, attributes, flag, variants)
     @client.value_of_variant(variant)

data/test/test_helper.rb

@@ -81,7 +81,7 @@ def new_client(overrides = {})
   options = Prefab::Options.new(**{
     prefab_config_override_dir: "none",
     prefab_config_classpath_dir: "test",
-    defaults_env: "unit_tests",
+    prefab_envs: ["unit_tests"],
     prefab_datasources: Prefab::Options::DATASOURCES::LOCAL_ONLY
   }.merge(overrides))
 

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.13.3
+  version: 0.16.0
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-12 00:00:00.000000000 Z
+date: 2022-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -100,6 +100,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: benchmark-ips
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: grpc-tools
   requirement: !ruby/object:Gem::Requirement
@@ -227,7 +241,8 @@ files:
 - lib/prefab_services_pb.rb
 - prefab-cloud-ruby.gemspec
 - run_test_harness_server.sh
-- test/.prefab.test.config.yaml
+- test/.prefab.default.config.yaml
+- test/.prefab.unit_tests.config.yaml
 - test/harness_server.rb
 - test/test_client.rb
 - test/test_config_client.rb

data/test/.prefab.test.config.yaml

@@ -1,32 +0,0 @@
-sample: default sample value
-sample_int: 123
-sample_double: 12.12
-sample_bool: true
-false_value: false
-zero_value: 0
-sample_to_override: Foo
-prefab.log_level: debug
-unit_tests:
-  sample: test sample value
-  enabled_flag: true
-  disabled_flag: false
-  flag_with_a_value:
-    feature_flag: true
-    value: "all-features"
-  in_lookup_key:
-    feature_flag: true
-    value: true
-    criteria:
-      operator: LOOKUP_KEY_IN
-      values:
-        - abc123
-        - xyz987
-  just_my_domain:
-    feature_flag: true
-    value: new-version
-    criteria:
-      operator: PROP_IS_ONE_OF
-      property: domain
-      values: ["prefab.cloud", "example.com"]
-ignored_env:
-  sample: ignored value