inline_forms_installer 8.1.1 → 8.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b52ad53c2bf545f31ee62580ea64c9e0ee3652938a85a18f812ebf84044374e5
-  data.tar.gz: d0570d54df08235abf7aee6b1cdf6e5f942aa49d99fbcb903a007682e04e9ea8
+  metadata.gz: 6b4f54ce386e1f7b9b8052cb1817c837a94a1cb4b315887a19456d1c054f8a28
+  data.tar.gz: 2597296ce7e66de213ba8eef07191b924c355258f45210cbf6380c1ffa695891
 SHA512:
-  metadata.gz: 61bdd6c15f62a1f6261039eab68e62fbdc29babda7b0dcd8d3da33c2ca0b021712cd7bce602577f90594c3476da86e13e8356773d92dec1da16cab509af03534
-  data.tar.gz: '00842465140c3164bfba1437ce6ae97691728f18bf454885280fe5f401fe959ab6cd0d186b82791bd6070af6c95b945a19aba02ddc12f7363392221fa28de20d'
+  metadata.gz: 6517c3d2c92010b5f9f8032206e8bad5d14bf5d11b77c186d807fed490680534952d136aa2e63ebd485878d17561a66a7c7477126fface669d447e63d69aa245
+  data.tar.gz: 243c4dee8186095ec2d8fd84a34a204bcf6deecf74360e01069b3396435dfad83fc12162fb347d704bf51e6a95301b9ef768b93185551f763523e6344fee27cd

data/lib/inline_forms_installer/creator.rb

@@ -67,6 +67,25 @@ module InlineFormsInstaller
         exit 1
       end
 
+      # The example app always generates Photo / Apartment / Owner; the
+      # installer always generates Locale / Role (and the Devise-backed user
+      # model with the chosen class name). Reject `-U <reserved>` early
+      # rather than letting `rails g inline_forms` collide with an
+      # already-generated app/models/<reserved>.rb at install time.
+      example_reserved = %w[Photo Apartment Owner].freeze
+      installer_reserved = %w[Locale Role].freeze
+      if installer_reserved.include?(user_model_cfg.class_name)
+        say "Error: -U #{user_model_cfg.class_name} conflicts with an installer-generated model " \
+            "(#{installer_reserved.join(', ')}); choose a different class name.", :red
+        exit 1
+      end
+      if install_example? && example_reserved.include?(user_model_cfg.class_name)
+        say "Error: -U #{user_model_cfg.class_name} conflicts with an --example model " \
+            "(#{example_reserved.join(', ')}); choose a different class name " \
+            "or drop --example.", :red
+        exit 1
+      end
+
       inline_forms_version = InlineFormsInstaller.inline_forms_version
       # The Gemfile pins `gem "inline_forms", "~> 8"`, so Bundler resolves the
       # highest 8.x available on RubyGems at install time. The
@@ -122,7 +141,7 @@ module InlineFormsInstaller
           Gem::Specification
             .find_all_by_name("rails")
             .map(&:version)
-            .select { |v| v >= Gem::Version.new("8.0") && v < Gem::Version.new("8.1") }
+            .select { |v| v >= Gem::Version.new("8.1") && v < Gem::Version.new("8.2") }
             .max
         rescue StandardError
           nil

data/lib/inline_forms_installer/installer_core.rb

@@ -70,12 +70,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"
 
-# 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.
+# Creator invokes `rails _8.1.x_ new`, which emits `load_defaults 8.1` and removes
+# `new_framework_defaults_8_1.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 8.0'
+            'config.load_defaults 8.1'
 end
 
 add_source 'https://rubygems.org'
@@ -106,10 +106,10 @@ gem 'jquery-ui-rails', '4.0.3'
 # foundation-icons-sass-rails depended on sass-rails).
 gem 'mini_magick'
 gem 'mysql2'
-gem 'paper_trail', '~> 16.0'
-gem 'rails-i18n', '~> 8.0'
+gem 'paper_trail', '~> 17.0'
+gem 'rails-i18n', '~> 8.1'
 gem 'rails-jquery-autocomplete'
-gem 'rails', '~> 8.0'
+gem 'rails', '~> 8.1'
 gem 'rake'
 gem 'rvm'
 gem 'dartsass-rails'
@@ -285,7 +285,7 @@ create_file "db/migrate/" +
   Time.now.utc.strftime("%Y%m%d%H%M%S") +
   "_" +
   "#{user_cfg.devise_migration_basename}.rb", <<-DEVISE_MIGRATION.strip_heredoc
-class #{user_cfg.devise_migration_class} < ActiveRecord::Migration[8.0]
+class #{user_cfg.devise_migration_class} < ActiveRecord::Migration[8.1]
 
   def change
     create_table(:#{user_cfg.table_name}) do |t|
@@ -425,7 +425,7 @@ create_file "db/migrate/" +
   Time.now.utc.strftime("%Y%m%d%H%M%S") +
   "_" +
   "#{user_cfg.join_migration_basename}.rb", <<-ROLES_MIGRATION.strip_heredoc
-  class #{user_cfg.join_migration_class} < ActiveRecord::Migration[8.0]
+  class #{user_cfg.join_migration_class} < ActiveRecord::Migration[8.1]
     def self.up
       create_table  :#{user_cfg.join_table}, :id => false, :force => true do |t|
         t.integer   :role_id
@@ -840,7 +840,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[8.0]
+    class AddOwnerToApartments < ActiveRecord::Migration[8.1]
       def change
         add_reference :apartments, :owner, null: true, foreign_key: true
       end
@@ -919,7 +919,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[8.0]
+    class SeedExampleApartmentsAndOwners < ActiveRecord::Migration[8.1]
       # ---------------------------------------------------------------
       # Apartment seed gallery
       # ---------------------------------------------------------------

data/lib/inline_forms_installer/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inline_forms_installer
 version: !ruby/object:Gem::Version
-  version: 8.1.1
+  version: 8.1.3
 platform: ruby
 authors:
 - Ace Suares
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.12
 specification_version: 4
 summary: CLI and Rails app template for generating inline_forms applications.
 test_files: []