mdd 3.0.0 → 3.0.1

data/lib/mdwa/dsl/entity.rb

@@ -1,38 +1,123 @@
 # -*- encoding : utf-8 -*-
-require 'ostruct'
+require 'mdwa/generators'
 
 module MDWA
   module DSL
 
     class Entity
       
-      attr_accessor :name, :resource, :purpose, :model_name, :ajax, :generated, :force
-      attr_accessor :attributes, :associations
+      attr_accessor :name, :resource, :user, :purpose, :scaffold_name, :model_name, :ajax, :generated, :force
+      attr_accessor :attributes, :associations, :code_generations
       
       def initialize( name )
         # set the entity name
         self.name = name
         
         # fixed attributes
-        self.resource    = false
-        self.model_name  = self.name
+        self.resource    = true
+        self.user        = false
         self.ajax        = false
         self.generated   = false
         self.force       = false
         
         # arrays
-        self.attributes   = []
-        self.associations = []
+        self.attributes   = {}
+        self.associations = {}
+        self.code_generations = []
       end
       
+      def name=(value)
+        @name = value
+      end
+      
+      def scaffold_name
+        return (@scaffold_name.blank? ? name: @scaffold_name)
+      end
+      
+      def model_name
+        return (@model_name.blank? ? scaffold_name: @model_name)
+      end
+      
+      def resource?
+        self.resource
+      end
+      
+      def force?
+        self.force
+      end
+      
+      def user?
+        self.user
+      end
+      
+      #
+      # Declares one attribute of the list using the block given.
+      #
       def attribute
-        attr = OpenStruct.new
+        attr = EntityAttribute.new(self)
         yield( attr ) if block_given?
-        self.attributes << attr
+        attr.raise_errors_if_invalid!
+        self.attributes[attr.name] = attr
       end
       
+      #
+      # Selects the default attribute of the entity
+      #
+      def default_attribute
+        default_attr = self.attributes.first.last # first element value
+        self.attributes.each do |key, attr|
+          default_attr = attr if attr.default?
+        end
+        return default_attr
+      end
+      
+      #
+      # Defines one association
+      #
+      def association
+        assoc = EntityAssociation.new(self)
+        yield( assoc ) if block_given?
+        # assoc.raise_errors_if_invalid!
+        self.associations[assoc.name] = assoc
+      end
+      
+      #
+      # Returns the associated model in app/models folder
+      #
+      def model_class
+        Generators::Model.new(self.model_name).model_class
+      end
+      
+      #
+      # Entity file name  
+      #
+      def file_name
+        self.name.singularize.underscore
+      end
+      
+      #
+      # Generate MDWA scaffold code for structural schema.
+      #
       def generate
+        # generates nothing if is not a resource
+        return nil unless self.resource
+        
+        gen = []
+        gen << scaffold_name
+        
+        attributes.each do |key, attr|
+          gen << attr.generate
+        end
+        
+        associations.each do |key, assoc|
+          gen << assoc.generate
+        end
+        
+        gen << "--ajax" if ajax
+        gen << "--force" if force
+        gen << "--model='#{model_name}'" if model_name != scaffold_name
         
+        "mdwa:#{user? ? 'user': 'scaffold'} #{gen.join(' ')}"
       end
       
     end

data/lib/mdwa/dsl/entity_association.rb

@@ -0,0 +1,59 @@
+# -*- encoding : utf-8 -*-
+module MDWA
+  module DSL
+
+    class EntityAssociation
+      
+      attr_accessor :source, :destination, :destination_view
+      attr_accessor :name, :type, :composition, :description
+      
+      ACCEPTED_TYPES = [:one_to_many, :many_to_one, :one_to_one, :one_to_one_not_navigable, :many_to_many]
+      
+      def initialize(source)
+        self.source = source
+        self.composition = false
+      end
+      
+      #
+      # Sets the destination entity.
+      # Sets the name if not set yet.
+      # 
+      def destination=(value)
+        self.name = value.downcase if self.name.blank?
+        @destination = value
+      end
+      
+      #
+      # Return the mapped type for the code generation.
+      #
+      def generator_type
+        case self.type.to_sym
+          when :one_to_many
+            return (self.composition ? 'nested_many' : 'has_many' )
+          when :one_to_one
+            return (self.composition ? 'nested_one' : 'belongs_to' )
+          when :one_to_one_not_navigable
+            'has_one'
+          when :many_to_one
+            'belongs_to'
+          when :many_to_many
+            'has_and_belongs_to_many'
+          end
+      end
+      
+      def generate
+        destination = DSL.entity(self.destination.camelize)
+        
+        gen = []
+        gen << self.name
+        gen << destination.scaffold_name + (destination.model_name != destination.scaffold_name ? ",#{destination.model_name}" : '')
+        gen << (self.destination_view || destination.default_attribute.name)
+        gen << generator_type
+        
+        gen.join(':')
+      end
+      
+    end
+    
+  end
+end

data/lib/mdwa/dsl/entity_attribute.rb

@@ -0,0 +1,46 @@
+# -*- encoding : utf-8 -*-
+require 'mdwa/generators'
+
+module MDWA
+  module DSL
+
+    class EntityAttribute
+      
+      attr_accessor :entity, :name, :type, :default
+      
+      ACCEPTED_TYPES = MDWA::Generators::ModelAttribute::STATIC_TYPES
+      
+      def initialize(entity)
+        self.entity = entity
+        self.default = false
+      end
+      
+      def raise_errors_if_invalid!
+        if !valid?
+          raise "Invalid entity attribute: name is blank" if self.name.blank?
+          raise "Invalid entity attribute: '#{name}' - type is blank" if self.type.blank?
+          raise "Invalid entity attribute: '#{name}' - type '#{type}' is invalid" if self.type_invalid?
+          raise "Invalid entity attribute: '#{name}' - entity is nil" if self.entity.blank?
+        end
+      end
+      
+      def valid?
+        !entity.nil? and !name.blank? and !type.blank? and !type_invalid?
+      end
+      
+      def type_invalid?
+        !ACCEPTED_TYPES.include?( self.type.to_sym )
+      end
+      
+      def default?
+        self.default
+      end
+      
+      def generate
+        "#{name}:#{type}"
+      end
+      
+    end
+    
+  end
+end

data/lib/mdwa/dsl/generator.rb

@@ -0,0 +1,10 @@
+# -*- encoding : utf-8 -*-
+module MDWA
+  module DSL
+
+    module Generator
+      
+    end # generator
+    
+  end # DSL
+end # MDWA

data/lib/mdwa/generators/model.rb

@@ -4,9 +4,11 @@ module MDWA
 		class Model
 
 			attr_accessor :name, :namespace, :attributes, :specific_model_name
-
+      
+      #
 			# Sets the variables by the string
 			# Format: <namespace>/<model>, the namespace is optional.
+			#
 			def initialize( arg )
 				
 				self.namespace = '' # prevents unitialized variable errors
@@ -36,6 +38,13 @@ module MDWA
           return specific_model.klass
         end
 			end
+			
+			#
+      # Returns the associated model in app/models folder
+      #
+			def model_class
+			 self.klass.classify.constantize
+		  end
 
 			def controller_name
 				namespace_scope + name.pluralize
@@ -89,9 +98,9 @@ module MDWA
 
 			private 
 				def namespace_scope
-		          return "#{namespace}::" if namespace?
-		          return ''
-		        end
+          return "#{namespace}::" if namespace?
+          return ''
+        end
 
 		end
 	end

data/lib/mdwa/generators/model_association.rb

@@ -68,7 +68,7 @@ module MDWA
 			end
 
 			def has_and_belongs_to_many?
-				return (relation == 'has_and_belongs_and_to_many')
+				return (relation == 'has_and_belongs_to_many')
 			end
       
     end

data/lib/mdwa/generators/model_attribute.rb

@@ -6,7 +6,7 @@ module MDWA
 		class ModelAttribute
 			attr_accessor :name, :type, :reference, :reference_type, :model
 
-			STATIC_TYPES = [:boolean, :date, :datetime, :decimal, :float, :integer, :string, :text, :time, :timestamp, :file]
+			STATIC_TYPES = [:boolean, :date, :datetime, :decimal, :float, :integer, :string, :text, :time, :timestamp, :file, :password]
 
 			# Sets the attributes variables
 			# Format: <name>:<type>,<model>:<reference>:<reference_type>
@@ -51,14 +51,14 @@ module MDWA
 
 			def migration_field
 				@migration_field ||= case self.type.to_s.to_sym
-		          when :string, :file		 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 :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
@@ -74,6 +74,7 @@ module MDWA
 		          when :date                 then 'date_select'
 		          when :text                 then 'text_area'
 		          when :boolean              then 'check_box'
+	            when :password             then 'password_field'  
 		          else
 		            'text_field'
 		        end

data/lib/mdwa/version.rb

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

data/mdd.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   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.files         = `git ls-files`.split("\n")

data/test/entity_test.rb

@@ -9,18 +9,84 @@ describe MDWA::DSL::Entities do
   before do
     # create product entity
     MDWA::DSL.entities.register "Product" do |e|
+      e.purpose   = 'Store the company products.'
       e.resource  = true
       e.ajax      = true
-      e.generated = false
+      
+      ## attributes
       e.attribute do |attr|
-        attr.name = 'test'
+        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
+      
+      ## associations
+      e.association do |a|
+        a.destination = 'Category'
+        a.type = 'many_to_one'
+        a.description = 'Holds the category'
+      end
+      
+      e.association do |a|
+        a.name = 'marca'
+        a.destination = 'Brand'
+        a.type = 'one_to_many'
+        a.composition = true
+        a.description = 'Product`s brand'
+      end
+      
+      e.association do |a|
+        a.destination = 'Category2'
+        a.type = 'one_to_one'
+      end
+      
+      e.association do |a|
+        a.destination = 'Category3'
+        a.type = 'one_to_one'
+        a.composition = true
+      end
+      
+      e.association do |a|
+        a.destination = 'Category4'
+        a.type = 'one_to_many'
+      end
+      
+      e.association do |a|
+        a.destination = 'Category5'
+        a.type = 'one_to_one_not_navigable'
+      end
+      
+      e.association do |a|
+        a.destination = 'Category6'
+        a.type = 'many_to_many'
+      end
+      
+      e.association do |a|
+        a.destination = 'Category7'
+        a.type = 'many_to_one'
+      end
+      
     end
     MDWA::DSL.entity("Product").must_be_instance_of MDWA::DSL::Entity
     
     # create category entity
     MDWA::DSL.entities.register "Category" do |e|
       e.resource = false
+      e.attribute do |attr|
+        attr.name = 'name'
+        attr.type = 'string'
+      end
     end
     MDWA::DSL.entity("Category").must_be_instance_of MDWA::DSL::Entity
   end
@@ -37,31 +103,140 @@ describe MDWA::DSL::Entities do
     product.must_be_instance_of MDWA::DSL::Entity
     product.resource.must_equal true
     product.ajax.must_equal true
-    product.generated.must_equal false
-    product.associations.must_be_instance_of Array
-    product.attributes.must_be_instance_of Array
+    product.associations.must_be_instance_of Hash
+    product.attributes.must_be_instance_of Hash
     product.model_name.must_equal( "Product" )
     
     category = MDWA::DSL.entity("Category")
     category.must_be_instance_of MDWA::DSL::Entity
     category.resource.must_equal false
-    category.associations.must_be_instance_of Array
-    category.attributes.must_be_instance_of Array
+    category.associations.must_be_instance_of Hash
+    category.attributes.must_be_instance_of Hash
   end
   
+  it "must override elements" do
+    MDWA::DSL.entities.register "Product" do |e|
+      e.resource = false
+    end
+    MDWA::DSL.entity("Product").resource.must_equal false
+  end
   
-  it "must not store other stuff" do
-    MDWA::DSL.entities.nodes.size.must_equal 2
+  it "must store attributes" do 
+    product = MDWA::DSL.entity("Product")
+    
+    product.attributes.count.must_equal 4
+    product.attributes['name'].type.must_equal 'string'
+    product.attributes['name'].name.must_equal 'name'
+    product.attributes['category'].type.must_equal 'integer'
+    product.attributes['category'].name.must_equal 'category'
+    product.attributes['published'].type.must_equal 'boolean'
+    product.attributes['published'].name.must_equal 'published'
+    product.attributes['stock'].type.must_equal 'integer'
+    product.attributes['stock'].name.must_equal 'stock'
+    
+    product.default_attribute.name.must_equal 'name'
+    
+    category = MDWA::DSL.entity("Category")
+    category.attributes.count.must_equal 1
+    category.default_attribute.name.must_equal 'name'
   end
   
+  it "must keep associations" do
+      
+    product = MDWA::DSL.entity("Product")
+    product.associations.count.must_equal 8
+    
+    product.associations['category'].type.must_equal 'many_to_one'
+    product.associations['category'].destination.must_equal 'Category'
+    product.associations['category'].generator_type.must_equal 'belongs_to'
+    
+    product.associations['brand'].must_equal nil
+    product.associations['marca'].type.must_equal 'one_to_many'
+    product.associations['marca'].destination.must_equal 'Brand'
+    product.associations['marca'].generator_type.must_equal 'nested_many'
+    
+    product.associations['category2'].generator_type.must_equal 'belongs_to'
+    product.associations['category3'].generator_type.must_equal 'nested_one'
+    product.associations['category4'].generator_type.must_equal 'has_many'
+    product.associations['category5'].generator_type.must_equal 'has_one'
+    product.associations['category6'].generator_type.must_equal 'has_and_belongs_to_many'
+    product.associations['category7'].generator_type.must_equal 'belongs_to'
+    
+  end
   
-  it "must override elements" do
+  it "must generated correct code" do
     
-    MDWA::DSL.entities.register "Product" do |e|
-      e.resource = false
+    MDWA::DSL.entities.register "Project" do |p|
+      p.resource = true
+      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.association do |assoc|
+        assoc.destination = 'Group'
+        assoc.type = 'many_to_one'
+      end
+    end
+    
+    MDWA::DSL.entities.register "Group" do |p|
+      p.resource = true
+      p.scaffold_name = 'a/group'
+      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
+    end
+    
+    project = MDWA::DSL.entity("Project")
+    group = MDWA::DSL.entity("Group")
+    
+    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"
+  end
+  
+  it "should not generate non-resource entities" do
+    MDWA::DSL.entities.register "Task" do |p|
+      p.resource = false
+      p.scaffold_name = 'a/task'
+      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
     end
-    MDWA::DSL.entity("Product").resource.must_equal false
     
+    task = MDWA::DSL.entity('Task')
+    task.generate.must_equal nil
   end
   
 end