vraptor-scaffold 1.3.0.rc → 1.3.0

data/lib/vraptor-scaffold/generators/app/gae_app_generator.rb

@@ -0,0 +1,145 @@
+class GaeAppGenerator < VraptorScaffold::Base
+
+  argument :project_path
+
+  class_option :package, :default => "app", :aliases => "-p",
+               :desc => "Define base package"
+
+  class_option :models_package, :aliases => "-m", :default => "models",
+               :desc => "Define models package"
+
+  class_option :controllers_package, :aliases => "-c", :default => "controllers",
+               :desc => "Define controllers package"
+
+  class_option :repositories_package, :aliases => "-r", :default => "repositories",
+               :desc => "Define repositories package"
+
+  class_option :skip_jquery, :type => :boolean, :aliases => "-j",
+               :desc => "Skip jQuery download file"
+
+  class_option :skip_eclipse, :type => :boolean, :aliases => "-E",
+               :desc => "Skip Eclipse files"
+
+  def self.source_root
+    File.join File.dirname(__FILE__), "templates"
+  end
+
+  def initialize(args, opts=[])
+    super([args], opts)
+    validate
+    self.destination_root=(project_path)
+    @project_name = project_path.split("/").last
+    @dependencies = DependencyManager.new({:gae => true}).dependencies
+  end
+
+  def create_root_folder
+    empty_directory "."
+  end
+
+  def configure_ant
+    create_eclipse_files unless options[:skip_eclipse]
+    copy_file("gitignore-gae", ".gitignore")
+    copy_file("build-gae.xml", "build.xml")
+    template("build.properties.erb", "build.properties")
+    template("ivy.erb", "ivy.xml")
+    copy_file(AppGenerator::IVY_JAR)
+    copy_file("gae/ivysettings.xml", "ivysettings.xml")
+  end
+
+  def configure_vraptor_packages
+    @vraptor_packages = ["br.com.caelum.vraptor.gae"]
+  end
+
+  def create_main_java
+    empty_directory Configuration::MAIN_SRC
+    @src = File.join(Configuration::MAIN_SRC, options[:package].gsub(".", File::Separator))
+  end
+
+  def create_controllers_directory
+    empty_directory File.join @src, options[:controllers_package]
+  end
+
+  def create_models_directory
+    empty_directory File.join(@src, options[:models_package])
+  end
+
+  def create_repositories_directory
+    repositories_folder = File.join @src, options[:repositories_package]
+    empty_directory repositories_folder
+    template("orm/Repository-objectify.java.tt", "#{repositories_folder}/Repository.java")
+  end
+
+  def create_main_resources
+    directory("resources", Configuration::MAIN_RESOURCES)
+  end
+
+  def configure_orm
+    infra_folder = File.join @src, "infra"
+    empty_directory infra_folder
+    template("gae/ObjectifyFactory.java.tt", "#{@src}/infra/ObjectifyFactory.java")
+  end
+
+  def create_webapp
+    directory("webapp", Configuration::WEB_APP)
+    template("gae/appengine-web.xml.tt", "#{Configuration::WEB_INF}/appengine-web.xml")
+    copy_file("gae/logging.properties", "#{Configuration::WEB_INF}/logging.properties")
+  end
+
+  def create_javascripts
+    javascripts = File.join Configuration::WEB_APP, "javascripts"
+    create_file File.join javascripts, "application.js"
+    unless options[:skip_jquery]
+      jquery = get_jquery
+      add_file (File.join javascripts, "jquery.min.js"), jquery.body if jquery
+    end
+  end
+
+  def configure_scaffold_properties
+    template("vraptor-scaffold-gae.erb", Configuration::FILENAME)
+  end
+
+  def configure_template_engine
+    JspTemplateEngine.new(project_path, @options).configure
+  end
+
+  def create_test
+    empty_directory Configuration::TEST_SRC
+    test_src = File.join(Configuration::TEST_SRC, options[:package].gsub(".", File::Separator))
+
+    empty_directory File.join test_src, options[:controllers_package]
+    empty_directory File.join test_src, options[:models_package]
+    empty_directory File.join test_src, options[:repositories_package]
+
+    directory("resources-test", Configuration::TEST_RESOURCES)
+  end
+
+  private
+  def orm
+    return "objectify"
+  end
+
+  def create_eclipse_files
+    template("eclipse/classpath-gae.erb", ".classpath")
+    template("eclipse/project-gae.erb", ".project")
+    directory("eclipse/settings-gae", ".settings")
+  end
+
+  def validate
+    if File.directory? project_path
+      puts "The project #{project_path} already exist"
+      Kernel::exit
+    end
+  end
+
+  def jquery_uri
+    "/ajax/libs/jquery/1/jquery.min.js"
+  end
+
+  def get_jquery
+    begin
+      VraptorScaffold::HttpRequest.open_session("ajax.googleapis.com").get jquery_uri;
+    rescue
+      Kernel.puts "Was not possible to download jQuery."
+    end
+  end
+end

data/lib/vraptor-scaffold/generators/app/jsp_template_engine.rb

@@ -4,14 +4,15 @@ class JspTemplateEngine < VraptorScaffold::Base
     File.join(File.dirname(__FILE__), "templates", "jsp")
   end
 
-  def initialize(project_path)
+  def initialize(project_path, options)
     super
     self.destination_root=(project_path)
+    @options = options
   end
 
   def configure
     template("../decorators.erb", File.join(Configuration::WEB_INF, "decorators.xml"))
-    copy_file("main.jsp", File.join(Configuration::WEB_INF, decorators_path, "main.jsp"))
+    template("main.jsp.erb", File.join(Configuration::WEB_INF, decorators_path, "main.jsp"))
     copy_file("prelude.jspf", File.join(Configuration::WEB_INF, "jsp", "prelude.jspf"))
     append_prelude_config
   end
@@ -19,15 +20,15 @@ class JspTemplateEngine < VraptorScaffold::Base
   def extension
     "jsp"
   end
-  
+
   def decorators_path
     File.join "jsp", "decorators"
   end
-  
+
   private
   def append_prelude_config
     file = File.join(Configuration::WEB_INF, "web.xml")
     template = File.join JspTemplateEngine.source_root, "jsp-web.xml"
     inject_into_file(file, File.read(template), :before => "</web-app>", :verbose => false)
   end
-end
+end

data/lib/vraptor-scaffold/generators/app/templates/build-gae.xml

@@ -0,0 +1,144 @@
+<project name="vraptor-scaffold" default="war" xmlns:ivy="antlib:org.apache.ivy.ant">
+
+	<property file="build.properties" />
+
+	<!-- paths -->
+	<path id="lib.path.id">
+		<fileset dir="${lib.dir}" />
+		<fileset dir="lib/provided" />
+	</path>
+	<path id="test.path.id">
+		<fileset dir="lib/test" />
+		<path refid="lib.path.id" />
+		<pathelement location="${test.build.dir}" />
+		<pathelement location="${build.dir}" />
+	</path>
+
+	<!-- =================================
+          target: resolve
+         ================================= -->
+	<target name="resolve" description="--> retrieve dependencies with ivy">
+		<path id="ivy.lib.path">
+			<pathelement location="${ivy.jar.file}" />
+		</path>
+		<taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path" />
+
+		<ivy:retrieve pattern="lib/[conf]/[artifact]-[revision].[ext]" sync="true" />
+		<delete dir="${lib.dir}" includes="**/*.*" />
+		<copy todir="${lib.dir}">
+			<fileset dir="lib/default">
+				<include name="*.jar" />
+			</fileset>
+		</copy>
+	</target>
+
+	<!-- =================================
+          target: compile
+         ================================= -->
+	<target name="compile" depends="resolve" description="--> compile">
+		<mkdir dir="${build.dir}" />
+		<delete dir="${build.dir}" includes="**/*.*" />
+		<javac srcdir="${src.dir}" destdir="${build.dir}" classpathref="lib.path.id" debug="on" />
+		<copy todir="${build.dir}">
+			<fileset dir="${resources.dir}">
+				<include name="**/*.*" />
+			</fileset>
+		</copy>
+	</target>
+
+	<!-- =================================
+          target: vraptor-scanning - By Otávio Scherer Garcia
+         ================================= -->
+	<target name="vraptor-scanning" depends="compile">
+		<path id="build.classpath">
+			<fileset dir="src/main/webapp/WEB-INF/lib" includes="*.jar" />
+		</path>
+
+		<java classpathref="build.classpath" classname="br.com.caelum.vraptor.scan.VRaptorStaticScanning" fork="true">
+			<arg value="src/main/webapp/WEB-INF/web.xml" />
+			<classpath refid="build.classpath" />
+			<classpath path="src/main/webapp/WEB-INF/classes" />
+		</java>
+	</target>
+
+	<!-- =================================
+	      target: compile test
+	     ================================= -->
+	<target name="compile-test" depends="compile" description="--> compile test">
+		<mkdir dir="${test.build.dir}" />
+		<delete dir="${test.build.dir}" includes="**/*.*" />
+		<javac srcdir="${test.src.dir}" destdir="${test.build.dir}" classpathref="test.path.id" debug="on" />
+		<copy todir="${test.build.dir}">
+			<fileset dir="${test.resources.dir}">
+				<include name="**/*.*" />
+			</fileset>
+		</copy>
+	</target>
+
+	<!-- =================================
+          target: run tests
+         ================================= -->
+	<target name="test" depends="compile-test" description="--> run all tests">
+		<mkdir dir="${output.dir}/test-results" />
+		<junit haltonfailure="yes">
+			<batchtest fork="yes" todir="${output.dir}/test-results">
+				<fileset dir="${test.src.dir}">
+					<include name="**/*Test.java" />
+				</fileset>
+			</batchtest>
+			<formatter type="brief" usefile="false" />
+			<formatter type="xml" />
+			<classpath refid="test.path.id" />
+		</junit>
+	</target>
+
+	<!-- =================================
+          target: war
+         ================================= -->
+	<target name="war" description="--> generate war file" depends="test">
+		<war destfile="${output.dir}/${project.name}.war">
+			<zipfileset dir="${webapp.dir}" />
+		</war>
+	</target>
+
+	<!-- =================================
+          target: minify
+         ================================= -->
+	<target name="minify" depends="resolve" description="minify js and css">
+		<property name="yuicompressor.jar" value="lib/minify/yuicompressor-2.3.6.jar" />
+
+		<fileset dir="${js.dir}" includes="*.js" excludes="all.min.js" id="alljs" />
+		<fileset dir="${css.dir}" includes="*.css" excludes="*.min.css" id="allcss" />
+
+		<delete file="${css.dir}/all.css" />
+		<concat destfile="${css.dir}/all.css" fixlastline="true">
+			<fileset refid="allcss" />
+		</concat>
+
+		<java jar="${yuicompressor.jar}" fork="true">
+			<arg value="${css.dir}/all.css" />
+			<arg value="-o" />
+			<arg value="${css.dir}/all.min.css" />
+		</java>
+
+		<delete file="${js.dir}/all.js" />
+		<concat destfile="${js.dir}/all.js" fixlastline="true">
+			<fileset refid="alljs" />
+		</concat>
+
+		<java jar="${yuicompressor.jar}" fork="true">
+			<arg value="${js.dir}/all.js" />
+			<arg value="-o" />
+			<arg value="${js.dir}/all.min.js" />
+		</java>
+	</target>
+
+	<!-- =================================
+          target: report
+         ================================= -->
+	<target name="report" depends="resolve" description="--> generates a report of dependencies">
+		<mkdir dir="${output.dir}/reports" />
+		<ivy:report todir="${output.dir}/reports" />
+	</target>
+
+</project>

data/lib/vraptor-scaffold/generators/app/templates/build.gradle.erb

@@ -34,24 +34,24 @@ sourceSets {
 sourceSets.main.classesDir = new File('<%= Configuration::WEB_INF %>/classes')
 
 jettyRun.scanIntervalSeconds=3
-jettyRun.contextPath = '/' 
+jettyRun.contextPath = '/'
 [jettyRunWar,jettyStop]*.stopPort = 8081
 [jettyRunWar,jettyStop]*.stopKey = 'stopKey'
 
 dependencies {
-<% @dependency_manager.compile_scope.each do |dependency| -%>
+<% @dependencies.compile_scope.each do |dependency| -%>
     compile group: '<%= dependency.group %>', name: '<%= dependency.name %>', version: '<%= dependency.version %>'<% if dependency.has_exclusions? %>, {<% dependency.exclusions.each do |exclusion| %>
         exclude group: '<%= exclusion.group %>', name: '<%= exclusion.name %>'<% end %>
     }<% end %>
 <% end -%>
 
     //Provided dependencies
-<% @dependency_manager.provided_scope.each do |dependency| -%>
+<% @dependencies.provided_scope.each do |dependency| -%>
     providedCompile group: '<%= dependency.group %>', name: '<%= dependency.name %>', version: '<%= dependency.version %>'
 <% end -%>
 
     //Test dependencies
-<% @dependency_manager.test_scope.each do |dependency| -%>
+<% @dependencies.test_scope.each do |dependency| -%>
     testCompile group: '<%= dependency.group %>', name: '<%= dependency.name %>', version: '<%= dependency.version %>'
 <% end -%>
 }

data/lib/vraptor-scaffold/generators/app/templates/eclipse/classpath-gae.erb

@@ -2,11 +2,9 @@
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="src" path="src/main/resources"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
-	<% @dependency_manager.test_scope.each do |dependency| %>
+	<% @dependencies.test_scope.each do |dependency| %>
 	  <classpathentry kind="lib" path="lib/test/<%= "#{dependency.name}-#{dependency.version}.jar" %>"/>
         <% end -%>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>

data/lib/vraptor-scaffold/generators/app/templates/eclipse/classpath.erb

@@ -12,7 +12,7 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
-	<% @dependency_manager.test_scope.each do |dependency| %>
+	<% @dependencies.test_scope.each do |dependency| %>
 	<classpathentry kind="lib" path="lib/test/<%= "#{dependency.name}-#{dependency.version}.jar" %>"/>
   <% end -%>
 </classpath>

data/lib/vraptor-scaffold/generators/app/templates/eclipse/project-gae.erb

@@ -26,12 +26,12 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>com.google.appengine.eclipse.core.enhancerbuilder</name>
+			<name>com.google.appengine.eclipse.core.projectValidator</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>com.google.appengine.eclipse.core.projectValidator</name>
+			<name>com.google.appengine.eclipse.core.enhancerbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>

data/lib/vraptor-scaffold/generators/app/templates/eclipse/settings-gae/com.google.appengine.eclipse.core.prefs

@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+gaeIsEclipseDefaultInstPath=true
+googleCloudSqlEnabled=false
+localDevMySqlEnabled=true

data/lib/vraptor-scaffold/generators/app/templates/eclipse/settings-gae/com.google.gdt.eclipse.core.prefs

@@ -1,5 +1,4 @@
-#Sun Oct 23 00:00:26 BRST 2011
 eclipse.preferences.version=1
 jarsExcludedFromWebInfLib=
 warSrcDir=src/main/webapp
-warSrcDirIsOutput=false
+warSrcDirIsOutput=true

data/lib/vraptor-scaffold/generators/app/templates/freemarker/macros/html.ftl

@@ -14,6 +14,18 @@
     <textarea id="${name}" name="${name}" cols="40" rows="20">${value}</textarea>
 </#macro>
 
+<#macro option value text="" selected=false>
+    <option value="${value}"<#if selected>selected="true"</#if> >${text}</option>
+</#macro>
+
+<#macro select name values check>
+    <select name="${name}">
+	  	<#list values as obj>
+	  		<#nested obj, check==obj.id>
+	  	</#list>
+    </select>
+</#macro>
+
 <#macro css name>
 	<link rel="stylesheet" type="text/css" href="${base}/stylesheets/${name}.css" />  
 </#macro>

data/lib/vraptor-scaffold/generators/app/templates/freemarker/main.ftl.erb

@@ -0,0 +1,18 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <@html.css "application"/>
+    <title>Vraptor Scaffold</title>
+    ${head}
+  </head>
+
+  <body>
+    ${body}
+    <%
+      jquery_file = File.join(destination_root, Configuration::WEB_APP, "javascripts", "jquery.min.js")
+      if (File.exists?(jquery_file))
+    %><@html.js "jquery.min"/>
+    <% end %><@html.js "application"/>
+  </body>
+</html>