flipper 1.2.2 → 1.3.0

data/spec/flipper/engine_spec.rb

@@ -4,8 +4,10 @@ require 'flipper/engine'
 RSpec.describe Flipper::Engine do
   let(:application) do
     Class.new(Rails::Application) do
+      config.load_defaults Rails::VERSION::STRING.to_f
       config.eager_load = false
       config.logger = ActiveSupport::Logger.new($stdout)
+      config.active_support.remove_deprecated_time_with_zone_name = false
     end.instance
   end
 
@@ -51,7 +53,7 @@ RSpec.describe Flipper::Engine do
       ENV['FLIPPER_STRICT'] = 'false'
       subject
       expect(config.strict).to eq(false)
-      expect(adapter).to be_instance_of(Flipper::Adapters::Memory)
+      expect(adapter).not_to be_instance_of(Flipper::Adapters::Strict)
     end
 
     [true, :raise, :warn].each do |value|
@@ -67,7 +69,7 @@ RSpec.describe Flipper::Engine do
       initializer { config.strict = false }
       subject
       expect(config.strict).to eq(false)
-      expect(adapter).to be_instance_of(Flipper::Adapters::Memory)
+      expect(adapter).not_to be_instance_of(Flipper::Adapters::Strict)
     end
 
     it "defaults to strict=:warn in RAILS_ENV=development" do
@@ -83,7 +85,7 @@ RSpec.describe Flipper::Engine do
         expect(Rails.env).to eq(env)
         subject
         expect(config.strict).to eq(false)
-        expect(adapter).to be_instance_of(Flipper::Adapters::Memory)
+        expect(adapter).not_to be_instance_of(Flipper::Adapters::Strict)
       end
     end
 
@@ -234,7 +236,8 @@ RSpec.describe Flipper::Engine do
       application.initialize!
 
       expect(Flipper.instance).to be_a(Flipper::Cloud::DSL)
-      expect(Flipper.instance.instrumenter).to be(ActiveSupport::Notifications)
+      expect(Flipper.instance.instrumenter).to be_a(Flipper::Cloud::Telemetry::Instrumenter)
+      expect(Flipper.instance.instrumenter.instrumenter).to be(ActiveSupport::Notifications)
     end
 
     context "with CLOUD_SYNC_SECRET" do
@@ -334,6 +337,33 @@ RSpec.describe Flipper::Engine do
     expect(ActiveRecord::Base.ancestors).to include(Flipper::Model::ActiveRecord)
   end
 
+  describe "config.actor_limit" do
+    let(:adapter) do
+      application.initialize!
+      Flipper.adapter.adapter.adapter
+    end
+
+    it "defaults to 100" do
+      expect(adapter).to be_instance_of(Flipper::Adapters::ActorLimit)
+      expect(adapter.limit).to eq(100)
+    end
+
+    it "can be set from FLIPPER_ACTOR_LIMIT env" do
+      ENV["FLIPPER_ACTOR_LIMIT"] = "500"
+      expect(adapter.limit).to eq(500)
+    end
+
+    it "can be set from an initializer" do
+      initializer { config.actor_limit = 99 }
+      expect(adapter.limit).to eq(99)
+    end
+
+    it "can be disabled from an initializer" do
+      initializer { config.actor_limit = false }
+      expect(adapter).not_to be_instance_of(Flipper::Adapters::ActorLimit)
+    end
+  end
+
   # Add app initializer in the same order as config/initializers/*
   def initializer(&block)
     application.initializer 'spec', before: :load_config_initializers do

data/spec/flipper/middleware/memoizer_spec.rb

@@ -458,7 +458,7 @@ RSpec.describe Flipper::Middleware::Memoizer do
       logged_memory = Flipper::Adapters::OperationLogger.new(memory)
       cache = ActiveSupport::Cache::MemoryStore.new
       cache.clear
-      cached = Flipper::Adapters::ActiveSupportCacheStore.new(logged_memory, cache, expires_in: 10)
+      cached = Flipper::Adapters::ActiveSupportCacheStore.new(logged_memory, cache)
       logged_cached = Flipper::Adapters::OperationLogger.new(cached)
       memo = {}
       flipper = Flipper.new(logged_cached)
@@ -471,15 +471,18 @@ RSpec.describe Flipper::Middleware::Memoizer do
 
       get '/', {}, 'flipper' => flipper
       expect(logged_cached.count(:get_all)).to be(1)
-      expect(logged_memory.count(:get_all)).to be(1)
+      expect(logged_memory.count(:features)).to be(1)
+      expect(logged_memory.count(:get_multi)).to be(1)
 
       get '/', {}, 'flipper' => flipper
       expect(logged_cached.count(:get_all)).to be(2)
-      expect(logged_memory.count(:get_all)).to be(1)
+      expect(logged_memory.count(:features)).to be(1)
+      expect(logged_memory.count(:get_multi)).to be(1)
 
       get '/', {}, 'flipper' => flipper
       expect(logged_cached.count(:get_all)).to be(3)
-      expect(logged_memory.count(:get_all)).to be(1)
+      expect(logged_memory.count(:features)).to be(1)
+      expect(logged_memory.count(:get_multi)).to be(1)
     end
   end
 end

data/spec/support/fail_on_output.rb

@@ -0,0 +1,8 @@
+if ENV["CI"] || ENV["FAIL_ON_OUTPUT"]
+  RSpec.configure do |config|
+    config.around do |example|
+      output = silence { example.run }
+      fail "Use `silence { }` to avoid printing to STDOUT/STDERR\n#{output}" unless output.empty?
+    end
+  end
+end

data/spec/support/spec_helpers.rb

@@ -1,6 +1,7 @@
 require 'ice_age'
 require 'json'
 require 'rack/test'
+require 'rack/session'
 
 module SpecHelpers
   extend self
@@ -12,7 +13,7 @@ module SpecHelpers
 
   def build_app(flipper, options = {})
     Flipper::UI.app(flipper, options) do |builder|
-      builder.use Rack::Session::Cookie, secret: 'test'
+      builder.use Rack::Session::Cookie, secret: 'test' * 16 # Rack 3+ wants a 64-character secret
     end
   end
 

data/test/adapters/actor_limit_test.rb

@@ -0,0 +1,20 @@
+require "test_helper"
+require "flipper/test/shared_adapter_test"
+require "flipper/adapters/actor_limit"
+
+class Flipper::Adapters::ActorLimitTest < MiniTest::Test
+  prepend Flipper::Test::SharedAdapterTests
+
+  def setup
+    @memory = Flipper::Adapters::Memory.new
+    @adapter = Flipper::Adapters::ActorLimit.new(@memory, 5)
+  end
+
+  def test_enable_fails_when_limit_exceeded
+    5.times { |i| @feature.enable Flipper::Actor.new("User;#{i}") }
+
+    assert_raises Flipper::Adapters::ActorLimit::LimitExceeded do
+      @feature.enable Flipper::Actor.new("User;6")
+    end
+  end
+end

data/test_rails/system/test_help_test.rb

@@ -29,7 +29,7 @@ end
 
 class TestHelpTest < ActionDispatch::SystemTestCase
   # Any driver that runs the app in a separate thread will test what we want here.
-  driven_by :cuprite, options: { process_timeout: 30 }
+  driven_by :cuprite, options: { process_timeout: 60 }
 
   setup do
     # Reconfigure Flipper since other tests change the adapter.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flipper
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - John Nunemaker
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-19 00:00:00.000000000 Z
+date: 2024-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -90,6 +90,8 @@ files:
 - lib/flipper/actor.rb
 - lib/flipper/adapter.rb
 - lib/flipper/adapter_builder.rb
+- lib/flipper/adapters/actor_limit.rb
+- lib/flipper/adapters/cache_base.rb
 - lib/flipper/adapters/dual_write.rb
 - lib/flipper/adapters/failover.rb
 - lib/flipper/adapters/failsafe.rb
@@ -109,6 +111,7 @@ files:
 - lib/flipper/adapters/sync/feature_synchronizer.rb
 - lib/flipper/adapters/sync/interval_synchronizer.rb
 - lib/flipper/adapters/sync/synchronizer.rb
+- lib/flipper/adapters/wrapper.rb
 - lib/flipper/cli.rb
 - lib/flipper/cloud.rb
 - lib/flipper/cloud/configuration.rb
@@ -193,12 +196,15 @@ files:
 - lib/generators/flipper/templates/update/migrations/01_create_flipper_tables.rb.erb
 - lib/generators/flipper/templates/update/migrations/02_change_flipper_gates_value_to_text.rb.erb
 - lib/generators/flipper/update_generator.rb
+- package-lock.json
+- package.json
 - spec/fixtures/environment.rb
 - spec/fixtures/feature.json
 - spec/fixtures/flipper_pstore_1679087600.json
 - spec/flipper/actor_spec.rb
 - spec/flipper/adapter_builder_spec.rb
 - spec/flipper/adapter_spec.rb
+- spec/flipper/adapters/actor_limit_spec.rb
 - spec/flipper/adapters/dual_write_spec.rb
 - spec/flipper/adapters/failover_spec.rb
 - spec/flipper/adapters/failsafe_spec.rb
@@ -287,10 +293,12 @@ files:
 - spec/spec_helper.rb
 - spec/support/actor_names.yml
 - spec/support/descriptions.yml
+- spec/support/fail_on_output.rb
 - spec/support/fake_backoff_policy.rb
 - spec/support/fake_udp_socket.rb
 - spec/support/skippable.rb
 - spec/support/spec_helpers.rb
+- test/adapters/actor_limit_test.rb
 - test/adapters/memory_test.rb
 - test/adapters/pstore_test.rb
 - test/test_helper.rb
@@ -306,7 +314,7 @@ metadata:
   homepage_uri: https://www.flippercloud.io
   source_code_uri: https://github.com/flippercloud/flipper
   bug_tracker_uri: https://github.com/flippercloud/flipper/issues
-  changelog_uri: https://github.com/flippercloud/flipper/releases/tag/v1.2.2
+  changelog_uri: https://github.com/flippercloud/flipper/releases/tag/v1.3.0
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -333,6 +341,7 @@ test_files:
 - spec/flipper/actor_spec.rb
 - spec/flipper/adapter_builder_spec.rb
 - spec/flipper/adapter_spec.rb
+- spec/flipper/adapters/actor_limit_spec.rb
 - spec/flipper/adapters/dual_write_spec.rb
 - spec/flipper/adapters/failover_spec.rb
 - spec/flipper/adapters/failsafe_spec.rb
@@ -421,10 +430,12 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/actor_names.yml
 - spec/support/descriptions.yml
+- spec/support/fail_on_output.rb
 - spec/support/fake_backoff_policy.rb
 - spec/support/fake_udp_socket.rb
 - spec/support/skippable.rb
 - spec/support/spec_helpers.rb
+- test/adapters/actor_limit_test.rb
 - test/adapters/memory_test.rb
 - test/adapters/pstore_test.rb
 - test/test_helper.rb