magick-feature-flags 0.9.25 → 0.9.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 955281614bf30144cc9ab808bc425aa3ef9a7217f54fda216fbc1666e159a282
-  data.tar.gz: 4dcfafc1e22d19472464da79de5765b02a4f9e0540e9d2ff16ee7527110d2924
+  metadata.gz: 52c961b4ce8e667ce8e728098f63a210fb82aaee03d63d573ef87d692c007875
+  data.tar.gz: 6e33c899e93f039bf5d318a0ac1492efa45329b99bbe4e700f17b37d4240818e
 SHA512:
-  metadata.gz: 1dbbd4877f1a84a8770f5b9175920ca5060e7b26b7acf23f1006094a33287ff41525ebef847ee0ebf50f22e94f14f2c20755621f503df9941cf2b8649b82e110
-  data.tar.gz: 0be714620546fc53ba039b417b0b6d85627346da8bb60acd6432f6e058ab650f20c3b0ec70f367972056dd0a7c1731244da5732bb0a572ae0047d6d1a46d535e
+  metadata.gz: f854aa3d288dd2bf137fb56e69c58c2092ff1b5d76a8ce2c429f416416b758ab5d99e680efd3c704f084d08dc7b2a4bc2f161bed9431446609de1ebddec40f22
+  data.tar.gz: 98e43b058ed905b6bed109911e6649b8644c401681e269a6e406f41e49689992bed804488ab81f0ccafe4db7dcbc68ab45a88686a93f0ee10213f35b8a8f1c36

data/lib/magick/admin_ui/engine.rb

@@ -25,6 +25,16 @@ module Magick
       # to ensure controllers are found
       config.autoload_paths += %W[#{root}/app/controllers] if root.join('app', 'controllers').exist?
 
+      # Explicitly require controllers early to ensure they're loaded when gem is from RubyGems
+      # This initializer runs before routes are drawn
+      initializer 'magick.admin_ui.require_controllers', before: :load_config_initializers do
+        controller_path = root.join('app', 'controllers', 'magick', 'adminui', 'features_controller.rb')
+        require controller_path.to_s if controller_path.exist?
+
+        stats_controller_path = root.join('app', 'controllers', 'magick', 'adminui', 'stats_controller.rb')
+        require stats_controller_path.to_s if stats_controller_path.exist?
+      end
+
       # Explicitly add app/views to view paths
       # Rails engines should do this automatically, but we ensure it's configured
       initializer 'magick.admin_ui.append_view_paths', after: :add_view_paths do |app|
@@ -39,9 +49,19 @@ module Magick
         end
       end
 
-      # Ensure view paths are added in to_prepare (runs before each request in development)
+      # Ensure controllers are loaded and view paths are added in to_prepare
+      # This runs before each request in development and once at boot in production
       config.to_prepare do
-        view_path = Magick::AdminUI::Engine.root.join('app', 'views').to_s
+        # Explicitly require controllers first to ensure they're loaded
+        # This is necessary when the gem is loaded from RubyGems
+        controller_path = root.join('app', 'controllers', 'magick', 'adminui', 'features_controller.rb')
+        require controller_path.to_s if controller_path.exist?
+
+        stats_controller_path = root.join('app', 'controllers', 'magick', 'adminui', 'stats_controller.rb')
+        require stats_controller_path.to_s if stats_controller_path.exist?
+
+        # Then add view paths
+        view_path = root.join('app', 'views').to_s
         if File.directory?(view_path)
           if defined?(Magick::AdminUI::FeaturesController)
             Magick::AdminUI::FeaturesController.append_view_path(view_path)

data/lib/magick/admin_ui.rb

@@ -1,19 +1,8 @@
 # frozen_string_literal: true
 
 require_relative 'admin_ui/engine'
-# Controllers are in app/controllers and will be auto-loaded by Rails engine
-# But we explicitly require them to ensure they're available when needed
-if defined?(Rails) && Rails.env
-  # In Rails, controllers are auto-loaded from app/controllers
-  # But we can explicitly require them if needed for console access
-  engine_root = Magick::AdminUI::Engine.root
-  if engine_root.join('app', 'controllers', 'magick', 'adminui', 'features_controller.rb').exist?
-    require engine_root.join('app', 'controllers', 'magick', 'adminui', 'features_controller').to_s
-  end
-  if engine_root.join('app', 'controllers', 'magick', 'adminui', 'stats_controller.rb').exist?
-    require engine_root.join('app', 'controllers', 'magick', 'adminui', 'stats_controller').to_s
-  end
-end
+# Controllers are explicitly required in the Engine's config.to_prepare block
+# This ensures they're loaded when the gem is used from RubyGems
 require_relative 'admin_ui/helpers'
 
 module Magick

data/lib/magick/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Magick
-  VERSION = '0.9.25'
+  VERSION = '0.9.26'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: magick-feature-flags
 version: !ruby/object:Gem::Version
-  version: 0.9.25
+  version: 0.9.26
 platform: ruby
 authors:
 - Andrew Lobanov