facets 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc5a3121c6c373b29fdc3e515820f8e547d8b8a2fbfd0dde05cec51640960fa5
-  data.tar.gz: 2440d6fd114506decc8993153077c4bf98c5e6f372cbc2922ee253103d9c1c0e
+  metadata.gz: e83c6730d1db66b68b3cad1ff1d18d522e33c0c967a92827fdcc1e90896fd9a0
+  data.tar.gz: e36061c5e9e99c9aa03ede727764012df8aa54758c29493d75950bb8ff98d14b
 SHA512:
-  metadata.gz: 67499b78df8f8b5b1a005d10b029d7f0278d7b6d9db5207c458df59433cf3d9362bcd8b4a60dbb5b31eb003b1b814fe1509800224746e5b71bbc5c1796349dbe
-  data.tar.gz: 8270894f6568a4d5b9b654a293e5c385230dc48032e0c711d24aa544ba0b48b379856874b4805cd476256e570272ebad0ebe76a71b4f519be8e6fa7470f81590
+  metadata.gz: 65774ae87ae60eaf13b146db1403ba731df7b6c840c37602bb286e67fef3a4f474e0b32b7aee9f967d351667d0d3473627cf8c111113cb0013b7f811f334b5a7
+  data.tar.gz: 72a213e09c2ba90be9980f6cc300c46f5ba615cddb2e7149fee2c9d83a0b683870478632ee6dfb041dbe792303b9cd3ea7901ce9551a4148e12d3e33f7e6d7e8

data/HISTORY.md

@@ -1,5 +1,37 @@
 # Facets Release History
 
+## 3.2.1 / 2026-06-14
+
+Patch release that fixes the broken 3.2.0 release. 3.2.0 shipped with stale
+`require_relative` lines pointing at method files that had been removed or
+renamed, so `require 'facets'` raised `LoadError`. This restores loadability
+and adds a regression guard so it cannot recur. (The breaking-change and
+versioning concern raised in issue #314 is left for a future major release.)
+
+Changes:
+
+* New Features
+
+  * Add `OpenDSL` — build free-form, pluggable DSL modules from a block.
+  * Add `PIC` — COBOL-style edited-picture pattern matching as a simple
+    alternative to regular expressions.
+
+* Bug Fixes
+
+  * Fix `LoadError` on `require 'facets'`: remove stale `require_relative`
+    lines left pointing at removed method files, and correct the
+    `hash/to_proc` -> `hash/setter` require after the rename.
+    (issues #312, #315; PR#313)
+  * Fix `range.rb` requiring the removed `range/overlap`. (PR#318)
+  * Stop `Kernel::As` from redefining `object_id`, which emitted a
+    "redefining 'object_id' may cause serious problems" warning on load.
+    (issue #310)
+
+* Internal
+
+  * Add a load-path regression test that verifies every `require_relative`
+    target across the library resolves to an existing file.
+
 ## 3.2.0 / 2026-04-01
 
 Modernization release targeting Ruby 3.1+. Cleans up long-standing
@@ -19,8 +51,12 @@ Changes:
   * Add `Range.intersection` and `Range#intersection` for finding the shared
     region of multiple ranges. Works with any comparable type.
   * Add `Kernel#functor` — block-less method chaining via Functor, replaces `tap` override.
-  * Rename `Hash#to_proc` to `Hash#setter` (avoids clash with Ruby 2.3's `Hash#to_proc`
-    which does key lookup; Facets' version does attribute assignment).
+  * Stop overriding `Hash#to_proc` and provide its behavior as `Hash#setter`
+    instead. Facets' version built a Proc that assigns the hash's key/value
+    pairs as attributes on a target object, which conflicted with Ruby's own
+    `Hash#to_proc` (added in 2.3, does key lookup). Facets now cedes `to_proc`
+    to Ruby; use `Hash#setter` for the attribute-assignment behavior. Also
+    renamed the option `response:` to `safe:` and fixed a receiver check.
   * Consolidate `Array#arrange` and `Array#to_ranges`; `to_ranges` is now primary,
     `arrange` and `rangify` are aliases. Now handles mixed ranges and values.
   * Fix `Array#step` to start at index 0 (was n-1); add optional offset parameter.

data/README.md

@@ -1,8 +1,7 @@
 # Ruby Facets
 
-[![Gem Version](https://badge.fury.io/rb/facets.svg)](http://badge.fury.io/rb/facets)
-[![Build Status](https://secure.travis-ci.org/rubyworks/facets.svg)](http://travis-ci.org/rubyworks/facets)    
-[![Flattr Me](http://api.flattr.com/button/flattr-badge-large.png)](http://flattr.com/thing/324911/Rubyworks-Ruby-Development-Fund)
+[![Gem Version](https://badge.fury.io/rb/facets.svg)](https://rubygems.org/gems/facets)
+[![CI](https://github.com/rubyworks/facets/actions/workflows/ci.yml/badge.svg)](https://github.com/rubyworks/facets/actions/workflows/ci.yml)
 
 
 *"ALL YOUR BASE ARE BELONG TO RUBY"*
@@ -10,7 +9,7 @@
 
 ## Introduction
 
-Ruby Facets is the premiere collection of general purpose method
+Ruby Facets is the premier collection of general purpose method
 extensions and standard additions for the Ruby programming language.
 
 Facets houses the largest single collection of methods available for
@@ -28,11 +27,10 @@ to a wide variety of usecases.
 
 ## Resources
 
-* Homepage: http://rubyworks.github.com/facets
-* Report Bugs: http://github.com/rubyworks/facets/issues
-* Mailing List: http://groups.google.com/group/facets-universal/topics
-* Wiki Pages: http://wiki.github.com/rubyworks/facets
-* Source Code: http://github.com/rubyworks/facets
+* Homepage: https://rubyworks.github.io/facets
+* Report Bugs: https://github.com/rubyworks/facets/issues
+* Wiki Pages: https://github.com/rubyworks/facets/wiki
+* Source Code: https://github.com/rubyworks/facets
 
 
 ## Documentation
@@ -45,7 +43,7 @@ it is important to remain aware of the source location of particular
 methods.
 
 For better organized online documentation, generated to separate core
-extensions from standard libraries, see the [Learn Facets](http://rubyworks.github.com/facets/learn.html) page on the website for links to available documentation.
+extensions from standard libraries, see the [Learn Facets](https://rubyworks.github.io/facets/learn.html) page on the website for links to available documentation.
 
 
 ## Installation
@@ -64,16 +62,9 @@ The easiest way to install is via RubyGems.
 
     $ gem install facets
 
-### Setup.rb
+### Requirements
 
-Facets can be installed the old-fashioned way using [Setup.rb](http://rubyworks.github.com/setup).
-Download and unpack the .tar.gz package and run setup.rb, like so:
-
-    $ tar -xvzf facets-2.x.x.tar.gz
-    $ cd facets-2.x.x
-    $ sudo setup.rb
-
-Facets 2.8+ requires Ruby 1.8.7 or higher. Facets 3.0+ requires Ruby 2.0.0 or higher.
+Facets 3.2+ requires Ruby 3.1 or higher.
 
 
 ## Mission
@@ -204,18 +195,13 @@ welcome. We want Ruby Facets to be of the highest quality.
 
 ## Development
 
-Facets uses the [Lemon](http://rubyworks.github.com/lemon) testing framework
-to handle unit testing, while [QED](http://rubyworks.github.com/qed) specifications
-provide tested documentation.
+Facets uses the [Lemon](https://rubyworks.github.io/lemon) testing framework
+to handle unit testing, while [QED](https://rubyworks.github.io/qed) specifications
+provide tested documentation. Run the test suite with [Rake](https://ruby.github.io/rake/):
+
+    $ rake test
 
-Facets uses [Detroit](http://detroit.github.com) and [Rulebow](http://rubyworks.github.com/rulebow)
-build tools. Detroit is a life-cycle tool and Rulebow is a continuous integration tool. These
-tools, via the `Assembly` and `Rulebook` scripts respectively, sometimes use other tools such
-as [Mast](http://rubyworks.github.com/mast) and [Indexer](http://rubyworks.github.com/indexer).
-In addition we support [Rake](https://ruby.github.io/rake/) and [Guard](http://guardgem.org/)
-build tools, which most developers are familiar with.
-Note, that while these build tools can be easy circumvented, the Mast and Indexer tools are
-necessary to prepare Facets for release.
+Continuous integration runs on GitHub Actions (see `.github/workflows/ci.yml`).
 
 
 ## Authors
@@ -263,5 +249,5 @@ code under such license, with appropriate credit citations.
 
 Ruby Facets, Copyright (c) 2005 Rubyworks
 
-Do you Ruby? (http://ruby-lang.org)
+Do you Ruby? (https://ruby-lang.org)
 

data/lib/core/facets/array.rb

@@ -43,7 +43,7 @@ require_relative 'array/split.rb'
 require_relative 'array/squeeze.rb'
 require_relative 'array/store.rb'
 require_relative 'array/thru.rb'
-require_relative 'array/to_h.rb'
+#require_relative 'array/to_h.rb'  # removed: now provided by Ruby
 require_relative 'array/traverse.rb'
 require_relative 'array/uniq_by.rb'
 

data/lib/core/facets/dir.rb

@@ -1,6 +1,6 @@
 require_relative 'dir/ascend.rb'
 require_relative 'dir/descend.rb'
-require_relative 'dir/each_child.rb'
+#require_relative 'dir/each_child.rb'  # removed: now provided by Ruby
 require_relative 'dir/multiglob.rb'
 require_relative 'dir/parent.rb'
 require_relative 'dir/recurse.rb'

data/lib/core/facets/enumerable.rb

@@ -9,7 +9,7 @@ require_relative 'enumerable/every.rb'
 require_relative 'enumerable/ewise.rb'
 require_relative 'enumerable/exclude.rb'
 require_relative 'enumerable/expand.rb'
-require_relative 'enumerable/filter.rb'
+#require_relative 'enumerable/filter.rb'  # removed: now provided by Ruby
 require_relative 'enumerable/find_yield.rb'
 require_relative 'enumerable/frequency.rb'
 require_relative 'enumerable/graph.rb'
@@ -31,7 +31,7 @@ require_relative 'enumerable/per.rb'
 require_relative 'enumerable/purge.rb'
 require_relative 'enumerable/recursively.rb'
 require_relative 'enumerable/squeeze.rb'
-require_relative 'enumerable/sum.rb'
+#require_relative 'enumerable/sum.rb'  # removed: now provided by Ruby
 require_relative 'enumerable/value_by'
 #require_relative 'enumerable/unassociate.rb'
 require_relative 'enumerable/uniq_by.rb'

data/lib/core/facets/essentials.rb

@@ -16,7 +16,7 @@ require_relative 'kernel/false'
 require_relative 'kernel/true'
 
 ### Object
-require_relative 'object/itself'
+#require_relative 'object/itself'  # removed: now provided by Ruby
 
 ### Array
 require_relative 'array/delete_values'
@@ -37,11 +37,11 @@ require_relative 'enumerable/graph'
 require_relative 'enumerable/value_by'
 
 ### File
-require_relative 'file/write'
+#require_relative 'file/write'  # removed: now provided by Ruby
 
 ### Hash
 require_relative 'hash/autonew'
-require_relative 'hash/compact'
+#require_relative 'hash/compact'  # removed: now provided by Ruby
 #require_relative 'hash/data'
 require_relative 'hash/delete_values'
 require_relative 'hash/except'

data/lib/core/facets/file.rb

@@ -11,6 +11,6 @@ require_relative 'file/rootname.rb'
 require_relative 'file/sanitize.rb'
 require_relative 'file/split_all.rb'
 require_relative 'file/split_root.rb'
-require_relative 'file/write.rb'
+#require_relative 'file/write.rb'  # removed: now provided by Ruby
 require_relative 'file/writelines.rb'
 

data/lib/core/facets/hash.rb

@@ -40,7 +40,7 @@ require_relative 'hash/swap.rb'
 require_relative 'hash/symbolize_keys.rb'
 require_relative 'hash/to_mod.rb'
 require_relative 'hash/to_options.rb'
-require_relative 'hash/to_proc.rb'
+require_relative 'hash/setter.rb'
 require_relative 'hash/to_struct.rb'
 require_relative 'hash/traverse.rb'
 require_relative 'hash/update.rb'

data/lib/core/facets/kernel/as.rb

@@ -99,8 +99,8 @@ class As #:nodoc:
     private :cache
   end
 
-  # Privatize all methods except #binding an operators.
-  private(*instance_methods.select { |m| m !~ /(^__|^\W|^binding$)/ })
+  # Privatize all methods except #binding, #object_id and operators.
+  private(*instance_methods.select { |m| m !~ /(^__|^\W|^binding$|^object_id$)/ })
 
   def initialize(subject, ancestor)
     @subject = subject

data/lib/core/facets/matchdata.rb

@@ -1,3 +1,3 @@
-require_relative 'matchdata/match.rb'
+#require_relative 'matchdata/match.rb'  # removed: now provided by Ruby
 require_relative 'matchdata/matchset.rb'
 

data/lib/core/facets/numeric.rb

@@ -1,8 +1,8 @@
 require_relative 'numeric/approx.rb'
 require_relative 'numeric/distance.rb'
 require_relative 'numeric/length.rb'
-require_relative 'numeric/negative.rb'
-require_relative 'numeric/positive.rb'
+#require_relative 'numeric/negative.rb'  # removed: now provided by Ruby
+#require_relative 'numeric/positive.rb'  # removed: now provided by Ruby
 require_relative 'numeric/round_to.rb'
 require_relative 'numeric/spacing.rb'
 

data/lib/core/facets/object.rb

@@ -1,7 +1,7 @@
 # TODO: Is there a good reason for these to be here instead of in Kernel module?
 require_relative 'object/clone.rb'
 require_relative 'object/dup.rb'
-require_relative 'object/itself.rb'
+#require_relative 'object/itself.rb'  # removed: now provided by Ruby
 require_relative 'object/object_state.rb'
-require_relative 'object/try_dup.rb'
+#require_relative 'object/try_dup.rb'  # removed
 

data/lib/core/facets/process.rb

@@ -1,2 +1,2 @@
-require_relative 'process/daemon.rb'
+#require_relative 'process/daemon.rb'  # removed: now provided by Ruby
 

data/lib/core/facets/range.rb

@@ -1,5 +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
 #require_relative 'range/op_sub.rb'       # too new

data/lib/core/facets/symbol.rb

@@ -8,7 +8,7 @@ require_relative 'symbol/op_div.rb'
 require_relative 'symbol/plain.rb'
 require_relative 'symbol/query.rb'
 require_relative 'symbol/setter.rb'
-require_relative 'symbol/succ.rb'
+#require_relative 'symbol/succ.rb'  # removed: now provided by Ruby
 require_relative 'symbol/thrown.rb'
 require_relative 'symbol/variablize.rb'
 

data/lib/core/facets/version.rb

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

data/lib/standard/facets/opendsl.rb

@@ -0,0 +1,33 @@
+# OpenDSL is a clever way to create a plugable
+# free-form domain specific language.
+#
+#   Example = OpenDSL.new do
+#     size do
+#       100
+#     end
+#   end
+#
+#   class Foo
+#     include Example
+#   end
+#
+#   Foo.new.size  #=> 100
+#
+class OpenDSL < Module
+
+  #
+  def initialize(&block)
+    instance_eval(&block) if block_given?
+  end
+
+  #
+  def method_missing(s, *a, &b)
+    if block_given?
+      define_method(s, &b)
+    else
+      super(s, *a, &b)
+    end
+  end
+
+end
+

data/lib/standard/facets/pic.rb

@@ -0,0 +1,173 @@
+# PIC - Pattern matching based on COBOL-style Edited Pictures.
+#
+# PIC provides a simple alternative to regular expressions for common
+# data format matching. It uses single-character codes to describe the
+# expected format of a string, inspired by COBOL's PICTURE clause.
+#
+# == Picture Characters
+#
+# The following picture characters are supported:
+#
+#   X - Any character (equivalent to regex `.`)
+#   9 - Any digit (equivalent to regex `\d`)
+#   Z - Zero or more digits (equivalent to regex `\d*`)
+#   0 - Any digit (equivalent to regex `\d`)
+#   A - Any letter, upper or lower case (equivalent to regex `[A-Za-z]`)
+#   W - Any word character (equivalent to regex `\w`)
+#   . - Literal period
+#   , - Literal comma
+#   - - Literal hyphen
+#   / - Literal forward slash
+#
+# == Repetition
+#
+# Any picture character can be followed by a count in brackets:
+#
+#   9[3]       - Exactly 3 digits (e.g. `\d{3}`)
+#   9[2,4]     - Between 2 and 4 digits (e.g. `\d{2,4}`)
+#   9[2..4]    - Same as above, alternate syntax
+#
+# == Usage
+#
+#   require 'pic'
+#
+#   # Simple currency pattern
+#   PIC['Z.99'].to_re        #=> /\d*\.\d\d/
+#
+#   # US phone number
+#   PIC['9[3]-9[3]-9[4]'].to_re  #=> /\d{3}\-\d{3}\-\d{4}/
+#
+#   # Match against a string
+#   PIC['99/99/9999'] =~ '12/25/2025'  #=> 0 (match)
+#
+# == Reference
+#
+# Based on the concept of Edited Pictures from COBOL.
+# See: http://www.csis.ul.ie/cobol/course/EditedPics.htm
+#
+# Copyright (c) 2011 Rubyworks (BSD-2-Clause)
+#
+module PIC
+
+  # Shortcut to `PIC::Template.new(pic)`.
+  #
+  # @param [String] pic
+  #   A picture string describing the expected format.
+  #
+  # @return [PIC::Template]
+  #
+  # @example
+  #   PIC['Z.99'].to_re  #=> /\d*\.\d\d/
+  #
+  def self.[](pic)
+    Template.new(pic)
+  end
+
+  # Template class encapsulates a picture string, converts it to a
+  # regular expression, and delegates to it for matching.
+  #
+  # @example
+  #   t = PIC::Template.new('9[3]-9[3]-9[4]')
+  #   t.to_re  #=> /\d{3}\-\d{3}\-\d{4}/
+  #   t =~ '555-123-4567'  #=> 0
+  #
+  class Template
+
+    # New pic template.
+    #
+    # @param [String] pic
+    #   Picture string to use for matching.
+    #
+    def initialize(pic)
+      @pic = pic
+    end
+
+    # The picture string.
+    #
+    # @return [String]
+    #
+    attr :pic
+
+    # Convert picture to a regular expression.
+    #
+    # @return [Regexp]
+    #
+    # @example
+    #   PIC::Template.new('99/99/9999').to_re  #=> /\d\d\/\d\d\/\d\d\d\d/
+    #
+    def to_re
+      re = ''
+      pic.scan(SCAN) do |s,c|
+        re << remap(s) + recnt(c)
+      end
+      Regexp.new(re)
+    end
+
+    # Alias for `#to_re`.
+    alias_method :to_regexp, :to_re
+
+    # Match picture against a given string.
+    #
+    # @param [String] string
+    #   String to match picture against.
+    #
+    # @return [Integer, nil] index position of match, or nil.
+    #
+    def =~(string)
+      to_re =~ string.to_str
+    end
+
+    alias === =~
+
+    # Check for non-match of the picture against a given string.
+    #
+    # @param [String] string
+    #   String to match picture against.
+    #
+    # @return [Boolean]
+    #
+    def !~(string)
+      to_re !~ string.to_str
+    end
+
+  private
+
+    # Map a picture character to its regex equivalent.
+    def remap(s)
+      REMAP[s] || raise(ArgumentError, "unknown picture character: #{s}")
+    end
+
+    # Convert a bracket count to a regex quantifier.
+    def recnt(c)
+      return '' unless c
+
+      case c
+      when /\[(\d+)\.\.(\d+)\]/
+        '{'+$1+','+$2+'}'
+      when /\[(\d+)\,(\d+)\]/
+        '{'+$1+','+$2+'}'
+      when /\[(\d+)\]/
+        '{'+$1+'}'
+      end
+    end
+
+    # Scan pattern for parsing picture strings.
+    SCAN = /(\S)(\[.*?\])?/
+
+    # Mapping of picture characters to regex fragments.
+    REMAP = {
+      'X' => '.',
+      '9' => '\d',
+      'Z' => '\d*',
+      '0' => '\d',
+      'A' => '[A-Za-z]',
+      'W' => '\w',
+      '.' => '\.',
+      ',' => '\,',
+      '-' => '\-',
+      '/' => '\/'
+    }
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: facets
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Thomas Sawyer
@@ -682,6 +682,7 @@ files:
 - lib/standard/facets/multiton.rb
 - lib/standard/facets/net/http.rb
 - lib/standard/facets/nullclass.rb
+- lib/standard/facets/opendsl.rb
 - lib/standard/facets/opesc.rb
 - lib/standard/facets/ostruct.rb
 - lib/standard/facets/ostruct/initialize.rb
@@ -706,6 +707,7 @@ files:
 - lib/standard/facets/pathname/uptodate.rb
 - lib/standard/facets/pathname/visit.rb
 - lib/standard/facets/pathname/work.rb
+- lib/standard/facets/pic.rb
 - lib/standard/facets/platform.rb
 - lib/standard/facets/random.rb
 - lib/standard/facets/rbconfig.rb