prefab-cloud-ruby 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8cd1347e930a4820b28ae3943e100a09765efeb56ca423dc4e4f26b51e3543b
-  data.tar.gz: 783119a33360850c31c425558735d356202e5365aa9f3ae3e88f776a22c7e231
+  metadata.gz: e0cc90e8b5acc15676a5101e6cbd902e37e38781ebb6d6fb33c892f938df3bbc
+  data.tar.gz: 68e1dbb144273aa9c54fb11efdf9333f2260a8805705d2aff47885719d995b7f
 SHA512:
-  metadata.gz: 04b84fcdebab292f086d7909428ea8b77f0d7a53a2dfe5943716ba988ea778ddef0f3c0f09ed4ccddae048097e17f358699633213059ab3062ae04ae287acc99
-  data.tar.gz: 2f65bdf10b36016e397413774bc676b20ed40d42f4ea4abcb7984bdd16afcbefd313e05a28505630cc9a818bcca950e60dcb41774d15e353d08f1e4d8d028966
+  metadata.gz: 9518b4ab1b19e6f7532fd29146b26bd0fd4e3527dbc4fde041b61b712a843db95f6f9355d8afb0b2496436aab711ec5f4a57075dbaf80c7afd4bb85c35d92b53
+  data.tar.gz: d2f4806025b4c965792653149ac9976b47ed4f687bbbb9b73cf58af091a55d4ad03affe49e6cd55aba132fa1a49f422f73900a2d295abb3afb2867cf204bb533

data/.github/workflows/ruby.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.7', '3.0', '3.1']
+        ruby-version: ['2.7', '3.0', '3.3']
 
     steps:
     - uses: actions/checkout@v3
@@ -36,7 +36,9 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby-version }}
-        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+        bundler-cache: false # runs 'bundle install' and caches installed gems automatically
+    - name: Install dependencies
+      run: bundle install --without development --jobs 4 --retry 3
     - name: Run tests
       run: bundle exec rake
       env:

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.6.1 - 2024-03-28
+
+- Performance optimizations (#178)
+- Global context (#182)
+
 ## 1.6.0 - 2024-03-27
 
 - Use semantic_logger for internal logging (#173)

data/Gemfile

@@ -7,8 +7,7 @@ gem 'google-protobuf', platforms: :ruby
 gem 'ld-eventsource'
 gem 'uuid'
 
-gem 'activesupport',  '>= 4'
-gem 'actionpack',  '>= 4'
+gem 'activesupport', '>= 4'
 
 gem 'semantic_logger', require: "semantic_logger/sync"
 

data/Gemfile.lock

@@ -1,23 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.1.2)
-      actionview (= 7.1.2)
-      activesupport (= 7.1.2)
-      nokogiri (>= 1.8.5)
-      racc
-      rack (>= 2.2.4)
-      rack-session (>= 1.0.1)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.2)
-      rails-html-sanitizer (~> 1.6)
-    actionview (7.1.2)
-      activesupport (= 7.1.2)
-      builder (~> 3.1)
-      erubi (~> 1.11)
-      rails-dom-testing (~> 2.2)
-      rails-html-sanitizer (~> 1.6)
-    activesupport (7.1.2)
+    activesupport (7.1.3.2)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -27,34 +11,48 @@ GEM
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.6)
+      public_suffix (>= 2.0.2, < 6.0)
     ansi (1.5.0)
     base64 (0.2.0)
-    benchmark-ips (2.10.0)
-    bigdecimal (3.1.4)
+    benchmark-ips (2.13.0)
+    bigdecimal (3.1.7)
     builder (3.2.4)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
-    crass (1.0.6)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    docile (1.3.5)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
-    drb (2.2.0)
-      ruby2_keywords
-    erubi (1.12.0)
-    faraday (1.3.0)
+    docile (1.4.0)
+    domain_name (0.6.20240107)
+    drb (2.2.1)
+    faraday (1.10.3)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
       faraday-net_http (~> 1.0)
-      multipart-post (>= 1.2, < 3)
-      ruby2_keywords
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
     faraday-net_http (1.0.1)
-    ffi (1.15.5)
-    ffi-compiler (1.0.1)
-      ffi (>= 1.0.0)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    ffi (1.16.3)
+    ffi-compiler (1.3.2)
+      ffi (>= 1.15.5)
       rake
-    git (1.13.0)
+    git (1.19.1)
       addressable (~> 2.8)
       rchardet (~> 1.8)
     github_api (0.19.0)
@@ -63,20 +61,21 @@ GEM
       faraday (>= 0.8, < 2)
       hashie (~> 3.5, >= 3.5.2)
       oauth2 (~> 1.0)
-    google-protobuf (3.22.2)
-    googleapis-common-protos-types (1.5.0)
-      google-protobuf (~> 3.14)
+    google-protobuf (3.25.3)
+    googleapis-common-protos-types (1.14.0)
+      google-protobuf (~> 3.18)
     hashie (3.6.0)
-    highline (2.0.3)
-    http (5.0.1)
-      addressable (~> 2.3)
+    highline (3.0.1)
+    http (5.2.0)
+      addressable (~> 2.8)
+      base64 (~> 0.1)
       http-cookie (~> 1.0)
       http-form_data (~> 2.2)
-      llhttp-ffi (~> 0.3.0)
-    http-cookie (1.0.4)
+      llhttp-ffi (~> 0.5.0)
+    http-cookie (1.0.5)
       domain_name (~> 0.5)
     http-form_data (2.3.0)
-    i18n (1.14.1)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
     juwelier (2.4.9)
       builder
@@ -90,34 +89,32 @@ GEM
       rake
       rdoc
       semver2
-    jwt (2.2.2)
+    jwt (2.8.1)
+      base64
     kamelcase (0.0.2)
       semver2 (~> 3)
-    ld-eventsource (2.2.0)
+    ld-eventsource (2.2.2)
       concurrent-ruby (~> 1.0)
       http (>= 4.4.1, < 6.0.0)
-    llhttp-ffi (0.3.1)
+    llhttp-ffi (0.5.0)
       ffi-compiler (~> 1.0)
       rake (~> 13.0)
-    loofah (2.21.4)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.12.0)
     macaddr (1.7.2)
       systemu (~> 2.6.5)
-    mini_portile2 (2.8.2)
-    minitest (5.16.2)
-    minitest-focus (1.3.1)
+    mini_portile2 (2.8.5)
+    minitest (5.22.3)
+    minitest-focus (1.4.0)
       minitest (>= 4, < 6)
-    minitest-reporters (1.5.0)
+    minitest-reporters (1.6.1)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
     multi_json (1.15.0)
     multi_xml (0.6.0)
-    multipart-post (2.1.1)
+    multipart-post (2.4.0)
     mutex_m (0.2.0)
-    nokogiri (1.15.2)
+    nokogiri (1.16.3)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oauth2 (1.4.11)
@@ -126,41 +123,32 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 4)
-    psych (3.3.1)
-    public_suffix (4.0.6)
-    racc (1.7.0)
-    rack (3.0.6.1)
-    rack-session (2.0.0)
-      rack (>= 3.0.0)
-    rack-test (2.1.0)
-      rack (>= 1.3)
-    rails-dom-testing (2.2.0)
-      activesupport (>= 5.0.0)
-      minitest
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.0)
-      loofah (~> 2.21)
-      nokogiri (~> 1.14)
-    rake (13.0.6)
+    psych (5.1.2)
+      stringio
+    public_suffix (5.0.4)
+    racc (1.7.3)
+    rack (3.0.10)
+    rake (13.1.0)
     rchardet (1.8.0)
-    rdoc (6.3.3)
-    ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.4)
+    rdoc (6.6.3.1)
+      psych (>= 4.0.0)
+    ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
     semantic_logger (4.15.0)
       concurrent-ruby (~> 1.0)
     semver2 (3.4.2)
-    simplecov (0.18.5)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
+    stringio (3.1.0)
     systemu (2.6.5)
     thread_safe (0.3.6)
-    timecop (0.9.4)
+    timecop (0.9.8)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8)
     uuid (2.3.9)
       macaddr (~> 1.0)
 
@@ -168,7 +156,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionpack (>= 4)
   activesupport (>= 4)
   benchmark-ips
   bundler

data/Rakefile

@@ -9,42 +9,45 @@ rescue Bundler::BundlerError => e
   warn 'Run `bundle install` to install missing gems'
   exit e.status_code
 end
+
 require 'rake'
-require 'juwelier'
-Juwelier::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://guides.rubygems.org/specification-reference/ for more options
-  gem.name = 'prefab-cloud-ruby'
-  gem.homepage = 'http://github.com/prefab-cloud/prefab-cloud-ruby'
-  gem.license = 'MIT'
-  gem.summary = %(Prefab Ruby Infrastructure)
-  gem.description = %(Feature Flags, Live Config, and Dynamic Log Levels as a service)
-  gem.email = 'jdwyer@prefab.cloud'
-  gem.authors = ['Jeff Dwyer']
+task default: :test
 
-  # dependencies defined in Gemfile
-end
-Juwelier::RubygemsDotOrgTasks.new
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
+unless ENV['CI']
+  require 'juwelier'
+  Juwelier::Tasks.new do |gem|
+    # gem is a Gem::Specification... see http://guides.rubygems.org/specification-reference/ for more options
+    gem.name = 'prefab-cloud-ruby'
+    gem.homepage = 'http://github.com/prefab-cloud/prefab-cloud-ruby'
+    gem.license = 'MIT'
+    gem.summary = %(Prefab Ruby Infrastructure)
+    gem.description = %(Feature Flags, Live Config, and Dynamic Log Levels as a service)
+    gem.email = 'jdwyer@prefab.cloud'
+    gem.authors = ['Jeff Dwyer']
 
-desc 'Code coverage detail'
-task :simplecov do
-  ENV['COVERAGE'] = 'true'
-  Rake::Task['test'].execute
-end
+    # dependencies defined in Gemfile
+  end
+  Juwelier::RubygemsDotOrgTasks.new
+  require 'rake/testtask'
+  Rake::TestTask.new(:test) do |test|
+    test.libs << 'lib' << 'test'
+    test.pattern = 'test/**/test_*.rb'
+    test.verbose = true
+  end
 
-task default: :test
+  desc 'Code coverage detail'
+  task :simplecov do
+    ENV['COVERAGE'] = 'true'
+    Rake::Task['test'].execute
+  end
 
-require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ''
+  require 'rdoc/task'
+  Rake::RDocTask.new do |rdoc|
+    version = File.exist?('VERSION') ? File.read('VERSION') : ''
 
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "prefab-cloud-ruby #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+    rdoc.rdoc_dir = 'rdoc'
+    rdoc.title = "prefab-cloud-ruby #{version}"
+    rdoc.rdoc_files.include('README*')
+    rdoc.rdoc_files.include('lib/**/*.rb')
+  end
 end

data/VERSION

@@ -1 +1 @@
-1.6.0
+1.6.1

data/dev/allocation_stats

@@ -0,0 +1,60 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'bundler/setup'
+
+gemspec = Dir.glob(File.expand_path("../../*.gemspec", __FILE__)).first
+spec = Gem::Specification.load(gemspec)
+
+# Add the require paths to the $LOAD_PATH
+spec.require_paths.each do |path|
+  full_path = File.expand_path("../" + path, __dir__)
+  $LOAD_PATH.unshift(full_path) unless $LOAD_PATH.include?(full_path)
+end
+
+spec.require_paths.each do |path|
+  require "./lib/prefab-cloud-ruby"
+end
+
+require 'prefab-cloud-ruby'
+
+$prefab = Prefab::Client.new(collect_logger_counts: false, collect_evaluation_summaries: false,
+                             context_upload_mode: :none)
+$prefab.get('prefab.auth.allowed_origins')
+
+puts '-' * 80
+
+require 'allocation_stats'
+
+$runs = 100
+
+def measure(description)
+  puts "Measuring #{description}..."
+  stats = $prefab.with_context(user: { email_suffix: 'yahoo.com' }) do
+    AllocationStats.trace do
+      $runs.times do
+        yield
+      end
+    end
+  end
+
+  allocations = stats.allocations(alias_paths: true).group_by(:sourcefile, :sourceline, :class)
+
+  if ENV['TOP']
+    puts allocations.sort_by_size.to_text.split("\n").first(20)
+  end
+
+  puts "Total allocations: #{allocations.all.values.map(&:size).sum}"
+  puts "Total memory: #{allocations.all.values.flatten.map(&:memsize).sum}"
+  puts stats.gc_profiler_report
+end
+
+measure "no-JIT context (#{$runs} runs)" do
+  $prefab.get('prefab.auth.allowed_origins')
+end
+
+puts "\n\n"
+
+measure "with JIT context (#{$runs} runs)" do
+  $prefab.get('prefab.auth.allowed_origins', { a: { b: "c" } })
+end

data/dev/benchmark

@@ -0,0 +1,40 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'bundler/setup'
+
+gemspec = Dir.glob(File.expand_path("../../*.gemspec", __FILE__)).first
+spec = Gem::Specification.load(gemspec)
+
+# Add the require paths to the $LOAD_PATH
+spec.require_paths.each do |path|
+  full_path = File.expand_path("../" + path, __dir__)
+  $LOAD_PATH.unshift(full_path) unless $LOAD_PATH.include?(full_path)
+end
+
+spec.require_paths.each do |path|
+  require "./lib/prefab-cloud-ruby"
+end
+
+require 'prefab-cloud-ruby'
+require 'benchmark/ips'
+
+prefab = Prefab::Client.new(collect_logger_counts: false, collect_evaluation_summaries: false,
+                            context_upload_mode: :none)
+
+prefab.get('prefab.auth.allowed_origins')
+
+prefab.with_context(user: { email_suffix: 'yahoo.com' }) do
+  Benchmark.ips do |x|
+    x.report("noop") do
+    end
+
+    x.report('prefab.get') do
+      prefab.get('prefab.auth.allowed_origins')
+    end
+
+    x.report('prefab.get with jit context') do
+      prefab.get('prefab.auth.allowed_origins', { a: { b: "c" } })
+    end
+  end
+end

data/lib/prefab/client.rb

@@ -29,6 +29,9 @@ module Prefab
       end
 
       context.clear
+
+      Prefab::Context.global_context = @options.global_context
+
       # start config client
       config_client
     end

data/lib/prefab/config_client.rb

@@ -60,7 +60,7 @@ module Prefab
         @base_client.example_contexts_aggregator.record(context)
       end
 
-      evaluation = _get(key, context)
+      evaluation = _get(key, properties)
 
       @base_client.context_shape_aggregator&.push(context)
 
@@ -168,7 +168,7 @@ module Prefab
         ]
       end.to_h
 
-      @config_resolver.default_context = default_contexts || {}
+      Prefab::Context.default_context = default_contexts || {}
 
       configs.configs.each do |config|
         @config_loader.set(config, source)

data/lib/prefab/config_resolver.rb

@@ -5,8 +5,6 @@ module Prefab
     attr_accessor :project_env_id # this will be set by the config_client when it gets an API response
     attr_reader :local_store
 
-    attr_accessor :default_context
-
     def initialize(base_client, config_loader)
       @lock = Concurrent::ReadWriteLock.new
       @local_store = {}
@@ -14,7 +12,6 @@ module Prefab
       @project_env_id = 0 # we don't know this yet, it is set from the API results
       @base_client = base_client
       @on_update = nil
-      @default_context = {}
       make_local
     end
 
@@ -59,11 +56,13 @@ module Prefab
     end
 
     def make_context(properties)
-      if properties == NO_DEFAULT_PROVIDED || properties.nil?
+      if properties.is_a?(Context)
+        properties
+      elsif properties == NO_DEFAULT_PROVIDED || properties.nil?
         Context.current
       else
-        Context.merge_with_current(properties)
-      end.merge_default(default_context || {})
+        Context.join(parent: Context.current, hash: properties, id: :jit)
+      end
     end
 
     private

data/lib/prefab/context.rb

@@ -8,18 +8,8 @@ module Prefab
       attr_reader :name
 
       def initialize(name, hash)
-        @hash = {}
         @name = name.to_s
-
-        merge!(hash)
-      end
-
-      def get(parts)
-        @hash[parts]
-      end
-
-      def merge!(other)
-        @hash = @hash.merge(other.transform_keys(&:to_s))
+        @hash = hash.transform_keys(&:to_s)
       end
 
       def to_h
@@ -27,13 +17,13 @@ module Prefab
       end
 
       def key
-        "#{@name}:#{get('key')}"
+        "#{@name}:#{@hash['key']}"
       end
 
       def to_proto
         PrefabProto::Context.new(
           type: name,
-          values: to_h.transform_values do |value|
+          values: @hash.transform_values do |value|
             ConfigValueWrapper.wrap(value)
           end
         )
@@ -44,17 +34,35 @@ module Prefab
     attr_reader :contexts, :seen_at
 
     class << self
+      def global_context=(context)
+        @global_context = join(hash: context, parent: nil, id: :global_context)
+      end
+
+      def global_context
+        @global_context ||= join(parent: nil, id: :global_context)
+      end
+
+      def default_context=(context)
+        @default_context = join(hash: context, parent: global_context, id: :default_context)
+
+        self.current.update_parent(@default_context)
+      end
+
+      def default_context
+        @default_context ||= join(parent: global_context, id: :default_context)
+      end
+
       def current=(context)
-        Thread.current[THREAD_KEY] = context
+        Thread.current[THREAD_KEY] = join(hash: context || {}, parent: default_context, id: :block)
       end
 
       def current
-        Thread.current[THREAD_KEY] ||= new
+        Thread.current[THREAD_KEY] ||= join(parent: default_context, id: :block)
       end
 
       def with_context(context)
         old_context = Thread.current[THREAD_KEY]
-        Thread.current[THREAD_KEY] = new(context)
+        Thread.current[THREAD_KEY] = join(parent: default_context, hash: context, id: :block)
         yield
       ensure
         Thread.current[THREAD_KEY] = old_context
@@ -62,7 +70,7 @@ module Prefab
 
       def with_merged_context(context)
         old_context = Thread.current[THREAD_KEY]
-        Thread.current[THREAD_KEY] = merge_with_current(context)
+        Thread.current[THREAD_KEY] = join(parent: current, hash: context, id: :merged)
         yield
       ensure
         Thread.current[THREAD_KEY] = old_context
@@ -77,51 +85,92 @@ module Prefab
       end
     end
 
-    def initialize(context = {})
+    def self.join(hash: {}, parent: nil, id: :not_provided)
+      context = new(hash)
+      context.update_parent(parent)
+      context.instance_variable_set(:@id, id)
+      context
+    end
+
+    def initialize(hash = {})
       @contexts = {}
+      @flattened = {}
       @seen_at = Time.now.utc.to_i
+      warned = false
+
+      if hash.is_a?(Hash)
+        hash.map do |name, values|
+          unless values.is_a?(Hash)
+            warn "[DEPRECATION] Prefab contexts should be a hash with a key of the context name and a value of a hash."
+            values = { name => values }
+            name = BLANK_CONTEXT_NAME
+          end
 
-      if context.is_a?(NamedContext)
-        @contexts[context.name] = context
-      elsif context.is_a?(Hash)
-        context.map do |name, values|
-          if values.is_a?(Hash)
-            @contexts[name.to_s] = NamedContext.new(name, values)
-          else
-            warn '[DEPRECATION] Prefab contexts should be a hash with a key of the context name and a value of a hash.'
-
-            @contexts[BLANK_CONTEXT_NAME] ||= NamedContext.new(BLANK_CONTEXT_NAME, {})
-            @contexts[BLANK_CONTEXT_NAME].merge!({ name => values })
+          @contexts[name.to_s] = NamedContext.new(name, values)
+          values.each do |key, value|
+            @flattened[name.to_s + '.' + key.to_s] = value
           end
         end
       else
-        raise ArgumentError, 'must be a Hash or a NamedContext'
+        raise ArgumentError, 'must be a Hash'
       end
     end
 
+    def update_parent(parent)
+      @parent = parent
+    end
+
     def blank?
       contexts.empty?
     end
 
     def set(name, hash)
       @contexts[name.to_s] = NamedContext.new(name, hash)
+      hash.each do |key, value|
+        @flattened[name.to_s + '.' + key.to_s] = value
+      end
     end
 
-    def get(property_key)
-      name, key = property_key.split('.', 2)
-
-      if key.nil?
-        name = BLANK_CONTEXT_NAME
-        key = property_key
+    def get(property_key, scope: nil)
+      if !property_key.include?(".")
+        property_key = BLANK_CONTEXT_NAME + '.' + property_key
       end
 
-      contexts[name]&.get(key)
+      if @flattened.key?(property_key)
+        @flattened[property_key]
+      else
+        scope ||= property_key.split('.').first
+
+        if @contexts[scope]
+          # If the key is in the present scope, parent values should not be used.
+          # We can consider the parent value clobbered by the present scope.
+          nil
+        else
+          @parent&.get(property_key, scope: scope)
+        end
+      end
     end
 
     def to_h
       contexts.transform_values(&:to_h)
     end
 
+    def to_s
+      "#<Prefab::Context:#{object_id} id=#{@id} #{to_h}>"
+    end
+
+    # Visualize a tree of the context up through its parents
+    #
+    # example:
+    #
+    # | jit:                            {"user"=>{"name"=>"Frank"}}
+    # |-- block:                        {"clock"=>{"timezone"=>"PST"}}
+    # |---- default_context:            {"prefab-api-key"=>{"user-id"=>123}}
+    # |------ global_context:           {"cpu"=>{"count"=>4, "speed"=>"2.4GHz"}, "clock"=>{"timezone"=>"UTC"}}
+    def tree(depth = 0)
+      "|" + ("-" * depth) + " #{id}: #{(" " * (30 - id.to_s.length - depth ))}#{to_h}\n" + (@parent&.tree(depth + 2) || '')
+    end
+
     def clear
       @contexts = {}
     end
@@ -175,5 +224,9 @@ module Prefab
         super
       end
     end
+
+    def id
+      @id
+    end
   end
 end

data/lib/prefab/evaluation.rb

@@ -3,7 +3,7 @@
 module Prefab
   # Records the result of evaluating a config's criteria and forensics for reporting
   class Evaluation
-    attr_reader :value
+    attr_reader :value, :context
 
     def initialize(config:, value:, value_index:, config_row_index:, context:, resolver:)
       @config = config
@@ -32,6 +32,7 @@ module Prefab
 
     def report(evaluation_summary_aggregator)
       return if @config.config_type == :LOG_LEVEL
+
       evaluation_summary_aggregator&.record(
         config_key: @config.key,
         config_type: @config.config_type,

data/lib/prefab/options.rb

@@ -15,7 +15,7 @@ module Prefab
     attr_reader :collect_sync_interval
     attr_reader :use_local_cache
     attr_reader :datafile
-    attr_reader :disable_action_controller_logging
+    attr_reader :global_context
     attr_accessor :is_fork
 
     module ON_INITIALIZATION_FAILURE
@@ -59,7 +59,7 @@ module Prefab
       allow_telemetry_in_local_mode: false,
       x_datafile: ENV['PREFAB_DATAFILE'],
       x_use_local_cache: false,
-      disable_action_controller_logging: false
+      global_context: {}
     )
       @api_key = api_key
       @namespace = namespace
@@ -79,8 +79,8 @@ module Prefab
       @collect_max_evaluation_summaries = collect_max_evaluation_summaries
       @allow_telemetry_in_local_mode = allow_telemetry_in_local_mode
       @use_local_cache = x_use_local_cache
-      @disable_action_controller_logging = disable_action_controller_logging
       @is_fork = false
+      @global_context = global_context
 
       # defaults that may be overridden by context_upload_mode
       @collect_shapes = false

data/lib/prefab-cloud-ruby.rb

@@ -45,7 +45,6 @@ require 'prefab/context'
 require 'prefab/logger_client'
 require 'active_support/deprecation'
 require 'active_support'
-require 'action_controller/metal/strong_parameters'
 require 'prefab/client'
 require 'prefab/config_client_presenter'
 require 'prefab/config_client'

data/prefab-cloud-ruby.gemspec

@@ -2,19 +2,18 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: prefab-cloud-ruby 1.6.0 ruby lib
+# stub: prefab-cloud-ruby 1.6.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "prefab-cloud-ruby".freeze
-  s.version = "1.6.0"
+  s.version = "1.6.1"
 
   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 = "2024-03-27"
+  s.date = "2024-03-28"
   s.description = "Feature Flags, Live Config, and Dynamic Log Levels as a service".freeze
   s.email = "jdwyer@prefab.cloud".freeze
-  s.executables = ["console".freeze]
   s.extra_rdoc_files = [
     "CHANGELOG.md",
     "LICENSE.txt",
@@ -34,8 +33,10 @@ Gem::Specification.new do |s|
     "README.md",
     "Rakefile",
     "VERSION",
-    "bin/console",
     "compile_protos.sh",
+    "dev/allocation_stats",
+    "dev/benchmark",
+    "dev/console",
     "lib/prefab-cloud-ruby.rb",
     "lib/prefab/client.rb",
     "lib/prefab/config_client.rb",
@@ -129,7 +130,6 @@ Gem::Specification.new do |s|
     s.add_runtime_dependency(%q<ld-eventsource>.freeze, [">= 0"])
     s.add_runtime_dependency(%q<uuid>.freeze, [">= 0"])
     s.add_runtime_dependency(%q<activesupport>.freeze, [">= 4"])
-    s.add_runtime_dependency(%q<actionpack>.freeze, [">= 4"])
     s.add_runtime_dependency(%q<semantic_logger>.freeze, [">= 0"])
     s.add_development_dependency(%q<benchmark-ips>.freeze, [">= 0"])
     s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
@@ -144,7 +144,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<ld-eventsource>.freeze, [">= 0"])
     s.add_dependency(%q<uuid>.freeze, [">= 0"])
     s.add_dependency(%q<activesupport>.freeze, [">= 4"])
-    s.add_dependency(%q<actionpack>.freeze, [">= 4"])
     s.add_dependency(%q<semantic_logger>.freeze, [">= 0"])
     s.add_dependency(%q<benchmark-ips>.freeze, [">= 0"])
     s.add_dependency(%q<bundler>.freeze, [">= 0"])

data/test/support/common_helpers.rb

@@ -180,7 +180,7 @@ module CommonHelpers
       return
     end
 
-    assert_equal expected, $stderr.string.split("\n")
+    assert_equal expected.uniq, $stderr.string.split("\n").uniq
 
     # restore since we've handled it
     $stderr = $oldstderr

data/test/test_config_resolver.rb

@@ -408,6 +408,47 @@ class TestConfigResolver < Minitest::Test
     end
   end
 
+  def test_context_lookup
+    global_context = { cpu: { count: 4, speed: '2.4GHz' }, clock: { timezone: 'UTC' } }
+    default_context = { 'prefab-api-key' => { 'user-id' => 123 } }
+    local_context = { clock: { timezone: 'PST' }, user: { name: 'Ted', email: 'ted@example.com' } }
+    jit_context = { user: { name: 'Frank' } }
+
+    config = PrefabProto::Config.new( key: 'example', rows: [ PrefabProto::ConfigRow.new( values: [ PrefabProto::ConditionalValue.new( value: PrefabProto::ConfigValue.new(string: 'valueB2')) ]) ])
+
+    client = new_client(global_context: global_context, config: [config])
+
+    # we fake getting the default context from the API
+    Prefab::Context.default_context = default_context
+
+    resolver = client.resolver
+
+    client.with_context(local_context) do
+      context = resolver.get("example", jit_context).context
+
+      # This digs all the way to the global context
+      assert_equal 4, context.get('cpu.count')
+      assert_equal '2.4GHz', context.get('cpu.speed')
+
+      # This digs to the default context
+      assert_equal 123, context.get('prefab-api-key.user-id')
+
+      # This digs to the local context
+      assert_equal 'PST', context.get('clock.timezone')
+
+      # This uses the jit context
+      assert_equal 'Frank', context.get('user.name')
+
+      # This is nil in the jit context because `user` was clobbered
+      assert_nil context.get('user.email')
+
+      context = resolver.get("example").context
+
+      # But without the JIT clobbering, it is still set
+      assert_equal 'ted@example.com', context.get('user.email')
+    end
+  end
+
   private
 
   def resolver_for_namespace(namespace, loader, project_env_id: TEST_ENV_ID)

data/test/test_context.rb

@@ -15,33 +15,17 @@ class TestContext < Minitest::Test
     assert_empty context.contexts
   end
 
-  def test_initialize_with_named_context
-    named_context = Prefab::Context::NamedContext.new('test', foo: 'bar')
-    context = Prefab::Context.new(named_context)
-    assert_equal 1, context.contexts.size
-    assert_equal named_context, context.contexts['test']
-  end
-
   def test_initialize_with_hash
     context = Prefab::Context.new(test: { foo: 'bar' })
     assert_equal 1, context.contexts.size
-    assert_equal 'bar', context.contexts['test'].get('foo')
+    assert_equal 'bar', context.get("test.foo")
   end
 
   def test_initialize_with_multiple_hashes
     context = Prefab::Context.new(test: { foo: 'bar' }, other: { foo: 'baz' })
     assert_equal 2, context.contexts.size
-    assert_equal 'bar', context.contexts['test'].get('foo')
-    assert_equal 'baz', context.contexts['other'].get('foo')
-  end
-
-  def test_initialize_with_invalid_hash
-    _, err = capture_io do
-      Prefab::Context.new({ foo: 'bar', baz: 'qux' })
-    end
-
-    assert_match '[DEPRECATION] Prefab contexts should be a hash with a key of the context name and a value of a hash',
-                 err
+    assert_equal 'bar', context.get("test.foo")
+    assert_equal 'baz', context.get("other.foo")
   end
 
   def test_initialize_with_invalid_argument
@@ -56,33 +40,11 @@ class TestContext < Minitest::Test
 
   def test_current_set
     context = Prefab::Context.new(EXAMPLE_PROPERTIES)
-    Prefab::Context.current = context
+    Prefab::Context.current = context.to_h
     assert_instance_of Prefab::Context, context
     assert_equal stringify(EXAMPLE_PROPERTIES), context.to_h
   end
 
-  def test_merge_with_current
-    context = Prefab::Context.new(EXAMPLE_PROPERTIES)
-    Prefab::Context.current = context
-    assert_equal stringify(EXAMPLE_PROPERTIES), context.to_h
-
-    new_context = Prefab::Context.merge_with_current({ user: { key: 'brand-new', other: 'different' },
-                                                       address: { city: 'New York' } })
-    assert_equal stringify({
-                             # Note that the user's `name` from the original
-                             # context is not included. This is because we don't _merge_ the new
-                             # properties if they collide with an existing context name. We _replace_
-                             # them.
-                             user: { key: 'brand-new', other: 'different' },
-                             team: EXAMPLE_PROPERTIES[:team],
-                             address: { city: 'New York' }
-                           }),
-                 new_context.to_h
-
-    # the original/current context is unchanged
-    assert_equal stringify(EXAMPLE_PROPERTIES), Prefab::Context.current.to_h
-  end
-
   def test_with_context
     Prefab::Context.with_context(EXAMPLE_PROPERTIES) do
       context = Prefab::Context.current
@@ -105,9 +67,14 @@ class TestContext < Minitest::Test
 
   def test_with_context_merge_nesting
     Prefab::Context.with_context(EXAMPLE_PROPERTIES) do
-      Prefab::Context.with_merged_context({ user: { key: 'abc', other: 'different' } }) do
+      Prefab::Context.with_merged_context({ user: { key: 'hij', other: 'different' } }) do
         context = Prefab::Context.current
-        assert_equal({ 'user' => { 'key' => 'abc', 'other' => 'different' }, "team"=>{"key"=>"abc", "plan"=>"pro"} }, context.to_h)
+        assert_nil context.get('user.name')
+        assert_equal context.get('user.key'), 'hij'
+        assert_equal context.get('user.other'), 'different'
+
+        assert_equal context.get('team.key'), 'abc'
+        assert_equal context.get('team.plan'), 'pro'
       end
 
       context = Prefab::Context.current
@@ -187,6 +154,35 @@ class TestContext < Minitest::Test
     ), contexts.to_proto(namespace)
   end
 
+  def test_parent_lookup
+    global_context = { cpu: { count: 4, speed: '2.4GHz' }, clock: { timezone: 'UTC' } }
+    default_context = { 'prefab-api-key' => { 'user-id' => 123 } }
+    local_context = { clock: { timezone: 'PST' }, user: { name: 'Ted', email: 'ted@example.com' } }
+    jit_context = { user: { name: 'Frank' } }
+
+    Prefab::Context.global_context = global_context
+    Prefab::Context.default_context = default_context
+    Prefab::Context.current = local_context
+
+    context = Prefab::Context.join(parent: Prefab::Context.current, hash: jit_context, id: :jit)
+
+    # This digs all the way to the global context
+    assert_equal 4, context.get('cpu.count')
+    assert_equal '2.4GHz', context.get('cpu.speed')
+
+    # This digs to the default context
+    assert_equal 123, context.get('prefab-api-key.user-id')
+
+    # This digs to the local context
+    assert_equal 'PST', context.get('clock.timezone')
+
+    # This uses the jit context
+    assert_equal 'Frank', context.get('user.name')
+
+    # This is nil in the jit context because `user` was clobbered
+    assert_nil context.get('user.email')
+  end
+
   private
 
   def stringify(hash)

data/test/test_example_contexts_aggregator.rb

@@ -10,10 +10,7 @@ class TestExampleContextsAggregator < Minitest::Test
     aggregator = Prefab::ExampleContextsAggregator.new(client: MockBaseClient.new, max_contexts: 2,
                                                        sync_interval: EFFECTIVELY_NEVER)
 
-    context = Prefab::Context.new(
-      user: { key: 'abc' },
-      device: { key: 'def', mobile: true }
-    )
+    context = Prefab::Context.new(user: { key: 'abc' }, device: { key: 'def', mobile: true })
 
     aggregator.record(context)
     assert_equal [context], aggregator.data

data/test/test_helper.rb

@@ -11,7 +11,7 @@ Dir.glob(File.join(File.dirname(__FILE__), 'support', '**', '*.rb')).each do |fi
   require file
 end
 
-MiniTest::Test.class_eval do
+Minitest::Test.class_eval do
   include CommonHelpers
   extend CommonHelpers
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prefab-cloud-ruby
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-27 00:00:00.000000000 Z
+date: 2024-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -114,20 +114,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4'
-- !ruby/object:Gem::Dependency
-  name: actionpack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4'
 - !ruby/object:Gem::Dependency
   name: semantic_logger
   requirement: !ruby/object:Gem::Requirement
@@ -214,8 +200,7 @@ dependencies:
         version: '0'
 description: Feature Flags, Live Config, and Dynamic Log Levels as a service
 email: jdwyer@prefab.cloud
-executables:
-- console
+executables: []
 extensions: []
 extra_rdoc_files:
 - CHANGELOG.md
@@ -235,8 +220,10 @@ files:
 - README.md
 - Rakefile
 - VERSION
-- bin/console
 - compile_protos.sh
+- dev/allocation_stats
+- dev/benchmark
+- dev/console
 - lib/prefab-cloud-ruby.rb
 - lib/prefab/client.rb
 - lib/prefab/config_client.rb