templus_models 3.0.20 → 3.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ceddeb835a1405f5013bf6d95cb6a2e0a2ef3fde23ca98904dedb189c670b680
-  data.tar.gz: 1c86d3fb910903056745b1767ad4d7044de431e9685073253124dd5634ce308d
+  metadata.gz: 6697b9a9308a28c268cc9a85e8698082cda535509c00312c9b148e4f4522fa59
+  data.tar.gz: 9011b06b986d0fe546925dcc5384f791cd9040c556eccd0e3ee23d406646c659
 SHA512:
-  metadata.gz: 00d81588bf7dc3cea202de0d104369706142dbf3e7e7fa0f3c1fe8d9e997798e61d89071e6c3f7a4755332242ba82a7b677e4d889cefa405a2a3214ac1b3a8ef
-  data.tar.gz: e9a051ff22d1642fa8ededd6375dcf1bcfdd84636abc4b603b0edf88809d9a42f1bd63caea033d6019558d9af1a36fa5971631ee733a4f466c7e67ce7eaa72e5
+  metadata.gz: 42430133a2689bf4f63e84c2c591fee5d0c9234ff5f307640e40f8e5b9f4443b3929418f517f052c291d96993123f790dd53f14ff43ef7266000f11ae003fc01
+  data.tar.gz: 224b86a8479102ad1dd9da7bb8985ea582de93ded79d7cbadeb2b62bd2569176cf65a35d8e7873c4cbe11dadc62dc919f83829a9ef227835c8851419f8241a46

data/app/controllers/crud_controller.rb

@@ -1,7 +1,6 @@
 class CrudController < ApplicationController
   before_action :setup, except: :autocomplete
 
-
   def index
     authorize! :read, @model_permission if respond_to?(:current_usuario)
     if params[:scope].present? && valid_method?(params[:scope])
@@ -10,23 +9,22 @@ class CrudController < ApplicationController
       @q = @model.ransack(params[:q])
     end
     if @q.sorts.empty?
-      if @crud_helper.order_field.to_s.include?("desc") || @crud_helper.order_field.to_s.include?("asc")
+      if @crud_helper.order_field.to_s.include?('desc') || @crud_helper.order_field.to_s.include?('asc')
         @q.sorts = @crud_helper.order_field.to_s
       else
         @q.sorts = "#{@crud_helper.order_field} asc"
       end
     end
-    if respond_to?(:current_usuario)
-      @records = @q.result(distinct: true).includes(@crud_helper.includes).accessible_by(current_ability, :read).page(params[:page]).per(@crud_helper.per_page)
-    else
-      @records = @q.result(distinct: true).includes(@crud_helper.includes).page(params[:page]).per(@crud_helper.per_page)
-    end
+    @records = @q.result(distinct: true)
+    @records = @records.includes(@crud_helper.includes).references(@crud_helper.includes) if @crud_helper.includes.present?
+    @records = @records.accessible_by(current_ability, :read) if respond_to?(:current_usuario)
+    @records = @records.page(params[:page]).per(@crud_helper.per_page)
     @titulo = @model.name.pluralize
     render partial: 'records' if request.respond_to?(:wiselinks_partial?) && request.wiselinks_partial?
   end
 
   def new
-    if params[:render] == "modal"
+    if params[:render] == 'modal'
       if @model.reflect_on_association(params[:attribute].to_s).present?
         @model = @model.reflect_on_association(params[:attribute].to_s).class_name.constantize
       else
@@ -56,9 +54,9 @@ class CrudController < ApplicationController
     authorize! :create_or_update, @record if respond_to?(:current_usuario)
     if valid_instance_method?(params[:acao])
       if @record.send(params[:acao])
-        flash.now[:success] = I18n.t("mensagem_action", acao: params[:acao])
+        flash.now[:success] = I18n.t('mensagem_action', acao: params[:acao])
       else
-        flash.now[:error] = I18n.t("mensagem_erro_action", acao: params[:acao])
+        flash.now[:error] = I18n.t('mensagem_erro_action', acao: params[:acao])
       end
       redirect_to @url
     else
@@ -75,22 +73,22 @@ class CrudController < ApplicationController
       authorize! :update, @record if respond_to?(:current_usuario)
       @saved = @record.update(params_permitt)
     else
-      @record  =  @model.new(params_permitt)
+      @record = @model.new(params_permitt)
       authorize! :create, @model_permission if respond_to?(:current_usuario)
       @saved = @record.save
     end
 
     respond_to do |format|
       if @saved
-        flash[:success] = params[:id].present? ? I18n.t("updated", model: I18n.t("model.#{@model.name.underscore}")) : I18n.t("created", model: I18n.t("model.#{@model.name.underscore}"))
+        flash[:success] = params[:id].present? ? I18n.t('updated', model: I18n.t("model.#{@model.name.underscore}")) : I18n.t("created", model: I18n.t("model.#{@model.name.underscore}"))
         format.html { redirect_to @url }
         unless params[:render] == 'modal'
-          format.js { render action: :index}
+          format.js { render action: :index }
         else
           format.js
         end
       else
-        action = (params[:id]) ? :edit : :new
+        action = params[:id] ? :edit : :new
         format.html { render action: action }
         format.js
       end
@@ -102,13 +100,13 @@ class CrudController < ApplicationController
     authorize! :destroy, @record if respond_to?(:current_usuario)
     if @record.destroy
       respond_to do |format|
-        flash[:success] = I18n.t("destroyed", model: I18n.t("model.#{@model.name.underscore}"))
+        flash[:success] = I18n.t('destroyed', model: I18n.t("model.#{@model.name.underscore}"))
         format.html { redirect_to @url }
         format.js { render action: :index }
       end
     else
       respond_to do |format|
-        flash[:error] = @record.errors.full_messages.join(", ")
+        flash[:error] = @record.errors.full_messages.join(', ')
         format.html { redirect_to @url }
         format.js { render action: :index }
       end
@@ -131,7 +129,7 @@ class CrudController < ApplicationController
     end
     instance_variable_set("@#{params[:var]}", results)
     if request.respond_to?(:wiselinks_partial?) && request.wiselinks_partial?
-      render :partial => params[:partial]
+      render partial: params[:partial]
     else
       render :index, controller: request[:controller]
     end
@@ -152,9 +150,9 @@ class CrudController < ApplicationController
     if valid_instance_method?(params[:label])
       method_label = params[:label]
     else
-      raise "Ação inválida"
+      raise 'Ação inválida'
     end
-    render json: results.map {|result| {id: result.id, label: result.send(method_label), value: result.send(method_label)} }
+    render json: results.map { |result| { id: result.id, label: result.send(method_label), value: result.send(method_label) } }
   end
 
   def listing
@@ -165,7 +163,7 @@ class CrudController < ApplicationController
       @q = @model.ransack(params[:q])
     end
     if @q.sorts.empty?
-      if @crud_helper.order_field.to_s.include?("desc") || @crud_helper.order_field.to_s.include?("asc")
+      if @crud_helper.order_field.to_s.include?('desc') || @crud_helper.order_field.to_s.include?('asc')
         @q.sorts = @crud_helper.order_field.to_s
       else
         @q.sorts = "#{@crud_helper.order_field} asc"
@@ -178,7 +176,7 @@ class CrudController < ApplicationController
     end
     report_name = "#{@crud_helper.title}_#{DateTime.now.strftime('%Y%m%d')}"
     respond_to do |format|
-      format.xls { headers["Content-Disposition"] = "attachment; filename=#{report_name}.xls" }
+      format.xls { headers['Content-Disposition'] = "attachment; filename=#{report_name}.xls" }
       format.pdf do
         pdf = WickedPdf.new.pdf_from_string(
           render_to_string('crud/listing.pdf.erb'),
@@ -187,7 +185,7 @@ class CrudController < ApplicationController
           show_as_html: params[:debug],
           margin: { top: 20, bottom: 20 }
         )
-        send_data(pdf, filename: "#{report_name}.pdf", type: "application/pdf", disposition: "inline")
+        send_data(pdf, filename: "#{report_name}.pdf", type: 'application/pdf', disposition: 'inline')
       end
     end
   end
@@ -205,7 +203,7 @@ class CrudController < ApplicationController
           show_as_html: params[:debug],
           margin: { top: 20, bottom: 20 }
         )
-        send_data(pdf, filename: "#{report_name}.pdf", type: "application/pdf", disposition: "inline")
+        send_data(pdf, filename: "#{report_name}.pdf", type: 'application/pdf', disposition: 'inline')
       end
       format.html
     end
@@ -219,7 +217,7 @@ class CrudController < ApplicationController
       if Module.const_get(params[:model].camelize).reflect_on_association(params[:associacao])
         @model = Module.const_get(params[:model].camelize).find(params[:id]).send(params[:associacao])
       else
-        raise "Ação inválida"
+        raise 'Ação inválida'
       end
       c_helper = Module.const_get(params[:model].camelize).reflect_on_association(params[:associacao]).class_name
       @crud_helper = Module.const_get("#{c_helper}Crud") unless params[:render] == "modal" and params[:action] == "new"
@@ -238,7 +236,7 @@ class CrudController < ApplicationController
   end
 
   def params_permitt
-    params.require(@model.name.underscore.gsub('/','_').to_sym).permit(fields_model)
+    params.require(@model.name.underscore.gsub('/', '_').to_sym).permit(fields_model)
   end
 
   def fields_model
@@ -273,7 +271,7 @@ class CrudController < ApplicationController
 
   def permitt_group(fields, key, groups,mod)
     chave = "#{key}_attributes"
-    group = {chave => [:id, :_destroy]}
+    group = { chave => [:id, :_destroy] }
     groups.each do |field|
       if field[:sf].present? && field[:sf][:grupo].present?
         group[chave] << permitt_group(fields, field[:attribute], field[:sf][:fields], mod.reflect_on_association(key.to_s).class_name.constantize)
@@ -283,7 +281,7 @@ class CrudController < ApplicationController
           if modelo.reflect_on_association(field[:attribute]).macro == :belongs_to
             group[chave] << "#{field[:attribute]}_id".to_sym
           else
-            group[chave] << {"#{field[:attribute].to_s.singularize}_ids".to_sym => []}
+            group[chave] << { "#{field[:attribute].to_s.singularize}_ids".to_sym => [] }
           end
         elsif (modelo.columns_hash[field[:attribute].to_s] || (modelo.respond_to?(:params_permitt) && modelo.params_permitt.include?(field[:attribute].to_sym)))
           group[chave] << field[:attribute]
@@ -297,7 +295,7 @@ class CrudController < ApplicationController
     list_methods = []
     @model.ancestors.each do |m|
       list_methods << m.methods(false).reject{ |m| /^_/ =~ m.to_s }
-      break if ["ApplicationRecord", "ActiveRecord::Base"].include? m.try(:superclass).to_s
+      break if ['ApplicationRecord', 'ActiveRecord::Base'].include? m.try(:superclass).to_s
     end
     list_methods.flatten.include? method.to_sym
   end
@@ -306,7 +304,7 @@ class CrudController < ApplicationController
     list_methods = []
     @model.ancestors.each do |m|
       list_methods << m.instance_methods(false).reject{ |m| /^_/ =~ m.to_s }
-      break if ["ApplicationRecord", "ActiveRecord::Base"].include? m.try(:superclass).to_s
+      break if ['ApplicationRecord', 'ActiveRecord::Base'].include? m.try(:superclass).to_s
     end
     list_methods.flatten.include? method.to_sym
   end
@@ -314,8 +312,8 @@ class CrudController < ApplicationController
   def convert_params(params)
     if params.present? && params.class == String
       hash = {}
-      params.split("&").each do |element|
-        result = element.split("?")[0].split("=")
+      params.split('&').each do |element|
+        result = element.split('?')[0].split('=')
         hash[result[0]] = result[1]
       end
       params = ActionController::Parameters.new(hash)

data/app/views/crud/_crud_template.html.erb

@@ -1,4 +1,4 @@
-<%unless params[:render] == 'modal'%>
+<% unless params[:render] == 'modal' %>
 	<% content_for :breadcumb do %>
 		<% if @crud_associacao.present? %>
 			<li class=""><%= link_to @crud_associacao.title, crud_models_path(model: @crud_associacao.root_path) %></li>
@@ -7,7 +7,7 @@
 			<li class=""><%= link_to @crud_helper.title, crud_models_path(model: @crud_helper.root_path) %></li>
 		<% end %>
 	<% end %>
-		
+
 
 	<% content_for :header do %>
 		<%=@crud_helper.title%>
@@ -19,10 +19,9 @@
 
 	<% content_for :modal do %>
 		<% if @crud_helper.search_fields.present? %>
-			<%= render "/crud/search" %>
+			<%= render '/crud/search' %>
 		<% end %>
 	<% end %>
-	
-<%end%>
+<% end%>
 
-<%= render "layouts/template_raro_crud" %>
+<%= render 'layouts/template_raro_crud' %>

data/app/views/crud/_default_actions_crud.html.erb

@@ -1,2 +1,2 @@
 <%= submit_tag(I18n.t("save"), class: "btn btn-primary") %>
-<%= link_to I18n.t("undo"), crud_models_path(model: @model.name.underscore), class: 'btn btn-default', data: {push: 'partial', target: "#form"} %>
+<%= link_to I18n.t("undo"), crud_models_path(model: @model.name.underscore), class: 'btn btn-default', data: { push: 'partial', target: "#form" } %>

data/app/views/crud/_form_group.html.erb

@@ -24,7 +24,7 @@
 	<% if [:has_many,:has_and_belongs_to_many].include?(f.object.class.reflect_on_association(key).macro) %>
 		<div class="form-group">
 			<div class="col-sm-10 col-sm-offset-2">
-				<%= g.link_to_remove "Remover #{I18n.t(groups[:sublabel] || groups[:label])}" %>
+				<%= g.link_to_remove "#{I18n.t('destroy')} #{I18n.t(groups[:sublabel] || groups[:label])}" %>
 			</div>
 		</div>
 	<% end %>
@@ -32,7 +32,7 @@
 <% if [:has_many,:has_and_belongs_to_many].include?(f.object.class.reflect_on_association(key).macro) %>
 	<div class="form-group">
 		<div class="col-sm-12">
-			<%= f.link_to_add "Adicionar #{I18n.t(groups[:sublabel] || groups[:label])}", key %>
+			<%= f.link_to_add "#{I18n.t('add')} #{I18n.t(groups[:sublabel] || groups[:label])}", key %>
 		</div>
 	</div>
 <% end %>

data/app/views/crud/_record.html.erb

@@ -1,5 +1,5 @@
 <%= content_tag :tr, id: "record-#{record.id}" do %>
-	<%@crud_helper.index_fields.each do |att| %>
+	<% @crud_helper.index_fields.each do |att| %>
 		<% if !att[:visible_if].nil?%>
 			<% if ((att[:visible_if].class == Proc && !att[:visible_if].call(record)) || (att[:visible_if].class != Proc && !att[:visible_if])) %>
 				<% next %>
@@ -86,8 +86,12 @@
 					<% if (action[:proc].present? && action[:proc].call(record)) || !action[:proc].present? %>
 						<% if action[:options].present? && action[:options][:wiselink].present? && action[:options][:wiselink] %>
 							<% data = {push: "partial", target: "#form"} %>
-						<% end %>
-						<%= link_to I18n.t(action[:desc]), action_crud_path(model: @model.name.underscore, id: record.id, acao: action[:method], page: params[:page], q: params[:q].try(:to_unsafe_h)), class: "btn btn-primary btn-xs", data: data || {} %>
+            <% end %>
+            <% if @crud_associacao.present? %>
+              <%= link_to I18n.t(action[:desc]), action_crud_associacao_path(model: params[:model], id: params[:id], associacao: params[:associacao], associacao_id: record.id, acao: action[:method], page: params[:page], q: params[:q].try(:to_unsafe_h)), class: "btn btn-primary btn-xs", data: data || {} %>
+            <% else %>
+              <%= link_to I18n.t(action[:desc]), action_crud_path(model: @model.name.underscore, id: record.id, acao: action[:method], page: params[:page], q: params[:q].try(:to_unsafe_h)), class: "btn btn-primary btn-xs", data: data || {} %>
+            <% end %>
 					<% end %>
 				<% end %>
 				<% @crud_helper.actions_links.each do |name, options| %>
@@ -146,4 +150,4 @@
 			</div>
 		</td>
 	<% end %>
-<% end %>
+<% end %>

data/app/views/crud/_records.html.erb

@@ -17,10 +17,10 @@
                 <% if att[:sort_field] == :false %>
                   <%= I18n.t(att[:label], default: I18n.t("shared.#{att[:attribute]}")) %>
                 <% else %>
-                  <%= sort_link @q, att[:sort_field], I18n.t(att[:label], default: I18n.t("shared.#{att[:attribute]}")), {},data: {push: 'partial', target: "#form"}%>
+                  <%= sort_link @q, att[:sort_field], I18n.t(att[:label], default: I18n.t("shared.#{att[:attribute]}")), {},data: { push: 'partial', target: "#form" } %>
                 <% end %>
               <% else %>
-                <%= sort_link @q, att[:attribute], I18n.t(att[:label], default: I18n.t("shared.#{att[:attribute]}")), {},data: {push: 'partial', target: "#form"}%>
+                <%= sort_link @q, att[:attribute], I18n.t(att[:label], default: I18n.t("shared.#{att[:attribute]}")), {},data: { push: 'partial', target: "#form" } %>
               <% end %>
             </th>
           <% end %>

data/lib/templus_models/version.rb

@@ -1,3 +1,3 @@
 module TemplusModels
-  VERSION = "3.0.20"
+  VERSION = '3.0.21'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: templus_models
 version: !ruby/object:Gem::Version
-  version: 3.0.20
+  version: 3.0.21
 platform: ruby
 authors:
 - Rodrigo Sol
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-28 00:00:00.000000000 Z
+date: 2019-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -74,14 +74,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: nested_form
   requirement: !ruby/object:Gem::Requirement
@@ -124,20 +124,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
 description: Easy CRUD generator for Rails Projects
 email:
 - rodrigo@rarolabs.com.br
@@ -979,8 +965,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.9
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Easy CRUD generator for Rails Projects