Merge branch 'main' into poll-cold-start-fix

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ jobs:
     services:
       redis:
         image: redis
-        ports: ['6379:6379']
+        ports: ["6379:6379"]
         options: >-
           --health-cmd "redis-cli ping"
           --health-interval 10s
@@ -26,30 +26,51 @@ jobs:
           --health-timeout 5s
           --health-retries 5
     strategy:
+      fail-fast: false
       matrix:
-        ruby: ['2.6', '2.7', '3.0', '3.1', '3.2']
-        rails: ['5.2', '6.0.0', '6.1.0', '7.0.0', '7.1.0']
+        ruby: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3"]
+        rails: ["5.2", "6.0.0", "6.1.0", "7.0.0", "7.1.0", "7.2.0", "8.0.0"]
         exclude:
           - ruby: "2.6"
             rails: "7.1.0"
           - ruby: "2.6"
             rails: "7.0.0"
+          - ruby: "2.6"
+            rails: "7.2.0"
+          - ruby: "2.6"
+            rails: "8.0.0"
           - ruby: "2.7"
             rails: "7.1.0"
+          - ruby: "2.7"
+            rails: "7.2.0"
+          - ruby: "2.7"
+            rails: "8.0.0"
           - ruby: "3.0"
             rails: "5.2"
+          - ruby: "3.0"
+            rails: "7.2.0"
+          - ruby: "3.0"
+            rails: "8.0.0"
           - ruby: "3.1"
             rails: "5.2"
           - ruby: "3.1"
             rails: "6.0.0"
+          - ruby: "3.1"
+            rails: "8.0.0"
           - ruby: "3.2"
             rails: "5.2"
           - ruby: "3.2"
             rails: "6.0.0"
           - ruby: "3.2"
             rails: "6.1.0"
+          - ruby: "3.3"
+            rails: "5.2"
+          - ruby: "3.3"
+            rails: "6.0.0"
+          - ruby: "3.3"
+            rails: "6.1.0"
     env:
-      SQLITE3_VERSION: 1.4.1
+      SQLITE3_VERSION: ${{ matrix.rails == '8.0.0' && '2.1.0' || '1.4.1' }}
       REDIS_URL: redis://localhost:6379/0
       CI: true
       RAILS_VERSION: ${{ matrix.rails }}
@@ -63,13 +84,13 @@ jobs:
       - name: Setup memcached
         uses: KeisukeYamashita/memcached-actions@v1
       - name: Start MongoDB
-        uses: supercharge/mongodb-github-action@v1.10.0
+        uses: supercharge/mongodb-github-action@1.12.0
         with:
           mongodb-version: 4.0
       - name: Check out repository code
         uses: actions/checkout@v4
       - name: Do some action caching
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: vendor/bundle
           key: ${{ runner.os }}-gems-${{ matrix.ruby }}-${{ matrix.rails }}-${{ hashFiles('**/Gemfile.lock') }}

.github/workflows/examples.yml

@@ -8,51 +8,71 @@ jobs:
     services:
       redis:
         image: redis
-        ports: ['6379:6379']
+        ports: ["6379:6379"]
         options: >-
           --health-cmd "redis-cli ping"
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5
     strategy:
       matrix:
-        ruby: ['2.6', '2.7', '3.0', '3.1', '3.2']
-        rails: ['5.2', '6.0.0', '6.1.0', '7.0.0', '7.1.0']
+        ruby: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3"]
+        rails: ["5.2", "6.0.0", "6.1.0", "7.0.0", "7.1.0", "7.2.0", "8.0.0"]
         exclude:
           - ruby: "2.6"
             rails: "7.1.0"
           - ruby: "2.6"
             rails: "7.0.0"
+          - ruby: "2.6"
+            rails: "7.2.0"
+          - ruby: "2.6"
+            rails: "8.0.0"
           - ruby: "2.7"
             rails: "7.1.0"
+          - ruby: "2.7"
+            rails: "7.2.0"
+          - ruby: "2.7"
+            rails: "8.0.0"
           - ruby: "3.0"
             rails: "5.2"
+          - ruby: "3.0"
+            rails: "7.2.0"
+          - ruby: "3.0"
+            rails: "8.0.0"
           - ruby: "3.1"
             rails: "5.2"
           - ruby: "3.1"
             rails: "6.0.0"
+          - ruby: "3.1"
+            rails: "8.0.0"
           - ruby: "3.2"
             rails: "5.2"
           - ruby: "3.2"
             rails: "6.0.0"
           - ruby: "3.2"
             rails: "6.1.0"
+          - ruby: "3.3"
+            rails: "5.2"
+          - ruby: "3.3"
+            rails: "6.0.0"
+          - ruby: "3.3"
+            rails: "6.1.0"
     env:
-      SQLITE3_VERSION: 1.4.1
+      SQLITE3_VERSION: ${{ matrix.rails == '8.0.0' && '2.1.0' || '1.4.1' }}
       REDIS_URL: redis://localhost:6379/0
       CI: true
       RAILS_VERSION: ${{ matrix.rails }}
     steps:
       - name: Setup memcached
         uses: KeisukeYamashita/memcached-actions@v1
       - name: Start MongoDB
-        uses: supercharge/mongodb-github-action@v1.10.0
+        uses: supercharge/mongodb-github-action@1.12.0
         with:
           mongodb-version: 4.0
       - name: Check out repository code
         uses: actions/checkout@v4
       - name: Do some action caching
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: vendor/bundle
           key: ${{ runner.os }}-gems-${{ matrix.ruby }}-${{ matrix.rails }}-${{ hashFiles('**/Gemfile.lock') }}

.gitignore

@@ -22,3 +22,5 @@ log
 bin
 .DS_Store
 .tool-versions
+tags
+node_modules

Gemfile

@@ -6,16 +6,18 @@ Dir['flipper-*.gemspec'].each do |gemspec|
   gemspec(name: "flipper-#{plugin}", development_group: plugin)
 end
 
+gem 'concurrent-ruby', '1.3.4'
 gem 'debug'
 gem 'rake'
 gem 'statsd-ruby', '~> 1.2.1'
 gem 'rspec', '~> 3.0'
 gem 'rack-test'
-gem 'rackup'
-gem 'sqlite3', "~> #{ENV['SQLITE3_VERSION'] || '1.4.1'}"
-gem 'rails', "~> #{ENV['RAILS_VERSION'] || '7.0.4'}"
+gem 'rackup', '= 1.0.0'
+gem 'sqlite3', "~> #{ENV['SQLITE3_VERSION'] || '2.1.0'}"
+gem 'rails', "~> #{ENV['RAILS_VERSION'] || '8.0'}"
 gem 'minitest', '~> 5.18'
 gem 'minitest-documentation'
+gem 'pstore'
 gem 'webmock'
 gem 'ice_age'
 gem 'redis-namespace'
@@ -24,9 +26,10 @@ gem 'stackprof'
 gem 'benchmark-ips'
 gem 'stackprof-webnav'
 gem 'flamegraph'
-gem 'climate_control'
 gem 'mysql2'
 gem 'pg'
+gem 'cuprite'
+gem 'puma'
 
 group(:guard) do
   gem 'guard'

Guardfile

@@ -21,6 +21,14 @@ guard 'rspec', rspec_options do
   watch('lib/flipper/api/middleware.rb') { 'spec/flipper/api_spec.rb' }
   watch(/shared_adapter_specs\.rb$/) { 'spec' }
   watch('spec/helper.rb') { 'spec' }
+  watch('lib/flipper/adapters/http/client.rb') { 'spec/flipper/adapters/http_spec.rb' }
+  watch('lib/flipper/adapters/cache_base.rb') {
+    [
+      'spec/flipper/adapters/redis_cache_spec.rb',
+      'spec/flipper/adapters/dalli_cache_spec.rb',
+      'spec/flipper/adapters/active_support_cache_store_spec.rb',
+    ]
+  }
 
   # To run all specs on every change... (useful with focus and fit)
   # watch(%r{.*}) { 'spec' }

README.md

@@ -1,6 +1,6 @@
 [![Flipper Mark](docs/images/banner.jpg)](https://www.flippercloud.io)
 
-[Website](https://flippercloud.io?utm_source=oss&utm_medium=readme&utm_campaign=website_link) | [Documentation](https://flippercloud.io/docs?utm_source=oss&utm_medium=readme&utm_campaign=docs_link) | [Examples](examples) | [Twitter](https://twitter.com/flipper_cloud) | [Ruby.social](https://ruby.social/@flipper)
+[Website](https://flippercloud.io?utm_source=oss&utm_medium=readme&utm_campaign=website_link) | [Documentation](https://flippercloud.io/docs?utm_source=oss&utm_medium=readme&utm_campaign=docs_link) | [Examples](examples) | [Chat](https://chat.flippercloud.io/join/xjHq-aJsA-BeZH) | [Twitter](https://twitter.com/flipper_cloud) | [Ruby.social](https://ruby.social/@flipper)
 
 # Flipper
 
@@ -111,3 +111,5 @@ We also have a [free plan](https://www.flippercloud.io?utm_source=oss&utm_medium
 | ![@alexwheeler](https://avatars3.githubusercontent.com/u/3260042?s=64) | [@alexwheeler](https://github.com/alexwheeler) | api         |
 | ![@thetimbanks](https://avatars1.githubusercontent.com/u/471801?s=64)  | [@thetimbanks](https://github.com/thetimbanks) | ui          |
 | ![@lazebny](https://avatars1.githubusercontent.com/u/6276766?s=64)     | [@lazebny](https://github.com/lazebny)         | docker      |
+| ![@pagertree](https://avatars.githubusercontent.com/u/24941240?s=64)   | [@pagertree](https://github.com/pagertree)   | sponsor     |
+| ![@kdaigle](https://avatars.githubusercontent.com/u/2501?s=64)   | [@kdaigle](https://github.com/kdaigle)   | sponsor     |

Rakefile

@@ -27,7 +27,8 @@ end
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |t|
-  t.rspec_opts = %w(--color --format documentation)
+  t.rspec_opts = %w(--color)
+  t.verbose = false
 end
 
 namespace :spec do
@@ -41,7 +42,6 @@ end
 Rake::TestTask.new do |t|
   t.libs = %w(lib test)
   t.pattern = 'test/**/*_test.rb'
-  t.options = '--documentation'
   t.warning = false
 end
 

benchmark/active_record_adapter_ips.rb

@@ -6,10 +6,13 @@
 
 flipper = Flipper.new(Flipper::Adapters::ActiveRecord.new)
 
-2000.times do |i|
-  flipper.enable_actor :foo, Flipper::Actor.new("User;#{i}")
+10.times do |n|
+  2000.times do |i|
+    flipper.enable_actor 'feature' + n.to_s, Flipper::Actor.new("User;#{i}")
+  end
 end
 
 Benchmark.ips do |x|
   x.report("get_all") { flipper.preload_all }
+  x.report("features") { flipper.features }
 end

examples/cloud/backoff_policy.rb

@@ -5,7 +5,7 @@
 intervals = []
 policy = Flipper::Cloud::Telemetry::BackoffPolicy.new
 
-10.times do |n|
+5.times do |n|
   intervals << policy.next_interval
 end
 

examples/ui/basic.ru

@@ -42,10 +42,12 @@ Flipper::UI.configure do |config|
 
   config.actor_names_source = lambda do |_keys|
     {
-      '1' => 'John',
-      '6' => 'Brandon',
+      '1' => '<a href="https://johnnunemaker.com">John</a>',
+      '6' => '<a href="https://opensoul.org">Brandon</a>',
     }
   end
+
+  config.application_href = "https://example.com"
 end
 
 # You can uncomment these to get some default data:
@@ -63,5 +65,6 @@ end
 use Rack::Reloader
 
 run Flipper::UI.app { |builder|
+  builder.use Rack::Reloader, 1
   builder.use Rack::Session::Cookie, secret: "_super_secret"
 }

exe/flipper

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require "flipper/cli"
+
+Flipper::CLI.run(ARGV)

flipper-active_record.gemspec

@@ -32,5 +32,5 @@ Gem::Specification.new do |gem|
   gem.metadata      = Flipper::METADATA
 
   gem.add_dependency 'flipper', "~> #{Flipper::VERSION}"
-  gem.add_dependency 'activerecord', '>= 4.2', '< 8'
+  gem.add_dependency 'activerecord', '>= 4.2', '< 9'
 end

flipper-active_support_cache_store.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |gem|
   gem.metadata      = Flipper::METADATA
 
   gem.add_dependency 'flipper', "~> #{Flipper::VERSION}"
-  gem.add_dependency 'activesupport', '>= 4.2', '< 8'
+  gem.add_dependency 'activesupport', '>= 4.2', '< 9'
 end

flipper-moneta.gemspec

@@ -19,5 +19,5 @@ Gem::Specification.new do |gem|
   gem.version       = Flipper::VERSION
 
   gem.add_dependency 'flipper', "~> #{Flipper::VERSION}"
-  gem.add_dependency 'moneta', '>= 0.7.0', '< 1.2'
+  gem.add_dependency 'moneta', '>= 0.7.0', '< 2'
 end

flipper-ui.gemspec

@@ -21,8 +21,9 @@ Gem::Specification.new do |gem|
   gem.metadata      = Flipper::METADATA
 
   gem.add_dependency 'rack', '>= 1.4', '< 4'
-  gem.add_dependency 'rack-protection', '>= 1.5.3', '<= 4.0.0'
+  gem.add_dependency 'rack-protection', '>= 1.5.3', '<5.0.0'
+  gem.add_dependency 'rack-session', '>= 1.0.2', '< 3.0.0'
   gem.add_dependency 'flipper', "~> #{Flipper::VERSION}"
   gem.add_dependency 'erubi', '>= 1.0.0', '< 2.0.0'
-  gem.add_dependency 'sanitize', '< 7'
+  gem.add_dependency 'sanitize', '< 8'
 end

flipper.gemspec

@@ -6,7 +6,7 @@ plugin_files = []
 plugin_test_files = []
 
 Dir['flipper-*.gemspec'].map do |gemspec|
-  spec = eval(File.read(gemspec))
+  spec = Gem::Specification.load(gemspec)
   plugin_files << spec.files
   plugin_test_files << spec.files
 end
@@ -27,6 +27,8 @@ Gem::Specification.new do |gem|
   gem.homepage      = 'https://www.flippercloud.io/docs'
   gem.license       = 'MIT'
 
+  gem.bindir = "exe"
+  gem.executables   = `git ls-files -- exe/*`.split("\n").map { |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n") - ignored_files + ['lib/flipper/version.rb']
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n") - ignored_test_files
   gem.name          = 'flipper'

lib/flipper.rb

@@ -174,10 +174,12 @@ def groups_registry=(registry)
 
 require 'flipper/actor'
 require 'flipper/adapter'
+require 'flipper/adapters/wrapper'
+require 'flipper/adapters/actor_limit'
+require 'flipper/adapters/instrumented'
 require 'flipper/adapters/memoizable'
 require 'flipper/adapters/memory'
 require 'flipper/adapters/strict'
-require 'flipper/adapters/instrumented'
 require 'flipper/adapter_builder'
 require 'flipper/configuration'
 require 'flipper/dsl'

lib/flipper/adapter_builder.rb

@@ -3,7 +3,7 @@ module Flipper
   #
   #   adapter = Flipper::AdapterBuilder.new do
   #     use Flipper::Adapters::Strict
-  #     use Flipper::Adapters::Memoizer
+  #     use Flipper::Adapters::Memoizable
   #     store Flipper::Adapters::Memory
   #   end.to_adapter
   #