mdd 2.0.1 → 2.0.2

data/lib/generators/mdd/association/USAGE

@@ -1,5 +1,6 @@
 Description:
 	Generate migrations and models based on ActiveRecord association types.
+	Use the model class name.
 
 Example:
 	rails g mdd:association Library has_many Books

data/lib/generators/mdd/association/association_generator.rb

@@ -21,6 +21,7 @@ module Mdd
 
       class_option :with_opposite, :desc => 'Generate the opposite relation too. For example, the oposite of belongs_to is has_many.', :type => :boolean, :default => false
       class_option :skip_rake_migrate, :desc => 'Skips rake db:migrate', :type => :boolean, :default => false
+      class_option :skip_migrations, :desc => 'Skips migration files', :type => :boolean, :default => false
       class_option :ask, :desc => 'Asks if the opposite should be generated.', :type => :boolean, :default => false
 
       def initialize(*args, &block)
@@ -38,26 +39,7 @@ module Mdd
         # active record generates join tables alphabetically
         @ordered_models = [@model1, @model2].sort! {|a,b| a.plural_name <=> b.plural_name}
       end
-
-
-      def migrate
-        @pending_migrations = true
-        case @relation.to_sym 
-        when :belongs_to, :nested_one
-          @table = @model1
-          @field = @model2
-          migration_template 'migrate/one_field.rb', "db/migrate/add_#{@field.singular_name.foreign_key}_to_#{@table.plural_name}.rb"
-        when :nested_many
-          @table = @model2
-          @field = @model1
-          migration_template 'migrate/one_field.rb', "db/migrate/add_#{@field.singular_name.foreign_key}_to_#{@table.plural_name}.rb"
-        when :has_and_belongs_to_many
-          migration_template 'migrate/many_to_many.rb', "db/migrate/create_#{many_to_many_table_name}.rb"
-        else
-          @pending_migrations = false
-        end
-
-      end
+      
 
       def model
         case @relation.to_sym 
@@ -97,6 +79,25 @@ module Mdd
         end
 
       end
+      
+      def migrate
+        unless options.skip_migrations
+          
+          @pending_migrations = true
+          case @relation.to_sym 
+          when :belongs_to, :nested_one
+            @table = @model1
+            @field = @model2
+            migration_template 'migrate/one_field.rb', "db/migrate/add_#{@field.singular_name.foreign_key}_to_#{@table.plural_name}.rb"
+          when :has_and_belongs_to_many
+            migration_template 'migrate/many_to_many.rb', "db/migrate/create_#{many_to_many_table_name}.rb"
+          else
+            @pending_migrations = false
+          end
+          
+        end
+
+      end
 
       def run_rake_db_migrate
         rake('db:migrate') if !options.skip_rake_migrate and @pending_migrations and yes? 'Run rake db:migrate?'

data/lib/generators/mdd/sandbox/templates/app/assets/javascripts/mdwa/login_manifest.js

@@ -1,4 +1,6 @@
 // Login screen javascript files
 //
 //= require jquery
-//= require jquery_ujs
+//= require jquery_ujs
+//= require_tree ../jquery
+//= require ./template/all_pages

data/lib/generators/mdd/sandbox/templates/app/assets/javascripts/mdwa/system_manifest.js

@@ -5,4 +5,5 @@
 //= require jquery
 //= require jquery_ujs
 //= require_tree ../jquery
+//= require jquery_nested_form
 //= require_tree ./template

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

@@ -13,7 +13,7 @@ $(function() {
 
 	// notices fadeout
 	$('a#system_notice_close, #system_notice').live('click', function() {
-		$('#system_notice').fadeOut();
+		$('#system_notice').remove();
 	});
 
 	// ajax forms cancel button closes modal window
@@ -46,5 +46,7 @@ function defineOrder( form, action, id ) {
 }
 
 function deleteSystemNotice() {
-	$('#system_notice').fadeOut('slow');
+	$('#system_notice').fadeOut('slow', function() {
+		$('#system_notice').remove();
+	});
 }

data/lib/generators/mdd/sandbox/templates/app/assets/stylesheets/mdwa/system_manifest.css

@@ -7,8 +7,7 @@
  *= require ./template/cssbase
  *= require ./template/template
  *= require ./template/grid
- *= require ./template/backend_base
+ *= require_tree ../jquery
  *= require ./template/backend
  *= require ./template/leftbar
- *= require_tree ../jquery
 */

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

@@ -83,7 +83,7 @@ div#logged_info {
 }
 
 div#logged_info a {
-	color: #fff;
+  color: #fff;
 }
 
 div#logged_info .welcome, div#logged_info .logout {
@@ -209,8 +209,8 @@ div.inside {
 }
 
 #leftbar ul li {
-	width: 100%;
-	border-bottom: 1px solid #4A4A4A;
+  width: 100%;
+  border-bottom: 1px solid #4A4A4A;
   border-top: 1px solid #858585;
   list-style-type: none;
   margin: 0;
@@ -235,16 +235,16 @@ div.inside {
 }
 
 #leftbar ul.submenu {
-	background: none repeat scroll 0 0 #555555;
+  background: none repeat scroll 0 0 #555555;
   box-shadow: 0 0 3px #333333 inset;
 }
 
 #leftbar ul.submenu li {
-	border:none;
+  border:none;
 }
 
 #leftbar ul.submenu li a:hover {
-	background: #5D5D5D !important
+  background: #5D5D5D !important
 }
 
 #leftbar ul li a span {
@@ -252,6 +252,6 @@ div.inside {
 }
 
 #leftbar ul.submenu li a span {
-	margin:0;
+  margin:0;
   padding-left: 25px;
 }

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

@@ -85,14 +85,12 @@ a.remove span {
 /* nested_forms buttons */
 a.add_nested_fields {
   background: url( <%= asset_path 'mdwa/icons/add.png' %>) no-repeat scroll 0 50% padding-box transparent;
-  padding: 0 0 0 19px;
+  padding: 0 0 0 20px;
 }
 
 a.remove_nested_fields {
   background: url(<%= asset_path 'mdwa/icons/remove-icon.png' %>) no-repeat scroll 0 50% padding-box transparent;
-  padding: 0 0 0 19px;
-  position: relative;
-  top: 20px;
+  padding: 0 0 0 20px;
 }
 
 /* Rails errors */

data/lib/generators/mdd/sandbox/templates/app/controllers/a/backend_controller.rb

@@ -3,7 +3,6 @@ class A::BackendController < ApplicationController
 	before_filter :authenticate_a_user!
 
 	check_authorization
-  	load_and_authorize_resource
 
 	def current_ability
 	  @current_ability ||= Ability.new(current_user)

data/lib/generators/mdd/scaffold/USAGE

@@ -5,12 +5,8 @@ Description:
     All list have pagination with will_paginate gem.
     Referenced models also have their relations configured in models and views.
 
-Restriction:
-	The database must be configured correctly as usual.
-	So, run rake db:create before start.
-
 Example:
-	It is equal to Rails scaffold if relations are not mentioned.
+	It behaves equally to Rails scaffold if relations are not mentioned.
 	The relations syntax:
 
     - rails generate mdd:scaffold Product name:string initial_date:date category_id:category:name:belongs
@@ -55,3 +51,17 @@ Example:
     		attr_accessible :name
     		has_one :product_price
     		...
+
+
+Restrictions:
+	1. The database must be configured correctly as usual.
+	So, run rake db:create before start.
+	
+	2. For associations, you can use the mdd:association generator. 
+	It generates several kinds of model relations.
+	Scaffold associations will fail for model associations with specific model names, for example:
+		rails g mdd:scaffold a/groups name:string --model=group
+		rails g mdd:scaffold a/projects name:string group:a/group:name:belongs_to
+	For that reason, you should use:
+		rails g mdd:scaffold a/projects name:string group:a/group,group:name:belongs_to
+		

data/lib/generators/mdd/scaffold/scaffold_generator.rb

@@ -7,13 +7,14 @@ module Mdd
 
       source_root File.expand_path('../templates', __FILE__)
 
-      attr_accessor :model, :create_nested_association
+      attr_accessor :model, :specific_model
       
       argument :scaffold_name, :type => :string, :banner => "[namespace]/Model"
       argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
 
+      class_option :model, :desc => 'Use if model is different than the scaffold name. Format: "[namespace]/Model"', :type => :string
       class_option :ajax, :desc => 'Generates modal forms and AJAX submits.', :type => :boolean, :default => false
-      class_option :skip_migration, :desc => 'Skips the generation of a new migration.', :type => :boolean, :default => false
+      class_option :skip_migrations, :desc => 'Skips the generation of a new migration.', :type => :boolean, :default => false
       class_option :skip_timestamp, :desc => 'Skip timestamp generator on migration files.', :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
@@ -22,11 +23,21 @@ module Mdd
 
         super
 
-        @model = Generators::Model.new( scaffold_name )
+        @model = Generators::Model.new( scaffold_name )        
 
         # model_name is not valid
         print_usage unless @model.valid?
 
+        # verifies specific model name
+        @specific_model = Generators::Model.new( options.model ) unless options.model.blank?
+        if !@specific_model.nil?
+          if !@specific_model.valid?
+            print_usage 
+          else
+            @model.specific_model_name = @specific_model.raw
+          end
+        end
+
         # sets the model attributes
         attributes.each do |attribute|
           @model.add_attribute Generators::ModelAttribute.new( attribute )
@@ -43,8 +54,9 @@ module Mdd
 
       def model
         unless options.only_interface
-          template 'models/module.rb', "app/models/#{@model.space}.rb" if @model.namespace?
-          template 'models/model.rb', "app/models/#{@model.space}/#{@model.singular_name}.rb"
+          model = @model.specific_model || @model
+          template 'models/module.rb', "app/models/#{model.space}.rb" if model.namespace?
+          template 'models/model.rb', "app/models/#{model.space}/#{model.singular_name}.rb"
         end
       end
 
@@ -76,25 +88,21 @@ module Mdd
       end
 
       def migration
-        unless options.skip_migration or options.only_interface
+        unless options.skip_migrations or options.only_interface
           migration_template 'db_migrate/migrate.rb', "db/migrate/create_#{@model.plural_name}.rb"
         end
       end
 
       def associations
-        unless options.skip_migration or options.only_interface
+        unless options.only_interface
           @model.attributes.select{ |a| a.references? }.each do |attr|
-              # if attr.belongs_to? or attr.nested_one? or attr.has_one?
-                generate "mdd:association #{@model.raw} #{attr.reference_type} #{attr.type.raw} #{'--force' if options.force} --skip_rake_migrate --ask"
-              # else
-              #   generate "mdd:association #{attr.type.raw} #{attr.reference_type} #{@model.raw} #{'--force' if options.force} --skip_rake_migrate --ask"
-              # end
+              generate "mdd:association #{@model.raw} #{attr.reference_type} #{attr.type.raw} #{'--skip_migrations' if options.skip_migrations} #{'--force' if options.force} --skip_rake_migrate --ask"
           end
         end
       end
 
       def run_rake_db_migrate
-        unless options.skip_migration or options.only_interface
+        unless options.skip_migrations or options.only_interface
           rake('db:migrate') if yes? 'Run rake db:migrate?'
         end
       end

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

@@ -1,4 +1,6 @@
 class <%= @model.controller_name %>Controller < <%= @inherit_controller || 'ApplicationController' %>
+  
+  load_and_authorize_resource :class => "<%= @model.klass %>"
 
 	def index
 		@<%= @model.plural_name %> = <%= @model.klass %>.paginate :page => params[:page]
@@ -17,16 +19,19 @@ class <%= @model.controller_name %>Controller < <%= @inherit_controller || 'Appl
 
 	def new
 	    @<%= @model.singular_name %> = <%= @model.klass %>.new
-		render :layout => false
+	    <%- @model.attributes.select {|a| a.nested_one?}.each do |attr| -%>
+	    @<%= @model.singular_name %>.<%= attr.type.singular_name %> = <%= attr.type.klass %>.new
+	    <%- end -%>
+		  render :layout => false
 	end
 
 	def edit
 	    @<%= @model.singular_name %> = <%= @model.klass %>.find(params[:id])
-		render :layout => false
+		  render :layout => false
 	end
 
 	def create
-	    @<%= @model.singular_name %> = <%= @model.klass %>.new(params[:<%= @model.object_name %>])
+	    @<%= @model.singular_name %> = <%= @model.klass %>.new(params[:<%= @model.to_params %>])
 	    @system_notice = t('<%= @model.plural_name %>.create_success') if @<%= @model.singular_name %>.save
 	    # loads all <%= @model.plural_name %> to display in the list
 	    load_list
@@ -38,7 +43,7 @@ class <%= @model.controller_name %>Controller < <%= @inherit_controller || 'Appl
 
 	def update
 	    @<%= @model.singular_name %> = <%= @model.klass %>.find(params[:id])
-	    @system_notice = t('<%= @model.plural_name %>.update_success') if @<%= @model.singular_name %>.update_attributes(params[:<%= @model.object_name %>])
+	    @system_notice = t('<%= @model.plural_name %>.update_success') if @<%= @model.singular_name %>.update_attributes(params[:<%= @model.to_params %>])
 	    
 	    # loads all <%= @model.plural_name %> to display in the list
 	    load_list

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

@@ -1,7 +1,9 @@
 class <%= @model.controller_name %>Controller < <%= @inherit_controller || 'ApplicationController' %>
+  
+  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]
 
 	    respond_to do |format|
 	      format.html
@@ -20,9 +22,9 @@ class <%= @model.controller_name %>Controller < <%= @inherit_controller || 'Appl
 
 	def new
 	    @<%= @model.singular_name %> = <%= @model.klass %>.new
-	    <%- @model.attributes.select {|a| a.nested_one?}.each do |attr| %>
+	    <%- @model.attributes.select {|a| a.nested_one?}.each do |attr| -%>
 	    @<%= @model.singular_name %>.<%= attr.type.singular_name %> = <%= attr.type.klass %>.new
-	    <%- end %>
+	    <%- end -%>
 
 	    respond_to do |format|
 	      format.html

data/lib/generators/mdd/scaffold/templates/db_migrate/migrate.rb

@@ -2,11 +2,12 @@ class Create<%= @model.plural_name.camelize %> < ActiveRecord::Migration
 
 	def self.up
 		create_table :<%= @model.plural_name %> do |t|
-		<%- @model.simple_attributes.each do |attr| %>
-			t.<%= attr.migration_field %> :<%= attr.name %><%- end %>
-		<%- unless options.skip_timestamp %>
+		<%- @model.simple_attributes.each do |attr| -%>
+			t.<%= attr.migration_field %> :<%= attr.name %>
+		<%- end -%>
+		<%- unless options.skip_timestamps -%>
 			t.timestamps 
-		<%- end %>
+		<%- end -%>
 		end
 	end
 

data/lib/generators/mdd/scaffold/templates/views/_form.html.erb

@@ -1,4 +1,4 @@
-<%%= <%= 'nested_' unless @model.attributes.select{|a| a.nested_many?}.count.zero? %>form_for(@<%= @model.singular_name %><%= ', :remote => true, :html => {:class => :mdwa_ajax}' if options.ajax %>) do |f| %>
+<%%= <%= 'nested_' unless @model.attributes.select{|a| a.nested_many?}.count.zero? %>form_for(<%= @model.to_route_object('@') %><%= ', :remote => true, :html => {:class => :mdwa_ajax}' if options.ajax %>) do |f| %>
 
 	<div id="mdwa_error">
 	   	<%%= render '/template/mdwa/crud_error', :object => @<%= @model.singular_name %> %>
@@ -11,10 +11,11 @@
 	</div>
 
 	<div class="actions">
-		<%- if !options.ajax %>
-		<%%= link_to t('system.cancel_button'), <%= @model.object_name.pluralize %>_path, :class => :cancel %> <%- else %>
-		<%%= link_to t('system.cancel_button'), '#', :class => :cancel %> <%- end %>
-	    
+		<%- if !options.ajax -%>
+		<%%= link_to t('system.cancel_button'), <%= @model.object_name.pluralize %>_path, :class => :cancel %> 
+		<%- else -%>
+		<%%= link_to t('system.cancel_button'), '#', :class => :cancel %> 
+		<%- end -%>
 	    <%%= f.submit :class => :button %>
 	</div>
 

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

@@ -1,27 +1,30 @@
-<%- @model.attributes.each do |attr| %>
-	<%- unless attr.references? %>
-	<div class="field">
-    	<%%= f.label :<%= attr.name %> %> 
-    	<%%= f.<%= attr.form_field %> :<%= attr.name %> %>
-  	</div>
-	<%- end %>
-	<%- if attr.belongs_to? %>
-	<div class="field">
-		<%%= f.label :<%= attr.name %> %> 
-		<%%= f.select :<%= attr.name %>, 
-			  options_for_select( <%= attr.type.klass %>.order('<%= attr.reference %> ASC').collect{ |c| [c.<%= attr.reference %>, c.id] }, f.object.<%= attr.name %> ), 
-				:prompt => '-- Select --' %>
-	</div>
-	<%- end %>
-	<%- if attr.nested? %>
-		<div class="nested">
-		<%%= f.fields_for :<%= (attr.nested_many?) ? attr.type.plural_name : attr.type.singular_name %> do |ff| %>
-			<%%= render '<%= attr.type.space %>/<%= attr.type.plural_name %>/form_fields', :f => ff %>
-			<%- unless attr.nested_one? %><%%= ff.link_to_remove t('nested.remove') %><%- end %>
-		<%% end %>
-		<%- unless attr.nested_one? %>
-		<%%= f.link_to_add t('nested.add', :name => '<%= attr.type.singular_name %>'), :<%= attr.type.plural_name %> %>
-		<%- end %>
-		</div>
-	<%- end %>
-<%- end %>
+<%- @model.attributes.each do |attr| -%>
+<%- unless attr.references? -%>
+<div class="field">
+   	<%%= f.label :<%= attr.name %> %> 
+   	<%%= f.<%= attr.form_field %> :<%= attr.name %> %>
+</div>
+<%- end # unless -%>
+<%- if attr.belongs_to? -%>
+<div class="field">
+	<%%= f.label :<%= attr.name %> %> 
+	<%%= f.select :<%= attr.name %>, 
+		  options_for_select( <%= attr.type.klass %>.order('<%= attr.reference %> ASC').collect{ |c| [c.<%= attr.reference %>, c.id] }, f.object.<%= attr.name %> ), 
+			:prompt => '-- Select --' %>
+</div>
+<%- end # if -%>
+<%- if attr.nested? -%>
+<div class="nested">
+	<%%= f.fields_for :<%= (attr.nested_many?) ? attr.type.plural_name : attr.type.singular_name %> do |ff| %>
+		<%%= render '<%= attr.type.space %>/<%= attr.type.plural_name %>/form_fields', :f => ff %>
+	<%- unless attr.nested_one? -%>
+		<%%= ff.link_to_remove t('nested.remove') %>
+	<%- end -%>
+	
+	<%% end %>
+	<%- unless attr.nested_one? -%>
+	<%%= f.link_to_add t('nested.add', :name => '<%= attr.type.singular_name %>'), :<%= attr.type.plural_name %> %>
+	<%- end -%>
+</div>
+<%- end # if -%>
+<%- end # model.attributes.each -%>

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

@@ -2,32 +2,37 @@
   <thead>
       <th class="list_show"><%%= t 'system.index_id' %></th>
       <th class="list_edit"><%%= t 'system.index_edit' %></th>
-    <%- @model.attributes.each do |attr| %>
+    <%- @model.attributes.each do |attr| -%>
       <th><%%= t '<%= @model.plural_name %>.index_<%= attr.name %>' %></th>
-    <%- end %>
+    <%- end -%>
       <th class="list_remove"><%%= t 'system.index_remove' %></th>
   </thead>
 <%% @<%= @model.plural_name %>.each do |<%= @model.singular_name %>| %>
   <tr class="<%%= cycle 'odd_line', 'even_line' %>" >
-    <td><%%= link_to <%= @model.singular_name %>.id, <%= @model.object_name %>_path(<%= @model.singular_name %>) <%= ", :class => 'lightbox various fancybox.ajax'" if options.ajax %> %></td>
-  	<td><%%= link_to 'Edit', edit_<%= @model.object_name %>_path(<%= @model.singular_name %>) <%= ", :class => 'lightbox various fancybox.ajax'" if options.ajax %> %></td>
-    <%- @model.attributes.each do |attr| %>
     <td>
-      <%- if !attr.references? %>
+		<%%= link_to <%= @model.singular_name %>.id, <%= @model.object_name %>_path(<%= @model.singular_name %>) <%= ", :class => 'lightbox various fancybox.ajax'" if options.ajax %> %>
+	</td>
+  	<td>
+		<%%= link_to t('system.index_edit_label'), edit_<%= @model.object_name %>_path(<%= @model.singular_name %>) <%= ", :class => 'lightbox various fancybox.ajax'" if options.ajax %> %>
+	</td>
+    <%- @model.attributes.each do |attr| -%>
+    <td>
+      <%- if !attr.references? -%>
         <%%= <%= @model.singular_name %>.<%= attr.name %> %>
-      <%- elsif attr.belongs_to? || attr.nested_one? %>
+      <%- elsif attr.belongs_to? || attr.nested_one? -%>
         <%%= <%= @model.singular_name %>.<%= attr.type.singular_name %>.<%= attr.reference %> %>
-      <%- elsif attr.has_many? or attr.nested_many? %>
+      <%- elsif attr.has_many? or attr.nested_many? -%>
         <ul>
         <%% <%= @model.singular_name %>.<%= attr.type.plural_name %>.each do |<%= attr.type.singular_name %>| %>
           <li><%%= <%= attr.type.singular_name %>.<%= attr.reference %> %> </li>
         <%% end %>
         </ul>
-      <%- end %>
+      <%- end -%>
     </td>
-    <%- end %>
-    
-    <td><%%= link_to t('system.index_remove_label'), <%= @model.singular_name %>, :method => :delete, <%= ':remote => true,' if options.ajax %> :data => {:confirm => t('system.index_confirm_deletion')} %></td>
+    <%- end -%>
+    <td>
+		<%%= link_to t('system.index_remove_label'), <%= @model.to_route_object %>, :method => :delete, <%= ':remote => true,' if options.ajax %> :data => {:confirm => t('system.index_confirm_deletion')} %>
+	</td>
   </tr>
 <%% end %>
 </table>

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

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

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

@@ -1,2 +1,2 @@
-$("#<%= @model.plural_name %>_list").html("<%%= escape_javascript( render :partial => '<%= @model.plural_name %>' )%>");
+$("#<%= @model.plural_name %>_list").html("<%%= escape_javascript( render '<%= @model.plural_name %>' )%>");
 $('body').append("<%%= escape_javascript( render '/template/mdwa/notice', :notice => @system_notice )%>");

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

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

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

@@ -4,23 +4,23 @@
 	</div>
 
 	<div class="inside">
-		<%- @model.attributes.each do |attr| %>
-			<div class="field">
-				<label><%%= t '<%= @model.plural_name %>.index_<%= attr.name %>' %></label>
-				<span>
-			<%- if !attr.references? %>
-		        <%%= @<%= @model.singular_name %>.<%= attr.name %> %>
-		    <%- elsif attr.belongs_to? || attr.nested_one? %>
-		    	<%%= @<%= @model.singular_name %>.<%= attr.type.singular_name %>.<%= attr.reference %> %>
-		    <%- elsif attr.has_many? or attr.nested_many? %>
-		        <ul>
-		    	<%% @<%= @model.singular_name %>.<%= attr.type.plural_name %>.each do |<%= attr.type.singular_name %>| %>
-		   	    	<li><%%= <%= attr.type.singular_name %>.<%= attr.reference %> %> </li>
-		    	<%% end %>
-		        </ul>
-		    <%- end %>
-		    	</span>
-			</div>
-		<%- end %>
+	<%- @model.attributes.each do |attr| -%>
+		<div class="field">
+			<label><%%= t '<%= @model.plural_name %>.index_<%= attr.name %>' %></label>
+			<span>
+		<%- if !attr.references? -%>
+	        <%%= @<%= @model.singular_name %>.<%= attr.name %> %>
+	    <%- elsif attr.belongs_to? || attr.nested_one? -%>
+	    	<%%= @<%= @model.singular_name %>.<%= attr.type.singular_name %>.<%= attr.reference %> %>
+	    <%- elsif attr.has_many? or attr.nested_many? -%>
+	        <ul>
+	    	<%% @<%= @model.singular_name %>.<%= attr.type.plural_name %>.each do |<%= attr.type.singular_name %>| %>
+	   	    	<li><%%= <%= attr.type.singular_name %>.<%= attr.reference %> %> </li>
+	    	<%% end %>
+	        </ul>
+	    <%- end -%>
+	    	</span>
+		</div>
+	<%- end -%>
 	</div>
 </div>

data/lib/mdd.rb

@@ -17,4 +17,7 @@ module Mdd
 end
 
 # include the layout selector in ApplicationController
-ActionController::Base.send :include, Mdd::Layout::Helper
+ActionController::Base.send :include, Mdd::Layout::Helper
+ActiveSupport.on_load(:action_controller) do
+    helper_method "current_page"
+end

data/lib/mdd/generators/model.rb

@@ -2,7 +2,7 @@ module Mdd
 	module Generators
 		class Model
 
-			attr_accessor :name, :namespace, :attributes
+			attr_accessor :name, :namespace, :attributes, :specific_model_name
 
 			# Sets the variables by the string
 			# Format: <namespace>/<model>, the namespace is optional.
@@ -10,17 +10,30 @@ module Mdd
 				
 				self.namespace = '' # prevents unitialized variable errors
 				self.namespace = arg.split('/').first.camelize if arg.split('/').count > 1
-        		self.name = arg.split('/').last.singularize.camelize
+    		self.name = arg.split('/').last.singularize.camelize
 
-        		self.attributes = []
+    		self.attributes = []
 			end
 
 			def valid?
 				name.underscore =~ /^[a-z][a-z0-9_\/]+$/
 			end
+			
+			def specific?
+			  !specific_model_name.blank?
+		  end
+		  
+		  def specific_model
+		    return Model.new( specific_model_name ) if specific?
+        return nil
+	    end
 
 			def klass
-				namespace_scope + name
+			  if !specific?
+				  return (namespace_scope + name)
+        else 
+          return specific_model.klass
+        end
 			end
 
 			def controller_name
@@ -30,6 +43,19 @@ module Mdd
 			def object_name
 				space + '_' + singular_name
 			end
+			
+			def to_params
+			  if !specific?
+				  return object_name
+        else 
+          return singular_name
+        end
+		  end
+			
+			def to_route_object(prefix = '')
+			  return "#{prefix}#{singular_name}" if !specific? or !namespace?
+			  return "[ :#{space}, #{prefix}#{singular_name}]" if specific? and namespace?
+		  end
 
 			def raw
 				klass.underscore

data/lib/mdd/generators/model_attribute.rb

@@ -7,7 +7,7 @@ module Mdd
 			STATIC_TYPES = [:boolean, :date, :datetime, :decimal, :float, :integer, :string, :text, :time, :timestamp, :file]
 
 			# Sets the attributes variables
-			# Format: <name>:<type>:<reference>:<reference_type>
+			# Format: <name>:<type>||<model>:<reference>:<reference_type>
 			def initialize( arg )
 
 				# sets the variables by the string
@@ -20,7 +20,7 @@ module Mdd
 
 			def name=(value)
 				if references? and !value.end_with?('_id')
-					@name = "#{value}_id" 
+					@name = "#{value.singularize}_id" 
 				else
 					@name = value
 				end
@@ -30,7 +30,9 @@ module Mdd
 				if STATIC_TYPES.include?( value.to_sym )
 					@type = value
 				else
-					@type = Model.new value # instance of model
+          value_split = value.split(',')
+					@type = Model.new( value_split.first ) # instance of model
+          @type.specific_model_name = value_split.last if value_split.count > 1
 					raise "Invalid reference type" if @type.nil?
 				end
 			end

data/lib/mdd/layout/helper.rb

@@ -12,8 +12,13 @@ module Mdd
 			module ClassMethods
 				def select_layout
 		      		Base.select_layout "#{request.path_parameters[:controller]}##{request.path_parameters[:action]}"
-		      	end
-		    end
+		  	end
+		  	
+        def current_page
+          "#{request.path_parameters[:controller].gsub('/', '_').underscore}_#{request.path_parameters[:action].underscore}"
+        end
+        
+		  end
 		end
 
 	end

data/lib/mdd/version.rb

@@ -1,3 +1,3 @@
 module Mdd
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mdd
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-26 00:00:00.000000000 Z
+date: 2012-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -183,7 +183,6 @@ files:
 - lib/generators/mdd/sandbox/templates/app/assets/javascripts/mdwa/template/ajaxloader.js
 - lib/generators/mdd/sandbox/templates/app/assets/javascripts/mdwa/template/all_pages.js
 - lib/generators/mdd/sandbox/templates/app/assets/javascripts/mdwa/template/clicable_title.js
-- lib/generators/mdd/sandbox/templates/app/assets/javascripts/mdwa/template/nested_form.js
 - lib/generators/mdd/sandbox/templates/app/assets/javascripts/mdwa/template/pagination.js
 - lib/generators/mdd/sandbox/templates/app/assets/stylesheets/.DS_Store
 - lib/generators/mdd/sandbox/templates/app/assets/stylesheets/jquery/.DS_Store

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

@@ -1,46 +0,0 @@
-$(function() {
-$('form a.add_nested_fields').live('click', function() {
-  // Setup
-  var assoc   = $(this).attr('data-association');           // Name of child
-  var content = $('#' + assoc + '_fields_blueprint').html(); // Fields template
-
-  // Make the context correct by replacing new_<parents> with the generated ID
-  // of each of the parent objects
-  var context = ($(this).closest('.fields').find('input:first').attr('name') || '').replace(new RegExp('\[[a-z]+\]$'), '');
-
-  // context will be something like this for a brand new form:
-  // project[tasks_attributes][1255929127459][assignments_attributes][1255929128105]
-  // or for an edit form:
-  // project[tasks_attributes][0][assignments_attributes][1]
-  if(context) {
-    var parent_names = context.match(/[a-z_]+_attributes/g) || [];
-    var parent_ids   = context.match(/[0-9]+/g);
-
-    for(i = 0; i < parent_names.length; i++) {
-      if(parent_ids[i]) {
-        content = content.replace(
-          new RegExp('(\\[' + parent_names[i] + '\\])\\[.+?\\]', 'g'),
-          '$1[' + parent_ids[i] + ']'
-        )
-      }
-    }
-  }
-
-  // Make a unique ID for the new child
-  var regexp  = new RegExp('new_' + assoc, 'g');
-  var new_id  = new Date().getTime();
-  content     = content.replace(regexp, new_id);
-
-  $(this).before(content);
-  return false;
-});
-
-$('form a.remove_nested_fields').live('click', function() {
-  var hidden_field = $(this).prev('input[type=hidden]')[0];
-  if(hidden_field) {
-    hidden_field.value = '1';
-  }
-  $(this).closest('.fields').hide();
-  return false;
-});
-});