magick-feature-flags 0.9.7 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 015b9568cac92b03d1776240c7236cb395d15189eb496e03ac803979fef2d77d
-  data.tar.gz: 3219b3349bb202775c883d7b977ca0dd8d64846625a524abbe858c6d51d9db43
+  metadata.gz: 97522d2ffcbf4267b4c5fbb6b8243eef1a91d2e00eee70717d6a5cfd74c6b3f4
+  data.tar.gz: 68a31983ffc8b7926c740a6444e4f1d189e7e7eff55a0fbbd175a9c3bee08e0a
 SHA512:
-  metadata.gz: d93760f46cd383bc5b97f032a992fe4e0fc6e567d50985ab2544475805ffbb4545b105c8033a7aafb5a48149c1169ab7f87e6e70da58bcbfd2554a1935608bb3
-  data.tar.gz: 19424a6172af8421a2041a4259f5474a4cffa7cf62cd03582b23f479374b7ca3a9aa56ca57f69e7facae4e372662d70abf80384456247d801ffd6eee141acd56
+  metadata.gz: ccf360255814ca54a8d7ab84f13329d74fbdbb5c61b9943053b607fe16107999bcbddf3954c8b4b6b9ec08c0ffcf5aea547132e18969eb1295d67a0e97ce3baf
+  data.tar.gz: e31e42e107f303988590f20bd3f3098221ae024a2f2eedefc5ebcf04781e76f845e10d672ab8e086eef91a3d675b6f2c6f21adfa7edb64e2fd7c413ab4b008e3

data/lib/magick/adapters/registry.rb

@@ -92,6 +92,11 @@ module Magick
         publish_cache_invalidation(feature_name)
       end
 
+      # Check if Redis adapter is available
+      def redis_available?
+        !redis_adapter.nil?
+      end
+
       private
 
       attr_reader :memory_adapter, :redis_adapter, :circuit_breaker

data/lib/magick/config.rb

@@ -57,6 +57,7 @@ module Magick
         @performance_metrics.enable_redis_tracking(enable: false)
       end
       # If nil, will be auto-determined in apply! method
+      @performance_metrics
     end
 
     def audit_log(enabled: true, adapter: nil)
@@ -93,21 +94,23 @@ module Magick
     def apply!
       # Apply configuration to Magick module
       Magick.adapter_registry = adapter_registry if adapter_registry
-      Magick.performance_metrics = performance_metrics if performance_metrics
-      Magick.audit_log = audit_log if audit_log
-      Magick.versioning = versioning if versioning
-      Magick.warn_on_deprecated = warn_on_deprecated
 
-      # Enable Redis tracking for performance metrics
-      if Magick.performance_metrics
-        # If redis_tracking was explicitly set, use that value
+      # Apply performance metrics (preserve redis_tracking setting)
+      if performance_metrics
+        Magick.performance_metrics = performance_metrics
+        # Re-apply redis_tracking setting after assignment (in case object was replaced)
         if defined?(@performance_metrics_redis_tracking) && !@performance_metrics_redis_tracking.nil?
           Magick.performance_metrics.enable_redis_tracking(enable: @performance_metrics_redis_tracking)
         # Otherwise, auto-enable if Redis adapter is configured
-        elsif adapter_registry.is_a?(Adapters::Registry) && adapter_registry.redis_adapter
+        # Check Magick.adapter_registry (after it's been set) instead of local instance variable
+        elsif Magick.adapter_registry.is_a?(Adapters::Registry) && Magick.adapter_registry.redis_available?
           Magick.performance_metrics.enable_redis_tracking(enable: true)
         end
       end
+
+      Magick.audit_log = audit_log if audit_log
+      Magick.versioning = versioning if versioning
+      Magick.warn_on_deprecated = warn_on_deprecated
     end
 
     private

data/lib/magick/rails/railtie.rb

@@ -16,19 +16,24 @@ if defined?(Rails)
           Object.class_eval { include Magick::DSL } unless Object.included_modules.include?(Magick::DSL)
         end
 
-        initializer 'magick.configure' do |app|
-          # Configure Magick with Rails-specific settings
-          Magick.configure do |config|
-            # Use Redis if available, otherwise fall back to memory
-            if defined?(Redis)
-              begin
-                redis_url = app.config.respond_to?(:redis_url) ? app.config.redis_url : nil
-                redis_client = redis_url ? ::Redis.new(url: redis_url) : ::Redis.new
-                memory_adapter = Adapters::Memory.new
-                redis_adapter = Adapters::Redis.new(redis_client)
-                config.adapter_registry = Adapters::Registry.new(memory_adapter, redis_adapter)
-              rescue StandardError => e
-                Rails.logger&.warn "Magick: Failed to initialize Redis adapter: #{e.message}. Using memory-only adapter."
+        initializer 'magick.configure', before: :load_config_initializers do |app|
+          # Configure Magick with Rails-specific settings (only if not already configured)
+          # This allows user's config/initializers/magick.rb to override these defaults
+          unless Magick.adapter_registry
+            Magick.configure do |magick|
+              # Use Redis if available, otherwise fall back to memory
+              if defined?(Redis)
+                begin
+                  redis_url = app.config.respond_to?(:redis_url) ? app.config.redis_url : nil
+                  redis_client = redis_url ? ::Redis.new(url: redis_url) : ::Redis.new
+                  memory_adapter = Adapters::Memory.new
+                  redis_adapter = Adapters::Redis.new(redis_client)
+                  magick.adapter_registry = Adapters::Registry.new(memory_adapter, redis_adapter)
+                  # Re-apply Redis tracking if performance metrics exists
+                  Magick.reapply_redis_tracking! if Magick.performance_metrics
+                rescue StandardError => e
+                  Rails.logger&.warn "Magick: Failed to initialize Redis adapter: #{e.message}. Using memory-only adapter."
+                end
               end
             end
           end

data/lib/magick/version.rb

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

data/lib/magick.rb

@@ -128,6 +128,14 @@ module Magick
       @versioning ||= Versioning.new(adapter_registry || default_adapter_registry)
     end
 
+    # Manually enable Redis tracking for performance metrics
+    # Useful if Redis adapter becomes available after initial configuration
+    def enable_redis_tracking(enable: true)
+      return unless performance_metrics
+
+      performance_metrics.enable_redis_tracking(enable: enable)
+    end
+
     # Get total usage count for a feature (combines memory and Redis counts)
     def feature_stats(feature_name)
       return {} unless performance_metrics
@@ -167,8 +175,7 @@ module Magick
       @performance_metrics&.clear!
     end
 
-    private
-
+    # Get default adapter registry (public method for use by other classes)
     def default_adapter_registry
       @default_adapter_registry ||= begin
         memory_adapter = Adapters::Memory.new
@@ -180,5 +187,7 @@ module Magick
         Adapters::Registry.new(memory_adapter, redis_adapter)
       end
     end
+
+    private
   end
 end

metadata

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