vraptor-scaffold 0.0.1.rc → 0.0.1

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

@@ -0,0 +1,92 @@
+require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper")
+
+describe FreemarkerTemplateEngine do
+
+  before(:all) do
+    @project_path = "src/vraptor-scaffold"
+    @webapp = "#{@project_path}/#{Configuration::WEB_APP}"
+    @web_inf = "#{@project_path}/#{Configuration::WEB_INF}"
+    @decorators = "#{@web_inf}/decorators"
+    @app = "#{@project_path}/#{Configuration::MAIN_SRC}/br/com/caelum"
+  end
+
+  context "configuring" do
+    before(:all) do
+      AppGenerator.new(@project_path, ["--template-engine=ftl", "-p=br.com.caelum"]).invoke_all
+    end
+
+    after(:all) do
+      FileUtils.remove_dir(@project_path)
+    end
+
+    it "should create decorators.xml" do
+      source = File.join File.dirname(__FILE__), "templates", "decorators.xml"
+      destination = "#{@web_inf}/decorators.xml"
+      exists_and_identical?(source, destination)
+    end
+
+    it "should append freemarker servlet in web.xml" do
+      source = File.join FreemarkerTemplateEngine.source_root, "freemarker-web.xml"
+      web_xml = "#{@web_inf}/web.xml"
+      File.read(web_xml).should include(File.read(source))
+    end
+
+    it "should create views folder" do
+      File.exist?("#{@web_inf}/views").should be_true 
+    end
+
+    it "should create infrastructure folder" do
+      File.exist?("#{@app}/infrastructure").should be_true 
+    end
+
+    it "should create path resolver" do
+      source = File.join File.dirname(__FILE__), "templates", "FreemarkerPathResolver.java"
+      destination = "#{@app}/infrastructure/FreemarkerPathResolver.java"
+      exists_and_identical?(source, destination)
+    end
+
+    it "should create decorator file" do
+      source = "#{FreemarkerTemplateEngine.source_root}/main.ftl"
+      destination = "#{@decorators}/main.ftl"
+      exists_and_identical?(source, destination)
+    end
+
+    it "should create html macro file" do
+      source = "#{FreemarkerTemplateEngine.source_root}/macros/html.ftl"
+      destination = "#{@webapp}/macros/html.ftl"
+      exists_and_identical?(source, destination)
+    end
+  end
+
+  context "with maven" do
+    before(:all) do
+      AppGenerator.new(@project_path, ["--template-engine=ftl", "-b=mvn"]).invoke_all
+    end
+
+    after(:all) do
+      FileUtils.remove_dir(@project_path)
+    end
+
+    it "should append freemarker dependency in pom.xml" do
+      source = File.join FreemarkerTemplateEngine.source_root, "freemarker-pom.xml"
+      pom = "#{@project_path}/pom.xml"
+      File.read(pom).should match(File.read(source))
+    end
+  end
+
+  context "with ant" do
+    before(:all) do
+      AppGenerator.new(@project_path, ["--template-engine=ftl", "-b=ant"]).invoke_all
+    end
+
+    after(:all) do
+      FileUtils.remove_dir(@project_path)
+    end
+
+    it "should append freemarker dependency in ivy.xml" do
+      source = File.join FreemarkerTemplateEngine.source_root, "freemarker-ivy.xml"
+      ivy = "#{@project_path}/ivy.xml"
+      File.read(ivy).should match(File.read(source))
+    end
+  end
+end

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

@@ -0,0 +1,44 @@
+require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper")
+
+describe JspTemplateEngine do
+
+  context "building a jsp application" do
+    before(:all) do
+      @project_path = "src/vraptor-scaffold"
+      @web_inf = "#{@project_path}/#{Configuration::WEB_INF}"
+      @decorators = "#{@web_inf}/decorators"
+      @app = "#{@project_path}/#{Configuration::MAIN_SRC}/app"
+      AppGenerator.new(@project_path).invoke_all
+    end
+
+    after(:all) do
+      FileUtils.remove_dir("src")
+    end
+
+    it "should create decorators.xml" do
+      source = File.join File.dirname(__FILE__), "templates", "decorators-jsp.xml"
+      destination = "#{@web_inf}/decorators.xml"
+      exists_and_identical?(source, destination)
+    end
+
+    it "should create views folder" do
+      File.exist?("#{@web_inf}/jsp").should be_true 
+    end
+
+    it "should create decorator file" do
+      source = "#{JspTemplateEngine.source_root}/main.jsp"
+      destination = "#{@decorators}/main.jsp"
+      exists_and_identical?(source, destination)
+    end
+
+    it "should not create infrastructure folder" do
+      File.exist?("#{@app}/infrastructure").should be_false 
+    end
+
+    it "should not create path resolver" do
+      to = "#{@app}/infrastructure/FreemarkerPathResolver.java"
+      File.exist?(to).should be_false
+    end
+
+  end
+end

data/{lib → spec/lib}/generators/app_generator/templates/Entity.java

@@ -8,7 +8,7 @@ import javax.persistence.MappedSuperclass;
 public class Entity {
 	
 	@Id @GeneratedValue
-	protected Long id;
+	private Long id;
 	
 	public void setId(Long id) {
 		this.id = id;
@@ -23,6 +23,9 @@ public class Entity {
 		if (obj == null) {
 			return false;
 		}
+		if (this == obj) {
+			return true;
+		}
 		if (getClass() != obj.getClass()) {
 			return false;
 		}
@@ -39,4 +42,4 @@ public class Entity {
 		hash = 17 * hash + (this.getId() != null ? this.getId().hashCode() : 0);
 		return hash;
 	}
-}
+}

data/{lib → spec/lib}/generators/app_generator/templates/FreemarkerPathResolver.java

@@ -1,4 +1,4 @@
-package app.infrastructure;
+package br.com.caelum.infrastructure;
 
 import br.com.caelum.vraptor.http.FormatResolver;
 import br.com.caelum.vraptor.ioc.Component;

data/{lib → spec/lib}/generators/app_generator/templates/Repository.java

@@ -6,7 +6,7 @@ import java.util.List;
 
 import javax.persistence.EntityManager;
 
-public abstract class Repository<T> {
+public abstract class Repository<T, I extends Serializable> {
 	
 	protected final EntityManager entityManager;
 	
@@ -14,20 +14,20 @@ public abstract class Repository<T> {
 		this.entityManager = entityManager;
 	}
 	
-	public void create(Object entity) {
+	public void create(T entity) {
 		entityManager.persist(entity);
 	}
 	
-	public void update(Object entity) {
+	public void update(T entity) {
 		entityManager.merge(entity);
 	}
 	
-	public void destroy(Object entity) {
+	public void destroy(T entity) {
 		entityManager.remove(entity);
 	}
 	
-	public T find(Serializable id) {
-		return (T) entityManager.find(getParameterizedClass(), id);
+	public T find(I id) {
+		return entityManager.find(getParameterizedClass(), id);
 	}
 	
 	@SuppressWarnings("unchecked")

data/spec/lib/generators/app_generator/templates/build.properties

@@ -0,0 +1,16 @@
+project.name=vraptor-scaffold
+
+output.dir=target
+test.build.dir=target/test-classes
+
+webapp.dir=src/main/webapp
+lib.dir=src/main/webapp/WEB-INF/lib
+build.dir=src/main/webapp/WEB-INF/classes
+
+src.dir=src/main/java
+resources.dir=src/main/resources
+
+test.src.dir=src/test/java
+test.resources.dir=src/test/resources
+
+ivy.jar.file=ivy-2.2.0-rc1.jar

data/spec/lib/generators/app_generator/templates/decorators-jsp.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<decorators defaultdir="/WEB-INF/decorators">
+    <decorator name="main" page="main.jsp">
+        <pattern>/*</pattern>
+    </decorator>
+</decorators>

data/{lib → spec/lib}/generators/app_generator/templates/decorators.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<decorators defaultdir="/decorators">
+<decorators defaultdir="/WEB-INF/decorators">
     <decorator name="main" page="main.ftl">
         <pattern>/*</pattern>
     </decorator>
-</decorators>
+</decorators>

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

@@ -0,0 +1,35 @@
+<ivy-module version="2.0">
+	<info organisation="vraptor-scaffold" module="vraptor-scaffold" />
+
+	<configurations>
+		<conf name="default" description="dependencies used for compile" />
+		<conf name="test" description="dependencies used for tests" visibility="public" />
+		<conf name="jetty" description="dependencies used for jetty" visibility="public" />
+		<conf name="provided" description="dependencies used for compile but is not packaged" visibility="public" />
+	</configurations>
+
+	<dependencies>
+		<dependency org="hsqldb" name="hsqldb" rev="1.8.0.10" conf="default" />
+		<dependency org="br.com.caelum" name="vraptor" rev="3.1.3" conf="default" />
+		<dependency org="opensymphony" name="sitemesh" rev="2.4.2" conf="default" />
+		<dependency org="javax.servlet" name="jstl" rev="1.2" conf="default" />
+		<dependency org="javax.persistence" name="persistence-api" rev="1.0" conf="default" />
+		<dependency org="org.hibernate" name="hibernate-entitymanager" rev="3.4.0.GA" conf="default" />
+		<dependency org="org.hibernate" name="hibernate-core" rev="3.3.2.GA" conf="default" />
+		<dependency org="org.hibernate" name="hibernate-validator" rev="3.1.0.GA" conf="default" />
+		<dependency org="joda-time" name="joda-time" rev="1.6" conf="default" />
+
+		<!-- Provided dependencies -->
+		<dependency org="javax.servlet" name="servlet-api" rev="2.5" conf="provided->default" />
+
+		<!-- Test dependencies -->
+		<dependency org="junit" name="junit" rev="4.8.1" conf="test->default" />
+		<dependency org="org.hamcrest" name="hamcrest-all" rev="1.1" conf="test->default" />
+		<dependency org="org.mockito" name="mockito-all" rev="1.8.5" conf="test->default" />
+
+		<!-- Ant dependencies -->
+		<dependency org="org.mortbay.jetty" name="jsp-api-2.1" rev="6.1.14" conf="jetty->default"/>
+		<dependency org="org.mortbay.jetty" name="jsp-2.1" rev="6.1.14" conf="jetty->default"/>
+		<dependency org="org.mortbay.jetty" name="jetty-ant" rev="6.1.14" conf="jetty->default" />	
+	</dependencies>
+</ivy-module>

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

@@ -12,6 +12,7 @@
 	</properties>
 	
 	<build>
+	  <outputDirectory>${basedir}/src/main/webapp/WEB-INF/classes</outputDirectory>
 		<plugins>
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
@@ -24,6 +25,7 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-eclipse-plugin</artifactId>
+				<version>2.8</version>
 				<configuration>
 					<downloadSources>true</downloadSources>
 					<downloadJavadocs>true</downloadJavadocs>
@@ -83,9 +85,9 @@
 			<version>2.4.2</version>
 		</dependency>
 		<dependency>
-			<groupId>org.freemarker</groupId>
-			<artifactId>freemarker</artifactId>
-			<version>2.3.16</version>
+			<groupId>javax.servlet</groupId>
+			<artifactId>jstl</artifactId>
+			<version>1.2</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.persistence</groupId>
@@ -96,6 +98,21 @@
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-entitymanager</artifactId>
 			<version>3.4.0.GA</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>slf4j-api</artifactId>
+					<groupId>org.slf4j</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>org.hibernate</artifactId>
+					<groupId>hibernate-core</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-core</artifactId>
+			<version>3.3.2.GA</version>
 			<exclusions>
 				<exclusion>
 					<artifactId>slf4j-api</artifactId>
@@ -112,6 +129,10 @@
 					<artifactId>slf4j-api</artifactId>
 					<groupId>org.slf4j</groupId>
 				</exclusion>
+				<exclusion>
+					<artifactId>org.hibernate</artifactId>
+					<groupId>hibernate-core</groupId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>

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

@@ -1,113 +1,133 @@
 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
-    
+
     it "should support text" do
       Attribute.valid_types.include?("text").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
-    
-     it "should know html input to text" do
+
+    it "should know html input to text" do
       Attribute.new("name", "text").html_input.should eql("textarea")
     end
   end
-  
+
   context "java type" do
     it "should know corret java type to boolean" do
       Attribute.new("flag", "boolean").java_type.should eql("boolean")
     end
-    
+
     it "should know corret java type to text" do
       Attribute.new("description", "text").java_type.should eql("String")
     end
-    
+
     it "should know corret java type to string" do
       Attribute.new("name", "string").java_type.should eql("String")
     end
-    
+
     it "should know corret java type to double" do
       Attribute.new("name", "double").java_type.should eql("Double")
     end
-    
+
     it "should know corret java type to float" do
       Attribute.new("name", "float").java_type.should eql("Float")
     end
-    
+
     it "should know corret java type to short" do
       Attribute.new("name", "short").java_type.should eql("Short")
     end
-    
+
     it "should know corret java type to integer" do
       Attribute.new("name", "integer").java_type.should eql("Integer")
     end
-    
+
     it "should know corret java type to long" do
       Attribute.new("name", "long").java_type.should eql("Long")
     end
   end
-  
+
+  context "validate" do
+
+    it "should be valid when attribute is supported" do
+      Kernel.should_not_receive(:exit) 
+      Attribute.valid_types.each do |type|
+        Attribute.new("name", type)
+      end
+    end
+
+    it "cannot be valid when attribute is not supported" do
+      Kernel.should_receive(:exit) 
+      Attribute.new("name", "char")
+    end
+
+    it "should be valid when attribute is upper case" do
+      Kernel.should_not_receive(:exit) 
+      Attribute.new("name", "String")
+    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