cm-admin 1.5.27 → 1.5.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80372ae18ae55b314e3140013b256d5b482105f017bd8174dfb5a0eb7157e105
-  data.tar.gz: 6543238e8a2610fd96742ec9e062d3f2b1e0a5a7bcf12c925734fa8c072a3b15
+  metadata.gz: 7935960984bf5a170dbb16e272ce951ab886ae16fcbb131d25fcbaafc31a8e82
+  data.tar.gz: de1756f433cdb23fccf3daaee59e46b8436ca37cee29b5c34808a19d28211989
 SHA512:
-  metadata.gz: 1d18282dfa81d47fd073355c9e473255d3e1abfae81366b09683ba37e3c47a92fc927e47258523acf48c10d3faf9587c39bbab31983e3ce5e1192d5757a4fe30
-  data.tar.gz: 40a791b08a8795345394960c8e00d7a50706988e97f7110240997cdac8239c2545dd2fb494ce52a83fd7ec513cacbaa51f685f5c4db1756a181e0679a8e6ef89
+  metadata.gz: 315d9e2c449721ac68ae48fe238ad80035208b774c84e31c71f70bf9c4fb3f481ae0ff37d1e9fa76aaa9040106d59a202e7baea257cc2b603ecb7bd4cdc08efc
+  data.tar.gz: 00577270ba1efaee074b670e339e80ee80692414b3ea7ecc2388951443d881bbbc3f5f56866baa4f0b7c907d8a1188f10dd6081fbafce27d268f37bbbb67c276

data/.github/workflows/linters.yml

@@ -19,10 +19,6 @@ 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/Gemfile

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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cm-admin (1.5.27)
+    cm-admin (1.5.28)
       caxlsx_rails
       cocoon (~> 1.2.15)
       csv-importer (~> 0.8.2)
@@ -98,7 +98,7 @@ GEM
     cocoon (1.2.15)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.3.3)
     crass (1.0.6)
     csv-importer (0.8.2)
       virtus
@@ -110,14 +110,15 @@ GEM
     globalid (1.2.1)
       activesupport (>= 6.1)
     htmlentities (4.3.4)
-    i18n (1.14.1)
+    i18n (1.14.5)
       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.6.2)
+    json (2.7.2)
+    language_server-protocol (3.17.0.3)
     local_time (2.1.0)
     loofah (2.22.0)
       crass (~> 1.0.2)
@@ -131,7 +132,7 @@ GEM
     method_source (1.1.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.7)
-    minitest (5.18.1)
+    minitest (5.24.0)
     net-imap (0.4.11)
       date
       net-protocol
@@ -150,13 +151,14 @@ GEM
     nokogiri (1.16.5-x86_64-linux)
       racc (~> 1.4)
     pagy (4.11.0)
-    parallel (1.22.1)
-    parser (3.1.2.1)
+    parallel (1.25.1)
+    parser (3.3.3.0)
       ast (~> 2.4.1)
+      racc
     pundit (2.2.0)
       activesupport (>= 3.0.0)
     racc (1.8.0)
-    rack (2.2.7)
+    rack (2.2.9)
     rack-proxy (0.7.7)
       rack
     rack-test (2.1.0)
@@ -191,8 +193,9 @@ GEM
       zeitwerk (~> 2.5)
     rainbow (3.1.1)
     rake (12.3.3)
-    regexp_parser (2.6.1)
-    rexml (3.2.5)
+    regexp_parser (2.9.2)
+    rexml (3.3.0)
+      strscan
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -206,31 +209,34 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
-    rubocop (1.35.1)
+    rubocop (1.64.1)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.20.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      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)
+      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)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 1.7.0, < 2.0)
-    ruby-progressbar (1.11.0)
+      rubocop (>= 1.33.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    ruby-progressbar (1.13.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)
@@ -238,7 +244,7 @@ GEM
     timeout (0.4.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.3.0)
+    unicode-display_width (2.5.0)
     virtus (2.0.0)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
@@ -267,9 +273,9 @@ DEPENDENCIES
   pundit
   rake (~> 12.0)
   rspec (~> 3.0)
-  rubocop (~> 1.35.1)
-  rubocop-performance (~> 1.14.3)
-  rubocop-rails (~> 2.15.2)
+  rubocop
+  rubocop-performance
+  rubocop-rails
   slim
 
 BUNDLED WITH

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

@@ -4,7 +4,10 @@
       p.section-heading = section.section_name
       .card
         .card-body
-          - section.section_fields.each do |field|
-            = show_field(@ar_object, field)
+          - 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.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/cm_admin.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.description   = 'CmAdmin providing a streamlined and efficient solution for building customized admin panels within the context of Rails applications. Its robust features empower developers to effortlessly generate and manage administrative interfaces with precision and ease.'
   spec.homepage      = 'https://github.com/commutatus/cm-admin'
   spec.license       = 'MIT'
-  spec.required_ruby_version = '>= 3.0.0'
+  spec.required_ruby_version = '>= 2.7.0'
 
   # spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
 

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_attr, :target, :col_size, :ajax_url
+                    :placeholder, :display_if, :html_attrs, :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_attr = {}
+        self.html_attrs = {}
         self.target = {}
         self.col_size = nil
       end

data/lib/cm_admin/models/row.rb

@@ -27,6 +27,14 @@ 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
@@ -37,4 +45,4 @@ module CmAdmin
       end
     end
   end
-end
+end

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '1.5.27'
+  VERSION = '1.5.28'
 end

data/lib/cm_admin/view_helpers/field_display_helper.rb

@@ -9,6 +9,23 @@ 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?
@@ -71,7 +88,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.upcase
+            ar_object.send(field.field_name).to_s.titleize.upcase
           end
         when :attachment
           show_attachment_value(ar_object, field)

data/lib/cm_admin/view_helpers/form_field_helper.rb

@@ -19,57 +19,73 @@ 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,
-                            class: "field-control #{required_class}",
-                            disabled: cm_field.disabled.call(form_obj.object),
-                            value: value,
-                            placeholder: cm_field.placeholder,
-                            data: { behaviour: 'integer-only' }
+                            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 )
       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,
-                            class: "field-control #{required_class}",
-                            disabled: cm_field.disabled.call(form_obj.object),
-                            value: value,
-                            placeholder: cm_field.placeholder
+                            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 )
       end
 
       def cm_custom_string_field(form_obj, cm_field, value, required_class, _target_action)
-        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
+        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 )
       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 },
-                        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
-                        }
+                        {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 )
       end
 
       def cm_custom_single_select_field(form_obj, cm_field, value, required_class, target_action, _ajax_url)
-        select_tag cm_field.html_attr[:name] || cm_field.field_name,
+        select_tag cm_field.html_attrs[: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: {
@@ -78,66 +94,94 @@ 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 },
-                        class: "field-control #{required_class} select-2",
-                        disabled: cm_field.disabled.call(form_obj.object), multiple: true
+                        {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 )
       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_attr[:name] || cm_field.field_name, value&.strftime('%d-%m-%Y'),
+        text_field_tag cm_field.html_attrs[:name] || cm_field.field_name, value&.strftime('%d-%m-%Y'),
+                          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_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,
-                           class: "field-control #{required_class}",
-                           placeholder: cm_field.placeholder
+                          merge_wrapper_options(
+                          {
+                            class: "field-control #{required_class}",
+                            placeholder: cm_field.placeholder
+                          }, cm_field.html_attrs)
       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,
-                                class: "field-control #{required_class}",
-                                placeholder: cm_field.placeholder
+                          merge_wrapper_options(
+                          {
+                            class: "field-control #{required_class}",
+                            placeholder: cm_field.placeholder
+                          }, cm_field.html_attrs)
       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, class: "field-control #{required_class}", disabled: cm_field.disabled.call(form_obj.object)
+          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 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, multiple: true, class: "field-control #{required_class}", disabled: cm_field.disabled.call(form_obj.object)
+          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 attachment_list(form_obj, cm_field, _value, required_class, _target_action)
         end
       end
@@ -145,7 +189,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|
@@ -176,8 +220,11 @@ 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,
-                              value: value,
-                              name: cm_field.html_attr[:name] || "#{form_obj.object_name}[#{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 )
       end
 
       # Refactor: Collection argument can be removed.
@@ -197,15 +244,16 @@ module CmAdmin
           format_check_box_array(value, form_obj, cm_field, required_class, target_action)
         else
           form_obj.check_box cm_field.field_name,
-                             {
-                               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") : ''
-                               }
-                             }
+                            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 )
         end
       end
 
@@ -227,6 +275,7 @@ 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),
@@ -235,7 +284,8 @@ module CmAdmin
                                         target_action: target_action&.name,
                                         target_url: target_action&.name ? cm_admin.send("#{@model.name.underscore}_#{target_action&.name}_path", ':param_1') : ''
                                       }
-                                    }, val
+                                    }, cm_field.html_attrs ),
+                                    val
         end
       end
 
@@ -259,6 +309,24 @@ 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.13.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
-      "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
+      "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
       "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.8.0"
-  resolved "https://registry.npmjs.org/ws/-/ws-8.8.0.tgz"
-  integrity sha512-JDAgSYQ1ksuwqfChJusw1LSJ8BizJ2e/vVu5Lxjq3YvNJNlROv1ui4i+c/kUUrPheBvQl4c5UbERhTwKa6QBJQ==
+  version "8.17.1"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.1.tgz#9293da530bb548febc95371d90f9c878727d919b"
+  integrity sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==
 
 xtend@^4.0.0, xtend@~4.0.1:
   version "4.0.2"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 1.5.27
+  version: 1.5.28
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-06-17 00:00:00.000000000 Z
+date: 2024-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx_rails
@@ -167,11 +167,9 @@ files:
 - ".github/ISSUE_TEMPLATE/bug_report.md"
 - ".github/ISSUE_TEMPLATE/config.yml"
 - ".github/ISSUE_TEMPLATE/feature_request.md"
-- ".github/workflows/bump_gem.yml"
 - ".github/workflows/linters.yml"
-- ".github/workflows/push_gem.yml"
+- ".github/workflows/release-gem.yml"
 - ".gitignore"
-- ".reek.yml"
 - ".rspec"
 - ".rubocop-https---raw-githubusercontent-com-commutatus-cm-linters-main-rubocop-yml"
 - ".rubocop.yml"
@@ -493,7 +491,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/.github/workflows/push_gem.yml

@@ -1,79 +0,0 @@
-name: Push & Release Gem Gem
-
-on:
-  workflow_dispatch:
-    inputs:
-      bump_type:
-        type: choice
-        description: "Bump Type ( Choosing None will bump build number and keep the same version )"
-        default: "patch"
-        options:
-        - patch
-        - minor
-        - major
-
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    name: Build gem
-    runs-on: ubuntu-latest
-
-    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:
-      # Set up
-      - uses: actions/checkout@v4
-
-      - name: set git config
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          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:
-          bundler-cache: true
-          ruby-version: ruby
-
-      - name: Install the gem-release
-        run: gem install gem-release
-
-      - name: Bump the gem
-        run: gem bump ${{ github.events.inputs.bump_type }}
-
-      - name: Push the new version
-        run: git push
-
-  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
-
-      - name: Remove lock on bundle
-        run: bundle config set frozen false
-
-      - uses: rubygems/release-gem@v1
-        with:
-          await-release: false

data/.reek.yml

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