base_editing_bootstrap 1.7.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c363b9569d715a8519f72345250ee7dd019de73ce87330e6a49d62acc0e0e10
-  data.tar.gz: 9d7499c1ba5fbf66c2d0f466237e7b69bce234d022d21cd9d74b920564b6960f
+  metadata.gz: 40690c34bdbdecebbcf083394fefe5ea626b958a085ce695fe4a039b17c8cfa9
+  data.tar.gz: a087acc3bda536ea0451af2e3818cc2c07c20a3a6a5e549bb74e96d7abcd6dd5
 SHA512:
-  metadata.gz: b2243dc34ddba312f01465774a8df4662ea78e832885774966d29c685164201284aae102b8188a59c54d8b3c44a1c8af81227e04ef28a780651e6cdcd1abe6c1
-  data.tar.gz: 7c43ad6f7059a50c7719633e432d941ebd2433518712b9b5d20b5fff573cc802b24de785e81a96eebaf31c6d96639b2e3a99445dca3df086956d73a0529cc6d3
+  metadata.gz: f85bc8f2ed0aa273b2e59258ace609e711dbcb088bf9420a5eaf5a48aa7a48c0907f7d6eb75ac9614cfcf0f536f1124a7bd9ee9541c68c3f4d29908e739a280d
+  data.tar.gz: 5565e435135fd2bae6a1a6e1907a6d150cb6be69d5b82c52d91095a3637efa811322519ae6f696578760b961339cd986b036f508a06d08532311f88d53209508

data/CHANGELOG.md

@@ -2,6 +2,34 @@
 All notable changes to this project will be documented in this file. See [conventional commits](https://www.conventionalcommits.org/) for commit guidelines.
 
 - - -
+## 1.8.1 - 2025-03-24
+#### Bug Fixes
+- Correct generator install multiple gems - (73948f5) - Marino Bonetti
+
+- - -
+
+## 1.8.0 - 2025-03-20
+#### Bug Fixes
+- Correct pass locals datas - (00fd083) - Marino Bonetti
+- Don't re-authorize if authorization is already done - (dd756b3) - Marino Bonetti
+- Correct path for generator - (a7d9842) - Marino Bonetti
+- Search partial with class name and without namespace - (2d08db3) - Marino Bonetti
+- Belongs to polymorphic (#17) - (7d736d7) - Marino Bonetti
+#### Documentation
+- Update documentation - (07dd44d) - Marino Bonetti
+- Correct documentation - (6337745) - Marino Bonetti
+#### Features
+- Aggiunto contenitore per gli errori base - (2f9f309) - Marino Bonetti
+- Add layouts for customization - (1bb0201) - Marino Bonetti
+- AutoRender text columns to TextArea - (8533b53) - Marino Bonetti
+#### Refactoring
+- Rename variable to be more logic - (8fa9bbb) - Marino Bonetti
+- Rewrite for debugging - (b7a3756) - Marino Bonetti
+#### Tests
+- Typo - (a1ada44) - Marino Bonetti
+
+- - -
+
 ## 1.7.0 - 2025-02-11
 #### Bug Fixes
 - Add permits of ransack scopes - (5fa26c6) - Marino Bonetti

data/app/controllers/base_editing_controller.rb

@@ -20,7 +20,8 @@ class BaseEditingController < RestrictedAreaController
   class_attribute :default_distinct, default: true
 
   def index
-    authorize base_class
+    #se è già stato autorizzano non rieseguiamo, utile nel caso vogliamo sovrascrivere la logica di autorizzazione in inheritance
+    authorize base_class unless pundit_policy_authorized?
 
     q = policy_scope(base_scope)
     @search_instance = search_class.new(q, current_user,
@@ -34,7 +35,9 @@ class BaseEditingController < RestrictedAreaController
   def new
     @object = base_class.new
     @object = yield(@object) if block_given?
-    authorize @object
+
+    #se è già stato autorizzano non rieseguiamo, utile nel caso vogliamo sovrascrivere la logica di autorizzazione in inheritance
+    authorize @object unless pundit_policy_authorized?
 
     respond_to do |format|
       format.html
@@ -64,7 +67,8 @@ class BaseEditingController < RestrictedAreaController
   def create
     @object = base_class.new(permitted_attributes)
     @object = yield(@object) if block_given?
-    authorize @object
+    #se è già stato autorizzano non rieseguiamo, utile nel caso vogliamo sovrascrivere la logica di autorizzazione in inheritance
+    authorize @object unless pundit_policy_authorized?
 
     respond_to do |format|
       if @object.save
@@ -124,7 +128,9 @@ class BaseEditingController < RestrictedAreaController
 
   def load_object
     @object = base_class.find(params[:id])
-    authorize @object
+
+    #se è già stato autorizzano non rieseguiamo, utile nel caso vogliamo sovrascrivere la logica di autorizzazione in inheritance
+    authorize @object unless pundit_policy_authorized?
     logger.debug { "Oggetto #{@object.inspect}" }
   end
 

data/app/helpers/utilities/form_helper.rb

@@ -24,7 +24,8 @@ module Utilities
         type = :enum
         generic_field = "enum"
       elsif form.object.class.respond_to?(:reflect_on_association) &&
-        form.object.class.reflect_on_association(field.to_s).is_a?(ActiveRecord::Reflection::BelongsToReflection)
+        form.object.class.reflect_on_association(field.to_s).is_a?(ActiveRecord::Reflection::BelongsToReflection) &&
+        !form.object.class.reflect_on_association(field.to_s).polymorphic? # non deve essere polymorphic
         # Abbiamo una relazione belongs_to da gestire
         reflection = form.object.class.reflect_on_association(field.to_s)
         type = :belongs_to
@@ -60,6 +61,8 @@ module Utilities
           generic_field = "boolean"
         when :has_one_attachment
           generic_field = "has_one_attachment"
+        when :text
+          generic_field = "textarea"
         else
           generic_field = "base"
         end
@@ -71,7 +74,15 @@ module Utilities
         "form_field",
         generic_field
       )
-      Rails.logger.debug { "#{type}->#{generic_field}->#{template.short_identifier}->#{ locals.inspect}" }
+      Rails.logger.debug do
+        <<~TEXT
+          [BASE EDITING BOOTSTRAP]
+           TYPE: #{type}
+           GENERIC_FIELD: #{generic_field}
+           TEMPLATE: #{template.short_identifier}
+           LOCALS:#{locals}
+        TEXT
+      end
       template.render(self, locals)
     end
 

data/app/helpers/utilities/template_helper.rb

@@ -18,21 +18,22 @@ module Utilities::TemplateHelper
     partial_path = (obj.respond_to? :to_partial_path) ? obj.to_partial_path : obj._to_partial_path
     obj_base_path = "#{partial_path}/#{base_path}"
 
-    # Precedenza modello e campo specifico
-    if lookup_context.exists?(field, [obj_base_path], true)
-      return lookup_context.find(field, [obj_base_path], true)
-    end
-    # Ricerca tramite campo generico e prefissi di contesto che contiene anche controller e namespace di controller
-    if lookup_context.exists?("#{base_path}/#{generic_field}", lookup_context.prefixes, true)
-      view = lookup_context.find_all("#{base_path}/#{generic_field}", lookup_context.prefixes, true)
-      return view.first
-    end
-    if lookup_context.exists?(generic_field, [obj_base_path], true)
-      return lookup_context.find(generic_field, [obj_base_path], true)
-    end
-    if lookup_context.exists?("base_editing/#{base_path}/#{generic_field}", [], true)
-      return lookup_context.find_all("base_editing/#{base_path}/#{generic_field}", [], true).first
+    [
+      # Precedenza modello e campo specifico
+      [field, [obj_base_path]],
+      # cerco tramite nome modello semplice, con namespace della risorsa (cell_field,header_field,form_field) e nome del campo specifico
+      ["#{obj.model_name.element}/#{base_path}/#{field}", lookup_context.prefixes],
+      # Ricerca tramite campo generico e prefissi di contesto che contiene anche controller e namespace di controller
+      ["#{base_path}/#{generic_field}", lookup_context.prefixes],
+      [generic_field, [obj_base_path]],
+      ["base_editing/#{base_path}/#{generic_field}", []],
+    ].each do |partial, prefixes|
+      Rails.logger.debug { "[BASE EDITING BOOTSTRAP] Cerco partial:`#{partial}` in #{prefixes.inspect}" }
+      if lookup_context.exists?(partial, prefixes, true)
+        return lookup_context.find(partial, prefixes, true)
+      end
     end
+    # fallback finale
     lookup_context.find("base_editing/#{base_path}/base", [], true)
   end
 

data/app/views/base_editing/_form.html.erb

@@ -1,20 +1,19 @@
-<div class="card" id="card_id">
-  <div class="card-header">
-    <%= form_for @object, builder: form_builder do |form| %>
+<%= render layout: "form_container" do %>
+  <%= form_for @object, builder: form_builder do |form| %>
 
-      <div class="card-body">
-        <%= render partial: "form_field_header", local: {form:} %>
-        <%= render layout: "form_fields_container" do %>
-          <%= render collection: form_attributes(form.object),
-                     layout: "form_field_container",
-                     partial: "form_field", locals: {form:} %>
-        <% end %>
-      </div>
-
-      <div class="card-footer">
-        <%= render partial: "form_footer", locals: {form: form} %>
-      </div>
+    <%= render layout: "form_body_container" do %>
+      <%= render partial: "form_field_header", locals: {form:} %>
+      <%= render partial: "form_base_errors", locals: {form:} if form.object.errors.key?(:base) %>
+      <%= render layout: "form_fields_container" do %>
+        <%= render collection: form_attributes(form.object),
+                   layout: "form_field_container",
+                   partial: "form_field", locals: {form:} %>
+      <% end %>
+    <% end %>
 
+    <%= render layout: "form_footer_container" do %>
+      <%= render partial: "form_footer", locals: {form: form} %>
     <% end %>
-  </div>
-</div>
+
+  <% end %>
+<% end %>

data/app/views/base_editing/_form_base_errors.html.erb

@@ -0,0 +1,22 @@
+<%
+  ##
+  # Template per il rendering degli errori base
+  # - form       -> FormBuilder
+%>
+<%# locals: (form:) -%>
+<% if form.object.errors.key?(:base) %>
+  <div class="row base-errors-container" id="<%= dom_id(@object,:base_errors_container) %>">
+    <div class="col-12">
+      <div class="card border-danger mb-3">
+        <div class="card-header"><%= t ".title", scope: form.object.class.model_name.i18n_key, default: t(".title") %></div>
+        <div class="card-body text-danger">
+          <ul>
+            <% form.object.errors.full_messages_for(:base).each do |m| %>
+              <li><%= m %></li>
+            <% end %>
+          </ul>
+        </div>
+      </div>
+    </div>
+  </div>
+<% end %>

data/app/views/base_editing/_form_body_container.html.erb

@@ -0,0 +1,3 @@
+<div class="card-body">
+  <%= yield %>
+</div>

data/app/views/base_editing/_form_container.html.erb

@@ -0,0 +1,3 @@
+<%= content_tag :div, class: "card", id: dom_id(@object, :form_container) do %>
+  <%= yield %>
+<% end %>

data/app/views/base_editing/_form_field.html.erb

@@ -2,18 +2,18 @@
   ##
   # Template per il rendering campo
   # - form       -> FormBuilder
-  # - form_field -> Array[String]
+  # - form_field -> String
 %>
 <%# locals: (form:, form_field:) -%>
 <%
-  button_group_classes = ["mb-1"]
+  input_group_classes = ["mb-1"]
 
   content = form_print_field(form, form_field)
   unless content.match "checkbox"
-    button_group_classes << "input-group"
+    input_group_classes << "input-group"
   end
-  button_group_classes << (form.object.validated? ? "has-validation" : "")
-  button_group_classes << "form-#{form_field}-input-group"
+  input_group_classes << (form.object.validated? ? "has-validation" : "")
+  input_group_classes << "form-#{form_field}-input-group"
 
   # Non renderizziamo il contenuto del label in questa vista se siamo nello switch
   if content.match "form-switch"
@@ -24,7 +24,7 @@
 
 %>
 <%= label_content %>
-<%= content_tag :div, class: button_group_classes.join(" ") do %>
+<%= content_tag :div, class: input_group_classes.join(" ") do %>
   <%= render partial: "editing_form_measure_unit", locals: {object: form.object, field: form_field} %>
   <%= content %>
   <%= error_messages_for(form.object, form_field) %>

data/app/views/base_editing/_form_footer_container.html.erb

@@ -0,0 +1,3 @@
+<div class="card-footer">
+  <%= yield %>
+</div>

data/app/views/base_editing/form_field/_textarea.html.erb

@@ -0,0 +1,7 @@
+<%
+  ##
+  # Template per il rendering del vero campo input
+  # eseguire override nei casi in cui si voglia renderizzare qualcosa di differente
+%>
+<%# locals: (form:, field:) -%>
+<%= form.text_area(field) %>

data/config/locales/it.yml

@@ -76,3 +76,10 @@ it:
   ransack:
     predicates:
       i_cont: "contiene"
+  base_editing:
+    form_base_errors:
+      title: Presenti errori generici
+  post:
+    base_editing:
+      form_base_errors:
+        title: Presenti errori per il modello POST

data/lib/base_editing_bootstrap/VERSION

@@ -1 +1 @@
-1.7.0
+1.8.1

data/lib/base_editing_bootstrap/forms/base.rb

@@ -97,7 +97,7 @@ module BaseEditingBootstrap::Forms
     # per il normale submit consiglio la lettura della guida standard di rails
     # ATTENZIONE: nelle classi del bottone undo, abbiamo aggiunto .btn-undo-button
     #             che ascoltiamo dalle modal e utilizziamo per chiudere la modal, al posto
-    #             seguire realmente il link con il browser.
+    #             di seguire realmente il link con il browser.
     def submit(value = nil, options = {})
       @template.content_tag(:div, class: "btn-group mr-1") do
         super(value, options.reverse_merge(class: "btn btn-primary")) +

data/lib/generators/base_editing_bootstrap/install/install_generator.rb

@@ -17,8 +17,18 @@ module BaseEditingBootstrap
       end
 
       def prepare_test_environment
-        gem "factory_bot_rails", group: :test, version: '~> 6.4', comment: "Necessary for spec"
-        gem 'rails-controller-testing', group: :test, comment: "Required if used with controllers spec"
+        actual_gemfile_path = File.join(@destination_stack, "Gemfile")
+        if File.exist?(actual_gemfile_path)
+          actual_gemfile = File.read(File.join(@destination_stack, "Gemfile"))
+        else
+          actual_gemfile = ''
+        end
+        unless actual_gemfile =~ /factory_bot_rails/
+          gem "factory_bot_rails", group: :test, version: '~> 6.4', comment: "Necessary for spec"
+        end
+        unless actual_gemfile =~ /rails-controller-test/
+          gem 'rails-controller-testing', group: :test, comment: "Required if used with controllers spec"
+        end
       end
     end
   end

data/lib/generators/base_editing_bootstrap/scaffold/scaffold_generator.rb

@@ -11,7 +11,7 @@ module BaseEditingBootstrap
       invoke :model
 
       def add_base_model
-        inject_into_class "app/models/#{model_resource_name}.rb", class_name do
+        inject_into_class "app/models/#{file_path}.rb", class_name do
           "  include BaseEditingBootstrap::BaseModel\n"
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: base_editing_bootstrap
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Marino Bonetti
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-11 00:00:00.000000000 Z
+date: 2025-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -337,11 +337,15 @@ files:
 - app/views/base_editing/_editing_form_help_text.html.erb
 - app/views/base_editing/_editing_form_measure_unit.html.erb
 - app/views/base_editing/_form.html.erb
+- app/views/base_editing/_form_base_errors.html.erb
+- app/views/base_editing/_form_body_container.html.erb
+- app/views/base_editing/_form_container.html.erb
 - app/views/base_editing/_form_field.html.erb
 - app/views/base_editing/_form_field_container.html.erb
 - app/views/base_editing/_form_field_header.html.erb
 - app/views/base_editing/_form_fields_container.html.erb
 - app/views/base_editing/_form_footer.html.erb
+- app/views/base_editing/_form_footer_container.html.erb
 - app/views/base_editing/_index_body.html.erb
 - app/views/base_editing/_index_main_buttons.html.erb
 - app/views/base_editing/_index_title_header.html.erb
@@ -368,6 +372,7 @@ files:
 - app/views/base_editing/form_field/_enum.html.erb
 - app/views/base_editing/form_field/_has_one_attachment.html.erb
 - app/views/base_editing/form_field/_integer.html.erb
+- app/views/base_editing/form_field/_textarea.html.erb
 - app/views/base_editing/header_field/_base.html.erb
 - app/views/base_editing/index.html.erb
 - app/views/base_editing/new.html.erb