mdd 3.0.3 → 3.0.4

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

@@ -62,7 +62,7 @@ module Mdwa
           # if model has not a database yet, run the generate command
           begin
             # if model does not exist, should generate scaffold
-            model_class = entity.model_class
+            model_class = entity.generator_model.model_class
           rescue
             model_class = nil
           end
@@ -130,7 +130,7 @@ module Mdwa
             # if model has not a database yet, run the generate command
             begin
               # if model does not exist, should generate scaffold
-              model_class = entity.model_class
+              model_class = entity.generator_model.model_class
             rescue
               model_class = nil
             end
@@ -138,7 +138,8 @@ module Mdwa
               puts "===================================================="
               puts "Generating code for '#{entity.name}'"
               puts "===================================================="
-              generate "#{entity.generate} --only_interface #{'--force' if options.force}"
+              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}'"
@@ -151,14 +152,114 @@ module Mdwa
       
       #
       # Generate actions for entities.
+      # Generate controller actions and routes
       #
       def entities_actions
-      end 
+        
+        @all_entities.each do |entity|
+          # next iteration if entity doesn't have specifications
+          next if entity.actions.actions.count.zero?
+          
+          model = entity.generator_model
+          
+          path_to_controller  = "app/controllers/#{model.space}/#{model.plural_name}_controller.rb"
+          controller_string   = File.read("#{Rails.root}/#{path_to_controller}")
+          path_to_routes      = 'config/routes.rb'
+          
+          #
+          # inject methods in the controller
+          # decide if code is included after class declaration or after cancan load code.
+          cancan_load = "load_and_authorize_resource :class => \"#{model.klass}\"" 
+          if controller_string.include? cancan_load
+            after = cancan_load 
+          else
+            inherit_controller = 'A::BackendController' if model.space == 'a'
+            after = "class #{model.controller_name}Controller < #{inherit_controller || 'ApplicationController'}"
+          end
+          
+          # insert in controller
+          insert_into_file path_to_controller, :after => after do 
+            actions = []
+            entity.actions.generate_controller.each do |action_name, generation_string|
+              # write the generated code only if it is not declared in the controller
+              actions << "\n\n#{generation_string}" unless controller_string.include? "def #{action_name}"
+            end
+            actions.join
+          end
+          
+          # inject routes declarations
+          insert_into_file path_to_routes, :after => "controller :#{model.plural_name} do" do
+            routes = []
+            entity.actions.generate_routes.each do |action_name, generation_string|
+              routes << "\n\t\t\t#{generation_string}"
+            end
+            routes.join
+          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"
+            end
+            routes.join
+          end
+          
+          # generate the corresponding files
+          entity.actions.actions.values.select{ |a| !a.resource? }.each do |action|
+            action.template_names.each do |request, file_name|          
+              case request.to_sym
+              when :modalbox, :html
+                template 'views/view.html.erb', "app/views/#{model.space}/#{model.plural_name}/#{file_name}" unless File.exist?("#{Rails.root}/app/views/#{model.space}/#{model.plural_name}/#{file_name}")
+              when :ajax
+                template 'views/view.js.erb', "app/views/#{model.space}/#{model.plural_name}/#{file_name}" unless File.exist?("#{Rails.root}/app/views/#{model.space}/#{model.plural_name}/#{file_name}")
+              when :ajax_js
+                template 'views/view.json.erb', "app/views/#{model.space}/#{model.plural_name}/#{file_name}" unless File.exist?("#{Rails.root}/app/views/#{model.space}/#{model.plural_name}/#{file_name}")
+              else
+                template 'views/view.custom.erb', "app/views/#{model.space}/#{model.plural_name}/#{file_name}" unless File.exist?("#{Rails.root}/app/views/#{model.space}/#{model.plural_name}/#{file_name}")
+              end
+            end
+          end
+          
+        end # iteration over entities
+        
+      end # method
       
       #
       # Generate code for entities specify.
+      # Generate unit testing code for models.
       #
       def entites_specifications
+
+        @all_entities.each do |entity|
+          # next iteration if entity doesn't have specifications
+          next if entity.specifications.count.zero?
+          
+          model = entity.generator_model
+          
+          path_to_spec = "spec/models/#{model.space}/#{model.singular_name}_spec.rb"
+          insert_into_file path_to_spec, :after => "describe #{model.klass} do" do
+            specs = []
+            file_string = File.read("#{Rails.root}/#{path_to_spec}")
+            entity.specifications.each do |specification|
+              unless file_string.include? specification.description
+                specs << "\n\n\tdescribe '#{specification.description}' do"
+                specification.details.each do |detail|
+                  unless file_string.include? detail
+                    specs << "\t\tit '#{detail}' do"
+                    specs << "\t\tend"
+                  end
+                end
+                specs << "\tend"
+              end
+            end
+            specs.join("\n")
+          end
+          
+        end
+
       end
     
       
@@ -173,8 +274,6 @@ module Mdwa
 
       
       
-      
-      
       private 
       
        # Implement the required interface for Rails::Generators::Migration.

data/lib/generators/mdwa/code/templates/views/view.custom.erb

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

data/lib/generators/mdwa/code/templates/views/view.html.erb

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

data/lib/generators/mdwa/code/templates/views/view.js.erb

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

data/lib/generators/mdwa/code/templates/views/view.json.erb

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

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

@@ -46,6 +46,25 @@ MDWA::DSL.entities.register "<%= name.singularize.camelize %>" do |e|
   #   a.composition = true
   #   a.description = 'This entity has a composite address.'
   # end
+
+  ##
+  ## Entity specifications. 
+  ## Define restrictions and rules so this entity will work properly.
+  ##
+  # e.specify "fields should not be invalid" do |s|
+  #    s.such_as "date should be valid"
+  #    s.such_as "administrator must not be empty"
+  #    s.such_as "description must not be empty"
+  #  end
+  #  e.specify "date should not be in the past"
+
+  ##
+  ## Entity actions. Define controller and routes for new operations with this entity.
+  ##
+  # e.member_action :publish, :get, :html
+  # e.collection_action :export, :post, [:csv, :xml]
+  # e.collection_action :report, :get, [:ajax]
+  
   <%- end -%>
   
 end

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

@@ -28,6 +28,7 @@ module Mdwa
         gem 'will_paginate'
         gem 'nested_form'
         gem 'require_all'
+        gem 'rspec-rails', :group => [:test, :development]
 
         inside Rails.root do
           run "bundle install"
@@ -167,6 +168,11 @@ module Mdwa
         
         rake "db:seed" if ask_question( "Run rake db:seeds?" )
       end
+      
+      def testes
+        # Install Rspec as the default testing framework
+        generate 'rspec:install'
+      end
 
       private 
 

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

@@ -24,6 +24,7 @@ module Mdwa
       class_option :skip_questions, :desc => 'Answer no for all questions by default.', :type => :boolean, :default => false
       class_option :skip_interface, :desc => 'Cretes only models, migrations and associations.', :type => :boolean, :default => false
       class_option :only_interface, :desc => 'Skips models, associations and migrations.', :type => :boolean, :default => false
+      class_option :skip_tests, :desc => 'Skip Rspec tests generation', :type => :boolean, :default => false
 
       def initialize(*args, &block)
 
@@ -111,10 +112,10 @@ module Mdwa
         unless options.skip_interface
           route_str = []
           route_str << "namespace :#{@model.space} do" if @model.namespace?
-          route_str << "\tcontroller :#{@model.plural_name} do"
-          route_str << "\tend"
-          route_str << "\tresources :#{@model.plural_name}"
-          route_str << "end" if @model.namespace?
+          route_str << "\t\tcontroller :#{@model.plural_name} do"
+          route_str << "\t\tend"
+          route_str << "\t\tresources :#{@model.plural_name}"
+          route_str << "\tend" if @model.namespace?
           
           route route_str.join("\n")
         end
@@ -139,6 +140,11 @@ module Mdwa
           rake('db:migrate') if !options.skip_questions and yes? 'Run rake db:migrate?'
         end
       end
+      
+      def tests_and_specify
+        template 'specs/model.rb', "spec/models/#{@model.space}/#{@model.singular_name}_spec.rb"
+        template 'specs/routing.rb', "spec/routing/#{@model.space}/#{@model.plural_name}_routing_spec.rb"
+      end
 
       private
 

data/lib/generators/mdwa/scaffold/templates/specs/model.rb

@@ -0,0 +1,7 @@
+# -*- encoding : utf-8 -*-
+require 'spec_helper'
+
+describe <%= @model.klass %> do
+  
+
+end

data/lib/generators/mdwa/scaffold/templates/specs/routing.rb

@@ -0,0 +1,36 @@
+# -*- encoding : utf-8 -*-
+require "spec_helper"
+
+describe <%= @model.controller_name %>Controller do
+  describe "routing" do
+
+    it "routes to #index" do
+      get("/<%= @model.to_route_url %>").should route_to("<%= @model.to_route_url %>#index")
+    end
+
+    it "routes to #new" do
+      get("/<%= @model.to_route_url %>/new").should route_to("<%= @model.to_route_url %>#new")
+    end
+
+    it "routes to #show" do
+      get("/<%= @model.to_route_url %>/1").should route_to("<%= @model.to_route_url %>#show", :id => "1")
+    end
+
+    it "routes to #edit" do
+      get("/<%= @model.to_route_url %>/1/edit").should route_to("<%= @model.to_route_url %>#edit", :id => "1")
+    end
+
+    it "routes to #create" do
+      post("/<%= @model.to_route_url %>").should route_to("<%= @model.to_route_url %>#create")
+    end
+
+    it "routes to #update" do
+      put("/<%= @model.to_route_url %>/1").should route_to("<%= @model.to_route_url %>#update", :id => "1")
+    end
+
+    it "routes to #destroy" do
+      delete("/<%= @model.to_route_url %>/1").should route_to("<%= @model.to_route_url %>#destroy", :id => "1")
+    end
+
+  end
+end

data/lib/mdwa/dsl/action.rb

@@ -1,4 +1,6 @@
 # -*- encoding : utf-8 -*-
+require 'mdwa/generators'
+
 module MDWA
   module DSL
 
@@ -8,11 +10,12 @@ module MDWA
       ALLOWED_METHODS = [:get, :post, :put, :delete]
       PREDEFINED_REQUEST_TYPES   = [:html, :ajax, :ajax_js, :modalbox]
       
-      attr_accessor :name, :type, :method, :request_type, :response, :resource
+      attr_accessor :name, :type, :entity, :method, :request_type, :response, :resource
       
-      def initialize(name, type, options)
+      def initialize(entity, name, type, options = {})
         self.name         = name.to_sym
         self.type         = type.to_sym
+        self.entity       = entity
         self.method       = options[:method] || :get
         self.request_type = options[:request_type] || :html
         self.response     = options[:response] || {}
@@ -47,15 +50,26 @@ module MDWA
         resource
       end
       
+      def generate_route
+        "#{self.method.to_s} '#{self.entity.name.underscore.pluralize}#{'/:id' if member?}/#{self.name.to_s}' => :#{self.name.to_sym}"
+      end
+      
       def generate_controller
         action_str = []
+        action_str << "\t# #{entity.generator_model.plural_name}##{self.name.to_s}"
+        action_str << "\t# Route: #{generate_route}"
         action_str << "\tdef #{self.name.to_s}"
-        action_str << ""
+          
+          if member?
+            action_str << "\t\t@#{entity.generator_model.singular_name} = #{entity.generator_model.klass}.find(params[:id])"
+            action_str << ""
+          end
+          
           action_str << "\t\trespond_to do |format|"        
           self.request_type.each do |request|          
             case request.to_sym
             when :modalbox
-              # action_str << "\t\t\tformat.html{render :layout => false}"
+              action_str << "\t\t\tformat.html{render :layout => false}"
             when :html
               action_str << "\t\t\tformat.html #{"{#{self.response[:html]}}" unless self.response[:html].blank?}"
             when :ajax
@@ -69,7 +83,28 @@ module MDWA
           action_str << "\t\tend"
         
         action_str << "\tend"        
-        # action_str.join("\n")
+        action_str.join("\n")
+      end
+      
+      
+      def template_names
+        names = {}
+        self.request_type.each do |request|
+          case request.to_sym
+          when :modalbox
+            names[:modalbox] = "#{self.name}.html.erb"
+          when :html
+            names[:html] = "#{self.name}.html.erb" if self.response[:html].blank?
+          when :ajax
+            names[:ajax] = "#{self.name}.js.erb" if self.response[:ajax].blank?
+          when :ajax_js
+            names[:ajax_js] = "#{self.name}.json.erb" if self.response[:ajax_js].blank?
+          else
+            names[request.to_sym] = "#{self.name}.#{request.to_s}.erb" if self.response[request.to_sym].blank?
+          end
+        end
+        
+        return names
       end
       
     end

data/lib/mdwa/dsl/entity.rb

@@ -107,10 +107,10 @@ module MDWA
       end
       
       #
-      # Returns the associated model in app/models folder
+      # Return an instance of Generators::Model
       #
-      def model_class
-        Generators::Model.new(self.model_name).model_class
+      def generator_model
+        Generators::Model.new(self.model_name)
       end
       
       #

data/lib/mdwa/dsl/entity_actions.rb

@@ -12,14 +12,14 @@ module MDWA
       end
       
       def member_action(name, method, request_type)
-        self.actions[name.to_sym] = Action.new(name.to_sym, :member, :method => method, :request_type => request_type)
+        self.actions[name.to_sym] = Action.new(self.entity, name.to_sym, :member, :method => method, :request_type => request_type)
       end
       
       #
       # Include a collection action
       # Params: name, method = get, request_type = html
       def collection_action(name, method, request_type)
-        self.actions[name.to_sym] = Action.new(name.to_sym, :collection, :method => method, :request_type => request_type)
+        self.actions[name.to_sym] = Action.new(self.entity, name.to_sym, :collection, :method => method, :request_type => request_type)
       end
       
       def member_actions
@@ -31,30 +31,30 @@ module MDWA
       end
       
       def generate_routes
-        routes = []
-        self.actions.values do |action|
-          routes << "#{action.method.to_s} '#{entity.name.underscore.pluralize}/#{action.name.to_s}' => #{action.name.to_sym}"
+        routes = {}
+        self.actions.values.select {|a| !a.resource?}.each do |action|
+          routes[action.name] = action.generate_route
         end
         return routes
       end
       
       def generate_controller
-        controller = []
-        self.actions.value.select {|a| !a.resource?}.each do |action|
-          controller << action.generate_controller
+        controller = {}
+        self.actions.values.select {|a| !a.resource?}.each do |action|
+          controller[action.name] = action.generate_controller
         end
-        # controller.join("\n\n")
+        return controller
       end
       
       # Returns all resource actions
       def set_resource_actions
-        self.actions[:index]   = Action.new(:index, :collection, :resource => true)
-        self.actions[:new]     = Action.new(:new, :collection, :resource => true)
-        self.actions[:edit]    = Action.new(:edit, :member, :resource => true)
-        self.actions[:show]    = Action.new(:show, :member, :resource => true)
-        self.actions[:create]  = Action.new(:create, :collection, :method => :post, :resource => true)
-        self.actions[:update]  = Action.new(:update, :member, :method => :put, :resource => true)
-        self.actions[:delete]  = Action.new(:delete, :member, :method => :delete, :resource => true)
+        self.actions[:index]   = Action.new(self.entity, :index, :collection, :resource => true)
+        self.actions[:new]     = Action.new(self.entity, :new, :collection, :resource => true)
+        self.actions[:edit]    = Action.new(self.entity, :edit, :member, :resource => true)
+        self.actions[:show]    = Action.new(self.entity, :show, :member, :resource => true)
+        self.actions[:create]  = Action.new(self.entity, :create, :collection, :method => :post, :resource => true)
+        self.actions[:update]  = Action.new(self.entity, :update, :member, :method => :put, :resource => true)
+        self.actions[:delete]  = Action.new(self.entity, :delete, :member, :method => :delete, :resource => true)
       end
       
       def clear_resource_actions

data/lib/mdwa/dsl/process_detail_next_action.rb

@@ -13,4 +13,4 @@ module MDWA
     end
     
   end # dsl
-end # mdwa
+end # mdwa

data/lib/mdwa/generators/model.rb

@@ -63,6 +63,13 @@ module MDWA
           return singular_name
         end
 		  end
+		  
+		  def to_route_url
+		    url = []
+		    url << space if namespace?
+		    url << plural_name
+		    url.join('/')
+	    end
 			
 			def to_route_object(prefix = '')
 			  return "#{prefix}#{singular_name}" if !specific? or !namespace?

data/lib/mdwa/version.rb

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

data/test/entity_actions_test.rb

@@ -19,7 +19,8 @@ describe MDWA::DSL::EntityActions do
   end
   
   it "should create action correctly" do 
-    action = MDWA::DSL::Action.new :publish, :member, :method => :get, :request_type => [:html, :ajax_js]
+    product_entity = MDWA::DSL.entity('Product')
+    action = MDWA::DSL::Action.new( product_entity, :publish, :member, :method => :get, :request_type => [:html, :ajax_js] )
     action.name.must_equal :publish
     action.member?.must_equal true
     action.method.must_equal :get
@@ -93,9 +94,17 @@ describe MDWA::DSL::EntityActions do
     
   end
   
-  it "should generate correct code" do
+  it 'should generate view files correctly' do
     product = MDWA::DSL.entity('Product')
-    puts product.actions.generate_routes
+    # p product.actions.actions[:publish].template_names
   end
   
+  it 'should generate correct code' do
+    
+    product = MDWA::DSL.entity('Product')
+    # p product.actions.generate_controller
+    
+  end
+
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mdd
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-24 00:00:00.000000000 Z
+date: 2012-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -169,6 +169,10 @@ files:
 - lib/generators/mdwa/code/USAGE
 - lib/generators/mdwa/code/code_generator.rb
 - lib/generators/mdwa/code/templates/migration.rb
+- lib/generators/mdwa/code/templates/views/view.custom.erb
+- lib/generators/mdwa/code/templates/views/view.html.erb
+- lib/generators/mdwa/code/templates/views/view.js.erb
+- lib/generators/mdwa/code/templates/views/view.json.erb
 - lib/generators/mdwa/entity/USAGE
 - lib/generators/mdwa/entity/entity_generator.rb
 - lib/generators/mdwa/entity/templates/entity.rb
@@ -303,6 +307,8 @@ files:
 - lib/generators/mdwa/scaffold/templates/db_migrate/migrate.rb
 - lib/generators/mdwa/scaffold/templates/models/model.rb
 - lib/generators/mdwa/scaffold/templates/models/module.rb
+- lib/generators/mdwa/scaffold/templates/specs/model.rb
+- lib/generators/mdwa/scaffold/templates/specs/routing.rb
 - lib/generators/mdwa/scaffold/templates/views/_form.html.erb
 - lib/generators/mdwa/scaffold/templates/views/_form_fields.html.erb
 - lib/generators/mdwa/scaffold/templates/views/_list.html.erb