mdd 3.0.6 → 3.0.7

data/lib/mdwa/dsl/entity.rb

@@ -73,8 +73,11 @@ module MDWA
       def after_declaration
         
         # if it's a user and have no attributes, include "name" to prevent errors
-        if user? and attributes.count.zero?
+        if user?
           self.attribute('name', 'string')
+          self.attribute('email', 'string')
+          self.attribute('password', 'password')
+          self.attribute('password_confirmation', 'password')
         end
         
       end
@@ -134,8 +137,11 @@ module MDWA
         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)
+          entity2 = DSL.entity(association.destination)
+          model2 = Generators::Model.new(entity2.model_name)
+          assoc = Generators::ModelAssociation.new(model1, model2, association.generator_type, entity2.default_attribute.name)
+          assoc.composition = true if association.composition
+          @generator_model.associations << assoc
         end
         return @generator_model
       end

data/lib/mdwa/dsl/entity_association.rb

@@ -22,6 +22,7 @@ module MDWA
         self.name = value.downcase if self.name.blank?
         @destination = value
       end
+    
       
       #
       # Return the mapped type for the code generation.
@@ -53,6 +54,26 @@ module MDWA
         gen.join(':')
       end
       
+      def one_to_many?
+        self.type.to_sym == :one_to_many
+      end
+      
+      def many_to_one?
+        self.type.to_sym == :many_to_one
+      end
+      
+      def one_to_one?
+        self.type.to_sym == :one_to_one
+      end
+      
+      def many_to_many?
+        self.type.to_sym == :many_to_many
+      end
+      
+      def one_to_one_not_navigable?
+        self.type.to_sym == :one_to_one_not_navigable
+      end
+      
     end
     
   end

data/lib/mdwa/dsl/requirements.rb

@@ -40,6 +40,10 @@ module MDWA
       def all
         @nodes.values
       end
+      
+      def clear
+        @nodes.clear
+      end
 
     end # class
     

data/lib/mdwa/generators/model_association.rb

@@ -6,20 +6,22 @@ module MDWA
     
     class ModelAssociation
       
-      attr_accessor :model1, :model2, :relation
+      attr_accessor :model1, :model2, :relation, :reference_field, :composition
       
       ACCEPTED_RELATIONS = [:has_many, :belongs_to, :has_and_belongs_to_many, :nested_many, :nested_one, :has_one]
       
-      def initialize(model1_name, model2_name, relation_name)
+      def initialize(model1_name, model2_name, relation_name, reference_field = nil)
         
         self.model1   = model1_name
         self.model2   = model2_name
         self.relation = relation_name
+        self.reference_field = reference_field || 'id'
+        self.composition = false
 
         # validation
         raise "Invalid model name: #{@model1.name}" unless self.model1.valid?
         raise "Invalid model name: #{@model2.name}" unless self.model2.valid?
-        raise "Invalid relation type: #{@relation}" unless relation_valid?
+        raise "Invalid relation type: #{@relation}" unless self.relation_valid?
       end
       
       def model1=(value)
@@ -38,6 +40,10 @@ module MDWA
         end
       end
       
+      def composition?
+        self.composition
+      end
+      
       def relation_valid?
         ACCEPTED_RELATIONS.include? relation.to_sym
       end

data/lib/mdwa/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mdd
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 3.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-27 00:00:00.000000000 Z
+date: 2012-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -324,11 +324,27 @@ 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/templates/templates/actions/view.custom.erb
+- lib/generators/mdwa/templates/templates/actions/view.html.erb
+- lib/generators/mdwa/templates/templates/actions/view.js.erb
+- lib/generators/mdwa/templates/templates/actions/view.json.erb
+- lib/generators/mdwa/templates/templates/general/routes.rb
+- lib/generators/mdwa/templates/templates/scaffold/controller.rb
+- lib/generators/mdwa/templates/templates/scaffold/helper.rb
+- lib/generators/mdwa/templates/templates/scaffold/model.rb
+- lib/generators/mdwa/templates/templates/scaffold/views/_form.html.erb
+- lib/generators/mdwa/templates/templates/scaffold/views/_form_fields.html.erb
+- lib/generators/mdwa/templates/templates/scaffold/views/_list.html.erb
+- lib/generators/mdwa/templates/templates/scaffold/views/create.js.erb
+- lib/generators/mdwa/templates/templates/scaffold/views/destroy.js.erb
+- lib/generators/mdwa/templates/templates/scaffold/views/edit.html.erb
+- lib/generators/mdwa/templates/templates/scaffold/views/index.html.erb
+- lib/generators/mdwa/templates/templates/scaffold/views/index.js.erb
+- lib/generators/mdwa/templates/templates/scaffold/views/new.html.erb
+- lib/generators/mdwa/templates/templates/scaffold/views/show.html.erb
+- lib/generators/mdwa/templates/templates/scaffold/views/update.js.erb
+- lib/generators/mdwa/templates/templates_generator.rb
+- lib/generators/mdwa/transform/templates/changes_migration.rb
 - lib/generators/mdwa/transform/transform_generator.rb
 - lib/generators/mdwa/user/templates/user.rb
 - lib/generators/mdwa/user/user_generator.rb
@@ -391,7 +407,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4288068741970845227
+      hash: -2577917960470046169
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -400,7 +416,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4288068741970845227
+      hash: -2577917960470046169
 requirements: []
 rubyforge_project: mdd
 rubygems_version: 1.8.24

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

@@ -1,40 +0,0 @@
-# -*- 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