inline_forms_installer 8.1.17 → 8.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c46819a2ebdd8fc0e78bf6552f9ad15e07f32683c11c9e0c36c8461a2b3e53f7
-  data.tar.gz: 488a04adfc5490222bbeb037e302bc11cb229b60002b88e384de26ac2aa1d562
+  metadata.gz: 8f04e2b37e58d0c6658da6ab3cc13ae2a44e22bb898fac9e8980960fd5d61378
+  data.tar.gz: c6fe8cc0545e99c3671824b7858136ab6f36c696602c3db9ac5f0ea91c686c96
 SHA512:
-  metadata.gz: a64cb19004014e639af9a1c3bb6cbec783521929fc36b5f50f782f21f622db5402e2c45210a08cb2744301e2d1d54b3479c146cc465b266c6ea337918881f809
-  data.tar.gz: 862b03e84c8b8627bbd55ac2611e87da3bc0c20979d6d4755642967503b01e3861607caa5fdc594ea58e3aab4e47800a2a13861501392ed1bbfd90d36fecb133
+  metadata.gz: 2ec0b4161bf92dcaf7de326218c891dafaaf490c5a16f4850211bbc52672b75e96ab6f55291bdc79fae8a980c4c1cb6d93c036a07384c96e3a48801cd45167dc
+  data.tar.gz: 83c865c2688e60ec6b06a0c811d7bccea25a9d252e1d2a70bf7328443dd869c438463a689f3127957c7563bc426f5434871993ea9eef8c53b46df3fbc3740456

data/inline_forms_installer.gemspec

@@ -20,6 +20,12 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency("inline_forms", "~> 8")
-  s.add_dependency("rvm", ">= 1.11", "< 2.0")
   s.add_dependency("thor", ">= 1.0", "< 2.0")
+
+  # RVM is optional. When the `rvm` gem is present AND the shell is inside an
+  # RVM environment, `inline_forms create` auto-creates a per-app gemset;
+  # otherwise it installs without RVM (any version manager, or none, works —
+  # Bundler isolates deps per app via Gemfile.lock). Install `gem install rvm`
+  # to opt in to gemset integration, or pass `--no-rvm` to skip it explicitly.
+
 end

data/lib/inline_forms_installer/creator.rb

@@ -109,8 +109,7 @@ module InlineFormsInstaller
       end
 
       target_ruby = InlineFormsInstaller::TARGET_RUBY_VERSION
-      require "rvm"
-      if RVM.current && !options[:skiprvm]
+      if rvm_active?
         say "Installing inline_forms with RVM", :green
       else
         say "Installing inline_forms without RVM", :green
@@ -125,8 +124,13 @@ module InlineFormsInstaller
       ENV["using_sqlite"] = using_sqlite?.to_s
       ENV["database"] = database
       ENV["install_example"] = install_example?.to_s
-      ENV["ruby_version"] = target_ruby
-      ENV["inline_forms_rvm_gemset"] = app_name if RVM.current && !options[:skiprvm]
+      # Match the generated `.ruby-version` to the version manager actually in
+      # use. RVM's `.ruby-version` reader needs the `ruby-X.Y.Z` form — a bare
+      # `X.Y.Z` makes `rvm use .` bail with "do not know how to handle" and skip
+      # the per-app gemset. rbenv/chruby/asdf/mise instead need the *bare*
+      # `X.Y.Z`. So: prefixed for RVM installs, bare for everyone else.
+      ENV["ruby_version"] = rvm_active? ? "ruby-#{target_ruby}" : target_ruby
+      ENV["inline_forms_rvm_gemset"] = app_name if rvm_active?
       ENV["inline_forms_version"] = inline_forms_version
       ENV["inline_forms_installer_version"] = InlineFormsInstaller::VERSION
       ENV["INLINE_FORMS_INSTALLER_ROOT"] = InlineFormsInstaller.gem_root
@@ -178,12 +182,28 @@ module InlineFormsInstaller
       "(see install log — no Minitest summary line)"
     end
 
+    # RVM is optional. Returns true only when the user did not pass `--no-rvm`,
+    # the `rvm` gem is installed (the installer no longer hard-depends on it),
+    # AND the shell is currently inside an RVM environment. Memoized because it
+    # is consulted in several places across the create flow.
+    def rvm_active?
+      return false if options[:skiprvm]
+      return @rvm_active if defined?(@rvm_active)
+
+      @rvm_active =
+        begin
+          require "rvm"
+          !!RVM.current
+        rescue LoadError
+          false
+        end
+    end
+
     def bundle_check_ok?(app_name)
       app_dir = File.expand_path(app_name)
       return false unless File.directory?(app_dir)
 
-      if !options[:skiprvm] && defined?(RVM) && RVM.current
-        require "rvm"
+      if rvm_active?
         RVM.chdir(app_dir) do
           RVM.use_from_path! "."
           system("bundle", "check", out: File::NULL, err: File::NULL)

data/lib/inline_forms_installer/installer_core.rb

@@ -77,7 +77,12 @@ end
 
 # Pin Ruby for the generated app (after `rails new`; do not write these files in
 # Creator before `rails new` — Rails also emits `.ruby-version` and prompts).
-create_file ".ruby-version", "#{ENV.fetch('ruby_version', 'ruby-4.0.4')}\n"
+# `rails new` writes its own `.ruby-version` (under RVM it picks up the ambient
+# `ruby-X.Y.Z` string). We always overwrite it with our bare, version-manager-
+# agnostic `X.Y.Z` form; `force: true` avoids Thor's interactive overwrite
+# prompt when Rails' value differs (it always does, now that we drop the
+# RVM-only `ruby-` prefix).
+create_file ".ruby-version", "#{ENV.fetch('ruby_version', '4.0.4')}\n", force: true
 if (gemset = ENV["inline_forms_rvm_gemset"]).to_s != ""
   create_file ".ruby-gemset", "#{gemset}\n"
 end
@@ -136,7 +141,10 @@ gem 'rails-i18n', '~> 8.1'
 gem 'rails-jquery-autocomplete'
 gem 'rails', '~> 8.1'
 gem 'rake'
-gem 'rvm'
+# NOTE: the `rvm` gem is intentionally NOT a runtime dependency of generated
+# apps — RVM is optional and nothing in the app needs the RVM Ruby API at
+# runtime. (The RVM-based Capistrano deploy helpers live in the :development
+# group below and are only used if you deploy with the shipped config/deploy.rb.)
 gem 'dartsass-rails'
 # Rails 7 no longer adds sprockets-rails to the default Gemfile; declare it
 # explicitly because the gem's own assets (foundation, jquery, etc.) live in
@@ -549,12 +557,19 @@ say "- Configure ActiveRecord YAML permitted classes for PaperTrail changesets..
 # `version.changeset`; PaperTrail rescues that and returns `{}`, which is why
 # the inline_forms versions list rendered every changeset as `empty`. Permit
 # the classes PT actually emits so `version.changeset` round-trips.
+#
+# date/time `_select` columns (e.g. FormElementShowcase#meeting_time, a
+# `:time_select` backed by a :time column) serialize their changeset value as
+# an `ActiveRecord::Type::Time::Value` (and the Date/DateTime siblings for
+# `:date_select` / datetime columns). Those wrapper classes must also be
+# permitted or `version.changeset` raises `Psych::DisallowedClass: Tried to
+# load unspecified class: ActiveRecord::Type::Time::Value` on the revert /
+# versions-panel path.
 create_file 'config/initializers/paper_trail_yaml_safe_load.rb', <<-PT_YAML.strip_heredoc
   # Generated by inline_forms.
   # See https://github.com/paper-trail-gem/paper_trail and
   # ActiveRecord::Coders::YAMLColumn safe-loading rules.
-  Rails.application.config.active_record.yaml_column_permitted_classes ||= []
-  Rails.application.config.active_record.yaml_column_permitted_classes |= [
+  permitted = [
     Symbol,
     Date,
     Time,
@@ -563,6 +578,27 @@ create_file 'config/initializers/paper_trail_yaml_safe_load.rb', <<-PT_YAML.stri
     ActiveSupport::TimeZone,
     ActiveSupport::HashWithIndifferentAccess
   ]
+
+  # date/time `_select` columns serialize their PaperTrail changeset/object
+  # value under a type-specific wrapper class — e.g. a `:time_select` helper
+  # maps to a `:time` column whose cast value is an
+  # `ActiveRecord::Type::Time::Value` (a Time subclass). Psych matches the
+  # *exact* stored class name, so permitting `Time`/`Date` is not enough: the
+  # wrapper must be listed too, or `revert` (`version.reify`) and the versions
+  # panel (`version.changeset`) raise/swallow Psych::DisallowedClass. Resolve
+  # by name and skip any this Rails version does not define (only Time::Value
+  # exists today; Date/DateTime are listed defensively for forward-compat).
+  %w[
+    ActiveRecord::Type::Time::Value
+    ActiveRecord::Type::Date::Value
+    ActiveRecord::Type::DateTime::Value
+  ].each do |const_name|
+    klass = const_name.safe_constantize
+    permitted << klass if klass
+  end
+
+  Rails.application.config.active_record.yaml_column_permitted_classes ||= []
+  Rails.application.config.active_record.yaml_column_permitted_classes |= permitted
   ActiveRecord.yaml_column_permitted_classes |= Rails.application.config.active_record.yaml_column_permitted_classes
 PT_YAML
 

data/lib/inline_forms_installer/version.rb

@@ -1,9 +1,13 @@
 # -*- encoding : utf-8 -*-
 module InlineFormsInstaller
-  VERSION = "8.1.17"
+  VERSION = "8.1.18"
 
-  # Written into generated apps' `.ruby-version` (must match gemspec `required_ruby_version`).
-  TARGET_RUBY_VERSION = "ruby-4.0.4"
+  # Canonical bare Ruby version (must match gemspec `required_ruby_version`).
+  # Written verbatim into generated apps' `.ruby-version` for rbenv/chruby/asdf/
+  # mise (which need the bare `X.Y.Z` form). For RVM installs the Creator writes
+  # the `ruby-X.Y.Z` form instead, because RVM's `.ruby-version` reader rejects a
+  # bare version. See Creator#create (ENV["ruby_version"]).
+  TARGET_RUBY_VERSION = "4.0.4"
 
   # Kept in sync with inline_forms gem releases from the same repo tag.
   INLINE_FORMS_VERSION = VERSION

data/lib/installer_templates/example_app_tests/test/models/example_app_paper_trail_changeset_test.rb

@@ -35,6 +35,49 @@ class ExampleAppPaperTrailChangesetTest < ActiveSupport::TestCase
     assert_equal ["Old Title", "New Title"], changeset["title"]
   end
 
+  # Regression for `Psych::DisallowedClass: Tried to load unspecified class:
+  # ActiveRecord::Type::Time::Value` in FormElementShowcasesController#revert.
+  #
+  # A `:time` column (FormElementShowcase#meeting_time, a `:time_select`
+  # helper) stores its value as an `ActiveRecord::Type::Time::Value` — a Time
+  # subclass. PaperTrail serializes that value under its real class name, so
+  # `YAML.safe_load` rejects it unless the wrapper class is on the permitted
+  # list. `version.changeset` rescues the DisallowedClass into `{}` (the
+  # versions panel then renders empty), but `version.reify` — the path
+  # `revert` takes — does NOT rescue and raised before the date/time wrapper
+  # classes were added to config/initializers/paper_trail_yaml_safe_load.rb.
+  test "time_select (meeting_time) version reifies and changeset round-trips" do
+    PaperTrail.request.whodunnit = "test"
+
+    showcase = FormElementShowcase.create!(
+      title: "PT time demo",
+      meeting_time: Time.utc(2000, 1, 1, 9, 15)
+    )
+    showcase.update!(meeting_time: Time.utc(2000, 1, 1, 14, 30))
+
+    version = showcase.versions.last
+    assert_equal "update", version.event,
+      "expected an update version to be recorded by paper_trail"
+
+    # The revert path: reify must not raise Psych::DisallowedClass.
+    reified = assert_nothing_raised do
+      version.reify
+    end
+    assert_equal 9,  reified.meeting_time.hour
+    assert_equal 15, reified.meeting_time.min
+
+    # The versions-panel read path: changeset must round-trip the time value
+    # (non-empty + present) rather than being rescued to {}.
+    changeset = version.changeset
+    assert_kind_of Hash, changeset
+    refute_empty changeset,
+      "version.changeset is empty; PaperTrail's YAML.safe_load probably hit a " \
+      "DisallowedClass (ActiveRecord::Type::Time::Value) and returned {}. Check " \
+      "config/initializers/paper_trail_yaml_safe_load.rb."
+    assert changeset.key?("meeting_time"),
+      "expected meeting_time in the changeset; got #{changeset.keys.inspect}"
+  end
+
   # `has_rich_text :description` lives in the `action_text_rich_texts` table,
   # so `has_paper_trail` on Apartment cannot see body edits. The installer adds
   # `config/initializers/rich_text_paper_trail.rb` (which declares

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inline_forms_installer
 version: !ruby/object:Gem::Version
-  version: 8.1.17
+  version: 8.1.18
 platform: ruby
 authors:
 - Ace Suares
@@ -25,26 +25,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '8'
-- !ruby/object:Gem::Dependency
-  name: rvm
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.11'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.11'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement