vraptor-scaffold 0.0.1.beta3 → 0.0.1.beta4

data/.gitignore

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

data/Gemfile

@@ -1,8 +1,8 @@
 source :rubygems
 
-gem "thor", ">=0.13.7"
+gem "thor", ">=0.13.8"
 gem "rake", ">=0.8.7"
-gem "activesupport", ">=2.3.8"
+gem "activesupport", ">=3.0.0.beta4"
 
 gem "ruby-debug", :group => [:development, :test]
 

data/History.txt

@@ -1,3 +1,15 @@
+=== 0.0.1.beta4 / 2010-07-??
+
+== New Features
+* Added validator support with hibernate-validator.
+* Error Messages.
+* Redirect to form when occur validation erros.
+* Added joda time dependency.
+* Create messages.properties(i18n).
+  
+== Bugfixes
+* Fixed i.e problems.
+
 === 0.0.1.beta3 / 2010-07-11
 
 == New Features

data/README.rdoc

@@ -1,8 +1,8 @@
 = Vraptor Scaffold
-Scaffold for vraptor3.
+Scaffold for vraptor 3.
 
 == Installation
-gem install vraptor-scaffold --pre
+ gem install vraptor-scaffold --pre
  
 == Getting Started
 At the command line client:
@@ -24,11 +24,11 @@ The only supported types for now are: boolean, double, float, short, integer, lo
 When you run vraptor new command will be created a java web application with:
  
 - Vraptor3 = Controller
-- Jpa(Hibernate) = ORM
+- Jpa(Hibernate and Hibernate Validator) = ORM
 - Freemarker = Template Engine
 - Sitemesh = Decorator
 - Maven2 = Project Management 
-- Jquery = JavaScript
+- jQuery = JavaScript
     
 Tests will use junit, mockito and dbunit.
  

data/Rakefile

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

data/TODO.txt

@@ -1,7 +1,4 @@
-display name web.xml with app name
 create others persistence unit(maven profile?)
-new java keyword(how to call new method in controller?)
-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)
@@ -11,4 +8,8 @@ usage file to each generator
 gem description
 http://waffle.codehaus.org
 put all html input in macros
-i18n
+i18n messages
+xstream
+context.xml
+it works on windowns?
+hibernate joda-time support

data/VERSION.yml

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

data/lib/generators/app_generator/app_generator.rb

@@ -49,6 +49,7 @@ class AppGenerator < VraptorScaffold::Base
       empty_directory main_resources
       inside main_resources do
         template_from_root("log4j.properties", "#{main_resources}/log4j.properties")
+        template_from_root("messages.properties", "#{main_resources}/messages.properties")
         meta_inf = empty_directory "META-INF"
         template_from_root("persistence.xml", "#{meta_inf}/persistence.xml")
       end

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

@@ -92,6 +92,22 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-validator</artifactId>
+			<version>3.1.0.GA</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>slf4j-api</artifactId>
+					<groupId>org.slf4j</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>joda-time</groupId>
+			<artifactId>joda-time</artifactId>
+			<version>1.6</version>
+		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>servlet-api</artifactId>

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

@@ -12,17 +12,19 @@ import br.com.caelum.vraptor.Post;
 import br.com.caelum.vraptor.Put;
 import br.com.caelum.vraptor.Resource;
 import br.com.caelum.vraptor.Result;
-import br.com.caelum.vraptor.view.Results;
+import br.com.caelum.vraptor.Validator;
 
 @Resource
 public class <%= controller_class_name %> {
 
-	private Result result;
-	private EntityManager entityManager;
+	private final Result result;
+	private final EntityManager entityManager;
+	private final Validator validator;
 	
-	public <%= controller_class_name %>(Result result, EntityManager entityManager) {
+	public <%= controller_class_name %>(Result result, EntityManager entityManager, Validator validator) {
 		this.entityManager = entityManager;
 		this.result = result;
+		this.validator = validator;
 	}
 	
 	@Get
@@ -34,27 +36,31 @@ public class <%= controller_class_name %> {
 	@Post
 	@Path("<%= path %>")
 	public void create(<%= class_name %> <%= @model %>) {
+		validator.validate(<%= @model %>);
+		validator.onErrorForwardTo(this).form(<%= @model %>);
 		entityManager.persist(<%= @model %>);
-		result.use(Results.logic()).redirectTo(<%= controller_class_name %>.class).index();  
+		result.redirectTo(this).index();
 	}
 	
 	@Get
 	@Path("<%= "#{path}/new" %>")
-	public <%= class_name %> new<%= class_name %>() {
-		return new <%= class_name %>();
+	public void new<%= class_name %>() {
+		result.forwardTo(this).form(new <%= class_name %>());
 	}
 	
 	@Put
 	@Path("<%= path %>")
 	public void update(<%= class_name %> <%= @model %>) {
+		validator.validate(<%= @model %>);
+		validator.onErrorForwardTo(this).form(<%= @model %>);
 		entityManager.merge(<%= @model %>);
-		result.use(Results.logic()).redirectTo(<%= controller_class_name %>.class).index();  
+		result.redirectTo(this).index();
 	}
 	
 	@Get
 	@Path("<%= "#{path}/{#{@model}.id}/edit" %>")
-	public <%= class_name %> edit(<%= @model.capitalize %> <%= @model %>) {
-		return entityManager.find(<%= @model.capitalize %>.class, <%= @model %>.getId());
+	public void edit(<%= @model.capitalize %> <%= @model %>) {
+		result.forwardTo(this).form(entityManager.find(<%= @model.capitalize %>.class, <%= @model %>.getId()));
 	}
 
 	@Get
@@ -67,6 +73,10 @@ public class <%= controller_class_name %> {
 	@Path("<%= path %>")
 	public void destroy(<%= class_name %> <%= @model %>) {
 		entityManager.remove(entityManager.find(<%= class_name %>.class, <%= @model %>.getId()));
-		result.use(Results.logic()).redirectTo(<%= controller_class_name %>.class).index();  
+		result.redirectTo(this).index();  
+	}
+	
+	public <%= class_name %> form(<%= class_name %> <%= @model %>) {
+		return <%= @model %>;
 	}
 }

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

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

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

@@ -0,0 +1,26 @@
+<#if errors??>
+	<#list errors as error>
+		 ${error.category} - ${error.message}<br />
+	</#list>
+</#if>
+
+<form action="<%= path %>" method="post">
+  
+  <#if <%= "#{@model}.id" %>??>
+    <input type="hidden" name="<%= "#{@model}.id" %>" value="<%= "${#{@model}.id}" %>"/>
+    <input type="hidden" name="_method" value="put"/>
+  </#if>
+
+<% @attributes.each do |att| -%>
+  <div class="field">
+    <%= att.name.capitalize %>:<br />
+    <%= "<@html.#{att.html_input} \"#{@model}.#{att.name}\" #{@model}.#{att.name}/>"  %>
+  </div>
+<% end -%>
+  <div class="actions">
+    <button type="submit">send</button>
+  </div>
+</form>
+
+<a href="<%= path %>">Back</a>
+

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

@@ -24,7 +24,8 @@
     <td>
       <form action="<%= path %>" method="post">
     	  <input name="<%= "#{@model}.id" %>" value="<%= "${#{@model}.id}" %>" type="hidden" />
-    	  <button type="submit" name="_method" value="delete" onclick="return confirm('Are you sure?')">destroy</button>
+    	  <input type="hidden" name="_method" value="delete"/>
+    	  <button type="submit" onclick="return confirm('Are you sure?')">destroy</button>
 	    </form>
 	  </td>
     </tr>

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

@@ -71,6 +71,12 @@ describe AppGenerator do
         FileUtils.compare_file(from, to).should be_true
       end
       
+      it "should create messages resource" do
+        from = "#{AppGenerator.source_root}/templates/messages.properties"
+        to = "#{@main_resources}/messages.properties"
+        FileUtils.compare_file(from, to).should be_true
+      end
+      
       it "should create META-INF" do
          File.exist?(@meta_inf).should be_true 
       end

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

@@ -92,6 +92,22 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-validator</artifactId>
+			<version>3.1.0.GA</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>slf4j-api</artifactId>
+					<groupId>org.slf4j</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>joda-time</groupId>
+			<artifactId>joda-time</artifactId>
+			<version>1.6</version>
+		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>servlet-api</artifactId>

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

@@ -12,17 +12,19 @@ import br.com.caelum.vraptor.Post;
 import br.com.caelum.vraptor.Put;
 import br.com.caelum.vraptor.Resource;
 import br.com.caelum.vraptor.Result;
-import br.com.caelum.vraptor.view.Results;
+import br.com.caelum.vraptor.Validator;
 
 @Resource
 public class ProductController {
 
-	private Result result;
-	private EntityManager entityManager;
+	private final Result result;
+	private final EntityManager entityManager;
+	private final Validator validator;
 	
-	public ProductController(Result result, EntityManager entityManager) {
+	public ProductController(Result result, EntityManager entityManager, Validator validator) {
 		this.entityManager = entityManager;
 		this.result = result;
+		this.validator = validator;
 	}
 	
 	@Get
@@ -34,27 +36,31 @@ public class ProductController {
 	@Post
 	@Path("/products")
 	public void create(Product product) {
+		validator.validate(product);
+		validator.onErrorForwardTo(this).form(product);
 		entityManager.persist(product);
-		result.use(Results.logic()).redirectTo(ProductController.class).index();  
+		result.redirectTo(this).index();
 	}
 	
 	@Get
 	@Path("/products/new")
-	public Product newProduct() {
-		return new Product();
+	public void newProduct() {
+		result.forwardTo(this).form(new Product());
 	}
 	
 	@Put
 	@Path("/products")
 	public void update(Product product) {
+		validator.validate(product);
+		validator.onErrorForwardTo(this).form(product);
 		entityManager.merge(product);
-		result.use(Results.logic()).redirectTo(ProductController.class).index();  
+		result.redirectTo(this).index();
 	}
 	
 	@Get
 	@Path("/products/{product.id}/edit")
-	public Product edit(Product product) {
-		return entityManager.find(Product.class, product.getId());
+	public void edit(Product product) {
+		result.forwardTo(this).form(entityManager.find(Product.class, product.getId()));
 	}
 
 	@Get
@@ -67,6 +73,10 @@ public class ProductController {
 	@Path("/products")
 	public void destroy(Product product) {
 		entityManager.remove(entityManager.find(Product.class, product.getId()));
-		result.use(Results.logic()).redirectTo(ProductController.class).index();  
+		result.redirectTo(this).index();  
+	}
+	
+	public Product form(Product product) {
+		return product;
 	}
 }

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

@@ -19,12 +19,8 @@ describe FreemarkerGenerator do
     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/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 
+  it "should create form view" do
+    File.exist?("src/main/webapp/WEB-INF/views/product/form.ftl").should be_true 
   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.beta3"
+  s.version = "0.0.1.beta4"
 
   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-11}
+  s.date = %q{2010-07-18}
   s.default_executable = %q{vraptor}
   s.description = %q{}
   s.email = %q{rodolfoliviero@gmail.com}
@@ -37,6 +37,7 @@ Gem::Specification.new do |s|
      "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/messages.properties",
      "lib/generators/app_generator/templates/persistence.xml",
      "lib/generators/app_generator/templates/pom.erb",
      "lib/generators/app_generator/templates/stylesheets/scaffold.css",
@@ -47,9 +48,8 @@ Gem::Specification.new do |s|
      "lib/generators/scaffold_generator/controller_generator/controller_generator.rb",
      "lib/generators/scaffold_generator/controller_generator/templates/controller.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",
@@ -92,21 +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<thor>, [">= 0.13.8"])
       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"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0.beta4"])
+      s.add_runtime_dependency(%q<bundler>, [">= 1.0.0.beta.5"])
     else
-      s.add_dependency(%q<thor>, [">= 0.13.7"])
+      s.add_dependency(%q<thor>, [">= 0.13.8"])
       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"])
+      s.add_dependency(%q<activesupport>, [">= 3.0.0.beta4"])
+      s.add_dependency(%q<bundler>, [">= 1.0.0.beta.5"])
     end
   else
-    s.add_dependency(%q<thor>, [">= 0.13.7"])
+    s.add_dependency(%q<thor>, [">= 0.13.8"])
     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"])
+    s.add_dependency(%q<activesupport>, [">= 3.0.0.beta4"])
+    s.add_dependency(%q<bundler>, [">= 1.0.0.beta.5"])
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: vraptor-scaffold
 version: !ruby/object:Gem::Version 
-  hash: 299253583
+  hash: 299253580
   prerelease: true
   segments: 
   - 0
   - 0
   - 1
-  - beta3
-  version: 0.0.1.beta3
+  - beta4
+  version: 0.0.1.beta4
 platform: ruby
 authors: 
 - Rodolfo Liviero
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-11 00:00:00 -03:00
+date: 2010-07-18 00:00:00 -03:00
 default_executable: vraptor
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 37
+        hash: 59
         segments: 
         - 0
         - 13
-        - 7
-        version: 0.13.7
+        - 8
+        version: 0.13.8
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -59,12 +59,13 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 299253624
         segments: 
-        - 2
         - 3
-        - 8
-        version: 2.3.8
+        - 0
+        - 0
+        - beta4
+        version: 3.0.0.beta4
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -75,14 +76,14 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 62196359
+        hash: 62196361
         segments: 
         - 1
         - 0
         - 0
         - beta
-        - 2
-        version: 1.0.0.beta.2
+        - 5
+        version: 1.0.0.beta.5
   type: :runtime
   version_requirements: *id004
 description: ""
@@ -113,6 +114,7 @@ files:
 - 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/messages.properties
 - lib/generators/app_generator/templates/persistence.xml
 - lib/generators/app_generator/templates/pom.erb
 - lib/generators/app_generator/templates/stylesheets/scaffold.css
@@ -123,9 +125,8 @@ files:
 - lib/generators/scaffold_generator/controller_generator/controller_generator.rb
 - lib/generators/scaffold_generator/controller_generator/templates/controller.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

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

@@ -1,21 +0,0 @@
-<body>
-
-<form action="<%= path %>" method="post">
-
-<input type="hidden" name="<%= "#{@model}.id" %>" value="<%= "${#{@model}.id}" %>">
-
-<% @attributes.each do |att| -%>
-  <div class="field">
-    <%= att.name.capitalize %>:<br />
-    <%= "<@html.#{att.html_input} \"#{@model}.#{att.name}\" #{@model}.#{att.name}/>"  %>
-  </div>
-<% end -%>
-  <div class="actions">
-    <button type="submit" name="_method" value="put">update</button>
-  </div>
-</form>
-
-<a href="<%= path %>">Back</a>
-	
-</body>
-

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

@@ -1,17 +0,0 @@
-<body>
-
-<form action="<%= path %>" method="post">
-<% @attributes.each do |att| -%>
-  <div class="field">
-    <%= att.name.capitalize %>:<br />
-    <%= "<@html.#{att.html_input} \"#{@model}.#{att.name}\"/>"  %>
-  </div>
-<% end -%>
-  <div class="actions">
-    <input type="submit" value="create">
-  </div>
-</form>
-
-<a href="<%= path %>">Back</a>
-	
-</body>