mdd 3.0.0 → 3.0.1

data/lib/generators/mdwa/sandbox/templates/app/views/a/administrators/_form_fields.html.erb

@@ -0,0 +1,25 @@
+<div class="yui3-u-1-2">
+  <div class="field">
+    <%= f.label :name %> 
+    <%= f.text_field :name %>
+  </div>
+  <div class="field">
+    <%= f.label :email %> 
+    <%= f.text_field :email %>
+  </div>
+</div>
+
+<div class="yui3-u-1-2">
+  <% unless @administrator.new_record? %>
+    <p class="description"><%= raw t('administrators.edit_form_password_text') %></p>
+  <% end %>
+
+  <div class="field">
+    <%= f.label :password, t('administrators.edit_form_password') %> 
+    <%= f.password_field :password %>
+  </div>
+  <div class="field">
+    <%= f.label :password_confirmation, t('administrators.edit_form_password_confirmation') %> 
+    <%= f.password_field :password_confirmation %>
+  </div>
+</div>

data/lib/generators/mdwa/sandbox/templates/db/seeds/site.rb

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
+Permission.create( :name => "SuperAdmin" ) if Permission.find_by_name("SuperAdmin").nil?
+
 if Administrator.count.zero?
-	Permission.create( :name => "SuperAdmin" ) if Permission.find_by_name("SuperAdmin").nil?
 	Administrator.create :name => "Administrator", :email => 'admin@admin.com', :password => 'admin123', :password_confirmation => 'admin123'
 end

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

@@ -18,7 +18,9 @@ module Mdwa
       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_migrations, :desc => 'Skips the generation of a new migration.', :type => :boolean, :default => false
+      class_option :skip_rake_migrate, :desc => 'Skips running rake db:migrate', :type => :boolean, :default => false
       class_option :skip_timestamp, :desc => 'Skip timestamp generator on migration files.', :type => :boolean, :default => false
+      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
 
@@ -120,14 +122,14 @@ module Mdwa
       def associations
         unless options.only_interface
           @model.attributes.select{ |a| a.references? }.each do |attr|
-              generate "mdwa:association #{@model.raw} #{attr.reference_type} #{attr.type.raw} #{'--skip_migrations' if options.skip_migrations} #{'--force' if options.force} --skip_rake_migrate --ask"
+              generate "mdwa:association #{@model.raw} #{attr.reference_type} #{attr.type.raw} #{'--skip_migrations' if options.skip_migrations} #{'--force' if options.force} #{'--ask' unless options.skip_questions} --skip_rake_migrate"
           end
         end
       end
 
       def run_rake_db_migrate
-        unless options.skip_migrations or options.only_interface
-          rake('db:migrate') if yes? 'Run rake db:migrate?'
+        if !options.skip_rake_migrate and !options.skip_migrations and !options.only_interface
+          rake('db:migrate') if !options.skip_questions and yes? 'Run rake db:migrate?'
         end
       end
 

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

@@ -21,7 +21,7 @@
         <%%= <%= @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? -%>
+      <%- elsif attr.has_many? or attr.has_and_belongs_to_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>

data/lib/generators/mdwa/user/USAGE

@@ -0,0 +1,3 @@
+Generates a loggable user, similar to MDWA Scaffold.
+USAGE:
+	rails g mdwa:user birth_date:date

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

@@ -0,0 +1,78 @@
+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]
+
+	    respond_to do |format|
+	      format.html
+	      format.js
+	    end
+	end
+
+
+	def show
+	    @<%= @model.singular_name %> = <%= @model.klass %>.find(params[:id])
+	    render :layout => false
+	end
+
+	def 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 -%>
+		  render :layout => false
+	end
+
+	def edit
+	    @<%= @model.singular_name %> = <%= @model.klass %>.find(params[:id])
+		  render :layout => false if params[:static_html].blank? or params[:static_html] != '1'
+	end
+
+	def create
+	    @<%= @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
+
+	    respond_to do |format|
+	      format.js
+	    end
+	end
+
+	def update
+	    @<%= @model.singular_name %> = <%= @model.klass %>.find(params[:id])
+	    # if password is blank, delete from params
+      if params[:<%= @model.object_name %>][:password].blank?
+        params[:<%= @model.object_name %>].delete :password
+        params[:<%= @model.object_name %>].delete :password_confirmation
+      end
+	    @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
+
+	    respond_to do |format|
+	      format.js
+	    end
+	end
+
+	def destroy
+	    @<%= @model.singular_name %> = <%= @model.klass %>.find(params[:id])
+	    @system_notice = t('<%= @model.plural_name %>.destroy_success') if @<%= @model.singular_name %>.destroy
+
+	    # loads all <%= @model.plural_name %> to display in the list
+	    load_list
+
+	    respond_to do |format|
+	      format.js
+	    end
+	end
+
+	private
+		def load_list
+			@<%= @model.plural_name %> = <%= @model.klass %>.paginate :page => 1
+		end
+
+end

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

@@ -0,0 +1,77 @@
+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]
+
+	    respond_to do |format|
+	      format.html
+	      format.js
+	    end
+	end
+
+
+	def show
+	    @<%= @model.singular_name %> = <%= @model.klass %>.find(params[:id])
+
+	    respond_to do |format|
+	      format.html
+	    end
+	end
+
+	def 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
+	    end
+	end
+
+	def edit
+	    @<%= @model.singular_name %> = <%= @model.klass %>.find(params[:id])
+	end
+
+	def create
+	    @<%= @model.singular_name %> = <%= @model.klass %>.new(params[:<%= @model.object_name %>])
+
+	    respond_to do |format|
+	      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
+	    end
+	end
+
+	def update
+	    @<%= @model.singular_name %> = <%= @model.klass %>.find(params[:id])
+	    # if password is blank, delete from params
+      if params[:<%= @model.object_name %>][:password].blank?
+        params[:<%= @model.object_name %>].delete :password
+        params[:<%= @model.object_name %>].delete :password_confirmation
+      end
+	    
+	    respond_to do |format|
+	      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
+	    end
+	end
+
+	def destroy
+	    @<%= @model.singular_name %> = <%= @model.klass %>.find(params[:id])
+	    
+	    @<%= @model.singular_name %>.destroy
+	    
+	    respond_to do |format|
+	      format.html { redirect_to <%= @model.object_name.pluralize %>_path, notice: t('<%= @model.plural_name %>.destroy_success') }
+	    end
+	end
+
+end

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

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

data/lib/generators/mdwa/user/templates/model.rb

@@ -0,0 +1,11 @@
+class <%= @model.klass %> < User
+  
+	attr_accessible <%= @model.simple_attributes.collect {|a| ":" + a.name }.join(', ') %>
+	
+	after_create :create_<%= @model.singular_name %>_permission
+
+  def create_<%= @model.singular_name %>_permission
+    self.permissions.push Permission.find_by_name("<%= @model.singular_name %>")
+  end
+  
+end

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

@@ -0,0 +1,12 @@
+<%% if @<%= @model.singular_name %>.errors.any? %>
+	$("#mdwa_error").html("<%%= escape_javascript( render '/template/mdwa/crud_error', :object => @<%= @model.singular_name %> )%>");
+<%% else %>
+	if( $('#<%= @model.plural_name %>_list').length > 0 ) {
+		$.fancybox.close(true);
+		$("#<%= @model.plural_name %>_list").html("<%%= escape_javascript( render '<%= @model.plural_name %>' )%>");
+	}
+	else if( $("#edit_<%= @model.plural_name %>").length > 0 ) {
+		$("#edit_<%= @model.plural_name %> .inside").html("<%%= escape_javascript( render 'form' )%>");
+	}
+	$('body').append("<%%= escape_javascript( render '/template/mdwa/notice', :notice => @system_notice )%>");
+<%% end %>

data/lib/generators/mdwa/user/user_generator.rb

@@ -0,0 +1,113 @@
+require 'rails/generators/migration'
+require 'mdwa/generators'
+
+module Mdwa
+  
+  module Generators
+
+    class UserGenerator < Rails::Generators::Base
+      include Rails::Generators::Migration
+
+      source_root File.expand_path('../templates', __FILE__)
+
+      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_rake_migrate, :desc => 'Skips running rake db:migrate', :type => :boolean, :default => false
+      class_option :skip_timestamp, :desc => 'Skip timestamp generator on migration files.', :type => :boolean, :default => false
+      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
+
+      def initialize(*args, &block)
+
+        super
+
+        @model = MDWA::Generators::Model.new( scaffold_name )        
+
+        # model_name is not valid
+        print_usage unless @model.valid?
+
+        # verifies specific model name
+        @specific_model = MDWA::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
+        
+        require_all "#{Rails.root}/app/models/user.rb"
+        @predefined_fields = User.column_names
+        @predefined_fields << 'password'
+        @predefined_fields << 'password_confirmation'
+        
+        # sets the model attributes
+        attributes.each do |attribute|
+          @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 #{attributes.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
+
+      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
+      end
+
+      def model_and_migration        
+        # model override
+        template 'model.rb', "app/models/#{@model.space}/#{@model.singular_name}.rb"
+        
+        # override model attributes to not allow field duplicity (causing errorss)
+        @model.attributes = []
+        attributes.each do |attribute|
+          @model.add_attribute MDWA::Generators::ModelAttribute.new( attribute ) unless @predefined_fields.include?( attribute.split(':').first )
+        end
+        migration_template 'migrate.rb', "db/migrate/add_#{@model.attributes.collect{|a| a.name}.join('_')}_to_users" unless @model.attributes.empty?
+        
+        # include type in db:seed
+        append_file 'db/seeds/site.rb' do
+          "\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?')
+          rake 'db:migrate'
+          rake 'db:seed' 
+        end
+      end
+
+
+      def run_rake_db_migrate
+        if !options.skip_rake_migrate and !options.skip_migrations and !options.only_interface
+          rake('db:migrate') if !options.skip_questions and yes? 'Run rake db:migrate?'
+        end
+      end
+
+      private
+
+        # Sets Rails migration timestamp
+        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
+
+  end 
+end

data/lib/mdwa/dsl.rb

@@ -1,9 +1,15 @@
 # -*- encoding : utf-8 -*-
+require 'mdwa/dsl/entities'
 module MDWA
   module DSL
     
-    autoload :Entities, 'mdwa/dsl/entities'
     autoload :Entity, 'mdwa/dsl/entity'
+    autoload :EntityAttribute, 'mdwa/dsl/entity_attribute'
+    autoload :EntityAssociation, 'mdwa/dsl/entity_association'
+    autoload :Generator, 'mdwa/dsl/generator'
+    
+    STRUCTURAL_PATH = 'app/mdwa/structure/'
+    NAVIGATION_PATH = 'app/mdwa/navigation/'
     
   end
 end

data/lib/mdwa/dsl/entities.rb

@@ -15,12 +15,20 @@ module MDWA
         @__instance__ ||= new
       end
       
-      def register( name )        
+      #
+      # Register a new entity in the list.
+      #
+      def register( name )
+        # retrive or initialize a entity
         e = element(name) || Entity.new( name )
         yield e
-        add_node e
+        add_node e # add to the list
       end
     
+      #
+      # Add note to the entity list
+      # Prevents entity duplication
+      #
       def add_node(node)
         @nodes[node.name] = node
       end
@@ -28,6 +36,10 @@ module MDWA
       def element(e)
         @nodes[e]
       end
+      
+      def all
+        @nodes.values
+      end
 
     end # class entitites