inline_forms 7.0.4 → 7.2.10

data/app/views/inline_forms/_list.html.erb

@@ -41,7 +41,20 @@
   <% end %>
 <% end %>
 
-<%= raw "<div class=\"list_container\" id=\"#{update_span}\">" if ul_needed -%>
+<%#
+  Container element. For the nested has_many case (parent_class set) we
+  emit a `<turbo-frame>` so pagination clicks (and any future in-frame
+  re-render of this list) swap only the matching frame instead of doing
+  a full-page navigation. Top-level lists (parent_class.nil?) keep the
+  classic <div> + full-page pagination they already had.
+-%>
+<% if ul_needed -%>
+  <% if parent_class.nil? -%>
+    <%= raw "<div class=\"list_container\" id=\"#{update_span}\">" -%>
+  <% else -%>
+    <%= raw "<turbo-frame id=\"#{update_span}\" class=\"list_container\">" -%>
+  <% end -%>
+<% end -%>
 
 <!--  # list of objects -->
 <% for object in objects %>
@@ -52,7 +65,30 @@
     <% css_class_id = parent_class.to_s.underscore + '_' + parent_id.to_s + '_' + attribute.to_s.singularize.underscore + "_" + object.id.to_s -%>
     <% path_to_object = attribute.to_s.singularize.underscore + "_path" %>
   <% end %>
-  <div class="row <%= cycle('odd', 'even') %><%= " top-level" if parent_class.nil? %>" id="<%= css_class_id -%>">
+  <%#
+    For NESTED rows (parent_class present) the surrounding
+    <turbo-frame> would otherwise intercept the UJS-driven inline-edit
+    links/forms swapped in by show.js.erb / edit.js.erb / new.js.erb
+    -- those all do `$('#<row_id>').html(...)`, so the swapped content
+    stays a descendant of this row. Turbo would submit the multipart
+    `<form>` from _edit.html.erb with `Accept: text/html`, which
+    inline_forms_controller's update / create / destroy only respond
+    to via format.js, raising `ActionController::UnknownFormat` (HTTP
+    406) AFTER the DB write already happened. `data-turbo="false"`
+    here keeps UJS handling those, unchanged.
+
+    For TOP-LEVEL rows (parent_class.nil?) there is no surrounding
+    frame, so the attribute would be a no-op for the row's own click
+    -- BUT after UJS swaps in the inline edit (which itself contains
+    the nested-photos `<turbo-frame>`), Turbo's `elementIsNavigatable`
+    walks up from any link inside that inner frame looking for the
+    closest `[data-turbo]` ancestor; it does NOT stop at the
+    intervening `<turbo-frame>`. A `data-turbo="false"` on the
+    top-level row therefore poisons every descendant including the
+    pagination links inside the inner photos frame, breaking
+    in-frame navigation. So we only emit it on nested rows.
+  -%>
+  <div class="row <%= cycle('odd', 'even') %><%= " top-level" if parent_class.nil? %>" id="<%= css_class_id -%>"<%= raw ' data-turbo="false"' unless parent_class.nil? %>>
     <% if cancan_disabled? || ( can? :soft_delete, object ) %>
       <div  class="small-1 column">
         <%= link_to_soft_delete(object, css_class_id) -%>
@@ -77,7 +113,25 @@
   <% pagination = will_paginate objects -%>
 <% else %>
   <% if pagination %>
-    <% pagination = will_paginate objects, :remote => true, :params => {:controller => attribute, :action => :index, :id => nil, :parent_class => parent_class, :parent_id => parent_id, :update => "#{parent_class.to_s.underscore}_#{parent_id}_#{attribute}", :ul_needed => true  } %>
+    <%#
+      Nested pagination is now driven by the surrounding <turbo-frame>:
+      the link's same-URL GET returns a fresh frame and Turbo swaps
+      just that region. No more remote: true + list.js.erb on the
+      pagination path.
+
+      The `update:` param must match the frame's id (`<update_span>`,
+      which is `…_list`). The legacy UJS pagination passed the OUTER
+      wrapper's id (`…` without `_list`) because list.js.erb did
+      `$('#<outer>').html(<rendered _list partial>)` and needed the
+      outer container, not the inner one. Turbo Frames swaps the
+      element with the matching id, so the param now carries the
+      frame id itself; otherwise the response (`<turbo-frame
+      id="…_list">`) and the request expectation (`Turbo-Frame:
+      <update_span>` derived from the URL `update=…` param) would
+      disagree and Turbo would log "the response did not contain the
+      expected <turbo-frame>" and ignore the page.
+    -%>
+    <% pagination = will_paginate objects, :params => {:controller => attribute, :action => :index, :id => nil, :parent_class => parent_class, :parent_id => parent_id, :update => "#{parent_class.to_s.underscore}_#{parent_id}_#{attribute}_list", :ul_needed => true } %>
   <% end %>
 <% end %>
 <% if pagination %>
@@ -87,4 +141,10 @@
     </div>
   </div>
 <% end %>
-<%= raw "</div>" if ul_needed -%>
+<% if ul_needed -%>
+  <% if parent_class.nil? -%>
+    <%= raw "</div>" -%>
+  <% else -%>
+    <%= raw "</turbo-frame>" -%>
+  <% end -%>
+<% end -%>

data/app/views/inline_forms/_versions_list.html.erb

@@ -13,82 +13,91 @@
       %>
   </div>
 </div>
+<%#
+  Header / per-entry rows: every entry was previously wrapped in a single
+  `<div class='small-12 column'>` whose direct children were `.small-N
+  column` divs. F5's float-based grid floated them side-by-side because
+  every `.column` was `float: left`; F6's flex grid only makes the direct
+  children of `.row` flex items, so once those `.small-N column` divs sit
+  inside a plain `.column` (not a `.row`) they collapse to stacked blocks
+  -- which is why opening Versions on F6 rendered Event/Done by/Changeset
+  vertically and the per-entry restore/timestamp/changeset cells one per
+  line. Each entry is now its own `<div class="row">` whose direct
+  children ARE the cell columns, so F6's flex grid lays them out
+  horizontally and the partial keeps F5's visual layout.
+-%>
 <div class="row <%= cycle('odd', 'even') %>">
-  <div class='small-12 column'>
-      <div class="small-1 column">
-        &nbsp;
-      </div>
-      <div  class="small-1 column">
-        <strong>Event</strong>
-      </div>
-      <div  class="small-2 column">
-        <strong>Done by</strong>
-      </div>
-      <div  class="small-8 column">
-        <strong>Changeset</strong>
-      </div>
+  <div class="small-1 column">
+    &nbsp;
+  </div>
+  <div class="small-1 column">
+    <strong>Event</strong>
+  </div>
+  <div class="small-2 column">
+    <strong>Done by</strong>
+  </div>
+  <div class="small-8 column">
+    <strong>Changeset</strong>
   </div>
 </div>
-<div class="row <%= cycle('odd', 'even') %>">
-  <% entries.reverse.each do |entry| %>
-    <% version = entry[:version] -%>
-    <% rich_text_name = entry[:rich_text_name] -%>
-    <div class='small-12 column'>
-      <div class="small-1 column">
-        <% if entry[:kind] == :primary %>
-          <%= link_to t('inline_forms.view.restore'),
-            send('revert_' + @object.class.to_s.underscore + "_path",
-              version,
-              :update => "#{@object.class.name.underscore}_#{@object.id}"
-            ),
-            :remote => true,
-            :method => :post
-          %>
-        <% else %>
-          &nbsp;
-        <% end %>
-      </div>
-      <div class="small-1 column">
-        <%= version.event -%><% if entry[:kind] == :rich_text %> <em>(rich text)</em><% end %>
-      </div>
-      <div  class="small-2 column">
-        <%= version.created_at -%>
-      </div>
-      <div  class="small-2 column">
-        <%= version_modified_by version.whodunnit -%>
-      </div>
-      <div  class="small-6 column">
-        <% if version.changeset.nil? || version.changeset.empty? %>
-          <em>empty</em>
-        <% else %>
-          <% version.changeset.each do |attribute, value| %>
-            <% next if attribute == 'updated_at' %>
-            <% next if entry[:kind] == :rich_text && attribute == 'record_id' %>
-            <% next if entry[:kind] == :rich_text && attribute == 'record_type' %>
-            <% next if entry[:kind] == :rich_text && attribute == 'name' %>
-            <% display_attribute = entry[:kind] == :rich_text && attribute == 'body' ? rich_text_name : attribute -%>
-            <table>
-              <tr>
-                <th colspan="2" class="text-center"><%= display_attribute %></th>
-                <th></th>
-              </tr>
-              <tr>
-                <td>old value</td>
-                <td>new value</td>
-              </tr>
-              <tr>
-                <% if entry[:kind] == :rich_text && attribute == 'body' %>
-                  <td><%= raw value[0] %></td>
-                  <td><%= raw value[1] %></td>
-                <% else %>
-                  <td><%= value[0] %></td>
-                  <td><%= value[1] %></td>
-                <% end %>
-              </tr>
-            </table>
-          <% end %>
+<% entries.reverse.each do |entry| %>
+  <% version = entry[:version] -%>
+  <% rich_text_name = entry[:rich_text_name] -%>
+  <div class="row <%= cycle('odd', 'even') %>">
+    <div class="small-1 column">
+      <% if entry[:kind] == :primary %>
+        <%= link_to t('inline_forms.view.restore'),
+          send('revert_' + @object.class.to_s.underscore + "_path",
+            version,
+            :update => "#{@object.class.name.underscore}_#{@object.id}"
+          ),
+          :remote => true,
+          :method => :post
+        %>
+      <% else %>
+        &nbsp;
+      <% end %>
+    </div>
+    <div class="small-1 column">
+      <%= version.event -%><% if entry[:kind] == :rich_text %> <em>(rich text)</em><% end %>
+    </div>
+    <div class="small-2 column">
+      <%= version.created_at -%>
+    </div>
+    <div class="small-2 column">
+      <%= version_modified_by version.whodunnit -%>
+    </div>
+    <div class="small-6 column">
+      <% if version.changeset.nil? || version.changeset.empty? %>
+        <em>empty</em>
+      <% else %>
+        <% version.changeset.each do |attribute, value| %>
+          <% next if attribute == 'updated_at' %>
+          <% next if entry[:kind] == :rich_text && attribute == 'record_id' %>
+          <% next if entry[:kind] == :rich_text && attribute == 'record_type' %>
+          <% next if entry[:kind] == :rich_text && attribute == 'name' %>
+          <% display_attribute = entry[:kind] == :rich_text && attribute == 'body' ? rich_text_name : attribute -%>
+          <table>
+            <tr>
+              <th colspan="2" class="text-center"><%= display_attribute %></th>
+              <th></th>
+            </tr>
+            <tr>
+              <td>old value</td>
+              <td>new value</td>
+            </tr>
+            <tr>
+              <% if entry[:kind] == :rich_text && attribute == 'body' %>
+                <td><%= raw value[0] %></td>
+                <td><%= raw value[1] %></td>
+              <% else %>
+                <td><%= value[0] %></td>
+                <td><%= value[1] %></td>
+              <% end %>
+            </tr>
+          </table>
         <% end %>
-      </div>
+      <% end %>
     </div>
-  <% end %>
-</div>
+  </div>
+<% end %>

data/app/views/layouts/application.html.erb

@@ -13,7 +13,16 @@
 
   <body>
     <%= yield %>
-    <%= javascript_include_tag "application", 'data-turbolinks-track' => true %>
+    <%= javascript_include_tag "application" %>
+    <%# Turbo (Hotwire) is loaded as an ES module so it does not collide with %>
+    <%# the classic-script Sprockets bundle above. Drive is disabled here so %>
+    <%# existing UJS-driven links/forms keep working unchanged; `<turbo-frame>` %>
+    <%# and `format.turbo_stream` remain available for per-view conversions. %>
+    <script type="module">
+      import { Turbo } from "<%= asset_path('turbo.min.js') %>"
+      Turbo.session.drive = false
+      window.Turbo = Turbo
+    </script>
     <%= javascript_include_tag "https://unpkg.com/trix@1.3.1/dist/trix.js" %>
     <%= javascript_include_tag Ckeditor.cdn_url if defined?(Ckeditor) %>
   </body>

data/app/views/layouts/inline_forms.html.erb

@@ -16,7 +16,17 @@
     <div id="outer_container">
       <%= yield %>
     </div>
-    <%= javascript_include_tag 'inline_forms/inline_forms', 'data-turbolinks-track' => true %>
+    <%= javascript_include_tag 'inline_forms/inline_forms' %>
+    <%# Turbo (Hotwire) is loaded as an ES module so it does not collide with %>
+    <%# the classic-script Sprockets bundle above (jquery_ujs etc.). Drive is %>
+    <%# disabled here so existing UJS-driven links/forms keep working unchanged; %>
+    <%# `<turbo-frame>` and `format.turbo_stream` are still available for the %>
+    <%# per-view conversions that follow this slice. %>
+    <script type="module">
+      import { Turbo } from "<%= asset_path('turbo.min.js') %>"
+      Turbo.session.drive = false
+      window.Turbo = Turbo
+    </script>
     <%= javascript_include_tag "https://unpkg.com/trix@1.3.1/dist/trix.js" %>
     <%= javascript_include_tag Ckeditor.cdn_url if defined?(Ckeditor) %>
   </body>

data/bin/inline_forms_app_template.rb

@@ -2,7 +2,9 @@ require 'rvm'
 
 if RVM.current && ENV['skiprvm'] !='true'
   rvm_version = "#{ENV['ruby_version']}@#{app_name}"
-  RVM.chdir "../#{app_name}" do
+  # Rails' `app_name` is underscored (e.g. my_app) while the directory may be
+  # camel-cased (MyApp); `../#{app_name}` breaks on case-sensitive filesystems.
+  RVM.chdir(File.expand_path(".")) do
     say "Working directory is #{`pwd`}"
     RVM.use_from_path! '.' # TODO ROYTJE FIX THIS BELOW
 # Warning! PATH is not properly set up, '/home/vagrant/.rvm/gems/ruby-2.0.0-p247@MyApp/bin' is not available,

data/bin/inline_forms_installer_core.rb

@@ -11,13 +11,20 @@ gem 'cancancan'
 gem 'carrierwave', '~> 3.1'
 gem 'devise-i18n', :git => 'https://github.com/acesuares/devise-i18n.git'
 gem 'devise'
-gem 'foundation-icons-sass-rails'
-gem 'foundation-rails', '~> 5.5'
+gem 'autoprefixer-rails'
+# foundation-rails 6.7+ uses Dart Sass (`sass:math`); sass-rails/sassc removed.
+# Visually tuned against foundation-rails ~> 6.6.2; current pin ~> 6.9 (6.9.0.x).
+gem 'foundation-rails', '~> 6.9'
 gem 'i18n-active_record', :git => 'https://github.com/acesuares/i18n-active_record.git'
 gem 'inline_forms', path: "#{File.expand_path(GENERATOR_PATH)}"
 gem 'jquery-rails'
 gem 'jquery-timepicker-rails'
-gem 'jquery-ui-sass-rails'
+# jQuery UI JavaScript (`//= require jquery.ui.all` in inline_forms.js). SCSS + PNGs
+# are vendored in the inline_forms engine (Dart Sass cannot evaluate sass-rails
+# `image-path()`). Pin matches former jquery-ui-sass-rails 4.0.3.x stack.
+gem 'jquery-ui-rails', '4.0.3'
+# Foundation Icons SCSS + fonts are vendored in the inline_forms engine (Dart Sass;
+# foundation-icons-sass-rails depended on sass-rails).
 gem 'mini_magick'
 gem 'mysql2'
 gem 'paper_trail', '~> 16.0'
@@ -27,13 +34,18 @@ gem 'rails', '~> 7.0.0'
 gem 'rake'
 gem 'remotipart', '~> 1.0'
 gem 'rvm'
-gem 'sass-rails'
+gem 'dartsass-rails'
 # Rails 7 no longer adds sprockets-rails to the default Gemfile; declare it
 # explicitly because the gem's own assets (foundation, jquery, etc.) live in
 # app/assets and rely on the Sprockets pipeline.
 gem 'sprockets-rails'
 # Rails 7 default JavaScript tooling: importmap-rails replaces Webpacker.
 gem 'importmap-rails'
+# Hotwire/Turbo. Loaded into the Sprockets bundle by inline_forms.js with
+# Turbo Drive disabled by default so existing UJS-driven links/forms keep
+# working; turbo-rails also registers the `turbo_stream` Mime type and view
+# format so future controllers can opt in to Turbo Stream responses.
+gem 'turbo-rails'
 gem 'tabs_on_rails', :git => 'https://github.com/acesuares/tabs_on_rails.git', :branch => 'update_remote_before_action'
 gem 'unicorn'
 gem 'validation_hints'
@@ -55,7 +67,6 @@ gem_group :development do
   gem 'seed_dump', '~> 0.5.3'
   # Rails 6.1 ActiveRecord's sqlite3 adapter requires sqlite3 ~> 1.4; 2.x activates first and breaks.
   gem 'sqlite3', '~> 1.4'
-  gem 'switch_user'
   gem 'thin'
   gem 'yaml_db'
 end
@@ -69,6 +80,27 @@ say "- Running bundle..."
 run "gem install bundler"
 run "bundle install"
 
+say "- Dart Sass: inline_forms stylesheet entrypoints + initializer..."
+copy_file File.join(GENERATOR_PATH, "lib/installer_templates/dartsass/inline_forms_dartsass_builds.rb"),
+          "config/initializers/inline_forms_dartsass_builds.rb"
+copy_file File.join(GENERATOR_PATH, "lib/installer_templates/dartsass/inline_forms_main.scss"),
+          "app/assets/stylesheets/inline_forms_install/inline_forms_main.scss"
+copy_file File.join(GENERATOR_PATH, "lib/installer_templates/dartsass/devise_main.scss"),
+          "app/assets/stylesheets/inline_forms_install/devise_main.scss"
+
+say "- Dart Sass: rails dartsass:install (builds/, manifest, Procfile.dev)..."
+run "bundle exec rails dartsass:install"
+
+say "- Dart Sass: drop default application.css (manifest links builds/*.css only)..."
+remove_file "app/assets/stylesheets/application.css"
+
+insert_into_file "test/test_helper.rb", <<~'DARTSASS_TEST', after: %(require "rails/test_help"\n)
+
+  # Dart Sass writes CSS to app/assets/builds; Sprockets does not compile .scss.
+  Rails.application.load_tasks
+  Rake::Task["dartsass:build"].invoke
+DARTSASS_TEST
+
 say "- Database setup: creating config/database.yml with development database #{ENV['database']}"
 remove_file "config/database.yml" # the one that 'rails new' created
 if ENV['using_sqlite'] == 'true'
@@ -336,6 +368,9 @@ say "- Installaing ZURB Foundation..."
 say "- Copy inline_forms_devise file for custom styles..."
 copy_file File.join(GENERATOR_PATH, 'lib/generators/assets/stylesheets/inline_forms_devise.css'), 'app/assets/stylesheets/inline_forms_devise.css'
 
+say "- Sprockets: link inline_forms_devise.css (logical path; dartsass:install drops link_directory ../stylesheets)..."
+append_to_file "app/assets/config/manifest.js", "//= link inline_forms_devise.css\n"
+
 say "- Add human_attribute_name in app/models/application_record.rb"
 remove_file 'app/models/application_record.rb' # the one that 'rails new' created
 copy_file File.join(GENERATOR_PATH, 'lib/generators/templates/application_record.rb'), "app/models/application_record.rb"
@@ -621,8 +656,100 @@ if ENV['install_example'] == 'true'
   run 'bundle exec rails g inline_forms Photo name:string caption:string image:image_field description:rich_text apartment:belongs_to _presentation:\'#{name}\''
   run 'bundle exec rails generate uploader Image'
   run 'bundle exec rails g inline_forms Apartment name:string title:string description:rich_text photos:has_many photos:associated _enabled:yes _presentation:\'#{name}\''
+
+  say "- Lower Photo.per_page so the seeded gallery paginates..."
+  # The model template (lib/generators/templates/model.erb) emits
+  #   attr_reader :per_page
+  #   @per_page = 7
+  # which is a long-standing typo: `attr_reader :per_page` defines an
+  # *instance* method, then `@per_page = 7` (executed in the class body)
+  # actively *clobbers* the class-level per_page that will_paginate
+  # exposes via `class_attribute :per_page` (its singleton-ivar storage
+  # also lives on `@per_page`). Net effect: nothing reads 7 anywhere,
+  # and the class-level per_page silently reverts to will_paginate's
+  # 30-default. Replace the pair on Photo with a real `self.per_page = 5`
+  # so the seeded gallery (12 photos) actually paginates 5/5/2.
+  gsub_file "app/models/photo.rb",
+            /^\s*attr_reader\s+:per_page\s*\n\s*@per_page\s*=\s*\d+\s*\n/,
+            "  self.per_page = 5\n"
+
   run 'bundle exec rake db:migrate'
 
+  # Seed the photos gallery from a local `pics/` folder. The folder is
+  # *gitignored* in the gem source (so the built .gem stays small and
+  # the gallery images are not committed) which means GENERATOR_PATH/pics
+  # exists only when the installer is run from the source repo, not when
+  # it is run from an installed gem on the developer's box. We therefore
+  # check, in order:
+  #   1. ENV['INLINE_FORMS_SEED_PICS']  -- explicit override path
+  #   2. GENERATOR_PATH/pics            -- gem source repo checkout
+  #   3. /home/code/inline_forms/pics   -- local dev convention
+  # and copy whichever is found into the generated app's db/seed_images/.
+  # The migration generated below is what reads from db/seed_images at
+  # `db:migrate` / `db:test:prepare` time, so this copy is only ever a
+  # one-shot at app generation.
+  pics_candidates = [
+    ENV["INLINE_FORMS_SEED_PICS"],
+    File.join(GENERATOR_PATH, "pics"),
+    "/home/code/inline_forms/pics",
+  ].compact
+  pics_src = pics_candidates.find { |p| Dir.exist?(p) }
+  if pics_src
+    seed_pics = Dir.glob(File.join(pics_src, "*.{jpg,jpeg,JPG,JPEG,png,PNG,gif,GIF}")).sort
+    if seed_pics.any?
+      say "- Copying #{seed_pics.size} sample photo(s) into db/seed_images/..."
+      empty_directory "db/seed_images"
+      seed_pics.each do |abs|
+        copy_file abs, File.join("db/seed_images", File.basename(abs))
+      end
+
+      say "- Generating Konferensha apartment + photos seed migration..."
+      sleep 1 # unique migration timestamp
+      seed_ts = Time.now.utc.strftime("%Y%m%d%H%M%S")
+      create_file "db/migrate/#{seed_ts}_seed_konferensha_photos.rb", <<-SEED_MIGRATION.strip_heredoc
+        class SeedKonferenshaPhotos < ActiveRecord::Migration[7.0]
+          # Seed an Apartment with a gallery of photos so the nested
+          # has_many list (apartments -> photos) has enough rows to
+          # trigger pagination. Driven by db/seed_images/, which the
+          # inline_forms installer copies from the gem's pics/ dir.
+          # Runs in development (via db:migrate) and against the test
+          # DB (via db:test:prepare), so integration tests can assert
+          # the paginated <turbo-frame> renders without seeding manually.
+          def up
+            apartment = Apartment.find_or_create_by!(name: "Konferensha") do |a|
+              a.title = "Konferensha sobre Papiamentu"
+            end
+
+            seed_dir = Rails.root.join("db", "seed_images")
+            return unless seed_dir.directory?
+
+            Dir.glob(seed_dir.join("*.{jpg,jpeg,png,gif}"), File::FNM_CASEFOLD).sort.each do |abs|
+              base = File.basename(abs)
+              next if Photo.exists?(name: base, apartment_id: apartment.id)
+              File.open(abs, "rb") do |io|
+                Photo.create!(
+                  name: base,
+                  caption: "Konferensha foto \#{base}",
+                  apartment: apartment,
+                  image: io
+                )
+              end
+            end
+          end
+
+          def down
+            apartment = Apartment.find_by(name: "Konferensha")
+            return unless apartment
+            apartment.photos.destroy_all
+            apartment.destroy
+          end
+        end
+      SEED_MIGRATION
+
+      run "bundle exec rake db:migrate"
+    end
+  end
+
   remove_file 'public/index.html'
 
   route "root :to => 'apartments#index'"