optify-config 1.20.2 → 1.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7335de5a2522eb56b0b3a4c2ef2540eb975e4e0f10301b682c61d7b5bbab5a3
-  data.tar.gz: 6de81291c19127c46ed8930d293e11454f4976dc70886cae002e603ae162a74a
+  metadata.gz: 0f5aba57c1908b188670d8868f281564791a273f3de0a118621d7205f4d808d9
+  data.tar.gz: 908bb31b5563fba2d0a2cee76b2fcc25add2264adf15a3c64e9972b326999be1
 SHA512:
-  metadata.gz: d542032a0a6737744093a1b00e80e1023dd950215b6dc40d5624a028427a7261719300e5aa29757bfa9d162ec166007d296fc006a98e477948923ac2b4d2aa01
-  data.tar.gz: b9b6e49156a7c133f20fbc60278e52a6858b2fda19537e4014089f30081a17fa271e4ba78d70b9353138036a3dad00e2ba0e05c626387dec529e7bd277363654
+  metadata.gz: 3d2c67fd5590b716289ba4868e6d08c6c9ce8e9f9735838d636f770f275e105710cc136080a9a7714b9cd9c2df991f5c11c4a01808378d325a52d74f831b282a
+  data.tar.gz: 2393060b4834d29505a8a8ad4f683ca56031e335a02746551ea4cc00ec149de4ee283a280554383e384c0ca0bf4c7286617170641cdeea0be064833cef338114

data/ext/optify_ruby/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "optify_ruby"
-version = "0.22.1"
+version = "0.23.0"
 edition = "2021"
 
 description = "optify bindings for Ruby"
@@ -21,6 +21,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 magnus = "0.8.2"
-optify = "0.20.5"
+# Can't put a relative path here because then others can't install the source gem: https://github.com/juharris/optify/pull/176
+optify = "0.21.0"
 rb-sys = { version = "0.9.124", default-features = false, features = ["ruby-static"] }
 serde_json = "1.0.143"

data/ext/optify_ruby/src/lib.rs

@@ -290,6 +290,23 @@ impl WrappedOptionsProvider {
     fn has_conditions(&self, canonical_feature_name: String) -> bool {
         self.0.borrow().has_conditions(&canonical_feature_name)
     }
+
+    fn map_feature_names(
+        ruby: &Ruby,
+        rb_self: &Self,
+        feature_names: Vec<String>,
+        preferences: &MutGetOptionsPreferences,
+    ) -> Result<Vec<Option<String>>, magnus::Error> {
+        let preferences = &convert_preferences(preferences);
+        match rb_self
+            .0
+            .borrow()
+            .map_feature_names(&feature_names, Some(preferences))
+        {
+            Ok(features) => Ok(features),
+            Err(e) => Err(map_feature_error(ruby, e)),
+        }
+    }
 }
 
 #[derive(Clone)]
@@ -538,6 +555,23 @@ impl WrappedOptionsWatcher {
     fn last_modified(&self) -> std::time::SystemTime {
         self.0.borrow().last_modified()
     }
+
+    fn map_feature_names(
+        ruby: &Ruby,
+        rb_self: &Self,
+        feature_names: Vec<String>,
+        preferences: &MutGetOptionsPreferences,
+    ) -> Result<Vec<Option<String>>, magnus::Error> {
+        let preferences = &convert_preferences(preferences);
+        match rb_self
+            .0
+            .borrow()
+            .map_feature_names(&feature_names, Some(preferences))
+        {
+            Ok(features) => Ok(features),
+            Err(e) => Err(map_feature_error(ruby, e)),
+        }
+    }
 }
 
 #[derive(Clone)]
@@ -643,6 +677,10 @@ fn init(ruby: &Ruby) -> Result<(), magnus::Error> {
         "conditions?",
         method!(WrappedOptionsProvider::has_conditions, 1),
     )?;
+    provider_class.define_method(
+        "map_feature_names",
+        method!(WrappedOptionsProvider::map_feature_names, 2),
+    )?;
 
     // Private methods for internal use.
     provider_class.define_private_method(
@@ -782,6 +820,10 @@ fn init(ruby: &Ruby) -> Result<(), magnus::Error> {
         "last_modified",
         method!(WrappedOptionsWatcher::last_modified, 0),
     )?;
+    watcher_class.define_method(
+        "map_feature_names",
+        method!(WrappedOptionsWatcher::map_feature_names, 2),
+    )?;
 
     // Private methods for internal use.
     watcher_class.define_private_method(

data/lib/optify_ruby/cache_init_options.rb

@@ -23,7 +23,7 @@ module Optify
 
     # Initializes the cache options.
     # Defaults to a non-thread-safe unlimited size cache for backwards compatibility
-    # with how this library was originally configured with an unbounded hash as the case.
+    # with how this library was originally configured with an unbounded hash as the base.
     # @param mode A value from `CacheMode`.
     #
     #: (

data/rbi/optify.rbi

@@ -43,7 +43,7 @@ module Optify
 
     # Initializes the cache options.
     # Defaults to a non-thread-safe unlimited size cache for backwards compatibility
-    # with how this library was originally configured with an unbounded hash as the case.
+    # with how this library was originally configured with an unbounded hash as the base.
     # @param mode A value from `CacheMode`.
     sig do
       params(
@@ -196,6 +196,15 @@ module Optify
   # Some of the methods shown within this module are implemented in Rust
   # and are declared in this common module to avoid duplicate declarations in different classes.
   module ProviderModule
+    # @param canonical_feature_name [String] A canonical feature name
+    # @return Whether the feature has conditions.
+    sig { params(canonical_feature_name: String).returns(T::Boolean) }
+    def conditions?(canonical_feature_name); end
+
+    # @return All of the keys and values for the the features.
+    sig { returns(String) }
+    def features_with_metadata_json; end
+
     # Map an alias or canonical feature name (perhaps derived from a file name) to a canonical feature name.
     # Canonical feature names map to themselves.
     #
@@ -292,11 +301,6 @@ module Optify
     end
     def get_options_json_with_preferences(key, feature_names, preferences); end
 
-    # @param canonical_feature_name [String] A canonical feature name
-    # @return Whether the feature has conditions.
-    sig { params(canonical_feature_name: String).returns(T::Boolean) }
-    def conditions?(canonical_feature_name); end
-
     # (Optional) Eagerly initializes the cache.
     # @return `self`.
     sig do
@@ -305,6 +309,18 @@ module Optify
     end
     def init(cache_init_options = nil); end
 
+    # Filters `feature_names` based on the preferences,
+    # such as the `preferences`'s constraints.
+    # Returns an array matching the input order where each element is the canonical name if the feature was kept, or nil if it was filtered out.
+    sig do
+      params(
+        feature_names: T::Array[String],
+        preferences: GetOptionsPreferences,
+      )
+        .returns(T::Array[T.nilable(String)])
+    end
+    def map_feature_names(feature_names, preferences); end
+
     private
 
     # Map aliases or canonical feature names (perhaps derived from a file names) to the canonical feature names.
@@ -319,10 +335,6 @@ module Optify
     # @return The metadata for the feature.
     sig { params(canonical_feature_name: String).returns(T.nilable(String)) }
     def get_feature_metadata_json(canonical_feature_name); end
-
-    # @return All of the keys and values for the the features.
-    sig { returns(String) }
-    def features_with_metadata_json; end
   end
 
   # Provides configurations based on keys and enabled feature names.

data/sig/optify.rbs

@@ -139,6 +139,13 @@ end
 # Some of the methods shown within this module are implemented in Rust
 # and are declared in this common module to avoid duplicate declarations in different classes.
 module Optify::ProviderModule
+  # @param canonical_feature_name [String] A canonical feature name
+  # @return Whether the feature has conditions.
+  def conditions?: (String canonical_feature_name) -> bool
+
+  # @return All of the keys and values for the the features.
+  def features_with_metadata_json: () -> String
+
   # Map an alias or canonical feature name (perhaps derived from a file name) to a canonical feature name.
   # Canonical feature names map to themselves.
   #
@@ -179,12 +186,10 @@ module Optify::ProviderModule
 
   def get_options_json_with_preferences: (String key, ::Array[String] feature_names, GetOptionsPreferences preferences) -> String
 
-  # @param canonical_feature_name [String] A canonical feature name
-  # @return Whether the feature has conditions.
-  def conditions?: (String canonical_feature_name) -> bool
-
   def init: (?CacheInitOptions? cache_init_options) -> self
 
+  def map_feature_names: (::Array[String] feature_names, GetOptionsPreferences preferences) -> ::Array[String?]
+
   # Map aliases or canonical feature names (perhaps derived from a file names) to the canonical feature names.
   # Canonical feature names map to themselves.
   # This implementation calls the Rust implementation directly.
@@ -195,9 +200,6 @@ module Optify::ProviderModule
 
   # @return The metadata for the feature.
   def get_feature_metadata_json: (String canonical_feature_name) -> String?
-
-  # @return All of the keys and values for the the features.
-  def features_with_metadata_json: () -> String
 end
 
 # Provides configurations based on keys and enabled feature names.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: optify-config
 version: !ruby/object:Gem::Version
-  version: 1.20.2
+  version: 1.21.0
 platform: ruby
 authors:
 - Justin D. Harris