vraptor-scaffold 0.0.1.beta2 → 0.0.1.beta3

data/.gitignore

@@ -4,3 +4,4 @@
 coverage
 pgk
 Gemfile.lock
+.idea

data/History.txt

@@ -0,0 +1,18 @@
+=== 0.0.1.beta3 / 2010-07-11
+
+== New Features
+* Added command to start web server(jetty).
+* Added boolean support.
+
+== Improvements
+* Bumped vraptor version to 3.1.3.
+* Change log4j.xml to log4j.properties.
+* Change views directory from WEB-INF/freemarker to WEB-INF/views.
+* Change hsqldb to use file instead of memory.
+  
+== Bugfixes
+* Fixed pom when creating project with path like /home/rodolfo/project.
+* Fixed runtime dependencies.
+
+=== 0.0.1.beta2 / 2010-07-07
+  * Crud with vraptor, maven 2, jpa, freemarker e jquery.   

data/LICENSE

@@ -1,3 +1,5 @@
+The MIT License
+
 Copyright (c) 2010 Rodolfo Liviero
 
 Permission is hereby granted, free of charge, to any person obtaining

data/README.rdoc

@@ -1,33 +1,68 @@
 = Vraptor Scaffold
+Scaffold for vraptor3.
 
 == Installation
-
- gem install vraptor-scaffold --pre
+gem install vraptor-scaffold --pre
+ 
+== Getting Started
+At the command line client:
+ 
+- vraptor new myapp
+- Change directory into myapp
+- vraptor scaffold product name:string value:double
+- vraptor start 
+- Go http://localhost:8080/products
  
-== Usage
+== Werb Server
+The default web server is jetty but you can import the project in your favorite ide
+and run your project with tomcat or jboss as for example.
 
- vraptor new store
- cd store
- vraptor scaffold product name:string
- mvn compile war:inplace jetty:run
+== Supported Java Types
+The only supported types for now are: boolean, double, float, short, integer, long and string.
+
+== Architecture Overview
+When you run vraptor new command will be created a java web application with:
  
- http://localhost:8080/products
+- Vraptor3 = Controller
+- Jpa(Hibernate) = ORM
+- Freemarker = Template Engine
+- Sitemesh = Decorator
+- Maven2 = Project Management 
+- Jquery = JavaScript
+    
+Tests will use junit, mockito and dbunit.
  
-== Dependency
+src/main/java/app/controllers
+    Controllers will be placed here.
+src/main/java/app/models
+    Models will be placed here.
+src/main/webapp 
+    Web root folder.
+src/main/webapp/decorators
+    Decorators will be placed here.
+src/main/webapp/macros
+    Freemarker macros will be placed here.
+src/main/webapp/javascripts
+    JavaScripts will be placed here.
+src/main/webapp/stylesheets
+    CSS will be placed here.
+src/main/webapp/WEB-INF/views
+    Views will be placed here. Ex: product/index.ftl
+
+== Dependencies
+Ensures that you already have installed:
+
 - Java 6 
 - Maven 2
 
 == Note on Patches/Pull Requests
-
 - Fork the project.
 - Make your feature addition or bug fix.
 - Add tests for it.
 - Send me a pull request.
 
-== Authors
-
+== Author
 -- Rodolfo Liviero [mailto:rodolfoliviero@gmail.com]
 
 == Copyright
-
- Copyright (c) 2010 Rodolfo Liviero. See LICENSE for details.
+Copyright (c) 2010 Rodolfo Liviero. See LICENSE for details.

data/Rakefile

@@ -10,6 +10,12 @@ begin
     gem.email = "rodolfoliviero@gmail.com"
     gem.homepage = "http://github.com/rodolfoliviero/vraptor-scaffold"
     gem.authors = ["Rodolfo Liviero"]
+    
+    gem.add_dependency "thor", ">=0.13.7"
+	  gem.add_dependency "rake", ">=0.8.7"
+  	gem.add_dependency "activesupport", ">=2.3.8"
+	  gem.add_dependency "bundler", ">=1.0.0.beta.2"
+	
   	gem.post_install_message = "Thank you for installing vraptor-scaffold. Please read http://github.com/rodolfoliviero/vraptor-scaffold/blob/master/README.rdoc for more information."
   end
   Jeweler::GemcutterTasks.new

data/TODO.txt

@@ -1,8 +1,14 @@
-Fix pom when create app with path Ex: /home/rodolfo/src/app
-change log4j.xml to lo4j.properties
 display name web.xml with app name
-changelog
-create others persistence unit
+create others persistence unit(maven profile?)
 new java keyword(how to call new method in controller?)
-change database to derby
 create "partial" to form
+update jpa to jpa2(hibernate 3.5.?-FINAL)
+datetime, date and time support.(jquery-ui?)
+relationship support(many-to-one, one-to-many, many-to-many)
+active record is possible?
+generators help
+usage file to each generator
+gem description
+http://waffle.codehaus.org
+put all html input in macros
+i18n

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :minor: 0
 :patch: 1
-:build: beta2
+:build: beta3
 :major: 0

data/lib/generators/app_generator/app_generator.rb

@@ -4,9 +4,9 @@ class AppGenerator < VraptorScaffold::Base
       File.dirname(__FILE__)
    end
   
-  def build(project_name)
-    @project_name = project_name
-    self.destination_root=(@project_name)
+  def build(project_path)
+    @project_name = project_path.split("/").last
+    self.destination_root=(project_path)
     empty_directory "."
     create_pom
     create_main_java
@@ -48,7 +48,7 @@ class AppGenerator < VraptorScaffold::Base
       main_resources = "src/main/resources"
       empty_directory main_resources
       inside main_resources do
-        template_from_root("log4j.xml", "#{main_resources}/log4j.xml")
+        template_from_root("log4j.properties", "#{main_resources}/log4j.properties")
         meta_inf = empty_directory "META-INF"
         template_from_root("persistence.xml", "#{meta_inf}/persistence.xml")
       end
@@ -62,10 +62,18 @@ class AppGenerator < VraptorScaffold::Base
         create_decorators
         create_js
         create_css
+        create_macros
         create_web_inf
       end
     end
     
+    def create_macros
+      macros = empty_directory "macros"
+      inside "macros" do
+        template_from_root("macros/html.ftl", "#{macros}/html.ftl")
+      end
+    end
+    
     def create_css
       css = empty_directory "stylesheets"
       inside "stylesheets" do
@@ -92,7 +100,7 @@ class AppGenerator < VraptorScaffold::Base
       inside "WEB-INF" do
         template_from_root("decorators.xml", "#{web_inf}/decorators.xml")
         template_from_root("web.xml", "#{web_inf}/web.xml")
-        empty_directory "freemarker"
+        empty_directory "views"
       end
     end
     

data/lib/generators/app_generator/templates/FreemarkerPathResolver.java

@@ -1,20 +1,18 @@
 package app.infrastructure;
 
-import javax.servlet.http.HttpServletRequest;
-
+import br.com.caelum.vraptor.http.FormatResolver;
 import br.com.caelum.vraptor.ioc.Component;
-import br.com.caelum.vraptor.view.AcceptHeaderToFormat;
 import br.com.caelum.vraptor.view.DefaultPathResolver;
 
 @Component
 public class FreemarkerPathResolver extends DefaultPathResolver {
 	
-	public FreemarkerPathResolver(HttpServletRequest request, AcceptHeaderToFormat acceptHeaderToFormat) {
-		super(request, acceptHeaderToFormat);
+	public FreemarkerPathResolver(FormatResolver resolver) {
+		super(resolver);
 	}
 
 	protected String getPrefix()  {
-		return "/WEB-INF/freemarker/";
+		return "/WEB-INF/views/";
 	}
 
 	protected String getExtension() {

data/lib/generators/app_generator/templates/log4j.properties

@@ -0,0 +1,4 @@
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} %5p [%-20c{1}] %m%n
+log4j.rootLogger=info, console

data/lib/generators/app_generator/templates/macros/html.ftl

@@ -0,0 +1,11 @@
+<#macro checkbox name checked=false>
+	<#if checked>
+  		<input type="checkbox" name="${name}" checked>
+	<#else>
+  		<input type="checkbox" name="${name}">
+	</#if>  
+</#macro>
+
+<#macro text name value="">
+    <input type="text" name="${name}" value="${value}">
+</#macro>

data/lib/generators/app_generator/templates/persistence.xml

@@ -9,9 +9,11 @@
 		
 		<properties>
 			<property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver" />
-			<property name="hibernate.connection.url" value="jdbc:hsqldb:mem:testdb" />
-			<property name="hibernate.hbm2ddl.auto" value="create" />
+			<property name="hibernate.connection.url" value="jdbc:hsqldb:file:tmp/devdb" />
+			<property name="hibernate.hbm2ddl.auto" value="update" />
 			<property name="hibernate.query.substitutions" value="true=1, false=0"/>
+			<property name="hibernate.show_sql" value="true" />
+			<property name="hibernate.format_sql" value="true" />
 		</properties>
 	</persistence-unit>
 

data/lib/generators/app_generator/templates/pom.erb

@@ -64,7 +64,7 @@
 		<dependency>
 			<groupId>br.com.caelum</groupId>
 			<artifactId>vraptor</artifactId>
-			<version>3.1.2</version>
+			<version>3.1.3</version>
 		</dependency>
 		<dependency>
 			<groupId>opensymphony</groupId>

data/lib/generators/app_generator/templates/web.xml

@@ -42,6 +42,10 @@
 			<param-name>default_encoding</param-name>
 			<param-value>ISO-8859-1</param-value>
 		</init-param>
+		<init-param>
+			<param-name>auto_import</param-name>
+			<param-value>macros/html.ftl as html</param-value>
+		</init-param>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
 

data/lib/generators/attribute.rb

@@ -3,6 +3,25 @@ class Attribute
   
   def initialize(name, type)
     @name = name
+    set_type(type)
+  end
+  
+  def set_type(type)
     @type = type
+    @type = @type.capitalize unless boolean?
+  end
+  
+  def html_input
+    input = "text"
+    input = "checkbox" if boolean?
+    input
+  end
+  
+  def boolean?
+    type.eql? "boolean"
+  end
+  
+  def self.valid_types
+    %w(boolean double float short integer long string)
   end
 end

data/lib/generators/scaffold_generator/freemarker_generator/freemarker_generator.rb

@@ -5,10 +5,14 @@ class FreemarkerGenerator < BaseScaffold
   end
   
   def build
-    template("templates/index.erb", "src/main/webapp/WEB-INF/freemarker/#{@model}/index.ftl")
-    template("templates/show.erb", "src/main/webapp/WEB-INF/freemarker/#{@model}/show.ftl")
-    template("templates/new.erb", "src/main/webapp/WEB-INF/freemarker/#{@model}/new#{class_name}.ftl")
-    template("templates/edit.erb", "src/main/webapp/WEB-INF/freemarker/#{@model}/edit.ftl")
+    create_view("index")
+    create_view("show")
+    create_view("new", "new#{class_name}")
+    create_view("edit")
+  end
+  
+  def create_view(template_name, file_name=template_name)
+  	 template("templates/#{template_name}.erb", "src/main/webapp/WEB-INF/views/#{@model}/#{file_name}.ftl")
   end
   
   def path

data/lib/generators/scaffold_generator/freemarker_generator/templates/edit.erb

@@ -7,7 +7,7 @@
 <% @attributes.each do |att| -%>
   <div class="field">
     <%= att.name.capitalize %>:<br />
-    <input type="text" name="<%= "#{@model}.#{att.name}" %>" value="<%= "${#{@model}.#{att.name}}" %>">
+    <%= "<@html.#{att.html_input} \"#{@model}.#{att.name}\" #{@model}.#{att.name}/>"  %>
   </div>
 <% end -%>
   <div class="actions">

data/lib/generators/scaffold_generator/freemarker_generator/templates/index.erb

@@ -14,7 +14,10 @@
 <#list <%= "#{@model}List as #@model" %>>
   <tr>
   <% @attributes.each do |att| -%>
-    <td><%= "${#{@model}.#{att.name}!\"\"}" %></td>
+    <td>
+      <%= "${#{@model}.#{att.name}!\"\"}" unless att.boolean? %>
+      <%= "${#{@model}.#{att.name}?string}" if att.boolean? %>
+    </td>
   <% end -%>
     <td><a href="<%= "#{path}/${#{@model}.id}/show" %>">show</a></td>
     <td><a href="<%= "#{path}/${#{@model}.id}/edit" %>">edit</a></td>

data/lib/generators/scaffold_generator/freemarker_generator/templates/new.erb

@@ -4,7 +4,7 @@
 <% @attributes.each do |att| -%>
   <div class="field">
     <%= att.name.capitalize %>:<br />
-    <input type="text" name="<%= "#{@model}.#{att.name}" %>">
+    <%= "<@html.#{att.html_input} \"#{@model}.#{att.name}\"/>"  %>
   </div>
 <% end -%>
   <div class="actions">

data/lib/generators/scaffold_generator/freemarker_generator/templates/show.erb

@@ -3,7 +3,8 @@
 <% @attributes.each do |att| -%>
 <p>
   <b><%= att.name.capitalize %>:</b>
-  <%= "${#{@model}.#{att.name}!\"\"}" %>
+   <%= "${#{@model}.#{att.name}!\"\"}" unless att.boolean? %>
+   <%= "${#{@model}.#{att.name}?string}" if att.boolean? %>
 </p>
 <% end -%>
 

data/lib/generators/scaffold_generator/scaffold_generator.rb

@@ -3,8 +3,9 @@ class ScaffoldGenerator
   attr_accessor :attributes, :model
   
   def initialize(args)
-  	@model = args.delete_at(0).downcase 
-  	parse_attributes(args)
+  	@model = args.shift.downcase 
+    @attributes = []
+    validate_scaffold_command(args)
   end
   
   def build
@@ -14,11 +15,27 @@ class ScaffoldGenerator
   end
   
   private 
-    def parse_attributes(args)
-      @attributes = []
+    def validate_scaffold_command(args)
+      unless File.exist?("pom.xml")
+        puts "To run scaffold please go to the project root folder."
+        Kernel::exit
+      end
+      validate_parse_attributes(args)
+    end
+  
+    def validate_parse_attributes(args)
       args.each do |arg|
         parsedAttribute = arg.split(":")
-        @attributes << Attribute.new(parsedAttribute[0], parsedAttribute[1].capitalize)
+        validate_parse_attribute(parsedAttribute)
+      end
+    end
+    
+    def validate_parse_attribute(parsedAttribute) 
+      type = parsedAttribute.last.downcase 
+      unless Attribute.valid_types.include?(type)
+        puts "Attribute #{type} is not supported. The supported attributes types are: #{Attribute.valid_types.join(" ")}"
+        Kernel::exit
       end
+      @attributes << Attribute.new(parsedAttribute.first, type)
     end
 end

data/lib/vraptor-scaffold.rb

@@ -3,9 +3,10 @@ require File.dirname(__FILE__) + '/load_paths'
 module VraptorScaffold
   class Main
 	def self.execute(args)
-		action = args.delete_at(0)
+		  action = args.shift
 	    AppGenerator.new.build(args[0]) if action == "new"
 	    ScaffoldGenerator.new(args).build if action == "scaffold"
+	    exec("mvn compile war:inplace jetty:run") if action == "start"
     end
   end
 end

data/spec/lib/generators/app_generator/app_generator_spec.rb

@@ -3,28 +3,28 @@ require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper")
 describe AppGenerator do
   
   before(:all) do
-    @project_name = "vraptor-scaffold"
-    AppGenerator.new.build(@project_name)
+    @project_path = "src/vraptor-scaffold"
+    AppGenerator.new.build(@project_path)
   end
   
   after(:all) do
-    FileUtils.remove_dir(@project_name)
+    FileUtils.remove_dir(@project_path)
   end
    
   context "build new application" do
     it "should create directory with project name" do
-      File.exist?(@project_name).should be_true 
+      File.exist?(@project_path).should be_true 
     end
     
     it "should create pom" do
       from = File.expand_path(File.dirname(__FILE__) + "/templates/pom.xml")
-      to = "#{@project_name}/pom.xml"
+      to = "#{@project_path}/pom.xml"
       FileUtils.compare_file(from, to).should be_true
     end
     
     context "creating main java" do
       before(:all) do
-        @main_java = "#{@project_name}/src/main/java"
+        @main_java = "#{@project_path}/src/main/java"
         @app = "#{@main_java}/app"
       end
        
@@ -57,7 +57,7 @@ describe AppGenerator do
     
     context "creating main resources" do
       before(:all) do
-        @main_resources = "#{@project_name}/src/main/resources"
+        @main_resources = "#{@project_path}/src/main/resources"
         @meta_inf = "#{@main_resources}/META-INF"
       end 
       
@@ -66,8 +66,8 @@ describe AppGenerator do
       end
       
       it "should create log4j" do
-        from = "#{AppGenerator.source_root}/templates/log4j.xml"
-        to = "#{@main_resources}/log4j.xml"
+        from = "#{AppGenerator.source_root}/templates/log4j.properties"
+        to = "#{@main_resources}/log4j.properties"
         FileUtils.compare_file(from, to).should be_true
       end
       
@@ -83,7 +83,7 @@ describe AppGenerator do
     end 
     context "creating webapp" do
       before(:all) do
-        @webapp = "#{@project_name}/src/main/webapp"
+        @webapp = "#{@project_path}/src/main/webapp"
         @web_inf = "#{@webapp}/WEB-INF"
         @decorators = "#{@webapp}/decorators"
       end 
@@ -108,6 +108,12 @@ describe AppGenerator do
         FileUtils.compare_file(from, to).should be_true
       end
       
+      it "should create html macro file" do
+        from = "#{AppGenerator.source_root}/templates/macros/html.ftl"
+        to = "#{@webapp}/macros/html.ftl"
+        FileUtils.compare_file(from, to).should be_true
+      end
+      
       it "should create WEB-INF folder" do
          File.exist?(@web_inf).should be_true 
       end
@@ -124,8 +130,8 @@ describe AppGenerator do
         FileUtils.compare_file(from, to).should be_true
       end
       
-      it "should create freemarker folder" do
-         File.exist?("#{@web_inf}/freemarker").should be_true 
+      it "should create views folder" do
+         File.exist?("#{@web_inf}/views").should be_true 
       end
       
       it "should create scaffold css" do
@@ -142,8 +148,8 @@ describe AppGenerator do
     end
     context "creating test" do
       before(:all) do
-        @test_java = "#{@project_name}/src/test/java"
-        @test_resource = "#{@project_name}/src/test/java"
+        @test_java = "#{@project_path}/src/test/java"
+        @test_resource = "#{@project_path}/src/test/java"
       end
       
       it "should create test source folder" do

data/spec/lib/generators/app_generator/templates/pom.xml

@@ -64,7 +64,7 @@
 		<dependency>
 			<groupId>br.com.caelum</groupId>
 			<artifactId>vraptor</artifactId>
-			<version>3.1.2</version>
+			<version>3.1.3</version>
 		</dependency>
 		<dependency>
 			<groupId>opensymphony</groupId>

data/spec/lib/generators/attribute_spec.rb

@@ -0,0 +1,82 @@
+require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
+
+describe Attribute do
+  
+  context "supported types" do
+    it "should support boolean" do
+      Attribute.valid_types.include?"boolean".should be_true
+    end
+    
+    it "should support double" do
+      Attribute.valid_types.include?"double".should be_true
+    end
+    
+    it "should support string" do
+      Attribute.valid_types.include?"string".should be_true
+    end
+    
+    it "should support float" do
+      Attribute.valid_types.include?"float".should be_true
+    end
+    
+    it "should support short" do
+      Attribute.valid_types.include?"short".should be_true
+    end
+    
+    it "should support integer" do
+      Attribute.valid_types.include?"integer".should be_true
+    end
+    
+    it "should support long" do
+      Attribute.valid_types.include?"long".should be_true
+    end
+  end
+  
+  context "html_input" do
+    it "should know html input to boolean" do
+      Attribute.new("flag", "boolean").html_input.should eql("checkbox")
+    end
+    
+    it "should know html input to string" do
+      Attribute.new("name", "string").html_input.should eql("text")
+    end
+    
+    it "should know html input to double" do
+      Attribute.new("name", "double").html_input.should eql("text")
+    end
+    
+    it "should know html input to float" do
+      Attribute.new("name", "float").html_input.should eql("text")
+    end
+    
+    it "should know html input to short" do
+      Attribute.new("name", "short").html_input.should eql("text")
+    end
+    
+    it "should know html input to integer" do
+      Attribute.new("name", "integer").html_input.should eql("text")
+    end
+    
+    it "should know html input to long" do
+      Attribute.new("name", "long").html_input.should eql("text")
+    end
+  end
+  
+   context "set type" do
+    it "should set corret type to boolean" do
+      Attribute.new("flag", "boolean").type.should eql("boolean")
+    end
+    
+     it "should set corret type otherwise" do
+      Attribute.new("id", "long").type.should eql("Long")
+    end
+  end
+  
+  it "should be boolean when type is boolean" do
+    Attribute.new("flag", "boolean").boolean?.should be_true
+  end
+  
+  it "cannot be boolean otherwise" do
+    Attribute.new("flag", "short").boolean?.should be_false
+  end
+end

data/spec/lib/generators/scaffold_generator/freemarker_generator/freemarker_generator_spec.rb

@@ -12,19 +12,19 @@ describe FreemarkerGenerator do
   end
   
   it "should create index view" do
-    File.exist?("src/main/webapp/WEB-INF/freemarker/product/index.ftl").should be_true 
+    File.exist?("src/main/webapp/WEB-INF/views/product/index.ftl").should be_true 
   end
   
   it "should create show view" do
-    File.exist?("src/main/webapp/WEB-INF/freemarker/product/show.ftl").should be_true 
+    File.exist?("src/main/webapp/WEB-INF/views/product/show.ftl").should be_true 
   end
   
   it "should create new view" do
-    File.exist?("src/main/webapp/WEB-INF/freemarker/product/newProduct.ftl").should be_true 
+    File.exist?("src/main/webapp/WEB-INF/views/product/newProduct.ftl").should be_true 
   end
-  
+
   it "should create edit view" do
-    File.exist?("src/main/webapp/WEB-INF/freemarker/product/edit.ftl").should be_true 
+    File.exist?("src/main/webapp/WEB-INF/views/product/edit.ftl").should be_true 
   end
   
 end	

data/spec/lib/generators/scaffold_generator/model_generator/templates/Product.java

@@ -11,7 +11,7 @@ public class Product {
 	private Long id;
 	
 	private String name;
-	private Double value;
+	private boolean flag;
   
 	public void setId(Long id) {
 		this.id = id;
@@ -29,12 +29,12 @@ public class Product {
 		return name;
 	}
 	
-	public void setValue(Double value) {
-		this.value = value;
+	public void setFlag(boolean flag) {
+		this.flag = flag;
 	}
 	
-	public Double getValue() {
-		return value;
+	public boolean getFlag() {
+		return flag;
 	}
 	
 }

data/spec/lib/generators/scaffold_generator/scaffold_generator_spec.rb

@@ -3,24 +3,44 @@ require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper")
 describe ScaffoldGenerator do
   
   before(:each) do
-    args = ["product", "name:string", "value:double"]
-    @generator = ScaffoldGenerator.new(args)
+    @args = ["product", "name:String", "value:double"]
+  end
+  
+  context "invalid scaffold command" do
+    it "outside project root" do
+      File.stub!(:exist?).with("pom.xml").and_return(false)
+      Kernel.should_receive(:exit)
+      ScaffoldGenerator.new(@args)
+    end
     
-    @model_generator = mock(ModelGenerator)
-    ModelGenerator.stub!(:new).with(@generator.model, @generator.attributes).and_return(@model_generator)
+    it "invalid attribute type" do
+      File.stub!(:exist?).and_return(true)
+      args = ["product", "name:string", "value:char"] 
+      Kernel.should_receive(:exit)
+      ScaffoldGenerator.new(args)
+    end
+  end
+  
+  context "valid scaffold command" do
+    
+    before(:each) do
+      File.stub!(:exist?).and_return(true)
+      @generator = ScaffoldGenerator.new(@args)
     
-    @controller_generator = mock(ControllerGenerator)
+      @model_generator = mock(ModelGenerator)
+      ModelGenerator.stub!(:new).with(@generator.model, @generator.attributes).and_return(@model_generator)
     
-    ControllerGenerator.stub!(:new).with(@generator.model, @generator.attributes).and_return(@controller_generator)
-    @freemarker_generator = mock(FreemarkerGenerator)
-    FreemarkerGenerator.stub!(:new).with(@generator.model, @generator.attributes).and_return(@freemarker_generator)
+      @controller_generator = mock(ControllerGenerator)
+      ControllerGenerator.stub!(:new).with(@generator.model, @generator.attributes).and_return(@controller_generator)
+      
+      @freemarker_generator = mock(FreemarkerGenerator)
+      FreemarkerGenerator.stub!(:new).with(@generator.model, @generator.attributes).and_return(@freemarker_generator)
     
     @model_generator.stub!(:build)
     @controller_generator.stub!(:build)
     @freemarker_generator.stub!(:build)
   end
-  
-  context "build scaffold" do
+    
     it "should call model generator" do
       @model_generator.should_receive(:build)
       @generator.build

data/spec/lib/vraptor-scaffold_spec.rb

@@ -16,7 +16,7 @@ describe VraptorScaffold::Main do
     end
     
     it "cannot call app generator when not typed new" do
-      @args.delete("new")
+      @args.shift
       @generator.should_not_receive(:build)
       VraptorScaffold::Main.execute(@args)
     end
@@ -34,4 +34,11 @@ describe VraptorScaffold::Main do
       VraptorScaffold::Main.execute(@args)
     end
   end
+  
+  context "web server" do
+    it "should start server when typed start" do
+      VraptorScaffold::Main.should_receive(:exec).with("mvn compile war:inplace jetty:run")
+      VraptorScaffold::Main.execute(["start"])
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -3,5 +3,5 @@ require 'spec/autorun'
 require File.dirname(__FILE__) + '/../lib/vraptor-scaffold'
 
 def build_attributes
-	attributes = [Attribute.new("name", "String"), Attribute.new("value", "Double")]
+	[Attribute.new("name", "string"), Attribute.new("flag", "boolean")]
 end

data/vraptor-scaffold.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{vraptor-scaffold}
-  s.version = "0.0.1.beta2"
+  s.version = "0.0.1.beta3"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rodolfo Liviero"]
-  s.date = %q{2010-07-08}
+  s.date = %q{2010-07-11}
   s.default_executable = %q{vraptor}
   s.description = %q{}
   s.email = %q{rodolfoliviero@gmail.com}
@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
     ".document",
      ".gitignore",
      "Gemfile",
+     "History.txt",
      "LICENSE",
      "README.rdoc",
      "Rakefile",
@@ -33,7 +34,8 @@ Gem::Specification.new do |s|
      "lib/generators/app_generator/templates/decorators.xml",
      "lib/generators/app_generator/templates/index.jsp",
      "lib/generators/app_generator/templates/javascripts/jquery-1.4.2.min.js",
-     "lib/generators/app_generator/templates/log4j.xml",
+     "lib/generators/app_generator/templates/log4j.properties",
+     "lib/generators/app_generator/templates/macros/html.ftl",
      "lib/generators/app_generator/templates/main.ftl",
      "lib/generators/app_generator/templates/persistence.xml",
      "lib/generators/app_generator/templates/pom.erb",
@@ -90,9 +92,21 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<thor>, [">= 0.13.7"])
+      s.add_runtime_dependency(%q<rake>, [">= 0.8.7"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 2.3.8"])
+      s.add_runtime_dependency(%q<bundler>, [">= 1.0.0.beta.2"])
     else
+      s.add_dependency(%q<thor>, [">= 0.13.7"])
+      s.add_dependency(%q<rake>, [">= 0.8.7"])
+      s.add_dependency(%q<activesupport>, [">= 2.3.8"])
+      s.add_dependency(%q<bundler>, [">= 1.0.0.beta.2"])
     end
   else
+    s.add_dependency(%q<thor>, [">= 0.13.7"])
+    s.add_dependency(%q<rake>, [">= 0.8.7"])
+    s.add_dependency(%q<activesupport>, [">= 2.3.8"])
+    s.add_dependency(%q<bundler>, [">= 1.0.0.beta.2"])
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: vraptor-scaffold
 version: !ruby/object:Gem::Version 
-  hash: 299253582
+  hash: 299253583
   prerelease: true
   segments: 
   - 0
   - 0
   - 1
-  - beta2
-  version: 0.0.1.beta2
+  - beta3
+  version: 0.0.1.beta3
 platform: ruby
 authors: 
 - Rodolfo Liviero
@@ -16,10 +16,75 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-08 00:00:00 -03:00
+date: 2010-07-11 00:00:00 -03:00
 default_executable: vraptor
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: thor
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 37
+        segments: 
+        - 0
+        - 13
+        - 7
+        version: 0.13.7
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 8
+        - 7
+        version: 0.8.7
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 2
+        - 3
+        - 8
+        version: 2.3.8
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 62196359
+        segments: 
+        - 1
+        - 0
+        - 0
+        - beta
+        - 2
+        version: 1.0.0.beta.2
+  type: :runtime
+  version_requirements: *id004
 description: ""
 email: rodolfoliviero@gmail.com
 executables: 
@@ -33,6 +98,7 @@ files:
 - .document
 - .gitignore
 - Gemfile
+- History.txt
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -44,7 +110,8 @@ files:
 - lib/generators/app_generator/templates/decorators.xml
 - lib/generators/app_generator/templates/index.jsp
 - lib/generators/app_generator/templates/javascripts/jquery-1.4.2.min.js
-- lib/generators/app_generator/templates/log4j.xml
+- lib/generators/app_generator/templates/log4j.properties
+- lib/generators/app_generator/templates/macros/html.ftl
 - lib/generators/app_generator/templates/main.ftl
 - lib/generators/app_generator/templates/persistence.xml
 - lib/generators/app_generator/templates/pom.erb

data/lib/generators/app_generator/templates/log4j.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
-	<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-		<layout class="org.apache.log4j.PatternLayout">
-			<param name="ConversionPattern" value="%d{HH:mm:ss,SSS} %5p [%-20c{1}] %m%n" />
-		</layout>
-	</appender>
-	
-	<logger name="org.hibernate">
-		<level value="WARN" />
-		<appender-ref ref="CONSOLE" />
-	</logger>
-
-	<root>
-		<priority value="INFO" />
-		<appender-ref ref="CONSOLE" />
-	</root>
-
-</log4j:configuration>