class2 0.5.2 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49d91ca721e5cefa4ee9663e3e4ca8edbb584315300888561fa2b70e49eb7923
-  data.tar.gz: 486025e1a89a034b49dc9a5c243d5bae341e4880d10d2a204e07898acd5a0e21
+  metadata.gz: 9e33244884d5c16ee2b4d8b43195e2247bfc88ad9d829cfcdaf32efc25195a72
+  data.tar.gz: c1e550bf7044f09d66930f09a859f0bf6713e83a3f648d5fb511d0deef8ba9f1
 SHA512:
-  metadata.gz: 9d85ef46fefd99c440a1fe0aa92724a3b217c8d14a6473d2ff025705604a40e40f234a0d0cbc730921301783d28f6ac5cfa2435bf631994bfc714fe649907d97
-  data.tar.gz: 46e2460f0924ce6c17413d7a15b0c6fc8685b0784e87a173ab6d51464a1b9a535e4d82f742c3c8b7c263a5ec7afe67c8514a12d7938dae549fa531c87b56142a
+  metadata.gz: 9959d03761af0652265bb53e65d75614ddd47bdf0315ffe1f91d7a31396124d31b2bc3369272ebd64667b51792ef543f9ec99c800b963ed9680fc409a78d35f1
+  data.tar.gz: 9ca603b6e2dfc257d26d8e6e31aebcc6ef08af5c46c0bfc53fdc0552a15a926c1f3a86e1fa439c55cd487ef4d0ce86c6207a101d5f44688391fe0d2d340325ae

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,13 @@
+2026-09-16  v0.6.1
+--------------------
+* Add Class2::Inflector wrapper
+
+2024-10-15  v0.6.0
+--------------------
+* Bug fix: autoloading in data section with namespace
+* Add support for Time conversion
+* Remove use of deprecated Fixnum
+
 2020-04-24  v0.5.2
 --------------------
 * Bug fix: Fix NoMethodError in ActiveSupport 6's Module.parent

data/README.md

@@ -2,8 +2,6 @@
 
 Easily create class hierarchies that support nested attributes, type conversion, equality, and more.
 
-[![Build Status](https://travis-ci.org/sshaw/class2.svg?branch=master)](https://travis-ci.org/sshaw/class2)
-
 ## Usage
 
 ```rb
@@ -126,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:
 
@@ -193,6 +217,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,10 @@ 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.add_dependency "activesupport", ">= 3.2", "< 9"
 
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13"
   spec.add_development_dependency "appraisal"
   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)
+Class2.autoload(namespace.camelize, caller.unshift(caller[0]))

data/lib/class2/inflector.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require "active_support/inflector"
+
+class Class2
+  #
+  # String inflection used to convert attribute names into class names, method
+  # names, and JSON keys.
+  #
+  # A lightweight wrapper around ActiveSupport::Inflector. Class2 calls this
+  # instead of ActiveSupport's String and Module extensions so that the
+  # inflection library can be replaced without changing the rest of Class2.
+  #
+  module Inflector
+    extend self
+
+    def pluralize(word)
+      ActiveSupport::Inflector.pluralize(word.to_s)
+    end
+
+    def singularize(word)
+      ActiveSupport::Inflector.singularize(word.to_s)
+    end
+
+    #
+    # Convert a table, attribute, or method name into a class name.
+    # "user_statuses" => "UserStatus", "admin/user" => "Admin::User".
+    #
+    def classify(word)
+      ActiveSupport::Inflector.classify(word.to_s)
+    end
+
+    #
+    # "some_value" => "SomeValue", "some_value", true => "someValue".
+    # "/" becomes "::".
+    #
+    # ActiveSupport's second argument is the opposite of `lower`: it is true
+    # when the first letter should be upper cased.
+    #
+    def camelize(word, lower = false)
+      ActiveSupport::Inflector.camelize(word.to_s, !lower)
+    end
+
+    #
+    # "SomeValue" => "some_value", "Admin::User" => "admin/user".
+    #
+    def underscore(word)
+      ActiveSupport::Inflector.underscore(word.to_s)
+    end
+  end
+end

data/lib/class2/version.rb

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

data/lib/class2.rb

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
 
 require "date"
+require "time"                  # for parse()
 require "json"
+require "rbconfig"              # for autoload()
 require "active_support/core_ext/module"
 require "active_support/inflector"
 
 require "class2/version"
+require "class2/inflector"
 
 no_export = ENV["CLASS2_NO_EXPORT"]
 
@@ -32,13 +35,13 @@ class Class2
     Hash      => lambda { |v| sprintf "%s.respond_to?(:to_h) ? %s.to_h : %s", v, v, v },
     Integer   => lambda { |v| "#{v} && Integer(#{v})" },
     String    => lambda { |v| "#{v} && String(#{v})" },
+    Time      => lambda { |v| "#{v} && Time.parse(#{v})" },
     TrueClass => lambda do |v|
       sprintf '["1", 1, 1.0, true].freeze.include?(%s.is_a?(String) ? %s.strip : %s)', v, v, v
     end
   }
 
   CONVERSIONS[FalseClass] = CONVERSIONS[TrueClass]
-  CONVERSIONS[Fixnum] = CONVERSIONS[Integer]
   CONVERSIONS.default = lambda { |v| v }
 
   class << self
@@ -58,11 +61,19 @@ class Class2
       nil
     end
 
-    def autoload(namespace = Object) # :nodoc:
+    def autoload(namespace = Object, stack = nil) # :nodoc:
       failure = lambda { |message|  abort "class2: cannot autoload class definitions: #{message}" }
-      failure["cannot find the right caller"] unless 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/
+      #
+      # 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|
+        line =~ /(.+):\d+:in\s+[`']\S/ && $1.index("/class2/autoload.rb").nil? &&
+          !$1.start_with?(libdir, "<internal:")
       end
 
       # Give this precedence over global DATA constant

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: class2
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.1
 platform: ruby
 authors:
 - Skye Shaw
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-04-25 00:00:00.000000000 Z
+date: 2026-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -19,7 +19,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '9'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -50,14 +50,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'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -86,15 +86,15 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - skye.shaw@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
 - Appraisals
 - Changes
 - Gemfile
@@ -108,12 +108,13 @@ files:
 - 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:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -128,9 +129,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.3.27
+signing_key:
 specification_version: 4
 summary: Easily create hierarchies of classes that support nested attributes, type
   conversion, equality, and more.

data/.travis.yml

@@ -1,30 +0,0 @@
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - jruby-9
-  - 2.3
-  - 2.4
-  - 2.5
-  - 2.6
-  - 2.7
-
-before_install:
-  - gem install bundler
-
-gemfile:
-  - gemfiles/as4.gemfile
-  - gemfiles/as5.gemfile
-  - gemfiles/as6.gemfile
-
-matrix:
-  exclude:
-    - rvm: 2.3
-      gemfile: gemfiles/as6.gemfile
-    - rvm: 2.4
-      gemfile: gemfiles/as6.gemfile
-    - rvm: 2.7
-      gemfile: gemfiles/as4.gemfile
-
-notifications:
-  email: false