zutils 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8be8be9b23d0b07e71f9220bd0e9f82307dd0f7773131b3c1311b89c51b7c85b
-  data.tar.gz: 7bebbfaa4e9d73d00481114102dbce38a3133c271d973a0609f6682c8a19a9e1
+  metadata.gz: 3630171997e63501bdef72428599e01e8433f2561e1d11a9a2f2a758bfd3447a
+  data.tar.gz: '08c18d2315835db0721b546e96254d7b51f2c2a081ab8350b4dd921898267b68'
 SHA512:
-  metadata.gz: 0f4f46044490cd2ed3b086e6e8aaeb69c34cf4ac9aa0fe17c35c94e621164321e6e038385fc0e8c03148892bc0c46d62e60dda3bcadde8156d617a059efe288c
-  data.tar.gz: 2530d2dfaf3104c1c27eb2ec5984e899f4cecdc991f4b51f8a84602274c4833ab1f6c65a64dc07ef782648b11c2fa210d3f490afdb01b513712efb159dc17f3b
+  metadata.gz: fb84011a96b37188a7c913fad32ed75d882f3bb405e455180f94bc8eb4e058973c6dbd0a2dceca08fb13a0fd1d737016bf25212948a24763f23171d3ec45b077
+  data.tar.gz: 71515648e16702b2b737a4c43787637d21c1d79e411284280f9caac1fde5c2540bbcf9e43d7858d02425d247f0ccf7da9c83d70b5e1831db26c4ca99cecbbb74

data/app/views/shared/_index.html.erb

@@ -17,6 +17,7 @@
 <% hide_footer ||= false %>
 
 <% hide_read_action ||= false %>
+<% hide_new_action ||= false %>
 <% hide_edit_action ||= false %>
 <% hide_destroy_action ||= false %>
 
@@ -68,7 +69,7 @@
   <% unless hide_links %>
     <% unless controller_name == 'users' %>
       <div class="box-footer card-footer">
-        <% if can? :new, list.klass %>
+        <% if !hide_new_action && can? :new, list.klass %>
           <% if nested_resource == true %>
             <% if parent_resource %>
               <%= link_to eval("new_#{parent_resource.class.model_name.singular}_#{list.klass.model_name.singular}_path(#{parent_resource.id})"), class: "btn btn-#{box_class}" do %>

data/app/views/shared/_list.html.erb

@@ -39,9 +39,11 @@
         <th data-field="<%= column_method || column_name %>" data-align="<%= column_align %>">
           <% if sort_all || sort_fields.include?(column_name) %>
             <% if column_name.include?('.') %>
-              <% s_name = column_method || column_name %>
-              <%= sort_link(@q, s_name.split('.').join('_'),
-                "#{s_name.split('.')[-2]&.camelize} (#{s_name.split('.')[-1]})")
+              <% mname = column_name.split('.')[-2]&.camelize %>
+              <% cname = column_name.split('.')[-1] %>
+              <% model = Kernel.const_get(mname) %>
+              <%= sort_link(@q, column_name.split('.').join('_'),
+                "#{model.model_name.human} (#{model.human_attribute_name(cname)})")
               %>
             <% elsif /_id$/ =~ column_name %>
               <%= sort_link(@q, column_name, list.klass.human_attribute_name(column_name.split("_id")[0])) %>
@@ -92,9 +94,13 @@
 
           <td>
             <% if column_name.include?('.') %>
-              <% o = object %>
-              <% column_name.split('.').each{|m| o = o.send(m) if o } %>
-              <%= o %>
+              <% if column_method.nil? %>
+                <% o = object %>
+                <% column_name.split('.').each{|m| o = o.send(m) if o } %>
+                <%= o %>
+              <% else %>
+                <%= object.send(column_method) %>
+              <% end %>
             <% elsif object.send(column_name).class == Date or
               object.send(column_name).class == DateTime or
               object.send(column_name).class == ActiveSupport::TimeWithZone or

data/app/views/shared/_show.html.erb

@@ -34,15 +34,25 @@
             <% end %>
           <% end %>
           <% if show_actions.include?('edit') && can?(:edit, object) %>
-            <%= link_to eval_with_rescue("edit_#{object.class.model_name.singular}_path(#{object.id})"), class: "btn btn-warning btn-xs", data: { toggle: 'tooltip', placement: 'top', title: 'Editar' } do %>
-              Editar <i class="fa fa-pencil"></i>
+            <% if nested_resource %>
+              <%= link_to eval_with_rescue("edit_#{parent_resource.class.model_name.singular}_#{object.class.model_name.singular}_path(#{parent_resource.id},#{object.id})"), class: "btn btn-#{box_class} btn-xs", data: { toggle: 'tooltip', placement: 'top', title: 'Editar' } do %>
+                Editar <i class="fa fa-pencil fa-pen"></i>
+              <% end %>
+            <% else %>
+              <%= link_to eval_with_rescue("edit_#{object.class.model_name.singular}_path(#{object.id})"), class: "btn btn-warning btn-xs", data: { toggle: 'tooltip', placement: 'top', title: 'Editar' } do %>
+                Editar <i class="fa fa-pencil fa-pen"></i>
+              <% end %>
             <% end %>
           <% end %>
           <% if show_actions.include?('index') %>
             <% if nested_resource %>
-              <%= link_to 'Listagem', eval_with_rescue("#{parent_resource.class.model_name.singular}_#{object.class.model_name.plural}_path(#{parent_resource.id})"), class: "btn btn-default btn-xs", data: { toggle: 'tooltip', placement: 'top', title: 'Listagem' } %>
+              <%= link_to eval_with_rescue("#{parent_resource.class.model_name.singular}_#{object.class.model_name.plural}_path(#{parent_resource.id})"), class: "btn btn-default btn-xs", data: { toggle: 'tooltip', placement: 'top', title: 'Listagem' } do %>
+                Listagem <i class="fa fa-bars"></i>
+              <% end %>
             <% else %>
-              <%= link_to 'Listagem', eval_with_rescue("#{object.class.model_name.plural}_path"), class: "btn btn-default btn-xs", data: { toggle: 'tooltip', placement: 'top', title: 'Listagem' } %>
+              <%= link_to eval_with_rescue("#{object.class.model_name.plural}_path"), class: "btn btn-default btn-xs", data: { toggle: 'tooltip', placement: 'top', title: 'Listagem' } do %>
+                Listagem <i class="fa fa-bars"></i>
+              <% end %>
             <% end %>
           <% end %>
         <% end %>
@@ -161,7 +171,7 @@
           </table>
         </div>
       </div>
-    <% else %>  
+    <% else %>
       <div class="box box-<%= box_class %>">
         <div class="box-header with-border">
           <h3 class="box-title">

data/lib/zutils/version.rb

@@ -1,3 +1,3 @@
 module Zutils
-  VERSION = "1.1.0"
+  VERSION = "2.0.0"
 end

data/zutils.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'rails', '~> 6.0'
+  spec.add_dependency 'rails', '>= 5.0'
 
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: zutils
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Ricardo Viana
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-26 00:00:00.000000000 Z
+date: 2022-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Utilidades gerais para aplicações rails