optify-config 1.15.2 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65334ccc886cf5a479eb7734f81d234bd088c85ed1e06a01d6693197076536d9
-  data.tar.gz: daf480e5bfb9174c58ffcfaf07023a1f1f3fbf0370410e35271d7ee0e90987a9
+  metadata.gz: 61fd9d81e7b8808f374f13e8859da5f875ae2d57e6438ece70f905d92e370955
+  data.tar.gz: 4d3ccb53cea8d3c09519c7ec960735bb1fb49b03f2d6afbab2fc56f6d6ecb3e2
 SHA512:
-  metadata.gz: 4fd19ad0474abdf115c39b24c595468b532cbb5fb97d85fc04da27612f070fe28daf5a367705319c81599ed22841e67cc94a35a416b2c31c387ab97134b3a3a1
-  data.tar.gz: c72936edfbc178ac88427a529104a17f5466e37d4ce8fcf26f2ce3927f2d3c8e6fac3c22049a622b0d167b5b47ae6d898d5021303641296a0846cba62ed0258a
+  metadata.gz: f5f9f06f4f98e1ecf052a39f608a09900631eaf9cd8338a3a1e58468e84c7e59858b673e74b9b944c20f89c9e575d8eebbb3e142778e6a95a4e13e6926fd7b44
+  data.tar.gz: dd9f9b8a273198cfb52a7a017fd607a49111e21611019112dcaeac919eaa5bc7fefdc9119191910f05ec7dcd54c7f6aa5fa0ae856570fa8547301c5457d93027

data/ext/optify_ruby/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "optify_ruby"
-version = "0.17.0"
+version = "0.18.0"
 edition = "2021"
 
 description = "optify bindings for Ruby"
@@ -21,6 +21,6 @@ crate-type = ["cdylib"]
 
 [dependencies]
 magnus = "0.8.0"
-optify = { path = "../../../../rust/optify", version = "0.18.0" }
+optify = { path = "../../../../rust/optify", version = "0.19.0" }
 rb-sys = { version = "*", default-features = false, features = ["ruby-static"] }
 serde_json = "1.0.143"

data/ext/optify_ruby/src/lib.rs

@@ -2,69 +2,16 @@ use magnus::{function, method, prelude::*, wrap, Object, Ruby};
 use optify::builder::OptionsProviderBuilder;
 use optify::builder::OptionsRegistryBuilder;
 use optify::builder::OptionsWatcherBuilder;
-use optify::provider::GetOptionsPreferences;
 use optify::provider::OptionsProvider;
 use optify::provider::OptionsRegistry;
 use optify::provider::OptionsWatcher;
 use optify::schema::metadata::OptionsMetadata;
 use std::cell::RefCell;
 
-fn convert_preferences(
-    preferences: &MutGetOptionsPreferences,
-) -> std::cell::Ref<'_, GetOptionsPreferences> {
-    preferences.0.borrow()
-}
-
-#[derive(Clone)]
-#[wrap(class = "Optify::GetOptionsPreferences")]
-struct MutGetOptionsPreferences(RefCell<GetOptionsPreferences>);
-
-impl MutGetOptionsPreferences {
-    fn new() -> Self {
-        Self(RefCell::new(GetOptionsPreferences {
-            constraints: None,
-            overrides_json: None,
-            skip_feature_name_conversion: false,
-        }))
-    }
-
-    // Constraints Section
-    fn set_constraints_json(&self, constraints_json: Option<String>) {
-        self.0
-            .borrow_mut()
-            .set_constraints_json(constraints_json.as_deref());
-    }
-
-    fn get_constraints_json(&self) -> Option<String> {
-        self.0
-            .borrow()
-            .constraints
-            .as_ref()
-            .map(|c| serde_json::to_string(&c.constraints).unwrap())
-    }
-
-    // Overrides Section
-    fn has_overrides(&self) -> bool {
-        self.0.borrow().overrides_json.is_some()
-    }
-
-    fn set_overrides_json(&self, overrides: Option<String>) {
-        self.0.borrow_mut().overrides_json = overrides;
-    }
-
-    fn get_overrides_json(&self) -> Option<String> {
-        self.0.borrow().overrides_json.clone()
-    }
-
-    // Skip Feature Name Conversion Section
-    fn set_skip_feature_name_conversion(&self, value: bool) {
-        self.0.borrow_mut().skip_feature_name_conversion = value;
-    }
+use crate::preferences::convert_preferences;
+use crate::preferences::MutGetOptionsPreferences;
 
-    fn skip_feature_name_conversion(&self) -> bool {
-        self.0.borrow().skip_feature_name_conversion
-    }
-}
+mod preferences;
 
 #[wrap(class = "Optify::OptionsProvider")]
 struct WrappedOptionsProvider(RefCell<OptionsProvider>);
@@ -180,6 +127,23 @@ impl WrappedOptionsProvider {
         serde_json::to_string(&self.0.borrow().get_features_with_metadata()).unwrap()
     }
 
+    fn get_filtered_features(
+        ruby: &Ruby,
+        rb_self: &Self,
+        feature_names: Vec<String>,
+        preferences: &MutGetOptionsPreferences,
+    ) -> Result<Vec<String>, magnus::Error> {
+        let preferences = &convert_preferences(preferences);
+        match rb_self
+            .0
+            .borrow()
+            .get_filtered_feature_names(&feature_names, Some(preferences))
+        {
+            Ok(features) => Ok(features),
+            Err(e) => Err(magnus::Error::new(ruby.exception_runtime_error(), e)),
+        }
+    }
+
     // Return a string because it wasn't clear how to return a type defined in Rust despite looking at docs and trying a few examples.
     fn get_options_json(
         ruby: &Ruby,
@@ -352,6 +316,23 @@ impl WrappedOptionsWatcher {
         serde_json::to_string(&self.0.borrow().get_features_with_metadata()).unwrap()
     }
 
+    fn get_filtered_features(
+        ruby: &Ruby,
+        rb_self: &Self,
+        feature_names: Vec<String>,
+        preferences: &MutGetOptionsPreferences,
+    ) -> Result<Vec<String>, magnus::Error> {
+        let preferences = &convert_preferences(preferences);
+        match rb_self
+            .0
+            .borrow()
+            .get_filtered_feature_names(&feature_names, Some(preferences))
+        {
+            Ok(features) => Ok(features),
+            Err(e) => Err(magnus::Error::new(ruby.exception_runtime_error(), e)),
+        }
+    }
+
     fn get_options_json(
         ruby: &Ruby,
         rb_self: &Self,
@@ -465,6 +446,10 @@ fn init(ruby: &Ruby) -> Result<(), magnus::Error> {
         "get_canonical_feature_name",
         method!(WrappedOptionsProvider::get_canonical_feature_name, 1),
     )?;
+    provider_class.define_method(
+        "get_filtered_features",
+        method!(WrappedOptionsProvider::get_filtered_features, 2),
+    )?;
     provider_class.define_method(
         "get_options_json",
         method!(WrappedOptionsProvider::get_options_json, 2),
@@ -565,6 +550,10 @@ fn init(ruby: &Ruby) -> Result<(), magnus::Error> {
         "get_canonical_feature_name",
         method!(WrappedOptionsWatcher::get_canonical_feature_name, 1),
     )?;
+    watcher_class.define_method(
+        "get_filtered_features",
+        method!(WrappedOptionsWatcher::get_filtered_features, 2),
+    )?;
     watcher_class.define_method(
         "get_options_json",
         method!(WrappedOptionsWatcher::get_options_json, 2),

data/ext/optify_ruby/src/preferences.rs

@@ -0,0 +1,60 @@
+use magnus::wrap;
+use optify::provider::GetOptionsPreferences;
+use std::cell::RefCell;
+
+pub fn convert_preferences(
+    preferences: &MutGetOptionsPreferences,
+) -> std::cell::Ref<'_, GetOptionsPreferences> {
+    preferences.0.borrow()
+}
+
+#[derive(Clone)]
+#[wrap(class = "Optify::GetOptionsPreferences")]
+pub struct MutGetOptionsPreferences(RefCell<GetOptionsPreferences>);
+
+impl MutGetOptionsPreferences {
+    pub fn new() -> Self {
+        Self(RefCell::new(GetOptionsPreferences {
+            constraints: None,
+            overrides_json: None,
+            skip_feature_name_conversion: false,
+        }))
+    }
+
+    // Constraints Section
+    pub fn set_constraints_json(&self, constraints_json: Option<String>) {
+        self.0
+            .borrow_mut()
+            .set_constraints_json(constraints_json.as_deref());
+    }
+
+    pub fn get_constraints_json(&self) -> Option<String> {
+        self.0
+            .borrow()
+            .constraints
+            .as_ref()
+            .map(|c| serde_json::to_string(&c.constraints).unwrap())
+    }
+
+    // Overrides Section
+    pub fn has_overrides(&self) -> bool {
+        self.0.borrow().overrides_json.is_some()
+    }
+
+    pub fn set_overrides_json(&self, overrides: Option<String>) {
+        self.0.borrow_mut().overrides_json = overrides;
+    }
+
+    pub fn get_overrides_json(&self) -> Option<String> {
+        self.0.borrow().overrides_json.clone()
+    }
+
+    // Skip Feature Name Conversion Section
+    pub fn set_skip_feature_name_conversion(&self, value: bool) {
+        self.0.borrow_mut().skip_feature_name_conversion = value;
+    }
+
+    pub fn skip_feature_name_conversion(&self) -> bool {
+        self.0.borrow().skip_feature_name_conversion
+    }
+}

data/lib/optify.rb

@@ -15,7 +15,7 @@ require_relative 'optify_ruby/watcher_implementation'
 # but that doesn't work when building for multiple versions of Ruby.
 # So we have to do this which is similar to something from 'https://github.com/matsadler/halton-rb/blob/main/lib/halton.rb'.
 begin
-  ruby_version = T.must(RUBY_VERSION.match(/\d+\.\d+/))[0]
+  ruby_version = RUBY_VERSION.match(/\d+\.\d+/)&.[](0)
   require_relative "optify_ruby/#{ruby_version}/optify_ruby"
 rescue LoadError
   begin

data/lib/optify_ruby/provider_module.rb

@@ -6,8 +6,6 @@ require 'sorbet-runtime'
 module Optify
   # @!visibility private
   module ProviderModule
-    extend T::Sig
-
     #: (Array[String] feature_names) -> Array[String]
     def get_canonical_feature_names(feature_names)
       # Try to optimize a typical case where there are just a few features.
@@ -40,7 +38,7 @@ module Optify
       end
       result.freeze
 
-      @features_with_metadata = T.let(result, T.nilable(T::Hash[String, OptionsMetadata]))
+      @features_with_metadata = result
       result
     end
 
@@ -71,13 +69,14 @@ module Optify
                        get_options_json(key, feature_names)
                      end
       hash = JSON.parse(options_json)
-      T.unsafe(config_class).from_hash(hash)
+      config_class #: as untyped
+        .from_hash(hash)
     end
 
     #: -> void
     def _init
-      @cache = T.let({}, T.nilable(T::Hash[T.untyped, T.untyped]))
-      @features_with_metadata = T.let(nil, T.nilable(T::Hash[String, OptionsMetadata]))
+      @cache = {} #: Hash[untyped, untyped]?
+      @features_with_metadata = nil #: Hash[String, OptionsMetadata]?
     end
 
     NOT_FOUND_IN_CACHE_SENTINEL = Object.new
@@ -93,28 +92,31 @@ module Optify
       end
 
       init unless @cache
-      feature_names = get_canonical_feature_names(feature_names) unless preferences&.skip_feature_name_conversion
 
-      cache_key = [key, feature_names, preferences&.constraints_json, config_class]
-      result = @cache&.fetch(cache_key, NOT_FOUND_IN_CACHE_SENTINEL)
+      if preferences.nil?
+        feature_names = get_filtered_features(feature_names, GetOptionsPreferences.new)
+      elsif !preferences.skip_feature_name_conversion || preferences.constraints_json
+        feature_names = get_filtered_features(feature_names, preferences)
+      end
+
+      # Features are filtered, so we don't need the constraints in the cache key.
+      cache_key = [key, feature_names, config_class]
+      result = @cache #: as !nil
+               .fetch(cache_key, NOT_FOUND_IN_CACHE_SENTINEL)
       return result unless result.equal?(NOT_FOUND_IN_CACHE_SENTINEL)
 
       # Handle a cache miss.
 
-      # We can avoid converting the features names because they're already converted, if that was desired.
-      if preferences.nil?
-        preferences = GetOptionsPreferences.new
-        preferences.skip_feature_name_conversion = true
-      else
-        # Indeed the copying of preferences could be wasteful, but this only happens on a cache miss
-        # and when no custom preferences are provided.
-        preferences = preferences.dup
-        preferences.skip_feature_name_conversion = true
-      end
+      # We can avoid converting the features names because they're already converted from filtering above, if that was desired.
+      # We don't need the constraints because we filtered the features above.
+      # We already know there are no overrides because we checked above.
+      preferences = GetOptionsPreferences.new
+      preferences.skip_feature_name_conversion = true
 
       result = get_options(key, feature_names, config_class, nil, preferences)
 
-      T.must(@cache)[cache_key] = result
+      @cache #: as !nil
+        .[]= cache_key, result
     end
   end
 end

data/lib/optify_ruby/watcher_implementation.rb

@@ -33,7 +33,7 @@ module Optify
     #: -> OptionsWatcher
     def init
       _init
-      @cache_creation_time = T.let(Time.now, T.nilable(Time))
+      @cache_creation_time = Time.now #: Time?
       self
     end
 

data/rbi/optify.rbi

@@ -183,6 +183,18 @@ module Optify
     sig { params(canonical_feature_name: String).returns(T.nilable(OptionsMetadata)) }
     def get_feature_metadata(canonical_feature_name); end
 
+    # Filters `feature_names` based on the preferences,
+    # such as the `preferences`'s constraints.
+    # Also converts the feature names to canonical feature names if `preferences.skip_feature_name_conversion` is `false`.
+    sig do
+      params(
+        feature_names: T::Array[String],
+        preferences: GetOptionsPreferences
+      )
+        .returns(T::Array[String])
+    end
+    def get_filtered_features(feature_names, preferences); end
+
     # Fetches options based on the provided key and feature names.
     #
     # @param key The key to fetch options for.

data/sig/optify.rbs

@@ -142,6 +142,8 @@ module Optify::ProviderModule
   # @return The metadata for the feature.
   def get_feature_metadata: (String canonical_feature_name) -> OptionsMetadata?
 
+  def get_filtered_features: (::Array[String] feature_names, GetOptionsPreferences preferences) -> ::Array[String]
+
   def get_options: [Config] (String key, ::Array[String] feature_names, T::Class[Config] config_class, ?CacheOptions? cache_options, ?Optify::GetOptionsPreferences? preferences) -> Config
 
   # Fetches options in JSON format based on the provided key and feature names.

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: optify-config
 version: !ruby/object:Gem::Version
-  version: 1.15.2
+  version: 1.16.0
 platform: ruby
 authors:
 - Justin D. Harris
 bindir: exe
 cert_chain: []
-date: 2025-09-03 00:00:00.000000000 Z
+date: 2025-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb_sys
@@ -118,6 +118,7 @@ files:
 - ext/optify_ruby/Cargo.toml
 - ext/optify_ruby/extconf.rb
 - ext/optify_ruby/src/lib.rs
+- ext/optify_ruby/src/preferences.rs
 - lib/optify.rb
 - lib/optify_ruby/base_config.rb
 - lib/optify_ruby/get_options_preferences.rb