templus_models 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 749829c56974ebda6ca4e4c53aa76d2971b67a67
-  data.tar.gz: a771e4b88920e4072c6db69fe32891b8e2b32e12
+  metadata.gz: b4375243bea6ad4021fbd11dcdc796f445c623d1
+  data.tar.gz: 4dbc1ce1f203547d791b2a79933db11c91ece85f
 SHA512:
-  metadata.gz: 9fde57d73ce9e7e3781eadff3b8919f8d4e3bb745a9806a26dd54539befdfd7c45a60cbf2e0239853cf0037077af883b48cd66e81e862e64d42d72b6eb24a988
-  data.tar.gz: d7b354949f3407c01c99620a5ba84abc88650c014d61943a6c14b82c12bc028932981a33ffbb831ce8d5235fd6889aa2a07c87aae2a5dc7aa2bc86afe66ea95c
+  metadata.gz: 2f1c40caabbc3676af69a4020a2bd79a7a135940ef1f37f833b03cd4409f8e17a6c9593071c2b456ea7f021bb3374089bec876f26c5c86d80aa0004b4e160961
+  data.tar.gz: 9418bee70eca2242c497d81d57c3b763efe70de8d010dbfe129b9cd8411e9117d396aa9b043ef335124161753953c3055cad7067cd9efb591a7b26d1c107880f

data/app/helpers/crud_helper.rb

@@ -110,12 +110,12 @@ module CrudHelper
     permissions.uniq.flatten
   end
 
-  def render_plus_button(field,f,modelo,record)
-    field[:sf][:wrapper] = :with_button
-    render_field(field,f,modelo,record)
+  def render_plus_button(field, f, modelo, record, options = {})
+    field[:sf][:wrapper] = options[:wrapper] || :with_button
+    render_field(field, f, modelo, record)
   end
 
-  def render_field(field,f,modelo,record)
+  def render_field(field, f, modelo, record)
     field[:sf][:wrapper] ||= :default
     if field[:sf].present? && field[:sf][:if].present?
       return unless field[:sf][:if].call(f.object)
@@ -129,32 +129,34 @@ module CrudHelper
       if !field[:sf][:edit].nil? && !field[:sf][:edit] && !record.new_record?
       elsif !field[:sf][:create].nil? && !field[:sf][:create] && record.new_record?
       else
+        opts = field[:sf].merge(label: I18n.t(field[:sf][:label]))
         unless modelo.reflect_on_association(field[:attribute])
           if modelo.new.send(field[:attribute]).class.to_s =~ /Uploader/ and f.object.send(field[:attribute]).present?
-            f.input field[:attribute], field[:sf].merge(hint: "Arquivo Atual: #{f.object.send(field[:attribute]).file.filename}")
+            f.input field[:attribute], opts.merge(hint: "Arquivo Atual: #{f.object.send(field[:attribute]).file.filename}")
           else
-            f.input field[:attribute], field[:sf]
+            f.input field[:attribute], opts
           end
         else
-           f.association field[:attribute], field[:sf]
+           f.association field[:attribute], opts
         end
       end
     else
       if field[:sf][:value] and field[:sf][:value].class == Proc
          field[:sf][:input_html] ||= {}
-         field[:sf][:input_html][:value] = f.instance_eval &field[:sf][:value]
+         field[:sf][:input_html][:value] = f.instance_eval(&field[:sf][:value])
       end
       if field[:sf][:collection_if] and field[:sf][:collection_if].class == Proc
-         field[:sf][:collection] = f.instance_eval &field[:sf][:collection_if]
+         field[:sf][:collection] = f.instance_eval(&field[:sf][:collection_if])
       end
+      opts = field[:sf].merge(label: I18n.t(field[:sf][:label]))
       unless modelo.reflect_on_association(field[:attribute])
         if modelo.new.send(field[:attribute]).class.to_s =~ /Uploader/ and f.object.send(field[:attribute]).present?
-          f.input field[:attribute], field[:sf].merge(hint: "Arquivo Atual: #{f.object.send(field[:attribute]).file.filename}")
+          f.input field[:attribute], opts.merge(hint: "Arquivo Atual: #{f.object.send(field[:attribute]).file.filename}")
         else
-          f.input field[:attribute], field[:sf]
+          f.input field[:attribute], opts
         end
       else
-        f.association field[:attribute], field[:sf]
+        f.association field[:attribute], opts
       end
     end
   end
@@ -211,7 +213,7 @@ module CrudHelper
     return true if crud_helper.condition_destroy_action.nil?
     crud_helper.condition_destroy_action.call(record)
   end
-  
+
   def should_listing?(crud_helper,model)
     return false unless can?(:read, model)
     return true if crud_helper.condition_listing_action.nil?

data/app/helpers/search_helper.rb

@@ -16,7 +16,7 @@ module SearchHelper
       "<div><input type='submit' class='btn btn-primary pull-right' value='#{name}' id='submit_raro_search'></div><br><br>"
     end
 
-    def raro_field (name, opts = {})
+    def raro_field(name, opts = {})
       modelo = opts[:model] || @model
       unless opts[:model]
         prototype = @model.columns_hash[name.to_s]
@@ -26,7 +26,7 @@ module SearchHelper
         modelo = Module.const_get(opts[:model])
         name = opts[:full_name]
       end
-      label = I18n.t("simple_form.labels.#{modelo.name.underscore}.#{name}")
+      label = "simple_form.labels.#{modelo.name.underscore}.#{name}"
       label = opts[:label] if opts[:label]
 
       @buffer << "<div class=\"form-group\">"
@@ -81,7 +81,7 @@ module SearchHelper
       case opts[:as]
       when :select
         if opts[:collection_if] and opts[:collection_if].class == Proc
-          opts[:collection] = ActionView::Helpers::FormBuilder.instance_eval &opts[:collection_if]
+          opts[:collection] = ActionView::Helpers::FormBuilder.instance_eval(&opts[:collection_if])
         end
         raro_select(name,opts,opts[:collection])
       when :hidden
@@ -115,7 +115,7 @@ module SearchHelper
       else
         buf << "<select name=#{name} class='form-control'>"
       end
-      buf <<"<option value ='' selected>#{I18n.t('search')}</option>"
+      buf << "<option value ='' selected>#{I18n.t('search')}</option>"
       collection.each do |e|
         buf << "<option value=#{e[0]}>#{e[1]}</option>"
       end
@@ -128,7 +128,7 @@ module SearchHelper
       if opts[:as] and opts[:as] == :hidden
         ""
       else
-      "<label class='col-sm-2 control-label'>#{name}</label>"
+      "<label class='col-sm-2 control-label'>#{I18n.t(name)}</label>"
       end
     end
 
@@ -227,9 +227,9 @@ module SearchHelper
       "<input type='hidden' name='partial' value='#{partial}'>" +
       "<input type='hidden' name='var' value='#{var}'>"
       if sort
-         buffer << "<input type='hidden' name='q[s]' value='#{sort}'>"
-       end
-       buffer
+        buffer << "<input type='hidden' name='q[s]' value='#{sort}'>"
+      end
+      buffer
     end
 
     def raro_after_form

data/app/raro_crud/raro_crud.rb

@@ -244,6 +244,7 @@ class RaroCrud
 
   def self.campo_tabela nome, opts={}
     @@index_fields[self.to_s.to_sym] = [] unless @@index_fields[self.to_s.to_sym]
+    opts = set_default_label nome, opts
     @@index_fields[self.to_s.to_sym].push(
       {
         attribute: nome
@@ -270,6 +271,7 @@ class RaroCrud
 
   def self.campo_formulario nome, opts={}
     @@form_fields[self.to_s.to_sym] = [] unless @@form_fields[self.to_s.to_sym]
+    opts = set_default_label nome, opts
     if opts.present? && opts[:autocomplete].present?
       opts[:as] = :autocomplete
       label_method = opts[:autocomplete][:label_method] || opts[:autocomplete][:campo]
@@ -309,10 +311,18 @@ class RaroCrud
     end
     field[:grupo] = true
   end
+  
+  def self.set_default_label nome, opts
+    unless opts[:label].present?
+      opts[:label] = "simple_form.labels.#{self.modelo.underscore}.#{nome}"
+    end
+    opts
+  end
 
   public
   def self.campo_visualizacao nome, opts = {}
     @@view_fields[self.to_s.to_sym] = [] unless @@view_fields[self.to_s.to_sym]
+    opts = set_default_label nome, opts
     @@view_fields[self.to_s.to_sym].push(
       {
         attribute: nome
@@ -322,6 +332,7 @@ class RaroCrud
 
   def self.campo_busca nome, opts = {}
     @@search_fields[self.to_s.to_sym] = [] unless @@search_fields[self.to_s.to_sym]
+    opts = set_default_label nome, opts
     @@search_fields[self.to_s.to_sym].push(
       {
         attribute: nome
@@ -331,6 +342,7 @@ class RaroCrud
 
   def self.campo_listagem nome, opts = {}
     @@listing_fields[self.to_s.to_sym] = [] unless @@listing_fields[self.to_s.to_sym]
+    opts = set_default_label nome, opts
     @@listing_fields[self.to_s.to_sym].push(
       {
         attribute: nome
@@ -340,6 +352,7 @@ class RaroCrud
 
   def self.campo_impressao nome, opts = {}
     @@printing_fields[self.to_s.to_sym] = [] unless @@printing_fields[self.to_s.to_sym]
+    opts = set_default_label nome, opts
     @@printing_fields[self.to_s.to_sym].push(
       {
         attribute: nome
@@ -442,9 +455,11 @@ class RaroCrud
     ].each do |field|
       attribute = field[:campo]
       field.delete(:campo)
+      field[:label] ||= "shared.#{attribute}"
       opts[:fields].push({attribute: attribute,sf: field})
     end
     opts[:grupo] = true
+    opts[:label] ||= "shared.adicionar_endereco"
     @@form_fields[self.to_s.to_sym].push(
       {
         attribute: :endereco

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

@@ -8,7 +8,7 @@
 <% end %>
 <%= f.simple_fields_for key do |g| %>
 	<div class="col-sm-12">
-		<h3><%= groups[:sublabel] || groups[:label] || I18n.t("simple_form.labels.#{modelo.name.underscore}.#{key}") %></h3>
+		<h3><%= I18n.t(groups[:label]) %></h3>
 	</div>
 	<% groups[:fields].each do |field| %>
 		<% if field[:sf].present? && field[:sf][:grupo].present? %>
@@ -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 #{groups[:sublabel] || groups[:label].try(:downcase) || I18n.t("simple_form.labels.#{modelo.name.underscore}.#{key}")}" %>
+				<%= g.link_to_remove "Remover #{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 #{groups[:sublabel] || groups[:label].try(:downcase) || I18n.t("simple_form.labels.#{modelo.name.underscore}.#{key}")}", key %>
+			<%= f.link_to_add "Adicionar #{I18n.t(groups[:sublabel] || groups[:label])}", key %>
 		</div>
 	</div>
 <% end %>

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

@@ -38,7 +38,7 @@
 				<% if record.send(att[:attribute]).to_s == "false" or record.send(att[:attribute]).to_s == "true" %>
 					<td class="row">
 						<div class="col-xs-9">
-							<%=  record.send(att[:attribute]) ? "Sim" : "Não" %>
+							<%=  I18n.t(record.send(att[:attribute]) ? "shared.sim" : "shared.nao") %>
 						</div>
 					</td>
 				<% else %>

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

@@ -14,9 +14,9 @@
 						<% end %>
 						<th>
 							<% if att[:sort_field].present? %>
-								<%= sort_link @q, att[:sort_field], I18n.t("simple_form.labels.#{@model.name.underscore}.#{att[:attribute]}"), {},data: {push: 'partial', target: "#form"}%>
+								<%= sort_link @q, att[:sort_field], I18n.t(att[:label]), {},data: {push: 'partial', target: "#form"}%>
 							<% else %>
-								<%= sort_link @q, att[:attribute], I18n.t("simple_form.labels.#{@model.name.underscore}.#{att[:attribute]}"), {},data: {push: 'partial', target: "#form"}%>
+								<%= sort_link @q, att[:attribute], I18n.t(att[:label]), {},data: {push: 'partial', target: "#form"}%>
 							<% end %>
 						</th>
 					<%end%>

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

@@ -11,11 +11,7 @@
 									<% next %>
 								<% end %>
 							<% end %>
-							<% if field[:sf].present? && field[:sf][:label].present? %>
-								<th><%= field[:sf][:label].to_s.mb_chars.upcase.to_s %></th>
-							<% else %>
-								<th><%= I18n.t("simple_form.labels.#{@model.name.underscore}.#{field[:attribute]}") %></th>
-							<% end %>
+							<th><%= I18n.t(field[:sf][:label]) %></th>
 
 							<% if @model.columns_hash[field[:attribute].to_s].present? && [:date, :datetime].include?(@model.columns_hash[field[:attribute].to_s].type)%>
 								<% if field[:date_format].present?%>
@@ -56,7 +52,7 @@
 									<%= render_field_file(@record.send(field[:attribute])) %>
 								</td>
 							<% elsif ["false","true"].include? @record.send(field[:attribute]).to_s %>
-								<td><%=  @record.send(field[:attribute]) ? "Sim" : "Não" %></td>
+								<td><%= I18n.t(@record.send(field[:attribute]) ? "shared.sim" : "shared.nao") %></td>
 							<% else %>
 								<td>
 									<% if field[:sf].present? && field[:sf][:label_method].present? && @record.send(field[:attribute]).present?%>

data/app/views/crud/listing.pdf.erb

@@ -17,11 +17,7 @@
       						<% next %>
       					<% end %>
       				<% end %>
-      				<% if att[:sf].present? && att[:sf][:label].present? %>
-      					<th><%= att[:sf][:label].to_s.mb_chars.upcase.to_s %></th>
-      				<% else %>
-      					<th><%= I18n.t("simple_form.labels.#{@model.name.underscore}.#{att[:attribute]}") %></th>
-      				<% end %>
+    					<th><%= I18n.t(att[:sf][:label]) %></th>
       			<% end %>
           </tr>
         </thead>
@@ -40,7 +36,7 @@
     							<td><%= record.send(att[:attribute]).map{|rec| rec.to_s}.join(",") %></td>
     						<% else %>
     							<% if record.send(att[:attribute]).to_s == "false" or record.send(att[:attribute]).to_s == "true" %>
-    								<td><%= record.send(att[:attribute]) ? "Sim" : "Não" %></td>
+    								<td><%= I18n.t(record.send(att[:attribute]) ? "shared.sim" : "shared.nao") %></td>
     							<% elsif att[:sf][:label_method].present? %>
     								<td><%= record.send(att[:attribute]).send(att[:sf][:label_method]).to_s %></td>
     							<% else %>

data/app/views/crud/listing.xls.erb

@@ -13,11 +13,7 @@ xmlns:html="http://www.w3.org/TR/REC-html40">
 						<% next %>
 					<% end %>
 				<% end %>
-				<% if att[:sf].present? && att[:sf][:label].present? %>
-					<Cell><Data ss:Type="String"><%= att[:sf][:label].to_s.mb_chars.upcase.to_s %></Data></Cell>
-				<% else %>
-					<Cell><Data ss:Type="String"><%= I18n.t("simple_form.labels.#{@model.name.underscore}.#{att[:attribute]}") %></Data></Cell>
-				<% end %>
+				<Cell><Data ss:Type="String"><%= I18n.t(att[:sf][:label]) %></Data></Cell>
 			<% end %>
 		</Row>
 		<% @records.each do |record| %>
@@ -34,7 +30,7 @@ xmlns:html="http://www.w3.org/TR/REC-html40">
 							<Cell><Data ss:Type="String"><%= record.send(att[:attribute]).map{|rec| rec.to_s}.join(",") %></Data></Cell>
 						<% else %>
 							<% if record.send(att[:attribute]).to_s == "false" or record.send(att[:attribute]).to_s == "true" %>
-								<Cell><Data ss:Type="String"><%=  record.send(att[:attribute]) ? "Sim" : "Não" %></Data></Cell>
+								<Cell><Data ss:Type="String"><%=  I18n.t(record.send(att[:attribute]) ? "shared.sim" : "shared.nao") %></Data></Cell>
 							<% elsif att[:sf][:label_method].present? %>
 								<Cell><Data ss:Type="String"><%=  record.send(att[:attribute]).send(att[:sf][:label_method]).to_s %></Data></Cell>
 							<% else %>

data/app/views/crud/printing.pdf.erb

@@ -20,11 +20,7 @@
                   <% next %>
                 <% end %>
               <% end %>
-              <% if field[:sf].present? && field[:sf][:label].present? %>
-                <th><%= field[:sf][:label].to_s.mb_chars.upcase.to_s %></th>
-              <% else %>
-                <th><%= I18n.t("simple_form.labels.#{@model.name.underscore}.#{field[:attribute]}") %></th>
-              <% end %>
+              <th><%= I18n.t(att[:sf][:label]) %></th>
 
               <% if @model.columns_hash[field[:attribute].to_s].present? && [:date, :datetime].include?(@model.columns_hash[field[:attribute].to_s].type)%>
                 <% if field[:date_format].present?%>
@@ -65,7 +61,7 @@
                   <%= render_field_file(@record.send(field[:attribute])) %>
                 </td>
               <% elsif ["false","true"].include? @record.send(field[:attribute]).to_s %>
-                <td><%=  @record.send(field[:attribute]) ? "Sim" : "Não" %></td>
+                <td><%=  I18n.t(@record.send(field[:attribute]) ? "shared.sim" : "shared.nao") %></td>
               <% else %>
                 <td>
                   <% if field[:sf].present? && field[:sf][:label_method].present? && @record.send(field[:attribute]).present?%>

data/config/routes.rb

@@ -1,6 +1,6 @@
 Rails.application.routes.draw do
 
-  if TemplusModels::Routes.registrar
+  if TemplusModels.configuration.registrar_rotas
     scope "(:locale)" do
       # Routes for RaroCrud
       get '/crud/:model' => "crud#index", as: :crud_models

data/lib/templus_models/configuration.rb

@@ -1,10 +1,11 @@
 module TemplusModels
   class Configuration
 
-    attr_accessor :usar_icones
+    attr_accessor :usar_icones, :registrar_rotas
 
     def initialize
       @usar_icones = false
+      @registrar_rotas = true
     end
 
     def self.instance

data/lib/templus_models/version.rb

@@ -1,3 +1,3 @@
 module TemplusModels
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

data/lib/templus_models.rb

@@ -24,15 +24,4 @@ module TemplusModels
     end
   end
 
-  module Routes
-    @@registrar = true
-
-    def self.registrar
-      @@registrar
-    end
-
-    def self.registrar=(value)
-      @@registrar = value
-    end
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: templus_models
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Rodrigo Sol
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-13 00:00:00.000000000 Z
+date: 2017-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails