cm-admin 1.5.10 → 1.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13710f4822ce508ecf0fa69b136368cfc21c2d381414fa002e7e26217ccafc03
-  data.tar.gz: 658aec550f94375067dac5e27c4805eb9d9fcae7b201c90e55bd04ee35818c07
+  metadata.gz: 8d46388e08f654f888bb33807afaa1eccf7911831f5a47aec2c2ca8051c1e8ea
+  data.tar.gz: 79be71a21dc68d7118465c6abbddbf500d68744564d3ea2a002af138e065a41c
 SHA512:
-  metadata.gz: 653d760b396e835a65129ecd591664cc01ae343921aa36a831f0150503530b803deb5305c85b204fc5634b3d449815c55362b2d3bf281bcf03594db500dd5dd1
-  data.tar.gz: bb5a3a55e20b0a020039bac2e45498f225224ac5ee249a9646fd9da1b1e00aeb322d3716a16414f19049a06d6423baffa22a6fc48b2c80a238b5c23e062eb8a1
+  metadata.gz: 8fc060fb6bc652c9e3b6abec4d55724aec3af6bb95d37e6827f9ce8e0d71ecce427a96abda152a39c5e3be9c344a3c9f74bf9d4c76c375fe228b2fb9fd779dca
+  data.tar.gz: d67ce654a076de309bdb53bf8fd62e90ac839f144ac9e8c2861be231b87db122fad71f65536a19e09ff018c81ae5a4048a1f38769d1fdab776d0885a237d44ec

data/.github/workflows/linters.yml

@@ -19,6 +19,10 @@ jobs:
           rubocop_extensions: rubocop-rails:2.14.2
           github_token: ${{ secrets.GITHUB_TOKEN }}
           reporter: github-pr-check # Possible values are github-pr-check, github-pr-review
+      - name: reek
+        uses: reviewdog/action-reek@v1
+        with:
+          reek_version: 6.1.1
       - uses: actions/checkout@v3
       - name: stylelint
         uses: reviewdog/action-stylelint@v1

data/.github/workflows/{release-gem.yml → push_gem.yml}

@@ -1,4 +1,5 @@
-name: Bump Gem
+# .github/workflows/push_gem.yml
+name: Push Gem
 
 on:
   workflow_dispatch:
@@ -17,8 +18,8 @@ permissions:
   contents: read
 
 jobs:
-  build:
-    name: Build gem
+  push:
+    name: Push gem to RubyGems.org
     runs-on: ubuntu-latest
 
     permissions:
@@ -36,6 +37,8 @@ jobs:
           git config --global user.email "${GITHUB_ACTOR_ID}+${GITHUB_ACTOR}@users.noreply.github.com"
           git config --global user.name "$(gh api /users/${GITHUB_ACTOR} | jq .name -r)"
           git config -l
+
+
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -45,48 +48,14 @@ jobs:
       - name: Install the gem-release
         run: gem install gem-release
 
-      - name: Bump the gem
-        run: gem bump ${{ github.events.inputs.bump_type }}
-
       - name: Remove lock on bundle
         run: bundle config set frozen false
 
-      - name: Bundle Install
-        run: bundle install
-
-      - name: Git Add files
-        run: git add Gemfile.lock
-
-      - name: Git Commit
-        run: git commit -m "Add bundle files"
-
-      - name: Push the new version
-        run: git push origin ${{ github.ref_name }}
-
-  release:
-
-    name: Release gem
-    runs-on: ubuntu-latest
-    needs: build
-    permissions:
-      id-token: write # IMPORTANT: this permission is mandatory for trusted publishing
-      contents: write # IMPORTANT: this permission is required for `rake release` to push the release tag
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Git Pull
-        run: git pull
-
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ruby
-          bundler-cache: true
+      - name: Bump the gem
+        run: gem bump ${{ github.events.inputs.bump_type }}
 
-      - name: Remove lock on bundle
-        run: bundle config set frozen false
+      - name: Commit the new version
+        run: git push  
 
-      - uses: rubygems/release-gem@v1
-        with:
-          await-release: false
+      # Release
+      - uses: rubygems/release-gem@v1

data/.reek.yml

@@ -0,0 +1,9 @@
+detectors:
+  IrresponsibleModule:
+    enabled: false
+  UncommunicativeVariableName:
+    enabled: true
+    accept:
+      - e
+  TooManyStatements:
+    enabled: false

data/Gemfile

@@ -8,9 +8,9 @@ gem 'rspec', '~> 3.0'
 gem 'slim'
 
 group :development do
-  gem 'rubocop', require: false
-  gem 'rubocop-performance', require: false
-  gem 'rubocop-rails', require: false
+  gem 'rubocop', '~> 1.35.1', require: false
+  gem 'rubocop-rails', '~> 2.15.2', require: false
+  gem 'rubocop-performance', '~> 1.14.3', require: false
 end
 # Specify your gem's dependencies in cm_admin.gemspec
 gemspec

data/Gemfile.lock

@@ -98,7 +98,7 @@ GEM
     cocoon (1.2.15)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    concurrent-ruby (1.3.3)
+    concurrent-ruby (1.2.2)
     crass (1.0.6)
     csv-importer (0.8.2)
       virtus
@@ -110,15 +110,14 @@ GEM
     globalid (1.2.1)
       activesupport (>= 6.1)
     htmlentities (4.3.4)
-    i18n (1.14.5)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     importmap-rails (2.0.1)
       actionpack (>= 6.0.0)
       activesupport (>= 6.0.0)
       railties (>= 6.0.0)
-    json (2.7.2)
-    language_server-protocol (3.17.0.3)
+    json (2.6.2)
     local_time (2.1.0)
     loofah (2.22.0)
       crass (~> 1.0.2)
@@ -132,7 +131,7 @@ GEM
     method_source (1.1.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.7)
-    minitest (5.24.0)
+    minitest (5.18.1)
     net-imap (0.4.11)
       date
       net-protocol
@@ -151,14 +150,13 @@ GEM
     nokogiri (1.16.5-x86_64-linux)
       racc (~> 1.4)
     pagy (4.11.0)
-    parallel (1.25.1)
-    parser (3.3.3.0)
+    parallel (1.22.1)
+    parser (3.1.2.1)
       ast (~> 2.4.1)
-      racc
     pundit (2.2.0)
       activesupport (>= 3.0.0)
     racc (1.8.0)
-    rack (2.2.9)
+    rack (2.2.7)
     rack-proxy (0.7.7)
       rack
     rack-test (2.1.0)
@@ -193,9 +191,8 @@ GEM
       zeitwerk (~> 2.5)
     rainbow (3.1.1)
     rake (12.3.3)
-    regexp_parser (2.9.2)
-    rexml (3.3.0)
-      strscan
+    regexp_parser (2.6.1)
+    rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -209,34 +206,31 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
-    rubocop (1.64.1)
+    rubocop (1.35.1)
       json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.3.0.2)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      rubocop-ast (>= 1.20.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.3)
-      parser (>= 3.3.1.0)
-    rubocop-performance (1.21.1)
-      rubocop (>= 1.48.1, < 2.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails (2.25.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.23.0)
+      parser (>= 3.1.1.0)
+    rubocop-performance (1.14.3)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rails (2.15.2)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 1.33.0, < 2.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
-    ruby-progressbar (1.13.0)
+      rubocop (>= 1.7.0, < 2.0)
+    ruby-progressbar (1.11.0)
     rubyzip (2.3.2)
     semantic_range (3.0.0)
     slim (4.1.0)
       temple (>= 0.7.6, < 0.9)
       tilt (>= 2.0.6, < 2.1)
-    strscan (3.1.0)
     temple (0.8.2)
     thor (1.3.1)
     thread_safe (0.3.6)
@@ -244,7 +238,7 @@ GEM
     timeout (0.4.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
+    unicode-display_width (2.3.0)
     virtus (2.0.0)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
@@ -273,9 +267,9 @@ DEPENDENCIES
   pundit
   rake (~> 12.0)
   rspec (~> 3.0)
-  rubocop
-  rubocop-performance
-  rubocop-rails
+  rubocop (~> 1.35.1)
+  rubocop-performance (~> 1.14.3)
+  rubocop-rails (~> 2.15.2)
   slim
 
 BUNDLED WITH

data/app/views/cm_admin/main/_show_section.html.slim

@@ -4,10 +4,7 @@
       p.section-heading = section.section_name
       .card
         .card-body
-          - if !section.section_fields.empty?
-            - section.section_fields.each do |field|
-              = show_field(@ar_object, field)
-          - if section.rows.present?
-              = show_rows(@ar_object, section.rows)
+          - section.section_fields.each do |field|
+            = show_field(@ar_object, field)
           - section.nested_table_fields.each do |nested_field|
-            = render partial: 'cm_admin/main/nested_table_section', locals: { nested_field: nested_field, ar_object: @ar_object }
+            = render partial: 'cm_admin/main/nested_table_section', locals: { nested_field: nested_field, ar_object: @ar_object }

data/lib/cm_admin/models/form_field.rb

@@ -6,7 +6,7 @@ module CmAdmin
       include Utils::Helpers
 
       attr_accessor :field_name, :label, :header, :input_type, :collection, :disabled, :helper_method,
-                    :placeholder, :display_if, :html_attrs, :target, :col_size, :ajax_url
+                    :placeholder, :display_if, :html_attr, :target, :col_size, :ajax_url
 
       VALID_INPUT_TYPES = %i[
         integer decimal string single_select multi_select date date_time text
@@ -28,7 +28,7 @@ module CmAdmin
         self.disabled = lambda { |arg| return false } if display_if.nil?
         self.label = self.field_name.to_s.titleize
         self.input_type = :string
-        self.html_attrs = {}
+        self.html_attr = {}
         self.target = {}
         self.col_size = nil
       end

data/lib/cm_admin/models/row.rb

@@ -27,14 +27,6 @@ module CmAdmin
         end
       end
 
-      def field(field_name, options={})
-        if @current_nested_field
-          @current_nested_field.fields << CmAdmin::Models::Field.new(field_name, options)
-        else
-          @row_fields << CmAdmin::Models::Field.new(field_name, options)
-        end
-      end
-
       def cm_section(section_name, col_size: nil, display_if: nil, &block)
         @sections << CmAdmin::Models::Section.new(section_name, @current_action, @model, display_if, col_size, &block)
       end
@@ -45,4 +37,4 @@ module CmAdmin
       end
     end
   end
-end
+end

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '1.5.10'
+  VERSION = '1.5.11'
 end

data/lib/cm_admin/view_helpers/field_display_helper.rb

@@ -9,23 +9,6 @@ module CmAdmin
         end
       end
 
-      def show_rows(ar_object, rows, col_size: 3)
-        rows.map do |row|
-          content_tag(:div, class: 'row') do
-            row.row_fields.map do |field|
-              next unless field.display_if.call(ar_object)
-
-              content_tag(:div, class: "col-#{col_size}") do
-                content_tag(:div, class: "card-info") do
-                  concat show_field_label(ar_object, field)
-                  concat value_with_prefix_and_suffix(ar_object, field)
-                end
-              end
-            end.compact.join.html_safe
-          end
-        end.join.html_safe
-      end
-
       def show_field_label(ar_object, field)
         content_tag(:div, class: "card-info__label") do
           field_label = if field.label.present?
@@ -88,7 +71,7 @@ module CmAdmin
         when :tag
           tag_class = field.tag_class.dig("#{ar_object.send(field.field_name.to_s)}".to_sym).to_s
           content_tag :span, class: "status-tag #{tag_class}" do
-            ar_object.send(field.field_name).to_s.titleize.upcase
+            ar_object.send(field.field_name).to_s.upcase
           end
         when :attachment
           show_attachment_value(ar_object, field)

data/lib/cm_admin/view_helpers/form_field_helper.rb

@@ -19,73 +19,57 @@ module CmAdmin
 
       def cm_integer_field(form_obj, cm_field, value, required_class, _target_action, _ajax_url)
         form_obj.text_field cm_field.field_name,
-                            merge_wrapper_options(
-                            {
-                              class: "field-control #{required_class}",
-                              disabled: cm_field.disabled.call(form_obj.object),
-                              value: value,
-                              placeholder: cm_field.placeholder,
-                              data: { behaviour: 'integer-only' }
-                            }, cm_field.html_attrs )
+                            class: "field-control #{required_class}",
+                            disabled: cm_field.disabled.call(form_obj.object),
+                            value: value,
+                            placeholder: cm_field.placeholder,
+                            data: { behaviour: 'integer-only' }
       end
 
       def cm_decimal_field(form_obj, cm_field, value, required_class, _target_action, _ajax_url)
         form_obj.text_field cm_field.field_name,
-                            merge_wrapper_options({
                               class: "field-control #{required_class}",
                               disabled: cm_field.disabled.call(form_obj.object),
                               value: value,
                               placeholder: cm_field.placeholder,
                               data: { behaviour: 'decimal-only' }
-                            }, cm_field.html_attrs )
       end
 
       def cm_string_field(form_obj, cm_field, value, required_class, _target_action, _ajax_url)
         form_obj.text_field cm_field.field_name,
-                            merge_wrapper_options(
-                            {
-                              class: "field-control #{required_class}",
-                              disabled: cm_field.disabled.call(form_obj.object),
-                              value: value,
-                              placeholder: cm_field.placeholder
-                            }, cm_field.html_attrs )
+                            class: "field-control #{required_class}",
+                            disabled: cm_field.disabled.call(form_obj.object),
+                            value: value,
+                            placeholder: cm_field.placeholder
       end
 
       def cm_custom_string_field(form_obj, cm_field, value, required_class, _target_action)
-        text_field_tag cm_field.html_attrs[:name] || cm_field.field_name,
-                            merge_wrapper_options(
-                            {
-                              value: value,
-                              class: "field-control #{required_class}",
-                              disabled: cm_field.disabled.call(form_obj.object),
-                              placeholder: cm_field.placeholder
-                            }, cm_field.html_attrs )
+        text_field_tag cm_field.html_attr[:name] || cm_field.field_name,
+                        value, class: "field-control #{required_class}",
+                        disabled: cm_field.disabled.call(form_obj.object),
+                        placeholder: cm_field.placeholder
       end
 
       def cm_single_select_field(form_obj, cm_field, value, required_class, target_action, ajax_url)
         class_name = ajax_url.present? ? 'select-2-ajax' : 'select-2'
         form_obj.select cm_field.field_name, options_for_select(select_collection_value(form_obj.object, cm_field), form_obj.object.send(cm_field.field_name)),
-                        {include_blank: cm_field.placeholder},
-                        merge_wrapper_options(
-                        {
-                          class: "field-control #{required_class} #{class_name}",
-                          disabled: cm_field.disabled.call(form_obj.object),
-                          data: {
-                            field_name: cm_field.field_name,
-                            field_type: 'linked-field',
-                            target_action: target_action&.name,
-                            target_url: target_action&.name ? cm_admin.send("#{@model.name.underscore}_#{target_action&.name}_path") : '',
-                            ajax_url: ajax_url
-                          }
-                        }, cm_field.html_attrs )
+                        { include_blank: cm_field.placeholder },
+                        class: "field-control #{required_class} #{class_name}",
+                        disabled: cm_field.disabled.call(form_obj.object),
+                        data: {
+                          field_name: cm_field.field_name,
+                          field_type: 'linked-field',
+                          target_action: target_action&.name,
+                          target_url: target_action&.name ? cm_admin.send("#{@model.name.underscore}_#{target_action&.name}_path") : '',
+                          ajax_url: ajax_url
+                        }
       end
 
       def cm_custom_single_select_field(form_obj, cm_field, value, required_class, target_action, _ajax_url)
-        select_tag cm_field.html_attrs[:name] || cm_field.field_name,
+        select_tag cm_field.html_attr[:name] || cm_field.field_name,
                     options_for_select(select_collection_value(form_obj.object, cm_field)),
-                    {include_blank: cm_field.placeholder}
-                    merge_wrapper_options(
                     {
+                      include_blank: cm_field.placeholder,
                       class: "field-control #{required_class} select-2",
                       disabled: cm_field.disabled.call(form_obj.object),
                       data: {
@@ -94,94 +78,66 @@ module CmAdmin
                         target_action: target_action&.name,
                         target_url: target_action&.name ? cm_admin.send("#{@model.name.underscore}_#{target_action&.name}_path") : ''
                       }
-                    }, cm_field.html_attrs )
+                    }
       end
 
       def cm_multi_select_field(form_obj, cm_field, value, required_class, target_action, _ajax_url)
         form_obj.select cm_field.field_name,
                         options_for_select(select_collection_value(form_obj.object, cm_field), form_obj.object.send(cm_field.field_name)),
-                        {include_blank: cm_field.placeholder}
-                        merge_wrapper_options(
-                        {
-                          class: "field-control #{required_class} select-2",
-                          disabled: cm_field.disabled.call(form_obj.object), multiple: true
-                        }, cm_field.html_attrs )
+                        { include_blank: cm_field.placeholder },
+                        class: "field-control #{required_class} select-2",
+                        disabled: cm_field.disabled.call(form_obj.object), multiple: true
       end
 
       def cm_date_field(form_obj, cm_field, value, required_class, _target_action, _ajax_url)
         form_obj.text_field cm_field.field_name,
-                          merge_wrapper_options(
-                          {
                             class: "field-control #{required_class}",
                             disabled: cm_field.disabled.call(form_obj.object),
                             value: value&.strftime('%d-%m-%Y'),
                             placeholder: cm_field.placeholder,
                             data: { behaviour: 'date-only' }
-                          }, cm_field.html_attrs )
       end
 
       def cm_custom_date_field(form_obj, cm_field, value, required_class, _target_action, _ajax_url)
-        text_field_tag cm_field.html_attrs[:name] || cm_field.field_name, value&.strftime('%d-%m-%Y'),
-                          merge_wrapper_options(
-                          {
+        text_field_tag cm_field.html_attr[:name] || cm_field.field_name, value&.strftime('%d-%m-%Y'),
                             class: "field-control #{required_class}",
                             disabled: cm_field.disabled.call(form_obj.object),
                             value: value&.strftime('%d-%m-%Y'),
                             placeholder: cm_field.placeholder,
                             data: { behaviour: 'date-only' }
-                          }, cm_field.html_attrs )
       end
 
       def cm_date_time_field(form_obj, cm_field, value, required_class, _target_action, _ajax_url)
         form_obj.text_field cm_field.field_name,
-                          merge_wrapper_options(
-                          {
                             class: "field-control #{required_class}",
                             disabled: cm_field.disabled.call(form_obj.object),
                             value: value,
                             placeholder: cm_field.placeholder,
                             data: { behaviour: 'date-time' }
-                          }, cm_field.html_attrs )
       end
 
       def cm_text_field(form_obj, cm_field, value, required_class, _target_action, _ajax_url)
         form_obj.text_area cm_field.field_name,
-                          merge_wrapper_options(
-                          {
-                            class: "field-control #{required_class}",
-                            placeholder: cm_field.placeholder
-                          }, cm_field.html_attrs)
+                           class: "field-control #{required_class}",
+                           placeholder: cm_field.placeholder
       end
 
       def cm_rich_text_field(form_obj, cm_field, value, required_class, _target_action, _ajax_url)
         form_obj.rich_text_area cm_field.field_name,
-                          merge_wrapper_options(
-                          {
-                            class: "field-control #{required_class}",
-                            placeholder: cm_field.placeholder
-                          }, cm_field.html_attrs)
+                                class: "field-control #{required_class}",
+                                placeholder: cm_field.placeholder
       end
 
       def cm_single_file_upload_field(form_obj, cm_field, _value, required_class, _target_action, _ajax_url)
         content_tag(:div) do
-          concat form_obj.file_field cm_field.field_name,
-                          merge_wrapper_options(
-                            {
-                              class: "field-control #{required_class}",
-                              disabled: cm_field.disabled.call(form_obj.object)
-                            }, cm_field.html_attrs )
+          concat form_obj.file_field cm_field.field_name, class: "field-control #{required_class}", disabled: cm_field.disabled.call(form_obj.object)
           concat attachment_list(form_obj, cm_field, _value, required_class, _target_action)
         end
       end
 
       def cm_multi_file_upload_field(form_obj, cm_field, _value, required_class, _target_action, _ajax_url)
         content_tag(:div) do
-          concat form_obj.file_field cm_field.field_name,
-                          merge_wrapper_options(
-                            {
-                              multiple: true, class: "field-control #{required_class}",
-                              disabled: cm_field.disabled.call(form_obj.object)
-                            }, cm_field.html_attrs )
+          concat form_obj.file_field cm_field.field_name, multiple: true, class: "field-control #{required_class}", disabled: cm_field.disabled.call(form_obj.object)
           concat attachment_list(form_obj, cm_field, _value, required_class, _target_action)
         end
       end
@@ -189,7 +145,7 @@ module CmAdmin
       def attachment_list(form_obj, cm_field, _value, required_class, _target_action)
         attached = form_obj.object.send(cm_field.field_name)
         return if defined?(::Paperclip) && attached.instance_of?(::Paperclip::Attachment)
-
+        
         content_tag(:div) do
           if attached.class == ActiveStorage::Attached::Many
             attached.each do |attachment|
@@ -220,11 +176,8 @@ module CmAdmin
 
       def cm_hidden_field(form_obj, cm_field, value, required_class, _target_action, _ajax_url)
         form_obj.hidden_field cm_field.field_name,
-                             merge_wrapper_options(
-                              {
-                                value: value,
-                                name: cm_field.html_attrs[:name] || "#{form_obj.object_name}[#{cm_field.field_name}]"
-                              }, cm_field.html_attrs )
+                              value: value,
+                              name: cm_field.html_attr[:name] || "#{form_obj.object_name}[#{cm_field.field_name}]"
       end
 
       # Refactor: Collection argument can be removed.
@@ -244,16 +197,15 @@ module CmAdmin
           format_check_box_array(value, form_obj, cm_field, required_class, target_action)
         else
           form_obj.check_box cm_field.field_name,
-                            merge_wrapper_options(
-                            {
-                              class: "cm-checkbox #{required_class} #{target_action.present? ? 'linked-field-request' : ''}",
-                                disabled: cm_field.disabled.call(form_obj.object),
-                                data: {
-                                  field_name: cm_field.field_name,
-                                  target_action: target_action&.name,
-                                  target_url: target_action&.name ? cm_admin.send("#{@model.name.underscore}_#{target_action&.name}_path") : ''
-                              }
-                            }, cm_field.html_attrs )
+                             {
+                               class: "cm-checkbox #{required_class} #{target_action.present? ? 'linked-field-request' : ''}",
+                               disabled: cm_field.disabled.call(form_obj.object),
+                               data: {
+                                 field_name: cm_field.field_name,
+                                 target_action: target_action&.name,
+                                 target_url: target_action&.name ? cm_admin.send("#{@model.name.underscore}_#{target_action&.name}_path") : ''
+                               }
+                             }
         end
       end
 
@@ -275,7 +227,6 @@ module CmAdmin
       def format_check_box_tag(val, form_obj, cm_field, required_class, target_action)
         content_tag :div, class: 'cm-radio-tag' do
           concat form_obj.check_box cm_field.field_name,
-                                    merge_wrapper_options(
                                     {
                                       class: "cm-checkbox #{required_class} #{target_action.present? ? 'linked-field-request' : ''}",
                                       disabled: cm_field.disabled.call(form_obj.object),
@@ -284,8 +235,7 @@ module CmAdmin
                                         target_action: target_action&.name,
                                         target_url: target_action&.name ? cm_admin.send("#{@model.name.underscore}_#{target_action&.name}_path", ':param_1') : ''
                                       }
-                                    }, cm_field.html_attrs ),
-                                    val
+                                    }, val
         end
       end
 
@@ -309,24 +259,6 @@ module CmAdmin
           concat form_obj.radio_button :level, val, class: 'field-control cm-radio'
         end
       end
-
-      def merge_wrapper_options(options, html_attrs)
-        if html_attrs
-          options.merge(html_attrs) do |key, oldval, newval|
-            case key.to_s
-            when "class"
-              oldval + " " + newval
-            when "data", "aria"
-              oldval.merge(newval)
-            else
-              newval
-            end
-          end
-        else
-          options
-        end
-      end
-
     end
   end
 end

data/package-lock.json

@@ -13650,9 +13650,9 @@
       }
     },
     "node_modules/ws": {
-      "version": "8.17.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
-      "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
+      "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
       "dev": true,
       "engines": {
         "node": ">=10.0.0"

data/yarn.lock

@@ -7717,9 +7717,9 @@ write-file-atomic@^4.0.2:
     signal-exit "^3.0.7"
 
 ws@^8.4.2:
-  version "8.17.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.1.tgz#9293da530bb548febc95371d90f9c878727d919b"
-  integrity sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==
+  version "8.8.0"
+  resolved "https://registry.npmjs.org/ws/-/ws-8.8.0.tgz"
+  integrity sha512-JDAgSYQ1ksuwqfChJusw1LSJ8BizJ2e/vVu5Lxjq3YvNJNlROv1ui4i+c/kUUrPheBvQl4c5UbERhTwKa6QBJQ==
 
 xtend@^4.0.0, xtend@~4.0.1:
   version "4.0.2"

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 1.5.10
+  version: 1.5.11
 platform: ruby
 authors:
 - sajinmp
 - anbublacky
 - AdityaTiwari2102
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-21 00:00:00.000000000 Z
+date: 2024-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx_rails
@@ -168,8 +168,9 @@ files:
 - ".github/ISSUE_TEMPLATE/config.yml"
 - ".github/ISSUE_TEMPLATE/feature_request.md"
 - ".github/workflows/linters.yml"
-- ".github/workflows/release-gem.yml"
+- ".github/workflows/push_gem.yml"
 - ".gitignore"
+- ".reek.yml"
 - ".rspec"
 - ".rubocop-https---raw-githubusercontent-com-commutatus-cm-linters-main-rubocop-yml"
 - ".rubocop.yml"
@@ -483,7 +484,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/commutatus/cm-admin
   source_code_uri: https://github.com/commutatus/cm-admin
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -498,8 +499,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key: 
+rubygems_version: 3.5.13
+signing_key:
 specification_version: 4
 summary: CmAdmin is a robust gem designed to assist in creating admin panels for Rails
   applications