inline_forms_installer 8.1.57 → 8.1.59

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d1734105bfa07ffb1a5a27e0c52fcc41ea5cbd8aac7db548ef6601493c3b492
-  data.tar.gz: d22858fa2313b583b881fc7f7ec69b224566be4412311f9ec5f458c912b171db
+  metadata.gz: 9a8fb98ca32062518006ec1a4f24690cc6e4f8a55c313ca47634e378ee689e0b
+  data.tar.gz: 63b4e47b930c8e49f99bef7973f92198508cb51d127d792902d3d63e5559ccce
 SHA512:
-  metadata.gz: 759e2f5a92aa54b3fcf125b311a55b80ba00bcc0f3247564510d04753ed091be6f5d15603fa816232dd0d8ff63df1dda501f3f8118edf86de9d7f89276a94473
-  data.tar.gz: 937571d49fb60a4fc83db7e789bab6a971287e5f1a4e50112f25b7c793a69273c69349c22dced242d1972344b5142b5faa718da1d5731ce0c6b7e711360b3053
+  metadata.gz: e57494b801e1a3f13b78be90ba7d76d5346fefe4ac14d01a2bd1b4a4e1cd62b745f7486fd34d5a5df3563b24ec5a389eb1149b4366b08f968754c1476cd28381
+  data.tar.gz: bf33012b7318a8f7aceea64dad2c203634295826410f964144b066eba0eab815f605671e84c03c952699934cefe98b524965f0f077e86ed9d1f1d9e2761f94e2

data/lib/inline_forms_installer/installer_core.rb

@@ -1095,11 +1095,40 @@ if ENV['install_example'] == 'true'
     end
   OWNERS_CTRL
 
+  # Phase -- a lookup whose dropdown follows its dropdown_order column
+  # (inline_forms 8.1.59, InlineForms::DropdownOrder): '---' first, then the
+  # process phases in process order. Its list (/phases) is alphabetical
+  # (_list_order:name) and the seed creates the rows in yet another order,
+  # so the dropdown order is visibly neither id nor name order.
+  say "- Generating Phase lookup (dropdown ordered by dropdown_order)..."
+  sleep 1
+  run %q{bundle exec rails g inline_forms Phase name:string dropdown_order:integer_field _enabled:yes _list_order:name _presentation:'#{name}'}
+
+  say "- Adding phase_id to apartments + belongs_to :phase..."
+  sleep 1
+  add_phase_ts = Time.now.utc.strftime("%Y%m%d%H%M%S")
+  create_file "db/migrate/#{add_phase_ts}_add_phase_to_apartments.rb", <<-ADD_PHASE.strip_heredoc
+    class AddPhaseToApartments < ActiveRecord::Migration[8.1]
+      def change
+        add_reference :apartments, :phase, null: true, foreign_key: true
+      end
+    end
+  ADD_PHASE
+
+  inject_into_file "app/models/apartment.rb",
+                   "  belongs_to :phase, optional: true\n",
+                   after: "class Apartment < ApplicationRecord\n"
+
+  # The :phase dropdown row goes right below :owner.
+  gsub_file "app/models/apartment.rb",
+            /     \[ :owner, :dropdown \], \n/,
+            "     [ :owner, :dropdown ], \n     [ :phase, :dropdown ], \n"
+
   # Seed the example app with 3 apartments + 3 owners and assign photos
   # from db/seed_images. Runs as a regular migration so `bundle exec rake
   # db:migrate` (and `rails db:setup` on a fresh checkout) populates the
   # demo gallery in one shot. Idempotent via find_or_create_by!.
-  say "- Generating seed migration (3 apartments + 3 owners + photo gallery)..."
+  say "- Generating seed migration (3 apartments + 3 owners + 4 phases + photo gallery)..."
   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
@@ -1147,6 +1176,17 @@ if ENV['install_example'] == 'true'
           apartments: [] },
       ].freeze
 
+      # Phases, created in neither name nor dropdown order: the apartment
+      # dropdown shows ---, helprequest, decision, admittance (dropdown_order);
+      # /phases lists them by name.
+      PHASES = [
+        { name: "decision",    dropdown_order: 20 },
+        { name: "admittance",  dropdown_order: 30 },
+        { name: "---",         dropdown_order: 0 },
+        { name: "helprequest", dropdown_order: 10 },
+      ].freeze
+      APARTMENT_PHASES = { "Apt 1" => "helprequest", "Apt 2" => "decision", "Apt 3" => "---" }.freeze
+
       # Comments seeded on each apartment's first photo (Apartment ->
       # Photo -> Comment: the second nesting level).
       COMMENTS = [
@@ -1160,6 +1200,10 @@ if ENV['install_example'] == 'true'
           Dir.glob(seed_dir.join("*.{png,jpg,jpeg,gif}"), File::FNM_CASEFOLD).sort :
           []
 
+        PHASES.each do |spec|
+          Phase.find_or_create_by!(name: spec[:name]) { |ph| ph.dropdown_order = spec[:dropdown_order] }
+        end
+
         apt_records = {}
         APARTMENTS.each_with_index do |spec, idx|
           apt = Apartment.find_or_create_by!(name: spec[:name]) do |a|
@@ -1193,6 +1237,9 @@ if ENV['install_example'] == 'true'
             end
           end
 
+          phase = Phase.find_by(name: APARTMENT_PHASES[spec[:name]])
+          apt.update!(phase: phase) if phase && apt.phase_id != phase.id
+
           apt_records[spec[:name]] = apt
         end
 
@@ -1223,6 +1270,7 @@ if ENV['install_example'] == 'true'
           apt.photos.destroy_all
           apt.destroy
         end
+        PHASES.each { |spec| Phase.find_by(name: spec[:name])&.destroy }
       end
     end
   SEED_MIGRATION

data/lib/inline_forms_installer/version.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 
 module InlineFormsInstaller
-  VERSION = "8.1.57"
+  VERSION = "8.1.59"
 
   # Canonical bare Ruby version (must match gemspec `required_ruby_version`).
   # Written verbatim into generated apps' `.ruby-version` for rbenv/chruby/asdf/

data/lib/installer_templates/dartsass/inline_forms_dartsass_builds.rb

@@ -12,3 +12,19 @@ Rails.application.config.dartsass.builds = {
   "inline_forms_install/inline_forms_main.scss" => "inline_forms/inline_forms.css",
   "inline_forms_install/devise_main.scss" => "inline_forms/devise.css"
 }
+
+# SELF-IMPORT GUARD: put the inline_forms gem's stylesheet dir FIRST on the
+# Sass load path. Dartsass::Runner assembles
+#   dartsass <build_options> --load-path app/assets/stylesheets
+#            --load-path <each config.assets.paths entry> <in:out ...>
+# and Dart Sass takes the first load path that has a match. app/assets/builds
+# is on config.assets.paths BEFORE the gem, and a plain .css file is importable
+# by Sass, so `@use "inline_forms/inline_forms"` (and ".../devise") in the
+# inline_forms_install/*_main.scss entries would resolve to the PREVIOUS OUTPUT
+# app/assets/builds/inline_forms/{inline_forms,devise}.css instead of the gem's
+# .scss: from the second build on, each build re-imports its own stale result
+# and gem stylesheet changes never reach the app. build_options precede the
+# load paths in the command, so this --load-path wins. Single token on
+# purpose: the runner splits every build_options entry on whitespace.
+Rails.application.config.dartsass.build_options <<
+  "--load-path=#{InlineForms::Engine.root.join('app/assets/stylesheets')}"

data/lib/installer_templates/example_app_tests/test/integration/example_app_dartsass_build_test.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require "test_helper"
+require "dartsass/runner"
+require "sass-embedded"
+
+# config/initializers/inline_forms_dartsass_builds.rb puts the gem's
+# stylesheet dir first on the Sass load path. Without it,
+# app/assets/builds (ahead of the gem in config.assets.paths) shadows the
+# gem's .scss: `@use "inline_forms/inline_forms"` in the
+# inline_forms_install/*_main.scss entries re-imports the app's previous
+# compiled CSS, and gem stylesheet changes never reach the app after its
+# first build. test_helper runs dartsass:build, so by now builds/ already held
+# a previous build when this run's one ran.
+class ExampleAppDartsassBuildTest < ActiveSupport::TestCase
+  test "the gem stylesheet dir is the first Sass load path" do
+    command = Dartsass::Runner.dartsass_compile_command
+    first_load_path = command.index { |arg| arg == "--load-path" || arg.start_with?("--load-path=") }
+
+    assert_equal "--load-path=#{gem_stylesheets}", command[first_load_path]
+  end
+
+  %w[inline_forms devise].each do |entry|
+    test "builds/inline_forms/#{entry}.css is compiled from the gem's #{entry}.scss" do
+      built = Rails.root.join("app/assets/builds/inline_forms/#{entry}.css")
+      assert built.file?, "#{built} missing; dartsass:build did not run"
+
+      expected = Sass.compile(File.join(gem_stylesheets, "inline_forms", "#{entry}.scss"),
+                              load_paths: load_paths, style: :compressed,
+                              logger: Sass::Logger.silent).css
+      assert_equal expected.strip, built.read.strip,
+        "#{entry}.css differs from a direct compile of the gem's #{entry}.scss " \
+        "(re-imported a stale app/assets/builds/inline_forms/#{entry}.css?)"
+    end
+  end
+
+  private
+
+  def gem_stylesheets
+    InlineForms::Engine.root.join("app/assets/stylesheets").to_s
+  end
+
+  # The gem's stylesheets, then the app's asset paths without app/assets/builds.
+  def load_paths
+    [ gem_stylesheets ] + Rails.application.config.assets.paths.map(&:to_s)
+                                .reject { |path| path.end_with?("app/assets/builds") }
+  end
+end

data/lib/installer_templates/example_app_tests/test/integration/example_app_phase_dropdown_test.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require_relative "../example_app/example_integration_test_case"
+
+# Phase (inline_forms 8.1.59): a lookup with a dropdown_order column. The
+# apartment's phase dropdown follows dropdown_order ('---' first, then the
+# phases in process order), not id order and not the alphabetical list order
+# of /phases. See InlineForms::DropdownOrder.
+class ExampleAppPhaseDropdownTest < ExampleAppIntegrationTestCase
+  PHASES = { "decision" => 20, "admittance" => 30, "---" => 0, "helprequest" => 10 }.freeze
+
+  setup do
+    PHASES.each do |name, position|
+      Phase.find_or_create_by!(name: name) { |phase| phase.dropdown_order = position }
+    end
+    @apartment = Apartment.find_or_create_by!(name: "Phase Apt") { |a| a.title = "Phase Title" }
+  end
+
+  test "the apartment phase dropdown follows dropdown_order" do
+    frame = "apartment_#{@apartment.id}_phase"
+    get edit_apartment_path(@apartment, attribute: "phase", form_element: "dropdown", update: frame),
+        headers: { "Turbo-Frame" => frame }
+
+    assert_response :success
+    options = @response.body.scan(%r{<option(?: [^>]*)?>([^<]*)</option>}).flatten
+    assert_equal [ "---", "helprequest", "decision", "admittance" ], options
+  end
+
+  test "choosing a phase in the dropdown saves it" do
+    frame = "apartment_#{@apartment.id}_phase"
+    decision = Phase.find_by!(name: "decision")
+
+    put apartment_path(@apartment, attribute: "phase", form_element: "dropdown", update: frame),
+        params: { _apartment: { phase_id: decision.id } }, headers: { "Turbo-Frame" => frame }
+
+    assert_response :success
+    assert_equal decision, @apartment.reload.phase
+  end
+
+  test "the phases list stays in its own (alphabetical) list order" do
+    get phases_path
+
+    assert_response :success
+    positions = %w[admittance decision helprequest].map { |name| @response.body.index(">#{name}<") }
+    assert positions.all?, "every phase is listed"
+    assert_equal positions.sort, positions
+  end
+end

data/lib/installer_templates/example_app_tests/test/integration/example_app_sass_deprecations_test.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require "test_helper"
+require "sass-embedded"
+
+# Sass @import is removed in Dart Sass 3. Since 8.1.58 the gem's entry points
+# load foundation_and_overrides with @use; the only gem @imports left are the
+# three in foundation_and_overrides.scss that wait for the Foundation decision
+# (see the module-system note in inline_forms/inline_forms.scss). Compiles
+# both entry points from the installed gem, with every deprecation reported
+# (verbose), and fails if the gem gains an @import or an entry point compiles
+# with more [import] warnings than 8.1.58 had.
+class ExampleAppSassDeprecationsTest < ActiveSupport::TestCase
+  GEM_IMPORTS_LEFT = [
+    "foundation_and_overrides.scss 'settings/settings'",
+    "foundation_and_overrides.scss 'foundation'",
+    "foundation_and_overrides.scss 'theme'"
+  ].freeze
+  # 8.1.58 with foundation-rails 6.9.0.0: the three above + 114 inside Foundation.
+  MAX_IMPORT_WARNINGS = 117
+
+  %w[inline_forms devise].each do |entry|
+    test "#{entry}.scss compiles without new @import deprecations" do
+      imports = import_deprecations(entry)
+
+      gem_imports = imports.select { |span| span.url.start_with?(gem_stylesheets_url) }
+                           .map { |span| "#{File.basename(span.url)} #{span.text}" }
+      assert_empty gem_imports - GEM_IMPORTS_LEFT,
+        "#{entry}.scss: new @import in the gem; load it with @use"
+      assert_operator imports.size, :<=, MAX_IMPORT_WARNINGS,
+        "#{entry}.scss: more [import] deprecations than 8.1.58"
+    end
+  end
+
+  private
+
+  def gem_stylesheets
+    InlineForms::Engine.root.join("app/assets/stylesheets").to_s
+  end
+
+  def gem_stylesheets_url
+    "file://#{gem_stylesheets}/"
+  end
+
+  # The gem's stylesheets first, then the app's asset paths without
+  # app/assets/builds (its compiled inline_forms/*.css would shadow the .scss).
+  def load_paths
+    [ gem_stylesheets ] + Rails.application.config.assets.paths.map(&:to_s)
+                                .reject { |path| path.end_with?("app/assets/builds") }
+  end
+
+  def import_deprecations(entry)
+    spans = []
+    logger = {
+      warn: lambda do |_message, context|
+        spans << context.span if context.deprecation && context.deprecation_type == "import"
+      end
+    }
+    Sass.compile(File.join(gem_stylesheets, "inline_forms", "#{entry}.scss"),
+                 load_paths: load_paths, style: :compressed, verbose: true, logger: logger)
+    spans
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inline_forms_installer
 version: !ruby/object:Gem::Version
-  version: 8.1.57
+  version: 8.1.59
 platform: ruby
 authors:
 - Ace Suares
@@ -97,16 +97,19 @@ files:
 - lib/installer_templates/example_app_tests/test/integration/example_app_apartment_top_level_new_test.rb
 - lib/installer_templates/example_app_tests/test/integration/example_app_apartment_top_level_pagination_test.rb
 - lib/installer_templates/example_app_tests/test/integration/example_app_apartment_versions_turbo_test.rb
+- lib/installer_templates/example_app_tests/test/integration/example_app_dartsass_build_test.rb
 - lib/installer_templates/example_app_tests/test/integration/example_app_devise_passwords_test.rb
 - lib/installer_templates/example_app_tests/test/integration/example_app_devise_sign_in_test.rb
 - lib/installer_templates/example_app_tests/test/integration/example_app_guest_access_test.rb
 - lib/installer_templates/example_app_tests/test/integration/example_app_layout_title_test.rb
 - lib/installer_templates/example_app_tests/test/integration/example_app_owner_tabs_test.rb
+- lib/installer_templates/example_app_tests/test/integration/example_app_phase_dropdown_test.rb
 - lib/installer_templates/example_app_tests/test/integration/example_app_photo_comments_test.rb
 - lib/installer_templates/example_app_tests/test/integration/example_app_photo_revert_test.rb
 - lib/installer_templates/example_app_tests/test/integration/example_app_photos_test.rb
 - lib/installer_templates/example_app_tests/test/integration/example_app_production_ssl_test.rb
 - lib/installer_templates/example_app_tests/test/integration/example_app_routing_test.rb
+- lib/installer_templates/example_app_tests/test/integration/example_app_sass_deprecations_test.rb
 - lib/installer_templates/example_app_tests/test/integration/example_app_schema_edit_test.rb
 - lib/installer_templates/example_app_tests/test/integration/example_app_showcase_choice_scale_fields_test.rb
 - lib/installer_templates/example_app_tests/test/integration/example_app_showcase_date_time_fields_test.rb