flipper-active_record 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '058253d0f5339510f6fed06b6386b95df879657bf8e7d09132e527cb249dfcd8'
-  data.tar.gz: 073655acecd4aeed5261f6eeaac66299f2f7212887afd4b96b0f535da5e01015
+  metadata.gz: cd8f5a24abcc3c82a2335e17b796fa84721522eb92bf138ebab4146b58da7fdc
+  data.tar.gz: c39a1899083f55078e7ca28e23d8b1363609ca1322be6d4f32cfcd23922440e2
 SHA512:
-  metadata.gz: ff1113b757308e8270eaeb3e77b76b626808bddd686e1e12c5f7dbb4640cb970e09f183028ea77c38fd6ab15ca029206884822a3587963ffc9bf4bebbf930184
-  data.tar.gz: 01f87ae47c2e6dd0bb00895bb302b3c55ed45cd906c62e5bf70ef3a6e322f91ec1f0beee07711f905722d3347ffb5a393dbba7b797f75e90393e558c37940be2
+  metadata.gz: 16b65bea23bf718930e3509b47ba4719ba4baf93dd86bccf69b292130a7732eff1ab7ea9843c9d4a7342e8180cafd08513bcdd14997be5189e6923afe575e499
+  data.tar.gz: '01816a252d70e1a9c0bd7215893c54f6ac5dd9444cf9c86b571455edb9b45b0b6bae6072a1e678d283eb70c067a738071a7b7625ace489464dda551574a36121'

data/benchmark/active_record_adapter_ips.rb

@@ -6,10 +6,13 @@ require 'benchmark/ips'
 
 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

data/lib/flipper/adapters/active_record.rb

@@ -21,6 +21,8 @@ module Flipper
         ].join
 
         has_many :gates, foreign_key: "feature_key", primary_key: "key"
+
+        validates :key, presence: true
       end
 
       # Private: Do not use outside of this adapter.
@@ -30,6 +32,9 @@ module Flipper
           "flipper_gates",
           Model.table_name_suffix,
         ].join
+
+        validates :feature_key, presence: true
+        validates :key, presence: true
       end
 
       VALUE_TO_TEXT_WARNING = <<-EOS
@@ -59,7 +64,7 @@ module Flipper
 
       # Public: The set of known features.
       def features
-        with_connection(@feature_class) { @feature_class.all.map(&:key).to_set }
+        with_connection(@feature_class) { @feature_class.distinct.pluck(:key).to_set }
       end
 
       # Public: Adds a feature to the set of known features.
@@ -68,9 +73,9 @@ module Flipper
           # race condition, but add is only used by enable/disable which happen
           # super rarely, so it shouldn't matter in practice
           @feature_class.transaction do
-            unless @feature_class.where(key: feature.key).first
+            unless @feature_class.where(key: feature.key).exists?
               begin
-                @feature_class.create! { |f| f.key = feature.key }
+                @feature_class.create!(key: feature.key)
               rescue ::ActiveRecord::RecordNotUnique
               end
             end

data/lib/flipper/version.rb

@@ -1,5 +1,5 @@
 module Flipper
-  VERSION = '1.2.2'.freeze
+  VERSION = '1.3.0'.freeze
 
   REQUIRED_RUBY_VERSION = '2.6'.freeze
   NEXT_REQUIRED_RUBY_VERSION = '3.0'.freeze

data/spec/flipper/adapters/active_record_spec.rb

@@ -1,5 +1,4 @@
 SpecHelpers.silence { require 'flipper/adapters/active_record' }
-require 'active_support/core_ext/kernel'
 
 # Turn off migration logging for specs
 ActiveRecord::Migration.verbose = false
@@ -17,212 +16,217 @@ RSpec.describe Flipper::Adapters::ActiveRecord do
 
   [
     {
-      adapter: "sqlite3",
-      database: ":memory:"
+      "adapter" => "sqlite3",
+      "database" => ":memory:"
     },
 
     {
-      adapter: "mysql2",
-      encoding: "utf8mb4",
-      username: ENV["MYSQL_USER"] || "root",
-      password: ENV["MYSQL_PASSWORD"] || "",
-      database: ENV["MYSQL_DATABASE"] || "flipper_test",
-      port: ENV["DB_PORT"] || 3306
+      "adapter" => "mysql2",
+      "encoding" => "utf8mb4",
+      "username" => ENV["MYSQL_USER"] || "root",
+      "password" => ENV["MYSQL_PASSWORD"] || "",
+      "database" => ENV["MYSQL_DATABASE"] || "flipper_test",
+      "port" => ENV["DB_PORT"] || 3306
     },
 
     {
-      adapter: "postgresql",
-      encoding: "unicode",
-      host: "127.0.0.1",
-      username: ENV["POSTGRES_USER"] || "",
-      password: ENV["POSTGRES_PASSWORD"] || "",
-      database: ENV["POSTGRES_DATABASE"] || "flipper_test",
+      "adapter" => "postgresql",
+      "encoding" => "unicode",
+      "host" => "127.0.0.1",
+      "username" => ENV["POSTGRES_USER"] || "",
+      "password" => ENV["POSTGRES_PASSWORD"] || "",
+      "database" => ENV["POSTGRES_DATABASE"] || "flipper_test",
     }
   ].each do |config|
-    config = config.with_indifferent_access
-
-    context "with #{config[:adapter]}" do
-      before(:all) do
-        silence { ActiveRecord::Tasks::DatabaseTasks.create(config) }
-      end
-
-      before(:each) do
-        skip_on_error(ActiveRecord::ConnectionNotEstablished, "#{config[:adapter]} not available") do
-          ActiveRecord::Base.establish_connection(config)
-          CreateFlipperTables.migrate(:up)
-        end
-      end
-
-      after(:each) do
-        ActiveRecord::Tasks::DatabaseTasks.purge(config)
-        ActiveRecord::Base.connection.close
-      end
-
-      after(:all) do
-        silence { ActiveRecord::Tasks::DatabaseTasks.drop(config) }
-      end
-
-      it_should_behave_like 'a flipper adapter'
-
-      it "works when table doesn't exist" do
-        CreateFlipperTables.migrate(:down)
-
-        Flipper.configuration = nil
-        Flipper.instance = nil
-
-        expect {
-          silence do
-            load 'flipper/adapters/active_record.rb'
-            Flipper::Adapters::ActiveRecord.new
+    context "with #{config['adapter']}" do
+      context "with tables created" do
+        before(:all) do
+          skip_on_error(ActiveRecord::ConnectionNotEstablished, "#{config['adapter']} not available") do
+            silence { ActiveRecord::Tasks::DatabaseTasks.create(config) }
           end
-        }.not_to raise_error
-      end
-
-      it "should load actor ids fine" do
-        flipper.enable_percentage_of_time(:foo, 1)
-
-        Flipper::Adapters::ActiveRecord::Gate.create!(
-          feature_key: "foo",
-          key: "actors",
-          value: "Organization;4",
-        )
 
-        flipper = Flipper.new(subject)
-        flipper.preload([:foo])
-      end
-
-      context 'requiring "flipper-active_record"' do
-        before do
           Flipper.configuration = nil
-          Flipper.instance = nil
+        end
 
-          silence { load 'flipper/adapters/active_record.rb' }
+        before(:each) do
+          skip_on_error(ActiveRecord::ConnectionNotEstablished, "#{config['adapter']} not available") do
+            ActiveRecord::Base.establish_connection(config)
+            CreateFlipperTables.migrate(:up)
+          end
         end
 
-        it 'configures itself' do
-          expect(Flipper.adapter.adapter).to be_a(Flipper::Adapters::ActiveRecord)
+        after(:each) do
+          ActiveRecord::Tasks::DatabaseTasks.purge(config)
+          ActiveRecord::Base.connection.close
         end
-      end
 
-      context "ActiveRecord connection_pool" do
-        before do
-          ActiveRecord::Base.clear_active_connections!
+        after(:all) do
+          silence { ActiveRecord::Tasks::DatabaseTasks.drop(config) } unless $skip
         end
 
-        context "#features" do
-          it "does not hold onto connections" do
-            expect(ActiveRecord::Base.connection_handler.active_connections?).to be(false)
-            subject.features
-            expect(ActiveRecord::Base.connection_handler.active_connections?).to be(false)
-          end
+        it_should_behave_like 'a flipper adapter'
 
-          it "does not release previously held connection" do
-            ActiveRecord::Base.connection # establish a new connection
-            expect(ActiveRecord::Base.connection_handler.active_connections?).to be(true)
-            subject.features
-            expect(ActiveRecord::Base.connection_handler.active_connections?).to be(true)
-          end
+        it "should load actor ids fine" do
+          flipper.enable_percentage_of_time(:foo, 1)
+
+          Flipper::Adapters::ActiveRecord::Gate.create!(
+            feature_key: "foo",
+            key: "actors",
+            value: "Organization;4",
+          )
+
+          flipper = Flipper.new(subject)
+          flipper.preload([:foo])
         end
 
-        context "#get_all" do
-          it "does not hold onto connections" do
-            expect(ActiveRecord::Base.connection_handler.active_connections?).to be(false)
-            subject.get_all
-            expect(ActiveRecord::Base.connection_handler.active_connections?).to be(false)
+        context "ActiveRecord connection_pool" do
+          before do
+            ActiveRecord::Base.connection_handler.clear_active_connections!
           end
 
-          it "does not release previously held connection" do
-            ActiveRecord::Base.connection # establish a new connection
-            expect(ActiveRecord::Base.connection_handler.active_connections?).to be(true)
-            subject.get_all
-            expect(ActiveRecord::Base.connection_handler.active_connections?).to be(true)
+          context "#features" do
+            it "does not hold onto connections" do
+              expect(ActiveRecord::Base.connection_handler.active_connections?).to be(false)
+              subject.features
+              expect(ActiveRecord::Base.connection_handler.active_connections?).to be(false)
+            end
+
+            it "does not release previously held connection" do
+              ActiveRecord::Base.connection # establish a new connection
+              expect(ActiveRecord::Base.connection_handler.active_connections?).to be(true)
+              subject.features
+              expect(ActiveRecord::Base.connection_handler.active_connections?).to be(true)
+            end
           end
-        end
 
-        context "#add / #remove / #clear" do
-          let(:feature) { Flipper::Feature.new(:search, subject) }
-
-          it "does not hold onto connections" do
-            expect(ActiveRecord::Base.connection_handler.active_connections?).to be(false)
-            subject.add(feature)
-            expect(ActiveRecord::Base.connection_handler.active_connections?).to be(false)
-            subject.remove(feature)
-            expect(ActiveRecord::Base.connection_handler.active_connections?).to be(false)
-            subject.clear(feature)
-            expect(ActiveRecord::Base.connection_handler.active_connections?).to be(false)
+          context "#get_all" do
+            it "does not hold onto connections" do
+              expect(ActiveRecord::Base.connection_handler.active_connections?).to be(false)
+              subject.get_all
+              expect(ActiveRecord::Base.connection_handler.active_connections?).to be(false)
+            end
+
+            it "does not release previously held connection" do
+              ActiveRecord::Base.connection # establish a new connection
+              expect(ActiveRecord::Base.connection_handler.active_connections?).to be(true)
+              subject.get_all
+              expect(ActiveRecord::Base.connection_handler.active_connections?).to be(true)
+            end
           end
 
-          it "does not release previously held connection" do
-            ActiveRecord::Base.connection # establish a new connection
-            expect(ActiveRecord::Base.connection_handler.active_connections?).to be(true)
-            subject.add(feature)
-            expect(ActiveRecord::Base.connection_handler.active_connections?).to be(true)
-            subject.remove(feature)
-            expect(ActiveRecord::Base.connection_handler.active_connections?).to be(true)
-            subject.clear(feature)
-            expect(ActiveRecord::Base.connection_handler.active_connections?).to be(true)
+          context "#add / #remove / #clear" do
+            let(:feature) { Flipper::Feature.new(:search, subject) }
+
+            it "does not hold onto connections" do
+              expect(ActiveRecord::Base.connection_handler.active_connections?).to be(false)
+              subject.add(feature)
+              expect(ActiveRecord::Base.connection_handler.active_connections?).to be(false)
+              subject.remove(feature)
+              expect(ActiveRecord::Base.connection_handler.active_connections?).to be(false)
+              subject.clear(feature)
+              expect(ActiveRecord::Base.connection_handler.active_connections?).to be(false)
+            end
+
+            it "does not release previously held connection" do
+              ActiveRecord::Base.connection # establish a new connection
+              expect(ActiveRecord::Base.connection_handler.active_connections?).to be(true)
+              subject.add(feature)
+              expect(ActiveRecord::Base.connection_handler.active_connections?).to be(true)
+              subject.remove(feature)
+              expect(ActiveRecord::Base.connection_handler.active_connections?).to be(true)
+              subject.clear(feature)
+              expect(ActiveRecord::Base.connection_handler.active_connections?).to be(true)
+            end
           end
-        end
 
-        context "#get_multi" do
-          let(:feature) { Flipper::Feature.new(:search, subject) }
+          context "#get_multi" do
+            let(:feature) { Flipper::Feature.new(:search, subject) }
+
+            it "does not hold onto connections" do
+              expect(ActiveRecord::Base.connection_handler.active_connections?).to be(false)
+              subject.get_multi([feature])
+              expect(ActiveRecord::Base.connection_handler.active_connections?).to be(false)
+            end
+
+            it "does not release previously held connection" do
+              ActiveRecord::Base.connection # establish a new connection
+              expect(ActiveRecord::Base.connection_handler.active_connections?).to be(true)
+              subject.get_multi([feature])
+              expect(ActiveRecord::Base.connection_handler.active_connections?).to be(true)
+            end
+          end
 
-          it "does not hold onto connections" do
-            expect(ActiveRecord::Base.connection_handler.active_connections?).to be(false)
-            subject.get_multi([feature])
-            expect(ActiveRecord::Base.connection_handler.active_connections?).to be(false)
+          context "#enable/#disable boolean" do
+            let(:feature) { Flipper::Feature.new(:search, subject) }
+            let(:gate) { feature.gate(:boolean)}
+
+            it "does not hold onto connections" do
+              expect(ActiveRecord::Base.connection_handler.active_connections?).to be(false)
+              subject.enable(feature, gate, gate.wrap(true))
+              expect(ActiveRecord::Base.connection_handler.active_connections?).to be(false)
+              subject.disable(feature, gate, gate.wrap(false))
+              expect(ActiveRecord::Base.connection_handler.active_connections?).to be(false)
+            end
+
+            it "does not release previously held connection" do
+              ActiveRecord::Base.connection # establish a new connection
+              expect(ActiveRecord::Base.connection_handler.active_connections?).to be(true)
+              subject.enable(feature, gate, gate.wrap(true))
+              expect(ActiveRecord::Base.connection_handler.active_connections?).to be(true)
+              subject.disable(feature, gate, gate.wrap(false))
+              expect(ActiveRecord::Base.connection_handler.active_connections?).to be(true)
+            end
           end
 
-          it "does not release previously held connection" do
-            ActiveRecord::Base.connection # establish a new connection
-            expect(ActiveRecord::Base.connection_handler.active_connections?).to be(true)
-            subject.get_multi([feature])
-            expect(ActiveRecord::Base.connection_handler.active_connections?).to be(true)
+          context "#enable/#disable set" do
+            let(:feature) { Flipper::Feature.new(:search, subject) }
+            let(:gate) { feature.gate(:group) }
+
+            it "does not hold onto connections" do
+              expect(ActiveRecord::Base.connection_handler.active_connections?).to be(false)
+              subject.enable(feature, gate, gate.wrap(:admin))
+              expect(ActiveRecord::Base.connection_handler.active_connections?).to be(false)
+              subject.disable(feature, gate, gate.wrap(:admin))
+              expect(ActiveRecord::Base.connection_handler.active_connections?).to be(false)
+            end
+
+            it "does not release previously held connection" do
+              ActiveRecord::Base.connection # establish a new connection
+              expect(ActiveRecord::Base.connection_handler.active_connections?).to be(true)
+              subject.enable(feature, gate, gate.wrap(:admin))
+              expect(ActiveRecord::Base.connection_handler.active_connections?).to be(true)
+              subject.disable(feature, gate, gate.wrap(:admin))
+              expect(ActiveRecord::Base.connection_handler.active_connections?).to be(true)
+            end
           end
         end
 
-        context "#enable/#disable boolean" do
-          let(:feature) { Flipper::Feature.new(:search, subject) }
-          let(:gate) { feature.gate(:boolean)}
+        context 'requiring "flipper-active_record"' do
+          before do
+            Flipper.configuration = nil
+            Flipper.instance = nil
 
-          it "does not hold onto connections" do
-            expect(ActiveRecord::Base.connection_handler.active_connections?).to be(false)
-            subject.enable(feature, gate, gate.wrap(true))
-            expect(ActiveRecord::Base.connection_handler.active_connections?).to be(false)
-            subject.disable(feature, gate, gate.wrap(false))
-            expect(ActiveRecord::Base.connection_handler.active_connections?).to be(false)
+            silence { load 'flipper/adapters/active_record.rb' }
           end
 
-          it "does not release previously held connection" do
-            ActiveRecord::Base.connection # establish a new connection
-            expect(ActiveRecord::Base.connection_handler.active_connections?).to be(true)
-            subject.enable(feature, gate, gate.wrap(true))
-            expect(ActiveRecord::Base.connection_handler.active_connections?).to be(true)
-            subject.disable(feature, gate, gate.wrap(false))
-            expect(ActiveRecord::Base.connection_handler.active_connections?).to be(true)
+          it 'configures itself' do
+            expect(Flipper.adapter.adapter).to be_a(Flipper::Adapters::ActiveRecord)
           end
         end
+      end
 
-        context "#enable/#disable set" do
-          let(:feature) { Flipper::Feature.new(:search, subject) }
-          let(:gate) { feature.gate(:group) }
+      it "works when table doesn't exist" do
 
-          it "does not hold onto connections" do
-            expect(ActiveRecord::Base.connection_handler.active_connections?).to be(false)
-            subject.enable(feature, gate, gate.wrap(:admin))
-            expect(ActiveRecord::Base.connection_handler.active_connections?).to be(false)
-            subject.disable(feature, gate, gate.wrap(:admin))
-            expect(ActiveRecord::Base.connection_handler.active_connections?).to be(false)
-          end
+        Flipper.configuration = nil
+        Flipper.instance = nil
 
-          it "does not release previously held connection" do
-            ActiveRecord::Base.connection # establish a new connection
-            expect(ActiveRecord::Base.connection_handler.active_connections?).to be(true)
-            subject.enable(feature, gate, gate.wrap(:admin))
-            expect(ActiveRecord::Base.connection_handler.active_connections?).to be(true)
-            subject.disable(feature, gate, gate.wrap(:admin))
-            expect(ActiveRecord::Base.connection_handler.active_connections?).to be(true)
-          end
+        Flipper::Adapters.send(:remove_const, :ActiveRecord) if Flipper::Adapters.const_defined?(:ActiveRecord)
+
+        silence do
+          expect {
+            load 'flipper/adapters/active_record.rb'
+            Flipper::Adapters::ActiveRecord.new
+          }.not_to raise_error
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flipper-active_record
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - John Nunemaker
 autorequire:
 bindir: bin
 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: flipper
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -74,7 +74,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: