mdd 3.1.0 → 3.1.1

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

@@ -13,4 +13,4 @@ end
 
 <%- unless options.requirement.blank? -%>
 MDWA::DSL.user('<%= @user %>').in_requirements << '<%= options.requirement %>'
-<%- end -%>
+<%- end -%>

data/lib/generators/mdwa/user_scaffold/templates/migrate.erb

@@ -2,9 +2,13 @@
 class Add<%= @model.attributes.collect{|a| a.name.camelize}.join('') %>ToUsers < ActiveRecord::Migration
 
 	def self.up
-		<%- @model.simple_attributes.each do |attr| -%>
-			<%- if !attr.type.to_sym == :file -%>
+		<%- @model.attributes.each do |attr| -%>
+			<%- if attr.type.to_sym != :file -%>
+				<%- if attr.belongs_to? or attr.nested_one? -%>
+				add_column :users, :<%= attr.name %>, :integer
+				<%- elsif !attr.references? -%>
 				add_column :users, :<%= attr.name %>, :<%= attr.migration_field %>
+	      <%- end -%>
 			<%- else -%>
 				add_column :users, :<%= attr.name %>_file_name, :string
 				add_column :users, :<%= attr.name %>_content_type, :string
@@ -15,9 +19,13 @@ class Add<%= @model.attributes.collect{|a| a.name.camelize}.join('') %>ToUsers <
 	end
 
 	def self.down 
-		<%- @model.simple_attributes.each do |attr| -%>
-			<%- if !attr.type.to_sym == :file -%>
+		<%- @model.attributes.each do |attr| -%>
+			<%- if attr.type.to_sym != :file -%>
+				<%- if attr.belongs_to? or attr.nested_one? -%>
 				remove_column :users, :<%= attr.name %>
+				<%- elsif !attr.references? -%>
+				remove_column :users, :<%= attr.name %>
+	      <%- end -%>
 			<%- else -%>
 				remove_column :users, :<%= attr.name %>_file_name
 				remove_column :users, :<%= attr.name %>_content_type

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

@@ -52,7 +52,10 @@ module Mdwa
         
         # 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 )
+          attr_name = attribute.split(':').first
+          if !User.accessible_attributes.to_a.include?( attr_name )
+            @model.add_attribute MDWA::Generators::ModelAttribute.new( attribute )
+          end
         end
         
         unless options.only_diff_migration
@@ -72,7 +75,11 @@ module Mdwa
           # add to model attributes
           # if it's not predefined in devise
           # if it's a belongs_to or nested_one association
-          if (!attr.references? and !@predefined_fields.include?( attribute.split(':').first )) or attr.belongs_to? or attr.nested_one?
+          if (!attr.references? and !@predefined_fields.include?(attribute.split(':').first)) or 
+             (
+              (attr.belongs_to? or attr.nested_one?) and 
+              User.column_names.to_a.select {|user_attr| user_attr == attr.name.foreign_key}.count.zero?
+              )
             @model.add_attribute attr
           end
         end

data/lib/mdwa/dsl/entity.rb

@@ -33,7 +33,7 @@ module MDWA
       end
       
       def scaffold_name
-        return (@scaffold_name.blank? ? name : @scaffold_name)
+        return (@scaffold_name.blank? ? name.underscore : @scaffold_name)
       end
       
       def model_name
@@ -72,15 +72,16 @@ module MDWA
       #
       def after_declaration
         
+        # include rails default attributes
+        self.attribute('id', 'integer') if self.attributes['id'].blank?
+        self.attribute('created_at', 'datetime') if self.attributes['created_at'].blank?
+        self.attribute('updated_at', 'datetime') if self.attributes['updated_at'].blank?
         # if it's a user and have no attributes, include "name" to prevent errors
-        self.attribute('id', 'integer')
-        self.attribute('created_at', 'datetime')
-        self.attribute('updated_at', 'datetime')
         if user?
-          self.attribute('name', 'string')
-          self.attribute('email', 'string')
-          self.attribute('password', 'password')
-          self.attribute('password_confirmation', 'password')
+          self.attribute('name', 'string') if self.attributes['name'].blank?
+          self.attribute('email', 'string') if self.attributes['email'].blank?
+          self.attribute('password', 'password') if self.attributes['password'].blank?
+          self.attribute('password_confirmation', 'password') if self.attributes['password_confirmation'].blank?
         end
         
       end
@@ -91,8 +92,8 @@ module MDWA
         attr = EntityAttribute.new(self)
         attr.name = name
         attr.type = type
-        attr.default = options[:default] unless options[:default].blank?
-        attr.style = options[:style] unless options[:style].blank?
+        attr.default = true if options.include?(:default) and options[:default]
+        attr.options = options
         attr.raise_errors_if_invalid!
         self.attributes[attr.name] = attr
       end

data/lib/mdwa/dsl/entity_association.rb

@@ -5,7 +5,7 @@ module MDWA
     class EntityAssociation
       
       attr_accessor :source, :destination, :destination_view
-      attr_accessor :name, :type, :composition, :description, :skip_views, :style
+      attr_accessor :name, :type, :composition, :description, :skip_views, :options
       
       ACCEPTED_TYPES = [:one_to_many, :many_to_one, :one_to_one, :one_to_one_not_navigable, :many_to_many]
       
@@ -13,6 +13,7 @@ module MDWA
         self.source = source
         self.composition = false
         self.skip_views = false
+        self.options = {}
       end
       
       #
@@ -20,7 +21,7 @@ module MDWA
       # Sets the name if not set yet.
       # 
       def destination=(value)
-        self.name = value.downcase if self.name.blank?
+        self.name = value.underscore if self.name.blank?
         @destination = value
       end
       
@@ -31,7 +32,14 @@ module MDWA
       def skip_views!
         self.skip_views = true
       end
-      
+
+      #
+      # Return the model association generator.
+      #
+      def to_model_association
+        self.source.generator_model.associations.select{ |m_assoc| m_assoc.model2.name.underscore == self.name.underscore }.first
+      end
+
       #
       # Return the mapped type for the code generation.
       #

data/lib/mdwa/dsl/entity_attribute.rb

@@ -6,7 +6,7 @@ module MDWA
 
     class EntityAttribute
       
-      attr_accessor :entity, :name, :type, :default, :style
+      attr_accessor :entity, :name, :type, :default, :options
       
       ACCEPTED_TYPES = MDWA::Generators::ModelAttribute::STATIC_TYPES
       
@@ -40,6 +40,13 @@ module MDWA
         "#{name}:#{type}"
       end
       
+      #
+      # Return the model attribute generator.
+      #
+      def to_model_attribute
+        self.entity.generator_model.attributes.select{ |m_attr| m_attr.name == self.name }.first
+      end
+
     end
     
   end

data/lib/mdwa/dsl/process.rb

@@ -1,4 +1,6 @@
 # -*- encoding : utf-8 -*-
+require 'extensions/string'
+
 module MDWA
   module DSL
     

data/lib/mdwa/dsl/process_detail.rb

@@ -1,5 +1,7 @@
 # -*- encoding : utf-8 -*-
 require 'ostruct'
+require 'extensions/string'
+
 module MDWA
   module DSL
     

data/lib/mdwa/dsl/process_detail_next_action.rb

@@ -1,4 +1,6 @@
 # -*- encoding : utf-8 -*-
+require 'extensions/string'
+
 module MDWA
   module DSL
     
@@ -7,7 +9,7 @@ module MDWA
       attr_accessor :alias, :method, :request, :redirect, :render, :when
       
       def initialize(next_action_alias)
-        self.alias = next_action_alias
+        self.alias = next_action_alias.to_alias
       end
       
     end

data/lib/mdwa/dsl/requirement.rb

@@ -1,4 +1,6 @@
 # -*- encoding : utf-8 -*-
+require 'extensions/string'
+
 module MDWA
   module DSL
     
@@ -12,9 +14,10 @@ module MDWA
         self.users    = []
         self.entities = []
       end
-      
-      def alias
-        @alias ||= self.summary.to_alias
+
+      def summary=(summary)
+        @summary = summary
+        @alias = summary.to_alias unless summary.nil?
       end
       
       def non_functional?

data/lib/mdwa/dsl/requirements.rb

@@ -53,7 +53,7 @@ module MDWA
     end
     
     def self.requirement(name)
-      self.requirements.element(name)
+      self.requirements.element(name.to_sym)
     end
 
     

data/lib/mdwa/dsl/workflow.rb

@@ -49,7 +49,7 @@ module MDWA
     end
     
     def self.process(name)
-      self.workflow.element(name)
+      self.workflow.element(name.to_sym)
     end
 
     

data/lib/mdwa/generators/model.rb

@@ -107,10 +107,18 @@ module MDWA
 				model_attribute.model = self
 			end
 
+			def add_association(model_association)
+				self.associations << model_association
+			end
+
 			def simple_attributes
 				attributes.select{ |a| !a.references? }
 			end
 
+			def to_sym
+				self.name.to_sym
+			end
+
 			private 
 				def namespace_scope
           return "#{namespace}::" if namespace?

data/lib/mdwa/generators/model_association.rb

@@ -84,6 +84,15 @@ module MDWA
 			def has_and_belongs_to_many?
 				return (relation == 'has_and_belongs_to_many')
 			end
+
+
+      def filter_input(destination_field)
+        input = []
+        input << "render '/template/mdwa/autocomplete_tag', :dom_element => '##{self.model2.name.underscore}', :dom_element_id => '##{self.model2.name.underscore}_id', :data => #{model2.klass}.all, :field_name => '#{destination_field}'"
+        input << "text_field_tag :#{self.model2.name.underscore}"
+        input << "hidden_field_tag :#{self.model2.name.underscore}_id"
+        return input
+      end
       
     end
     

data/lib/mdwa/generators/model_attribute.rb

@@ -52,33 +52,55 @@ module MDWA
 
 			def migration_field
 				@migration_field ||= case self.type.to_s.to_sym
-		          when :string, :file, :password  then 'string'
-		          when :boolean                   then 'boolean'
-		          when :date 				              then 'date'
-		          when :datetime                  then 'datetime'
-		          when :decimal, :float           then 'decimal'
-		          when :text 				              then 'text'
-		          when :time 				              then 'time'
-		          when :timestamp 			          then 'timestamp'
-		          else
-		            'integer'
-		        end
+          when :string, :password         then 'string'
+          when :boolean                   then 'boolean'
+          when :date 				              then 'date'
+          when :datetime                  then 'datetime'
+          when :decimal, :float           then 'decimal'
+          when :text 				              then 'text'
+          when :time 				              then 'time'
+          when :timestamp 			          then 'timestamp'
+          when :file                      then 'attachment'
+          else
+            'integer'
+        end
 			end
 
 			def form_field
-		        @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'
-		          when :time                 then 'time_select'
-		          when :datetime, :timestamp then 'datetime_select'
-		          when :date                 then 'date_select'
-		          when :text                 then 'text_area'
-		          when :boolean              then 'check_box'
-	            when :password             then 'password_field'  
-		          else
-		            'text_field'
-		        end
+        @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'
+          when :time                 then 'time_select'
+          when :datetime, :timestamp then 'datetime_select'
+          when :date                 then 'date_select'
+          when :text                 then 'text_area'
+          when :boolean              then 'check_box'
+          when :password             then 'password_field'  
+          else
+            'text_field'
+        end
+			end
+
+			def filter_input
+				input = []
+        case self.type.to_s.to_sym
+          when :text, :string then
+          	input << "text_field_tag :#{self.name}"
+         	when :integer, :float, :decimal then
+          	input << "text_field_tag :#{self.name}, '', :onkeypress => \"mascara(this, checaNumero)\", :maxlength => 10"
+          when :file, :password then 
+          	input << 'No possible filter for file or password.'
+          when :time then 
+          	input << 'time_select'
+          when :datetime, :timestamp, :date then 
+          	input << "text_field_tag :#{self.name}_0, '', :class => :datepicker, :onkeypress => \"mascara(this, checaData)\", :maxlength => 10"
+          	input << "text_field_tag :#{self.name}_1, '', :class => :datepicker, :onkeypress => \"mascara(this, checaData)\", :maxlength => 10"
+          when :boolean then
+          	input << "select_tag :#{self.name}, options_for_select([[t('system.yes'), 1], [t('system.no'), 0]]), :prompt => t('system.both')"
+          else
+          	input << "text_field_tag :#{self.name}"
+        end
 			end
 
 			def belongs_to?

data/lib/mdwa/version.rb

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

data/mdd.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "mdd"
   
-  s.add_dependency 'rails', '>= 3.2.11'
+  s.add_dependency 'rails', '>= 3.2.8'
   s.add_dependency 'jquery-rails', '>= 2.2.0'
   s.add_dependency 'devise', '>= 2.1'
   s.add_dependency 'cancan', '>= 1.6'

data/test/entity_attributes_options_test.rb

@@ -0,0 +1,43 @@
+# -*- encoding : utf-8 -*-
+require 'mdwa/dsl'
+
+require 'minitest/spec'
+require 'minitest/autorun'
+
+describe MDWA::DSL::EntityAttribute do
+  
+  before do
+    # create product entity
+    MDWA::DSL.entities.register "Pessoa" do |e|
+      e.resource  = true
+      e.ajax      = true
+
+      e.attribute 'nome', 'string', default: true, filtered: true
+      e.attribute 'documento', 'string', filtered: true
+      e.attribute 'endereco', 'string'
+      e.attribute 'campo', 'string', filtered: false
+    end 
+  end
+  
+  it "should store attributes correctly" do 
+    entidade = MDWA::DSL.entity('Pessoa')
+
+    entidade.attributes.count.must_equal 7
+    entidade.attributes['nome'].options.count.must_equal 2
+    entidade.attributes['nome'].default.must_equal true
+    entidade.attributes['nome'].options[:filtered].must_equal true
+    entidade.attributes['nome'].options[:outro].must_equal nil
+
+    entidade.attributes['documento'].options.count.must_equal 1
+    entidade.attributes['documento'].default.must_equal false
+    entidade.attributes['documento'].options[:filtered].must_equal true
+    entidade.attributes['documento'].options[:outro].must_equal nil
+
+    entidade.attributes['endereco'].options.count.must_equal 0
+    entidade.attributes['endereco'].default.must_equal false
+    entidade.attributes['endereco'].options[:filtered].must_equal nil
+
+    entidade.attributes.values.select{|attr| attr.options[:filtered]}.count.must_equal 2
+  end
+
+end

data/test/entity_test.rb

@@ -90,7 +90,7 @@ describe MDWA::DSL::Entities do
     product.ajax.must_equal true
     product.associations.must_be_instance_of Hash
     product.attributes.must_be_instance_of Hash
-    product.model_name.must_equal( "Product" )
+    product.model_name.must_equal( "product" )
     
     category = MDWA::DSL.entity("Category")
     category.must_be_instance_of MDWA::DSL::Entity
@@ -109,7 +109,7 @@ describe MDWA::DSL::Entities do
   it "must store attributes" do 
     product = MDWA::DSL.entity("Product")
     
-    product.attributes.count.must_equal 4
+    product.attributes.count.must_equal 7
     product.attributes['name'].type.must_equal 'string'
     product.attributes['name'].name.must_equal 'name'
     product.attributes['category'].type.must_equal 'integer'
@@ -122,7 +122,7 @@ describe MDWA::DSL::Entities do
     product.default_attribute.name.must_equal 'name'
     
     category = MDWA::DSL.entity("Category")
-    category.attributes.count.must_equal 1
+    category.attributes.count.must_equal 4
     category.default_attribute.name.must_equal 'name'
   end
   
@@ -182,8 +182,8 @@ describe MDWA::DSL::Entities do
     project.scaffold_name.must_equal 'a/project'
     project.model_name.must_equal 'a/project'
     
-    project.generate.must_equal "mdwa:scaffold a/project nome:string ativo:boolean situacao_atual:text group:a/group:nome:belongs_to --ajax"
-    group.generate.must_equal "mdwa:scaffold a/group nome:string ativo:boolean --ajax --force"
+    project.generate.must_equal "mdwa:scaffold a/project nome:string ativo:boolean situacao_atual:text id:integer created_at:datetime updated_at:datetime group:a/group:nome:belongs_to --ajax"
+    group.generate.must_equal "mdwa:scaffold a/group nome:string ativo:boolean id:integer created_at:datetime updated_at:datetime --ajax --force"
   end
   
   it "should not generate non-resource entities" do
@@ -209,7 +209,7 @@ describe MDWA::DSL::Entities do
     end
     
     team_member = MDWA::DSL.entity('TeamMember')
-    team_member.attributes.count.must_equal 1
+    team_member.attributes.count.must_equal 7
     team_member.attributes['name'].name.must_equal 'name'
     team_member.attributes['name'].type.must_equal 'string'
   end