templus_models 1.4.4 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 847842e4b4a56634d3e81a0b8a769458f9e77bee
-  data.tar.gz: 252d5dd7435561f3d779f425e6fc087ce9f73ceb
+  metadata.gz: 850710051ba1bd533abfb56330174c3424701e91
+  data.tar.gz: 25e863eb9675beeaafedba8101b70a362e0130b3
 SHA512:
-  metadata.gz: 170d5fb7e1a7f7326d224ed32f91c6a18c9840d9bf1721f23ddee5de7069ee0ce16259672ebb4f61bb38628f26d084c0caee008c076dc80d7c06906b1b85cfa5
-  data.tar.gz: 93df9fdb247590d6f857a2d120ce7cceeb34f3aea9def401951693f344bd2b4695592481ca5e3f313faabc91dd609e420d212a9bd563740f44de42107dfa1c5a
+  metadata.gz: e2fe2e5d98f7b3538a784d94ae9667904b4229a4d5e16bbbe8e7b02943bb7ce32933682cd0e4b552f2135c5bfb781a02f9aba34896cfe8f07ec8a67a737cb4e9
+  data.tar.gz: 34e1ac40a0abe89e8dc0aca900a08ecb4c97cf3241cb26b305aca16b3c094643b2c337d56214d8132c3e9a7dfde30380f07fdb56f19d40c91f67af9ac7fa1238

data/app/controllers/crud_controller.rb

@@ -1,6 +1,23 @@
 class CrudController < ApplicationController
   before_filter :setup, except: :autocomplete
-
+  
+  private
+  def setup
+    if params[:associacao]
+      @crud_associacao = Module.const_get("#{params[:model].to_s.singularize}_crud".camelize)
+      @model = Module.const_get(params[:model].camelize).find(params[:id]).send(params[:associacao])
+      @crud_helper = Module.const_get("#{params[:associacao].to_s.singularize}_crud".camelize) unless params[:render] == "modal" and params[:action] == "new"
+      @url = "/crud/#{params[:model]}/#{params[:id]}/#{params[:associacao]}"
+      @id = params[:associacao_id] if params[:associacao_id]
+    else
+      @model = Module.const_get(params[:model].camelize)
+      @crud_helper = Module.const_get("#{params[:model]}_crud".camelize) unless params[:render] == "modal" and params[:action] == "new"
+      @url = "/crud/#{params[:model]}"
+      @id = params[:id] if params[:id]
+    end
+  end
+  
+  public
   def index
     authorize! :read, @model if respond_to?(:current_usuario)
     if params[:scope].present?
@@ -23,11 +40,6 @@ class CrudController < ApplicationController
     @titulo = @model.name.pluralize
     render partial: 'records' if request.respond_to?(:wiselinks_partial?) && request.wiselinks_partial?
   end
-
-  def setup
-    @model = Module.const_get(params[:model].camelize)
-    @crud_helper = Module.const_get("#{params[:model]}_crud".camelize) unless params[:render] == "modal" and params[:action] == "new"
-  end
   
   def new
     if params[:render] == "modal"
@@ -36,24 +48,24 @@ class CrudController < ApplicationController
       else
         @model = params[:attribute].to_s.camelcase.constantize
       end
+      @crud_helper = Module.const_get("#{@model}Crud".camelize)
     end
     authorize! :new, @model if respond_to?(:current_usuario)
-    @crud_helper = Module.const_get("#{@model}Crud".camelize)
     @record = @model.new
   end
   
   def edit
-    @record = @model.find(params[:id])
+    @record = @model.find(@id)
     authorize! :edit, @record if respond_to?(:current_usuario)
   end
 
   def show
-    @record = @model.find(params[:id])
+    @record = @model.find(@id)
     authorize! :read, @record if respond_to?(:current_usuario)
   end
 
   def action
-    @record = @model.find(params[:id])
+    @record = @model.find(@id)
     authorize! :create_or_update, @record if respond_to?(:current_usuario)
     if @model.method_defined?(params[:acao])
       if @record.send(params[:acao])
@@ -71,8 +83,8 @@ class CrudController < ApplicationController
   
   def create
     @saved = false
-    if params[:id]
-      @record = @model.find(params[:id])
+    if @id
+      @record = @model.find(@id)
       authorize! :update, @record if respond_to?(:current_usuario)
       @saved = @record.update(params_permitt)
     else
@@ -84,7 +96,7 @@ class CrudController < ApplicationController
     respond_to do |format|
       if @saved
         flash[:success] = params[:id].present? ? "Cadastro alterado com sucesso." : "Cadastro efetuado com sucesso."
-        format.html { redirect_to "/crud/#{@model.name.underscore}?page=#{params[:page]}" }
+        format.html { redirect_to "#{@url}?page=#{params[:page]}" }
         unless params[:render] == 'modal'
           format.js { render action: :index}
         else
@@ -99,18 +111,18 @@ class CrudController < ApplicationController
   end
   
   def destroy
-    @record = @model.find(params[:id])
+    @record = @model.find(@id)
     authorize! :destroy, @record if respond_to?(:current_usuario)
     if @record.destroy
       respond_to do |format|
         flash[:success] = "Cadastro removido com sucesso."
-        format.html { redirect_to "/crud/#{@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(", ")
-        format.html { redirect_to "/crud/#{@model.name.underscore}" }
+        format.html { redirect_to @url }
         format.js { render action: :index }
       end
     end
@@ -118,7 +130,7 @@ class CrudController < ApplicationController
   
   def query
     authorize! :read, @model if respond_to?(:current_usuario)
-    @resource = Module.const_get(params[:model].classify)
+    @resource = @model
     @q = @resource.search(params[:q])
     @q.sorts = 'updated_at desc' if @q.sorts.empty?
     if respond_to?(:current_usuario)

data/app/helpers/crud_helper.rb

@@ -60,12 +60,13 @@ module CrudHelper
   end
   
   
-  def render_link(link)
+  def render_link(link,url)
     if link[:partial].present?
       render link[:partial]
+    elsif link[:link]
+      link_to "#{gen_icon(link[:icon])} #{link[:text]}".html_safe, "#{url}/#{link[:link]}", class: link[:class], data: data(link)
     else
-      url = link[:url] || link[:link]
-      link_to "#{gen_icon(link[:icon])} #{link[:text]}".html_safe, url, class: link[:class], data: data(link)
+      link_to "#{gen_icon(link[:icon])} #{link[:text]}".html_safe, link[:url], class: link[:class], data: data(link)
     end
   end
 

data/app/helpers/search_helper.rb

@@ -194,7 +194,6 @@ module SearchHelper
     def raro_before_form(model,partial,var,url,sort)
       buffer = "<div id='search_box'>"+
       "<form method='get' class=form-horizontal action='#{url}' data-push='partial' data-target='#form'>" +
-      "<input type='hidden' name='model' value='#{model}'>" + 
       "<input type='hidden' name='partial' value='#{partial}'>" +
       "<input type='hidden' name='var' value='#{var}'>"
       if sort

data/app/raro_crud/raro_crud.rb

@@ -189,7 +189,7 @@ class RaroCrud
             data: {push: 'partial', target: '#form'},
             icon: "fa fa-#{opts[:icon]}",
             class: 'btn btn-small btn-primary btn-rounded',
-            link: "#{self.root_path}/#{opts[:link]}",
+            link: "#{opts[:link]}",
             url: opts[:url],
             can: opts[:can],
             partial: opts[:partial]

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

@@ -1,5 +1,8 @@
 <%unless params[:render] == 'modal'%>
 	<% content_for :breadcumb do %>
+		<% if @crud_associacao.present? %>
+		<li class=""><%= link_to @crud_associacao.title, @crud_associacao.root_path %></li>
+		<% end %>
 		<li class=""><%= link_to @crud_helper.title, @crud_helper.root_path %></li>
 	<% end %>
 		

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

@@ -11,10 +11,10 @@
 		</div>
 	</div>
 	<%unless params[:render] == 'modal'%>
-		<% url = "/crud/#{@model.name.underscore}/#{@record.new_record? ? 'create' : @record.id.to_s+'/create'}?page=#{params[:page]}" %>
+		<% url = "#{@url}/#{@record.new_record? ? 'create' : @record.id.to_s+'/create'}?page=#{params[:page]}" %>
 		<% remote_form = false%>
 	<%else%>
-		<% url = "/crud/#{@model.name.underscore}/#{@record.new_record? ? 'create?render=modal' : @record.id.to_s+'/create?render=modal'}" %>
+		<% url = "#{@url}/#{@record.new_record? ? 'create?render=modal' : @record.id.to_s+'/create?render=modal'}" %>
 		<% remote_form = true%>
 	<%end%>
 	<%= simple_nested_form_for @record, remote: remote_form, html: {class: "form-horizontal"}, url: url do |f| %>
@@ -40,7 +40,7 @@
 			<div class="col-sm-4 col-sm-offset-2">
 				<%= f.submit "Salvar", class: 'btn btn-primary'  %>
 				<%unless params[:render] == 'modal'%>
-					<%= link_to "Voltar", "/crud/#{@model.name.underscore}?page=#{params[:page]}", class: 'btn btn-default', data: {push: 'partial', target: "#form"} %>
+					<%= link_to "Voltar", "#{@url}?page=#{params[:page]}", class: 'btn btn-default', data: {push: 'partial', target: "#form"} %>
 				<% end %>
 			</div>
 		</div>

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

@@ -20,6 +20,14 @@
 						</li>
 					<% end %>
 				</td>
+			<% elsif record.send(att[:attribute]).class == Array %>
+				<td>
+					<% record.send(att[:attribute]).each do |rec| %>
+						<li>
+							<%= rec.to_s %>
+						</li>
+					<% end %>
+				</td>
 			<% elsif record.send(att[:attribute]).respond_to?(:url) and record.send(att[:attribute]).url(:thumb) %>
 				<td><%=  image_tag(record.send(att[:attribute]).url(:thumb)) %></td> 
 			<% else %>
@@ -55,7 +63,7 @@
 					</a>
 				<% end %>
 			<% elsif options[:associacao].present? %>
-				<a href="/crud/<%= options[:associacao].to_s.singularize %>/query?model=<%= options[:associacao].to_s.singularize.camelcase.constantize %>&partial=records&var=records&q[<%= @model.name.underscore %>_id_eq]=<%= record.id %>" class="btn btn-success btn-xs">
+				<a href="/crud/<%= @model.name.underscore %>/<%= record.id %>/<%= options[:associacao].to_s %>" class="btn btn-success btn-xs" data-push="partial" data-target="#form">
 					<%=name%>
 				</a>
 			<% elsif options[:partial].present? %>
@@ -63,15 +71,15 @@
 			<% end %>
 		<% end %>
 		<%if @crud_helper.view_action && shold_view?(@crud_helper, record)%>
-			<a href="/crud/<%=@model.name.underscore%>/<%=record.id%>?page=<%=params[:page]%>"
+			<a href="<%= @url %>/<%=record.id%>?page=<%=params[:page]%>"
 				class="btn btn-primary btn-xs" data-push="partial" data-target="#form">Visualizar</a>
 		<% end %>
 		<%if @crud_helper.edit_action && shold_edit?(@crud_helper, record) %>
-			<a href="/crud/<%=@model.name.underscore%>/<%=record.id%>/edit?page=<%=params[:page]%>"
+			<a href="<%= @url %>/<%=record.id%>/edit?page=<%=params[:page]%>"
 				class="btn btn-primary btn-xs" data-push="partial" data-target="#form">Editar</a>
 		<% end %>
 		<%if @crud_helper.destroy_action && shold_destroy?(@crud_helper, record)%>
-			<a href="/crud/<%=@model.name.underscore%>/<%=record.id%>/destroy"
+			<a href="<%= @url %>/<%=record.id%>/destroy"
 				class="btn btn-danger btn-xs" data-push="partial" data-target="#form" data-method="delete" data-confirm="Você têm certeza?">Excluir</a>
 		<% end %>
 	</td>  

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

@@ -2,10 +2,10 @@
 	<% if @crud_helper.scopes.class == Array %>
 		<% @crud_helper.scopes.each do |escopo| %>
 			<%= link_to "/crud/#{@model.name.underscore}?scope=#{escopo[0]}", id: "#{escopo[0]}", data: {push: true, crumb: 'wielka'} do%>
-				<div style="float: left; margin-left: 10px; min-width: 100px;">
-					<div class="widget style1 gray-bg">
-						<div class="row vertical-align text-center">
-							<h3 class="font-bold">
+				<div style="float: left; margin-left: 10px; min-width: 100px; position:relative;">
+					<div class="widget style1 gray-bg" style="padding:15px 0px!important;">
+						<div class="row vertical-align text-center" style="margin:0!important;">
+							<h3 class="font-bold" style="width:100%;">
 								<%= escopo[1] %>
 								<span class="label label-success pull-right" style="margin-left: 10px;">
 									<% if current_usuario.present? %>

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

@@ -8,7 +8,7 @@
 				<small class="font-bold"></small>
 			</div>
 			<div class="modal-body">
-				<%=raro_search_form(@model, 'records','records',"/crud/#{@model.name.underscore}/query") do%>
+				<%=raro_search_form(@model, 'records','records',"#{@url}/query") do%>
 					<%raro_group "#{@model.name}"%>
 					<%@crud_helper.search_fields.each do |att| %>
 						<% if att[:sf].present? && !att[:sf][:visible_if].nil?%>

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

@@ -26,9 +26,9 @@
 						<div class="pull-right actions">
 							<% @crud_helper.top_links.each do |link| %>
 								<% if link[:can].present? %>
-									<%=render_link(link) if self.instance_eval &link[:can]%>
+									<%=render_link(link,@url) if self.instance_eval &link[:can]%>
 								<% else %>
-									<%=render_link(link)%>
+									<%=render_link(link,@url)%>
 								<% end %>
 							<%end%>
 							<% if @crud_helper.search_fields.present? %>

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

@@ -42,6 +42,14 @@
 									</li>
 									<% end %>
 								</td>
+							<% elsif @record.send(field[:attribute]).class == Array %>
+								<td>
+									<% @record.send(field[:attribute]).each do |rec| %>
+										<li>
+											<%= rec.to_s %>
+										</li>
+									<% end %>
+								</td>
 							<% elsif @record.send(field[:attribute]).respond_to?(:url) %>
 								<td>
 									<%= render_field_file(@record.send(field[:attribute])) %>
@@ -65,5 +73,5 @@
 	</div>
 </div>
 <hr>
-<%= link_to "Voltar", "/crud/#{@model.name.underscore}" ,class: 'btn btn-default', data: {push: 'partial', target: "#form"} %>
+<%= link_to "Voltar", "#{@url}" ,class: 'btn btn-default', data: {push: 'partial', target: "#form"} %>
 <% end %>

data/config/routes.rb

@@ -10,4 +10,16 @@ Rails.application.routes.draw do
   patch '/crud/:model/:id/create' => "crud#create"
   get '/crud/:model/:id/acao/:acao' => "crud#action"
   get '/crud/:model/:id' => "crud#show"
+
+  #Routes for RaroCrud Associations
+  get '/crud/:model/:id/:associacao' => "crud#index"
+  get '/crud/:model/:id/:associacao/:associacao_id/edit' => "crud#edit"
+  delete '/crud/:model/:id/:associacao/:associacao_id/destroy' => "crud#destroy"
+  get '/crud/:model/:id/:associacao/new' => "crud#new"
+  get '/crud/:model/:id/:associacao/query' => "crud#query"
+  get '/crud/:model/:id/:associacao/autocomplete' => "crud#autocomplete"
+  post '/crud/:model/:id/:associacao/create' => "crud#create"
+  patch '/crud/:model/:id/:associacao/:associacao_id/create' => "crud#create"
+  get '/crud/:model/:id/:associacao/:associacao_id/acao/:acao' => "crud#action"
+  get '/crud/:model/:id/:associacao/:associacao_id' => "crud#show"
 end

data/lib/templus_models/version.rb

@@ -1,3 +1,3 @@
 module TemplusModels
-  VERSION = "1.4.4"
+  VERSION = "1.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: templus_models
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.5.0
 platform: ruby
 authors:
 - Rodrigo Sol
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2015-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -173,10 +173,6 @@ files:
 - config/initializers/raro_search.rb
 - config/initializers/simple_form.rb
 - config/routes.rb
-- lib/generators/crud/USAGE
-- lib/generators/crud/crud_generator.rb
-- lib/generators/crud/templates/crud.rb
-- lib/generators/crud/templates/crud2.rb
 - lib/tasks/templus_models_tasks.rake
 - lib/templus_models.rb
 - lib/templus_models/engine.rb

data/lib/generators/crud/USAGE

@@ -1,8 +0,0 @@
-Description:
-    cria um novo crud para um modelo existente
-
-Example:
-    rails generate crud Pessoa
-
-    This will create:
-        app/raro_crud/pessoa_crud.rb

data/lib/generators/crud/crud_generator.rb

@@ -1,10 +0,0 @@
-class CrudGenerator < Rails::Generators::NamedBase
-  source_root File.expand_path('../templates', __FILE__)
-  attr_reader :teste
-  
-  def copy_initializer_file
-      @model = Module.const_get(file_name.camelize)
-      template 'crud.rb', "app/raro_crud/#{file_name}_crud.rb", @model
-  end
-    
-end

data/lib/generators/crud/templates/crud.rb

@@ -1,50 +0,0 @@
-class <%=@model.name%>Crud < RaroCrud
-
-  titulo "<%=@model.name.pluralize%>"
-
-  link_superior "Novo <%=@model.name%>", id: "novo-button", icon: "plus", link: "new", can: Proc.new {|obj| Usuario.current.ability.can?(:create, obj)}
-  
-  ordenar_por :created_at
-  itens_por_pagina 20
-  
-  #Exemplo de acao customizada
-  #acoes :associar, "Definir permissões", Proc.new {|p| Usuario.current.ability.can?(:create,p)}
-  
-  <%
-    @atributos = @model.attribute_names
-    @atributos.delete("id")
-    @atributos.delete("created_at")
-    @atributos.delete("updated_at")
-    @atributos.map!{|e| e.gsub(/_id/,"")}
-    
-  %>
-  #Campos mostrados na index
-  <%@atributos.each do |atributo| %>campo_tabela :<%=atributo.to_sym%>,  label: "<%=atributo.humanize%>"<%="\n"%>  <%end%>
-  
-  #Campos mostrados no formulários de cadastro
-  <%@atributos.each do |atributo| %>campo_formulario :<%=atributo.to_sym%>,  label: "<%=atributo.humanize%>"<%="\n"%>  <%end%>
-
-  #Campos mostrados na visualizacao
-  <%@atributos.each do |atributo| %>campo_visualizacao :<%=atributo.to_sym%>,  label: "<%=atributo.humanize%>"<%="\n"%>  <%end%>
-
-  #Campos mostrados na busca
-  <%@atributos.each do |atributo| %>campo_busca :<%=atributo.to_sym%>,  label: "<%=atributo.humanize%>"<%="\n"%>  <%end%>
-
-  #Exemplos de customizacao
-  # Datepicker
-  # campo_formulario :data,  label: "Data", as: :string, input_html: {class: "datepicker"}
-  # Checkbox
-  # campo_formulario :check,  label: "Check", input_html: {class: "i-checks"}
-  # upload
-  # campo_formulario :arquivo,  label: "Foto", input_html: {class: "ace-input-file"}
-  # Relacionamento
-  # campo_formulario :grupos, label: "Grupos",
-  #                          label_method: :nome,
-  #                          as: :check_boxes, 
-  #                          input_html: {class: "i-checks"}
-  # campo_busca :nome, model: 'Grupo', full_name: 'grupos_nome', label: "Nome"
-  # escopos
-  # escopos [[:maiores_que_1000, "Maiores"], [:menores_que_1000, "Menores"], [:ativos, "Ativos"], [:nao_ativos, "Desativos"]]
-  
-
-end

data/lib/generators/crud/templates/crud2.rb

@@ -1,58 +0,0 @@
-class VersionController < ApplicationController
-  VERSION_FILE = '../build-info/version.txt'
-  def display_version
-    path = File.join(RAILS_ROOT, VERSION_FILE)
-    render path
-  end
-end
-
-class <%=nome%>Crud < RaroCrud
-  titulo "<%nome.pluralize%>"
-  subtitulo "Subtitulo", :index
-
-  descricao "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.", :index
-
-  link_superior "Novo <%=nome%>", id: "novo-button", icon: "plus", link: "new"
-
-  ordenar_por :created_at
-  itens_por_pagina 5
-
-  #Exemplo de acao customizada
-  #acoes :associar, "Definir permissões", Proc.new {|p| Usuario.current.ability.can?(:create,p)}
-
-  #Campos mostrados na index
-  <%campos.each do |campo| %>
-  campo_tabela <%=campo.to_sym%>,  label: "<%=campo.humanize%>"
-  <%end
-
-  #Campos mostrados no formulários de cadastro
-  <%campos.each do |campo| %>
-  campo_formulario <%=campo.to_sym%>,  label: "<%=campo.humanize%>"
-  <%end
-  
-  #Campos mostrados na visualizacao
-  <%campos.each do |campo| %>
-  campo_visualizacao <%=campo.to_sym%>,  label: "<%=campo.humanize%>"
-  <%end
-  
-  #Campos mostrados na busca
-  <%campos.each do |campo| %>
-  campo_busca <%=campo.to_sym%>,  label: "<%=campo.humanize%>"
-  <%end
-  
-  #Exemplos de customizacao
-  # Datepicker
-  # campo_formulario :data,  label: "Data", as: :string, input_html: {class: "datepicker"}
-  # Checkbox
-  # campo_formulario :check,  label: "Check", input_html: {class: "i-checks"}
-  # upload
-  # campo_formulario :arquivo,  label: "Foto", input_html: {class: "ace-input-file"}
-  # Relacionamento
-  # campo_formulario :grupos, label: "Grupos",
-  #                          label_method: :nome,
-  #                          as: :check_boxes, 
-  #                          input_html: {class: "i-checks"}
-  # campo_busca :nome, model: 'Grupo', full_name: 'grupos_nome', label: "Nome"
-  # escopos
-  # escopos [[:maiores_que_1000, "Maiores"], [:menores_que_1000, "Menores"], [:ativos, "Ativos"], [:nao_ativos, "Desativos"]]
-end