vraptor-scaffold 1.3.0.rc → 1.3.0

data/.rvmrc.example

@@ -0,0 +1 @@
+rvm 1.9.3@vraptor-scaffold

data/.travis.yml

@@ -3,4 +3,5 @@ notifications:
         - rodolfo.liviero@gmail.com
 
 rvm:
-  - 1.9.2
+  - 1.9.2
+  - 1.9.3

data/CHANGELOG.rdoc

@@ -1,10 +1,29 @@
-== 1.3.0 / 2011-??-??
+== 1.3.1 / 2012-??-??
+
+* New Features
+    * Support entity relationship on scaffold (vraptor scaffold student pencil:references).
+    * Skip jquery download (vraptor new app --skip-jquery)
+    * vraptor-scanning ant task for appengine projects. Fast bootstrap for apps.
+
+* Improvements
+    * Update vraptor to 3.4.1.
+    * Update gae to 1.7.2.1 sdk.
+    * Replaced http requisitions by mocks on specs. Specs running so fast.
+    * Refactoring on app generators.
+    * Refactoring on dependency manager.
+
+== 1.3.0 / 2012-??-??
 
 * New Features
     * GAE support (vraptor new app --gae).
     * Customizing templates.
     * Added start command (vraptor start).
 
+* Improvements
+    * updated mockito to 1.9.0.
+	* updated hibernte to 4.0.1.Final.
+	* updated hsqldb to 2.2.8.
+
 == 1.2.3 / 2011-11-15
 
 * Bugfixes
@@ -157,7 +176,7 @@
     * Redirect to form when occur validation erros.
     * Added joda time dependency.
     * Create messages.properties(i18n).
-  
+
 * Bugfixes
     * Fixed i.e problems.
 
@@ -172,7 +191,7 @@
     * 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.

data/Rakefile

@@ -1,5 +1,5 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
+#!/usr/bin/env rake
+require "bundler/gem_tasks"
 
 require 'spec/rake/spectask'
 Spec::Rake::SpecTask.new(:spec) do |spec|

data/lib/vraptor-scaffold.rb

@@ -12,4 +12,4 @@ require 'vraptor-scaffold/configuration'
 require 'vraptor-scaffold/runner'
 require 'vraptor-scaffold/execution'
 require 'vraptor-scaffold/http_request'
-require 'vraptor-scaffold/load_paths'
+require 'vraptor-scaffold/generators/base'

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

@@ -22,8 +22,8 @@ class AppGenerator < VraptorScaffold::Base
   class_option :heroku, :type => :boolean, :aliases => "-h",
                :desc => "heroku project"
 
-  class_option :gae, :type => :boolean, :aliases => "-g",
-               :desc => "google app engine project"
+  class_option :gae, :type => :boolean,
+               :desc => "gae project"
 
   class_option :repositories_package, :aliases => "-r", :default => "repositories",
                :desc => "Define repositories package"
@@ -34,8 +34,8 @@ class AppGenerator < VraptorScaffold::Base
   class_option :orm, :default => "jpa", :aliases => "-o",
                :desc => "Object-relational mapping (options: #{ORMS.join(', ')})"
 
-  class_option :jquery, :aliases => "-j", :default => "latest version",
-               :desc => "jQuery version"
+  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"
@@ -53,7 +53,7 @@ class AppGenerator < VraptorScaffold::Base
     validate
     self.destination_root=(project_path)
     @project_name = project_path.split("/").last
-    @dependency_manager = DependencyManager.new(options)
+    @dependencies = DependencyManager.new(options).dependencies
   end
 
   def create_root_folder
@@ -75,9 +75,6 @@ class AppGenerator < VraptorScaffold::Base
       template("ivy.erb", "ivy.xml")
       copy_file(IVY_JAR)
     end
-    if options[:gae]
-      copy_file("gae/ivysettings.xml", "ivysettings.xml")
-    end
   end
 
   def configure_gradle
@@ -85,10 +82,9 @@ class AppGenerator < VraptorScaffold::Base
   end
 
   def configure_vraptor_packages
-    vraptor_util_package = "br.com.caelum.vraptor.util"
+    vraptor_util_package = "br.com.caelum.vraptor"
     @vraptor_packages = []
-    @vraptor_packages += ["#{vraptor_util_package}.#{orm}"] if orm == "jpa" or orm == "hibernate"
-    @vraptor_packages += ["#{vraptor_util_package}.gae"] if options[:gae]
+    @vraptor_packages += ["#{vraptor_util_package}.util.#{orm}"] if orm == "jpa" or orm == "hibernate"
   end
 
   def create_main_java
@@ -106,17 +102,13 @@ class AppGenerator < VraptorScaffold::Base
   def create_models_directory
     models_folder = File.join @src, options[:models_package]
     empty_directory models_folder
-    template("models/Entity.erb", "#{models_folder}/Entity.java") unless options[:gae]
+    template("models/Entity.erb", "#{models_folder}/Entity.java")
   end
 
   def create_repositories_directory
     repositories_folder = File.join @src, options[:repositories_package]
     empty_directory repositories_folder
-    if options[:gae]
-      template("orm/Repository-objectify.java.tt", "#{repositories_folder}/Repository.java")
-    else
-      template("orm/Repository-#{orm}.java.tt", "#{repositories_folder}/Repository.java")
-    end
+    template("orm/Repository-#{orm}.java.tt", "#{repositories_folder}/Repository.java")
   end
 
   def create_main_resources
@@ -126,10 +118,6 @@ class AppGenerator < VraptorScaffold::Base
   def configure_orm
     if (orm == "hibernate")
       copy_file("orm/hibernate.cfg.xml", (File.join Configuration::MAIN_RESOURCES, "hibernate.cfg.xml"))
-    elsif orm == "objectify"
-      infra_folder = File.join @src, "infra"
-      empty_directory infra_folder
-      template("gae/ObjectifyFactory.java.tt", "#{@src}/infra/ObjectifyFactory.java")
     else
       metainf = File.join Configuration::MAIN_RESOURCES, 'META-INF'
       empty_directory metainf
@@ -139,16 +127,15 @@ class AppGenerator < VraptorScaffold::Base
 
   def create_webapp
     directory("webapp", Configuration::WEB_APP)
-    if @options[:gae]
-      template("gae/appengine-web.xml.tt", "#{Configuration::WEB_INF}/appengine-web.xml")
-      copy_file("gae/logging.properties", "#{Configuration::WEB_INF}/logging.properties")
-    end
   end
 
   def create_javascripts
     javascripts = File.join Configuration::WEB_APP, "javascripts"
     create_file File.join javascripts, "application.js"
-    add_file (File.join javascripts, "jquery.min.js"), get_jquery.body
+    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
@@ -157,7 +144,7 @@ class AppGenerator < VraptorScaffold::Base
 
   def configure_template_engine
     templates = {"jsp" => JspTemplateEngine, "ftl" => FreemarkerTemplateEngine}
-    templates[options[:template_engine]].new(project_path).configure if templates[options[:template_engine]]
+    templates[options[:template_engine]].new(project_path, @options).configure if templates[options[:template_engine]]
   end
 
   def create_test
@@ -174,25 +161,17 @@ class AppGenerator < VraptorScaffold::Base
   private
   def build_tool
     return "mvn" if options[:heroku]
-    return "ant" if options[:gae]
     options[:build_tool]
   end
 
   def orm
-    return "objectify" if options[:gae]
     options[:orm]
   end
 
   def create_eclipse_files
-    if options[:gae]
-      template("eclipse/classpath-gae.erb", ".classpath")
-      template("eclipse/project-gae.erb", ".project")
-      directory("eclipse/settings-gae", ".settings")
-    else
-      template("eclipse/classpath.erb", ".classpath")
-      template("eclipse/project.erb", ".project")
-      directory("eclipse/settings", ".settings")
-    end
+    template("eclipse/classpath.erb", ".classpath")
+    template("eclipse/project.erb", ".project")
+    directory("eclipse/settings", ".settings")
   end
 
   def validate
@@ -209,33 +188,21 @@ class AppGenerator < VraptorScaffold::Base
       Kernel::exit
     end
 
-    if options[:heroku] and options[:gae]
-      puts "You cannot create gae and heroku template project together"
-      Kernel::exit
-    end
-
     if File.directory? project_path
       puts "The project #{project_path} already exist"
       Kernel::exit
     end
-
-    if options[:jquery] != 'latest version'
-      case get_jquery
-      when Net::HTTPClientError, Net::HTTPServerError
-        download_url = "http://docs.jquery.com/Downloading_jQuery"
-        puts "jQuery version #{options[:jquery]} was not found. Please visit the download page to see the versions available #{download_url}."
-        Kernel::exit
-      end
-    end
   end
 
   def jquery_uri
-    jquery_version = "1" #this mean get latest version
-    jquery_version = options[:jquery] if options[:jquery] != 'latest version'
-    "/ajax/libs/jquery/#{jquery_version}/jquery.min.js"
+    "/ajax/libs/jquery/1/jquery.min.js"
   end
 
   def get_jquery
-    VraptorScaffold::HttpRequest.open_session("ajax.googleapis.com").get jquery_uri
+    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/dependency/default_dependencies.rb

@@ -0,0 +1,44 @@
+class DefaultDependencies
+
+  attr_accessor :options
+
+  def initialize(options)
+	  @options = options
+  end
+
+  def compile_scope
+    dependencies = append_freemarker_dependency_if_necessary default_dependencies
+    dependencies
+  end
+
+  def test_scope
+    [Dependency.new("junit", "junit", "4.10"),
+     Dependency.new("org.hamcrest", "hamcrest-all", "1.1"),
+     Dependency.new("org.mockito", "mockito-all", "1.9.0")]
+  end
+
+  def provided_scope
+    [Dependency.new("javax.servlet", "servlet-api", "2.5"), Dependency.new("javax.servlet.jsp", "jsp-api", "2.1")]
+  end
+
+  private
+  def default_dependencies
+		hibernate_version = "4.0.1.Final"
+		dependencies = [Dependency.new("br.com.caelum", "vraptor", "3.4.1"),
+									Dependency.new("opensymphony", "sitemesh", "2.4.2"),
+									Dependency.new("javax.servlet", "jstl", "1.2"),
+									Dependency.new("org.hsqldb", "hsqldb", "2.2.8"),
+									Dependency.new("org.hibernate", "hibernate-entitymanager", hibernate_version),
+									Dependency.new("org.hibernate", "hibernate-c3p0", hibernate_version),
+									Dependency.new("org.hibernate", "hibernate-validator", "4.2.0.Final"),
+									Dependency.new("joda-time", "joda-time", "2.0"),
+									Dependency.new("com.thoughtworks.xstream", "xstream", "1.4.1")]
+
+    dependencies
+  end
+
+  def append_freemarker_dependency_if_necessary dependencies
+    dependencies << Dependency.new("org.freemarker", "freemarker", "2.3.18") if @options[:template_engine] == 'ftl'
+    dependencies
+  end
+end

data/lib/vraptor-scaffold/generators/app/dependency/dependency_manager.rb

@@ -0,0 +1,25 @@
+class DependencyManager
+
+  attr_accessor :options
+
+	def initialize(options)
+		@options = options
+  end
+
+	def dependencies
+		dependencies_per_project = {"default" => DefaultDependencies,
+																"gae" => GaeDependencies,
+																"heroku" => HerokuDependencies}
+
+    dependencies_per_project.fetch(project_style).new(@options)
+	end
+
+	private
+  def project_style
+		return "heroku" if @options[:heroku]
+		return "gae" if @options[:gae]
+
+		"default"
+  end
+
+end

data/lib/vraptor-scaffold/generators/app/dependency/gae_dependencies.rb

@@ -0,0 +1,49 @@
+class GaeDependencies
+
+	attr_accessor :options
+
+	def initialize(options)
+		@options = options
+	end
+
+	def compile_scope
+		dependencies = append_freemarker_dependency_if_necessary default_dependencies
+		dependencies
+	end
+
+	def test_scope
+		[Dependency.new("junit", "junit", "4.10"),
+   Dependency.new("org.hamcrest", "hamcrest-all", "1.1"),
+   Dependency.new("org.mockito", "mockito-all", "1.9.0")]
+	end
+
+	def provided_scope
+		[Dependency.new("javax.servlet", "servlet-api", "2.5"), Dependency.new("javax.servlet.jsp", "jsp-api", "2.1")]
+	end
+
+	def default_dependencies
+		dependencies = [Dependency.new("br.com.caelum", "vraptor", "3.4.1", [Dependency.new("org.objenesis", "objenesis")]),
+		  Dependency.new("opensymphony", "sitemesh", "2.4.2"),
+		  Dependency.new("javax.servlet", "jstl", "1.2"),
+		  Dependency.new("org.hibernate", "hibernate-validator", "4.2.0.Final"),
+		  Dependency.new("joda-time", "joda-time", "2.0"),
+		  Dependency.new("com.thoughtworks.xstream", "xstream", "1.4.1")]
+
+		appengine_version = "1.7.2.1"
+		dependencies += [Dependency.new("com.googlecode.objectify", "objectify", "3.1"),
+		   Dependency.new("br.com.caelum", "vraptor3.4-compatible-gae", "1.1"),
+		   Dependency.new("commons-fileupload", "commons-fileupload", "1.2.2"),
+		   Dependency.new("com.google.appengine", "appengine-api-1.0-sdk", appengine_version),
+		   Dependency.new("com.google.appengine", "appengine-api-labs", appengine_version),
+		   Dependency.new("com.google.appengine", "appengine-jsr107cache", appengine_version),
+		   Dependency.new("net.sf.jsr107cache", "jsr107cache", "1.1"),
+		   Dependency.new("org.apache.geronimo.specs", "geronimo-jpa_3.0_spec", "1.1.1")]
+
+		dependencies
+	end
+
+	def append_freemarker_dependency_if_necessary dependencies
+		dependencies << Dependency.new("org.freemarker", "freemarker", "2.3.18") if @options[:template_engine] == 'ftl'
+		dependencies
+	end
+end

data/lib/vraptor-scaffold/generators/app/dependency/heroku_dependencies.rb

@@ -0,0 +1,48 @@
+class HerokuDependencies
+
+	attr_accessor :options
+
+	def initialize(options)
+		@options = options
+	end
+
+	def compile_scope
+		dependencies = append_freemarker_dependency_if_necessary default_dependencies
+		dependencies
+	end
+
+	def test_scope
+		[Dependency.new("junit", "junit", "4.10"),
+	 Dependency.new("org.hamcrest", "hamcrest-all", "1.1"),
+	 Dependency.new("org.mockito", "mockito-all", "1.9.0")]
+	end
+
+	def provided_scope
+		return []
+	end
+
+	private
+	def default_dependencies
+		hibernate_version = "4.0.1.Final"
+		dependencies = [Dependency.new("br.com.caelum", "vraptor", "3.4.1"),
+									Dependency.new("opensymphony", "sitemesh", "2.4.2"),
+									Dependency.new("javax.servlet", "jstl", "1.2"),
+									Dependency.new("org.hsqldb", "hsqldb", "2.2.8"),
+									Dependency.new("org.hibernate", "hibernate-entitymanager", hibernate_version),
+									Dependency.new("org.hibernate", "hibernate-c3p0", hibernate_version),
+									Dependency.new("org.hibernate", "hibernate-validator", "4.2.0.Final"),
+									Dependency.new("joda-time", "joda-time", "2.0"),
+									Dependency.new("com.thoughtworks.xstream", "xstream", "1.4.1")]
+
+		#heroku
+		dependencies += [Dependency.new("org.eclipse.jetty", "jetty-webapp", "7.4.4.v20110707"),
+									 Dependency.new("org.mortbay.jetty", "jsp-2.1-glassfish", "2.1.v20100127"),
+									 Dependency.new("javax.servlet", "servlet-api", "2.5")]
+		dependencies
+	end
+
+	def append_freemarker_dependency_if_necessary dependencies
+		dependencies << Dependency.new("org.freemarker", "freemarker", "2.3.18") if @options[:template_engine] == 'ftl'
+		dependencies
+	end
+end

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

@@ -4,16 +4,18 @@ class FreemarkerTemplateEngine < VraptorScaffold::Base
     File.join(File.dirname(__FILE__), "templates", "freemarker")
   end
 
-  def initialize(project_path)
+  def initialize(project_path, options)
     super
     self.destination_root=(project_path)
     @project_path = project_path
+    @options = options
   end
 
   def configure
     directory("macros", File.join(Configuration::WEB_APP, "macros"))
     template("../decorators.erb", File.join(Configuration::WEB_INF, "decorators.xml"))
-    copy_file("main.ftl", File.join(Configuration::WEB_INF, decorators_path, "main.ftl"))
+    template("main.ftl.erb", File.join(Configuration::WEB_INF, decorators_path, "main.ftl"))
+    #copy_file("main.ftl", File.join(Configuration::WEB_INF, decorators_path, "main.ftl"))
     directory("infrastructure", infra_path)
     append_freemarker_servlet
   end
@@ -21,7 +23,7 @@ class FreemarkerTemplateEngine < VraptorScaffold::Base
   def extension
     "ftl"
   end
-  
+
   def decorators_path
     File.join "views", "decorators"
   end
@@ -36,9 +38,9 @@ class FreemarkerTemplateEngine < VraptorScaffold::Base
     file = File.join(Configuration::WEB_INF, "web.xml")
     template = File.join FreemarkerTemplateEngine.source_root, "freemarker-web.xml"
     inject_into_file(file, File.read(template), :before => "</web-app>", :verbose => false)
-  end 
+  end
 
   def infra_path
     File.join Configuration::MAIN_SRC, package.gsub(".", File::Separator), "infrastructure"
   end
-end
+end