magick-feature-flags 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3df9cccb3e3478e71402fa478d4a70401d0150290fdca89a6a47df7fbd901794
-  data.tar.gz: 929990ca6220cebb2e9215a1993df11fa25a71dbf620029a176db1c8b50edf48
+  metadata.gz: ce69954c64fae4d8ec9d10d177621ef508c1f0d8db98b9012849250d90cc974f
+  data.tar.gz: 41024341850d984dc1b16c8e85913160a94eb92b96f5eaf07477d9ff93a46de4
 SHA512:
-  metadata.gz: 225fdbbed5820df1ca9cb7f0283172b57ab5a3c0a26639fc6d11cef9553f80cc35402753878469db7470ef90ac691431daf399cac1b1cba26d23395ce5776f8c
-  data.tar.gz: da03312e98129cc04bc0ba63dfc06e67e171406e35fa4e46f9ff73c494a0596ef4e1e65868bab0a0ad7f43f05bbf449a81d9ac1b25eae5a0d40e1ba6245f4e44
+  metadata.gz: a16aa4722424020d4d4ab0d45c1dc5bfec6452ae6f24177d713e6f98790d33b4851bb340e39603aecf52c06bf2d669d0876c0b3835bc9ebf4f63cd92e7776ccc
+  data.tar.gz: 3a49561daaf30a060abefd7c11413dd5e87e27771b59e089d287cb2788920f5f9c334c4922e064d03c18ce692b6f37a6bfeaf419f09ba12891313c3be1eb1f8a

data/app/controllers/magick/adminui/features_controller.rb

@@ -87,11 +87,8 @@ module Magick
       end
 
       def enable
-        if @feature.enable
-          redirect_to magick_admin_ui.features_path, notice: 'Feature enabled'
-        else
-          redirect_to magick_admin_ui.feature_path(@feature.name), alert: 'Cannot enable feature — its dependencies must be enabled first'
-        end
+        @feature.enable
+        redirect_to magick_admin_ui.features_path, notice: 'Feature enabled'
       end
 
       def disable

data/lib/magick/feature.rb

@@ -107,6 +107,11 @@ module Magick
       return false if status == :inactive
       return false if status == :deprecated && !context[:allow_deprecated]
 
+      # Dependency check: a feature with unmet prerequisites evaluates as disabled,
+      # regardless of its own configured state. Evaluation-only — prerequisite state
+      # is never written into this feature.
+      return false unless dependencies_satisfied?(context)
+
       # Fast path: skip targeting checks if targeting is empty (most common case)
       unless @_targeting_empty
         # Check exclusions FIRST — exclusions always take priority over inclusions
@@ -532,18 +537,6 @@ module Magick
     end
 
     def enable(user_id: nil)
-      # Check that all of this feature's own dependencies are enabled
-      # e.g. if checkout depends on payments, checkout can't be enabled until payments is
-      deps = @dependencies || []
-      unless deps.empty?
-        disabled_deps = deps.select do |dep_name|
-          dep_feature = Magick.features[dep_name.to_s] || Magick[dep_name]
-          dep_feature && !dep_feature.enabled?
-        end
-
-        return false unless disabled_deps.empty?
-      end
-
       # Clear all targeting to enable globally
       @targeting = {}
       save_targeting
@@ -589,9 +582,6 @@ module Magick
         registered.instance_variable_set(:@targeting, {})
       end
 
-      # Cascade disable: disable all features that depend on this one
-      disable_dependent_features(user_id: user_id)
-
       # Rails 8+ event
       if defined?(Magick::Rails::Events) && Magick::Rails::Events.rails8?
         Magick::Rails::Events.feature_disabled_globally(name, user_id: user_id)
@@ -1015,42 +1005,18 @@ module Magick
       context
     end
 
-    def disable_dependent_features(user_id: nil)
-      # Cascade-disable features that depend ON this feature.
-      # e.g. if checkout depends on payments, disabling payments also disables checkout.
-      dependents = find_dependent_features
-      return if dependents.empty?
-
-      dependents.each do |dep_name|
-        dep_feature = Magick.features[dep_name.to_s] || Magick[dep_name]
-        next unless dep_feature
+    def dependencies_satisfied?(context)
+      deps = @dependencies
+      return true if deps.nil? || deps.empty?
 
-        dep_feature.instance_variable_set(:@targeting, {})
-        dep_feature.save_targeting
-
-        case dep_feature.type
-        when :boolean
-          dep_feature.set_value(false, user_id: user_id)
-        when :string
-          dep_feature.set_value('', user_id: user_id)
-        when :number
-          dep_feature.set_value(0, user_id: user_id)
-        end
-
-        if defined?(Magick::Rails::Events) && Magick::Rails::Events.rails8?
-          Magick::Rails::Events.feature_disabled_globally(dep_name, user_id: user_id)
-        end
-      end
-    end
+      deps.all? do |dep_name|
+        dep_feature = Magick.features[dep_name.to_s] || Magick.features[dep_name.to_sym]
+        # Unknown dependency is treated as satisfied — matches prior behavior
+        # where missing features were skipped in cascade logic.
+        next true unless dep_feature
 
-    def find_dependent_features
-      # Find all features that have this feature in their dependencies
-      dependent_features = []
-      Magick.features.each do |_name, feature|
-        feature_deps = feature.instance_variable_get(:@dependencies) || []
-        dependent_features << feature.name if feature_deps.include?(name.to_s) || feature_deps.include?(name.to_sym)
+        dep_feature.enabled?(context)
       end
-      dependent_features
     end
 
     def excluded?(context)

data/lib/magick/version.rb

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

data/lib/magick.rb

@@ -31,7 +31,6 @@ require_relative 'magick/export_import'
 require_relative 'magick/versioning'
 require_relative 'magick/circuit_breaker'
 require_relative 'magick/testing_helpers'
-require_relative 'magick/feature_dependency'
 require_relative 'magick/documentation'
 # AdminUI is loaded conditionally via configuration
 # It is not loaded by default - must be enabled in Magick.configure

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: magick-feature-flags
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Andrew Lobanov
@@ -128,7 +128,6 @@ files:
 - lib/magick/errors.rb
 - lib/magick/export_import.rb
 - lib/magick/feature.rb
-- lib/magick/feature_dependency.rb
 - lib/magick/feature_variant.rb
 - lib/magick/log_safe.rb
 - lib/magick/performance_metrics.rb

data/lib/magick/feature_dependency.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-module Magick
-  class FeatureDependency
-    def self.check(feature_name, context = {})
-      feature = Magick.features[feature_name.to_s] || Magick[feature_name]
-      dependencies = feature.instance_variable_get(:@dependencies) || []
-
-      dependencies.all? do |dep_name|
-        Magick.enabled?(dep_name, context)
-      end
-    end
-
-    def self.add_dependency(feature_name, dependency_name)
-      feature = Magick.features[feature_name.to_s] || Magick[feature_name]
-      dependencies = feature.instance_variable_get(:@dependencies) || []
-      dependencies << dependency_name.to_s unless dependencies.include?(dependency_name.to_s)
-      feature.instance_variable_set(:@dependencies, dependencies)
-    end
-
-    def self.remove_dependency(feature_name, dependency_name)
-      feature = Magick.features[feature_name.to_s] || Magick[feature_name]
-      dependencies = feature.instance_variable_get(:@dependencies) || []
-      dependencies.delete(dependency_name.to_s)
-      feature.instance_variable_set(:@dependencies, dependencies)
-    end
-  end
-end