mdd 3.1.0 → 3.1.1

data/lib/generators/mdwa/sandbox/templates/config/locales/mdwa.en.yml

@@ -12,6 +12,7 @@ en:
     logged_info_edit_account: "My Account"
     cancel_button: "Cancel"
     save_button: "Save"
+    search_button: "Search"
     index_id: "ID"
     index_edit: "Edit"
     index_edit_label: "Edit"
@@ -21,6 +22,9 @@ en:
     add_by_ajax: "Add new %{name}"
     edit_by_ajax: "Edit %{name}"
     no_file: "No file"
+    yes: "Yes"
+    no: "No"
+    both: "Both"
 
   administrators:
     edit_title: "Editing account: %{name}"

data/lib/generators/mdwa/scaffold/templates/controllers/ajax_controller.rb

@@ -4,7 +4,7 @@ class <%= @model.controller_name %>Controller < <%= @inherit_controller || 'Appl
   load_and_authorize_resource :class => "<%= @model.klass %>"
 
 	def index
-		@<%= @model.plural_name %> = <%= @model.klass %>.paginate :page => params[:page]
+		@<%= @model.plural_name %> = <%= @model.klass %>.paginate :page => params[:page], :per_page => params[:per_page]
 
     respond_to do |format|
       format.html

data/lib/generators/mdwa/scaffold/templates/controllers/controller.rb

@@ -4,7 +4,7 @@ class <%= @model.controller_name %>Controller < <%= @inherit_controller || 'Appl
   load_and_authorize_resource :class => "<%= @model.klass %>"
 
 	def index
-		  @<%= @model.plural_name %> = <%= @model.klass %>.paginate :page => params[:page]
+		  @<%= @model.plural_name %> = <%= @model.klass %>.paginate :page => params[:page], :per_page => params[:per_page]
 
 	    respond_to do |format|
 	      format.html

data/lib/generators/mdwa/scaffold/templates/specs/routing.rb

@@ -33,4 +33,4 @@ describe <%= @model.controller_name %>Controller do
     end
 
   end
-end
+end

data/lib/generators/mdwa/templates/templates/general/routes.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 def mdwa_router(router)
 
-end
+end

data/lib/generators/mdwa/templates/templates/scaffold/controller.erb

@@ -9,17 +9,44 @@ class <%= @model.controller_name %>Controller < <%= (@model.space == 'a') ? 'A::
   # Hook for code generations. Do not delete.
   #===controller_init===
 
-	def index
-	  @<%= @model.plural_name %> = <%= @model.klass %>.paginate :page => params[:page]
+  def index
+    conditions = []
+    <%- 
+    atributos_com_filtro = @entity.attributes.values.select {|attr| attr.options[:filtered]} 
+    associacoes_com_filtro = @entity.associations.values.select {|assoc| assoc.options[:filtered]}
+    -%>
+    <%- if !atributos_com_filtro.count.zero? -%>
+      <%- atributos_com_filtro.each do |atributo| -%>
+        <%- if [:integer, :float, :decimal, :boolean].include? atributo.type.to_sym  -%>
+    conditions << "(<%= @model.plural_name %>.<%= atributo.name %> = '#{params[:<%= atributo.name %>]}')" unless params[:<%= atributo.name %>].blank?
+        <%- elsif [:string, :text].include? atributo.type.to_sym  -%>
+    conditions << "(<%= @model.plural_name %>.<%= atributo.name %> LIKE '%#{params[:<%= atributo.name %>]}%')" unless params[:<%= atributo.name %>].blank?
+        <%- elsif [:date].include? atributo.type.to_sym  -%>
+    conditions << "(<%= @model.plural_name %>.<%= atributo.name %> BETWEEN '#{params[:<%= atributo.name %>_0].to_date}' AND '#{params[:<%= atributo.name %>_1].to_date}')" if !params[:<%= atributo.name %>_0].blank? and !params[:<%= atributo.name %>_1].blank?
+    conditions << "(<%= @model.plural_name %>.<%= atributo.name %> >= '#{params[:<%= atributo.name %>_0].to_date}')" if !params[:<%= atributo.name %>_0].blank? and params[:<%= atributo.name %>_0].blank?
+    conditions << "(<%= @model.plural_name %>.<%= atributo.name %> <= '#{params[:<%= atributo.name %>_1].to_date}')" if params[:<%= atributo.name %>_0].blank? and !params[:<%= atributo.name %>_1].blank?
+        <%- elsif [:datetime, :timestamp].include? atributo.type.to_sym  -%>
+    conditions << "(<%= @model.plural_name %>.<%= atributo.name %> BETWEEN '#{params[:<%= atributo.name %>_0].to_date.beginning_of_day}' AND '#{params[:<%= atributo.name %>_1].to_date.end_of_day}')" if !params[:<%= atributo.name %>_0].blank? and !params[:<%= atributo.name %>_1].blank?
+    conditions << "(<%= @model.plural_name %>.<%= atributo.name %> >= '#{params[:<%= atributo.name %>_0].to_date.beginning_of_day}')" if !params[:<%= atributo.name %>_0].blank? and params[:<%= atributo.name %>_0].blank?
+    conditions << "(<%= @model.plural_name %>.<%= atributo.name %> <= '#{params[:<%= atributo.name %>_1].to_date.end_of_day}')" if params[:<%= atributo.name %>_0].blank? and !params[:<%= atributo.name %>_1].blank?
+        <%- end -%>
+      <%- end -%>
+    <%- end -%>
+
+    <%- associacoes_com_filtro.each do |associacao| -%>
+    conditions << "(<%= @model.plural_name %>.<%= associacao.name %>_id = #{params[:<%= associacao.name %>_id]})" unless params[:<%= associacao.name %>_id].blank?
+    <%- end -%>
+
+    @<%= @model.plural_name %> = <%= @model.klass %>.paginate :page => params[:page], :per_page => params[:per_page], :conditions => conditions.join(' AND ')
 
     respond_to do |format|
       format.html
       format.js
     end
-	end
+  end
 
 
-	def show
+  def show
     @<%= @model.singular_name %> = <%= @model.klass %>.find(params[:id])
 
   <%- if @entity.ajax? -%>
@@ -29,9 +56,9 @@ class <%= @model.controller_name %>Controller < <%= (@model.space == 'a') ? 'A::
       format.html
     end
   <%- end -%>
-	end
+  end
 
-	def new
+  def new
     @<%= @model.singular_name %> = <%= @model.klass %>.new
     <%- @model.associations.select {|a| a.nested_one?}.each do |assoc| -%>
     @<%= @model.singular_name %>.<%= assoc.model2.singular_name %> = <%= assoc.model2.klass %>.new
@@ -44,9 +71,9 @@ class <%= @model.controller_name %>Controller < <%= (@model.space == 'a') ? 'A::
       format.html
     end
   <%- end -%>
-	end
+  end
 
-	def edit
+  def edit
     @<%= @model.singular_name %> = <%= @model.klass %>.find(params[:id])
 
   <%- if @entity.ajax? -%>
@@ -56,15 +83,12 @@ class <%= @model.controller_name %>Controller < <%= (@model.space == 'a') ? 'A::
       format.html
     end
   <%- end -%>
-	end
+  end
 
-	def create
+  def create
     @<%= @model.singular_name %> = <%= @model.klass %>.new(params[:<%= @model.to_params %>])
     saved_ok = @<%= @model.singular_name %>.save
-    @system_notice = t('<%= @model.plural_name %>.create_success') if saved_ok    
-  <%- if @entity.ajax? -%>
-    load_list # loads all <%= @model.plural_name %> to display in the list
-  <%- end -%>
+    @system_notice = t('<%= @model.plural_name %>.notice.create') if saved_ok    
   
   <%- @model.associations.select{|a| a.has_and_belongs_to_many? and a.composition?}.each do |association| -%>
     unless params[:<%= association.model2.plural_name %>].nil?
@@ -86,9 +110,9 @@ class <%= @model.controller_name %>Controller < <%= (@model.space == 'a') ? 'A::
       end
     <%- end -%>
     end
-	end
+  end
 
-	def update
+  def update
     @<%= @model.singular_name %> = <%= @model.klass %>.find(params[:id])
   <%- if @entity.user? -%>
     # if password is blank, delete from params
@@ -97,11 +121,9 @@ class <%= @model.controller_name %>Controller < <%= (@model.space == 'a') ? 'A::
       params[:<%= @model.object_name %>].delete :password_confirmation
     end
   <%- end -%>
-    saved_ok = @<%= @model.singular_name %>.update_attributes(params[:<%= @model.to_params %>])
-  <%- if @entity.ajax? -%>
-    @system_notice = t('<%= @model.plural_name %>.update_success') if saved_ok
-    load_list # loads all <%= @model.plural_name %> to display in the list
-  <%- end -%>
+    @<%= @model.singular_name %>.attributes = params[:<%= @model.to_params %>]
+    saved_ok = @<%= @model.singular_name %>.save
+    @system_notice = t('<%= @model.plural_name %>.notice.update') if saved_ok
   
   <%- @model.associations.select{|a| a.has_and_belongs_to_many? and a.composition?}.each do |association| -%>
     unless params[:<%= association.model2.plural_name %>].nil?
@@ -116,21 +138,18 @@ class <%= @model.controller_name %>Controller < <%= (@model.space == 'a') ? 'A::
     <%- if @entity.ajax? -%>
       format.js
     <%- else -%>
-      if @<%= @model.singular_name %>.update_attributes(params[:<%= @model.object_name %>])
-        format.html { redirect_to <%= @model.object_name.pluralize %>_path, notice: t('<%= @model.plural_name %>.update_success') }
+      if saved_ok
+        format.html { redirect_to <%= @model.object_name.pluralize %>_path, notice: @system_notice }
       else
         format.html { render action: "edit" }
       end
     <%- end -%>
     end
-	end
+  end
 
-	def destroy
+  def destroy
     @<%= @model.singular_name %> = <%= @model.klass %>.find(params[:id])
-    @system_notice = t('<%= @model.plural_name %>.destroy_success') if @<%= @model.singular_name %>.destroy
-  <%- if @entity.ajax? -%>
-    load_list # loads all <%= @model.plural_name %> to display in the list
-  <%- end -%>
+    @system_notice = t('<%= @model.plural_name %>.notice.destroy') if @<%= @model.singular_name %>.destroy
     
     respond_to do |format|
     <%- if @entity.ajax? -%>
@@ -139,12 +158,7 @@ class <%= @model.controller_name %>Controller < <%= (@model.space == 'a') ? 'A::
       format.html { redirect_to <%= @model.object_name.pluralize %>_path, notice: @system_notice }
     <%- end -%>
     end
-	end
-	
-	
-	private
-		def load_list
-			@<%= @model.plural_name %> = <%= @model.klass %>.paginate :page => 1
-		end
-
+  end
+  
+  
 end

data/lib/generators/mdwa/templates/templates/scaffold/views/_form_fields.html.erb

@@ -3,7 +3,7 @@
 <div class="field">
    	<%%= f.label :<%= attr.name %>, t('<%= @model.plural_name %>.edit.<%= attr.name %>') %> 
 	<%- if attr.type.to_sym == :file -%>
-	<%% unless @<%= @model.singular_name %>.new_record? %>
+	<%% if !@<%= @model.singular_name %>.new_record? and !@<%= @model.singular_name %>.<%= attr.name %>.blank? %>
 		<span><%%= link_to image_tag(file_icon_path(@<%= @model.singular_name %>.<%= attr.name %>_file_name)), @<%= @model.singular_name %>.<%= attr.name %>.url, :target => '_blank' %></span>
 	<%% end %>
 	<%- end -%>
@@ -18,7 +18,7 @@
 	<%%= f.label :<%= assoc.model2.singular_name.foreign_key %>, t('<%= @model.plural_name %>.edit.<%= assoc.model2.singular_name %>') %> 
 	<%%= f.select :<%= assoc.model2.singular_name.foreign_key %>, 
 		  options_for_select( <%= assoc.model2.klass %>.order('<%= assoc.reference_field %> ASC').collect{ |c| [c.<%= assoc.reference_field %>, c.id] }, f.object.<%= assoc.model2.singular_name.foreign_key %> ), 
-			:prompt => '-- Select --' %>
+			:prompt => t('<%= @model.plural_name %>.edit.<%= assoc.model2.singular_name %>_select') %>
 </div>
 <%- end # if -%>
 

data/lib/generators/mdwa/templates/templates/scaffold/views/_list.html.erb

@@ -1,15 +1,15 @@
 ===entity_code===
 <table class="list">
   <thead>
-      <th class="list_show"><%%= t 'system.index_id' %></th>
-      <th class="list_edit"><%%= t 'system.index_edit' %></th>
+      <th class="list_show"><%%= t '<%= @model.plural_name %>.index.id' %></th>
     <%- @model.attributes.select{|a| !['id', 'created_at', 'updated_at'].include?(a.name)}.each do |attr| -%>
-      <th><%%= t '<%= @model.plural_name %>.index_<%= attr.name %>' %></th>
+      <th><%%= t '<%= @model.plural_name %>.index.<%= attr.name %>' %></th>
     <%- end -%>
     <%- @model.associations.each do |assoc| -%>
       <th><%%= t '<%= @model.plural_name %>.index.<%= assoc.model2.singular_name %>' %></th>
     <%- end -%>
-      <th class="list_remove"><%%= t 'system.index_remove' %></th>
+      <th class="list_edit"><%%= t '<%= @model.plural_name %>.index.edit' %></th>
+      <th class="list_remove"><%%= t '<%= @model.plural_name %>.index.remove' %></th>
   </thead>
 
 <%% @<%= @model.plural_name %>.each do |<%= @model.singular_name %>| %>
@@ -17,16 +17,14 @@
     <td class="list_show">
 		<%%= link_to <%= @model.singular_name %>.id, <%= @model.object_name %>_path(<%= @model.singular_name %>) <%= ", :class => 'lightbox various fancybox.ajax'" if @entity.ajax %> %>
 	</td>
-  	<td class="list_edit">
-		<%%= link_to t('system.index_edit_label'), edit_<%= @model.object_name %>_path(<%= @model.singular_name %>) <%= ", :class => 'lightbox various fancybox.ajax'" if @entity.ajax %> %>
-	</td>
+
   <%- @model.attributes.select{|a| a.name != 'id' and a.name != 'created_at' and a.name != 'updated_at'}.each do |attr| -%>
 	<td>
 		<%- if attr.type.to_sym == :file -%>
 		<%% unless <%= @model.singular_name %>.<%= attr.name %>_file_name.blank? %>
 			<%%= link_to image_tag(file_icon_path(<%= @model.singular_name %>.<%= attr.name %>_file_name)), <%= @model.singular_name %>.<%= attr.name %>.url, :target => '_blank' %>
 		<%% else %>
-			No file.
+			<%%= t 'system.no_file' %>
 		<%% end %>
 		<%- else -%>
 		<%%= <%= @model.singular_name %>.<%= attr.name %> %>
@@ -47,8 +45,11 @@
       <%- end -%>
     </td>
     <%- end -%>
+    <td class="list_edit">
+      <%%= link_to t('<%= @model.plural_name %>.index.edit_label'), edit_<%= @model.object_name %>_path(<%= @model.singular_name %>) <%= ", :class => 'lightbox various fancybox.ajax'" if @entity.ajax %> %>
+    </td>
     <td class="list_remove">
-		<%%= link_to t('system.index_remove_label'), <%= @model.to_route_object %>, :method => :delete, <%= ':remote => true,' if @entity.ajax %> :data => {:confirm => t('system.index_confirm_deletion')} %>
+		<%%= link_to t('<%= @model.plural_name %>.index.remove_label'), <%= @model.to_route_object %>, :method => :delete, <%= ':remote => true,' if @entity.ajax %> :data => {:confirm => t('<%= @model.plural_name %>.index.confirm_deletion')} %>
 	</td>
   </tr>
 <%% end %>

data/lib/generators/mdwa/templates/templates/scaffold/views/create.js.erb

@@ -3,6 +3,6 @@
 	$("#mdwa_error").html("<%%= j( render '/template/mdwa/crud_error', :object => @<%= @model.singular_name %> )%>");
 <%% else %>
 	$.fancybox.close(true);
-	$("#<%= @model.plural_name %>_list").html("<%%= j( render 'list' )%>");
+	$('#<%= @model.plural_name %>_filter_form').submit();
 	$('body').append("<%%= j( render '/template/mdwa/notice', :notice => @system_notice )%>");
 <%% end %>

data/lib/generators/mdwa/templates/templates/scaffold/views/destroy.js.erb

@@ -1,3 +1,3 @@
 ===entity_code===
-$("#<%= @model.plural_name %>_list").html("<%%= j( render 'list' )%>");
+$('#<%= @model.plural_name %>_filter_form').submit();
 $('body').append("<%%= j( render '/template/mdwa/notice', :notice => @system_notice )%>");

data/lib/generators/mdwa/templates/templates/scaffold/views/index.html.erb

@@ -4,12 +4,57 @@
 		<h1><%%= t '<%= @model.plural_name %>.title.index' %></h1>
 		<%- if @entity.ajax -%>
 		<div class="page_header_right_tab">
-			<%%= link_to t('system.add_by_ajax', :name => '<%= @model.singular_name.humanize %>'), new_<%= @model.object_name %>_path, :class => 'lightbox various fancybox.ajax' %>
+			<%%= link_to t('<%= @model.plural_name %>.index.add'), new_<%= @model.object_name %>_path, :class => 'lightbox various fancybox.ajax' %>
 		</div>
 		<%- end -%>
 	</div>
 
 	<div class="inside">
+
+		<div class="topo">
+			<div class="yui3-g">
+				<%%= form_tag <%= @model.object_name.pluralize %>_path, :method => :get, :remote => true, :id => '<%= @model.plural_name %>_filter_form' do %>
+
+				<%- 
+				atributos_com_filtro = @entity.attributes.values.select {|attr| attr.options[:filtered]}
+				associacoes_com_filtro = @entity.associations.values.select {|assoc| assoc.options[:filtered]}
+				-%>
+				<%- if !atributos_com_filtro.count.zero? or !associacoes_com_filtro.count.zero? -%>
+					<%- atributos_com_filtro.each do |atributo| -%>
+						<div class="yui3-u-1-5">
+							<div class="field">
+								<%%= label_tag :<%= atributo.name %>, t('<%= @model.plural_name %>.filtros.<%= atributo.name %>') %>
+								<%- atributo.to_model_attribute.filter_input.each do |input| -%>
+									<%%= <%= input %> %>
+								<%- end -%>
+							</div>
+						</div>
+					<%- end -%>
+
+					<%- associacoes_com_filtro.each do |associacao| -%>
+						<div class="yui3-u-1-5">
+							<div class="field">
+								<%%= label_tag :<%= associacao.name %>, t('<%= @model.plural_name %>.filtros.<%= associacao.name %>') %>
+								<%- associacao.to_model_association.filter_input(associacao.options[:filter_field]).each do |input| -%>
+									<%%= <%= input %> %>
+								<%- end -%>
+							</div>
+						</div>
+					<%- end -%>
+
+					<!-- Botão buscar -->
+					<div class="yui3-u-1-5">
+						<div class="field">
+							<label>&nbsp;</label>
+							<%%= submit_tag t('system.search_button'), :class => :button %>
+						</div>
+					</div>
+				<%- end -%>
+
+				<%% end %>
+			</div>
+		</div>
+
 		<div id="<%= @model.plural_name %>_list">
 			<%%= render 'list' %>
 		</div>

data/lib/generators/mdwa/templates/templates/scaffold/views/index.js.erb

@@ -1,2 +1,2 @@
 ===entity_code===
-$("#<%= @model.plural_name %>_list").html("<%%= escape_javascript( render 'list' )%>");
+$("#<%= @model.plural_name %>_list").html("<%%= j( render 'list' )%>");

data/lib/generators/mdwa/templates/templates/scaffold/views/update.js.erb

@@ -4,7 +4,7 @@
 <%% else %>
 	if( $('#<%= @model.plural_name %>_list').length > 0 ) {
 		$.fancybox.close(true);
-		$("#<%= @model.plural_name %>_list").html("<%%= j( render 'list' )%>");
+		$('#<%= @model.plural_name %>_filter_form').submit();
 	}
 	else if( $("#edit_<%= @model.plural_name %>").length > 0 ) {
 		$("#edit_<%= @model.plural_name %> .inside").html("<%%= j( render 'form' )%>");

data/lib/generators/mdwa/templates/templates_generator.rb

@@ -149,4 +149,4 @@ module Mdwa
       
     end
   end
-end
+end

data/lib/generators/mdwa/transform/transform_generator.rb

@@ -1,3 +1,5 @@
+# -*- encoding : utf-8 -*-
+
 require 'erb'
 require 'mdwa/dsl'
 
@@ -15,6 +17,7 @@ module Mdwa
       attr_accessor :pending_migrations
       
       argument :entities, :type => :array, :banner => 'Entities to transform', :default => []
+      class_option :skip_locales, :type => :boolean, :default => false, :desc => "Skip I18n generation?"
       
       source_root File.expand_path("../templates", __FILE__)
       
@@ -45,30 +48,34 @@ module Mdwa
       def generate_model_controller_helper_views
         @entities.each do |entity|
           generator_model = entity.generator_model
-          
-          namespaces = Dir.glob("#{Rails.root}/#{MDWA::DSL::TEMPLATES_PATH}#{entity.file_name}/*").select{|d| File.directory?(d) and File.basename(d) != 'views'}
+
+          #
+          # Para cada namespace, gera seu código  
+          #
+          # Pasta onde o código gerado vai ser colocado
+          # Namespace 'frontend' é o público e gera código nas raízes do Rails        
+          namespaces = Dir.glob("#{Rails.root}/#{MDWA::DSL::TEMPLATES_PATH}#{entity.file_name}/*").select{|d| File.directory?(d)}.collect {|n| File.basename(n)}
           if !namespaces.count.zero?
             namespaces.each do |namespace|
-              mdwa_template "#{entity.file_name}/#{File.basename namespace}/model.erb", "app/models/#{File.basename namespace}/#{generator_model.singular_name}.rb"
-              mdwa_template "#{entity.file_name}/#{File.basename namespace}/helper.erb", "app/helpers/#{File.basename namespace}/#{generator_model.plural_name}_helper.rb"
-              mdwa_template "#{entity.file_name}/#{File.basename namespace}/controller.erb", "app/controllers/#{File.basename namespace}/#{generator_model.plural_name}_controller.rb"
-              Dir.glob("#{namespace}/views/*").each do |file|
+
+              namespace_destino = (namespace != 'frontend') ? namespace : ''
+              templates_deste_namespace = MDWA::DSL::TEMPLATES_PATH + entity.file_name + '/' + namespace + '/'
+
+              # Gera model, controllers e helper
+              mdwa_template "#{entity.file_name}/#{namespace}/model.erb", "app/models/#{namespace_destino}/#{generator_model.singular_name}.rb" if File.exists?(templates_deste_namespace + 'model.erb')
+              mdwa_template "#{entity.file_name}/#{namespace}/helper.erb", "app/helpers/#{namespace_destino}/#{generator_model.plural_name}_helper.rb"  if File.exists?(templates_deste_namespace + 'helper.erb')
+              mdwa_template "#{entity.file_name}/#{namespace}/controller.erb", "app/controllers/#{namespace_destino}/#{generator_model.plural_name}_controller.rb"  if File.exists?(templates_deste_namespace + 'controller.erb')
+              
+              # Gera as views
+              Dir.glob("#{templates_deste_namespace}/views/*").each do |file|
                 file_name = File.basename(file)
-                mdwa_template "#{entity.file_name}/#{File.basename namespace}/views/#{file_name}", "app/views/#{File.basename namespace}/#{generator_model.plural_name}/#{file_name}"
+                mdwa_template "#{entity.file_name}/#{namespace}/views/#{file_name}", "app/views/#{namespace_destino}/#{generator_model.plural_name}/#{file_name}"
               end
-            end
-          else
-            entity_name = "#{Rails.root}/#{MDWA::DSL::TEMPLATES_PATH}#{entity.file_name}"
-            mdwa_template "#{entity_name}/model.rb", "app/models/#{generator_model.space}/#{generator_model.singular_name}.rb"
-            mdwa_template "#{entity_name}/helper.rb", "app/helpers/#{generator_model.space}/#{generator_model.plural_name}_helper.rb"
-            mdwa_template "#{entity_name}/controller.rb", "app/controllers/#{generator_model.space}/#{generator_model.plural_name}_controller.rb"
-            Dir.glob("#{entity_name}/views/*").each do |file|
-              file_name = File.basename(file)
-              mdwa_template "#{entity.file_name}/views/#{file_name}", "app/views/#{generator_model.space}/#{generator_model.plural_name}/#{file_name}"
-            end
-          end
-        end
-      end
+
+            end # nm.each
+          end # if nm == 0
+        end # each
+      end # def
       
       def generate_routes
         
@@ -120,6 +127,8 @@ module Mdwa
       
       def generate_locales
 
+        return nil if options.skip_locales
+
         locales_file = 'config/locales/mdwa.specific.en.yml'
         locales_content = File.read(locales_file)
         # make sure the file exist
@@ -128,46 +137,52 @@ module Mdwa
         @entities.each do |entity|
           model = entity.generator_model
           if !locales_content.include?( "  #{model.plural_name}:" )
-            append_file locales_file, :after => "en:\n" do 
-              lines = []
-              lines <<  "  #{model.plural_name}:"
-              lines <<  "    notice:"
-              lines <<  "      create: \"#{model.singular_name.humanize} created.\""
-              lines <<  "      update: \"#{model.singular_name.humanize} updated.\""
-              lines <<  "      destroy: \"#{model.singular_name.humanize} destroyed.\""
-              lines <<  "    title:"
-              lines <<  "      index: \"#{model.plural_name.humanize}\""
-              lines <<  "      show: \"#{model.singular_name.humanize}\""
-              lines <<  "      new: \"New #{model.singular_name.humanize}\""
-              lines <<  "      edit: \"Edit #{model.singular_name.humanize}\""
-              # INDEX
-              lines <<  "    index:"
-              model.attributes.each do |attr|
-                lines <<  "      #{attr.name}: \"#{attr.name.humanize}\""
-              end
-              model.associations.each do |assoc|
-                lines << ((assoc.belongs_to? or assoc.nested_one? or assoc.has_one?) ? "      #{assoc.model2.singular_name}: \"#{assoc.model2.singular_name.humanize}\"" : "      #{assoc.model2.singular_name}: \"#{assoc.model2.plural_name.humanize}\"")
-              end
-              # EDIT
-              lines <<  "    edit:"
-              model.attributes.each do |attr|
-                lines <<  "      #{attr.name}: \"#{attr.name.humanize}\""
-              end
-              model.associations.each do |assoc|
-                lines << ((assoc.belongs_to? or assoc.nested_one? or assoc.has_one?) ? "      #{assoc.model2.singular_name}: \"#{assoc.model2.singular_name.humanize}\"" : "      #{assoc.model2.singular_name}: \"#{assoc.model2.plural_name.humanize}\"")
-              end
-              # SHOW
-              lines <<  "    show:"
-              model.attributes.each do |attr|
-                lines <<  "      #{attr.name}: \"#{attr.name.humanize}\""
-              end
-              model.associations.each do |assoc|
-                lines << ((assoc.belongs_to? or assoc.nested_one? or assoc.has_one?) ? "      #{assoc.model2.singular_name}: \"#{assoc.model2.singular_name.humanize}\"" : "      #{assoc.model2.singular_name}: \"#{assoc.model2.plural_name.humanize}\"")
-              end
-
-              lines << "\n"
-              lines.join("\n")
+            puts "Não tem"
+            lines = []
+            lines << "\n"
+            lines <<  "  #{model.plural_name}:"
+            lines <<  "    notice:"
+            lines <<  "      create: \"#{model.singular_name.humanize} created.\""
+            lines <<  "      update: \"#{model.singular_name.humanize} updated.\""
+            lines <<  "      destroy: \"#{model.singular_name.humanize} destroyed.\""
+            lines <<  "    title:"
+            lines <<  "      index: \"#{model.plural_name.humanize}\""
+            lines <<  "      show: \"#{model.singular_name.humanize}\""
+            lines <<  "      new: \"New #{model.singular_name.humanize}\""
+            lines <<  "      edit: \"Edit #{model.singular_name.humanize}\""
+            # INDEX
+            lines <<  "    index:"
+            lines <<  "      add: 'Adicionar'"
+            lines <<  "      edit: 'Edit'"
+            lines <<  "      edit_label: 'Edit'"
+            lines <<  "      remove: 'Remove'"
+            lines <<  "      remove_label: 'Remove'"
+            lines <<  "      confirm_deletion: 'Are you sure?'"
+            model.attributes.each do |attr|
+              lines <<  "      #{attr.name}: \"#{attr.name.humanize}\""
+            end
+            model.associations.each do |assoc|
+              lines << ((assoc.belongs_to? or assoc.nested_one? or assoc.has_one?) ? "      #{assoc.model2.singular_name}: \"#{assoc.model2.singular_name.humanize}\"" : "      #{assoc.model2.singular_name}: \"#{assoc.model2.plural_name.humanize}\"")
             end
+            # EDIT
+            lines <<  "    edit:"
+            model.attributes.each do |attr|
+              lines <<  "      #{attr.name}: \"#{attr.name.humanize}\""
+            end
+            model.associations.each do |assoc|
+              lines << ((assoc.belongs_to? or assoc.nested_one? or assoc.has_one?) ? "      #{assoc.model2.singular_name}: \"#{assoc.model2.singular_name.humanize}\"" : "      #{assoc.model2.singular_name}: \"#{assoc.model2.plural_name.humanize}\"")
+            end
+            # SHOW
+            lines <<  "    show:"
+            model.attributes.each do |attr|
+              lines <<  "      #{attr.name}: \"#{attr.name.humanize}\""
+            end
+            model.associations.each do |assoc|
+              lines << ((assoc.belongs_to? or assoc.nested_one? or assoc.has_one?) ? "      #{assoc.model2.singular_name}: \"#{assoc.model2.singular_name.humanize}\"" : "      #{assoc.model2.singular_name}: \"#{assoc.model2.plural_name.humanize}\"")
+            end
+            lines << "\n"
+
+            append_file locales_file, lines.join("\n"), :after => "en:"
           end
           
         end # @entities loop
@@ -235,10 +250,10 @@ module Mdwa
                 @changes << {:entity => entity, :type => 'remove_column', :column => column.name, :attr_type => column.type}
               else
                 # se o atributo é derivado de file e não existe o file na entidade, apaga
-                @changes << {:entity => entity, :type => 'remove_column', :column => column.name, :attr_type => column.type} if column.name.ends_with?("_file_name") and entity.attributes[column.name.delete("_file_name")].nil?
-                @changes << {:entity => entity, :type => 'remove_column', :column => column.name, :attr_type => column.type} if column.name.ends_with?("_content_type") and entity.attributes[column.name.delete("_content_type")].nil?
-                @changes << {:entity => entity, :type => 'remove_column', :column => column.name, :attr_type => column.type} if column.name.ends_with?("_file_size") and entity.attributes[column.name.delete("_file_size")].nil?
-                @changes << {:entity => entity, :type => 'remove_column', :column => column.name, :attr_type => column.type} if column.name.ends_with?("_updated_at") and entity.attributes[column.name.delete("_updated_at")].nil?
+                @changes << {:entity => entity, :type => 'remove_column', :column => column.name, :attr_type => column.type} if column.name.ends_with?("_file_name") and entity.attributes[column.name.gsub("_file_name", '')].nil?
+                @changes << {:entity => entity, :type => 'remove_column', :column => column.name, :attr_type => column.type} if column.name.ends_with?("_content_type") and entity.attributes[column.name.gsub("_content_type", '')].nil?
+                @changes << {:entity => entity, :type => 'remove_column', :column => column.name, :attr_type => column.type} if column.name.ends_with?("_file_size") and entity.attributes[column.name.gsub("_file_size", '')].nil?
+                @changes << {:entity => entity, :type => 'remove_column', :column => column.name, :attr_type => column.type} if column.name.ends_with?("_updated_at") and entity.attributes[column.name.gsub("_updated_at", '')].nil?
               end
             # attribute exists in model and entity, but changed type
             elsif entity_attribute.type.to_sym != column.type.to_sym
@@ -251,7 +266,7 @@ module Mdwa
           # new attributes
           # no column with that name -> column must be added
           entity.attributes.each do |key, attr|
-            # se a entidade for file e não existir seus atributos no banco de dados, corrige
+            # se o atributo for file e não existir seus atributos no banco de dados, corrige
             if attr.type.to_sym == :file
               @changes << {:entity => entity, :type => 'add_column', :column => "#{attr.name}_file_name", :attr_type => 'string'} if model_class.columns.select{|c| c.name == "#{attr.name}_file_name"}.count.zero?
               @changes << {:entity => entity, :type => 'add_column', :column => "#{attr.name}_content_type", :attr_type => 'string'} if model_class.columns.select{|c| c.name == "#{attr.name}_content_type"}.count.zero?
@@ -321,14 +336,7 @@ module Mdwa
           migration_string << "\n\tdef self.up"
           migration_string << "\t\tcreate_table :#{generator_model.plural_name} do |t|"
           generator_model.attributes.select{|a| !['id', 'created_at', 'updated_at'].include?(a.name)}.each do |attr|
-            if attr.type.to_sym != :file
-              migration_string << "\t\t\tt.#{attr.migration_field} :#{attr.name}"
-            else
-              migration_string << "\t\t\tt.string :#{attr.name}_file_name"
-              migration_string << "\t\t\tt.string :#{attr.name}_content_type"
-              migration_string << "\t\t\tt.integer :#{attr.name}_file_size"
-              migration_string << "\t\t\tt.datetime :#{attr.name}_updated_at"
-            end
+            migration_string << "\t\t\tt.#{attr.migration_field} :#{attr.name}"
         	end
         	generator_model.associations.each do |assoc|
         	  if assoc.belongs_to? or assoc.nested_one?
@@ -392,4 +400,4 @@ module Mdwa
     end
     
   end
-end
+end