RubyGems - mdd - Versions diffs - 3.0.4 → 3.0.6 - Mend

mdd 3.0.4 → 3.0.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (33) hide show

data/app/controllers/mdwa/mdwa_controller.rb ADDED Viewed

@@ -0,0 +1,8 @@
+class Mdwa::MDWAController < ApplicationController
+  protected
+      def restrict_to_development
+        head(:bad_request) unless Rails.env.development?
+      end
+end

data/app/controllers/mdwa/requirements_controller.rb ADDED Viewed

@@ -0,0 +1,9 @@
+require 'mdwa/dsl'
+class Mdwa::RequirementsController < Mdwa::MDWAController
+  def index
+    require_all MDWA::DSL::REQUIREMENTS_PATH
+    @requirements = MDWA::DSL.requirements.all
+  end
+end

data/app/views/layouts/mdwa_visualization.html.erb ADDED Viewed

@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>MDWA Software Visualization</title>
+    <%= stylesheet_link_tag 'mdwa/system_manifest' %>
+    <%= javascript_include_tag 'mdwa/system_manifest' %>
+    <%= csrf_meta_tag %>
+  </head>
+  <body class="mdwa_visualization">
+    <%= render '/template/mdwa/notice', :notice => notice, :alert => alert %>
+    <div id="header" class="yui3-g">
+      <div id="logo" class="yui3-u-1-3">
+        <%= link_to "MDWA Application", a_root_path, :target => '_self' %>
+      </div>
+    </div>
+    <div id="mdwa_content">
+      <%= yield %>
+    </div>
+    <div class="footer">
+    </div>
+  </body>
+</html>

data/app/views/mdwa/requirements/index.html.erb ADDED Viewed

@@ -0,0 +1,31 @@
+<div id="requirements_index">
+	<div class="page_header">
+		<h1>MDWA Requirements</h1>
+	</div>
+	<div class="inside">
+		<% if @requirements.count > 0 %>
+			<table class="list">
+				<tr>
+					<th>Requirement title</th>
+					<th>Description</th>
+					<th>Entities</th>
+					<th>Users</th>
+				</tr>
+				<% @requirements.each do |requirement| %>
+				<tr>
+					<td><%= requirement.summary %></td>
+					<td><%= requirement.description %></td>
+					<td><%= requirement.entities.join ', ' %></td>
+					<td><%= requirement.users.join ', ' %></td>
+				</tr>
+				<% end %>
+			</table>
+		<% else %>
+			<p>No requirements specified.</p>
+		<% end %>
+	</div>
+</div>

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

@@ -19,25 +19,25 @@ module Mdwa
       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'
+      class_option :prototype, :type => :boolean, :default => false, :desc => 'Generate prototype files instead of ERB templates'
       #
       # Constructor
       # Require all entities to load the DSL of the application
-      #
       def initialize(*args, &block)
         super
         # include files with entities
         # select entities that will be generated
         inside Rails.root do
-          if entities.count.zero?
-            require_all MDWA::DSL::STRUCTURAL_PATH unless Dir.glob("#{MDWA::DSL::STRUCTURAL_PATH}/*.rb").count.zero?
-          else
-            files = entities.collect{ |e| "#{MDWA::DSL::STRUCTURAL_PATH}#{MDWA::DSL::Entity.new(e).file_name}.rb" }
-            require_all files.join(', ')
-          end
+          require_all MDWA::DSL::STRUCTURAL_PATH unless Dir.glob("#{MDWA::DSL::STRUCTURAL_PATH}/*.rb").count.zero?
+        end
+        if entities.count.zero?
+          @all_entities = MDWA::DSL.entities.all
+        else
+          @all_entities = entities.collect{ |e| MDWA::DSL.entity(e) }
         end
-        @all_entities = MDWA::DSL.entities.all
         # entity changes and migrations
         @changes = []
@@ -121,30 +121,27 @@ module Mdwa
       #
       def entities_interface
-        if options.only_interface
-          @all_entities.each do |entity|
-            # if it's not a resource, ignore
-            next unless entity.resource?
+        return nil unless 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.generator_model.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} --only_interface #{'--force' if options.force}"
-              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}'"
-            end
+          # if model has not a database yet, run the generate command
+          begin
+            # if model does not exist, should generate scaffold
+            model_class = entity.generator_model.model_class
+          rescue
+            model_class = nil
           end
+          puts "===================================================="
+          puts "Generating code for '#{entity.name}'"
+          puts "===================================================="
+          generation_string = "#{entity.generate} --only_interface #{'--force' if options.force}"
+          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}'"
         end
       end
@@ -197,14 +194,16 @@ module Mdwa
           end
           # inject routes testing
-          insert_into_file "spec/routing/#{model.space}/#{model.plural_name}_routing_spec.rb", :after => 'describe "routing" do' do
-            routes = []
-            entity.actions.actions.values.select {|a| !a.resource}.each do |action|
-              routes << "\n\n\t\tit 'routes to ##{action.name}' do"
-              routes << "\n\t\t\t#{action.method.to_s}('#{action.entity.generator_model.to_route_url}/#{'1/' if action.member?}#{action.name}').should route_to('#{action.entity.generator_model.to_route_url}##{action.name}' #{', :id => "1"' if action.member?})"
-              routes << "\n\t\tend"
+          if File.exist?(Rails.root + "/spec/routing/#{model.space}/#{model.plural_name}_routing_spec.rb")
+            insert_into_file "spec/routing/#{model.space}/#{model.plural_name}_routing_spec.rb", :after => 'describe "routing" do' do
+              routes = []
+              entity.actions.actions.values.select {|a| !a.resource}.each do |action|
+                routes << "\n\n\t\tit 'routes to ##{action.name}' do"
+                routes << "\n\t\t\t#{action.method.to_s}('#{action.entity.generator_model.to_route_url}/#{'1/' if action.member?}#{action.name}').should route_to('#{action.entity.generator_model.to_route_url}##{action.name}' #{', :id => "1"' if action.member?})"
+                routes << "\n\t\tend"
+              end
+              routes.join
             end
-            routes.join
           end
           # generate the corresponding files

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

@@ -1,7 +1,5 @@
 # -*- encoding : utf-8 -*-
 require 'rails/generators'
 require 'mdwa/dsl'
 module Mdwa
@@ -14,11 +12,19 @@ module Mdwa
       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.'
+      class_option :requirement, :type => :string, :desc => 'Requirement alias'
       def code_generation
-        template 'entity.rb', "#{MDWA::DSL::STRUCTURAL_PATH}#{MDWA::DSL::Entity.new(name).file_name}.rb"
+        file_name = "#{MDWA::DSL::STRUCTURAL_PATH}#{MDWA::DSL::Entity.new(name).file_name}.rb"
+        # if file doesn't exist, create it
+        # if file exists, include the in_requirements clause
+        if !File.exist?( Rails.root + file_name )
+          template 'entity.rb', file_name
+        else
+          append_to_file( file_name, "\nMDWA::DSL.entity('#{name.singularize.camelize}').in_requirements << '#{options.requirement}'" ) unless options.requirement.blank?
+        end
       end
     end # entity
   end #generators
-end #mdwa
+end #mdwa

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

@@ -11,7 +11,7 @@ MDWA::DSL.entities.register "<%= name.singularize.camelize %>" do |e|
   <%- end -%>
   <%- unless options.no_comments -%>
-  # e.purpose   = %q{To-do} # what this entity does?
+  # e.purpose   = %q{To-do} # what does this entity do?
   # 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?
@@ -21,14 +21,8 @@ MDWA::DSL.entities.register "<%= name.singularize.camelize %>" do |e|
   ##
   ## 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
+  # e.attribute 'name', 'string'
+  # e.attribute 'category', 'integer'
   ##
   ## Define entity associations
@@ -68,3 +62,7 @@ MDWA::DSL.entities.register "<%= name.singularize.camelize %>" do |e|
   <%- end -%>
 end
+<%- unless options.requirement.blank? -%>
+MDWA::DSL.entity('<%= name.singularize.camelize %>').in_requirements << '<%= options.requirement %>'
+<%- end -%>

data/lib/generators/mdwa/from_requirements/from_requirements_generator.rb CHANGED Viewed

@@ -15,7 +15,6 @@ module Mdwa
       #
       # Constructor
       # Require all entities to load the DSL of the application
-      #
       def initialize(*args, &block)
         super
@@ -36,14 +35,18 @@ module Mdwa
         # For all requirements, generate users and entities
         @requirements.each do |requirement|
+          puts "============================================================================="
+          puts "Generating transformation for requirement: '#{requirement.summary}'"
+          puts "============================================================================="
           # generate entities
           requirement.entities.each do |entity|
-            generate "mdwa:entity #{entity}" unless File.exist?("#{Rails.root}/#{MDWA::DSL::STRUCTURAL_PATH}#{MDWA::DSL::Entity.new(entity).file_name}.rb")
+            generate "mdwa:entity #{entity} --requirement=\"#{requirement.alias}\""
           end
           # generate users
           requirement.users.each do |user|
-            generate "mdwa:user #{user}" unless File.exist?("#{Rails.root}/#{MDWA::DSL::USERS_PATH}#{MDWA::DSL::Entity.new(user).file_name}.rb")
+            generate "mdwa:user #{user} --requirement=\"#{requirement.alias}\""
           end
         end

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

@@ -140,6 +140,16 @@ module Mdwa
     root :to => 'home#index'
   end
+  # Software visualization
+  namespace :mdwa do
+    controller :requirements do
+      get 'requirements/index' => 'requirements#index', :as => 'requirements'
+      get 'requirements/:alias' => 'requirements#show', :as => 'requirement'
+    end
+    root :to => 'requirements#index'
+  end
           "
         end
       end

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

@@ -6,6 +6,7 @@
  *= require ./template/reset
  *= require ./template/cssbase
  *= require ./template/template
+ *= require ./template/visualization
  *= require ./template/grid
  *= require_tree ../jquery
  *= require ./template/backend

data/lib/generators/mdwa/sandbox/templates/app/assets/stylesheets/mdwa/template/visualization.css ADDED Viewed

@@ -0,0 +1,3 @@
+body.mdwa_visualization {
+	background: #fff;
+}

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

@@ -1,7 +1,7 @@
 <%= form_for([:a, @administrator]) do |f| %>
   <div id="mdwa_error">
-   	<%%= render '/template/mdwa/crud_error', :object => @administrator %>
+   	<%= render '/template/mdwa/crud_error', :object => @administrator %>
   </div>
   <div class="yui3-g">

data/lib/generators/mdwa/sandbox/templates/config/initializers/mdwa_layout.rb CHANGED Viewed

@@ -6,4 +6,7 @@ MDWA::Layout::Base.config do |config|
   config['/a/users/passwords#*'] 		  = 'system'
   config['/a/users/sessions#new'] 	  = 'login'
   config['/a/users/sessions#create'] 	= 'login'
+  # Software visualization in development environment
+  config['/mdwa/*']                   = 'mdwa_visualization'
 end

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

@@ -89,7 +89,10 @@ module Mdwa
       def locales
-        append_file 'config/locales/mdwa_model_specific.en.yml', :after => "en:\n" do
+        locales_file = 'config/locales/mdwa_model_specific.en.yml'
+        create_file locales_file unless File.exist?(locales_file)
+        append_file locales_file, :after => "en:\n" do
           lines = []
           lines <<  "  #{@model.plural_name}:"
           lines <<  "    create_success: \"#{@model.singular_name.humanize} created.\""

data/lib/generators/mdwa/scaffold/templates/controllers/ajax_controller.rb CHANGED Viewed

@@ -6,16 +6,16 @@ class <%= @model.controller_name %>Controller < <%= @inherit_controller || 'Appl
 	def index
 		@<%= @model.plural_name %> = <%= @model.klass %>.paginate :page => params[:page]
-	    respond_to do |format|
-	      format.html
-	      format.js
-	    end
+    respond_to do |format|
+      format.html
+      format.js
+    end
 	end
 	def show
-	    @<%= @model.singular_name %> = <%= @model.klass %>.find(params[:id])
-	    render :layout => false
+    @<%= @model.singular_name %> = <%= @model.klass %>.find(params[:id])
+    render :layout => false
 	end
 	def new
@@ -34,8 +34,7 @@ class <%= @model.controller_name %>Controller < <%= @inherit_controller || 'Appl
 	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
+      load_list # loads all <%= @model.plural_name %> to display in the list
 	    respond_to do |format|
 	      format.js
@@ -46,8 +45,7 @@ class <%= @model.controller_name %>Controller < <%= @inherit_controller || 'Appl
 	    @<%= @model.singular_name %> = <%= @model.klass %>.find(params[:id])
 	    @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
+      load_list # loads all <%= @model.plural_name %> to display in the list
 	    respond_to do |format|
 	      format.js
@@ -58,8 +56,7 @@ class <%= @model.controller_name %>Controller < <%= @inherit_controller || 'Appl
 	    @<%= @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
+	    load_list # loads all <%= @model.plural_name %> to display in the list
 	    respond_to do |format|
 	      format.js

data/lib/generators/mdwa/template/template_generator.rb ADDED Viewed

@@ -0,0 +1,40 @@
+# -*- 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__)
+      argument :entities, :type => :array, :banner => 'Specific entities', :default => []
+      #
+      # Constructor
+      # Require all entities to load the DSL of the application
+      def initialize(*args, &block)
+        super
+        # include files with entities
+        # select entities that will be generated
+        inside Rails.root do
+          if entities.count.zero?
+            require_all MDWA::DSL::STRUCTURAL_PATH unless Dir.glob("#{MDWA::DSL::STRUCTURAL_PATH}/*.rb").count.zero?
+          else
+            files = entities.collect{ |e| "#{MDWA::DSL::STRUCTURAL_PATH}#{MDWA::DSL::Entity.new(e).file_name}.rb" }
+            require_all files.join(', ')
+          end
+        end
+        @all_entities = MDWA::DSL.entities.all
+      end
+    end
+  end
+end

data/lib/generators/mdwa/template/templates/views/view.custom.erb ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ Custom format.
2	+ Be sure to include this in /config/initializers/mime_types.rb

data/lib/generators/mdwa/template/templates/views/view.html.erb ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ <h1>HTML generated code</h1>
2	+ <p>Replace this with your own code</p>

data/lib/generators/mdwa/template/templates/views/view.js.erb ADDED Viewed

	@@ -0,0 +1 @@
1	+ alert('js.erb response');

data/lib/generators/mdwa/template/templates/views/view.json.erb ADDED Viewed

	@@ -0,0 +1 @@
1	+ <%%= {json_response: 'ok'}.to_json %>

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

@@ -0,0 +1,130 @@
+require 'erb'
+require 'mdwa/dsl'
+module Mdwa
+  module Generators
+    class TransformGenerator < Rails::Generators::Base
+      def initialize(*args, &block)
+        super
+        # include files with entities
+        # select entities that will be generated
+        inside Rails.root do
+          require_all MDWA::DSL::STRUCTURAL_PATH unless Dir.glob("#{MDWA::DSL::STRUCTURAL_PATH}/*.rb").count.zero?
+        end
+        @entities = MDWA::DSL.entities.all
+      end
+      def generate_model
+        @project_entity = MDWA::DSL.entity('Project')
+        generator_model = @project_entity.generator_model
+        mdwa_template "#{@project_entity.file_name}/model.rb", "app/models/#{generator_model.space}/#{generator_model.singular_name}.rb"
+      end
+      def generate_controller
+        @project_entity = MDWA::DSL.entity('Project')
+        generator_model = @project_entity.generator_model
+        mdwa_template "#{@project_entity.file_name}/controller.rb", "app/controllers/#{generator_model.space}/#{generator_model.plural_name}_controller.rb"
+      end
+      def generate_views
+        @project_entity = MDWA::DSL.entity('Project')
+        generator_model = @project_entity.generator_model
+        mdwa_template "#{@project_entity.file_name}/views/edit.html.erb", "app/views/#{generator_model.space}/#{generator_model.plural_name}/edit.html.erb"
+        mdwa_template "#{@project_entity.file_name}/views/index.html.erb", "app/views/#{generator_model.space}/#{generator_model.plural_name}/index.html.erb"
+        mdwa_template "#{@project_entity.file_name}/views/index.js.erb", "app/views/#{generator_model.space}/#{generator_model.plural_name}/index.js.erb"
+        mdwa_template "#{@project_entity.file_name}/views/new.html.erb", "app/views/#{generator_model.space}/#{generator_model.plural_name}/new.html.erb"
+        mdwa_template "#{@project_entity.file_name}/views/show.html.erb", "app/views/#{generator_model.space}/#{generator_model.plural_name}/show.html.erb"
+        mdwa_template "#{@project_entity.file_name}/views/_form.html.erb", "app/views/#{generator_model.space}/#{generator_model.plural_name}/_form.html.erb"
+        mdwa_template "#{@project_entity.file_name}/views/_form_fields.html.erb", "app/views/#{generator_model.space}/#{generator_model.plural_name}/_form_fields.html.erb"
+        mdwa_template "#{@project_entity.file_name}/views/_list.html.erb", "app/views/#{generator_model.space}/#{generator_model.plural_name}/_#{generator_model.plural_name}.html.erb"
+        if @project_entity.ajax?
+          mdwa_template "#{@project_entity.file_name}/views/create.js.erb", "app/views/#{generator_model.space}/#{generator_model.plural_name}/create.js.erb"
+          mdwa_template "#{@project_entity.file_name}/views/update.js.erb", "app/views/#{generator_model.space}/#{generator_model.plural_name}/update.js.erb"
+          mdwa_template "#{@project_entity.file_name}/views/destroy.js.erb", "app/views/#{generator_model.space}/#{generator_model.plural_name}/destroy.js.erb"
+        end
+      end
+      def generate_routes
+        @project_entity = MDWA::DSL.entity('Project')
+        generator_model = @project_entity.generator_model
+        route 'mdwa_router(self)'
+        append_to_file 'config/routes.rb', "require File.expand_path('../../app/mdwa/templates/routes.rb', __FILE__)"
+        insert_into_file path_to_routes, :after => "controller :#{generator_model.plural_name} do" do
+          routes = []
+          @project_entity.actions.generate_routes.each do |action_name, generation_string|
+            routes << "\n\t\t\t#{generation_string}"
+          end
+          routes.join
+        end
+      end
+      def generate_locales
+      end
+      def generate_migration
+        @project_entity = MDWA::DSL.entity('Project')
+        generator_model = @project_entity.generator_model
+        migration_string = []
+        # create table
+        migration_string << "\n\tdef self.up"
+        migration_string << "\t\tcreate_table :#{generator_model.plural_name} do |t|"
+        generator_model.simple_attributes.each do |attr|
+        	migration_string << "\t\t\tt.#{attr.migration_field} :#{attr.name}"
+      	end
+        migration_string << "\t\t\tt.timestamps"
+        migration_string << "\t\tend\n\tend"
+        # drop table
+        migration_string << "\n\tdef self.down"
+        migration_string << "\t\tdrop_table :#{generator_model.plural_name}"
+        migration_string << "\tend"
+        migration_name = "create_#{generator_model.plural_name}"
+        migration_from_string(migration_name, migration_string.join("\n"))
+        rake('db:migrate') if yes?('Run rake db:migrate')
+      end
+      def generate_tests
+      end
+      private
+        def mdwa_template(file_to_read, file_to_write)
+          read = File.read("#{Rails.root}/#{MDWA::DSL::TEMPLATES_PATH}/#{file_to_read}")
+          erb = ERB.new(read, nil, '-')
+          create_file "#{Rails.root}/#{file_to_write}", erb.result, :force => true
+        end
+        def migration_from_string(file_name, migration_string)
+          # migration number
+          if ActiveRecord::Base.timestamped_migrations
+            @migration_number = Time.now.utc.strftime("%Y%m%d%H%M%S")
+          else
+            @migration_number = "%.3d" % (current_migration_number(Rails.root + 'db/migrate') + 1)
+          end
+          # incluir classe na migration
+          migration_string = "# -*- encoding : utf-8 -*-\nclass #{file_name.camelize} < ActiveRecord::Migration\n#{migration_string}\nend"
+          create_file "#{Rails.root}/db/migrate/#{@migration_number}_#{file_name}.rb", migration_string
+        end
+    end
+  end
+end

data/lib/generators/mdwa/user/templates/user.rb CHANGED Viewed

@@ -10,3 +10,7 @@ MDWA::DSL.users.register '<%= @user %>' do |u|
   # u.user_roles = ['<%= @user %>']
 end
+<%- unless options.requirement.blank? -%>
+MDWA::DSL.user('<%= @user %>').in_requirements << '<%= options.requirement %>'
+<%- end -%>

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

@@ -12,16 +12,25 @@ module Mdwa
       attr_accessor :user
       argument :user_name
+      class_option :requirement, :type => :string, :desc => 'Requirement alias'
       def initialize(*args, &block)
         super
         @user = user_name.singularize.camelize
       end
       def generate_user
-        template 'user.rb', "#{MDWA::DSL::USERS_PATH}#{@user.underscore}.rb"
-        generate "mdwa:entity #{@user} --user"
+        file_name = "#{MDWA::DSL::USERS_PATH}#{@user.underscore}.rb"
+        # if file doesn't exist, create it
+        # if file exists, include the in_requirements clause
+        if !File.exist?( Rails.root + file_name )
+          template 'user.rb', file_name
+        else
+          append_to_file( file_name, "\nMDWA::DSL.user('#{@user}').in_requirements << '#{options.requirement}'" ) unless options.requirement.blank?
+        end
+        generate "mdwa:entity #{@user} --user --requirement=\"#{options.requirement}\""
       end
     end # class user generator

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

@@ -54,73 +54,73 @@ module Mdwa
           @model.add_attribute MDWA::Generators::ModelAttribute.new( attribute ) unless User.accessible_attributes.to_a.include?( attribute.split(':').first )
         end
-        generate "mdwa:scaffold #{scaffold_name} name:string email:string password:password password_confirmation:password #{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"
+        generate "mdwa:scaffold #{scaffold_name} name:string email:string password:password password_confirmation:password #{@model.attributes.collect{|a| a.raw}.join(' ')} #{'--force' if options.force} #{'--ajax' if options.ajax} #{"model=#{options.model}" if options.model} #{'--skip_interface' if options.skip_interface} #{'--only_interface' if options.only_interface} #{'--skip_rake_migrate' if options.skip_rake_migrate} #{'--skip_timestamp' if options.skip_timestamp} #{'--skip_questions' if options.skip_questions} --skip-migrations"
       end
       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_override
-        # locate the mdwa user to discover the roles
-        require_all "#{MDWA::DSL::USERS_PATH}#{@model.singular_name}.rb"
-        @mdwa_user = MDWA::DSL.user(@model.name)
-        if @mdwa_user.nil?
-          @roles = [@model.name]
-        else
-          @roles = @mdwa_user.user_roles
-        end
-        # model override
-        gsub_file "app/models/#{@model.space}/#{@model.singular_name}.rb", 'ActiveRecord::Base', 'User'
-        inject_into_class "app/models/#{@model.space}/#{@model.singular_name}.rb", @model.model_class do
-          inj = []
-          @roles.each do |role|
-            inj << "\n\n\tafter_create :create_#{role.underscore}_permission\n"
-            inj << "\tdef create_#{role.underscore}_permission"
-            inj << "\t\t#{role.underscore}_permission = Permission.find_by_name('#{role.underscore}')"
-            inj << "\t\t#{role.underscore}_permission = Permission.create(:name => '#{role.underscore}') if #{role.underscore}_permission.nil?"
-            inj << "\t\tself.permissions.push #{role.underscore}_permission"
-            inj << "\tend"
-          end
-          inj.join("\n")
-        end
-      end
-      def migration_override
-        # override model attributes to not allow field duplicity (causing errors)
-        @model.attributes = []
-        attributes.each do |attribute|
-          @model.add_attribute MDWA::Generators::ModelAttribute.new( attribute ) unless @predefined_fields.include?( attribute.split(':').first )
-        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
+         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_override
+         # locate the mdwa user to discover the roles
+         require_all "#{MDWA::DSL::USERS_PATH}#{@model.singular_name}.rb"
+         @mdwa_user = MDWA::DSL.user(@model.name)
+         if @mdwa_user.nil?
+           @roles = [@model.name]
+         else
+           @roles = @mdwa_user.user_roles
+         end
+         # model override
+         gsub_file "app/models/#{@model.space}/#{@model.singular_name}.rb", 'ActiveRecord::Base', 'User'
+         inject_into_class "app/models/#{@model.space}/#{@model.singular_name}.rb", @model.model_class do
+           inj = []
+           @roles.each do |role|
+             inj << "\n\n\tafter_create :create_#{role.underscore}_permission\n"
+             inj << "\tdef create_#{role.underscore}_permission"
+             inj << "\t\t#{role.underscore}_permission = Permission.find_by_name('#{role.underscore}')"
+             inj << "\t\t#{role.underscore}_permission = Permission.create(:name => '#{role.underscore}') if #{role.underscore}_permission.nil?"
+             inj << "\t\tself.permissions.push #{role.underscore}_permission"
+             inj << "\tend"
+           end
+           inj.join("\n")
+         end
+       end
+       def migration_override
+         # override model attributes to not allow field duplicity (causing errors)
+         @model.attributes = []
+         attributes.each do |attribute|
+           @model.add_attribute MDWA::Generators::ModelAttribute.new( attribute ) unless @predefined_fields.include?( attribute.split(':').first )
+         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

data/lib/mdwa/dsl.rb CHANGED Viewed

@@ -23,6 +23,7 @@ module MDWA
     USERS_PATH        = 'app/mdwa/users/'
     WORKFLOW_PATH     = 'app/mdwa/workflow/'
     REQUIREMENTS_PATH = 'app/mdwa/requirements/'
+    TEMPLATES_PATH    = 'app/mdwa/templates/'
   end
 end

data/lib/mdwa/dsl/entities.rb CHANGED Viewed

@@ -22,6 +22,7 @@ module MDWA
         # retrive or initialize a entity
         entity = element(name) || Entity.new( name )
         yield(entity) if block_given?
+        entity.after_declaration
         add_node entity # add to the list
       end

data/lib/mdwa/dsl/entity.rb CHANGED Viewed

@@ -7,7 +7,7 @@ module MDWA
     class Entity
       attr_accessor :name, :resource, :user, :purpose, :scaffold_name, :model_name, :ajax, :force
-      attr_accessor :attributes, :associations, :actions, :specifications, :code_generations
+      attr_accessor :attributes, :associations, :actions, :specifications, :code_generations, :in_requirements
       def initialize( name )
         # set the entity name
@@ -19,6 +19,7 @@ module MDWA
         self.actions          = EntityActions.new(self)
         self.specifications   = []
         self.code_generations = []
+        self.in_requirements  = []
         # fixed attributes
         self.resource    = true
@@ -54,6 +55,10 @@ module MDWA
         self.resource
       end
+      def ajax?
+        self.ajax
+      end
       def force?
         self.force
       end
@@ -62,12 +67,25 @@ module MDWA
         self.user
       end
+      #
+      # Executed after the entity is declared, but before the inclusion in the entities singleton array.
+      #
+      def after_declaration
+        # if it's a user and have no attributes, include "name" to prevent errors
+        if user? and attributes.count.zero?
+          self.attribute('name', 'string')
+        end
+      end
       #
       # Declares one attribute of the list using the block given.
       #
-      def attribute
+      def attribute(name, type)
         attr = EntityAttribute.new(self)
-        yield( attr ) if block_given?
+        attr.name = name
+        attr.type = type
         attr.raise_errors_if_invalid!
         self.attributes[attr.name] = attr
       end
@@ -110,7 +128,16 @@ module MDWA
       # Return an instance of Generators::Model
       #
       def generator_model
-        Generators::Model.new(self.model_name)
+        @generator_model = Generators::Model.new(self.model_name)
+        self.attributes.values.each do |attribute|
+          @generator_model.add_attribute Generators::ModelAttribute.new( "#{attribute.name}:#{attribute.type}" )
+        end
+        self.associations.values.each do |association|
+          model1 = Generators::Model.new(self.model_name)
+          model2 = Generators::Model.new(DSL.entity(association.destination).model_name)
+          @generator_model.associations << Generators::ModelAssociation.new(model1, model2, association.generator_type)
+        end
+        return @generator_model
       end
       #

data/lib/mdwa/dsl/user.rb CHANGED Viewed

@@ -5,9 +5,11 @@ module MDWA
     class User
       attr_accessor :name, :description, :user_roles
+      attr_accessor :in_requirements
       def initialize(name)
         self.name = name.camelize
+        self.in_requirements = []
         self.clear_user_roles
       end

data/lib/mdwa/generators/model.rb CHANGED Viewed

@@ -5,7 +5,7 @@ module MDWA
 	module Generators
 		class Model
-			attr_accessor :name, :namespace, :attributes, :specific_model_name
+			attr_accessor :name, :namespace, :attributes, :specific_model_name, :associations
       #
 			# Sets the variables by the string
@@ -18,6 +18,7 @@ module MDWA
     		self.name = arg.split('/').last.singularize.camelize
     		self.attributes = []
+    		self.associations = []
 			end
 			def valid?
@@ -53,7 +54,8 @@ module MDWA
 			end
 			def object_name
-				space + '_' + singular_name
+			  return (space + '_' + singular_name) if !space.blank?
+			  return singular_name
 			end
 			def to_params

data/lib/mdwa/version.rb CHANGED Viewed

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module MDWA
-  VERSION = "3.0.4"
+  VERSION = "3.0.6"
 end

data/mdd.gemspec CHANGED Viewed

@@ -13,14 +13,14 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "mdd"
-  s.add_dependency 'rails'
-  s.add_dependency 'jquery-rails'
-  s.add_dependency 'devise'
-  s.add_dependency 'cancan'
-  s.add_dependency 'will_paginate'
-  s.add_dependency 'nested_form'
-  s.add_dependency 'require_all'
-  s.add_development_dependency 'minitest'
+  s.add_dependency 'rails', '>= 3.1'
+  s.add_dependency 'jquery-rails', '>= 2.0'
+  s.add_dependency 'devise', '>= 2.1'
+  s.add_dependency 'cancan', '>= 1.6'
+  s.add_dependency 'will_paginate', '>= 3.0'
+  s.add_dependency 'nested_form', '>= 0.2'
+  s.add_dependency 'require_all', '>= 1.2.1'
+  s.add_development_dependency 'minitest', '>= 3.3'
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/test/entity_test.rb CHANGED Viewed

@@ -14,22 +14,10 @@ describe MDWA::DSL::Entities do
       e.ajax      = true
       ## attributes
-      e.attribute do |attr|
-        attr.name = 'name'
-        attr.type = 'string'
-      end
-      e.attribute do |attr|
-        attr.name = 'category'
-        attr.type = 'integer'
-      end
-      e.attribute do |attr|
-        attr.name = 'stock'
-        attr.type = 'integer'
-      end
-      e.attribute do |attr|
-        attr.name = 'published'
-        attr.type = 'boolean'
-      end
+      e.attribute 'name', 'string'
+      e.attribute 'category', 'integer'
+      e.attribute 'stock', 'integer'
+      e.attribute 'published', 'boolean'
       ## associations
       e.association do |a|
@@ -83,10 +71,7 @@ describe MDWA::DSL::Entities do
     # create category entity
     MDWA::DSL.entities.register "Category" do |e|
       e.resource = false
-      e.attribute do |attr|
-        attr.name = 'name'
-        attr.type = 'string'
-      end
+      e.attribute 'name', 'string'
     end
     MDWA::DSL.entity("Category").must_be_instance_of MDWA::DSL::Entity
   end
@@ -171,18 +156,9 @@ describe MDWA::DSL::Entities do
       p.scaffold_name = 'a/project'
       p.ajax = true
-      p.attribute do |a|
-        a.name = 'nome'
-        a.type = 'string'
-      end
-      p.attribute do |a|
-        a.name = 'ativo'
-        a.type = 'boolean'
-      end
-      p.attribute do |a|
-        a.name = 'situacao_atual'
-        a.type = 'text'
-      end
+      p.attribute 'nome', 'string'
+      p.attribute 'ativo', 'boolean'
+      p.attribute 'situacao_atual', 'text'
       p.association do |assoc|
         assoc.destination = 'Group'
@@ -196,15 +172,8 @@ describe MDWA::DSL::Entities do
       p.ajax = true
       p.force = true
-      p.attribute do |a|
-        a.name = 'nome'
-        a.type = 'string'
-      end
-      p.attribute do |a|
-        a.name = 'ativo'
-        a.type = 'boolean'
-      end
+      p.attribute 'nome', 'string'
+      p.attribute 'ativo', 'boolean'
     end
     project = MDWA::DSL.entity("Project")
@@ -224,19 +193,25 @@ describe MDWA::DSL::Entities do
       p.ajax = true
       p.force = true
-      p.attribute do |a|
-        a.name = 'name'
-        a.type = 'string'
-      end
-      p.attribute do |a|
-        a.name = 'active'
-        a.type = 'boolean'
-      end
+      p.attribute 'name', 'string'
+      p.attribute 'active', 'boolean'
     end
     task = MDWA::DSL.entity('Task')
     task.generate.must_equal nil
   end
+  it "should create default attribute for user entity" do
+    MDWA::DSL.entities.register "TeamMember" do |p|
+      p.resource = true
+      p.ajax = true
+      p.user = true
+    end
+    team_member = MDWA::DSL.entity('TeamMember')
+    team_member.attributes.count.must_equal 1
+    team_member.attributes['name'].name.must_equal 'name'
+    team_member.attributes['name'].type.must_equal 'string'
+  end
 end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mdd
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.6
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-08-08 00:00:00.000000000 Z
+date: 2012-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: cancan
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: nested_form
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: require_all
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
 description: Implements a set of tools for code generation for Rails apps. It's based
   on Theodoro's MDWA approach for web applications.
 email:
@@ -153,7 +153,11 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- app/controllers/mdwa/mdwa_controller.rb
+- app/controllers/mdwa/requirements_controller.rb
 - app/helpers/mdwa_helper.rb
+- app/views/layouts/mdwa_visualization.html.erb
+- app/views/mdwa/requirements/index.html.erb
 - app/views/template/mdwa/_autocomplete_tag.html.erb
 - app/views/template/mdwa/_crud_error.html.erb
 - app/views/template/mdwa/_login_text.html.erb
@@ -251,6 +255,7 @@ files:
 - lib/generators/mdwa/sandbox/templates/app/assets/stylesheets/mdwa/template/leftbar.css.erb
 - lib/generators/mdwa/sandbox/templates/app/assets/stylesheets/mdwa/template/reset.css
 - lib/generators/mdwa/sandbox/templates/app/assets/stylesheets/mdwa/template/template.css.erb
+- lib/generators/mdwa/sandbox/templates/app/assets/stylesheets/mdwa/template/visualization.css
 - lib/generators/mdwa/sandbox/templates/app/controllers/a/administrators_controller.rb
 - lib/generators/mdwa/sandbox/templates/app/controllers/a/backend_controller.rb
 - lib/generators/mdwa/sandbox/templates/app/controllers/a/home_controller.rb
@@ -319,6 +324,12 @@ files:
 - lib/generators/mdwa/scaffold/templates/views/index.js.erb
 - lib/generators/mdwa/scaffold/templates/views/new.html.erb
 - lib/generators/mdwa/scaffold/templates/views/show.html.erb
+- lib/generators/mdwa/template/template_generator.rb
+- lib/generators/mdwa/template/templates/views/view.custom.erb
+- lib/generators/mdwa/template/templates/views/view.html.erb
+- lib/generators/mdwa/template/templates/views/view.js.erb
+- lib/generators/mdwa/template/templates/views/view.json.erb
+- lib/generators/mdwa/transform/transform_generator.rb
 - lib/generators/mdwa/user/templates/user.rb
 - lib/generators/mdwa/user/user_generator.rb
 - lib/generators/mdwa/user_scaffold/USAGE
@@ -378,15 +389,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4288068741970845227
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4288068741970845227
 requirements: []
 rubyforge_project: mdd
-rubygems_version: 1.8.22
+rubygems_version: 1.8.24
 signing_key:
 specification_version: 3
 summary: MDD-based code generation tools to avoid repetitive tasks in Rails dev.