b4um_generators 0.2.10 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bedf093ab3a868c663ba73bc843bfd9e262dde6511058cbeeafb48b2e48c228d
-  data.tar.gz: 64ae08a60ec9482ba1040b738c3a92e24da26c079586f74673e3aa7b6c323f4f
+  metadata.gz: b1f1050f028cad2eefaf3b2643268bd1e55267aefd8029a8c286e56a5f64b27d
+  data.tar.gz: be01b49c59c57796e2f9d83ae1d0f065119edc374a2addd64166063a17c6bc15
 SHA512:
-  metadata.gz: effd259d2314e5450df3104327b54e5bd7aa803879897bcd8ec321a682b2e54466df294607633bcc0c4f452cb5ce1e644eb56374275ad77b86720111de1e8be2
-  data.tar.gz: f5b4d6ceaf22362d380413be06194cc7b1e870b316737bf31089dc290b85ba303d7a7e294ccc1696424567b36f0d9b1ec2becc1921307d475c940c1140046bbc
+  metadata.gz: 107f73e822050fbe81d7a9e12419a988478d63ba929215e6aad778fcc4e8b37a93695b778b95b881b3476eda91c5dec04b497648ad6f1038c011971bfcb89bcf
+  data.tar.gz: 94552c06de7aba5a9aa211f576447fa8a85dc45fb5eaee2158278d57f1ab8e3cc21727e94d21d2fac36fc356155cba4c2c07bbd7bed55f39cc9a6b4db369e05d

data/.rubocop.yml

@@ -15,14 +15,14 @@ Style/StringLiteralsInInterpolation:
   EnforcedStyle: double_quotes
 
 Metrics/MethodLength:
-  Max: 650
+  Max: 1050
 
 Metrics/BlockLength:
   Exclude:
     - 'spec/**/*'
 
 Metrics/ClassLength:
-  Max: 650
+  Max: 1050
 
 Metrics/AbcSize:
   Max: 100

data/README.de.md

@@ -82,6 +82,7 @@ b4um:pagination
 b4um:infinite_scroll
 b4um:search
 b4um:comments
+b4um:in_place
 b4um:authentication
 b4um:trix
 b4um:readable
@@ -114,6 +115,8 @@ Der Scaffold-Generator bietet:
 - Index-, Show-, New- und Edit-Views
 - Standardmäßig ein Bento-Index-Layout
 - Optionales Tabellen-Index-Layout
+- Select-Felder mit eigenen Anzeigebezeichnungen
+- Radio-Felder mit eigenen Anzeigebezeichnungen
 - Automatischen Navigationseintrag
 - Aktiven Navigationszustand
 - Anzeige von Formular-Validierungsfehlern
@@ -121,6 +124,45 @@ Der Scaffold-Generator bietet:
 - Unterstützung für Passwortfelder
 - Optionale lesbare URL-Parameter
 
+### Select- und Radio-Felder
+
+Der Scaffold-Generator kann String-Attribute als Select- oder Radio-Felder mit eigenen Anzeigebezeichnungen erzeugen.
+
+Für ein Select-Feld verwende:
+
+```text
+--select='FIELD:VALUE=LABEL,VALUE=LABEL'
+```
+
+Beispiel:
+
+```bash
+bin/rails generate b4um:scaffold Product name:string status:string --select='status:Active=Aktiv,Inactive=Inaktiv'
+```
+
+Für Radio-Buttons verwende:
+
+```text
+--radio='FIELD:VALUE=LABEL,VALUE=LABEL'
+```
+
+Beispiel:
+
+```bash
+bin/rails generate b4um:scaffold Product name:string condition:string --radio='condition:new=Neu,used=Gebraucht,refurbished=Generalüberholt'
+```
+
+Beide Optionen können für unterschiedliche Felder miteinander kombiniert werden:
+
+```bash
+bin/rails generate b4um:scaffold Product name:string status:string condition:string --select='status:Active=Aktiv,Inactive=Inaktiv' --radio='condition:new=Neu,used=Gebraucht'
+```
+
+Die konfigurierten Werte werden in der Datenbank gespeichert. In Formularen, Ressourcen-Views und Tabellen-Layouts
+werden dagegen die zugehörigen Anzeigebezeichnungen dargestellt.
+
+Dasselbe Feld kann nicht gleichzeitig `--select` und `--radio` verwenden.
+
 ### Bento-Index
 
 Der standardmäßige Scaffold-Index verwendet das responsive b4um-Bento-Kartenlayout.
@@ -690,6 +732,90 @@ Bestehende b4um-Comments-Controller werden automatisch erweitert.
 Unbekannte benutzerdefinierte Comments-Controller bleiben unverändert und führen dazu, dass der Generator abbricht,
 anstatt eigenen Code zu überschreiben.
 
+## In-place Editing
+
+Füge Feldern einer bestehenden b4um-Ressource eine direkte Bearbeitung hinzu:
+
+```bash
+bin/rails generate b4um:in_place MODEL FIELD [FIELD ...]
+```
+
+Beispiel für ein einzelnes Feld:
+
+```bash
+bin/rails generate b4um:in_place Product name
+```
+
+Mehrere Felder können in einem Durchlauf hinzugefügt werden:
+
+```bash
+bin/rails generate b4um:in_place Product name price status
+```
+
+Modell, Controller und Resource-Routen müssen bereits vorhanden sein.
+
+Der Generator erkennt die vorhandenen Feldtypen automatisch und erstellt die passenden Editoren.
+
+Unterstützte Felder sind:
+
+- String- und Text-Felder
+- Numerische und Decimal-Felder
+- Boolean-Felder
+- Action-Text-Rich-Text-Felder
+- Einzelne Active-Storage-Bild-Attachments
+- Mehrere Active-Storage-Bild-Attachments
+
+### Select-Felder
+
+Ein Feld kann mit `--select` als Auswahlliste dargestellt werden:
+
+```bash
+bin/rails generate b4um:in_place Product status --select='status:Active=Aktiv,Inactive=Inaktiv'
+```
+
+Der Wert vor `=` wird in der Datenbank gespeichert. Der optionale Wert nach `=` wird als sichtbare Beschriftung
+verwendet.
+
+Zum Beispiel speichert `Active=Aktiv` den Wert `Active`, während `Aktiv` angezeigt wird.
+
+### Radio-Felder
+
+Ein Feld kann mit `--radio` als Gruppe von Radio-Buttons dargestellt werden:
+
+```bash
+bin/rails generate b4um:in_place Product condition --radio='condition:new=Neu,used=Gebraucht,refurbished=Generalüberholt'
+```
+
+Für Radio-Felder gilt dieselbe Wert- und Beschriftungssyntax wie für `--select`.
+
+### Verhalten der In-place-Bearbeitung
+
+Die generierte In-place-Bearbeitung bietet:
+
+- Bearbeitung mit Turbo Frames ohne zusätzliches In-place-Editing-Gem
+- Direkte Bearbeitung innerhalb des bestehenden Ressourcen-Layouts
+- Speichern von Text- und Rich-Text-Feldern beim Klick außerhalb des Editors
+- Sofortiges Speichern von Select-, Radio- und Boolean-Feldern
+- Bearbeitung einzelner und mehrerer Bild-Attachments
+- Entfernen vorhandener Bild-Attachments
+- Validierungsfehler direkt im Editor
+- Sofortige Aktualisierung der Flash-Meldung nach erfolgreicher Änderung
+- Mehrere Felder in einem Generator-Durchlauf
+- Nachträgliches Hinzufügen weiterer Felder
+- Sichere wiederholte Ausführung des Generators
+
+### Authentifizierung
+
+Die In-place-Bearbeitung integriert sich automatisch in die b4um-Authentifizierung.
+
+Ohne Authentifizierung können die generierten In-place-Felder bearbeitet werden.
+
+Wenn die b4um-Authentifizierung installiert ist, wird die In-place-Bearbeitung auf angemeldete Benutzer beschränkt und
+die zugehörigen Controller-Actions werden mit `require_login` geschützt.
+
+Die Authentifizierung kann vor oder nach der In-place-Bearbeitung installiert werden. Die Generatoren aktualisieren die
+Integration in beiden Installationsreihenfolgen automatisch.
+
 ## Trix und Rich Text
 
 Füge einer bestehenden b4um-Ressource Rails Action Text mit Trix hinzu:
@@ -978,7 +1104,7 @@ wird.
 
 ## Version
 
-Aktuelle Version: `0.2.6`
+Aktuelle Version: `0.2.14`
 
 ## Autor
 

data/README.md

@@ -80,6 +80,7 @@ b4um:pagination
 b4um:infinite_scroll
 b4um:search
 b4um:comments
+b4um:in_place
 b4um:authentication
 b4um:trix
 b4um:readable
@@ -112,6 +113,8 @@ The scaffold generator provides:
 - Index, show, new and edit views
 - Bento index layout by default
 - Optional table index layout
+- Select fields with custom labels
+- Radio fields with custom labels
 - Automatic navigation entry
 - Active navigation state
 - Form validation errors
@@ -119,6 +122,45 @@ The scaffold generator provides:
 - Password field support
 - Optional readable URL parameters
 
+### Select and Radio Fields
+
+The scaffold generator can render string attributes as select or radio fields with custom display labels.
+
+For a select field, use:
+
+```text
+--select='FIELD:VALUE=LABEL,VALUE=LABEL'
+```
+
+Example:
+
+```bash
+bin/rails generate b4um:scaffold Product name:string status:string --select='status:Active=Aktiv,Inactive=Inaktiv'
+```
+
+For radio buttons, use:
+
+```text
+--radio='FIELD:VALUE=LABEL,VALUE=LABEL'
+```
+
+Example:
+
+```bash
+bin/rails generate b4um:scaffold Product name:string condition:string --radio='condition:new=Neu,used=Gebraucht,refurbished=Generalüberholt'
+```
+
+Both options can be combined for different fields:
+
+```bash
+bin/rails generate b4um:scaffold Product name:string status:string condition:string --select='status:Active=Aktiv,Inactive=Inaktiv' --radio='condition:new=Neu,used=Gebraucht'
+```
+
+The configured values are stored in the database, while the labels are displayed in forms, resource views and table
+layouts.
+
+A field cannot use both `--select` and `--radio`.
+
 ### Bento Index
 
 The default scaffold index uses the responsive b4um Bento card layout.
@@ -685,6 +727,89 @@ Existing b4um comments controllers are extended automatically.
 Unknown custom comments controllers are left unchanged and cause the generator to stop instead of overwriting custom
 code.
 
+## In-place Editing
+
+Add in-place editing to fields of an existing b4um resource:
+
+```bash
+bin/rails generate b4um:in_place MODEL FIELD [FIELD ...]
+```
+
+Example for a single field:
+
+```bash
+bin/rails generate b4um:in_place Product name
+```
+
+Multiple fields can be added in one run:
+
+```bash
+bin/rails generate b4um:in_place Product name price status
+```
+
+The model, controller and resource routes must already exist.
+
+The generator detects the existing field types and creates the appropriate editors.
+
+Supported fields include:
+
+- String and text fields
+- Numeric and decimal fields
+- Boolean fields
+- Action Text rich-text fields
+- Active Storage single image attachments
+- Active Storage multiple image attachments
+
+### Select Fields
+
+A field can be rendered as a select list with `--select`:
+
+```bash
+bin/rails generate b4um:in_place Product status --select='status:Active=Aktiv,Inactive=Inaktiv'
+```
+
+The value before `=` is stored in the database. The optional value after `=` is used as the displayed label.
+
+For example, `Active=Aktiv` stores `Active` while displaying `Aktiv`.
+
+### Radio Fields
+
+A field can be rendered as radio buttons with `--radio`:
+
+```bash
+bin/rails generate b4um:in_place Product condition --radio='condition:new=Neu,used=Gebraucht,refurbished=Generalüberholt'
+```
+
+The same value and label syntax used by `--select` applies to radio fields.
+
+### In-place Editing Behavior
+
+Generated in-place editing provides:
+
+- Turbo Frame based editing without an additional in-place editing gem
+- Editing directly inside the existing resource layout
+- Outside-click saving for text and rich-text fields
+- Immediate saving for select, radio and boolean fields
+- Single and multiple image attachment editing
+- Removal of existing image attachments
+- Inline validation errors
+- Immediate flash-message updates after successful changes
+- Multiple fields in one generator run
+- Additional fields in later generator runs
+- Safe repeated generator runs
+
+### Authentication
+
+In-place editing integrates automatically with b4um authentication.
+
+Without authentication, generated in-place fields are editable.
+
+When b4um authentication is installed, in-place editing is restricted to logged-in users and the corresponding
+controller actions are protected with `require_login`.
+
+Authentication can be installed either before or after in-place editing. The generators update the integration
+automatically in both installation orders.
+
 ## Trix and Rich Text
 
 Add Rails Action Text with Trix to an existing b4um resource:
@@ -970,7 +1095,7 @@ The gem can be tested locally by referencing the repository with `path:` from a
 
 ## Version
 
-Current version: `0.2.7`
+Current version: `0.2.14`
 
 ## Author
 

data/lib/b4um_generators/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module B4umGenerators
-  VERSION = "0.2.10"
+  VERSION = "0.2.14"
 end

data/lib/generators/b4um/attachment/attachment_generator.rb

@@ -110,13 +110,18 @@ module B4um
       def update_single_attachment_params
         content = File.read(controller_path)
 
-        return if attachment_permitted?(content)
+        update_single_permitted_params(content)
+        update_single_attachment_action
+      end
+
+      def update_single_permitted_params(content)
+        return if single_attachment_permitted?(content)
 
         pattern = /
           params\.expect\(
           #{Regexp.escape(file_name)}:\s*
           \[
-          (?<attributes>[^\]]*)
+          (?<attributes>.*?)
           \]
           \)
         /mx
@@ -124,9 +129,88 @@ module B4um
         return unless content.match?(pattern)
 
         gsub_file(controller_path, pattern) do |match|
+          match_data = pattern.match(match)
+          attributes = match_data[:attributes]
+
+          insertion = ":#{attachment}, :remove_#{attachment}"
+
+          normalized_attributes =
+            attributes
+            .strip
+            .gsub(/\s+,/, ",")
+
+          updated_attributes =
+            if normalized_attributes.match?(/\w+:\s*\[/)
+              normalized_attributes.sub(
+                /(?=\w+:\s*\[)/,
+                "#{insertion}, "
+              )
+            else
+              "#{normalized_attributes}, #{insertion}"
+            end
+
           match.sub(
-            /\]\)$/,
-            ", :#{attachment}])"
+            attributes,
+            " #{updated_attributes} "
+          )
+        end
+      end
+
+      def single_attachment_permitted?(content)
+        content.include?(
+          ":#{attachment}, :remove_#{attachment}"
+        )
+      end
+
+      def update_single_attachment_action
+        content = File.read(controller_path)
+
+        return if content.include?(
+          "remove_#{attachment} = update_params.delete(\"remove_#{attachment}\")"
+        )
+
+        if content.include?("    update_params = #{file_name}_params\n")
+          insert_into_file(
+            controller_path,
+            "    remove_#{attachment} = update_params.delete(\"remove_#{attachment}\")\n",
+            after: "    update_params = #{file_name}_params\n"
+          )
+        else
+          setup = [
+            "  def update",
+            "    update_params = #{file_name}_params",
+            "    remove_#{attachment} = update_params.delete(\"remove_#{attachment}\")",
+            "",
+            "    respond_to do |format|",
+            ""
+          ].join("\n")
+
+          gsub_file(
+            controller_path,
+            "  def update\n    respond_to do |format|\n",
+            setup
+          )
+        end
+
+        content = File.read(controller_path)
+
+        if content.include?("      if @#{file_name}.update(update_params)\n")
+          insert_into_file(
+            controller_path,
+            "        @#{file_name}.#{attachment}.purge if remove_#{attachment} == \"1\"\n",
+            after: "      if @#{file_name}.update(update_params)\n"
+          )
+        else
+          attachment_handling = [
+            "      if @#{file_name}.update(update_params)",
+            "        @#{file_name}.#{attachment}.purge if remove_#{attachment} == \"1\"",
+            ""
+          ].join("\n")
+
+          gsub_file(
+            controller_path,
+            "      if @#{file_name}.update(#{file_name}_params)\n",
+            attachment_handling
           )
         end
       end
@@ -141,23 +225,59 @@ module B4um
       def update_multiple_permitted_params(content)
         return if multiple_attachment_permitted?(content)
 
-        pattern = /
+        params_method_pattern = /
+          def\s+#{Regexp.escape(file_name)}_params
+          (?<body>.*?)
+          ^\s*end
+        /mx
+
+        params_method = content[params_method_pattern, 0]
+
+        unless params_method
+          raise Thor::Error,
+                "Could not find #{file_name}_params in #{controller_path}"
+        end
+
+        expect_pattern = /
           params\.expect\(
           #{Regexp.escape(file_name)}:\s*
           \[
-          (?<attributes>[^\]]*)
+          (?<attributes>.*)
           \]
           \)
         /mx
 
-        return unless content.match?(pattern)
+        match_data = expect_pattern.match(params_method)
 
-        gsub_file(controller_path, pattern) do |match|
-          match.sub(
-            /\]\)$/,
-            ", #{attachment}: [], remove_#{attachment}_ids: []])"
-          )
+        unless match_data
+          raise Thor::Error,
+                "Could not find params.expect for #{file_name} in #{controller_path}"
         end
+
+        normalized_attributes =
+          match_data[:attributes]
+          .strip
+          .gsub(/\s+,/, ",")
+
+        updated_attributes =
+          "#{normalized_attributes}, " \
+          "#{attachment}: [], " \
+          "remove_#{attachment}_ids: []"
+
+        updated_params_method =
+          params_method.sub(
+            match_data[0],
+            match_data[0].sub(
+              match_data[:attributes],
+              " #{updated_attributes} "
+            )
+          )
+
+        gsub_file(
+          controller_path,
+          params_method,
+          updated_params_method
+        )
       end
 
       def multiple_attachment_permitted?(content)
@@ -173,24 +293,43 @@ module B4um
           "new_#{attachment} = update_params.delete(\"#{attachment}\")"
         )
 
+        unless content.include?("    update_params = #{file_name}_params\n")
+          gsub_file(
+            controller_path,
+            "  def update\n    respond_to do |format|\n",
+            [
+              "  def update",
+              "    update_params = #{file_name}_params",
+              "",
+              "    respond_to do |format|",
+              ""
+            ].join("\n")
+          )
+        end
+
         setup = [
-          "  def update",
-          "    update_params = #{file_name}_params",
           "    new_#{attachment} = update_params.delete(\"#{attachment}\")",
           "    remove_#{attachment}_ids = update_params.delete(\"remove_#{attachment}_ids\")",
-          "",
-          "    respond_to do |format|",
           ""
         ].join("\n")
 
-        gsub_file(
+        insert_into_file(
           controller_path,
-          "  def update\n    respond_to do |format|\n",
-          setup
+          setup,
+          after: "    update_params = #{file_name}_params\n"
         )
 
+        content = File.read(controller_path)
+
+        unless content.include?("      if @#{file_name}.update(update_params)\n")
+          gsub_file(
+            controller_path,
+            "      if @#{file_name}.update(#{file_name}_params)\n",
+            "      if @#{file_name}.update(update_params)\n"
+          )
+        end
+
         attachment_handling = [
-          "      if @#{file_name}.update(update_params)",
           "        @#{file_name}.#{attachment}.attach(new_#{attachment}) if new_#{attachment}.present?",
           "",
           "        if remove_#{attachment}_ids.present?",
@@ -201,10 +340,10 @@ module B4um
           ""
         ].join("\n")
 
-        gsub_file(
+        insert_into_file(
           controller_path,
-          "      if @#{file_name}.update(#{file_name}_params)\n",
-          attachment_handling
+          attachment_handling,
+          after: "      if @#{file_name}.update(update_params)\n"
         )
       end
 
@@ -439,12 +578,34 @@ module B4um
                  <%= "hidden" unless #{file_name}.#{attachment}.attached? %>>
 
               <% if #{file_name}.#{attachment}.attached? %>
-                <%= image_tag #{file_name}.#{attachment},
-                              class: "form-image-preview__image",
-                              alt: #{file_name}.#{attachment}.filename.to_s,
-                              data: {
-                                image_preview_target: "image"
-                              } %>
+                <div class="form-image-preview__item"
+                     role="button"
+                     tabindex="0"
+                     aria-pressed="false"
+                     data-image-preview-target="existingItem"
+                     data-action="click->image-preview#toggleRemoval keydown->image-preview#toggleRemovalWithKeyboard">
+
+                  <%= image_tag #{file_name}.#{attachment},
+                                class: "form-image-preview__image",
+                                alt: #{file_name}.#{attachment}.filename.to_s,
+                                data: {
+                                  image_preview_target: "image"
+                                } %>
+
+                  <%= check_box_tag(
+                        "#{file_name}[remove_#{attachment}]",
+                        "1",
+                        false,
+                        class: "form-image-preview__remove-checkbox",
+                        data: {
+                          image_preview_target: "removeCheckbox"
+                        }
+                      ) %>
+
+                  <div class="form-image-preview__remove-status">
+                    Will be removed
+                  </div>
+                </div>
               <% else %>
                 <img class="form-image-preview__image"
                      data-image-preview-target="image"