inline_forms_installer 8.0.0 → 8.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd3c5925a09649543ee457a7150ce972a9369172b2b458c32997fe6e8bcb2c2f
-  data.tar.gz: e518a25462d7003a2b40415dbdd60782f87f6fb8b7e26068a4ae223c7ef75131
+  metadata.gz: 91d4fdc2c47dbae9f0fb05f32157e77326029df28eae8c529655779d417d791a
+  data.tar.gz: d21272dbbdd19be64fd742f267054fca738afc40cffbda9cbfe74dfb1bf2982a
 SHA512:
-  metadata.gz: b2679daccabc402e75e1651946d55f9c04101460d80c881336c618f4d1a4662e38a840c2a397f2da5dbb19f126159a101d40f7bf67e070c3dc8a53e52e36c9ca
-  data.tar.gz: ef9c2b32d0d7df9370feece3b35e97bcb842013e5d89a4da83a4cacb950e295d7d513ebd165f9cf25c6d4b2b9af9dbe4f2b5e11efb05acbed5a46e9776eee074
+  metadata.gz: 51085fde767560341594f9d3c3da50b8a6085b06bfef3a3ba4826e63a21de5f5278d43fdee437b1e6c45f44738bb81b3fc7e3cde5bd471dee6fe5581a7bb0bcf
+  data.tar.gz: 1f4f9a714507ac6ba8658418a0586d1f006591f3ea9ffe6a0f655390211e7ea090a74c35f5f18cf8bbf61bbbd5b2a4fa0f52cf4f17ba223aba0b6c6f6bb8ba60

data/lib/inline_forms_installer/creator.rb

@@ -61,7 +61,7 @@ module InlineFormsInstaller
 
       inline_forms_version = InlineFormsInstaller.inline_forms_version
       # The Gemfile pins `gem "inline_forms", "~> 8"`, so Bundler resolves the
-      # highest 7.x available on RubyGems at install time. The
+      # highest 8.x available on RubyGems at install time. The
       # `inline_forms_version` value above is just whatever happens to be in
       # the Creator's own gemset and may differ from what lands in the app;
       # report the constraint instead of a misleading exact version, and let
@@ -103,6 +103,7 @@ module InlineFormsInstaller
       ENV["inline_forms_installer_version"] = InlineFormsInstaller::VERSION
       ENV["INLINE_FORMS_INSTALLER_ROOT"] = InlineFormsInstaller.gem_root
       ENV["INLINE_FORMS_ROOT"] = InlineFormsInstaller.inline_forms_gem_root
+      InlineFormsInstaller.discover_prerelease_env!
 
       app_template_file = File.join(__dir__, "app_template.rb")
 
@@ -112,7 +113,7 @@ module InlineFormsInstaller
           Gem::Specification
             .find_all_by_name("rails")
             .map(&:version)
-            .select { |v| v >= Gem::Version.new("7.2") && v < Gem::Version.new("7.3") }
+            .select { |v| v >= Gem::Version.new("8.0") && v < Gem::Version.new("8.1") }
             .max
         rescue StandardError
           nil

data/lib/inline_forms_installer/installer_core.rb

@@ -31,6 +31,31 @@ def bundle_install!
   end
 end
 
+# Pre-install built .gem files into the app RVM gemset so Bundler can resolve
+# inline_forms ~> 8 before those releases exist on RubyGems. Set
+# INLINE_FORMS_RELEASE_ROOT and/or VALIDATION_HINTS_ROOT (creator sets the latter
+# when a sibling validation_hints checkout exists).
+def install_prerelease_gems_from_roots!
+  roots = []
+  %w[INLINE_FORMS_RELEASE_ROOT VALIDATION_HINTS_ROOT].each do |key|
+    root = ENV[key].to_s
+    roots << File.expand_path(root) if root != "" && File.directory?(root)
+  end
+  roots.uniq!
+  return if roots.empty?
+
+  %w[validation_hints inline_forms inline_forms_installer].each do |name|
+    gem_file = roots.filter_map { |root|
+      files = Dir[File.join(root, "#{name}-*.gem")]
+      files.sort.last if files.any?
+    }.max
+    next unless gem_file && File.file?(gem_file)
+
+    say "- Installing #{File.basename(gem_file)} into app gemset..."
+    run "gem install #{Shellwords.escape(gem_file)} --no-document"
+  end
+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"
@@ -44,15 +69,12 @@ use_app_rvm_gemset!
 remove_file 'Gemfile' if File.exist?('Gemfile')
 create_file 'Gemfile', "# created by inline_forms_installer #{ENV['inline_forms_installer_version']} on #{Date.today}\n"
 
-# `rails new` is invoked with whatever the system `rails` binary points at
-# (often Rails 8.x), so the generated `config/application.rb` may carry
-# `load_defaults 8.0` and other 8.x-only settings. The Gemfile below pins
-# `rails ~> 7.2.3`; normalize application.rb so the first `bundle exec rails`
-# boot matches that pin.
+# Creator invokes `rails _8.0.x_ new`, which emits `load_defaults 8.0` and removes
+# `new_framework_defaults_8_0.rb`. Normalize anyway when an older generator left another minor.
 if File.exist?('config/application.rb')
   gsub_file 'config/application.rb',
             /config\.load_defaults\s+\d+\.\d+/,
-            'config.load_defaults 7.2'
+            'config.load_defaults 8.0'
 end
 
 add_source 'https://rubygems.org'
@@ -65,8 +87,8 @@ gem 'autoprefixer-rails'
 # foundation-rails 6.7+ uses Dart Sass (`sass:math`); sass-rails/sassc removed.
 # Visually tuned against foundation-rails ~> 6.6.2; current pin ~> 6.9 (6.9.0.x).
 gem 'foundation-rails', '~> 6.9'
-# Pin inline_forms and validation_hints on the 7.x line; Bundler resolves the
-# highest 7.x that satisfies all deps. Set INLINE_FORMS_GEMFILE_PATH for
+# Pin inline_forms and validation_hints on the 8.x line; Bundler resolves the
+# highest 8.x that satisfies all deps. Set INLINE_FORMS_GEMFILE_PATH for
 # maintainer local-path overrides only.
 if ENV["INLINE_FORMS_GEMFILE_PATH"] && File.directory?(ENV["INLINE_FORMS_GEMFILE_PATH"])
   gem "inline_forms", path: ENV["INLINE_FORMS_GEMFILE_PATH"]
@@ -84,9 +106,9 @@ gem 'jquery-ui-rails', '4.0.3'
 gem 'mini_magick'
 gem 'mysql2'
 gem 'paper_trail', '~> 16.0'
-gem 'rails-i18n', '~> 7.0'
+gem 'rails-i18n', '~> 8.0'
 gem 'rails-jquery-autocomplete'
-gem 'rails', '~> 7.2.3'
+gem 'rails', '~> 8.0'
 gem 'rake'
 gem 'rvm'
 gem 'dartsass-rails'
@@ -121,8 +143,8 @@ gem_group :development do
   gem 'rvm-capistrano', :require => false
   gem 'rvm1-capistrano3', require: false
   gem 'seed_dump', '~> 0.5.3'
-  # Rails 6.1 ActiveRecord's sqlite3 adapter requires sqlite3 ~> 1.4; 2.x activates first and breaks.
-  gem 'sqlite3', '~> 1.4'
+  # Rails 8 sqlite3 adapter requires sqlite3 >= 2.1.
+  gem 'sqlite3', '>= 2.1'
   gem 'thin'
   gem 'yaml_db'
 end
@@ -134,13 +156,7 @@ end
 
 say "- Running bundle..."
 run "gem install bundler --no-document"
-if (vh_root = ENV["VALIDATION_HINTS_ROOT"]) && File.directory?(vh_root)
-  vh_gem = Dir[File.join(vh_root, "validation_hints-*.gem")].sort.last
-  if vh_gem && File.file?(vh_gem)
-    say "- Installing #{File.basename(vh_gem)} from VALIDATION_HINTS_ROOT..."
-    run "gem install #{vh_gem} --no-document"
-  end
-end
+install_prerelease_gems_from_roots!
 bundle_install!
 
 say "- Dart Sass: inline_forms stylesheet entrypoints + initializer..."
@@ -151,6 +167,13 @@ copy_file File.join(INSTALLER_ROOT, "lib/installer_templates/dartsass/inline_for
 copy_file File.join(INSTALLER_ROOT, "lib/installer_templates/dartsass/devise_main.scss"),
           "app/assets/stylesheets/inline_forms_install/devise_main.scss"
 
+say "- Sprockets: app/assets/config/manifest.js (Rails 8 importmap default omits it)..."
+empty_directory "app/assets/config"
+create_file "app/assets/config/manifest.js", <<~MANIFEST unless File.exist?("app/assets/config/manifest.js")
+  //= link_tree ../images
+  //= link_tree ../builds
+MANIFEST
+
 say "- Dart Sass: rails dartsass:install (builds/, manifest, Procfile.dev)..."
 run "bundle exec rails dartsass:install"
 
@@ -256,7 +279,7 @@ create_file "db/migrate/" +
   Time.now.utc.strftime("%Y%m%d%H%M%S") +
   "_" +
   "devise_create_users.rb", <<-DEVISE_MIGRATION.strip_heredoc
-class DeviseCreateUsers < ActiveRecord::Migration[7.2]
+class DeviseCreateUsers < ActiveRecord::Migration[8.0]
 
   def change
     create_table(:users) do |t|
@@ -409,7 +432,7 @@ create_file "db/migrate/" +
   Time.now.utc.strftime("%Y%m%d%H%M%S") +
   "_" +
   "inline_forms_create_join_table_user_role.rb", <<-ROLES_MIGRATION.strip_heredoc
-  class InlineFormsCreateJoinTableUserRole < ActiveRecord::Migration[7.2]
+  class InlineFormsCreateJoinTableUserRole < ActiveRecord::Migration[8.0]
     def self.up
       create_table  :roles_users, :id => false, :force => true do |t|
         t.integer   :role_id
@@ -837,7 +860,7 @@ if ENV['install_example'] == 'true'
   sleep 1
   add_owner_ts = Time.now.utc.strftime("%Y%m%d%H%M%S")
   create_file "db/migrate/#{add_owner_ts}_add_owner_to_apartments.rb", <<-ADD_OWNER.strip_heredoc
-    class AddOwnerToApartments < ActiveRecord::Migration[7.2]
+    class AddOwnerToApartments < ActiveRecord::Migration[8.0]
       def change
         add_reference :apartments, :owner, null: true, foreign_key: true
       end
@@ -916,7 +939,7 @@ if ENV['install_example'] == 'true'
   sleep 1
   seed_ts = Time.now.utc.strftime("%Y%m%d%H%M%S")
   create_file "db/migrate/#{seed_ts}_seed_example_apartments_and_owners.rb", <<-SEED_MIGRATION.strip_heredoc
-    class SeedExampleApartmentsAndOwners < ActiveRecord::Migration[7.2]
+    class SeedExampleApartmentsAndOwners < ActiveRecord::Migration[8.0]
       # ---------------------------------------------------------------
       # Apartment seed gallery
       # ---------------------------------------------------------------

data/lib/inline_forms_installer/version.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 module InlineFormsInstaller
-  VERSION = "8.0.0"
+  VERSION = "8.0.3"
 
   # Written into generated apps' `.ruby-version` (must match gemspec `required_ruby_version`).
   TARGET_RUBY_VERSION = "ruby-4.0.4"

data/lib/inline_forms_installer.rb

@@ -29,6 +29,54 @@ module InlineFormsInstaller
       INLINE_FORMS_VERSION
     end
   end
+
+  # When developing unreleased 8.x gems, point env at checkouts that contain
+  # built *.gem files so the installer can gem-install them into the app gemset.
+  def self.discover_prerelease_env!
+    if ENV["INLINE_FORMS_RELEASE_ROOT"].to_s == "" || ENV["VALIDATION_HINTS_ROOT"].to_s == ""
+      dir = gem_root
+      6.times do
+        if ENV["INLINE_FORMS_RELEASE_ROOT"].to_s == "" &&
+           File.file?(File.join(dir, "inline_forms.gemspec")) &&
+           Dir[File.join(dir, "inline_forms-*.gem")].any?
+          ENV["INLINE_FORMS_RELEASE_ROOT"] = dir
+        end
+        if ENV["VALIDATION_HINTS_ROOT"].to_s == "" &&
+           File.file?(File.join(dir, "validation_hints.gemspec")) &&
+           Dir[File.join(dir, "validation_hints-*.gem")].any?
+          ENV["VALIDATION_HINTS_ROOT"] = dir
+        end
+        parent = File.expand_path("..", dir)
+        break if parent == dir
+        dir = parent
+      end
+    end
+
+    if ENV["VALIDATION_HINTS_ROOT"].to_s == ""
+      sibling_vh = File.expand_path("../validation_hints", File.expand_path("..", gem_root))
+      ENV["VALIDATION_HINTS_ROOT"] = sibling_vh if File.directory?(sibling_vh)
+    end
+
+    {
+      "INLINE_FORMS_RELEASE_ROOT" => "inline_forms",
+      "VALIDATION_HINTS_ROOT" => "validation_hints"
+    }.each do |env_key, repo_name|
+      next if ENV[env_key].to_s != ""
+
+      checkout = dev_checkout_with_gems(repo_name)
+      ENV[env_key] = checkout if checkout
+    end
+  end
+
+  def self.dev_checkout_with_gems(repo_name)
+    [
+      File.expand_path("~/code/#{repo_name}"),
+      File.expand_path("~/#{repo_name}")
+    ].uniq.find do |checkout|
+      File.file?(File.join(checkout, "#{repo_name}.gemspec")) &&
+        Dir[File.join(checkout, "#{repo_name}-*.gem")].any?
+    end
+  end
 end
 
 require "inline_forms_installer/creator"

data/lib/installer_templates/unicorn/production.rb

@@ -22,7 +22,7 @@ before_exec do |_|
 end
 
 before_fork do |server, worker|
-  defined?(ActiveRecord::Base) and ActiveRecord::Base.connection.disconnect!
+  defined?(ActiveRecord::Base) and ActiveRecord::Base.connection_pool.disconnect!
 
   old_pid = "#{app_path}/tmp/pids/unicorn.pid.oldbin"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inline_forms_installer
 version: !ruby/object:Gem::Version
-  version: 8.0.0
+  version: 8.0.3
 platform: ruby
 authors:
 - Ace Suares