magick-feature-flags 0.9.8 → 0.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7f546b5a885a633524d3b0c405e296621f00eaeabb7b65339160c5aa0911ead
-  data.tar.gz: 07af571d3fdba904c122c5e8996c58fcaac31d515bd955f57aa640d66373376b
+  metadata.gz: 6ff57666debab09c055a1709e27902b4ff03780b62ca97382e3f0df191b4b1ce
+  data.tar.gz: 1420d03c05427c4c0ef7f319debb108542b36fa5fccf999ad13e3bd0571c0451
 SHA512:
-  metadata.gz: 75608b0d581c01aa0a25a362bb45c6cdcb4e8b3ee0316663d1ec6e521b9af3099192d1e2a38fcc13ead9adb256c1fda09934fef749323fc7e94cbaa7daac7c3f
-  data.tar.gz: ca5643cbd9bdeffeb8c8e1116b4631c6bedde59c2bd050936a77b6bdece35fc67955608ecccba41a7eaaffe59da769a0b74c59f9cb57372fbd07b281c188b397
+  metadata.gz: 2150805b902ed92fc1f033493e47697541078d21fb7d9d1e827ddf8b22d9e17fd58e8e1ed926aa47fecf1662c491d910ecba528a0d1ce8f306b340c9e0b35a16
+  data.tar.gz: 21144c7b0ad4c6c23eb379f088898757f438058dc9c2278f3fc30a03e188b03a6b58e9cb4aac8d5e37127523b5bcfc562a00c08079de95da035d10b9afa28ad5

data/lib/magick/adapters/registry.rb

@@ -97,6 +97,13 @@ module Magick
         !redis_adapter.nil?
       end
 
+      # Get Redis client (public method for use by other classes)
+      def redis_client
+        return nil unless redis_adapter
+
+        redis_adapter.instance_variable_get(:@redis)
+      end
+
       private
 
       attr_reader :memory_adapter, :redis_adapter, :circuit_breaker

data/lib/magick/performance_metrics.rb

@@ -65,9 +65,7 @@ module Magick
       should_flush = false
       @mutex.synchronize do
         # Flush if we have enough pending updates or enough time has passed
-        if @pending_updates.size >= @batch_size || (Time.now - @last_flush) >= @flush_interval
-          should_flush = true
-        end
+        should_flush = true if @pending_updates.size >= @batch_size || (Time.now - @last_flush) >= @flush_interval
       end
 
       flush_to_redis if should_flush
@@ -88,13 +86,13 @@ module Magick
       # Update Redis in batch
       begin
         adapter = Magick.adapter_registry || Magick.default_adapter_registry
-        if adapter.is_a?(Magick::Adapters::Registry) && adapter.redis_adapter
-          redis = adapter.redis_adapter.instance_variable_get(:@redis)
+        if adapter.is_a?(Magick::Adapters::Registry) && adapter.redis_available?
+          redis = adapter.redis_client
           if redis
             updates_to_flush.each do |feature_name, count|
               redis_key = "magick:stats:#{feature_name}"
               redis.incrby(redis_key, count)
-              redis.expire(redis_key, 86400 * 7) # Keep stats for 7 days
+              redis.expire(redis_key, 86_400 * 7) # Keep stats for 7 days
             end
           end
         end
@@ -130,8 +128,8 @@ module Magick
       if @redis_enabled
         begin
           adapter = Magick.adapter_registry || Magick.default_adapter_registry
-          if adapter.is_a?(Magick::Adapters::Registry) && adapter.redis_adapter
-            redis = adapter.redis_adapter.instance_variable_get(:@redis)
+          if adapter.is_a?(Magick::Adapters::Registry) && adapter.redis_available?
+            redis = adapter.redis_client
             if redis
               redis_key = "magick:stats:#{feature_name_str}"
               redis_count = redis.get(redis_key).to_i
@@ -152,11 +150,11 @@ module Magick
       if @redis_enabled
         begin
           adapter = Magick.adapter_registry || Magick.default_adapter_registry
-          if adapter.is_a?(Magick::Adapters::Registry) && adapter.redis_adapter
-            redis = adapter.redis_adapter.instance_variable_get(:@redis)
+          if adapter.is_a?(Magick::Adapters::Registry) && adapter.redis_available?
+            redis = adapter.redis_client
             if redis
               # Get all stats keys
-              redis.keys("magick:stats:*").each do |key|
+              redis.keys('magick:stats:*').each do |key|
                 feature_name = key.to_s.sub('magick:stats:', '')
                 redis_count = redis.get(key).to_i
                 combined_counts[feature_name] = (combined_counts[feature_name] || 0) + redis_count

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.8'
+  VERSION = '0.9.10'
 end

data/lib/magick.rb

@@ -175,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
@@ -188,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.8
+  version: 0.9.10
 platform: ruby
 authors:
 - Andrew Lobanov