inline_forms_installer 7.13.16 → 7.13.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96167ccff7679d08e833d0d7b3bcecf8b9ec9fa2f950f93a38041bfd99c21177
-  data.tar.gz: 7984f59c8a809a5e65b768f7f856c5f1cb4a4fc42171d961c181141f7e1efed5
+  metadata.gz: 65af883a40498b32b176ba59f105d6fa81c739a76426f484b689e29171814ba3
+  data.tar.gz: e6a35bc454545c6f70b0ecf87b15cbbcdc392de47ad687147e8f924a8f022e08
 SHA512:
-  metadata.gz: 58abafb930ddc25949d072411880a0bcf322e8dd512b5d4d82fe0bf8fb1fe93d9cd2d5521afa773995fc062bec37ac7a98d0d738a601d98b7e2b2ab6133430ea
-  data.tar.gz: 50a6a526fc398ae983955d003c1ac6317c3ffb45ea508941a3d5a182dc3c7c2aacd110bbd230449ea2129d161f28d82d6f06c3fa2a5a7b4de5ef0681e87f8472
+  metadata.gz: f1505bdbbf6eb2beca0e7c7b59cc702d6d5be3661dc580d27cc127f85a24ba21d523e3c6590134fb516858b6038bb160ae9a383eedcbd521241874b2bed57266
+  data.tar.gz: 67ff20e3683741e532f6e85d635b4eb27c9cfe2e8535fac939e4cb5c995c0df96750c82131e67b01aca2d35a95324f56ec18dacb149f079a0da44e6e985d3375

data/lib/inline_forms_installer/creator.rb

@@ -60,7 +60,14 @@ module InlineFormsInstaller
       end
 
       inline_forms_version = InlineFormsInstaller.inline_forms_version
-      say "Creating #{app_name} with inline_forms v#{inline_forms_version} and development database #{database}...", :green
+      # The Gemfile pins `gem "inline_forms", "~> 7"`, so Bundler resolves the
+      # highest 7.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
+      # `print_create_summary` read the actual locked versions from the
+      # generated app's Gemfile.lock once `bundle install` is done.
+      say "Creating #{app_name} (inline_forms ~> 7) with development database #{database}...", :green
 
       regex = /\A[0-9a-zA-Z][0-9a-zA-Z_-]+[0-9a-zA-Z]\Z/
       if !regex.match(app_name)
@@ -159,13 +166,31 @@ module InlineFormsInstaller
       end
     end
 
+    # Read the Bundler-locked version of `gem_name` from the generated app's
+    # Gemfile.lock so the install summary reports what actually shipped to
+    # the app, not what happens to be in the Creator's own gemset (the two
+    # can differ because the Gemfile pins `~> 7`).
+    def locked_gem_version(app_name, gem_name)
+      lock_path = File.expand_path(File.join(app_name, "Gemfile.lock"))
+      return nil unless File.file?(lock_path)
+
+      File.foreach(lock_path) do |line|
+        if (m = line.match(/^\s{4}#{Regexp.escape(gem_name)} \(([^)]+)\)/))
+          return m[1]
+        end
+      end
+      nil
+    end
+
     def print_create_summary(app_name, log_path, started_at, ran_example)
       duration = (Time.now - started_at).round(1)
       bundle_ok = bundle_check_ok?(app_name)
 
       test_summary = test_summary_from_log(log_path, ran_example)
 
-      if_ver = InlineFormsInstaller.inline_forms_version
+      if_ver = locked_gem_version(app_name, "inline_forms") ||
+               InlineFormsInstaller.inline_forms_version
+      vh_ver = locked_gem_version(app_name, "validation_hints")
       inst_ver = InlineFormsInstaller::VERSION
 
       InlineFormsInstaller::CreateLog.append_summary(
@@ -180,12 +205,12 @@ module InlineFormsInstaller
 
       say ""
       say "Install complete (#{duration}s)", :green
-      say "  inline_forms #{if_ver} / inline_forms_installer #{inst_ver}", :green
+      say "  inline_forms #{if_ver} / inline_forms_installer #{inst_ver}#{vh_ver ? " / validation_hints #{vh_ver}" : ''}", :green
       say "  bundle check: #{bundle_ok ? 'ok' : 'FAILED'}", bundle_ok ? :green : :red
       say "  tests: #{test_summary}", :green
       say "Install log: #{log_path}", :green
     end
-    private :print_create_summary, :test_summary_from_log, :bundle_check_ok?
+    private :print_create_summary, :test_summary_from_log, :bundle_check_ok?, :locked_gem_version
   end
 end
 

data/lib/inline_forms_installer/installer_core.rb

@@ -499,37 +499,6 @@ create_file 'config/initializers/paper_trail_yaml_safe_load.rb', <<-PT_YAML.stri
   ActiveRecord.yaml_column_permitted_classes |= Rails.application.config.active_record.yaml_column_permitted_classes
 PT_YAML
 
-# Create Translations
-say "- Generate models and tables and views for translations..." # TODO Translations need to be done in inline_forms, and then generate a yml file, perhaps
-generate "inline_forms", "InlineFormsLocale name:string inline_forms_translations:belongs_to _enabled:yes _presentation:\#{name}"
-sleep 1 # unique migration timestamps per generator
-generate "inline_forms", "InlineFormsKey name:string inline_forms_translations:has_many inline_forms_translations:associated _enabled:yes _presentation:\#{name}"
-sleep 1
-generate "inline_forms", "InlineFormsTranslation inline_forms_key:belongs_to inline_forms_locale:dropdown value:text interpolations:text is_proc:boolean _presentation:\#{value}"
-# Plain long text uses :plain_text; ActionText-backed fields use :rich_text.
-sleep 1 # to get unique migration number
-create_file "db/migrate/" +
-  Time.now.utc.strftime("%Y%m%d%H%M%S") +
-  "_" +
-  "inline_forms_create_view_for_translations.rb", <<-VIEW_MIGRATION.strip_heredoc
-  class InlineFormsCreateViewForTranslations < ActiveRecord::Migration[7.2]
-    def self.up
-      execute 'CREATE VIEW translations
-               AS
-                 SELECT L.name AS locale,
-                        K.name AS thekey,
-                        T.value AS value,
-                        T.interpolations AS interpolations,
-                        T.is_proc AS is_proc
-                   FROM inline_forms_keys K, inline_forms_locales L, inline_forms_translations T
-                     WHERE T.inline_forms_key_id = K.id AND T.inline_forms_locale_id = L.id '
-    end
-    def self.down
-      execute 'DROP VIEW translations'
-    end
-  end
-VIEW_MIGRATION
-
 say "- Creating application title via locales..."
 create_file "config/locales/inline_forms_local.en.yml", <<-END_LOCALE.strip_heredoc
   en:

data/lib/inline_forms_installer/version.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 module InlineFormsInstaller
-  VERSION = "7.13.16"
+  VERSION = "7.13.18"
 
   # 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: 7.13.16
+  version: 7.13.18
 platform: ruby
 authors:
 - Ace Suares