vraptor-scaffold 0.0.1.beta4 → 0.0.1.beta5

data/Gemfile

@@ -1,6 +1,6 @@
 source :rubygems
 
-gem "thor", ">=0.13.8"
+gem "thor", ">=0.14.0"
 gem "rake", ">=0.8.7"
 gem "activesupport", ">=3.0.0.beta4"
 

data/History.txt

@@ -1,4 +1,18 @@
-=== 0.0.1.beta4 / 2010-07-??
+=== 0.0.1.beta4 / 2010-07-?
+
+== New Features
+* Added generic repository.
+* Scaffold repository to each model.
+* Now controllers use repository instead entity manager.
+* Generated models come with hashCode and equals.
+* Generating fake tests to models, controllers and repositories.
+
+== Improvements
+* Better freemarker views.
+* UTF-8 default enconding.
+* Update jetty maven plugin version(6 to 7).
+
+=== 0.0.1.beta4 / 2010-07-16
 
 == New Features
 * Added validator support with hibernate-validator.

data/README.rdoc

@@ -12,8 +12,14 @@ At the command line client:
 - vraptor scaffold product name:string value:double
 - vraptor start 
 - Go http://localhost:8080/products
+
+== Tests
+At the command line client:
+
+- Running: mvn clean test
+- Code coverage: mvn clean cobertura:cobertura
  
-== Werb Server
+== Web 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.
 
@@ -29,25 +35,46 @@ When you run vraptor new command will be created a java web application with:
 - Sitemesh = Decorator
 - Maven2 = Project Management 
 - jQuery = JavaScript
-    
-Tests will use junit, mockito and dbunit.
+- Junit
+- Mockito    
+
+== Description of Contents
  
 src/main/java/app/controllers
-    Controllers will be placed here.
+  Controllers will be placed here.
+  
 src/main/java/app/models
-    Models will be placed here.
+  Models will be placed here.
+  
+src/main/java/app/repositories
+  Repositories will be placed here.
+  
 src/main/webapp 
-    Web root folder.
+  Web root folder.
+  
 src/main/webapp/decorators
-    Decorators will be placed here.
+  Decorators will be placed here.
+  
 src/main/webapp/macros
-    Freemarker macros will be placed here.
+  Freemarker macros will be placed here.
+  
 src/main/webapp/javascripts
-    JavaScripts will be placed here.
+  JavaScripts will be placed here.
+  
 src/main/webapp/stylesheets
-    CSS will be placed here.
+  CSS will be placed here.
+  
 src/main/webapp/WEB-INF/views
-    Views will be placed here. Ex: product/index.ftl
+  Views will be placed here. Ex: product/index.ftl
+  
+src/test/java/app/controllers
+  Tests to controllers will be placed here.
+  
+src/test/java/app/models
+  Testes to models will be placed here.
+  
+src/test/java/app/repositories
+  Tests to repositories will be placed here.
 
 == Dependencies
 Ensures that you already have installed:

data/Rakefile

@@ -11,12 +11,12 @@ begin
     gem.homepage = "http://github.com/rodolfoliviero/vraptor-scaffold"
     gem.authors = ["Rodolfo Liviero"]
     
-    gem.add_dependency "thor", ">=0.13.8"
-	  gem.add_dependency "rake", ">=0.8.7"
+    gem.add_dependency "thor", ">=0.14.0"
+	gem.add_dependency "rake", ">=0.8.7"
   	gem.add_dependency "activesupport", ">=3.0.0.beta4"
-	  gem.add_dependency "bundler", ">=1.0.0.beta.5"
+	gem.add_dependency "bundler", ">=1.0.0.rc.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."
+	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
 rescue LoadError

data/TODO.txt

@@ -1,15 +1,19 @@
-create others persistence unit(maven profile?)
-update jpa to jpa2(hibernate 3.5.?-FINAL)
+unit tests to generated code
 datetime, date and time support.(jquery-ui?)
 relationship support(many-to-one, one-to-many, many-to-many)
-active record is possible?
+
+gem description
 generators help
 usage file to each generator
-gem description
-http://waffle.codehaus.org
+create others persistence unit(maven profile?)
+update jpa to jpa2(hibernate 3.5.?-FINAL)
+
 put all html input in macros
 i18n messages
-xstream
-context.xml
 it works on windowns?
 hibernate joda-time support
+top leval package
+scaml support
+jetty goal
+support to change default encondig when create new app like --enconding=ISO-8859-1
+cuke for duke

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :minor: 0
 :patch: 1
-:build: beta4
+:build: beta5
 :major: 0

data/lib/generators/app_generator/app_generator.rb

@@ -12,14 +12,21 @@ class AppGenerator < VraptorScaffold::Base
     create_main_java
     create_main_resources
     create_webapp
-    empty_directory "src/test/java"
-    empty_directory "src/test/resources"
+    create_test
   end
   
   private
   	def create_pom
   		template("templates/pom.erb", "pom.xml")
   	end
+  	
+  	def create_test
+  	  empty_directory "src/test/java"
+      empty_directory "src/test/java/app"
+      empty_directory "src/test/java/app/controllers"
+      empty_directory "src/test/java/app/models"
+      empty_directory "src/test/resources"
+	  end
   
     def create_main_java
       main_java = "src/main/java"
@@ -33,17 +40,30 @@ class AppGenerator < VraptorScaffold::Base
       empty_directory "app"
       inside "app" do
         empty_directory "controllers"
-        empty_directory "models"
+        create_app_models
         create_app_infra
+        create_app_repository
       end
     end
     
+    def create_app_models
+      models_path = empty_directory "models"
+      template = "Entity.java"
+      template_from_root(template, "#{models_path}/#{template}")
+    end
+    
     def create_app_infra
       infra_path = empty_directory "infrastructure"
       template = "FreemarkerPathResolver.java"
       template_from_root(template, "#{infra_path}/#{template}")
     end
     
+    def create_app_repository
+      repository_path = empty_directory "repositories"
+      template = "Repository.java"
+      template_from_root(template, "#{repository_path}/#{template}")
+    end
+    
     def create_main_resources
       main_resources = "src/main/resources"
       empty_directory main_resources

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

@@ -0,0 +1,42 @@
+package app.models;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+
+@MappedSuperclass
+public class Entity {
+	
+	@Id @GeneratedValue
+	protected Long id;
+	
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Long getId() {
+		return id;
+	}
+	
+	@Override
+	public boolean equals(Object obj) {
+		if (obj == null) {
+			return false;
+		}
+		if (getClass() != obj.getClass()) {
+			return false;
+		}
+		final Entity other = (Entity) obj;
+		if (id != other.id && (id == null || !id.equals(other.id))) {
+			return false;
+		}
+		return true;
+	}
+
+	@Override
+	public int hashCode() {
+		int hash = 7;
+		hash = 17 * hash + (this.getId() != null ? this.getId().hashCode() : 0);
+		return hash;
+	}
+}

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

@@ -0,0 +1,43 @@
+package app.repositories;
+
+import java.io.Serializable;
+import java.lang.reflect.ParameterizedType;
+import java.util.List;
+
+import javax.persistence.EntityManager;
+
+public abstract class Repository<T> {
+	
+	protected final EntityManager entityManager;
+	
+	public Repository(EntityManager entityManager) {
+		this.entityManager = entityManager;
+	}
+	
+	public void create(Object entity) {
+		entityManager.persist(entity);
+	}
+	
+	public void update(Object entity) {
+		entityManager.merge(entity);
+	}
+	
+	public void destroy(Object entity) {
+		entityManager.remove(entity);
+	}
+	
+	public T find(Serializable id) {
+		return (T) entityManager.find(getParameterizedClass(), id);
+	}
+	
+	@SuppressWarnings("unchecked")
+	public List<T> findAll() {
+		return entityManager.createQuery("From " + getParameterizedClass().getName()).getResultList();
+	}
+	
+	@SuppressWarnings("unchecked")
+	private Class<T> getParameterizedClass() {
+		ParameterizedType parameterizedType = (ParameterizedType) getClass().getGenericSuperclass();
+		return (Class<T>) parameterizedType.getActualTypeArguments()[0];
+	}
+}

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

@@ -6,7 +6,11 @@
 	<packaging>war</packaging>
 	<version>0.0.1-SNAPSHOT</version>
 	<name><%= @project_name %></name>
-
+	
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+	
 	<build>
 		<plugins>
 			<plugin>
@@ -15,6 +19,7 @@
 				<configuration>
 					<source>1.6</source>
 					<target>1.6</target>
+					<encoding>UTF-8</encoding>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -32,12 +37,12 @@
 			</plugin>
 			<plugin>
 				<groupId>org.mortbay.jetty</groupId>
-				<artifactId>maven-jetty-plugin</artifactId>
+				<artifactId>jetty-maven-plugin</artifactId>
+				<version>7.1.6.v20100715</version>
 				<configuration>
-					<scanIntervalSeconds>5</scanIntervalSeconds>
+					<scanIntervalSeconds>3</scanIntervalSeconds>
 					<stopKey>foo</stopKey>
 					<stopPort>9999</stopPort>
-					<contextPath>/</contextPath>
 				</configuration>
 			</plugin>
 		</plugins>

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

@@ -11,6 +11,11 @@
 		<param-value>br.com.caelum.vraptor.util.jpa.JPACustomProvider</param-value>
 	</context-param>
 	
+	<context-param>
+		<param-name>br.com.caelum.vraptor.encoding</param-name>
+		<param-value>UTF-8</param-value>
+	</context-param>
+	
 	<filter>
         <filter-name>sitemesh</filter-name>
         <filter-class>com.opensymphony.sitemesh.webapp.SiteMeshFilter</filter-class>
@@ -40,7 +45,7 @@
 		</init-param>
 		<init-param>
 			<param-name>default_encoding</param-name>
-			<param-value>ISO-8859-1</param-value>
+			<param-value>UTF-8</param-value>
 		</init-param>
 		<init-param>
 			<param-name>auto_import</param-name>

data/lib/generators/scaffold_generator/controller_generator/controller_generator.rb

@@ -6,10 +6,11 @@ class ControllerGenerator < BaseScaffold
   
   def build
     template("templates/controller.erb", "src/main/java/app/controllers/#{controller_class_name}.java")
+    template("templates/controller_test.erb", "src/test/java/app/controllers/#{controller_class_name}Test.java")
   end
   
   def controller_class_name
-    "#{@model.capitalize}Controller"
+    "#{class_name}Controller"
   end
   
   def path

data/lib/generators/scaffold_generator/controller_generator/templates/controller.erb

@@ -2,9 +2,8 @@ package app.controllers;
 
 import java.util.List;
 
-import javax.persistence.EntityManager;
-
 import app.models.<%= class_name %>;
+import app.repositories.<%= class_name %>Repository;
 import br.com.caelum.vraptor.Delete;
 import br.com.caelum.vraptor.Get;
 import br.com.caelum.vraptor.Path;
@@ -18,65 +17,62 @@ import br.com.caelum.vraptor.Validator;
 public class <%= controller_class_name %> {
 
 	private final Result result;
-	private final EntityManager entityManager;
+	private final <%= class_name %>Repository repository;
 	private final Validator validator;
 	
-	public <%= controller_class_name %>(Result result, EntityManager entityManager, Validator validator) {
-		this.entityManager = entityManager;
+	public <%= controller_class_name %>(Result result, <%= class_name %>Repository repository, Validator validator) {
 		this.result = result;
+		this.repository = repository;
 		this.validator = validator;
 	}
 	
 	@Get
 	@Path("<%= path %>")
 	public List<<%= class_name %>> index() {
-		return entityManager.createQuery("from <%= class_name %>").getResultList();
+		return repository.findAll();
 	}
 	
 	@Post
 	@Path("<%= path %>")
 	public void create(<%= class_name %> <%= @model %>) {
 		validator.validate(<%= @model %>);
-		validator.onErrorForwardTo(this).form(<%= @model %>);
-		entityManager.persist(<%= @model %>);
+		validator.onErrorUsePageOf(this).new<%= class_name %>();
+		repository.create(<%= @model %>);
 		result.redirectTo(this).index();
 	}
 	
 	@Get
 	@Path("<%= "#{path}/new" %>")
-	public void new<%= class_name %>() {
-		result.forwardTo(this).form(new <%= class_name %>());
+	public <%= class_name %> new<%= class_name %>() {
+		return new <%= class_name %>();
 	}
 	
 	@Put
 	@Path("<%= path %>")
 	public void update(<%= class_name %> <%= @model %>) {
 		validator.validate(<%= @model %>);
-		validator.onErrorForwardTo(this).form(<%= @model %>);
-		entityManager.merge(<%= @model %>);
+		validator.onErrorUsePageOf(this).edit(<%= @model %>);
+		repository.update(<%= @model %>);
 		result.redirectTo(this).index();
 	}
 	
 	@Get
 	@Path("<%= "#{path}/{#{@model}.id}/edit" %>")
-	public void edit(<%= @model.capitalize %> <%= @model %>) {
-		result.forwardTo(this).form(entityManager.find(<%= @model.capitalize %>.class, <%= @model %>.getId()));
+	public <%= class_name %> edit(<%= class_name %> <%= @model %>) {
+		return repository.find(<%= @model %>.getId());
 	}
 
 	@Get
 	@Path("<%= "#{path}/{#{@model}.id}/show" %>")
-	public <%= class_name %> show(<%= @model.capitalize %> <%= @model %>) {
-		return entityManager.find(<%= @model.capitalize %>.class, <%= @model %>.getId());
+	public <%= class_name %> show(<%= class_name %> <%= @model %>) {
+		return repository.find(<%= @model %>.getId());
 	}
 
 	@Delete
 	@Path("<%= path %>")
 	public void destroy(<%= class_name %> <%= @model %>) {
-		entityManager.remove(entityManager.find(<%= class_name %>.class, <%= @model %>.getId()));
+		repository.destroy(repository.find(<%= @model %>.getId()));
 		result.redirectTo(this).index();  
 	}
 	
-	public <%= class_name %> form(<%= class_name %> <%= @model %>) {
-		return <%= @model %>;
-	}
 }

data/lib/generators/scaffold_generator/controller_generator/templates/controller_test.erb

@@ -0,0 +1,12 @@
+package app.controllers;
+
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+
+public class <%= controller_class_name %>Test {
+
+	@Test public void fakeTest() {
+		assertNotNull("put something real.", new <%= controller_class_name %>(null, null, null));
+ 	}
+}

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

@@ -8,10 +8,12 @@ class FreemarkerGenerator < BaseScaffold
     create_view("index")
     create_view("show")
     create_view("form")
+    create_view("edit")
+    create_view("new", "new#{class_name}")
   end
   
-  def create_view(name)
-  	 template("templates/#{name}.erb", "src/main/webapp/WEB-INF/views/#{@model}/#{name}.ftl")
+  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

@@ -0,0 +1,3 @@
+<body>
+	<#include "form.ftl">
+</body>

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

@@ -0,0 +1,3 @@
+<body>
+	<#include "form.ftl">
+</body>

data/lib/generators/scaffold_generator/model_generator/model_generator.rb

@@ -6,5 +6,6 @@ class ModelGenerator < BaseScaffold
   
   def build
     template("templates/model.erb", "src/main/java/app/models/#{class_name}.java")
+    template("templates/model_test.erb", "src/test/java/app/models/#{class_name}Test.java")
   end
 end

data/lib/generators/scaffold_generator/model_generator/templates/model.erb

@@ -1,26 +1,11 @@
 package app.models;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-
-@Entity
-public class <%= class_name %> {
-
-	@Id @GeneratedValue
-	private Long id;
+@javax.persistence.Entity
+public class <%= class_name %> extends Entity {
 	
 <% @attributes.each do |att| -%>
 	private <%= att.type %> <%= att.name %>;
 <% end -%>
-  
-	public void setId(Long id) {
-		this.id = id;
-	}
-	
-	public Long getId() {
-		return id;
-	}
 	
 <% @attributes.each do |att| -%>
 	public void set<%= att.name.capitalize %>(<%= att.type %> <%= att.name %>) {

data/lib/generators/scaffold_generator/model_generator/templates/model_test.erb

@@ -0,0 +1,13 @@
+package app.models;
+
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+
+public class <%= class_name %>Test {
+
+    @Test public void fakeTest() {
+  		assertNotNull("put something real.", new <%= class_name %>());
+  	}
+}
+

data/lib/generators/scaffold_generator/repository_generator/repository_generator.rb

@@ -0,0 +1,15 @@
+class RepositoryGenerator < BaseScaffold
+  
+  def self.source_root
+    File.dirname(__FILE__)
+  end
+  
+  def build
+    template("templates/repository.erb", "src/main/java/app/repositories/#{class_name}Repository.java")
+    template("templates/repository_test.erb", "src/test/java/app/repositories/#{repository_class_name}Test.java")
+  end
+  
+  def repository_class_name
+    "#{class_name}Repository"
+  end
+end

data/lib/generators/scaffold_generator/repository_generator/templates/repository.erb

@@ -0,0 +1,14 @@
+package app.repositories;
+
+import javax.persistence.EntityManager;
+
+import br.com.caelum.vraptor.ioc.Component;
+import app.models.<%= class_name %>;
+
+@Component
+public class <%= repository_class_name %> extends Repository<<%= class_name %>> {
+
+	public <%= repository_class_name %>(EntityManager entityManager) {
+		super(entityManager);
+	}
+}

data/lib/generators/scaffold_generator/repository_generator/templates/repository_test.erb

@@ -0,0 +1,13 @@
+package app.repositories;
+
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+
+public class <%= repository_class_name %>Test {
+
+    @Test public void fakeTest() {
+  		assertNotNull("put something real.", new <%= repository_class_name %>(null));
+  	}
+}
+

data/lib/generators/scaffold_generator/scaffold_generator.rb

@@ -10,8 +10,9 @@ class ScaffoldGenerator
   
   def build
   	ModelGenerator.new(model, attributes).build
-  	ControllerGenerator.new(model, @attributes).build
-  	FreemarkerGenerator.new(model, @attributes).build
+  	RepositoryGenerator.new(model, attributes).build
+  	ControllerGenerator.new(model, attributes).build
+  	FreemarkerGenerator.new(model, attributes).build
   end
   
   private 

data/lib/load_paths.rb

@@ -10,6 +10,7 @@ require File.dirname(__FILE__) + '/../lib/generators/base'
 require File.dirname(__FILE__) + '/../lib/generators/scaffold_generator/scaffold_generator'
 require File.dirname(__FILE__) + '/../lib/generators/scaffold_generator/base_scaffold'
 require File.dirname(__FILE__) + '/../lib/generators/scaffold_generator/model_generator/model_generator'
+require File.dirname(__FILE__) + '/../lib/generators/scaffold_generator/repository_generator/repository_generator'
 require File.dirname(__FILE__) + '/../lib/generators/scaffold_generator/controller_generator/controller_generator'
 require File.dirname(__FILE__) + '/../lib/generators/scaffold_generator/freemarker_generator/freemarker_generator'
 require File.dirname(__FILE__) + '/../lib/generators/app_generator/app_generator'

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

@@ -8,7 +8,7 @@ describe AppGenerator do
   end
   
   after(:all) do
-    FileUtils.remove_dir(@project_path)
+    FileUtils.remove_dir("src")
   end
    
   context "build new application" do
@@ -44,6 +44,12 @@ describe AppGenerator do
         File.exist?("#{@app}/models").should be_true 
       end
       
+      it "should create generic entity" do
+        from = "#{AppGenerator.source_root}/templates/Entity.java"
+        to = "#{@app}/models/Entity.java"
+        FileUtils.compare_file(from, to).should be_true
+      end
+      
       it "should create infrastructure folder" do
         File.exist?("#{@app}/infrastructure").should be_true 
       end
@@ -53,6 +59,12 @@ describe AppGenerator do
         to = "#{@app}/infrastructure/FreemarkerPathResolver.java"
         FileUtils.compare_file(from, to).should be_true
       end
+      
+       it "should create generic repository" do
+        from = "#{AppGenerator.source_root}/templates/Repository.java"
+        to = "#{@app}/repositories/Repository.java"
+        FileUtils.compare_file(from, to).should be_true
+      end
     end
     
     context "creating main resources" do
@@ -156,12 +168,25 @@ describe AppGenerator do
       before(:all) do
         @test_java = "#{@project_path}/src/test/java"
         @test_resource = "#{@project_path}/src/test/java"
+        @app = "#{@test_java}/app"
       end
       
       it "should create test source folder" do
         File.exist?(@test_java).should be_true 
       end
       
+      it "should create app folder" do
+        File.exist?(@app).should be_true 
+      end
+      
+      it "should create controllers folder" do
+        File.exist?("#{@app}/controllers").should be_true 
+      end
+      
+      it "should create models folder" do
+        File.exist?("#{@app}/models").should be_true 
+      end
+      
       it "should create test resource folder" do
         File.exist?(@test_resource).should be_true 
       end

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

@@ -6,7 +6,11 @@
 	<packaging>war</packaging>
 	<version>0.0.1-SNAPSHOT</version>
 	<name>vraptor-scaffold</name>
-
+	
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+	
 	<build>
 		<plugins>
 			<plugin>
@@ -15,6 +19,7 @@
 				<configuration>
 					<source>1.6</source>
 					<target>1.6</target>
+					<encoding>UTF-8</encoding>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -32,12 +37,12 @@
 			</plugin>
 			<plugin>
 				<groupId>org.mortbay.jetty</groupId>
-				<artifactId>maven-jetty-plugin</artifactId>
+				<artifactId>jetty-maven-plugin</artifactId>
+				<version>7.1.6.v20100715</version>
 				<configuration>
-					<scanIntervalSeconds>5</scanIntervalSeconds>
+					<scanIntervalSeconds>3</scanIntervalSeconds>
 					<stopKey>foo</stopKey>
 					<stopPort>9999</stopPort>
-					<contextPath>/</contextPath>
 				</configuration>
 			</plugin>
 		</plugins>

data/spec/lib/generators/scaffold_generator/controller_generator/controller_generator_spec.rb

@@ -17,4 +17,8 @@ describe ControllerGenerator do
     FileUtils.compare_file(from, to).should be_true
   end
   
+  it "should create controller test" do
+    File.exist?("src/test/java/app/controllers/ProductControllerTest.java").should be_true 
+  end
+  
 end	

data/spec/lib/generators/scaffold_generator/controller_generator/templates/ProductController.java

@@ -2,9 +2,8 @@ package app.controllers;
 
 import java.util.List;
 
-import javax.persistence.EntityManager;
-
 import app.models.Product;
+import app.repositories.ProductRepository;
 import br.com.caelum.vraptor.Delete;
 import br.com.caelum.vraptor.Get;
 import br.com.caelum.vraptor.Path;
@@ -18,65 +17,62 @@ import br.com.caelum.vraptor.Validator;
 public class ProductController {
 
 	private final Result result;
-	private final EntityManager entityManager;
+	private final ProductRepository repository;
 	private final Validator validator;
 	
-	public ProductController(Result result, EntityManager entityManager, Validator validator) {
-		this.entityManager = entityManager;
+	public ProductController(Result result, ProductRepository repository, Validator validator) {
 		this.result = result;
+		this.repository = repository;
 		this.validator = validator;
 	}
 	
 	@Get
 	@Path("/products")
 	public List<Product> index() {
-		return entityManager.createQuery("from Product").getResultList();
+		return repository.findAll();
 	}
 	
 	@Post
 	@Path("/products")
 	public void create(Product product) {
 		validator.validate(product);
-		validator.onErrorForwardTo(this).form(product);
-		entityManager.persist(product);
+		validator.onErrorUsePageOf(this).newProduct();
+		repository.create(product);
 		result.redirectTo(this).index();
 	}
 	
 	@Get
 	@Path("/products/new")
-	public void newProduct() {
-		result.forwardTo(this).form(new Product());
+	public Product newProduct() {
+		return new Product();
 	}
 	
 	@Put
 	@Path("/products")
 	public void update(Product product) {
 		validator.validate(product);
-		validator.onErrorForwardTo(this).form(product);
-		entityManager.merge(product);
+		validator.onErrorUsePageOf(this).edit(product);
+		repository.update(product);
 		result.redirectTo(this).index();
 	}
 	
 	@Get
 	@Path("/products/{product.id}/edit")
-	public void edit(Product product) {
-		result.forwardTo(this).form(entityManager.find(Product.class, product.getId()));
+	public Product edit(Product product) {
+		return repository.find(product.getId());
 	}
 
 	@Get
 	@Path("/products/{product.id}/show")
 	public Product show(Product product) {
-		return entityManager.find(Product.class, product.getId());
+		return repository.find(product.getId());
 	}
 
 	@Delete
 	@Path("/products")
 	public void destroy(Product product) {
-		entityManager.remove(entityManager.find(Product.class, product.getId()));
+		repository.destroy(repository.find(product.getId()));
 		result.redirectTo(this).index();  
 	}
 	
-	public Product form(Product product) {
-		return product;
-	}
 }

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

@@ -23,4 +23,12 @@ describe FreemarkerGenerator do
     File.exist?("src/main/webapp/WEB-INF/views/product/form.ftl").should be_true 
   end
   
+  it "should create new view" do
+    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/views/product/edit.ftl").should be_true 
+  end
+  
 end	

data/spec/lib/generators/scaffold_generator/model_generator/model_generator_spec.rb

@@ -17,4 +17,7 @@ describe ModelGenerator do
     FileUtils.compare_file(from, to).should be_true
   end
   
+   it "should create model test" do
+    File.exist?("src/test/java/app/models/ProductTest.java").should be_true 
+  end
 end	

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

@@ -1,25 +1,10 @@
 package app.models;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-
-@Entity
-public class Product {
-
-	@Id @GeneratedValue
-	private Long id;
+@javax.persistence.Entity
+public class Product extends Entity {
 	
 	private String name;
 	private boolean flag;
-  
-	public void setId(Long id) {
-		this.id = id;
-	}
-	
-	public Long getId() {
-		return id;
-	}
 	
 	public void setName(String name) {
 		this.name = name;

data/spec/lib/generators/scaffold_generator/repository_generator/repository_generator_spec.rb

@@ -0,0 +1,23 @@
+require File.expand_path(File.dirname(__FILE__) + "/../../../../spec_helper")
+
+describe RepositoryGenerator do
+  
+  before(:each) do
+    @generator = RepositoryGenerator.new("product", build_attributes)
+    @generator.build
+  end
+  
+  after(:each) do
+    FileUtils.remove_dir("src") 
+  end
+  
+  it "should create repository" do
+    from = File.expand_path(File.dirname(__FILE__) + "/templates/ProductRepository.java")
+    to = "src/main/java/app/repositories/ProductRepository.java"
+    FileUtils.compare_file(from, to).should be_true
+  end
+  
+   it "should create repository" do
+    File.exist?("src/test/java/app/repositories/ProductRepositoryTest.java").should be_true
+  end
+end	

data/spec/lib/generators/scaffold_generator/repository_generator/templates/ProductRepository.java

@@ -0,0 +1,14 @@
+package app.repositories;
+
+import javax.persistence.EntityManager;
+
+import br.com.caelum.vraptor.ioc.Component;
+import app.models.Product;
+
+@Component
+public class ProductRepository extends Repository<Product> {
+
+	public ProductRepository(EntityManager entityManager) {
+		super(entityManager);
+	}
+}

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

@@ -29,16 +29,20 @@ describe ScaffoldGenerator do
     
       @model_generator = mock(ModelGenerator)
       ModelGenerator.stub!(:new).with(@generator.model, @generator.attributes).and_return(@model_generator)
-    
+      
+      @repository_generator = mock(RepositoryGenerator)
+      RepositoryGenerator.stub!(:new).with(@generator.model, @generator.attributes).and_return(@repository_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)
+      @model_generator.stub!(:build)
+      @repository_generator.stub!(:build)
+      @controller_generator.stub!(:build)
+      @freemarker_generator.stub!(:build)
   end
     
     it "should call model generator" do
@@ -55,5 +59,10 @@ describe ScaffoldGenerator do
       @freemarker_generator.should_receive(:build)
       @generator.build
     end
+    
+    it "should call repository generator" do
+      @repository_generator.should_receive(:build)
+      @generator.build
+    end
   end
 end	

data/vraptor-scaffold.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{vraptor-scaffold}
-  s.version = "0.0.1.beta4"
+  s.version = "0.0.1.beta5"
 
   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-18}
+  s.date = %q{2010-08-04}
   s.default_executable = %q{vraptor}
   s.description = %q{}
   s.email = %q{rodolfoliviero@gmail.com}
@@ -30,7 +30,9 @@ Gem::Specification.new do |s|
      "VERSION.yml",
      "bin/vraptor",
      "lib/generators/app_generator/app_generator.rb",
+     "lib/generators/app_generator/templates/Entity.java",
      "lib/generators/app_generator/templates/FreemarkerPathResolver.java",
+     "lib/generators/app_generator/templates/Repository.java",
      "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",
@@ -47,12 +49,19 @@ Gem::Specification.new do |s|
      "lib/generators/scaffold_generator/base_scaffold.rb",
      "lib/generators/scaffold_generator/controller_generator/controller_generator.rb",
      "lib/generators/scaffold_generator/controller_generator/templates/controller.erb",
+     "lib/generators/scaffold_generator/controller_generator/templates/controller_test.erb",
      "lib/generators/scaffold_generator/freemarker_generator/freemarker_generator.rb",
+     "lib/generators/scaffold_generator/freemarker_generator/templates/edit.erb",
      "lib/generators/scaffold_generator/freemarker_generator/templates/form.erb",
      "lib/generators/scaffold_generator/freemarker_generator/templates/index.erb",
+     "lib/generators/scaffold_generator/freemarker_generator/templates/new.erb",
      "lib/generators/scaffold_generator/freemarker_generator/templates/show.erb",
      "lib/generators/scaffold_generator/model_generator/model_generator.rb",
      "lib/generators/scaffold_generator/model_generator/templates/model.erb",
+     "lib/generators/scaffold_generator/model_generator/templates/model_test.erb",
+     "lib/generators/scaffold_generator/repository_generator/repository_generator.rb",
+     "lib/generators/scaffold_generator/repository_generator/templates/repository.erb",
+     "lib/generators/scaffold_generator/repository_generator/templates/repository_test.erb",
      "lib/generators/scaffold_generator/scaffold_generator.rb",
      "lib/load_paths.rb",
      "lib/vraptor-scaffold.rb",
@@ -64,6 +73,8 @@ Gem::Specification.new do |s|
      "spec/lib/generators/scaffold_generator/freemarker_generator/freemarker_generator_spec.rb",
      "spec/lib/generators/scaffold_generator/model_generator/model_generator_spec.rb",
      "spec/lib/generators/scaffold_generator/model_generator/templates/Product.java",
+     "spec/lib/generators/scaffold_generator/repository_generator/repository_generator_spec.rb",
+     "spec/lib/generators/scaffold_generator/repository_generator/templates/ProductRepository.java",
      "spec/lib/generators/scaffold_generator/scaffold_generator_spec.rb",
      "spec/lib/vraptor-scaffold_spec.rb",
      "spec/spec.opts",
@@ -80,6 +91,7 @@ Gem::Specification.new do |s|
     "spec/lib/vraptor-scaffold_spec.rb",
      "spec/lib/generators/app_generator/app_generator_spec.rb",
      "spec/lib/generators/scaffold_generator/controller_generator/controller_generator_spec.rb",
+     "spec/lib/generators/scaffold_generator/repository_generator/repository_generator_spec.rb",
      "spec/lib/generators/scaffold_generator/scaffold_generator_spec.rb",
      "spec/lib/generators/scaffold_generator/model_generator/model_generator_spec.rb",
      "spec/lib/generators/scaffold_generator/freemarker_generator/freemarker_generator_spec.rb",
@@ -92,21 +104,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.8"])
+      s.add_runtime_dependency(%q<thor>, [">= 0.14.0"])
       s.add_runtime_dependency(%q<rake>, [">= 0.8.7"])
       s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0.beta4"])
-      s.add_runtime_dependency(%q<bundler>, [">= 1.0.0.beta.5"])
+      s.add_runtime_dependency(%q<bundler>, [">= 1.0.0.rc.2"])
     else
-      s.add_dependency(%q<thor>, [">= 0.13.8"])
+      s.add_dependency(%q<thor>, [">= 0.14.0"])
       s.add_dependency(%q<rake>, [">= 0.8.7"])
       s.add_dependency(%q<activesupport>, [">= 3.0.0.beta4"])
-      s.add_dependency(%q<bundler>, [">= 1.0.0.beta.5"])
+      s.add_dependency(%q<bundler>, [">= 1.0.0.rc.2"])
     end
   else
-    s.add_dependency(%q<thor>, [">= 0.13.8"])
+    s.add_dependency(%q<thor>, [">= 0.14.0"])
     s.add_dependency(%q<rake>, [">= 0.8.7"])
     s.add_dependency(%q<activesupport>, [">= 3.0.0.beta4"])
-    s.add_dependency(%q<bundler>, [">= 1.0.0.beta.5"])
+    s.add_dependency(%q<bundler>, [">= 1.0.0.rc.2"])
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: vraptor-scaffold
 version: !ruby/object:Gem::Version 
-  hash: 299253580
+  hash: 299253581
   prerelease: true
   segments: 
   - 0
   - 0
   - 1
-  - beta4
-  version: 0.0.1.beta4
+  - beta5
+  version: 0.0.1.beta5
 platform: ruby
 authors: 
 - Rodolfo Liviero
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-18 00:00:00 -03:00
+date: 2010-08-04 00:00:00 -03:00
 default_executable: vraptor
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 59
+        hash: 39
         segments: 
         - 0
-        - 13
-        - 8
-        version: 0.13.8
+        - 14
+        - 0
+        version: 0.14.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -76,14 +76,14 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 62196361
+        hash: 15424049
         segments: 
         - 1
         - 0
         - 0
-        - beta
-        - 5
-        version: 1.0.0.beta.5
+        - rc
+        - 2
+        version: 1.0.0.rc.2
   type: :runtime
   version_requirements: *id004
 description: ""
@@ -107,7 +107,9 @@ files:
 - VERSION.yml
 - bin/vraptor
 - lib/generators/app_generator/app_generator.rb
+- lib/generators/app_generator/templates/Entity.java
 - lib/generators/app_generator/templates/FreemarkerPathResolver.java
+- lib/generators/app_generator/templates/Repository.java
 - 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
@@ -124,12 +126,19 @@ files:
 - lib/generators/scaffold_generator/base_scaffold.rb
 - lib/generators/scaffold_generator/controller_generator/controller_generator.rb
 - lib/generators/scaffold_generator/controller_generator/templates/controller.erb
+- lib/generators/scaffold_generator/controller_generator/templates/controller_test.erb
 - lib/generators/scaffold_generator/freemarker_generator/freemarker_generator.rb
+- lib/generators/scaffold_generator/freemarker_generator/templates/edit.erb
 - lib/generators/scaffold_generator/freemarker_generator/templates/form.erb
 - lib/generators/scaffold_generator/freemarker_generator/templates/index.erb
+- lib/generators/scaffold_generator/freemarker_generator/templates/new.erb
 - lib/generators/scaffold_generator/freemarker_generator/templates/show.erb
 - lib/generators/scaffold_generator/model_generator/model_generator.rb
 - lib/generators/scaffold_generator/model_generator/templates/model.erb
+- lib/generators/scaffold_generator/model_generator/templates/model_test.erb
+- lib/generators/scaffold_generator/repository_generator/repository_generator.rb
+- lib/generators/scaffold_generator/repository_generator/templates/repository.erb
+- lib/generators/scaffold_generator/repository_generator/templates/repository_test.erb
 - lib/generators/scaffold_generator/scaffold_generator.rb
 - lib/load_paths.rb
 - lib/vraptor-scaffold.rb
@@ -141,6 +150,8 @@ files:
 - spec/lib/generators/scaffold_generator/freemarker_generator/freemarker_generator_spec.rb
 - spec/lib/generators/scaffold_generator/model_generator/model_generator_spec.rb
 - spec/lib/generators/scaffold_generator/model_generator/templates/Product.java
+- spec/lib/generators/scaffold_generator/repository_generator/repository_generator_spec.rb
+- spec/lib/generators/scaffold_generator/repository_generator/templates/ProductRepository.java
 - spec/lib/generators/scaffold_generator/scaffold_generator_spec.rb
 - spec/lib/vraptor-scaffold_spec.rb
 - spec/spec.opts
@@ -186,6 +197,7 @@ test_files:
 - spec/lib/vraptor-scaffold_spec.rb
 - spec/lib/generators/app_generator/app_generator_spec.rb
 - spec/lib/generators/scaffold_generator/controller_generator/controller_generator_spec.rb
+- spec/lib/generators/scaffold_generator/repository_generator/repository_generator_spec.rb
 - spec/lib/generators/scaffold_generator/scaffold_generator_spec.rb
 - spec/lib/generators/scaffold_generator/model_generator/model_generator_spec.rb
 - spec/lib/generators/scaffold_generator/freemarker_generator/freemarker_generator_spec.rb