class2 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bfd5b014d465ba372f6886d798d8a2e68eb233d4906b326302d77dceb331671
-  data.tar.gz: cd6aa6212aab92a1c32f64ef9e17de551cdb4e6ce68293efca155cc649520068
+  metadata.gz: 70badfe7a9fb6e6ad1df0f513ffc6bd4a322ab559457b62c810c54949b6862f8
+  data.tar.gz: c9feafd17d6e2375b868b22e87f4bac8d83db1dc26b538ff7ad13fd36d71d3f0
 SHA512:
-  metadata.gz: 90dff1bc730f190875bfe3b72c1d8abde282a5a394d3c95ff8760bb79008b32e39c79baca7a3e67b8ae187a9de5bfa87adedc23837850f44cc9b58c049852568
-  data.tar.gz: 27326bddbefad990d43801f49b23885a97fbeda319329959933eaaca8a35d8e6692b5daa03d564795c60d54633703e1f4297b147edb77f68d13b98c9ebc38cf4
+  metadata.gz: 32006d461e4e85a7c7b04c60ce9f388b670d55b3a1607afc8e2ab017b5f771aa949a411505ae7a0822c5a023865bf4e7260d79cd9997e4a73ceaa320b492bf35
+  data.tar.gz: ae9e57e7b101a98c2c9bece0ca8d583f6022acc81b5e293a2c0e540d8b65e128d9d2ae589c826c9aeb0fb45fb30534e43f423e9b1207eb5747f724da00ef8633

data/.github/workflows/ci.yml

@@ -0,0 +1,25 @@
+name: CI
+
+on:
+  push:
+    branches: ["**"]
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ["2.7", "3.0", "3.1", "3.2", "3.3", "3.4", "4.0"]
+
+    steps:
+      - uses: actions/checkout@v7
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Run the default task
+        run: bundle exec rake

data/Changes

@@ -1,3 +1,11 @@
+2026-09-16  v0.7.0
+--------------------
+* Drop ActiveSupport for inflections and use dry-inflector
+
+2026-09-16  v0.6.1
+--------------------
+* Add Class2::Inflector wrapper
+
 2024-10-15  v0.6.0
 --------------------
 * Bug fix: autoloading in data section with namespace

data/README.md

@@ -124,6 +124,32 @@ For more info on accessor formats and JSON see:
 * [`Class2::UpperCamelCase`](https://www.rubydoc.info/gems/class2/Class2/UpperCamelCase)
 * [`Class2::LowerCamelCase`](https://www.rubydoc.info/gems/class2/Class2/LowerCamelCase)
 
+[Using Ruby-specific JSON extensions](https://github.com/ruby/json?tab=readme-ov-file#usage) you can define
+Ruby types in the JSON class2 will use for type conversion:
+
+```json
+{
+  "your_class": {
+    "id": 0,
+    "name": "string",
+    "updated_at": {"json_class":"Time","s":0,"n":0},
+  }
+}
+```
+
+Then require the appropriate JSON conversion class:
+
+```rb
+require "json/add/time"
+```
+
+This will result in class2 creating a `MyClass` class with the following:
+
+- `#id` returning an `Integer` instance
+- `#name` returning a `String` instance
+- `#updated_at` returning a `Time` instance
+
+This will work for any [supported conversions](#conversions).
 
 You can also autoload a definition from a DATA section:
 
@@ -165,8 +191,7 @@ To control the creation of the top-level methods, see the
 
 #### Naming
 
-`class2` uses
-[`String#classify`](http://api.rubyonrails.org/classes/String.html#method-i-classify)
+`class2` uses [`dry-inflector`](https://github.com/dry-rb/dry-inflector)
 to turn keys into class names: `:foo` will be `Foo`, `:foo_bars` will
 be `FooBar`.
 
@@ -176,7 +201,9 @@ used to derive the class names from the plural attribute names. An
 `:addresses` key with an `Array` value will result in a class named
 `Address` being created.
 
-Plurality is determined by [`String#pluralize`](http://api.rubyonrails.org/classes/String.html#method-i-pluralize).
+Plurality is determined by
+[`dry-inflector`](https://github.com/dry-rb/dry-inflector) loaded with
+ActiveSupport 6.1's rules. No `String` methods are added.
 
 #### Conversions
 
@@ -191,6 +218,7 @@ You can use any of these classes or their instances in your class definitions:
 * `Float`
 * `Hash`
 * `Integer`
+* `Time`
 * `TrueClass`/`FalseClass` - either one will cause a boolean conversion
 
 Custom conversions are possible, just add the conversion to

data/class2.gemspec

@@ -18,10 +18,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activesupport", ">= 3.2", "< 7"
+  spec.required_ruby_version = ">= 2.7"
+
+  spec.add_dependency "dry-inflector", "~> 1.1.0"
 
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "appraisal"
+  spec.add_development_dependency "rake", "~> 13"
   spec.add_development_dependency "minitest"
 end

data/lib/class2/autoload/namespaced.rb

@@ -6,4 +6,4 @@ end
 
 source = $1
 namespace = source =~ %r{/lib/(.+?)(?:\.rb)?\z} ? $1 : File.basename(source, File.extname(source))
-Class2.autoload(namespace.camelize, caller.unshift(caller[0]))
+Class2.autoload(Class2::Inflector.camelize(namespace), caller.unshift(caller[0]))

data/lib/class2/inflector.rb

@@ -0,0 +1,177 @@
+# frozen_string_literal: true
+
+require "dry/inflector"
+
+class Class2
+  #
+  # String inflection used to convert attribute names into class names, method
+  # names, and JSON keys.
+  #
+  # dry-inflector provides the rule engine, but it is loaded with ActiveSupport
+  # 6.1's rules and case conversion so that the names Class2 generates are the
+  # same as when ActiveSupport provided the inflector. dry-inflector's rules,
+  # acronyms (API, JSON, HTTP, ...), and uncountables differ from ActiveSupport's
+  # and would change class names and plural attribute detection.
+  #
+  module Inflector
+    extend self
+
+    # ActiveSupport's uncountables.
+    UNCOUNTABLE = %w[
+      equipment information rice money species series fish sheep jeans police
+    ].freeze
+
+    #
+    # Rules are prepended, so the last one added is the first one applied and
+    # they are added here in ActiveSupport's order so they have its precedence.
+    #
+    INFLECTOR = Dry::Inflector.new do |inflections|
+      inflections.plural(/$/, "s")
+      inflections.plural(/s$/i, "s")
+      inflections.plural(/^(ax|test)is$/i, '\1es')
+      inflections.plural(/(octop|vir)us$/i, '\1i')
+      inflections.plural(/(octop|vir)i$/i, '\1i')
+      inflections.plural(/(alias|status)$/i, '\1es')
+      inflections.plural(/(bu)s$/i, '\1ses')
+      inflections.plural(/(buffal|tomat)o$/i, '\1oes')
+      inflections.plural(/([ti])um$/i, '\1a')
+      inflections.plural(/([ti])a$/i, '\1a')
+      inflections.plural(/sis$/i, "ses")
+      inflections.plural(/(?:([^f])fe|([lr])f)$/i, '\1\2ves')
+      inflections.plural(/(hive)$/i, '\1s')
+      inflections.plural(/([^aeiouy]|qu)y$/i, '\1ies')
+      inflections.plural(/(x|ch|ss|sh)$/i, '\1es')
+      inflections.plural(/(matr|vert|ind)(?:ix|ex)$/i, '\1ices')
+      inflections.plural(/^(m|l)ouse$/i, '\1ice')
+      inflections.plural(/^(m|l)ice$/i, '\1ice')
+      inflections.plural(/^(ox)$/i, '\1en')
+      inflections.plural(/^(oxen)$/i, '\1')
+      inflections.plural(/(quiz)$/i, '\1zes')
+
+      # ActiveSupport leaves a word alone when none of its rules match. These
+      # rules have a higher precedence than dry-inflector's defaults, which have
+      # irregulars ActiveSupport doesn't (foot/feet, tooth/teeth, goose/geese),
+      # so this rule -- the one with the lowest precedence -- matches everything
+      # and leaves it alone.
+      inflections.singular(/$/, '\0')
+      inflections.singular(/s$/i, "")
+      inflections.singular(/(ss)$/i, '\1')
+      inflections.singular(/(n)ews$/i, '\1ews')
+      inflections.singular(/([ti])a$/i, '\1um')
+      inflections.singular(/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)(sis|ses)$/i, '\1sis')
+      inflections.singular(/(^analy)(sis|ses)$/i, '\1sis')
+      inflections.singular(/([^f])ves$/i, '\1fe')
+      inflections.singular(/(hive)s$/i, '\1')
+      inflections.singular(/(tive)s$/i, '\1')
+      inflections.singular(/([lr])ves$/i, '\1f')
+      inflections.singular(/([^aeiouy]|qu)ies$/i, '\1y')
+      inflections.singular(/(s)eries$/i, '\1eries')
+      inflections.singular(/(m)ovies$/i, '\1ovie')
+      inflections.singular(/(x|ch|ss|sh)es$/i, '\1')
+      inflections.singular(/^(m|l)ice$/i, '\1ouse')
+      inflections.singular(/(bus)(es)?$/i, '\1')
+      inflections.singular(/(o)es$/i, '\1')
+      inflections.singular(/(shoe)s$/i, '\1')
+      inflections.singular(/(cris|test)(is|es)$/i, '\1is')
+      inflections.singular(/^(a)x[ie]s$/i, '\1xis')
+      inflections.singular(/(octop|vir)(us|i)$/i, '\1us')
+      inflections.singular(/(alias|status)(es)?$/i, '\1')
+      inflections.singular(/^(ox)en/i, '\1')
+      inflections.singular(/(vert|ind)ices$/i, '\1ex')
+      inflections.singular(/(matr)ices$/i, '\1ix')
+      inflections.singular(/(quiz)zes$/i, '\1')
+      inflections.singular(/(database)s$/i, '\1')
+
+      # ActiveSupport adds a rule for both forms of an irregular, so that the
+      # plural pluralizes to itself ("people" => "people"). Every word here has
+      # the same first letter in both forms, which is all ActiveSupport's rules
+      # for this case need.
+      {
+        "person" => "people",
+        "man" => "men",
+        "child" => "children",
+        "sex" => "sexes",
+        "move" => "moves",
+        "zombie" => "zombies"
+      }.each do |singular, plural|
+        s0, srest = singular[0], singular[1..-1]
+        p0, prest = plural[0], plural[1..-1]
+
+        inflections.plural(/(#{s0})#{srest}$/i, "\\1#{prest}")
+        inflections.plural(/(#{p0})#{prest}$/i, "\\1#{prest}")
+
+        inflections.singular(/(#{s0})#{srest}$/i, "\\1#{srest}")
+        inflections.singular(/(#{p0})#{prest}$/i, "\\1#{srest}")
+      end
+
+      # dry-inflector considers a word uncountable if any of its
+      # underscore-separated segments is ("user_money"), and its list has words
+      # ActiveSupport's doesn't (moose, deer, ...). Drop it and use #uncountable?
+      # below instead.
+      inflections.uncountables.clear
+    end
+
+    def pluralize(word)
+      word = word.to_s
+      uncountable?(word) ? word : INFLECTOR.pluralize(word)
+    end
+
+    def singularize(word)
+      word = word.to_s
+      uncountable?(word) ? word : INFLECTOR.singularize(word)
+    end
+
+    #
+    # Convert a table, attribute, or method name into a class name.
+    # "user_statuses" => "UserStatus", "admin/user" => "Admin::User".
+    #
+    def classify(word)
+      camelize(singularize(word.to_s.sub(/.*\./, "")))
+    end
+
+    #
+    # "some_value" => "SomeValue", "some_value", true => "someValue".
+    # "/" becomes "::".
+    #
+    # Unlike ActiveSupport::Inflector#camelize this has no acronym support, so
+    # there's no need to pass a symbol to get "lower" camel case.
+    #
+    def camelize(word, lower = false)
+      word = word.to_s.dup
+
+      if lower
+        word.sub!(/^\w/) { |c| c.downcase }
+      else
+        word.sub!(/^[a-z\d]*/) { |c| c.capitalize }
+      end
+
+      word.gsub!(/(?:_|(\/))([a-z\d]*)/i) { "#{$1}#{$2.capitalize}" }
+      word.gsub!("/", "::")
+      word
+    end
+
+    #
+    # "SomeValue" => "some_value", "APIClient" => "api_client",
+    # "Admin::User" => "admin/user".
+    #
+    def underscore(word)
+      word = word.to_s.dup
+      return word unless word =~ /[A-Z-]|::/
+
+      word.gsub!("::", "/")
+      word.gsub!(/([A-Z\d]+)([A-Z][a-z])/, '\1_\2')
+      word.gsub!(/([a-z\d])([A-Z])/, '\1_\2')
+      word.tr!("-", "_")
+      word.downcase!
+      word
+    end
+
+    private
+
+    # ActiveSupport only considers the whole word, e.g. "police" is uncountable
+    # but "military_police" is not.
+    def uncountable?(word)
+      UNCOUNTABLE.any? { |uncountable| /\b#{Regexp.escape(uncountable)}\Z/i =~ word }
+    end
+  end
+end

data/lib/class2/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Class2
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/lib/class2.rb

@@ -3,10 +3,10 @@
 require "date"
 require "time"                  # for parse()
 require "json"
-require "active_support/core_ext/module"
-require "active_support/inflector"
+require "rbconfig"              # for autoload()
 
 require "class2/version"
+require "class2/inflector"
 
 no_export = ENV["CLASS2_NO_EXPORT"]
 
@@ -61,9 +61,17 @@ class Class2
 
     def autoload(namespace = Object, stack = nil) # :nodoc:
       failure = lambda { |message|  abort "class2: cannot autoload class definitions: #{message}" }
+      #
+      # Ignore our autoload file and require()'s internals. Both their file
+      # names and the backtrace format change between Rubies: kernel_require.rb
+      # and bundled_gems.rb (3.3+) are where the frames come from, and since
+      # 3.4 frames are quoted with ' instead of `. Some Rubies report the
+      # rubygems frames as <internal:...>, which is not a readable path.
+      #
+      libdir = RbConfig::CONFIG["rubylibdir"]
       failure["cannot find the right caller"] unless (stack || caller).find do |line|
-        # Ignore our autoload file and require()
-        line.index("/class2/autoload.rb:").nil? && line.index("/kernel_require.rb:").nil? && line =~ /(.+):\d+:in\s+`\S/
+        line =~ /(.+):\d+:in\s+[`']\S/ && $1.index("/class2/autoload.rb").nil? &&
+          !$1.start_with?(libdir, "<internal:")
       end
 
       # Give this precedence over global DATA constant
@@ -135,7 +143,7 @@ class Class2
         object.each { |klass, attrs| make_class(namespace, klass, attrs, block) }
       end
 
-      name = name.to_s.classify
+      name = Inflector.classify(name)
       return if namespace.const_defined?(name, false)
 
       make_method_name = lambda { |x| x.to_s.gsub(/[^\w]+/, "_") } # good enough
@@ -224,7 +232,7 @@ class Class2
           method = make_method_name[method]
           attr_writer method
 
-          retval = method == method.pluralize ? "[]" : "#{namespace}::#{method.classify}.new"
+          retval = method == Inflector.pluralize(method) ? "[]" : "#{namespace}::#{Inflector.classify(method)}.new"
           class_eval <<-CODE
             def #{method}
               @#{method} ||= #{retval}
@@ -249,10 +257,11 @@ class Class2
             if self.class.__nested_attributes.include?(key.respond_to?(:to_sym) ? key.to_sym : key) &&
                (value.is_a?(Hash) || value.is_a?(Array))
 
-              name = key.to_s.classify
+              name = Inflector.classify(key)
 
-              # parent is deprecated in ActiveSupport 6 and its warning uses Strong#squish! which they don't include!
-              parent = self.class.respond_to?(:module_parent) ? self.class.module_parent : self.class.parent
+              # Neither Module#parent nor #module_parent, both ActiveSupport additions.
+              # For a class with no name this is Object, like #module_parent.
+              parent = self.class.name.to_s.split("::")[0..-2].inject(Object) { |mod, c| mod.const_get(c) }
               next unless parent.const_defined?(name)
 
               klass = parent.const_get(name)
@@ -293,7 +302,7 @@ class Class2
   module UpperCamelCase
     module Attributes
       def self.included(klass)
-        Util.convert_attributes(klass) { |v| v.camelize }
+        Util.convert_attributes(klass) { |v| Inflector.camelize(v) }
       end
     end
 
@@ -314,13 +323,13 @@ class Class2
   module LowerCamelCase
     module Attributes
       def self.included(klass)
-        Util.convert_attributes(klass) { |v| v.camelize(:lower) }
+        Util.convert_attributes(klass) { |v| Inflector.camelize(v, true) }
       end
     end
 
     module JSON
       def as_json(*)
-        Util.as_json(self, :camelize, :lower)
+        Util.as_json(self, :camelize, true)
       end
 
       def to_json(*argz)
@@ -343,7 +352,7 @@ class Class2
     #
     module Attributes
       def self.included(klass)
-        Util.convert_attributes(klass) { |v| v.underscore }
+        Util.convert_attributes(klass) { |v| Inflector.underscore(v) }
       end
     end
 
@@ -363,18 +372,18 @@ class Class2
   end
 
   module Util
-    def self.as_json(klass, *argz)
+    def self.as_json(klass, method, *argz)
       hash = {}
       klass.to_h.each do |k, v|
         if v.is_a?(Hash)
-          v = as_json(v, *argz)
+          v = as_json(v, method, *argz)
         elsif v.is_a?(Array)
-          v = v.map { |e| as_json(e, *argz) }
+          v = v.map { |e| as_json(e, method, *argz) }
         elsif v.respond_to?(:as_json)
           v = v.as_json
         end
 
-        hash[k.to_s.public_send(*argz)] = v
+        hash[Inflector.public_send(method, k.to_s, *argz)] = v
       end
 
       hash

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: class2
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Skye Shaw
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-16 00:00:00.000000000 Z
+date: 2026-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: dry-inflector
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -50,28 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -93,20 +73,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- Appraisals
 - Changes
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - class2.gemspec
-- gemfiles/as4.gemfile
-- gemfiles/as5.gemfile
-- gemfiles/as6.gemfile
 - lib/class2.rb
 - lib/class2/autoload.rb
 - lib/class2/autoload/namespaced.rb
+- lib/class2/inflector.rb
 - lib/class2/version.rb
 homepage: https://github.com/sshaw/class2
 licenses:
@@ -120,7 +98,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/Appraisals

@@ -1,11 +0,0 @@
-appraise "as4" do
-  gem "activesupport", "~> 4.2"
-end
-
-appraise "as5" do
-  gem "activesupport", "~> 5.2"
-end
-
-appraise "as6" do
-  gem "activesupport", "> 5", "< 7"
-end

data/gemfiles/as4.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activesupport", "~> 4.2"
-
-gemspec path: "../"

data/gemfiles/as5.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activesupport", "~> 5.2"
-
-gemspec path: "../"

data/gemfiles/as6.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activesupport", "> 5", "< 7"
-
-gemspec path: "../"