mdd 3.0.20 → 3.1.0

data/app/helpers/mdwa_helper.rb

@@ -11,7 +11,7 @@ module MdwaHelper
   end
 
   def encode_results_to_autocomplete(results, field_name)
-    return results.collect{ |c| "{label: '#{c.send field_name}', value: '#{c.id}'}"  }.join( ',' ).html_safe
+    results.collect{ |c| "{label: \"#{c.send(field_name).html_safe}\", value: \"#{c.id}\"}"  }.join( ',' ).html_safe
   end
   
   def file_icon_path( file_name, size = 'medium' )

data/app/views/mdwa/requirements/index.html.erb

@@ -10,6 +10,7 @@
 				<tr>
 					<th>Requirement title</th>
 					<th>Description</th>
+					<th>Non-functional concerns</th>
 					<th>Entities</th>
 					<th>Users</th>
 				</tr>
@@ -17,6 +18,7 @@
 				<tr>
 					<td><%= requirement.summary %></td>
 					<td><%= requirement.description %></td>
+					<td><%= requirement.non_functional_description %></td>
 					<td><%= requirement.entities.join ', ' %></td>
 					<td><%= requirement.users.join ', ' %></td>
 				</tr>
@@ -28,4 +30,4 @@
 	
 	</div>
 	
-</div>
+</div>

data/app/views/template/mdwa/_autocomplete_multiple_tag.html.erb

@@ -40,7 +40,7 @@
 			}
 	    });
 	
-	  $( ".<%= dom_element_id %>_remove_autocomplete").live( "click", function() {
+	  $( ".<%= dom_element_id %>_remove_autocomplete").on( "click", function() {
 	    $(this).parent().remove();
 	  });
   });

data/app/views/template/mdwa/_autocomplete_tag.html.erb

@@ -13,6 +13,12 @@
           return false;
         }
     });
+
+    $("<%= dom_element %>").on("blur", function() {
+      if($(this).val() == "" ) {
+        $('<%= dom_element_id %>').val("").trigger('change');
+      }
+    });
   });
 
 </script>

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

@@ -5,6 +5,7 @@ MDWA::DSL.requirements.register do |r|
   r.summary     = '<%= @summary %>'
   r.alias       = '<%= @requirement.alias %>' # alias is the unique requirement name and it's created automatically, you can override it with this argument.
   r.description = %q{Detailed description of the requirement.}
+  r.non_functional_description = %q{Explain the non-functional concerns involved in this requirement.}
   
   <%- unless options.no_comments %>
   #

data/lib/generators/mdwa/sandbox/sandbox_generator.rb

@@ -144,7 +144,27 @@ module Mdwa
         # language files
         copy_file 'config/locales/devise.en.yml', 'config/locales/devise.en.yml'
         copy_file 'config/locales/mdwa.en.yml', 'config/locales/mdwa.en.yml'
-        copy_file 'config/locales/mdwa.en.yml', 'config/locales/mdwa_model_specific.en.yml'
+        create_file 'config/locales/mdwa.specific.en.yml', "en:\n"
+
+        # set production pre-compile directives
+        production = []
+        production << "\n  # Precompile directives"
+        production << "  #####################"
+        production << "  #Javascripts"
+        production << "  #####################"
+        production << "  assets = []"
+        production << "  assets << 'mdwa/login_manifest.js'"
+        production << "  assets << 'mdwa/public_manifest.js'"
+        production << "  assets << 'mdwa/system_manifest.js'"
+        production << "  #####################"
+        production << "  #CSS"
+        production << "  #####################"
+        production << "  assets << 'mdwa/login_manifest.css'"
+        production << "  assets << 'mdwa/public_manifest.css'"
+        production << "  assets << 'mdwa/system_manifest.js'"
+        production << "  config.assets.precompile += assets"
+        production << "\n"
+        inject_into_file 'config/environments/production.rb', production.join("\n"), :after => "config.assets.digest = true\n"
       end
 
       def routes
@@ -163,16 +183,6 @@ module Mdwa
     
     root :to => 'home#index'
   end
-  
-  # Software visualization
-  namespace :mdwa do
-    controller :requirements do
-      get 'requirements/index' => 'requirements#index', :as => 'requirements'
-      get 'requirements/:alias' => 'requirements#show', :as => 'requirement'
-    end
-    
-    root :to => 'requirements#index'
-  end
           "
         end
       end

data/lib/generators/mdwa/sandbox/templates/app/assets/javascripts/mdwa/template/all_pages.js

@@ -1,7 +1,7 @@
 $(function() {
 	
 	// all .toggle links must have a rel attribute to identify what element will toggle
-	$('a.toggle').live('click', function() {
+	$('a.toggle').on('click', function() {
 		$($(this).attr('rel')).toggle();
 	});
 
@@ -12,14 +12,19 @@ $(function() {
 	});
 
 	// notices fadeout
-	$('a#system_notice_close, #system_notice').live('click', function() {
+	$('a#system_notice_close, #system_notice').on('click', function() {
 		$('#system_notice').remove();
 	});
 
 	// ajax forms cancel button closes modal window
-	$('.mdwa_ajax a.cancel').live('click', function() {
+	$('.mdwa_ajax a.cancel').on('click', function() {
 		$.fancybox.close(true);
 	});	
+
+	// set focus on modalbox form
+  $(document).bind("ajaxComplete", function() {
+    setFocusOnForm();
+  });
 	
 });
 
@@ -50,3 +55,10 @@ function deleteSystemNotice() {
 		$('#system_notice').remove();
 	});
 }
+
+// focus on the first text input field in the first field on the page
+function setFocusOnForm() {
+	$(':input:enabled:visible:first', "div.filtros").focus();
+  $(':input:enabled:visible:first', "div.mdwa_new").focus();
+  $(':input:enabled:visible:first', "div.mdwa_edit").focus();
+}

data/lib/generators/mdwa/sandbox/templates/app/assets/javascripts/mdwa/template/clicable_title.js

@@ -3,7 +3,7 @@ $(function() {
 		if($(this).val() == '')
 		  $(this).val($(this).attr('title'));
 	});
-	$('.clicable_title').live({
+	$('.clicable_title').on({
 		blur: function() {
 			if($(this).val() == '') $(this).val($(this).attr('title'));
 		},

data/lib/generators/mdwa/sandbox/templates/app/assets/javascripts/mdwa/template/pagination.js

@@ -1,5 +1,5 @@
 $(function() {
-  $(".pagination a").live("click", function() {
+  $(".pagination a").on("click", function() {
     $.getScript(this.href);
     return false;
   });

data/lib/generators/mdwa/sandbox/templates/app/assets/stylesheets/mdwa/template/template.css.erb

@@ -269,4 +269,28 @@ a#system_notice_close {
 /* Modalbox */
 .fancybox-inner {
   background: #fff;
-}
+}
+
+/* List formatting */
+th.list_show {
+  width: 5%;
+}
+
+th.list_edit {
+  width: 5%;
+}
+
+td.list_edit {
+  text-align: center !important;
+}
+
+td.list_edit a {
+  background: url("<%= asset_path "mdwa/icons/edit.png" %>") no-repeat;
+    padding-left: 24px;
+}
+
+td.list_remove a {
+  background: url("<%= asset_path "mdwa/icons/delete.png" %>") no-repeat;
+    padding-left: 24px;
+    padding-bottom: 1px;
+}

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

@@ -3,7 +3,7 @@ en:
     email_label: "E-mail:"
     password_label: "Password:"
     login_button_label: "Login"
-    login_text_pre_form: "Welcome to system. <br />Please login to access this app."
+    login_text_pre_form: "Welcome to a MDWA software. <br />Please login to access this app."
 
   system:
     error: "error"
@@ -20,6 +20,7 @@ en:
     index_confirm_deletion: "Are you sure?"
     add_by_ajax: "Add new %{name}"
     edit_by_ajax: "Edit %{name}"
+    no_file: "No file"
 
   administrators:
     edit_title: "Editing account: %{name}"

data/lib/generators/mdwa/templates/templates/scaffold/{model.rb → model.erb}

@@ -1,10 +1,11 @@
 # -*- encoding : utf-8 -*-
 ===entity_code===
+
 class <%= @model.klass %> < <%= !@entity.user? ? 'ActiveRecord::Base' : 'User' %>
 
 <%- # model attributes -%>
 <%- unless @model.attributes.count.zero? -%>
-    attr_accessible <%= @model.attributes.collect {|a| ":" + a.name }.join(', ') %>
+    attr_accessible <%= @model.attributes.select{|a| !['id', 'created_at', 'updated_at'].include?(a.name)}.collect {|a| ":" + a.name }.join(', ') %>
 <%- end -%>
 <%- # paperclip file uploads -%>
 <%- unless @model.attributes.select{|attr| attr.type.to_sym == :file}.count.zero? -%>

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

@@ -1,7 +1,7 @@
 ===entity_code===
-<%- @model.attributes.select{|a| a.name != 'id' and a.name != 'created_at' and a.name != 'updated_at'}.each do |attr| -%>
+<%- @model.attributes.select{|a| !['id', 'created_at', 'updated_at'].include?(a.name)}.each do |attr| -%>
 <div class="field">
-   	<%%= f.label :<%= attr.name %>, t('<%= @model.plural_name %>.edit_<%= attr.name %>') %> 
+   	<%%= f.label :<%= attr.name %>, t('<%= @model.plural_name %>.edit.<%= attr.name %>') %> 
 	<%- if attr.type.to_sym == :file -%>
 	<%% unless @<%= @model.singular_name %>.new_record? %>
 		<span><%%= link_to image_tag(file_icon_path(@<%= @model.singular_name %>.<%= attr.name %>_file_name)), @<%= @model.singular_name %>.<%= attr.name %>.url, :target => '_blank' %></span>
@@ -15,7 +15,7 @@
 <%- next if assoc.skip_views? %>
 <%- if assoc.belongs_to? -%>
 <div class="field">
-	<%%= f.label :<%= assoc.model2.singular_name.foreign_key %>, t('<%= @model.plural_name %>.edit_<%= assoc.model2.singular_name %>') %> 
+	<%%= 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 --' %>

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

@@ -3,11 +3,11 @@
   <thead>
       <th class="list_show"><%%= t 'system.index_id' %></th>
       <th class="list_edit"><%%= t 'system.index_edit' %></th>
-    <%- @model.attributes.select{|a| a.name != 'id' and a.name != 'created_at' and a.name != 'updated_at'}.each do |attr| -%>
+    <%- @model.attributes.select{|a| !['id', 'created_at', 'updated_at'].include?(a.name)}.each do |attr| -%>
       <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>
+      <th><%%= t '<%= @model.plural_name %>.index.<%= assoc.model2.singular_name %>' %></th>
     <%- end -%>
       <th class="list_remove"><%%= t 'system.index_remove' %></th>
   </thead>

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

@@ -1,6 +1,6 @@
 ===entity_code===
 <%% if @<%= @model.singular_name %>.errors.any? %>
-	$("#mdwa_error").html("<%%= escape_javascript( render '/template/mdwa/crud_error', :object => @<%= @model.singular_name %> )%>");
+	$("#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' )%>");

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' )%>");
-$('body').append("<%%= escape_javascript( render '/template/mdwa/notice', :notice => @system_notice )%>");
+$('body').append("<%%= j( render '/template/mdwa/notice', :notice => @system_notice )%>");

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

@@ -1,7 +1,7 @@
 ===entity_code===
 <div id="<%= @model.plural_name %>_edit" class="mdwa_edit">
 	<div class="page_header">
-		<h1><%%= t('<%= @model.plural_name %>.edit_title') %></h1>
+		<h1><%%= t('<%= @model.plural_name %>.title.edit') %></h1>
 	</div>
 
 	<div class="inside">

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

@@ -1,7 +1,7 @@
 ===entity_code===
 <div id="<%= @model.plural_name %>_index" class="mdwa_index">
 	<div class="page_header">
-		<h1><%%= t '<%= @model.plural_name %>.index_title' %></h1>
+		<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' %>

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

@@ -1,7 +1,7 @@
 ===entity_code===
 <div id="<%= @model.plural_name %>_new" class="mdwa_new">
 	<div class="page_header">
-		<h1><%%= t('<%= @model.plural_name %>.new_title') %></h1>
+		<h1><%%= t('<%= @model.plural_name %>.title.new') %></h1>
 	</div>
 
 	<div class="inside">

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

@@ -1,18 +1,18 @@
 ===entity_code===
 <div id="<%= @model.plural_name %>_show" class="mdwa_show">
 	<div class="page_header">
-		<h1><%%= t('<%= @model.plural_name %>.show_title') %></h1>
+		<h1><%%= t('<%= @model.plural_name %>.title.show') %></h1>
 	</div>
 
 	<div class="inside">
-	<%- @model.attributes.select{|a| a.name != 'id' and a.name != 'created_at' and a.name != 'updated_at'}.each do |attr| -%>
+	<%- @model.attributes.each do |attr| -%>
 		<div class="field">
-			<label><%%= t '<%= @model.plural_name %>.show_<%= attr.name %>' %></label>
+			<label><%%= t '<%= @model.plural_name %>.show.<%= attr.name %>' %></label>
 		<%- if attr.type.to_sym == :file -%>
 			<%% unless @<%= @model.singular_name %>.<%= attr.name %>.nil? %>
 			<span><%%= link_to image_tag(file_icon_path(@<%= @model.singular_name %>.<%= attr.name %>_file_name)), @<%= @model.singular_name %>.<%= attr.name %>.url, :target => '_blank' %></span>
 			<%% else %>
-			No file.
+				<%%= t('system.no_file') %>
 			<%% end %>
 		<%- else -%>
 			<span><%%= @<%= @model.singular_name %>.<%= attr.name %> %></span>
@@ -21,7 +21,7 @@
 	<%- end -%>
 	<%- @model.associations.each do |assoc| -%>
 		<div class="field">
-			<label><%%= t '<%= @model.plural_name %>.show_<%= assoc.model2.singular_name %>' %></label>
+			<label><%%= t '<%= @model.plural_name %>.show.<%= assoc.model2.singular_name %>' %></label>
 			<span>
 			<%- if assoc.belongs_to? || assoc.nested_one? -%>
 		    	<%%= @<%= @model.singular_name %>.<%= assoc.model2.singular_name %>.<%= assoc.reference_field %> unless @<%= @model.singular_name %>.<%= assoc.model2.singular_name %>.nil? %>

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

@@ -1,6 +1,6 @@
 ===entity_code===
 <%% if @<%= @model.singular_name %>.errors.any? %>
-	$("#mdwa_error").html("<%%= escape_javascript( render '/template/mdwa/crud_error', :object => @<%= @model.singular_name %> )%>");
+	$("#mdwa_error").html("<%%= j( render '/template/mdwa/crud_error', :object => @<%= @model.singular_name %> )%>");
 <%% else %>
 	if( $('#<%= @model.plural_name %>_list').length > 0 ) {
 		$.fancybox.close(true);

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

@@ -49,12 +49,12 @@ module Mdwa
           model = entity.generator_model
           
           puts '--------------------------------------'
-          puts "- Code for: #{entity.name} -"
+          puts "- Templates for: #{entity.name} -"
           puts '--------------------------------------'
         
-          copy_with_header 'scaffold/controller.rb', "#{MDWA::DSL::TEMPLATES_PATH}#{entity.file_name}/#{model.space + '/'}controller.rb", entity.name
-          copy_with_header 'scaffold/helper.rb', "#{MDWA::DSL::TEMPLATES_PATH}#{entity.file_name}/#{model.space + '/'}helper.rb", entity.name
-          copy_with_header 'scaffold/model.rb', "#{MDWA::DSL::TEMPLATES_PATH}#{entity.file_name}/#{model.space + '/'}model.rb", entity.name
+          copy_with_header 'scaffold/controller.erb', "#{MDWA::DSL::TEMPLATES_PATH}#{entity.file_name}/#{model.space + '/'}controller.erb", entity.name
+          copy_with_header 'scaffold/helper.erb', "#{MDWA::DSL::TEMPLATES_PATH}#{entity.file_name}/#{model.space + '/'}helper.erb", entity.name
+          copy_with_header 'scaffold/model.erb', "#{MDWA::DSL::TEMPLATES_PATH}#{entity.file_name}/#{model.space + '/'}model.erb", entity.name
           
           # views
           copy_with_header 'scaffold/views/_form_fields.html.erb', "#{MDWA::DSL::TEMPLATES_PATH}#{entity.file_name}/#{model.space + '/'}views/_form_fields.html.erb", entity.name
@@ -84,7 +84,7 @@ module Mdwa
 
           model = entity.generator_model
 
-          path_to_controller  = "#{MDWA::DSL::TEMPLATES_PATH}#{entity.file_name}/#{model.space + '/'}controller.rb"
+          path_to_controller  = "#{MDWA::DSL::TEMPLATES_PATH}#{entity.file_name}/#{model.space + '/'}controller.erb"
           controller_string   = File.read("#{Rails.root}/#{path_to_controller}")
 
           # hooks for code generations

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

@@ -49,9 +49,9 @@ module Mdwa
           namespaces = Dir.glob("#{Rails.root}/#{MDWA::DSL::TEMPLATES_PATH}#{entity.file_name}/*").select{|d| File.directory?(d) and File.basename(d) != 'views'}
           if !namespaces.count.zero?
             namespaces.each do |namespace|
-              mdwa_template "#{entity.file_name}/#{File.basename namespace}/model.rb", "app/models/#{File.basename namespace}/#{generator_model.singular_name}.rb"
-              mdwa_template "#{entity.file_name}/#{File.basename namespace}/helper.rb", "app/helpers/#{File.basename namespace}/#{generator_model.plural_name}_helper.rb"
-              mdwa_template "#{entity.file_name}/#{File.basename namespace}/controller.rb", "app/controllers/#{File.basename namespace}/#{generator_model.plural_name}_controller.rb"
+              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|
                 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}"
@@ -79,6 +79,18 @@ module Mdwa
         # clear routes file contents
         File.truncate(path_to_routes, 0)
         append_file path_to_routes, "def mdwa_router(router)\n\nend"
+
+        inject_into_file path_to_routes, :after => "def mdwa_router(router)\n" do
+  "\n# Software visualization
+    namespace :mdwa do
+      controller :requirements do
+        get 'requirements/index' => 'requirements#index', :as => 'requirements'
+        get 'requirements/:alias' => 'requirements#show', :as => 'requirement'
+      end
+      
+      root :to => 'requirements#index'
+    end"
+        end
         
         MDWA::DSL.entities.all.each do |entity|
           generator_model = entity.generator_model
@@ -86,11 +98,11 @@ module Mdwa
           # inject scaffold code
           inject_into_file path_to_routes, :after => "def mdwa_router(router)\n" do
             route_str = []
-            route_str << "\n\tnamespace :#{generator_model.space} do" if generator_model.namespace?
-            route_str << "\t\tcontroller :#{generator_model.plural_name} do"
-            route_str << "\t\tend"
-            route_str << "\t\tresources :#{generator_model.plural_name}"
-            route_str << "\tend\n" if generator_model.namespace?
+            route_str << "\n  namespace :#{generator_model.space} do" if generator_model.namespace?
+            route_str << "    controller :#{generator_model.plural_name} do"
+            route_str << "    end"
+            route_str << "    resources :#{generator_model.plural_name}"
+            route_str << "  end\n" if generator_model.namespace?
                 
             route_str.join "\n"
           end
@@ -108,7 +120,7 @@ module Mdwa
       
       def generate_locales
 
-        locales_file = 'config/locales/mdwa_model_specific.en.yml'
+        locales_file = 'config/locales/mdwa.specific.en.yml'
         locales_content = File.read(locales_file)
         # make sure the file exist
         create_file locales_file unless File.exist?(Rails.root + locales_file)
@@ -119,28 +131,40 @@ module Mdwa
             append_file locales_file, :after => "en:\n" do 
               lines = []
               lines <<  "  #{model.plural_name}:"
-              lines <<  "    create_success: \"#{model.singular_name.humanize} created.\""
-              lines <<  "    update_success: \"#{model.singular_name.humanize} updated.\""
-              lines <<  "    destroy_success: \"#{model.singular_name.humanize} destroyed.\""
-              lines <<  "    index_title: \"#{model.plural_name.humanize}\""
-              lines <<  "    show_title: \"#{model.singular_name.humanize}\""
-              lines <<  "    new_title: \"New #{model.singular_name.humanize}\""
-              lines <<  "    edit_title: \"Edit #{model.singular_name.humanize}\""
+              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 <<  "    index_#{attr.name}: \"#{attr.name.humanize}\""
-                lines <<  "    show_#{attr.name}: \"#{attr.name.humanize}\""
-                lines <<  "    edit_#{attr.name}: \"#{attr.name.humanize}\""
+                lines <<  "      #{attr.name}: \"#{attr.name.humanize}\""
               end
               model.associations.each do |assoc|
-                if assoc.belongs_to? or assoc.nested_one? or assoc.has_one?
-                  lines <<  "    index_#{assoc.model2.singular_name}: \"#{assoc.model2.singular_name.humanize}\""
-                  lines <<  "    show_#{assoc.model2.singular_name}: \"#{assoc.model2.singular_name.humanize}\""
-                  lines <<  "    edit_#{assoc.model2.singular_name}: \"#{assoc.model2.singular_name.humanize}\""
-                else
-                  lines <<  "    index_#{assoc.model2.singular_name}: \"#{assoc.model2.plural_name.humanize}\""
-                  lines <<  "    show_#{assoc.model2.singular_name}: \"#{assoc.model2.plural_name.humanize}\""
-                end
+                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")
             end
@@ -206,11 +230,20 @@ module Mdwa
             entity_attribute = entity.attributes[column.name]
             # model attribute exists, but not in entity -> was erased
             if entity_attribute.nil?
-              @changes << {:entity => entity, :type => 'remove_column', :column => column.name, :attr_type => column.type}
+              # atributo não é derivado de file, pode apagar na moral
+              if !column.name.ends_with?("_file_name") and !column.name.ends_with?("_content_type") and !column.name.ends_with?("_file_size") and !column.name.ends_with?("_updated_at") 
+                @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?
+              end
             # attribute exists in model and entity, but changed type
             elsif entity_attribute.type.to_sym != column.type.to_sym
               # ignores files, passwords and float, decimal, integer variations
-              next if entity_attribute.type.to_sym == :file or entity_attribute.type.to_sym == :password or ((column.type.to_sym == :integer or column.type.to_sym == :decimal) and entity_attribute.type.to_sym == :float)
+              next if entity_attribute.type.to_sym == :password or ((column.type.to_sym == :integer or column.type.to_sym == :decimal) and entity_attribute.type.to_sym == :float)
               @changes << {:entity => entity, :type => 'change_column', :column => column.name, :attr_type => entity_attribute.type, :from => column.type}
             end
           end
@@ -218,7 +251,15 @@ module Mdwa
           # new attributes
           # no column with that name -> column must be added
           entity.attributes.each do |key, attr|
-            if model_class.columns.select {|c| c.name == attr.name }.count.zero?
+            # se a entidade 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?
+              @changes << {:entity => entity, :type => 'add_column', :column => "#{attr.name}_file_size", :attr_type => 'integer'} if model_class.columns.select{|c| c.name == "#{attr.name}_file_size"}.count.zero?
+              @changes << {:entity => entity, :type => 'add_column', :column => "#{attr.name}_updated_at", :attr_type => 'datetime'} if model_class.columns.select{|c| c.name == "#{attr.name}_updated_at"}.count.zero?
+            
+            # nenhuma coluna com esse nome
+            elsif model_class.columns.select {|c| c.name == attr.name }.count.zero?
               @changes << {:entity => entity, :type => 'add_column', :column => attr.name, :attr_type => attr.type}
             end
           end
@@ -279,22 +320,29 @@ module Mdwa
           # create table
           migration_string << "\n\tdef self.up"
           migration_string << "\t\tcreate_table :#{generator_model.plural_name} do |t|"
-          generator_model.attributes.each do |attr|
-          	migration_string << "\t\t\tt.#{attr.migration_field} :#{attr.name}"
+          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
         	end
         	generator_model.associations.each do |assoc|
         	  if assoc.belongs_to? or assoc.nested_one?
           	  migration_string << "\t\t\tt.integer :#{assoc.model2.singular_name.foreign_key}"
         	  end
         	end
-          migration_string << "\t\t\tt.timestamps"
-          migration_string << "\t\tend"
+          migration_string << "\n\t\tt.timestamps"
+          migration_string << "\t\tend" # fim do create_table
         	generator_model.associations.each do |assoc|
             if assoc.belongs_to? or assoc.nested_one?
           	  migration_string << "\t\tadd_index :#{assoc.model1.plural_name}, :#{assoc.model2.singular_name.foreign_key}"
         	  end
       	  end
-          migration_string << "\n\tend"
+          migration_string << "\n\tend" # fim do self.up
 
           # drop table
           migration_string << "\n\tdef self.down"

data/lib/generators/mdwa/user_scaffold/templates/migrate.erb

@@ -0,0 +1,30 @@
+# -*- encoding : utf-8 -*-
+class Add<%= @model.attributes.collect{|a| a.name.camelize}.join('') %>ToUsers < ActiveRecord::Migration
+
+	def self.up
+		<%- @model.simple_attributes.each do |attr| -%>
+			<%- if !attr.type.to_sym == :file -%>
+				add_column :users, :<%= attr.name %>, :<%= attr.migration_field %>
+			<%- else -%>
+				add_column :users, :<%= attr.name %>_file_name, :string
+				add_column :users, :<%= attr.name %>_content_type, :string
+				add_column :users, :<%= attr.name %>_file_size, :integer
+				add_column :users, :<%= attr.name %>_updated_at, :datetime
+			<%- end -%>
+		<%- end -%>
+	end
+
+	def self.down 
+		<%- @model.simple_attributes.each do |attr| -%>
+			<%- if !attr.type.to_sym == :file -%>
+				remove_column :users, :<%= attr.name %>
+			<%- else -%>
+				remove_column :users, :<%= attr.name %>_file_name
+				remove_column :users, :<%= attr.name %>_content_type
+				remove_column :users, :<%= attr.name %>_file_size
+				remove_column :users, :<%= attr.name %>_updated_at
+			<%- end -%>
+		<%- end -%>
+	end
+
+end

data/lib/generators/mdwa/user_scaffold/user_scaffold_generator.rb

@@ -76,7 +76,7 @@ module Mdwa
             @model.add_attribute attr
           end
         end
-        migration_template 'migrate.rb', "db/migrate/add_#{@model.attributes.collect{|a| a.name}.join('_')}_to_users" unless @model.attributes.empty?
+        migration_template 'migrate.erb', "db/migrate/add_#{@model.attributes.collect{|a| a.name}.join('_')}_to_users" unless @model.attributes.empty?
       
         # include type in db:seed
         append_file 'db/seeds/site.rb' do

data/lib/mdwa/dsl/entity.rb

@@ -87,25 +87,14 @@ module MDWA
       
       #
       # Declares one attribute of the list using the block given.
-      def attribute(name, type, options = {})
-        if type.to_sym == :file
-          fields = ['_file_name','_content_type', '_file_size', '_updated_at']
-          fields.each do |f|
-            attr = EntityAttribute.new(self)
-            attr.name = "#{name}#{f}"
-            attr.type = :string
-            attr.raise_errors_if_invalid!
-            self.attributes[attr.name] = attr
-          end
-        else        
-          attr = EntityAttribute.new(self)
-          attr.name = name
-          attr.type = type
-          attr.default = options[:default] unless options[:default].blank?
-          attr.style = options[:style] unless options[:style].blank?
-          attr.raise_errors_if_invalid!
-          self.attributes[attr.name] = attr
-        end
+      def attribute(name, type, options = {})     
+        attr = EntityAttribute.new(self)
+        attr.name = name
+        attr.type = type
+        attr.default = options[:default] unless options[:default].blank?
+        attr.style = options[:style] unless options[:style].blank?
+        attr.raise_errors_if_invalid!
+        self.attributes[attr.name] = attr
       end
       
       #

data/lib/mdwa/dsl/requirement.rb

@@ -4,7 +4,7 @@ module MDWA
     
     class Requirement
       
-      attr_accessor :summary, :description, :alias, :users, :entities
+      attr_accessor :summary, :description, :alias, :users, :entities, :non_functional_description
       
       def initialize(summary = nil)
         self.summary  = summary
@@ -17,6 +17,10 @@ module MDWA
         @alias ||= self.summary.to_alias
       end
       
+      def non_functional?
+        !self.non_functional_description.blank?
+      end
+      
     end
     
   end # dsl

data/lib/mdwa/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module MDWA
-  VERSION = "3.0.20"
+  VERSION = "3.1.0"
 end

data/mdd.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "mdd"
   
-  s.add_dependency 'rails', '>= 3.1'
-  s.add_dependency 'jquery-rails', '>= 2.0'
+  s.add_dependency 'rails', '>= 3.2.11'
+  s.add_dependency 'jquery-rails', '>= 2.2.0'
   s.add_dependency 'devise', '>= 2.1'
   s.add_dependency 'cancan', '>= 1.6'
   s.add_dependency 'will_paginate', '>= 3.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mdd
 version: !ruby/object:Gem::Version
-  version: 3.0.20
+  version: 3.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-14 00:00:00.000000000 Z
+date: 2013-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 3.2.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 3.2.11
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -403,7 +403,7 @@ files:
 - lib/generators/mdwa/sandbox/templates/config/initializers/will_paginate.rb
 - lib/generators/mdwa/sandbox/templates/config/locales/devise.en.yml
 - lib/generators/mdwa/sandbox/templates/config/locales/mdwa.en.yml
-- lib/generators/mdwa/sandbox/templates/config/locales/mdwa_model_specific.en.yml
+- lib/generators/mdwa/sandbox/templates/config/locales/mdwa.specific.en.yml
 - lib/generators/mdwa/sandbox/templates/db/migrate/create_permissions.rb
 - lib/generators/mdwa/sandbox/templates/db/migrate/create_user_permissions.rb
 - lib/generators/mdwa/sandbox/templates/db/migrate/devise_create_users.rb
@@ -436,9 +436,9 @@ files:
 - lib/generators/mdwa/templates/templates/actions/view.js.erb
 - lib/generators/mdwa/templates/templates/actions/view.json.erb
 - lib/generators/mdwa/templates/templates/general/routes.rb
-- lib/generators/mdwa/templates/templates/scaffold/controller.rb
-- lib/generators/mdwa/templates/templates/scaffold/helper.rb
-- lib/generators/mdwa/templates/templates/scaffold/model.rb
+- lib/generators/mdwa/templates/templates/scaffold/controller.erb
+- lib/generators/mdwa/templates/templates/scaffold/helper.erb
+- lib/generators/mdwa/templates/templates/scaffold/model.erb
 - lib/generators/mdwa/templates/templates/scaffold/views/_form.html.erb
 - lib/generators/mdwa/templates/templates/scaffold/views/_form_fields.html.erb
 - lib/generators/mdwa/templates/templates/scaffold/views/_list.html.erb
@@ -458,7 +458,7 @@ files:
 - lib/generators/mdwa/user_scaffold/USAGE
 - lib/generators/mdwa/user_scaffold/templates/controllers/ajax_controller.rb
 - lib/generators/mdwa/user_scaffold/templates/controllers/controller.rb
-- lib/generators/mdwa/user_scaffold/templates/migrate.rb
+- lib/generators/mdwa/user_scaffold/templates/migrate.erb
 - lib/generators/mdwa/user_scaffold/templates/views/update.js.erb
 - lib/generators/mdwa/user_scaffold/user_scaffold_generator.rb
 - lib/mdd.rb

data/lib/generators/mdwa/user_scaffold/templates/migrate.rb

@@ -1,16 +0,0 @@
-# -*- encoding : utf-8 -*-
-class Add<%= @model.attributes.collect{|a| a.name.camelize}.join('') %>ToUsers < ActiveRecord::Migration
-
-	def self.up
-		<%- @model.simple_attributes.each do |attr| -%>
-			add_column :users, :<%= attr.name %>, :<%= attr.migration_field %>
-		<%- end -%>
-	end
-
-	def self.down 
-		<%- @model.simple_attributes.each do |attr| -%>
-			remove_column :users, :<%= attr.name %>
-		<%- end -%>
-	end
-
-end