facets 3.2.1 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e83c6730d1db66b68b3cad1ff1d18d522e33c0c967a92827fdcc1e90896fd9a0
-  data.tar.gz: e36061c5e9e99c9aa03ede727764012df8aa54758c29493d75950bb8ff98d14b
+  metadata.gz: da62aa5e36dc4d4fbe19984071e7f4bf38acc53a7812c285a50a36b714115f23
+  data.tar.gz: 7244c28aff76e1073f723148e6a9e3006246a26cd59c047dab8a2d8f765a3e3d
 SHA512:
-  metadata.gz: 65774ae87ae60eaf13b146db1403ba731df7b6c840c37602bb286e67fef3a4f474e0b32b7aee9f967d351667d0d3473627cf8c111113cb0013b7f811f334b5a7
-  data.tar.gz: 72a213e09c2ba90be9980f6cc300c46f5ba615cddb2e7149fee2c9d83a0b683870478632ee6dfb041dbe792303b9cd3ea7901ce9551a4148e12d3e33f7e6d7e8
+  metadata.gz: acc7199da1618757142fede6aece2bdbc324a7d8d95525f4ff40a0ef1085484ec42d3727eb3adcd65be3eccfa210e599d1488dafde8640b04375947b6df96c7b
+  data.tar.gz: 0e561c34ccac85af4fa6b1ce7c28a2396d4326ff75917b6fde31c6618be7cdb46c959fec59454b1a6b4df5a2c3a6812cae72c68ce5bd0a96714afa1dc43bd344

data/HISTORY.md

@@ -1,5 +1,32 @@
 # Facets Release History
 
+## 3.2.2 / 2026-06-15
+
+Patch release with cross-version fixes surfaced by CI on Ruby 3.1–3.4.
+
+Changes:
+
+* Bug Fixes
+
+  * Fix `Range.intersection` on Ruby 3.1 and 3.2. It relied on `Range#overlap?`,
+    which only exists in Ruby 3.3+; replaced with an explicit overlap test that
+    works on any Ruby and any comparable element type.
+  * Restore `Range#overlap?` for Ruby < 3.3. It was dropped in 3.2.0 (since Ruby
+    3.3 added a native one), which left 3.1/3.2 users without it. It is now
+    defined only when missing, so it never replaces the built-in on 3.3+.
+  * Widen `Binding#caller` and `Binding#caller_locations` to accept the optional
+    `length` argument (matching `Kernel#caller`/`#caller_locations`). The
+    too-narrow arity raised `ArgumentError` when `warn(uplevel:)` dispatched to
+    them under JRuby's pure-Ruby `warn`.
+
+* Internal
+
+  * Add `ostruct` to the test dependencies. `ostruct` is deprecated in Ruby 3.4
+    and removed from the default gems in Ruby 3.5, so it must be declared
+    explicitly. Facets' OpenStruct extensions (`require 'facets/ostruct'`) still
+    work, but now require the `ostruct` gem to be installed on Ruby 3.5+. These
+    extensions may be divested from Facets in a future release.
+
 ## 3.2.1 / 2026-06-14
 
 Patch release that fixes the broken 3.2.0 release. 3.2.0 shipped with stale

data/lib/core/facets/binding/caller.rb

@@ -4,14 +4,18 @@ class Binding
 
   # Returns the call stack, same format as Kernel#caller()
   #
-  def caller( skip=0 )
-    eval("caller(#{skip})")
+  # Accepts the same `(start, length)` arguments as Kernel#caller.
+  #
+  def caller( start=0, length=nil )
+    length ? eval("caller(#{start}, #{length})") : eval("caller(#{start})")
   end
 
   # Returns the call stack, same format as Kernel#caller_locations()
   #
-  def caller_locations( skip=0 )
-    eval("caller_locations(#{skip})")
+  # Accepts the same `(start, length)` arguments as Kernel#caller_locations.
+  #
+  def caller_locations( start=0, length=nil )
+    length ? eval("caller_locations(#{start}, #{length})") : eval("caller_locations(#{start})")
   end
 
   # Return the line number on which the binding was created.

data/lib/core/facets/range/intersection.rb

@@ -21,7 +21,8 @@ class Range
   def self.intersection(*ranges)
     return nil if ranges.empty?
     ranges.reduce do |result, r|
-      return nil unless result.overlap?(r)
+      # Manual overlap test (Range#overlap? is Ruby 3.3+; Facets targets 3.1+).
+      return nil unless result.first <= r.last && r.first <= result.last
       new_first = result.first > r.first ? result.first : r.first
       new_last  = result.last  < r.last  ? result.last  : r.last
       new_first..new_last

data/lib/core/facets/range/overlap.rb

@@ -0,0 +1,19 @@
+class Range
+
+  # Do two ranges overlap?
+  #
+  #   (1..5).overlap?(3..8)   #=> true
+  #   (1..5).overlap?(6..8)   #=> false
+  #
+  # Ruby 3.3 added a native Range#overlap?, so only define Facets' version
+  # on older Rubies that lack it -- this avoids replacing the built-in.
+  #
+  # CREDIT: Daniel Schierbeck, Brandon Keepers
+
+  unless method_defined?(:overlap?)
+    def overlap?(other)
+      include?(other.first) or other.include?(first)
+    end
+  end
+
+end

data/lib/core/facets/range.rb

@@ -1,4 +1,5 @@
 require_relative 'range/combine.rb'
+require_relative 'range/overlap.rb'
 #require_relative 'range/intersection.rb' # too new
 #require_relative 'range/quantile.rb'     # uncommon
 #require_relative 'range/op_add.rb'       # too new

data/lib/core/facets/version.rb

@@ -1,3 +1,3 @@
 module Facets
-  VERSION = '3.2.1'
+  VERSION = '3.2.2'
 end

data/lib/standard/facets/ostruct.rb

@@ -1,3 +1,13 @@
+# Facets' extensions to Ruby's OpenStruct.
+#
+# NOTE: `ostruct` is deprecated as of Ruby 3.4 and is no longer a default gem
+# as of Ruby 3.5 — it must be installed/declared explicitly to be available
+# (`gem install ostruct`, or add `ostruct` to your Gemfile/gemspec). The gem
+# itself still exists, so these extensions continue to work on top of it.
+#
+# Given OpenStruct's deprecation, Facets may divest these extensions in a
+# future release.
+
 require 'ostruct'
 require 'facets/ostruct/initialize'
 require 'facets/ostruct/to_ostruct'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: facets
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.2
 platform: ruby
 authors:
 - Thomas Sawyer
@@ -451,6 +451,7 @@ files:
 - lib/core/facets/range/nudge.rb
 - lib/core/facets/range/op_add.rb
 - lib/core/facets/range/op_sub.rb
+- lib/core/facets/range/overlap.rb
 - lib/core/facets/range/quantile.rb
 - lib/core/facets/range/to_rng.rb
 - lib/core/facets/range/umbrella.rb