mdd 3.0.6 → 3.0.7

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

@@ -0,0 +1,144 @@
+# -*- encoding : utf-8 -*-
+
+require 'rails/generators'
+require 'rails/generators/migration'
+
+require 'mdwa/dsl'
+
+module Mdwa
+  module Generators
+    class TemplatesGenerator < Rails::Generators::Base
+      
+      include Rails::Generators::Migration
+      
+      source_root File.expand_path("../templates", __FILE__)
+      
+      attr_accessor :entities
+      
+      #
+      # Constructor
+      # Require all entities to load the DSL of the application
+      def initialize(*args, &block)
+        super
+        
+        # include files with entities
+        # select entities that will be generated
+        inside Rails.root do
+          require_all MDWA::DSL::STRUCTURAL_PATH unless Dir.glob("#{MDWA::DSL::STRUCTURAL_PATH}/*.rb").count.zero?
+        end
+        @entities = MDWA::DSL.entities.all
+      end
+      
+      
+      def general_files
+        template 'general/routes.rb', "#{MDWA::DSL::TEMPLATES_PATH}routes.rb"
+      end
+      
+      def entities_scaffold
+        
+        @entities.each do |entity|
+          
+          model = entity.generator_model
+          
+          puts '--------------------------------------'
+          puts "- Code 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
+          
+          # 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
+          copy_with_header 'scaffold/views/_form.html.erb', "#{MDWA::DSL::TEMPLATES_PATH}#{entity.file_name}/#{model.space + '/'}views/_form.html.erb", entity.name
+          copy_with_header 'scaffold/views/_list.html.erb', "#{MDWA::DSL::TEMPLATES_PATH}#{entity.file_name}/#{model.space + '/'}views/_list.html.erb", entity.name
+          copy_with_header 'scaffold/views/create.js.erb', "#{MDWA::DSL::TEMPLATES_PATH}#{entity.file_name}/#{model.space + '/'}views/create.js.erb", entity.name
+          copy_with_header 'scaffold/views/destroy.js.erb', "#{MDWA::DSL::TEMPLATES_PATH}#{entity.file_name}/#{model.space + '/'}views/destroy.js.erb", entity.name
+          copy_with_header 'scaffold/views/edit.html.erb', "#{MDWA::DSL::TEMPLATES_PATH}#{entity.file_name}/#{model.space + '/'}views/edit.html.erb", entity.name
+          copy_with_header 'scaffold/views/index.html.erb', "#{MDWA::DSL::TEMPLATES_PATH}#{entity.file_name}/#{model.space + '/'}views/index.html.erb", entity.name
+          copy_with_header 'scaffold/views/index.js.erb', "#{MDWA::DSL::TEMPLATES_PATH}#{entity.file_name}/#{model.space + '/'}views/index.js.erb", entity.name
+          copy_with_header 'scaffold/views/new.html.erb', "#{MDWA::DSL::TEMPLATES_PATH}#{entity.file_name}/#{model.space + '/'}views/new.html.erb", entity.name
+          copy_with_header 'scaffold/views/show.html.erb', "#{MDWA::DSL::TEMPLATES_PATH}#{entity.file_name}/#{model.space + '/'}views/show.html.erb", entity.name
+          copy_with_header 'scaffold/views/update.js.erb', "#{MDWA::DSL::TEMPLATES_PATH}#{entity.file_name}/#{model.space + '/'}views/update.js.erb", entity.name
+        end
+      end
+        
+        
+      def entity_actions
+        
+        puts '--------------------------------------'
+        puts "- Generating actions -"
+        puts '--------------------------------------'
+        
+        @entities.each do |entity|
+          # next iteration if entity doesn't have specifications
+          next if entity.actions.actions.count.zero?
+
+          model = entity.generator_model
+
+          path_to_controller  = "#{MDWA::DSL::TEMPLATES_PATH}#{entity.file_name}/#{model.space + '/'}controller.rb"
+          controller_string   = File.read("#{Rails.root}/#{path_to_controller}")
+
+          # hooks for code generations
+          controller_hook = '#===controller_init==='
+          test_hook = '#===test_init==='
+
+          # insert in controller
+          insert_into_file path_to_controller, :after => controller_hook do 
+            actions = []
+            entity.actions.generate_controller.each do |action_name, generation_string|
+              # write the generated code only if it is not declared in the controller
+              actions << "\n\n#{generation_string}" unless controller_string.include? "def #{action_name}"
+            end
+            actions.join
+          end
+          
+          # generate the corresponding files
+          entity.actions.actions.values.select{ |a| !a.resource? }.each do |action|
+            action.template_names.each do |request, file_name|          
+              case request.to_sym
+              when :modalbox, :html
+                copy_with_header 'actions/view.html.erb', "#{MDWA::DSL::TEMPLATES_PATH}#{entity.file_name}/#{model.space + '/'}views/#{file_name}", entity unless File.exist?("#{MDWA::DSL::TEMPLATES_PATH}#{entity.file_name}/views/#{file_name}")
+              when :ajax
+                copy_with_header 'actions/view.js.erb', "#{MDWA::DSL::TEMPLATES_PATH}#{entity.file_name}/#{model.space + '/'}views/#{file_name}", entity unless File.exist?("#{MDWA::DSL::TEMPLATES_PATH}#{entity.file_name}/views/#{file_name}")
+              when :ajax_js
+                copy_with_header 'actions/view.json.erb', "#{MDWA::DSL::TEMPLATES_PATH}#{entity.file_name}/#{model.space + '/'}views/#{file_name}", entity unless File.exist?("#{MDWA::DSL::TEMPLATES_PATH}#{entity.file_name}/views/#{file_name}")
+              else
+                copy_with_header 'actions/view.custom.erb', "#{MDWA::DSL::TEMPLATES_PATH}#{entity.file_name}/#{model.space + '/'}views/#{file_name}", entity unless File.exist?("#{MDWA::DSL::TEMPLATES_PATH}#{entity.file_name}/views/#{file_name}")
+              end
+            end
+          end
+
+          # inject routes testing
+          # if File.exist?(Rails.root + "/spec/routing/#{model.space}/#{model.plural_name}_routing_spec.rb")
+          #   insert_into_file "spec/routing/#{model.space}/#{model.plural_name}_routing_spec.rb", :after => 'describe "routing" do' do
+          #     routes = []
+          #     entity.actions.actions.values.select {|a| !a.resource}.each do |action|
+          #       routes << "\n\n\t\tit 'routes to ##{action.name}' do"
+          #       routes << "\n\t\t\t#{action.method.to_s}('#{action.entity.generator_model.to_route_url}/#{'1/' if action.member?}#{action.name}').should route_to('#{action.entity.generator_model.to_route_url}##{action.name}' #{', :id => "1"' if action.member?})"
+          #       routes << "\n\t\tend"
+          #     end
+          #     routes.join
+          #   end
+          # end
+
+        end # @entities loop
+        
+      end
+      
+      def tests
+      end
+      
+      
+      private
+      
+        def copy_with_header(source, destination, entity)
+          if !File.exist?(Rails.root + destination) or options.force
+            copy_file source, destination
+            gsub_file destination, '===entity_code===', "<%- \n@entity = MDWA::DSL.entity('#{entity}') \n@model = @entity.generator_model \n-%>", {:verbose => false}
+          end
+        end
+      
+    end
+  end
+end

data/lib/generators/mdwa/transform/templates/changes_migration.rb

@@ -0,0 +1,16 @@
+# -*- encoding : utf-8 -*-
+class Alter<%= @entities.select{|e| e.resource?}.collect{|e| e.file_name.camelize}.join('') %><%= @random_migration_key %> < ActiveRecord::Migration
+  
+  def self.up
+  <%- @changes.each do |change| -%>
+    <%= change[:type] %> :<%= MDWA::Generators::Model.new(change[:entity].model_name).plural_name %>, :<%= change[:column] %> <%= ", :#{change[:attr_type]}" unless change[:attr_type].blank? or change[:type] == 'remove_column' %>
+  <%- end -%>
+  end
+  
+  def self.down
+  <%- @changes.each do |change| -%>
+    <%= inverse_migration_type change[:type] %> :<%= MDWA::Generators::Model.new(change[:entity].model_name).plural_name %>, :<%= change[:column] %> <%= ", :#{change[:attr_type]}" if inverse_migration_type(change[:type]) == 'add_column' %> <%= ", :#{change[:from]}" unless change[:from].blank? %>
+  <%- end -%>
+  end
+  
+end

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

@@ -1,102 +1,241 @@
 require 'erb'
 require 'mdwa/dsl'
 
+require 'rails/generators'
+require 'rails/generators/migration'
+
+
 module Mdwa
   module Generators
    
     class TransformGenerator < Rails::Generators::Base
       
+      include Rails::Generators::Migration
+      
+      attr_accessor :pending_migrations
+      
+      argument :entities, :type => :array, :banner => 'Entities to transform', :default => []
+      
+      source_root File.expand_path("../templates", __FILE__)
+      
       def initialize(*args, &block)
         super
         
+        # control if there are any migrations to execute
+        @pending_migrations = false
+        
         # include files with entities
-        # select entities that will be generated
         inside Rails.root do
           require_all MDWA::DSL::STRUCTURAL_PATH unless Dir.glob("#{MDWA::DSL::STRUCTURAL_PATH}/*.rb").count.zero?
         end
-        @entities = MDWA::DSL.entities.all
-        
-      end
-      
-      def generate_model
-        @project_entity = MDWA::DSL.entity('Project')
-        generator_model = @project_entity.generator_model
-        
-        mdwa_template "#{@project_entity.file_name}/model.rb", "app/models/#{generator_model.space}/#{generator_model.singular_name}.rb"
-      end
-      
-      def generate_controller
-        @project_entity = MDWA::DSL.entity('Project')
-        generator_model = @project_entity.generator_model
+        # select entities that will be generated
+        if entities.count.zero?
+          @entities = MDWA::DSL.entities.all 
+        else
+          @entities = entities.collect{ |e| MDWA::DSL.entity(e) }
+        end
         
-        mdwa_template "#{@project_entity.file_name}/controller.rb", "app/controllers/#{generator_model.space}/#{generator_model.plural_name}_controller.rb"
+        # entity changes and migrations
+        @changes = []
+        @random_migration_key = rand.to_s.gsub('.','').to_i
       end
       
-      def generate_views
-        @project_entity = MDWA::DSL.entity('Project')
-        generator_model = @project_entity.generator_model
+      def generate_model_controller_helper_views
+        @entities.each do |entity|
+          generator_model = entity.generator_model
+          mdwa_template "#{entity.file_name}/model.rb", "app/models/#{generator_model.space}/#{generator_model.singular_name}.rb"
+          mdwa_template "#{entity.file_name}/helper.rb", "app/controllers/#{generator_model.space}/#{generator_model.plural_name}_helper.rb"
+          mdwa_template "#{entity.file_name}/controller.rb", "app/controllers/#{generator_model.space}/#{generator_model.plural_name}_controller.rb"
 
-        mdwa_template "#{@project_entity.file_name}/views/edit.html.erb", "app/views/#{generator_model.space}/#{generator_model.plural_name}/edit.html.erb"        
-        mdwa_template "#{@project_entity.file_name}/views/index.html.erb", "app/views/#{generator_model.space}/#{generator_model.plural_name}/index.html.erb"
-        mdwa_template "#{@project_entity.file_name}/views/index.js.erb", "app/views/#{generator_model.space}/#{generator_model.plural_name}/index.js.erb"
-        mdwa_template "#{@project_entity.file_name}/views/new.html.erb", "app/views/#{generator_model.space}/#{generator_model.plural_name}/new.html.erb"
-        mdwa_template "#{@project_entity.file_name}/views/show.html.erb", "app/views/#{generator_model.space}/#{generator_model.plural_name}/show.html.erb"
-        mdwa_template "#{@project_entity.file_name}/views/_form.html.erb", "app/views/#{generator_model.space}/#{generator_model.plural_name}/_form.html.erb"
-        mdwa_template "#{@project_entity.file_name}/views/_form_fields.html.erb", "app/views/#{generator_model.space}/#{generator_model.plural_name}/_form_fields.html.erb"
-        mdwa_template "#{@project_entity.file_name}/views/_list.html.erb", "app/views/#{generator_model.space}/#{generator_model.plural_name}/_#{generator_model.plural_name}.html.erb"
-        
-        if @project_entity.ajax?
-          mdwa_template "#{@project_entity.file_name}/views/create.js.erb", "app/views/#{generator_model.space}/#{generator_model.plural_name}/create.js.erb"
-          mdwa_template "#{@project_entity.file_name}/views/update.js.erb", "app/views/#{generator_model.space}/#{generator_model.plural_name}/update.js.erb"
-          mdwa_template "#{@project_entity.file_name}/views/destroy.js.erb", "app/views/#{generator_model.space}/#{generator_model.plural_name}/destroy.js.erb"
+          Dir.glob("#{Rails.root}/#{MDWA::DSL::TEMPLATES_PATH}#{entity.file_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
       
       def generate_routes
-        @project_entity = MDWA::DSL.entity('Project')
-        generator_model = @project_entity.generator_model
         
         route 'mdwa_router(self)'
-        append_to_file 'config/routes.rb', "require File.expand_path('../../app/mdwa/templates/routes.rb', __FILE__)"
+        path_to_routes = 'app/mdwa/templates/routes.rb'
+        insert_into_file 'config/routes.rb', "load File.expand_path('../../#{path_to_routes}', __FILE__)\n\n", :before => /.+::Application\.routes\.draw do(?:\s*\|map\|)?\s*$/
+        
+        # clear routes file contents
+        File.truncate(path_to_routes, 0)
+        append_file path_to_routes, "def mdwa_router(router)\n\nend"
         
-        insert_into_file path_to_routes, :after => "controller :#{generator_model.plural_name} do" do
-          routes = []
-          @project_entity.actions.generate_routes.each do |action_name, generation_string|
-            routes << "\n\t\t\t#{generation_string}"
+        @entities.each do |entity|
+          generator_model = entity.generator_model
+          
+          # 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.join "\n"
+          end
+        
+          # inject specific actions
+          inject_into_file path_to_routes, :after => "controller :#{generator_model.plural_name} do" do
+            routes = []
+            entity.actions.generate_routes.each do |action_name, generation_string|
+              routes << "\n\t#{generation_string}"
+            end
+            routes.join
           end
-          routes.join
         end
       end
       
       def generate_locales
+
+        locales_file = 'config/locales/mdwa_model_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)
+        
+        @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 <<  "    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}\""
+              model.attributes.each do |attr|
+                lines <<  "    index_#{attr.name}: \"#{attr.name.humanize}\""
+                lines <<  "    show_#{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}\""
+                else
+                  lines <<  "    index_#{assoc.model2.singular_name}: \"#{assoc.model2.plural_name.humanize}\""
+                  lines <<  "    show_#{assoc.model2.singular_name}: \"#{assoc.model2.plural_name.humanize}\""
+                end
+              end
+              lines << "\n"
+              lines.join("\n")
+            end
+          end
+          
+        end # @entities loop
+
       end
       
-      def generate_migration
-        @project_entity = MDWA::DSL.entity('Project')
-        generator_model = @project_entity.generator_model
-        
-        migration_string = []
-        # create table
-        migration_string << "\n\tdef self.up"
-        migration_string << "\t\tcreate_table :#{generator_model.plural_name} do |t|"
-        generator_model.simple_attributes.each do |attr|
-        	migration_string << "\t\t\tt.#{attr.migration_field} :#{attr.name}"
-      	end
-        migration_string << "\t\t\tt.timestamps"
-        migration_string << "\t\tend\n\tend"
-
-        # drop table
-        migration_string << "\n\tdef self.down"
-        migration_string << "\t\tdrop_table :#{generator_model.plural_name}"
-        migration_string << "\tend"
+      def generate_migrations
+        
+        @entities.each do |entity|
+          # if it's not a resource, ignore
+          next unless entity.resource?
+        
+          # if model does not exist, should generate scaffold
+          begin
+            model_class = entity.generator_model.model_class
+          rescue
+            model_class = nil
+          end
+          
+          # if is a new scaffold, generate migration for scaffold
+          if (model_class.nil? or !model_class.table_exists?) and !entity.user?
+            migration_for_entity(entity) 
+            next
+          end
+          
+          # generate new fields for users
+          if entity.user?
+            generation_string = "#{entity.generate} --only_diff_migration --skip_rake_migrate --skip-questions #{'--force' if options.force}"
+            generate generation_string
+          end
+          
+        end # @entities loop
+      end
+      
+      
+      def generate_changes_in_attributes
         
-        migration_name = "create_#{generator_model.plural_name}"
-        migration_from_string(migration_name, migration_string.join("\n"))
+        @entities.each do |entity|
+          # do not generate migrations for users changes
+          next if entity.user?
+          # if it's not a resource, ignore
+          next unless entity.resource?
+          
+          # if model does not exist, should generate scaffold
+          begin
+            model_class = entity.generator_model.model_class
+          rescue
+            model_class = nil
+          end
+          
+          # if table is not created yet, ignore
+          next unless model_class.table_exists?
+          
+          # search for changes in this entity
+          model_class.columns.each do |column|
+            
+            # ignore rails default columns and attributes used in associations
+            next if column.name == 'id' or column.name == 'created_at' or column.name == 'updated_at' or column.name.end_with? '_id'
+            
+            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}
+            # attribute exists in model and entity, but changed type
+            elsif entity_attribute.type.to_sym != column.type.to_sym
+              next if entity_attribute.type.to_sym == :file or entity_attribute.type.to_sym == :password
+              @changes << {:entity => entity, :type => 'change_column', :column => column.name, :attr_type => entity_attribute.type, :from => column.type}
+            end
+          end
+          
+          # 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?
+              @changes << {:entity => entity, :type => 'add_column', :column => attr.name, :attr_type => attr.type}
+            end
+          end
+          
+          # new foreign keys
+          # belongs_to and nested_one associations that are in the entity, but not database
+          entity.generator_model.associations.select{|a| a.belongs_to? or a.nested_one?}.each do |assoc|
+            if model_class.columns.select{|c| c.name == assoc.model2.singular_name.foreign_key}.count.zero?
+              @changes << {:entity => entity, :type => 'add_column', :column => assoc.model2.name.foreign_key, :attr_type => 'integer'}
+            end
+          end
+          
+        end # @entities loop
         
-        rake('db:migrate') if yes?('Run rake db:migrate')
+        # generate changed code
+        unless @changes.empty?
+          migration_template 'changes_migration.rb', "db/migrate/alter_#{@entities.select{|e| e.resource?}.collect{|e| e.file_name}.join('_')}#{@random_migration_key}.rb"
+          @pending_migrations = true
+        end
         
       end
       
+      # 
+      # Search for many to many tables.
+      def many_to_many_tables
+        @entities.each do |entity|
+          entity.generator_model.associations.select{|a| a.has_and_belongs_to_many?}.each do |association|
+            generate "mdwa:association #{association.model1.singular_name} has_and_belongs_to_many #{association.model2.singular_name} --skip-models"
+          end
+        end
+      end
+      
+      def run_rake_migrate
+        rake('db:migrate') if @pending_migrations and yes?('Run rake db:migrate')
+      end
+      
       def generate_tests
       end
       
@@ -109,6 +248,47 @@ module Mdwa
           create_file "#{Rails.root}/#{file_to_write}", erb.result, :force => true
         end
         
+        
+        def migration_for_entity(entity)
+          # ignores user
+          return nil if entity.user?
+
+          generator_model = entity.generator_model
+
+          migration_string = []
+          # 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}"
+        	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"
+        	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"
+
+          # drop table
+          migration_string << "\n\tdef self.down"
+          migration_string << "\t\tdrop_table :#{generator_model.plural_name}"
+          migration_string << "\tend"
+
+          migration_name = "create_#{generator_model.plural_name}"
+          migration_from_string(migration_name, migration_string.join("\n"))
+
+          sleep 1 # aguarda 1 seg para trocar o timestamp
+          
+          @pending_migrations = true
+        end
+        
         def migration_from_string(file_name, migration_string)
           
           # migration number
@@ -123,6 +303,23 @@ module Mdwa
           create_file "#{Rails.root}/db/migrate/#{@migration_number}_#{file_name}.rb", migration_string
           
         end
+        
+        def inverse_migration_type(type)
+          case type.to_sym
+          when :add_column      then 'remove_column'
+          when :remove_column   then 'add_column'
+          when :change_column   then 'change_column'
+          end
+        end
+        
+        # Implement the required interface for Rails::Generators::Migration.
+        def self.next_migration_number(dirname) #:nodoc:
+          if ActiveRecord::Base.timestamped_migrations
+            Time.now.utc.strftime("%Y%m%d%H%M%S")
+          else
+            "%.3d" % (current_migration_number(dirname) + 1)
+          end
+        end
       
     end
     

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

@@ -24,6 +24,7 @@ module Mdwa
       class_option :skip_questions, :desc => 'Answer no for all questions by default.', :type => :boolean, :default => false
       class_option :skip_interface, :desc => 'Cretes only models, migrations and associations.', :type => :boolean, :default => false
       class_option :only_interface, :desc => 'Skips models, associations and migrations.', :type => :boolean, :default => false
+      class_option :only_diff_migration, :desc => 'Generates only the migration for fields addition.', :type => :boolean, :default => false
 
       def initialize(*args, &block)
 
@@ -54,22 +55,30 @@ module Mdwa
           @model.add_attribute MDWA::Generators::ModelAttribute.new( attribute ) unless User.accessible_attributes.to_a.include?( attribute.split(':').first )
         end
         
-        generate "mdwa:scaffold #{scaffold_name} name:string email:string password:password password_confirmation:password #{@model.attributes.collect{|a| a.raw}.join(' ')} #{'--force' if options.force} #{'--ajax' if options.ajax} #{"model=#{options.model}" if options.model} #{'--skip_interface' if options.skip_interface} #{'--only_interface' if options.only_interface} #{'--skip_rake_migrate' if options.skip_rake_migrate} #{'--skip_timestamp' if options.skip_timestamp} #{'--skip_questions' if options.skip_questions} --skip-migrations"
+        unless options.only_diff_migration
+          generate "mdwa:scaffold #{scaffold_name} name:string email:string password:password password_confirmation:password #{@model.attributes.collect{|a| a.raw}.join(' ')} #{'--force' if options.force} #{'--ajax' if options.ajax} #{"model=#{options.model}" if options.model} #{'--skip_interface' if options.skip_interface} #{'--only_interface' if options.only_interface} #{'--skip_rake_migrate' if options.skip_rake_migrate} #{'--skip_timestamp' if options.skip_timestamp} #{'--skip_questions' if options.skip_questions} --skip-migrations"
+        end
 
       end
 
       def controller_and_view
-         unless options.skip_interface
-           # controllers
-           @inherit_controller = 'A::BackendController' if @model.space == 'a'
-           template "controllers/#{'ajax_' if options.ajax}controller.rb", "app/controllers/#{@model.space}/#{@model.plural_name}_controller.rb"
-         
-           # views - update only 
-           template 'views/update.js.erb', "app/views/#{@model.space}/#{@model.plural_name}/update.js.erb"
-         end
+        
+        return nil if options.only_diff_migration
+        return nil if options.skip_interface
+        
+        # controllers
+        @inherit_controller = 'A::BackendController' if @model.space == 'a'
+        template "controllers/#{'ajax_' if options.ajax}controller.rb", "app/controllers/#{@model.space}/#{@model.plural_name}_controller.rb"
+
+        # views - update only 
+        template 'views/update.js.erb', "app/views/#{@model.space}/#{@model.plural_name}/update.js.erb"
+        
        end
      
        def model_override
+         
+        return nil if options.only_diff_migration
+       
          # locate the mdwa user to discover the roles
          require_all "#{MDWA::DSL::USERS_PATH}#{@model.singular_name}.rb"
          @mdwa_user = MDWA::DSL.user(@model.name)
@@ -78,10 +87,11 @@ module Mdwa
          else
            @roles = @mdwa_user.user_roles
          end
-       
+     
          # model override
-         gsub_file "app/models/#{@model.space}/#{@model.singular_name}.rb", 'ActiveRecord::Base', 'User'
-         inject_into_class "app/models/#{@model.space}/#{@model.singular_name}.rb", @model.model_class do 
+         model_path = (@model.specific?) ? "app/models/#{@model.specific_model.space}/#{@model.specific_model.singular_name}.rb" : "app/models/#{@model.space}/#{@model.singular_name}.rb"
+         gsub_file model_path, 'ActiveRecord::Base', 'User'
+         inject_into_class model_path, @model.model_class do 
            inj = []
            @roles.each do |role|
              inj << "\n\n\tafter_create :create_#{role.underscore}_permission\n"
@@ -93,6 +103,7 @@ module Mdwa
            end
            inj.join("\n")
          end
+           
        end
 
        def migration_override        
@@ -100,7 +111,14 @@ module Mdwa
          # override model attributes to not allow field duplicity (causing errors)
          @model.attributes = []
          attributes.each do |attribute|
-           @model.add_attribute MDWA::Generators::ModelAttribute.new( attribute ) unless @predefined_fields.include?( attribute.split(':').first )
+           attr = MDWA::Generators::ModelAttribute.new( attribute ) 
+           
+           # add to model attributes
+           # if it's not predefined in devise
+           # if it's a belongs_to or nested_one association
+           if (!attr.references? and !@predefined_fields.include?( attribute.split(':').first )) or attr.belongs_to? or attr.nested_one?
+             @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?
        
@@ -109,7 +127,7 @@ module Mdwa
            "\n\nPermission.create( :name => '#{@model.singular_name}' ) if Permission.find_by_name('#{@model.singular_name}').nil?"
          end
          # run rake db:seeds
-         if yes?('Run rake db:seed to create permission type?')
+         if !options.skip_questions and yes?('Run rake db:seed to create permission type?')
            rake 'db:migrate'
            rake 'db:seed' 
          end

data/lib/mdwa/dsl/action.rb

@@ -51,7 +51,16 @@ module MDWA
       end
       
       def generate_route
-        "#{self.method.to_s} '#{self.entity.name.underscore.pluralize}#{'/:id' if member?}/#{self.name.to_s}' => :#{self.name.to_sym}"
+        str = []
+        str << "#{self.method.to_s} "
+        str << "'#{self.entity.name.underscore.pluralize}"
+        str << '/:id' if member?
+        str << "/#{self.name.to_s}' "
+        str << "=> '#{self.entity.name.underscore.pluralize}##{self.name.to_sym}'"
+        str << ", :as => '"
+        str << "#{self.name.to_s}_#{member? ? self.entity.name.underscore.singularize : self.entity.name.underscore.pluralize}" # action_entity(s)
+        str << "'"
+        str.join
       end
       
       def generate_controller