mdd 2.0.3 → 3.0.0

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

@@ -0,0 +1,8 @@
+require 'mdwa/layout'
+MDWA::Layout::Base.config do |config|
+	config['/*'] 						            = 'public'
+  config['/a/*'] 						          = 'system'
+  config['/a/users/passwords#*'] 		  = 'system'
+  config['/a/users/sessions#new'] 	  = 'login'
+  config['/a/users/sessions#create'] 	= 'login'
+end

data/lib/generators/{mdd → mdwa}/sandbox/templates/config/locales/mdwa.en.yml

@@ -12,6 +12,8 @@ en:
     logged_info_edit_account: "My Account"
     cancel_button: "Cancel"
     index_id: "ID"
+    index_edit: "Edit"
+    index_edit_label: "Edit"
     index_remove: "Remove"
     index_remove_label: "Remove"
     index_confirm_deletion: "Are you sure?"

data/lib/generators/{mdd → mdwa}/scaffold/USAGE

@@ -9,21 +9,21 @@ Example:
 	It behaves equally to Rails scaffold if relations are not mentioned.
 	The relations syntax:
 
-    - rails generate mdd:scaffold Product name:string initial_date:date category_id:category:name:belongs
+    - rails generate mdwa:scaffold Product name:string initial_date:date category_id:category:name:belongs
     	# model product.rb
     	class Product < ActiveRecord::Base
     		attr_accessible :name, :initial_date, :category_id
     		belongs_to :category
     		...
 
-    - rails generate mdd:scaffold Category name:string products:product:name:has_many
+    - rails generate mdwa:scaffold Category name:string products:product:name:has_many
     	# model product.rb
     	class Product < ActiveRecord::Base
     		attr_accessible :name
     		has_many :products
     		...
 
-    - rails generate mdd:scaffold Product name:string category:category:name:nested_many
+    - rails generate mdwa:scaffold Product name:string category:category:name:nested_many
     	# model product.rb
     	class Product < ActiveRecord::Base
     		attr_accessible :name, :categories_attributes
@@ -31,21 +31,21 @@ Example:
     		accepts_nested_attributes_for :categories, :allow_destroy => true
     		...
 
-    - rails generate mdd:scaffold Company name:string address:address:name:nested_one
+    - rails generate mdwa:scaffold Company name:string address:address:name:nested_one
         class Company < ActiveRecord::Base
             attr_accessible :name, :address_attributes
             belongs_to :address
             accepts_nested_attributes_for :address, :allow_destroy => true
             ...
 
-    - rails generate mdd:scaffold User name:string projects:projects:name:has_and_belongs_to_many
-      rails generate mdd:scaffold Project name:string users:user:name:has_and_belongs_to_many
+    - rails generate mdwa:scaffold User name:string projects:projects:name:has_and_belongs_to_many
+      rails generate mdwa:scaffold Project name:string users:user:name:has_and_belongs_to_many
         Class User < ActiveRecord::Base
             has_and_belongs_to_many :projects
         Class User < ActiveRecord::Base
             has_and_belongs_to_many :users
 
-    - rails generate mdd:scaffold Product name:string product_price:productPrice:name:has_one
+    - rails generate mdwa:scaffold Product name:string product_price:productPrice:name:has_one
     	# model product.rb
     	class Product < ActiveRecord::Base
     		attr_accessible :name
@@ -60,8 +60,8 @@ Restrictions:
 	2. For associations, you can use the mdd:association generator. 
 	It generates several kinds of model relations.
 	Scaffold associations will fail for model associations with specific model names, for example:
-		rails g mdd:scaffold a/groups name:string --model=group
-		rails g mdd:scaffold a/projects name:string group:a/group:name:belongs_to
+		rails g mdwa:scaffold a/groups name:string --model=group
+		rails g mdwa:scaffold a/projects name:string group:a/group:name:belongs_to
 	For that reason, you should use:
-		rails g mdd:scaffold a/projects name:string group:a/group,group:name:belongs_to
+		rails g mdwa:scaffold a/projects name:string group:a/group,group:name:belongs_to
 		

data/lib/generators/{mdd → mdwa}/scaffold/scaffold_generator.rb

@@ -1,6 +1,9 @@
 require 'rails/generators/migration'
+require 'mdwa/generators'
 
-module Mdd 
+module Mdwa
+  
+  module Generators
 
     class ScaffoldGenerator < Rails::Generators::Base
       include Rails::Generators::Migration
@@ -23,13 +26,13 @@ module Mdd
 
         super
 
-        @model = Generators::Model.new( scaffold_name )        
+        @model = MDWA::Generators::Model.new( scaffold_name )        
 
         # model_name is not valid
         print_usage unless @model.valid?
 
         # verifies specific model name
-        @specific_model = Generators::Model.new( options.model ) unless options.model.blank?
+        @specific_model = MDWA::Generators::Model.new( options.model ) unless options.model.blank?
         if !@specific_model.nil?
           if !@specific_model.valid?
             print_usage 
@@ -40,7 +43,7 @@ module Mdd
 
         # sets the model attributes
         attributes.each do |attribute|
-          @model.add_attribute Generators::ModelAttribute.new( attribute )
+          @model.add_attribute MDWA::Generators::ModelAttribute.new( attribute )
         end
 
       end
@@ -81,13 +84,8 @@ module Mdd
       end
       
       def locales
-        destination = 'config/locales/mdwa_model_specific.en.yml'
-        inside Rails.root do
-          create_file destination unless File.exist?(destination)
-          append_file destination, "en:\n"
-        end
         
-        append_file destination, :after => "en:\n" do 
+        append_file 'config/locales/mdwa_model_specific.en.yml', :after => "en:\n" do 
           lines = []
           lines <<  "  #{@model.plural_name}:"
           lines <<  "    create_success: \"#{@model.singular_name.humanize} created.\""
@@ -122,7 +120,7 @@ module Mdd
       def associations
         unless options.only_interface
           @model.attributes.select{ |a| a.references? }.each do |attr|
-              generate "mdd:association #{@model.raw} #{attr.reference_type} #{attr.type.raw} #{'--skip_migrations' if options.skip_migrations} #{'--force' if options.force} --skip_rake_migrate --ask"
+              generate "mdwa:association #{@model.raw} #{attr.reference_type} #{attr.type.raw} #{'--skip_migrations' if options.skip_migrations} #{'--force' if options.force} --skip_rake_migrate --ask"
           end
         end
       end
@@ -144,6 +142,7 @@ module Mdd
           end
         end
 
-  end
+    end
 
+  end 
 end

data/lib/mdd.rb

@@ -1,23 +1,8 @@
-require "mdd/version"
+# -*- encoding : utf-8 -*-
+require 'rails/engine'
 
-module Mdd
-  class Mdd < Rails::Engine
+module MDD
+  class MDD < Rails::Engine
     config.autoload_paths << File.expand_path("../app", __FILE__)
   end
-
-  module Generators
-  	autoload :Model, 'mdd/generators/model'
-    autoload :ModelAttribute, 'mdd/generators/model_attribute'
-  end
-
-  module Layout
-  	autoload :Base, 'mdd/layout/base'
-  	autoload :Helper, 'mdd/layout/helper'
-  end
-end
-
-# include the layout selector in ApplicationController
-ActionController::Base.send :include, Mdd::Layout::Helper
-ActiveSupport.on_load(:action_controller) do
-    helper_method "current_page"
 end

data/lib/mdwa.rb

@@ -0,0 +1,6 @@
+# -*- encoding : utf-8 -*-
+require "mdwa/version"
+
+module MDWA
+
+end

data/lib/mdwa/all.rb

@@ -0,0 +1,5 @@
+# -*- encoding : utf-8 -*-
+
+require 'mdwa/dsl'
+require 'mdwa/generators'
+require 'mdwa/layout'

data/lib/mdwa/dsl.rb

@@ -0,0 +1,9 @@
+# -*- encoding : utf-8 -*-
+module MDWA
+  module DSL
+    
+    autoload :Entities, 'mdwa/dsl/entities'
+    autoload :Entity, 'mdwa/dsl/entity'
+    
+  end
+end

data/lib/mdwa/dsl/entities.rb

@@ -0,0 +1,45 @@
+# -*- encoding : utf-8 -*-
+module MDWA
+  module DSL
+
+    # singleton class
+    class Entities
+      
+      attr_accessor :nodes
+      
+      def initialize
+        @nodes ||= {}
+      end
+      
+      def self.instance
+        @__instance__ ||= new
+      end
+      
+      def register( name )        
+        e = element(name) || Entity.new( name )
+        yield e
+        add_node e
+      end
+    
+      def add_node(node)
+        @nodes[node.name] = node
+      end
+      
+      def element(e)
+        @nodes[e]
+      end
+
+    end # class entitites
+    
+    # return the entities instance
+    def self.entities
+      Entities.instance
+    end
+    
+    def self.entity(name)
+      self.entities.element(name)
+    end
+
+    
+  end # dsl
+end # mdd

data/lib/mdwa/dsl/entity.rb

@@ -0,0 +1,41 @@
+# -*- encoding : utf-8 -*-
+require 'ostruct'
+
+module MDWA
+  module DSL
+
+    class Entity
+      
+      attr_accessor :name, :resource, :purpose, :model_name, :ajax, :generated, :force
+      attr_accessor :attributes, :associations
+      
+      def initialize( name )
+        # set the entity name
+        self.name = name
+        
+        # fixed attributes
+        self.resource    = false
+        self.model_name  = self.name
+        self.ajax        = false
+        self.generated   = false
+        self.force       = false
+        
+        # arrays
+        self.attributes   = []
+        self.associations = []
+      end
+      
+      def attribute
+        attr = OpenStruct.new
+        yield( attr ) if block_given?
+        self.attributes << attr
+      end
+      
+      def generate
+        
+      end
+      
+    end
+
+  end
+end

data/lib/mdwa/generators.rb

@@ -0,0 +1,10 @@
+# -*- encoding : utf-8 -*-
+module MDWA
+  
+  module Generators
+  	autoload :Model, 'mdwa/generators/model'
+    autoload :ModelAttribute, 'mdwa/generators/model_attribute'
+    autoload :ModelAssociation, 'mdwa/generators/model_association'
+  end
+  
+end

data/lib/{mdd → mdwa}/generators/model.rb

@@ -1,4 +1,5 @@
-module Mdd
+# -*- encoding : utf-8 -*-
+module MDWA
 	module Generators
 		class Model
 

data/lib/mdwa/generators/model_association.rb

@@ -0,0 +1,77 @@
+module MDWA
+  module Generators
+    
+    class ModelAssociation
+      
+      attr_accessor :model1, :model2, :relation
+      
+      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)
+        
+        self.model1   = model1_name
+        self.model2   = model2_name
+        self.relation = relation_name
+
+        # 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?
+      end
+      
+      def model1=(value)
+        if value.is_a? String
+          @model1 = Generators::Model.new( value )
+        elsif value.is_a? Generators::Model
+          @model1 = value
+        end
+      end
+      
+      def model2=(value)
+        if value.is_a? String
+          @model2 = Generators::Model.new( value )
+        elsif value.is_a? Generators::Model
+          @model2 = value
+        end
+      end
+      
+      def relation_valid?
+        ACCEPTED_RELATIONS.include? relation.to_sym
+      end
+      
+      def ordered
+        [@model1, @model2].sort! {|a,b| a.plural_name <=> b.plural_name}
+      end
+      
+      def belongs_to?
+				return (relation == 'belongs_to')
+			end
+
+			def has_many?
+				return (relation == 'has_many')
+			end
+
+			def nested_many?
+				return (relation == 'nested_many')
+			end
+
+			def nested?
+				nested_many? || nested_one?
+			end
+
+			def nested_one?
+				return (relation == 'nested_one')
+			end
+
+			def has_one?
+				return (relation == 'has_one')
+			end
+
+			def has_and_belongs_to_many?
+				return (relation == 'has_and_belongs_and_to_many')
+			end
+      
+    end
+    
+  end
+end