Merge pull request #785 from flippercloud/fix-ar-ext-require

Ensure that flipper itself has the extensions for active record
flippercloud · Dec 9, 2023 · c020f74 · c020f74
2 parents 5a3587b + 01d4e0c
commit c020f74
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/flipper-active_record.gemspec b/flipper-active_record.gemspec
@@ -1,9 +1,16 @@
 # -*- encoding: utf-8 -*-
 require File.expand_path('../lib/flipper/version', __FILE__)
 require File.expand_path('../lib/flipper/metadata', __FILE__)
+require "set"
+
+# Files that should exist in main flipper gem.
+main_flipper_active_record_files = Set[
+  "lib/flipper/model/active_record.rb",
+  "spec/flipper/model/active_record_spec.rb",
+]
 
 flipper_active_record_files = lambda do |file|
-  file =~ /active_record/
+  file =~ /active_record/ && !main_flipper_active_record_files.include?(file)
 end
 
 Gem::Specification.new do |gem|

diff --git a/lib/flipper/engine.rb b/lib/flipper/engine.rb
@@ -15,9 +15,8 @@ class Engine < Rails::Engine
     end
 
     initializer "flipper.properties" do
-      require "flipper/model/active_record"
-
       ActiveSupport.on_load(:active_record) do
+        require "flipper/model/active_record"
         ActiveRecord::Base.include Flipper::Model::ActiveRecord
       end
     end