base_editing_bootstrap 0.12.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ebd5f42f60f886ca0e8c5ecff7d5be53531bf015ea7c44f763f6d07127f69ec
-  data.tar.gz: 007b28d61ec3058efdc94488578cc2fdae37d1477296511db5e5653f77b94bee
+  metadata.gz: 1f4da39d416d3107b6e4f40d63a33c136eed02e5d5c8cb6b2e91423be99460c1
+  data.tar.gz: f71d9cfd3efeef8edbd20ee5da7ec9b98f198ce6a9fc99ed7b8cc0af7038983c
 SHA512:
-  metadata.gz: 530342bff9cac4c81404c568d89faf99293f1992e3c2aedea0042ec4ed9a3f30bf72f9a9da75036bef84eb29c8b7e8299baa4b5c548d5ef7ca2e9497732a3478
-  data.tar.gz: 4b9e115f5ee49c9857bb243091e4ca58c70f0e02d16e241dbb93c09337728fee62455c673818fb963810d0dec36462ce332194217d590c3848bd013213126c55
+  metadata.gz: c93f3d73d379b66d37a039064ac5f6cb8638f32e9785d2998c7d3353f060dde6c6be02db38d8ac6f1e2ef29e3e0a1ab4e265b73959bbd3dacbff5ecc367d87e1
+  data.tar.gz: ef9c876ff6628cdbc7b200240b3785952e58d951a610bd8275a587d2d6c9b6ea03724bd03c5f6def17c81c04b268a79c5330a7288931418ace32062356c214df

data/CHANGELOG.md

@@ -2,6 +2,32 @@
 All notable changes to this project will be documented in this file. See [conventional commits](https://www.conventionalcommits.org/) for commit guidelines.
 
 - - -
+## 0.14.0 - 2024-10-14
+#### Bug Fixes
+- Namespaced resources (#7) - (e85f926) - Marino Bonetti
+#### Continuous Integration
+- Start Enabling Rails 8.0 - (9c66914) - Marino Bonetti
+- Fix scaffold generator questions - (0379151) - Marino Bonetti
+#### Documentation
+- Add more info in spec desc - (82ab3a7) - Marino Bonetti
+- Add docs for Development - (616a0ea) - Marino Bonetti
+- Add locals form partial - (022eb83) - Marino Bonetti
+#### Features
+- Boolean field - (8c7d0a2) - Marino Bonetti
+- Auto remove input-group for checkboxes - (d5b13d2) - Marino Bonetti
+- Add searchable columns - (9ccfb6f) - Marino Bonetti
+- Add option to FullDisallowPolicy - (6468967) - Marino Bonetti
+
+- - -
+
+## 0.13.0 - 2024-10-02
+#### Bug Fixes
+- Correct generator - (c3a5e60) - Marino Bonetti
+#### Features
+- Rails Matrix versions (#4) - (1deaa4e) - Marino Bonetti
+
+- - -
+
 ## 0.12.0 - 2024-10-01
 #### Documentation
 - Update documentation - (e49af20) - Marino Bonetti

data/README.md

@@ -146,6 +146,7 @@ Utilizzo per modello base, in questo esempio prendiamo come modello Post come es
   - Decimal           => _decimal.html.erb
   - DateTime          => _datetime.html.erb
   - Date              => _date.html.erb
+  - Boolean           => _boolean.html.erb
   - Enum              => _enum.html.erb
     Per gli enum, le traduzioni dei labels di ogni valore provvengono da i18n
     attraverso l'helper: `Utilities::EnumHelper#enum_translation`
@@ -222,7 +223,15 @@ end
 
 
 ## Contributing
-Contribution directions go here.
+1. Setup env with:  
+```shell
+docker compose run app spec/dummy/bin/setup
+```
+
+2. Start environment with:  
+```shell
+docker compose up
+```
 
 ## License
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/app/controllers/base_editing_controller.rb

@@ -86,12 +86,14 @@ class BaseEditingController < RestrictedAreaController
 
   def base_class
     return @_base_class if @_base_class
-    controller = controller_path
-    modello = controller.singularize.camelize.safe_constantize
-    logger.debug { "Editazione del controller:#{controller} per modello: #{modello.to_s}" }
-    raise "Non riesco a restituire la classe base per il controller #{controller}" if modello.nil?
+    finder = BaseEditingBootstrap::ResourceFinder.new(controller_path)
+    if finder.model
+      logger.debug { "Editazione del controller:#{controller_path} per modello: #{finder.model.to_s}" }
+    else
+      raise "Non riesco a restituire la classe base per il controller #{controller_path}"
+    end
 
-    @_base_class = modello
+    @_base_class = finder.model
   end
 
   private

data/app/helpers/base_editing_helper.rb

@@ -3,20 +3,7 @@ module BaseEditingHelper
   include Utilities::EnumHelper
   include Utilities::SearchHelper
   include Utilities::FormHelper
+  include Utilities::IconHelper
 
 
-  ##
-  # Genera le icone di Bootstrap icons
-  def icon( name, text = nil, html_options = {})
-    text, html_options = nil, text if text.is_a?(Hash)
-
-    content_class = "bi-#{name}"
-    content_class << " #{html_options[:class]}" if html_options.key?(:class)
-    html_options[:class] = content_class
-    html_options['aria-hidden'] ||= true
-
-    html = content_tag(:i, nil, html_options)
-    html << ' ' << text.to_s unless text.blank?
-    html
-  end
 end

data/app/helpers/utilities/form_helper.rb

@@ -35,6 +35,8 @@ module Utilities
           generic_field = "decimal"
         when :integer
           generic_field = "integer"
+        when :boolean
+          generic_field = "boolean"
         else
           generic_field = "base"
         end

data/app/helpers/utilities/icon_helper.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Utilities::IconHelper
+
+  ##
+  # Genera le icone di Bootstrap icons
+  def icon( name, text = nil, html_options = {})
+    text, html_options = nil, text if text.is_a?(Hash)
+
+    content_class = "bi-#{name}"
+    content_class += " #{html_options[:class]}" if html_options.key?(:class)
+    html_options[:class] = content_class
+    html_options['aria-hidden'] ||= true
+
+    html = content_tag(:i, nil, html_options)
+    html << ' ' << text.to_s unless text.blank?
+    html
+  end
+end

data/app/helpers/utilities/search_helper.rb

@@ -1,6 +1,8 @@
 module Utilities
   module SearchHelper
     include TemplateHelper
+    include PageHelper
+    include IconHelper
 
     ##
     # Per aggiungere bottoni:
@@ -32,7 +34,14 @@ module Utilities
                       when :created_at, :updated_at
                         "timestamps"
                       else
-                        "base"
+                        type = obj.class.type_for_attribute(field).type
+                        case type
+                        when :boolean
+                          "boolean"
+                        else
+                          "base"
+                        end
+
                       end
       template = find_template_with_fallbacks(
         obj,

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

@@ -1,7 +1,27 @@
-<%= form.label(form_field, class:  ["form-label","form-#{form_field}-label"]) %>
-<div class="input-group mb-2 <%= form.object.validated? ? "has-validation" : "" %><%= "form-#{form_field}-input-group" %>">
+<%
+  ##
+  # Template per il rendering campo
+  # - form       -> FormBuilder
+  # - form_field -> Array[String]
+%>
+<%# locals: (form:, form_field:) -%>
+<%= form.label(form_field, class: ["form-label", "form-#{form_field}-label"]) %>
+
+<%
+  button_group_classes = ["mb-2"]
+
+  content = form_print_field(form, form_field)
+  unless content.match "checkbox"
+    button_group_classes << "input-group"
+  end
+
+  button_group_classes << (form.object.validated? ? "has-validation" : "")
+  button_group_classes << "form-#{form_field}-input-group"
+
+%>
+<%= content_tag :div, class: button_group_classes.join(" ") do %>
   <%= render partial: "editing_form_measure_unit", locals: {object: form.object, field: form_field} %>
-  <%= form_print_field(form, form_field) %>
+  <%= content %>
   <%= error_messages_for(form.object, form_field) %>
-</div>
+<% end %>
 <%= render partial: "editing_form_help_text", locals: {object: form.object, field: form_field} %>

data/app/views/base_editing/cell_field/_boolean.html.erb

@@ -0,0 +1,3 @@
+<%# Renderizza il campo nella tabella della pagina dei risultati %>
+<%# locals: (obj:,field:)  -%>
+<td><%= boolean_to_icon obj.read_attribute(field) %></td>

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

@@ -0,0 +1,2 @@
+<%# locals: (form:, field:) -%>
+<%= form.switch_box(field) %>

data/base_editing_bootstrap.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   end
   spec.files += Dir['spec/support/external_shared/*.rb']
 
-  spec.add_dependency "rails", [">= 7.0", "< 8.0"]
+  spec.add_dependency "rails", [">= 7.0", "< 8.1"]
   # Policy
   spec.add_dependency "pundit", ["~> 2.3", ">= 2.3.1"]
   # Search
@@ -38,11 +38,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'kaminari', ['~> 1.2', '>= 1.2.2']
   spec.add_dependency 'kaminari-i18n', '~> 0.5'
 
-  spec.add_development_dependency "rspec-rails", '~> 6.0'
+  spec.add_development_dependency "rspec-rails", '~> 7.0'
   spec.add_development_dependency "factory_bot_rails", '~> 6.4'
   spec.add_development_dependency 'faker', '~> 3.3'
   spec.add_development_dependency "puma", '~> 6.4'
-  spec.add_development_dependency "sqlite3", '~> 1.7'
+  spec.add_development_dependency "sqlite3", '>= 1.7.x'
   spec.add_development_dependency "sprockets-rails", '~> 3.4'
   spec.add_development_dependency 'rails-i18n', '~> 7.0' # For 7.0.0
   spec.add_development_dependency "i18n-debug", '~> 1.2'

data/lib/base_editing_bootstrap/VERSION

@@ -1 +1 @@
-0.12.0
+0.14.0

data/lib/base_editing_bootstrap/resource_finder.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module BaseEditingBootstrap
+  ##
+  # PORO to find the base classe in the BaseEditingController
+  class ResourceFinder
+    def initialize(controllar_path)
+      @controllar_path = controllar_path
+      @_model_class = false
+    end
+
+    # @return [NilClass|Object]
+    def model
+      if @_model_class === false
+        @_model_class = nil
+        if (anything = @controllar_path.singularize.camelize.safe_constantize)
+          @_model_class = anything
+        else
+          if @controllar_path.include?("/")
+            demodulize_one_level = @controllar_path.split("/")[1..].join("/")
+            if demodulize_one_level != @controllar_path
+              @_model_class = ResourceFinder.new(demodulize_one_level).model
+            end
+          end
+        end
+      end
+      @_model_class
+    end
+  end
+end

data/lib/generators/base_editing_bootstrap/cell_override/cell_override_generator.rb

@@ -7,7 +7,7 @@ module BaseEditingBootstrap
       argument :name, type: :string, banner: "Post", required: true
       argument :attributes, type: :array, default: [], banner: "field field:type"
 
-      TYPES = [:base,:timestamps].freeze
+      TYPES = [:base, :timestamps, :boolean].freeze
 
       desc <<-DESCRIPTION.strip_heredoc
              Description:   

data/lib/generators/base_editing_bootstrap/field_override/field_override_generator.rb

@@ -7,7 +7,7 @@ module BaseEditingBootstrap
       argument :name, type: :string, banner: "Post", required: true
       argument :attributes, type: :array, default: [], banner: "field field:type"
 
-      TYPES = %i[base date datetime decimal integer enum]
+      TYPES = %i[base date datetime decimal integer enum boolean]
 
       desc <<-DESCRIPTION.strip_heredoc
              Description:   

data/lib/generators/base_editing_bootstrap/install/templates/initializer.rb

@@ -11,12 +11,12 @@ BaseEditingBootstrap.configure do |config|
   # Configurazione per alterare lo standard di azione post aggiornamento record
   # il default è andare nella pagina di editing del record
   # possibili valori :edit , :index
-  # config.inherited_controller = :edit
+  # config.after_success_update_redirect = :edit
 
   ##
   # Configurazione per alterare lo standard di azione post creazione record
   # il default è andare nella pagina di editing del record
   # possibili valori :edit , :index
-  # config.inherited_controller = :edit
+  # config.after_success_create_redirect = :edit
 
 end

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

@@ -31,7 +31,8 @@ module BaseEditingBootstrap
 
       def add_policy
         @search_attrs = []
-        if yes? "Vuoi poter ricercare determinati campi con form di ricerca?"
+        @permitted_attributes = []
+        if yes? "Vuoi poter ricercare determinati campi con form di ricerca?(y/n)"
 
           say "Gli attributi che hai indicato sono: #{ attributes_names.join(",")}"
           say <<~MESSAGE
@@ -52,11 +53,11 @@ module BaseEditingBootstrap
             out << [attr, *matchers.keys.collect{|m| "#{attr}#{m}"  } ]
           end
 
-          puts out.inspect
-
           print_table(out,borders:true)
           @search_attrs = ask("Inserisce un elenco diviso da virgola degli attributi da ricercare").split(",")
-
+          #cerchiamo di estrapolare gli attributi da rendere disponibili a ransack per la ricerca
+          @permitted_attributes = out.select{|c|  c[1..].intersect?(@search_attrs)  }.collect(&:first)
+          puts @permitted_attributes.inspect
         end
 
         template "policy.rb", File.join("app/policies", "#{singular_name}_policy.rb")

data/lib/generators/base_editing_bootstrap/scaffold/templates/policy.rb.tt

@@ -8,4 +8,10 @@ class <%= class_name %>Policy < BaseModelPolicy
     %i[<%= @search_attrs.join(" ") %>]
   end
 <%- end -%>
+<%- if @permitted_attributes.any? -%>
+  # TODO check if correct with search_fields
+  def permitted_attributes_for_ransack
+    %w[<%= @permitted_attributes.join(" ") %>]
+  end
+<%- end -%>
 end

data/spec/support/external_shared/base_editing_controller_helpers.rb

@@ -190,7 +190,13 @@ default_unathorized_failure = -> { raise "TODO - passare proc con richiesta che
 
 RSpec.shared_examples "fail with unauthorized" do |request: default_unathorized_failure|
   it "is expected to redirect to root" do
-    expect(Pundit).to receive(:authorize).with(user, any_args).and_raise(Pundit::NotAuthorizedError)
+
+    if Gem::Version.create( Pundit::VERSION) < Gem::Version.create('2.3.2')
+      allow(Pundit).to receive(:authorize).with(user, any_args).and_raise(Pundit::NotAuthorizedError)
+    else
+      allow_any_instance_of(Pundit::Context).to receive(:authorize).and_raise(Pundit::NotAuthorizedError)
+    end
+
     instance_exec(&request)
     expect(response).to redirect_to(root_path)
     expect(flash[:error]).not_to be_nil

data/spec/support/external_shared/pundit.rb

@@ -28,6 +28,14 @@ RSpec.shared_examples "a standard base model policy" do |factory, check_default_
           create: true,
           index: true
         }
+      elsif check_default_responses == :full_disallow
+        checks = {
+          show: false,
+          destroy: false,
+          update: false,
+          create: false,
+          index: false
+        }
       elsif check_default_responses.is_a? Hash
         checks = check_default_responses
       elsif check_default_responses == false
@@ -37,6 +45,7 @@ RSpec.shared_examples "a standard base model policy" do |factory, check_default_
          Acceptable values for check_default_responses are: 
            - true
            - false
+           - :full_disallow -> all methods to false
            - Hash with:  
               show
               destroy
@@ -64,7 +73,7 @@ RSpec.shared_examples "a standard base model policy" do |factory, check_default_
     end
 
     with_them do
-      it "should " do
+      it "should respond_to? #{params[:method]}" do
         expect(instance).to respond_to(method)
       end
       if check_default_responses

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: base_editing_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Marino Bonetti
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-01 00:00:00.000000000 Z
+date: 2024-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -19,7 +19,7 @@ dependencies:
         version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '8.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '8.1'
 - !ruby/object:Gem::Dependency
   name: pundit
   requirement: !ruby/object:Gem::Requirement
@@ -110,14 +110,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
@@ -164,16 +164,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 1.7.x
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 1.7.x
 - !ruby/object:Gem::Dependency
   name: sprockets-rails
   requirement: !ruby/object:Gem::Requirement
@@ -302,6 +302,7 @@ files:
 - app/helpers/base_editing_helper.rb
 - app/helpers/utilities/enum_helper.rb
 - app/helpers/utilities/form_helper.rb
+- app/helpers/utilities/icon_helper.rb
 - app/helpers/utilities/page_helper.rb
 - app/helpers/utilities/search_helper.rb
 - app/helpers/utilities/template_helper.rb
@@ -331,9 +332,11 @@ files:
 - app/views/base_editing/_search_result_row.html.erb
 - app/views/base_editing/_tabs.html.erb
 - app/views/base_editing/cell_field/_base.html.erb
+- app/views/base_editing/cell_field/_boolean.html.erb
 - app/views/base_editing/cell_field/_timestamps.html.erb
 - app/views/base_editing/edit.html.erb
 - app/views/base_editing/form_field/_base.html.erb
+- app/views/base_editing/form_field/_boolean.html.erb
 - app/views/base_editing/form_field/_date.html.erb
 - app/views/base_editing/form_field/_datetime.html.erb
 - app/views/base_editing/form_field/_decimal.html.erb
@@ -359,6 +362,7 @@ files:
 - lib/base_editing_bootstrap/engine.rb
 - lib/base_editing_bootstrap/forms/base.rb
 - lib/base_editing_bootstrap/is_validated.rb
+- lib/base_editing_bootstrap/resource_finder.rb
 - lib/base_editing_bootstrap/searches/base.rb
 - lib/base_editing_bootstrap/searches/field.rb
 - lib/base_editing_bootstrap/version.rb