mdd 3.0.0 → 3.0.1

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

@@ -2,6 +2,7 @@
 
 require 'rails/generators'
 require 'rails/generators/migration'
+
 require 'mdwa/generators'
 
 module Mdwa
@@ -27,14 +28,14 @@ module Mdwa
 
         super
         
-        @association = Generators::ModelAssocation.new(model1, model2, relation)
+        @association = MDWA::Generators::ModelAssociation.new(model1, model2, relation)
 
       end
       
 
       def model
         if @association.belongs_to?
-          inject_into_class "app/models/#{@association.model1.space}/#{@association.model1.singular_name}.rb", @association.model1.klass.classify.constantize do
+          inject_into_class "app/models/#{@association.model1.space}/#{@association.model1.singular_name}.rb", @association.model1.model_class do
             ret = []
             ret << "\n\tbelongs_to :#{@association.model2.singular_name}, :class_name => '#{@association.model2.klass}'"
             ret << "\tattr_accessible :#{@association.model2.singular_name.foreign_key}"
@@ -42,25 +43,25 @@ module Mdwa
           end
         end
         if @association.has_one?
-          inject_into_class "app/models/#{@association.model1.space}/#{@association.model1.singular_name}.rb", @association.model1.klass.classify.constantize do
+          inject_into_class "app/models/#{@association.model1.space}/#{@association.model1.singular_name}.rb", @association.model1.model_class do
             "\n\thas_one :#{@association.model2.singular_name}, :class_name => '#{@association.model2.klass}'\n"
           end
         end
         if @association.has_many?
-          inject_into_class "app/models/#{@association.model1.space}/#{@association.model1.singular_name}.rb", @association.model1.klass.classify.constantize do
+          inject_into_class "app/models/#{@association.model1.space}/#{@association.model1.singular_name}.rb", @association.model1.model_class do
             "\n\thas_many :#{@association.model2.plural_name}, :class_name => '#{@association.model2.klass}'\n"
           end
         end
         if @association.has_and_belongs_to_many?
-          inject_into_class "app/models/#{@association.model1.space}/#{@association.model1.singular_name}.rb", @association.model1.klass.classify.constantize do
+          inject_into_class "app/models/#{@association.model1.space}/#{@association.model1.singular_name}.rb", @association.model1.model_class do
             "\n\thas_and_belongs_to_many :#{@association.model2.plural_name}, :join_table => :#{many_to_many_table_name}\n"
           end
-          inject_into_class "app/models/#{@association.model2.space}/#{@association.model2.singular_name}.rb", @association.model2.klass.classify.constantize do
+          inject_into_class "app/models/#{@association.model2.space}/#{@association.model2.singular_name}.rb", @association.model2.model_class do
             "\n\thas_and_belongs_to_many :#{@association.model1.plural_name}, :join_table => :#{many_to_many_table_name}\n"
           end
         end
         if @association.nested_one?
-          inject_into_class "app/models/#{@association.model1.space}/#{@association.model1.singular_name}.rb", @association.model1.klass.classify.constantize do
+          inject_into_class "app/models/#{@association.model1.space}/#{@association.model1.singular_name}.rb", @association.model1.model_class do
             # belongs_to
             # attr_accessible attributes
             # attr_nested_attributes 
@@ -68,7 +69,7 @@ module Mdwa
           end
         end
         if @association.nested_many?
-          inject_into_class "app/models/#{@association.model1.space}/#{@association.model1.singular_name}.rb", @association.model1.klass.classify.constantize do
+          inject_into_class "app/models/#{@association.model1.space}/#{@association.model1.singular_name}.rb", @association.model1.model_class do
             # belongs_to
             # attr_accessible attributes
             # attr_nested_attributes 
@@ -133,9 +134,9 @@ module Mdwa
       end
 
       # Implement the required interface for Rails::Generators::Migration.
-      def self.next_migration_number(dirname)
+      def self.next_migration_number(dirname) #:nodoc:
         if ActiveRecord::Base.timestamped_migrations
-          Time.now.utc.strftime("%Y%m%d%H%M%S").to_s
+          Time.now.utc.strftime("%Y%m%d%H%M%S")
         else
           "%.3d" % (current_migration_number(dirname) + 1)
         end

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

@@ -1,8 +1,8 @@
 # -*- encoding : utf-8 -*-
-class Create<%= @ordered_models.first.plural_name.camelize %><%= @ordered_models.last.plural_name.camelize %> < ActiveRecord::Migration
+class Create<%= @association.ordered.first.plural_name.camelize %><%= @association.ordered.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 %>
+	    create_table :<%= @association.ordered.first.plural_name %>_<%= @association.ordered.last.plural_name %>, :id => false do |t|
+	      t.references :<%= @association.ordered.first.singular_name %>, :<%= @association.ordered.last.singular_name %>
 	    end
   	end
 end

data/lib/generators/mdwa/code/USAGE

@@ -0,0 +1,5 @@
+Generates code for MDWA structural models.
+Examples:
+	
+	rails g mdwa:code 							# Generates code for all entities
+	rails g mdwa:code Product Category Client 	# Generates code for Product, Category and Client entities

data/lib/generators/mdwa/code/code_generator.rb

@@ -0,0 +1,166 @@
+# -*- encoding : utf-8 -*-
+
+require 'rails/generators'
+require 'rails/generators/migration'
+
+require 'mdwa/dsl'
+
+module Mdwa
+  module Generators
+    class CodeGenerator < Rails::Generators::Base
+      
+      include Rails::Generators::Migration
+      
+      source_root File.expand_path("../templates", __FILE__)
+      
+      attr_accessor :all_entities, :code_changes, :random_migration_key
+
+      argument :entities, :type => :array, :banner => 'Specific entities', :default => []
+      
+      class_option :run_migrations, :type => :boolean, :default => false, :desc => 'Run rake db:migrate directly'
+      class_option :only_interface, :type => :boolean, :default => false, :desc => 'Generate only user interface'
+      
+      def initialize(*args, &block)
+        super
+        
+        # include files with entities
+        inside Rails.root do
+          if entities.count.zero?
+            require_all MDWA::DSL::STRUCTURAL_PATH
+          else
+            files = entities.collect{ |e| "#{MDWA::DSL::STRUCTURAL_PATH}#{MDWA::DSL::Entity.new(e).file_name}.rb" }
+            require_all files.join(', ')
+          end
+        end
+        
+        # select models that will be generated
+        # only required models are included
+        @all_entities = MDWA::DSL.entities.all
+        
+        @changes = []
+        @random_migration_key = rand.to_s.gsub('.','').to_i
+        
+      end
+      
+      def code_generation
+        
+        return false if options.only_interface
+        
+        @all_entities.each do |entity|
+          
+          # if it's not a resource, ignore
+          next unless entity.resource?
+          
+          # if model has not a database yet, run the generate command
+          begin
+            # if model does not exist, should generate scaffold
+            model_class = entity.model_class
+          rescue
+            model_class = nil
+          end
+          if entity.force? or model_class.nil? or !model_class.table_exists?
+            puts "===================================================="
+            puts "Generating code for '#{entity.name}'"
+            puts "===================================================="
+            generation_string = "#{entity.generate} #{'--skip_rake_migrate' unless options.run_migrations} #{'--force' if options.force} --skip-questions"
+            generate generation_string
+            
+            # append generated code to entity
+            append_to_file "#{MDWA::DSL::STRUCTURAL_PATH}#{entity.file_name}.rb", "\n\nMDWA::DSL.entity('#{entity.name}').code_generations << '#{generation_string}'"
+            
+            next # nothing's changed, go to the next entity
+          end
+        
+          # check what changed
+          model_class.columns.each do |column|
+            # ignore rails default columns and attributes used in associations
+            next if column.name == 'id' or column.name == 'created_at' or column.name == 'updated_at' or column.name.end_with? '_id'
+            
+            entity_attribute = entity.attributes[column.name]
+            # model attribute exists, but not in entity -> was erased
+            if entity_attribute.nil? 
+              @changes << {:entity => entity, :type => 'remove_column', :column => column.name}
+            # attribute exists in model and entity, but changed type
+            elsif entity_attribute.type.to_sym != column.type.to_sym
+              next if entity_attribute.type.to_sym == :file or entity_attribute.type.to_sym == :password
+              @changes << {:entity => entity, :type => 'change_column', :column => column.name, :attr_type => entity_attribute.type, :from => column.type}
+            end
+            
+          end
+          
+          # new attributes
+          entity.attributes.each do |key, attr|
+            # no column with that name -> column must be added
+            if model_class.columns.select {|c| c.name == attr.name}.count.zero?
+              @changes << {:entity => entity, :type => 'add_column', :column => attr.name, :attr_type => attr.type}
+            end
+          end
+          
+        end
+        
+      end
+      
+      def only_interface_generation
+        
+        if options.only_interface
+          @all_entities.each do |entity|
+
+            # if it's not a resource, ignore
+            next unless entity.resource?
+
+            # if model has not a database yet, run the generate command
+            begin
+              # if model does not exist, should generate scaffold
+              model_class = entity.model_class
+            rescue
+              model_class = nil
+            end
+            if entity.force? or model_class.nil? or !model_class.table_exists?
+              puts "===================================================="
+              puts "Generating code for '#{entity.name}'"
+              puts "===================================================="
+              generate "#{entity.generate} --only_interface #{'--force' if options.force}"
+              
+              # append generated code to entity
+              append_to_file "#{MDWA::DSL::STRUCTURAL_PATH}#{entity.file_name}.rb", "\n\nMDWA::DSL.entity('#{entity.name}').code_generations << '#{generation_string}'"
+            end
+          end
+        end
+        
+      end  
+      
+      def migration_generation
+        unless @changes.empty?
+          # generate changed code                                                               
+          migration_template 'migration.rb', "db/migrate/alter_#{@all_entities.select{|e| e.resource?}.collect{|e| e.file_name}.join('_')}#{@random_migration_key}.rb"
+        end
+      end
+      
+      def rake_db_migrate
+        if options.run_migrations
+          rake 'db:migrate'
+        end
+      end
+      
+      # Implement the required interface for Rails::Generators::Migration.
+      def self.next_migration_number(dirname) #:nodoc:
+        if ActiveRecord::Base.timestamped_migrations
+          Time.now.utc.strftime("%Y%m%d%H%M%S")
+        else
+          "%.3d" % (current_migration_number(dirname) + 1)
+        end
+      end
+      
+      private 
+       def inverse_migration_type(type)
+         case type.to_sym
+         when :add_column      then 'remove_column'
+         when :remove_column   then 'add_column'
+         when :change_column   then 'change_column'
+         end
+       end
+      
+    end # class
+  end # generators
+end # mdwa
+    

data/lib/generators/mdwa/code/templates/migration.rb

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

data/lib/generators/mdwa/entity/USAGE

@@ -0,0 +1,5 @@
+Generates a clean entity for MDWA structural model.
+
+Example:
+	rails g mdwa:entity Product
+	rails g mdwa:entity a/category

data/lib/generators/mdwa/entity/entity_generator.rb

@@ -0,0 +1,25 @@
+# -*- encoding : utf-8 -*-
+
+require 'rails/generators'
+require 'rails/generators/migration'
+
+require 'mdwa/dsl'
+
+module Mdwa
+  module Generators
+    class EntityGenerator < Rails::Generators::Base
+      
+      source_root File.expand_path("../templates", __FILE__)
+
+      argument :name, :type => :string, :banner => 'Entity name'
+      
+      class_option :user, :type => :boolean, :default => false, :desc => 'Is this entity a loggable user?'
+      class_option :no_comments, :type => :boolean, :default => false, :desc => 'Generates entity without comments.'
+      
+      def code_generation
+        template 'entity.rb', "#{MDWA::DSL::STRUCTURAL_PATH}#{MDWA::DSL::Entity.new(name).file_name}.rb"
+      end
+      
+    end # entity
+  end #generators
+end #mdwa

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

@@ -0,0 +1,50 @@
+# -*- encoding : utf-8 -*-
+MDWA::DSL.entities.register "<%= name.singularize.camelize %>" do |e|
+  
+  <%- if options.user -%>
+  # NOTE: Users have the following attributes predefined (Devise defaults):
+  # "email", "password", "password_confirmation", "encrypted_password", "name", "type", "reset_password_token", 
+  # "reset_password_sent_at", "remember_created_at", "sign_in_count", "current_sign_in_at", "last_sign_in_at", 
+  # "current_sign_in_ip", "last_sign_in_ip", "created_at", "updated_at"
+  e.user        = true
+  <%- end -%>
+  
+  <%- unless options.no_comments -%>
+  # e.purpose   = %q{To-do} # what this entity does?
+  # e.resource  = true      # should it be stored like a resource?
+  # e.ajax      = true      # scaffold with ajax?
+  # e.user      = false     # is this entity a loggable user?
+  # e.scaffold_name = 'a/<%= name.singularize.underscore %>' # mdwa sandbox specific code?
+  # e.model_name = 'a/<%= name.singularize.underscore %>' # use specific model name? or different namespace?
+
+  ##
+  ## Define entity attributes
+  ##
+  # e.attribute do |attr|
+  #   attr.name = 'name'
+  #   attr.type = 'string'
+  # end
+  # e.attribute do |attr|
+  #   attr.name = 'category'
+  #   attr.type = 'integer'
+  # end
+  
+  ##
+  ## Define entity associations
+  ##
+  # e.association do |a|
+  #   a.type = 'many_to_one'
+  #   a.destination = 'Category' # entity name
+  #   a.description = '<%= name.singularize.humanize %> belongs to category'
+  # end
+  # 
+  # e.association do |a|
+  #   a.name = 'address' # specify a name for the associations
+  #   a.type = 'one_to_one'
+  #   a.destination = 'Address' 
+  #   a.composition = true
+  #   a.description = 'This entity has a composite address.'
+  # end
+  <%- end -%>
+  
+end

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

@@ -27,6 +27,7 @@ module Mdwa
         gem 'cancan'
         gem 'will_paginate'
         gem 'nested_form'
+        gem 'require_all'
 
         inside Rails.root do
           run "bundle install"
@@ -131,7 +132,8 @@ module Mdwa
     devise_for :users, :skip => :registrations, :controllers => {:sessions => 'a/users/sessions', :passwords => 'a/users/passwords' }
    
     resources :administrators
-    controller :administrators do
+    
+    controller :home do
       get '/edit_account' => :edit_own_account
     end
     

data/lib/generators/mdwa/sandbox/templates/app/controllers/a/home_controller.rb

@@ -6,5 +6,9 @@ class A::HomeController < A::BackendController
 
   def index
   end
+  
+  def edit_own_account
+    redirect_to "/a/#{current_user.type.underscore.split('/').last.pluralize}/#{current_user.id}/edit?static_html=1"
+  end
 
 end

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

@@ -1,45 +1,13 @@
 <%= form_for([:a, @administrator]) do |f| %>
 
-  <% if @administrator.errors.any? %>
-    <div id="error_explanation">
-      <h2><%= pluralize(@administrator.errors.count, t('system.error')) %> :</h2>
-
-      <ul>
-      <% @administrator.errors.full_messages.each do |msg| %>
-        <li><%= msg %></li>
-      <% end %>
-      </ul>
-    </div>
-  <% end %>
+  <div id="mdwa_error">
+   	<%%= render '/template/mdwa/crud_error', :object => @administrator %>
+  </div>
 
   <div class="yui3-g">
-
-    <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>
-    
+	<div class="yui3-u">
+		<%= render 'form_fields', :f => f %>
+  	</div>
   </div>
   
   <div class="actions">