magick-feature-flags 0.8.8 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 876436714b054435d68ac40f18eab6597165640e5f4ab2cb666474f7b03cb92f
-  data.tar.gz: 1cb04e84837d1faf72fa9566fe852ce484d20035b763b9cec4896ec1cb24b62e
+  metadata.gz: cb4c8735b5c0df6cc7331ddd6cb4bec60b7557839dbe38087c61b5c3ac7a434e
+  data.tar.gz: 1035c662c99663e07265a6e25f5cccfaa833057bac07b3dd7b9739f15916ece2
 SHA512:
-  metadata.gz: b541dbee500ab1e93969791326ca2f02ab7b4bd9595f5a903ec954018166cf5de9f26cde857325e2698fdcfe311533e31f3eb201027594e4a66007246a14248a
-  data.tar.gz: 701320125c33d03df6238e010ee9ce274f59fc56d4b423ebb6ffec131b2edda19fb1214dc532b875259f63848e4cbfa61ddbbf9b1354b6384fa139cd17c06840
+  metadata.gz: 5d42c95ef3ea3e5b2a96788970df810d18fc8bad3c73efb87dd6ec056a6eb1518d20bee97a3940faf302f432deb524b98529dd350bc0b2ed83796fcb78ffbd6c
+  data.tar.gz: a0753994c42679b82438fe6d9b6f9a1d993b1efd151cf93a2a027ee23c1b8355945a62d32421aee55d8fecd61eb810b9638eb7d237b6fb9e4d10309905dbf9dc

data/lib/magick/feature.rb

@@ -20,6 +20,7 @@ module Magick
       @display_name = options[:name] || options[:display_name]
       @targeting = {}
       @dependencies = options[:dependencies] ? Array(options[:dependencies]) : []
+      @stored_value_initialized = false # Track if @stored_value has been explicitly set
 
       validate_type!
       validate_default_value!
@@ -64,7 +65,9 @@ module Magick
         duration = (Time.now - start_time) * 1000
         Magick.performance_metrics.record(name, 'enabled?', duration, success: false)
       end
-      raise e
+      # Return false on any error (fail-safe)
+      warn "Magick: Error checking feature '#{name}': #{e.message}" if defined?(Rails) && Rails.env.development?
+      false
     end
 
     def check_enabled(context = {})
@@ -99,6 +102,10 @@ module Magick
       else
         false
       end
+    rescue StandardError => e
+      # Return false on any error (fail-safe)
+      warn "Magick: Error in check_enabled for '#{name}': #{e.message}" if defined?(Rails) && Rails.env.development?
+      false
     end
 
     def disabled?(context = {})
@@ -126,11 +133,26 @@ module Magick
       targeting_result = check_targeting(context)
       return targeting_result unless targeting_result.nil?
 
-      # Use instance variable if set, otherwise load from adapter
-      # This ensures we use the most recent value set via set_value/disable/enable
-      value = @stored_value
-      value = load_value_from_adapter if value.nil?
-      value || default_value
+      # Use instance variable if it has been set (check using defined? to handle nil vs uninitialized)
+      # We use a special check: if @stored_value was explicitly set (even to false), use it
+      # We track this by checking if @stored_value_initialized flag is set
+      return @stored_value if defined?(@stored_value_initialized) && @stored_value_initialized
+
+      # Load from adapter if instance variable hasn't been initialized
+      loaded_value = load_value_from_adapter
+      if loaded_value.nil?
+        # Value not found in adapter, use default
+        default_value
+      else
+        # Value found in adapter, use it and mark as initialized
+        @stored_value = loaded_value
+        @stored_value_initialized = true
+        loaded_value
+      end
+    rescue StandardError => e
+      # Return default value on error (fail-safe)
+      warn "Magick: Error in get_value for '#{name}': #{e.message}" if defined?(Rails) && Rails.env.development?
+      default_value
     end
 
     def enable_for_user(user_id)
@@ -326,11 +348,13 @@ module Magick
       adapter_registry.set(name, 'description', description) if description
       adapter_registry.set(name, 'display_name', display_name) if display_name
       @stored_value = value
+      @stored_value_initialized = true # Mark as initialized
 
       # Update registered feature instance if it exists
       if Magick.features.key?(name)
         registered = Magick.features[name]
         registered.instance_variable_set(:@stored_value, value)
+        registered.instance_variable_set(:@stored_value_initialized, true)
         registered.instance_variable_set(:@targeting, @targeting.dup) if @targeting
       end
 
@@ -434,6 +458,7 @@ module Magick
       if Magick.features.key?(name)
         registered = Magick.features[name]
         registered.instance_variable_set(:@stored_value, @stored_value)
+        registered.instance_variable_set(:@stored_value_initialized, @stored_value_initialized)
         registered.instance_variable_set(:@status, @status)
         registered.instance_variable_set(:@description, @description)
         registered.instance_variable_set(:@display_name, @display_name)
@@ -466,19 +491,31 @@ module Magick
     end
 
     def load_from_adapter
-      # Clear cached value to force reload from adapter (which checks version)
-      @stored_value = nil
-      @stored_value = load_value_from_adapter
+      # Load value from adapter
+      loaded_value = load_value_from_adapter
+      # Set @stored_value if we got a value from adapter (can be false, true, '', 0, etc.)
+      # Only set if loaded_value is not nil (nil means not found in adapter)
+      unless loaded_value.nil?
+        @stored_value = loaded_value
+        @stored_value_initialized = true
+      end
+
       status_value = adapter_registry.get(name, 'status')
       @status = status_value ? status_value.to_sym : status
 
-      # Load description from adapter (override initial value if present in adapter)
-      description_value = adapter_registry.get(name, 'description')
-      @description = description_value if description_value
+      # Load description from adapter only if not provided in DSL
+      # DSL (features.rb) is the source of truth, so don't override DSL values
+      unless @description
+        description_value = adapter_registry.get(name, 'description')
+        @description = description_value if description_value
+      end
 
-      # Load display_name from adapter (override initial value if present in adapter)
-      display_name_value = adapter_registry.get(name, 'display_name')
-      @display_name = display_name_value if display_name_value
+      # Load display_name from adapter only if not provided in DSL
+      # DSL (features.rb) is the source of truth, so don't override DSL values
+      unless @display_name
+        display_name_value = adapter_registry.get(name, 'display_name')
+        @display_name = display_name_value if display_name_value
+      end
 
       targeting_value = adapter_registry.get(name, 'targeting')
       if targeting_value.is_a?(Hash)
@@ -493,12 +530,11 @@ module Magick
     end
 
     def save_metadata_if_new
-      # Save description and display_name to adapter if they were provided in options
-      # but don't exist in adapter yet (to avoid overwriting existing values)
-      if @description && !adapter_registry.get(name, 'description')
-        adapter_registry.set(name, 'description', @description)
-      end
-      return unless @display_name && !adapter_registry.get(name, 'display_name')
+      # Always save description and display_name from DSL to adapter
+      # The features.rb file is the source of truth for metadata
+      # This ensures metadata is always up-to-date even if feature already exists
+      adapter_registry.set(name, 'description', @description) if @description
+      return unless @display_name
 
       adapter_registry.set(name, 'display_name', @display_name)
     end

data/lib/magick/version.rb

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

metadata

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