inline_forms_installer 8.1.2 → 8.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9e1c36cd2a99018033b6df98c71975da7c4bcb4b86938c61a74ff73a03cff68
-  data.tar.gz: faed808a013aa9ad85dc1058248bbc4297f99c5bfaecca2b1e415be4bb778aa7
+  metadata.gz: 8aab65c5a20c0e070c304623d7498286d6cb8c06d883863d309c8005a230aaa5
+  data.tar.gz: 6a241f0384dc7f8bbee8aa1d61cc08c2226ee1ce93ea6ae584f8f455906e8a77
 SHA512:
-  metadata.gz: 5134c15fa5725d6688ee2359beb837977ef2a7ca3aa00707aefcf79a03c38f561063f08382207fe070d27f403e8fb21b0410fd825743fa986261e1f96a2bbf6d
-  data.tar.gz: 8b4f20c765f50b271e588467bbb3670e3b8b1677fa2cfd1a5e40217a83c20d253efb71bf0550998f3ea11669a421e8e8e897d360738d071326eb84c605c169f4
+  metadata.gz: 46b0762a885fcb3e9a56f47e8b91f6f26f4b6a2091548813923b1f9bb902fc604d3c4769dd7b561d80d0bc4b80a18b28abec4cdb515aa3c62b7b7317628f615c
+  data.tar.gz: ae5781053e3daf55d8336b533e76ed3e696032cbb62d3e0d74ed5e004a19faf2ca426b4cf4a56f3cc983b0761b0ca18fd0b62f3217d4276d35491acd53e4c949

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

data/lib/inline_forms_installer/installer_core.rb

@@ -106,7 +106,7 @@ 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 'paper_trail', '~> 17.0'
 gem 'rails-i18n', '~> 8.1'
 gem 'rails-jquery-autocomplete'
 gem 'rails', '~> 8.1'
@@ -368,6 +368,11 @@ create_file user_cfg.model_path, <<-USER_MODEL.strip_heredoc
     # via `#{user_cfg.class_name}.inline_forms_list`). Avoids `default_scope`
     # so callers can `unscope`/`reorder` cleanly when needed.
     scope :inline_forms_list, -> { order(:name, :id) }
+    # Search box on /#{user_cfg.plural_route} filters by name OR email. Without this
+    # the controller would `merge(ApplicationRecord.inline_forms_search(q))`,
+    # which is the no-op `all` fallback, and the query string would be silently
+    # ignored.
+    scope :inline_forms_search, ->(q) { where("name LIKE :q OR email LIKE :q", q: "%\#{q}%") }
 
     def _presentation
       "\#{name}"
@@ -404,6 +409,18 @@ create_file user_cfg.model_path, <<-USER_MODEL.strip_heredoc
   end
 USER_MODEL
 
+# inline_forms initializer (must exist before subsequent `rails g inline_forms`
+# runs so the generator's `add_tab` step can inject each generated model's
+# route token into `MODEL_TABS`). Pre-seeded with the user-model route
+# (the user model is hand-written above, not generated, so the generator
+# never sees it).
+say "- Creating inline_forms initializer (MODEL_TABS seeded with #{user_cfg.plural_route})"
+create_file "config/initializers/inline_forms.rb", <<-END_INITIALIZER.strip_heredoc
+  Rails.application.reloader.to_prepare do
+    MODEL_TABS = %w(#{user_cfg.plural_route} )
+  end
+END_INITIALIZER
+
 # Create Locales
 say "- Create locales"
 generate "inline_forms", "Locale name:string title:string #{user_cfg.table_name}:has_many _enabled:yes _list_order:title _presentation:\#{title}"
@@ -545,13 +562,6 @@ create_file "app/helpers/application_helper.rb", <<-END_APPHELPER.strip_heredoc
   end
 END_APPHELPER
 
-say "- Creating inline_forms initializer"
-create_file "config/initializers/inline_forms.rb", <<-END_INITIALIZER.strip_heredoc
-  Rails.application.reloader.to_prepare do
-    MODEL_TABS = %w()
-  end
-END_INITIALIZER
-
 say "- Recreating ApplicationController to add devise, cancan, I18n stuff..."
 remove_file "app/controllers/application_controller.rb" # the one that 'rails new' created
 create_file "app/controllers/application_controller.rb", <<-END_APPCONTROLLER.strip_heredoc

data/lib/inline_forms_installer/version.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 module InlineFormsInstaller
-  VERSION = "8.1.2"
+  VERSION = "8.1.4"
 
   # 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.2
+  version: 8.1.4
 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: []