inline_forms_installer 8.1.58 → 8.1.60

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9e3599f9f0622e0fe6e64acfbf1679d07f83a10d5738b555404f1b2fa4a6694
-  data.tar.gz: d45293d3e30a531e61c9a10db1c31981ee58868c3d6830ee8da148eaa60919f7
+  metadata.gz: 216f417bd81b48d798076676ab738b5cccd3cb975dcd111bf7eec4d0c4209611
+  data.tar.gz: 6cc34bbd9d1579ff0be367a8b1ded62b35f0c303e02daec2e4079326ec71b617
 SHA512:
-  metadata.gz: be4bac316abc71fd2c200a10eb8d169b7aec2b3772bf44a6dfb2e35ccd1e99344f089ae790c0b6ec1a409f37ee5320ad2e1a2f9e6f3d56e682b15720b39d10fa
-  data.tar.gz: 321944c96eafdaa2ed8cd7b99825522c545aaa1dd26fc8b7604b00c0ca7727bbf87a557f2519b6bbf84ad2bec2915c7ac511334d618b162549c3619a6af752d1
+  metadata.gz: b3330d050fb3a4d7fc9995e26a032736c00e28c1df3d1cdd57a7a3adbeae7da4826fb90114807799fc0dd110084840ed18f2139b19e0af9a43c2e53196ac25cb
+  data.tar.gz: e662affa087a5c224743d3c76d28d0829cb6261ef2353d5a790a891c85cd60479ed05d8a5897b29c4f0923754949c3457d8e41f7f3447312564726ffe1253327

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
 
@@ -1212,9 +1259,13 @@ if ENV['install_example'] == 'true'
       end
 
       def down
+        # apartments.owner_id and apartments.phase_id have foreign keys:
+        # release the apartments (seeded or not) that point at a seeded owner
+        # or phase before destroying it, or destroy raises.
         OWNERS.each do |spec|
-          owner = Owner.find_by(name: spec[:name])
-          owner&.destroy
+          owner = Owner.find_by(name: spec[:name]) or next
+          Apartment.where(owner_id: owner.id).update_all(owner_id: nil)
+          owner.destroy
         end
         APARTMENTS.each do |spec|
           apt = Apartment.find_by(name: spec[:name])
@@ -1223,6 +1274,11 @@ if ENV['install_example'] == 'true'
           apt.photos.destroy_all
           apt.destroy
         end
+        PHASES.each do |spec|
+          phase = Phase.find_by(name: spec[:name]) or next
+          Apartment.where(phase_id: phase.id).update_all(phase_id: nil)
+          phase.destroy
+        end
       end
     end
   SEED_MIGRATION

data/lib/inline_forms_installer/version.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 
 module InlineFormsInstaller
-  VERSION = "8.1.58"
+  VERSION = "8.1.60"
 
   # 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

@@ -23,8 +23,18 @@ Rails.application.config.dartsass.builds = {
 # 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')}"
+# and gem stylesheet changes never reach the app.
+#
+# The gem dir goes in front of the runner's own --load-path list, as a
+# separate argument: not in build_options (the runner splits every entry there
+# on whitespace, which breaks a gem path with a space in it) and not first on
+# config.assets.paths (Sprockets would then resolve inline_forms/*.css to the
+# gem's .scss instead of the compiled build).
+require "dartsass/runner"
+
+module InlineFormsDartsassLoadPath
+  def dartsass_load_paths
+    [ "--load-path", InlineForms::Engine.root.join("app/assets/stylesheets").to_s ] + super
+  end
+end
+Dartsass::Runner.singleton_class.prepend(InlineFormsDartsassLoadPath)

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

@@ -17,7 +17,8 @@ class ExampleAppDartsassBuildTest < ActiveSupport::TestCase
     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]
+    # Two arguments, so a gem path with a space stays one argument.
+    assert_equal [ "--load-path", gem_stylesheets ], command[first_load_path, 2]
   end
 
   %w[inline_forms devise].each do |entry|

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inline_forms_installer
 version: !ruby/object:Gem::Version
-  version: 8.1.58
+  version: 8.1.60
 platform: ruby
 authors:
 - Ace Suares
@@ -103,6 +103,7 @@ files:
 - 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