mdd 1.1.0 → 2.0

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

@@ -0,0 +1,11 @@
+<% if object.errors.any? %>
+	<div class="mdwa_error">	
+		<h2><%= pluralize(object.errors.count, t('system.error')) %> :</h2>
+
+		<ul>
+		<% object.errors.full_messages.each do |msg| %>
+		<li><%= msg %></li>
+		<% end %>
+		</ul>
+	</div>
+<% end %>

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

@@ -4,10 +4,6 @@
 	$(function() {
 		setTimeout(deleteSystemNotice, 3000);
 	});
-
-	function deleteSystemNotice() {
-		$('#system_notice').fadeOut('slow');
-	}
   </script>
 
   <div id="system_notice">

data/lib/generators/mdd/association/USAGE

@@ -0,0 +1,21 @@
+Description:
+	Generate migrations and models based on ActiveRecord association types.
+
+Example:
+	rails g mdd:association Library has_many Books
+
+	rails g mdd:association Book belongs_to Library --with-opposite
+		Generates the first example as the opposite
+
+	rails g mdd:association Company nested_one Address
+		Creates address_id in migration and belongs_to :address and accepts_nested_attrs in Company model
+		Creates has_one :company in Address model if opposite requested
+
+	rails g mdd:association Sale nested_many SaleItem
+		Creates sale_id and belongs_to in SaleItem
+		Creates has_many and accepts_nested_attrs in Sale
+
+	rails g mdd:association User has_and_belongs_to_many Project
+		Creates the join table projects_users
+		Creates has_and_belongs_to_many association in both models
+		The generated code indicates the join_table parameter, because often users have many to many associations and may be inheritance involved.

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

@@ -0,0 +1,153 @@
+# -*- encoding : utf-8 -*-
+
+require 'rails/generators'
+require 'rails/generators/migration'
+
+module Mdd
+  module Generators
+    class AssociationGenerator < Rails::Generators::Base
+      
+      include Rails::Generators::Migration
+
+      ACCEPTED_RELATIONS = [:has_many, :belongs_to, :has_and_belongs_to_many, :nested_many, :nested_one, :has_one]
+      
+      source_root File.expand_path("../templates", __FILE__)
+
+      attr_accessor :model1, :attribute, :model2, :pending_migrations
+
+      argument :model1, :type => :string, :banner => "First part of relation"
+      argument :relation, :type => :string, :banner => "has_many, belongs, has_one, nested_many, nested_one..."
+      argument :model2, :type => :string, :banner => "Second part of relation"
+
+      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 :ask, :desc => 'Asks if the opposite should be generated.', :type => :boolean, :default => false
+
+      def initialize(*args, &block)
+
+        super
+
+        @model1 = Generators::Model.new( model1 )
+        @model2 = Generators::Model.new( model2 )
+
+        # validation
+        print_usage unless @model1.valid?
+        print_usage unless @model2.valid?
+        print_usage unless ACCEPTED_RELATIONS.include? @relation.to_sym
+
+        # 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 
+        when :belongs_to
+          inject_into_class "app/models/#{@model1.space}/#{@model1.singular_name}.rb", @model1.klass.constantize do
+            "\n\tbelongs_to :#{@model2.singular_name}, :class_name => '#{@model2.klass}'\n\tattr_accessible :#{@model2.singular_name.foreign_key}"
+          end
+        when :has_one
+          inject_into_class "app/models/#{@model1.space}/#{@model1.singular_name}.rb", @model1.klass.constantize do
+            "\n\thas_one :#{@model2.singular_name}, :class_name => '#{@model2.klass}'\n"
+          end
+        when :has_many
+          inject_into_class "app/models/#{@model1.space}/#{@model1.singular_name}.rb", @model1.klass.constantize do
+            "\n\thas_many :#{@model2.plural_name}, :class_name => '#{@model2.klass}'\n"
+          end
+        when :has_and_belongs_to_many
+          inject_into_class "app/models/#{@model1.space}/#{@model1.singular_name}.rb", @model1.klass.constantize do
+            "\n\thas_and_belongs_to_many :#{@model2.plural_name}, :join_table => :#{many_to_many_table_name}\n"
+          end
+          inject_into_class "app/models/#{@model2.space}/#{@model2.singular_name}.rb", @model2.klass.constantize do
+            "\n\thas_and_belongs_to_many :#{@model1.plural_name}, :join_table => :#{many_to_many_table_name}\n"
+          end
+        when :nested_one
+          inject_into_class "app/models/#{@model1.space}/#{@model1.singular_name}.rb", @model1.klass.constantize do
+            # belongs_to
+            # attr_accessible attributes
+            # attr_nested_attributes 
+            "\n\tbelongs_to :#{@model2.singular_name}, :class_name => '#{@model2.klass}'\n\tattr_accessible :#{@model2.singular_name}_attributes, :#{@model2.singular_name.foreign_key}\n\taccepts_nested_attributes_for :#{@model2.singular_name}, :allow_destroy => true\n"
+          end
+        when :nested_many
+          inject_into_class "app/models/#{@model1.space}/#{@model1.singular_name}.rb", @model1.klass.constantize do
+            # belongs_to
+            # attr_accessible attributes
+            # attr_nested_attributes 
+            "\n\thas_many :#{@model2.plural_name}, :class_name => '#{@model2.klass}', :dependent => :destroy\n\tattr_accessible :#{@model2.plural_name}_attributes\n\taccepts_nested_attributes_for :#{@model2.plural_name}, :allow_destroy => true\n"
+          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?'
+      end
+
+      def opposite
+
+        if options.with_opposite or options.ask
+          # belongs_to
+          if @relation == 'belongs_to' and (options.with_opposite or ( options.ask and yes?("#{@model1.name} belongs to #{@model2.singular_name}. Create has_many association?") ))
+            generate "mdd:association #{@model2.raw} has_many #{@model1.raw} #{'--force' if options.force}"
+          end
+
+          # has_many
+          if @relation == 'has_many' and (options.with_opposite or ( options.ask and yes?("#{@model1.name} has many #{@model2.plural_name}. Create belongs_to association?") ))
+            generate "mdd:association #{@model2.raw} belongs_to #{@model1.raw} #{'--force' if options.force}"
+          end
+          
+          # has_one
+          if @relation == 'has_one' and (options.with_opposite or ( options.ask and yes?("#{@model1.name} has one #{@model2.singular_name}. Create belongs_to association?") ))
+            generate "mdd:association #{@model2.raw} belongs_to #{@model1.raw} #{'--force' if options.force}"
+          end
+
+          # nested_many
+          if @relation == 'nested_many' and (options.with_opposite or ( options.ask and yes?("#{@model1.name} has many (nested) with #{@model2.plural_name}. Create belongs_to association?") ))
+            generate "mdd:association #{@model2.raw} belongs_to #{@model1.raw} #{'--force' if options.force}"
+          end
+
+          # nested_one          
+          if @relation == 'nested_one' and (options.with_opposite or ( options.ask and yes?("#{@model1.name} belongs nested to #{@model2.singular_name}. Create has_one association?") ))
+            generate "mdd:association #{@model2.raw} has_one #{@model1.raw} #{'--force' if options.force}"
+          end
+
+        end
+      end
+
+      # Implement the required interface for Rails::Generators::Migration.
+      def self.next_migration_number(dirname)
+        if ActiveRecord::Base.timestamped_migrations
+          Time.now.utc.strftime("%Y%m%d%H%M%S").to_s
+        else
+          "%.3d" % (current_migration_number(dirname) + 1)
+        end
+      end
+
+      private 
+        def many_to_many_table_name
+          "#{@ordered_models.first.plural_name}_#{@ordered_models.last.plural_name}"
+        end
+
+
+    end
+  end
+end

data/lib/generators/mdd/association/templates/migrate/many_to_many.rb

@@ -0,0 +1,8 @@
+# -*- encoding : utf-8 -*-
+class Create<%= @ordered_models.first.plural_name.camelize %><%= @ordered_models.last.plural_name.camelize %> < ActiveRecord::Migration
+	def change
+	    create_table :<%= @ordered_models.first.plural_name %>_<%= @ordered_models.last.plural_name %>, :id => false do |t|
+	      t.references :<%= @ordered_models.first.singular_name %>, :<%= @ordered_models.last.singular_name %>
+	    end
+  	end
+end

data/lib/generators/mdd/association/templates/migrate/one_field.rb

@@ -0,0 +1,13 @@
+class Add<%= @field.singular_name.foreign_key.camelize %>To<%= @table.plural_name.camelize %> < ActiveRecord::Migration
+
+	def self.up
+		add_column :<%= @table.plural_name %>, :<%= @field.singular_name.foreign_key %>, :integer
+		add_index :<%= @table.plural_name %>, :<%= @field.singular_name.foreign_key %>
+	end
+
+	def self.down 
+		remove_column :<%= @table.plural_name %>, :<%= @field.singular_name.foreign_key %>
+		remove_index :<%= @table.plural_name %>, :<%= @field.singular_name.foreign_key %>
+	end
+
+end

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

@@ -45,3 +45,6 @@ function defineOrder( form, action, id ) {
   $( "#" + form ).submit();
 }
 
+function deleteSystemNotice() {
+	$('#system_notice').fadeOut('slow');
+}

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

@@ -1,9 +1,9 @@
 $(function() {
-	$.each($('.titulo_clicavel'), function(index, value) {
+	$.each($('.clicable_title'), function(index, value) {
 		if($(this).val() == '')
 		  $(this).val($(this).attr('title'));
 	});
-	$('.titulo_clicavel').live({
+	$('.clicable_title').live({
 		blur: function() {
 			if($(this).val() == '') $(this).val($(this).attr('title'));
 		},

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

@@ -104,12 +104,10 @@ div.actions .button {
     box-shadow: 0 0 1px #AAAAAA;
     cursor: pointer;
     float: right;
-    height: 40px;
+    font-size: 15px;
+    padding: 5px 10px;
     text-shadow: 0 0 1px #FFFFFF;
     width: 100px;
-
-    font-size: 15px;
-  	padding: 10px;
 }
 
 div.actions .button:hover {

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

@@ -25,7 +25,8 @@ div.field label {
 div.field input[type="text"],
 div.field input[type="email"],
 div.field input[type="number"],
-div.field input[type="password"] {
+div.field input[type="password"],
+div.field textarea {
 	border: 1px solid #888;
 	padding: 4px;
 	font-size: 13px;
@@ -40,6 +41,10 @@ div.field input[type="password"]:hover {
 	box-shadow: 0 0 2px #999;
 }
 
+div.field textarea {
+	height: 100px;
+}
+
 div.actions {
 	text-align:center;
 	margin: 20px 0;

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

@@ -102,7 +102,7 @@ a.remove_nested_fields {
   display: table;
 }
 
-#error_explanation {
+.mdwa_error {
   width: 450px;
   border: 2px solid red;
   padding: 7px;
@@ -111,7 +111,7 @@ a.remove_nested_fields {
   background-color: #f0f0f0;
 }
 
-#error_explanation h2 {
+.mdwa_error h2 {
   text-align: left;
   font-weight: bold;
   padding: 5px 5px 5px 15px;
@@ -122,7 +122,7 @@ a.remove_nested_fields {
   color: #fff;
 }
 
-#error_explanation ul li {
+.mdwa_error ul li {
   font-size: 12px;
   list-style: square;
 }

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

@@ -42,4 +42,8 @@ en:
   menu:
     administrators: "Users"
     add_administrator: "Add User"
-    settings: "Settings"
+    settings: "Settings"
+  
+  nested:
+    add: "Add %{name}"
+    remove: "Remove"

data/lib/generators/mdd/scaffold/USAGE

@@ -5,5 +5,53 @@ 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:
-    rails generate mdd:scaffold Model name:string initial_date:date category_id:category:name:belongs
+	It is equal 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
+    	# model product.rb
+    	class Product < ActiveRecord::Base
+    		attr_accessible :name, :initial_date, :category_id
+    		belongs_to :category
+    		...
+
+    - rails generate mdd:scaffold Category name:string products:product:name:has_many
+    	# model product.rb
+    	class Product < ActiveRecord::Base
+    		attr_accessible :name
+    		has_many :products
+    		...
+
+    - rails generate mdd:scaffold Product name:string category:category:name:nested_many
+    	# model product.rb
+    	class Product < ActiveRecord::Base
+    		attr_accessible :name, :categories_attributes
+    		has_many :categories
+    		accepts_nested_attributes_for :categories, :allow_destroy => true
+    		...
+
+    - rails generate mdd:scaffold Company name:string address:address:name:nested_one
+        class Company < ActiveRecord::Base
+            attr_accessible :name, :address_attributes
+            belongs_to :address
+            accepts_nested_attributes_for :address, :allow_destroy => true
+            ...
+
+    - rails generate mdd:scaffold User name:string projects:projects:name:has_and_belongs_to_many
+      rails generate mdd:scaffold Project name:string users:user:name:has_and_belongs_to_many
+        Class User < ActiveRecord::Base
+            has_and_belongs_to_many :projects
+        Class User < ActiveRecord::Base
+            has_and_belongs_to_many :users
+
+    - rails generate mdd:scaffold Product name:string product_price:productPrice:name:has_one
+    	# model product.rb
+    	class Product < ActiveRecord::Base
+    		attr_accessible :name
+    		has_one :product_price
+    		...

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

@@ -7,99 +7,99 @@ module Mdd
 
       source_root File.expand_path('../templates', __FILE__)
 
-      attr_accessor :namespace, :model_name, :model_attributes
+      attr_accessor :model, :create_nested_association
       
       argument :scaffold_name, :type => :string, :banner => "[namespace]/Model"
       argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
 
-      class_option :skip_migration, :desc => 'Skips the generation of a new migration', :type => :boolean
-      class_option :ajax, :desc => 'Generates modal forms and AJAX submits', :type => :boolean
+      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_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
 
       def initialize(*args, &block)
 
         super
 
-        # separates model and namespace
-        @namespace = ''
-        @namespace = scaffold_name.split('/').first.camelize if scaffold_name.split('/').count > 1
-        @model_name = scaffold_name.split('/').last.singularize.camelize
+        @model = Generators::Model.new( scaffold_name )
 
         # model_name is not valid
-        print_usage unless @model_name.underscore =~ /^[a-z][a-z0-9_\/]+$/
+        print_usage unless @model.valid?
 
         # sets the model attributes
-        @model_attributes = []
         attributes.each do |attribute|
-          @model_attributes << Generators::ModelAttribute.new( attribute )
+          @model.add_attribute Generators::ModelAttribute.new( attribute )
         end
+
       end
 
       def controller
-        @inherit_controller = 'A::BackendController' if @namespace.underscore == 'a'
-        template "controllers/#{'ajax_' if options.ajax}controller.rb", "app/controllers/#{@namespace}/#{plural_name}_controller.rb"
+        unless options.skip_interface
+          @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"
+        end
       end
 
       def model
-        template 'models/module.rb', "app/models/#{@namespace.underscore}.rb" unless @namespace.blank?
-        template 'models/model.rb', "app/models/#{@namespace.underscore}/#{singular_name}.rb"
-      end 
-
-      def migration
-        unless options.skip_migration
-          migration_template 'db_migrate/migrate.rb', "db/migrate/create_#{plural_name}.rb"
+        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"
         end
       end
 
       def views
-        template 'views/edit.html.erb', "app/views/#{@namespace.underscore}/#{plural_name}/edit.html.erb"
-        template 'views/index.html.erb', "app/views/#{@namespace.underscore}/#{plural_name}/index.html.erb"
-        template 'views/index.js.erb', "app/views/#{@namespace.underscore}/#{plural_name}/index.js.erb"
-        template 'views/new.html.erb', "app/views/#{@namespace.underscore}/#{plural_name}/new.html.erb"
-        template 'views/_form.html.erb', "app/views/#{@namespace.underscore}/#{plural_name}/_form.html.erb"
-        template 'views/_list.html.erb', "app/views/#{@namespace.underscore}/#{plural_name}/_#{plural_name}.html.erb"
-
-        if options.ajax
-          template 'views/create.js.erb', "app/views/#{@namespace.underscore}/#{plural_name}/create.js.erb"
-          template 'views/destroy.js.erb', "app/views/#{@namespace.underscore}/#{plural_name}/destroy.js.erb"
-          template 'views/update.js.erb', "app/views/#{@namespace.underscore}/#{plural_name}/update.js.erb"
+        unless options.skip_interface
+          template 'views/edit.html.erb', "app/views/#{@model.space}/#{@model.plural_name}/edit.html.erb"
+          template 'views/index.html.erb', "app/views/#{@model.space}/#{@model.plural_name}/index.html.erb"
+          template 'views/index.js.erb', "app/views/#{@model.space}/#{@model.plural_name}/index.js.erb"
+          template 'views/new.html.erb', "app/views/#{@model.space}/#{@model.plural_name}/new.html.erb"
+          template 'views/show.html.erb', "app/views/#{@model.space}/#{@model.plural_name}/show.html.erb"
+          template 'views/_form.html.erb', "app/views/#{@model.space}/#{@model.plural_name}/_form.html.erb"
+          template 'views/_form_fields.html.erb', "app/views/#{@model.space}/#{@model.plural_name}/_form_fields.html.erb"
+          template 'views/_list.html.erb', "app/views/#{@model.space}/#{@model.plural_name}/_#{@model.plural_name}.html.erb"
+
+          if options.ajax
+            #create and update are the same
+            template 'views/create.js.erb', "app/views/#{@model.space}/#{@model.plural_name}/create.js.erb"
+            template 'views/create.js.erb', "app/views/#{@model.space}/#{@model.plural_name}/update.js.erb"
+            template 'views/destroy.js.erb', "app/views/#{@model.space}/#{@model.plural_name}/destroy.js.erb"
+          end
         end
       end
 
       def routes
-        route "resources :#{plural_name}" unless namespace?
-        route "namespace :#{namespace.underscore} do resources :#{plural_name} end" if namespace?
-      end
-
-      def run_rake_db_migrate
-        rake('db:migrate') if yes? 'Run rake db:migrate?'
-      end
-
-      private
-
-        def singular_name
-          @model_name.underscore
-        end
-
-        def plural_name
-          @model_name.underscore.pluralize
+        unless options.skip_interface
+          route "resources :#{@model.plural_name}" unless @model.namespace?
+          route "namespace :#{@model.space} do resources :#{@model.plural_name} end" if @model.namespace?
         end
+      end
 
-        def namespace_model_class
-          "#{namespace_scope}#{@model_name}"
+      def migration
+        unless options.skip_migration or options.only_interface
+          migration_template 'db_migrate/migrate.rb', "db/migrate/create_#{@model.plural_name}.rb"
         end
+      end
 
-        def namespace_scope
-          return "#{@namespace}::" unless @namespace.blank?
-          return ''
+      def associations
+        unless options.skip_migration or 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
+          end
         end
+      end
 
-        def namespace_object
-          namespace_model_class.gsub('::', '_').underscore
+      def run_rake_db_migrate
+        unless options.skip_migration or options.only_interface
+          rake('db:migrate') if yes? 'Run rake db:migrate?'
         end
+      end
 
-        def namespace?
-          !namespace.blank?
-        end
+      private
 
         # Sets Rails migration timestamp
         def self.next_migration_number(dirname) #:nodoc:

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

@@ -1,7 +1,7 @@
-class <%= namespace_scope %><%= plural_name.camelize %>Controller < <%= @inherit_controller || 'ApplicationController' %>
+class <%= @model.controller_name %>Controller < <%= @inherit_controller || 'ApplicationController' %>
 
 	def index
-		@<%= plural_name %> = <%= namespace_model_class %>.paginate :page => params[:page]
+		@<%= @model.plural_name %> = <%= @model.klass %>.paginate :page => params[:page]
 
 	    respond_to do |format|
 	      format.html
@@ -11,24 +11,24 @@ class <%= namespace_scope %><%= plural_name.camelize %>Controller < <%= @inherit
 
 
 	def show
-	    @<%= singular_name %> = <%= namespace_model_class %>.find(params[:id])
+	    @<%= @model.singular_name %> = <%= @model.klass %>.find(params[:id])
 	    render :layout => false
 	end
 
 	def new
-	    @<%= singular_name %> = <%= namespace_model_class %>.new
+	    @<%= @model.singular_name %> = <%= @model.klass %>.new
 		render :layout => false
 	end
 
 	def edit
-	    @<%= singular_name %> = <%= namespace_model_class %>.find(params[:id])
+	    @<%= @model.singular_name %> = <%= @model.klass %>.find(params[:id])
 		render :layout => false
 	end
 
 	def create
-	    @<%= singular_name %> = <%= namespace_model_class %>.new(params[:<%= namespace_object %>])
-	    @<%= singular_name %>.save
-	    # loads all <%= plural_name %> to display in the list
+	    @<%= @model.singular_name %> = <%= @model.klass %>.new(params[:<%= @model.object_name %>])
+	    @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
 
 	    respond_to do |format|
@@ -37,10 +37,10 @@ class <%= namespace_scope %><%= plural_name.camelize %>Controller < <%= @inherit
 	end
 
 	def update
-	    @<%= singular_name %> = <%= namespace_model_class %>.find(params[:id])
-	    @<%= singular_name %>.update_attributes(params[:<%= namespace_object %>])
+	    @<%= @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 %>])
 	    
-	    # loads all <%= plural_name %> to display in the list
+	    # loads all <%= @model.plural_name %> to display in the list
 	    load_list
 
 	    respond_to do |format|
@@ -49,10 +49,10 @@ class <%= namespace_scope %><%= plural_name.camelize %>Controller < <%= @inherit
 	end
 
 	def destroy
-	    @<%= singular_name %> = <%= namespace_model_class %>.find(params[:id])
-	    @<%= singular_name %>.destroy
+	    @<%= @model.singular_name %> = <%= @model.klass %>.find(params[:id])
+	    @system_notice = t('<%= @model.plural_name %>.destroy_success') if @<%= @model.singular_name %>.destroy
 
-	    # loads all <%= plural_name %> to display in the list
+	    # loads all <%= @model.plural_name %> to display in the list
 	    load_list
 
 	    respond_to do |format|
@@ -62,7 +62,7 @@ class <%= namespace_scope %><%= plural_name.camelize %>Controller < <%= @inherit
 
 	private
 		def load_list
-			@<%= plural_name %> = <%= namespace_model_class %>.paginate :page => 1
+			@<%= @model.plural_name %> = <%= @model.klass %>.paginate :page => 1
 		end
 
 end

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

@@ -1,7 +1,7 @@
-class <%= namespace_scope %><%= plural_name.camelize %>Controller < <%= @inherit_controller || 'ApplicationController' %>
+class <%= @model.controller_name %>Controller < <%= @inherit_controller || 'ApplicationController' %>
 
 	def index
-		@<%= plural_name %> = <%= namespace_model_class %>.paginate :page => params[:page]
+		@<%= @model.plural_name %> = <%= @model.klass %>.paginate :page => params[:page]
 
 	    respond_to do |format|
 	      format.html
@@ -11,7 +11,7 @@ class <%= namespace_scope %><%= plural_name.camelize %>Controller < <%= @inherit
 
 
 	def show
-	    @<%= singular_name %> = <%= namespace_model_class %>.find(params[:id])
+	    @<%= @model.singular_name %> = <%= @model.klass %>.find(params[:id])
 
 	    respond_to do |format|
 	      format.html
@@ -19,7 +19,10 @@ class <%= namespace_scope %><%= plural_name.camelize %>Controller < <%= @inherit
 	end
 
 	def new
-	    @<%= singular_name %> = <%= namespace_model_class %>.new
+	    @<%= @model.singular_name %> = <%= @model.klass %>.new
+	    <%- @model.attributes.select {|a| a.nested_one?}.each do |attr| %>
+	    @<%= @model.singular_name %>.<%= attr.type.singular_name %> = <%= attr.type.klass %>.new
+	    <%- end %>
 
 	    respond_to do |format|
 	      format.html
@@ -27,15 +30,15 @@ class <%= namespace_scope %><%= plural_name.camelize %>Controller < <%= @inherit
 	end
 
 	def edit
-	    @<%= singular_name %> = <%= namespace_model_class %>.find(params[:id])
+	    @<%= @model.singular_name %> = <%= @model.klass %>.find(params[:id])
 	end
 
 	def create
-	    @<%= singular_name %> = <%= namespace_model_class %>.new(params[:<%= namespace_object %>])
+	    @<%= @model.singular_name %> = <%= @model.klass %>.new(params[:<%= @model.object_name %>])
 
 	    respond_to do |format|
-	      if @<%= singular_name %>.save
-	        format.html { redirect_to <%= namespace_object.pluralize %>_path, notice: t('<%= plural_name %>.create_success') }
+	      if @<%= @model.singular_name %>.save
+	        format.html { redirect_to <%= @model.object_name.pluralize %>_path, notice: t('<%= @model.plural_name %>.create_success') }
 	      else
 	        format.html { render action: "new" }
 	      end
@@ -43,11 +46,11 @@ class <%= namespace_scope %><%= plural_name.camelize %>Controller < <%= @inherit
 	end
 
 	def update
-	    @<%= singular_name %> = <%= namespace_model_class %>.find(params[:id])
+	    @<%= @model.singular_name %> = <%= @model.klass %>.find(params[:id])
 	    
 	    respond_to do |format|
-	      if @<%= singular_name %>.update_attributes(params[:<%= namespace_object %>])
-	        format.html { redirect_to <%= namespace_object.pluralize %>_path, notice: t('<%= plural_name %>.update_success') }
+	      if @<%= @model.singular_name %>.update_attributes(params[:<%= @model.object_name %>])
+	        format.html { redirect_to <%= @model.object_name.pluralize %>_path, notice: t('<%= @model.plural_name %>.update_success') }
 	      else
 	        format.html { render action: "edit" }
 	      end
@@ -55,12 +58,12 @@ class <%= namespace_scope %><%= plural_name.camelize %>Controller < <%= @inherit
 	end
 
 	def destroy
-	    @<%= singular_name %> = <%= namespace_model_class %>.find(params[:id])
+	    @<%= @model.singular_name %> = <%= @model.klass %>.find(params[:id])
 	    
-	    @<%= singular_name %>.destroy
+	    @<%= @model.singular_name %>.destroy
 	    
 	    respond_to do |format|
-	      format.html { redirect_to <%= namespace_object.pluralize %>_path, notice: t('<%= plural_name %>.destroy_success') }
+	      format.html { redirect_to <%= @model.object_name.pluralize %>_path, notice: t('<%= @model.plural_name %>.destroy_success') }
 	    end
 	end
 

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

@@ -1,18 +1,17 @@
-class Create<%= plural_name.camelize %> < ActiveRecord::Migration
+class Create<%= @model.plural_name.camelize %> < ActiveRecord::Migration
 
 	def self.up
-		create_table :<%= plural_name %> do |t|
-		<%- @model_attributes.each do |attr| %>
-			t.<%= attr.migration_field %> :<%= attr.name %>
-		<%- end %>
-		<%- indexed_attributes = @model_attributes.select {|m| m.references?} %> <%- if indexed_attributes.count > 0 %>
-			add_index <%= indexed_attributes.collect {|m| ":" + m.name }.join(', ') %>
+		create_table :<%= @model.plural_name %> do |t|
+		<%- @model.simple_attributes.each do |attr| %>
+			t.<%= attr.migration_field %> :<%= attr.name %><%- end %>
+		<%- unless options.skip_timestamp %>
+			t.timestamps 
 		<%- end %>
 		end
 	end
 
 	def self.down 
-		drop_table :<%= plural_name %>
+		drop_table :<%= @model.plural_name %>
 	end
 
 end

data/lib/generators/mdd/scaffold/templates/models/model.rb

@@ -1,9 +1,5 @@
-class <%= namespace_model_class %> < ActiveRecord::Base
+class <%= @model.klass %> < ActiveRecord::Base
   
-  attr_accessible <%= @model_attributes.reject {|m| m.references? }.collect {|m| ":" + m.name }.join(', ') %>
-
-  <%- @model_attributes.select {|m| m.references? }.each do |attr| %>
-  belongs_to :<%= attr.type %>
-  <%- end %>
+	attr_accessible <%= @model.simple_attributes.collect {|a| ":" + a.name }.join(', ') %>
   
 end

data/lib/generators/mdd/scaffold/templates/models/module.rb

@@ -1,2 +1,2 @@
-module <%= @namespace.camelize %>
+module <%= @model.namespace %>
 end

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

@@ -1,33 +1,18 @@
-<%%= form_for(@<%= singular_name %><%= ', :remote => true, :class => :mdwa_ajax' if options.ajax %>) do |f| %>
-
-	<%- unless options.ajax %>
-		<%% if @<%= singular_name %>.errors.any? %>
-		    <div id="error_explanation">
-		      <h2><%%= pluralize(@<%= singular_name %>.errors.count, t('system.error')) %> :</h2>
-
-		      <ul>
-		      <%% @<%= singular_name %>.errors.full_messages.each do |msg| %>
-		        <li><%%= msg %></li>
-		      <%% end %>
-		      </ul>
-		    </div>
-		<%% end %>
-	<%- end %>
+<%%= <%= '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| %>
 
+	<div id="mdwa_error">
+	   	<%%= render '/template/mdwa/crud_error', :object => @<%= @model.singular_name %> %>
+	</div>
+	
 	<div class="yui3-g">
 		<div class="yui3-u">
-			<%- @model_attributes.each do |attr| %>
-			<div class="field">
-	  	    	<%%= f.label :<%= attr.name %> %> 
-	  	    	<%= attr.form_field %>
-	  	  	</div>
-  	  		<%- end %>
+			<%%= render 'form_fields', :f => f %>
   	  	</div>
 	</div>
 
 	<div class="actions">
 		<%- if !options.ajax %>
-		<%%= link_to t('system.cancel_button'), <%= namespace_object.pluralize %>_path, :class => :cancel %> <%- else %>
+		<%%= 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 %>

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

@@ -0,0 +1,27 @@
+<%- @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 %>

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

@@ -1,20 +1,35 @@
 <table class="list">
   <thead>
-      <th><%%= t 'system.index_id' %></th>
-    <%- @model_attributes.each do |attr| %>
-      <th><%%= t '<%= plural_name %>.index_<%= attr.name %>' %></th>
+      <th class="list_show"><%%= t 'system.index_id' %></th>
+      <th class="list_edit"><%%= t 'system.index_edit' %></th>
+    <%- @model.attributes.each do |attr| %>
+      <th><%%= t '<%= @model.plural_name %>.index_<%= attr.name %>' %></th>
     <%- end %>
-      <th><%%= t 'system.index_remove' %></th>
+      <th class="list_remove"><%%= t 'system.index_remove' %></th>
   </thead>
-<%% @<%= plural_name %>.each do |<%= singular_name %>| %>
+<%% @<%= @model.plural_name %>.each do |<%= @model.singular_name %>| %>
   <tr class="<%%= cycle 'odd_line', 'even_line' %>" >
-  	<td><%%= link_to <%= singular_name %>.id, edit_<%= namespace_object %>_path(<%= singular_name %>) <%= ", :class => 'lightbox various fancybox.ajax'" if options.ajax %> %></td>
-    <%- @model_attributes.each do |attr| %>
-    <td><%%= <%= singular_name %>.<%= attr.name %> %></td>
+    <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? %>
+        <%%= <%= @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 %>
+    </td>
     <%- end %>
-    <td><%%= link_to t('system.index_remove_label'), <%= singular_name %>, :method => :delete, <%= ':remote => true,' if options.ajax %> :confirm => t('system.index_confirm_deletion') %></td>
+    
+    <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>
   </tr>
 <%% end %>
 </table>
 
-<%%= pagination_footer @<%= plural_name %> %>
+<%%= pagination_footer @<%= @model.plural_name %> %>

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

@@ -1,2 +1,7 @@
-$.fancybox.close(true);
-$("#<%= plural_name %>_list").html("<%%= escape_javascript( render :partial => '<%= plural_name %>' )%>");
+<%% if @<%= @model.singular_name %>.errors.any? %>
+	$("#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 %>' )%>");
+	$('body').append("<%%= escape_javascript( render '/template/mdwa/notice', :notice => @system_notice )%>");
+<%% end %>

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

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

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

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

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

@@ -1,16 +1,16 @@
-<div id="<%= plural_name %>_index" class="mdwa_index">
+<div id="<%= @model.plural_name %>_index" class="mdwa_index">
 	<div class="page_header">
-		<h1><%%= t '<%= plural_name %>.index_title' %></h1>
+		<h1><%%= t '<%= @model.plural_name %>.index_title' %></h1>
 		<%- if options.ajax %>
 		<div class="page_header_right_tab">
-			<%%= link_to t('system.add_by_ajax', :name => '<%= singular_name.humanize %>'), new_<%= namespace_object%>_path, :class => 'lightbox various fancybox.ajax' %>
+			<%%= link_to t('system.add_by_ajax', :name => '<%= @model.singular_name.humanize %>'), new_<%= @model.object_name %>_path, :class => 'lightbox various fancybox.ajax' %>
 		</div>
 		<%- end %>
 	</div>
 
 	<div class="inside">
-		<div id="<%= plural_name %>_list">
-			<%%= render '<%= plural_name %>' %>
+		<div id="<%= @model.plural_name %>_list">
+			<%%= render '<%= @model.plural_name %>' %>
 		</div>
 	</div>
 </div>

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

@@ -1 +1 @@
-$("#<%= plural_name %>_list").html("<%%= escape_javascript( render :partial => "<%= plural_name %>" )%>");
+$("#<%= @model.plural_name %>_list").html("<%%= escape_javascript( render :partial => "<%= @model.plural_name %>" )%>");

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

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

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

@@ -0,0 +1,26 @@
+<div id="<%= @model.plural_name %>_show" class="mdwa_show">
+	<div class="page_header">
+		<h1><%%= t('<%= @model.plural_name %>.show_title') %></h1>
+	</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 %>
+	</div>
+</div>

data/lib/mdd.rb

@@ -6,7 +6,8 @@ module Mdd
   end
 
   module Generators
-  	autoload :ModelAttribute, 'mdd/generators/model_attribute'
+  	autoload :Model, 'mdd/generators/model'
+    autoload :ModelAttribute, 'mdd/generators/model_attribute'
   end
 
   module Layout

data/lib/mdd/generators/model.rb

@@ -0,0 +1,71 @@
+module Mdd
+	module Generators
+		class Model
+
+			attr_accessor :name, :namespace, :attributes
+
+			# Sets the variables by the string
+			# Format: <namespace>/<model>, the namespace is optional.
+			def initialize( arg )
+				
+				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.attributes = []
+			end
+
+			def valid?
+				name.underscore =~ /^[a-z][a-z0-9_\/]+$/
+			end
+
+			def klass
+				namespace_scope + name
+			end
+
+			def controller_name
+				namespace_scope + name.pluralize
+			end
+
+			def object_name
+				space + '_' + singular_name
+			end
+
+			def raw
+				klass.underscore
+			end
+
+			def singular_name
+				name.underscore
+			end
+
+			def plural_name
+				name.underscore.pluralize
+			end
+
+			def namespace?
+				!namespace.blank?
+			end
+
+			def space
+				namespace.underscore
+			end
+
+			def add_attribute(model_attribute)
+				self.attributes << model_attribute
+				model_attribute.model = self
+			end
+
+			def simple_attributes
+				attributes.select{ |a| !a.references? }
+			end
+
+			private 
+				def namespace_scope
+		          return "#{namespace}::" if namespace?
+		          return ''
+		        end
+
+		end
+	end
+end

data/lib/mdd/generators/model_attribute.rb

@@ -2,10 +2,12 @@ module Mdd
 	module Generators
 
 		class ModelAttribute
-			attr_accessor :name, :type, :reference, :reference_type
+			attr_accessor :name, :type, :reference, :reference_type, :model
 
 			STATIC_TYPES = [:boolean, :date, :datetime, :decimal, :float, :integer, :string, :text, :time, :timestamp, :file]
 
+			# Sets the attributes variables
+			# Format: <name>:<type>:<reference>:<reference_type>
 			def initialize( arg )
 
 				# sets the variables by the string
@@ -14,11 +16,6 @@ module Mdd
 				self.name = split[0]
 				self.reference = split[2]
 				self.reference_type = split[3]
-
-			end
-
-			def references?
-				!STATIC_TYPES.include?(self.type.to_sym)
 			end
 
 			def name=(value)
@@ -29,8 +26,26 @@ module Mdd
 				end
 			end
 
+			def type=(value)
+				if STATIC_TYPES.include?( value.to_sym )
+					@type = value
+				else
+					@type = Model.new value # instance of model
+					raise "Invalid reference type" if @type.nil?
+				end
+			end
+
+			def reference=(value)
+				@reference = value
+				@reference = 'id' if value.blank?
+			end
+
+			def reference_type=(value)
+				@reference_type = value.underscore unless value.blank?
+			end
+
 			def migration_field
-				@migration_field ||= case self.type.to_sym
+				@migration_field ||= case self.type.to_s.to_sym
 		          when :string, :file		 then 'string'
 		          when :boolean              then 'boolean'
 		          when :date 				 then 'date'
@@ -45,7 +60,7 @@ module Mdd
 			end
 
 			def form_field
-		        @form_field ||= case self.type.to_sym
+		        @form_field ||= case self.type.to_s.to_sym
 		          when :integer              then 'number_field'
 		          when :float, :decimal      then 'text_field'
 		          when :file				 then 'file_field'
@@ -57,10 +72,39 @@ module Mdd
 		          else
 		            'text_field'
 		        end
+			end
+
+			def belongs_to?
+				return (reference_type == 'belongs_to')
+			end
+
+			def has_many?
+				return (reference_type == 'has_many')
+			end
+
+			def nested_many?
+				return (reference_type == 'nested_many')
+			end
+
+			def nested?
+				nested_many? || nested_one?
+			end
 
-		        "<%= f.#{@form_field} :#{self.name} %>"
+			def nested_one?
+				return (reference_type == 'nested_one')
+			end
+
+			def has_one?
+				return (reference_type == 'has_one')
+			end
+
+			def has_and_belongs_to_many?
+				return (reference_type == 'has_and_belongs_and_to_many')
+			end
+
+			def references?
+				!STATIC_TYPES.include?(self.type.to_s.to_sym)
 			end
-			
 		end
 
 	end

data/lib/mdd/version.rb

@@ -1,3 +1,3 @@
 module Mdd
-  VERSION = "1.1.0"
+  VERSION = "2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mdd
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: '2.0'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-01 00:00:00.000000000 Z
+date: 2012-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -122,9 +122,16 @@ files:
 - Rakefile
 - app/helpers/mdd_helper.rb
 - app/views/template/mdwa/_autocomplete_tag.html.erb
+- app/views/template/mdwa/_crud_error.html.erb
 - app/views/template/mdwa/_login_text.html.erb
 - app/views/template/mdwa/_notice.html.erb
 - lib/generators/.DS_Store
+- lib/generators/mdd/.DS_Store
+- lib/generators/mdd/association/USAGE
+- lib/generators/mdd/association/association_generator.rb
+- lib/generators/mdd/association/templates/.DS_Store
+- lib/generators/mdd/association/templates/migrate/many_to_many.rb
+- lib/generators/mdd/association/templates/migrate/one_field.rb
 - lib/generators/mdd/sandbox/USAGE
 - lib/generators/mdd/sandbox/sandbox_generator.rb
 - lib/generators/mdd/sandbox/templates/app/assets/images/.DS_Store
@@ -187,6 +194,7 @@ files:
 - lib/generators/mdd/sandbox/templates/app/assets/stylesheets/mdwa/login_manifest.css
 - lib/generators/mdd/sandbox/templates/app/assets/stylesheets/mdwa/public_manifest.css
 - lib/generators/mdd/sandbox/templates/app/assets/stylesheets/mdwa/system_manifest.css
+- lib/generators/mdd/sandbox/templates/app/assets/stylesheets/mdwa/template/.DS_Store
 - lib/generators/mdd/sandbox/templates/app/assets/stylesheets/mdwa/template/backend.css.erb
 - lib/generators/mdd/sandbox/templates/app/assets/stylesheets/mdwa/template/backend_base.css.erb
 - lib/generators/mdd/sandbox/templates/app/assets/stylesheets/mdwa/template/cssbase.css
@@ -244,10 +252,12 @@ files:
 - lib/generators/mdd/scaffold/templates/.DS_Store
 - lib/generators/mdd/scaffold/templates/controllers/ajax_controller.rb
 - lib/generators/mdd/scaffold/templates/controllers/controller.rb
+- lib/generators/mdd/scaffold/templates/db_migrate/.DS_Store
 - lib/generators/mdd/scaffold/templates/db_migrate/migrate.rb
 - lib/generators/mdd/scaffold/templates/models/model.rb
 - lib/generators/mdd/scaffold/templates/models/module.rb
 - lib/generators/mdd/scaffold/templates/views/_form.html.erb
+- lib/generators/mdd/scaffold/templates/views/_form_fields.html.erb
 - lib/generators/mdd/scaffold/templates/views/_list.html.erb
 - lib/generators/mdd/scaffold/templates/views/create.js.erb
 - lib/generators/mdd/scaffold/templates/views/destroy.js.erb
@@ -255,9 +265,10 @@ files:
 - lib/generators/mdd/scaffold/templates/views/index.html.erb
 - lib/generators/mdd/scaffold/templates/views/index.js.erb
 - lib/generators/mdd/scaffold/templates/views/new.html.erb
-- lib/generators/mdd/scaffold/templates/views/update.js.erb
+- lib/generators/mdd/scaffold/templates/views/show.html.erb
 - lib/mdd.rb
 - lib/mdd/.DS_Store
+- lib/mdd/generators/model.rb
 - lib/mdd/generators/model_attribute.rb
 - lib/mdd/layout/base.rb
 - lib/mdd/layout/helper.rb

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

@@ -1,2 +0,0 @@
-$.fancybox.close(true);
-$("#<%= plural_name %>_list").html("<%%= escape_javascript( render :partial => '<%= plural_name %>' )%>");