RubyGems - vraptor-scaffold - Versions diffs - 1.1.0 → 1.2.0 - Mend

vraptor-scaffold 1.1.0 → 1.2.0

Files changed (170) hide show

data/lib/vraptor-scaffold/generators/{app_generator → app}/templates/ivy.erb RENAMED

@@ -24,7 +24,7 @@
 		<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" />
 		<!-- Minify dependencies -->
 		<dependency org="com.yahoo.platform.yui" name="yuicompressor" rev="2.3.6" conf="minify->default" />
 	</dependencies>

data/lib/vraptor-scaffold/generators/{app_generator → app}/templates/jsp/jsp-web.xml RENAMED

File without changes

data/lib/vraptor-scaffold/generators/{app_generator → app}/templates/jsp/main.jsp RENAMED

@@ -11,7 +11,7 @@
   </head>
   <body>
     <decorator:body/>
-    <script type="text/javascript" src="${pageContext.request.contextPath}/javascripts/jquery.min.js"/></script>
-    <script type="text/javascript" src="${pageContext.request.contextPath}/javascripts/application.js"/></script>
+    <script type="text/javascript" src="${pageContext.request.contextPath}/javascripts/jquery.min.js"></script>
+    <script type="text/javascript" src="${pageContext.request.contextPath}/javascripts/application.js"></script>
   </body>
 </html>

data/lib/vraptor-scaffold/generators/{app_generator → app}/templates/jsp/prelude.jspf RENAMED

File without changes

data/lib/vraptor-scaffold/generators/{app_generator/templates/src/models/Entity.java.tt → app/templates/models/Entity.erb} RENAMED

@@ -1,4 +1,4 @@
-package <%= options[:package] %>.models;
+package <%= options[:package] %>.<%= options[:models_package] %>;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;

data/lib/vraptor-scaffold/generators/app/templates/orm/Repository-hibernate.java.tt ADDED

@@ -0,0 +1,50 @@
+package <%= options[:package] %>.<%= options[:repositories_package] %>;
+import java.io.Serializable;
+import java.lang.reflect.ParameterizedType;
+import java.util.List;
+import org.hibernate.Query;
+import org.hibernate.Session;
+public abstract class Repository<T, I extends Serializable> {
+	protected final Session session;
+	protected final Class<T> clazz;
+	protected Repository(Session session) {
+		this.session = session;
+		@SuppressWarnings("unchecked")
+		Class<T> clazz = (Class<T>) ((ParameterizedType) getClass().getGenericSuperclass()).getActualTypeArguments()[0];
+		this.clazz = clazz;
+	}
+	public void create(T entity) {
+		session.persist(entity);
+	}
+	@SuppressWarnings("unchecked")
+	public T update(T entity) {
+		return (T) session.merge(entity);
+	}
+	public void destroy(T entity) {
+		session.delete(entity);
+	}
+	@SuppressWarnings("unchecked")
+	public T find(I id) {
+		return (T) session.get(clazz, id);
+	}
+	public List<T> findAll() {
+		Query query = session.createQuery("from " + clazz.getName());
+		@SuppressWarnings("unchecked")
+		List<T> resultList = query.list();
+		return resultList;
+	}
+}

data/lib/vraptor-scaffold/generators/{app_generator/templates/src/repositories/Repository.java.tt → app/templates/orm/Repository-jpa.java.tt} RENAMED

@@ -1,4 +1,4 @@
-package <%= options[:package] %>.repositories;
+package <%= options[:package] %>.<%= options[:repositories_package] %>;
 import java.io.Serializable;
 import java.lang.reflect.ParameterizedType;
@@ -25,8 +25,8 @@ public abstract class Repository<T, I extends Serializable> {
 		entityManager.persist(entity);
 	}
-	public void update(T entity) {
-		entityManager.merge(entity);
+	public T update(T entity) {
+		return entityManager.merge(entity);
 	}
 	public void destroy(T entity) {

data/lib/vraptor-scaffold/generators/app/templates/orm/hibernate.cfg.xml ADDED

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-configuration PUBLIC "-//Hibernate/Hibernate Configuration DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
+<hibernate-configuration>
+	<session-factory>
+	</session-factory>
+</hibernate-configuration>

data/lib/vraptor-scaffold/generators/app/templates/orm/persistence.xml ADDED

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
+	version="2.0">
+	<persistence-unit name="default" transaction-type="RESOURCE_LOCAL">
+    </persistence-unit>
+</persistence>

data/lib/vraptor-scaffold/generators/{app_generator → app}/templates/pom.erb RENAMED

@@ -2,19 +2,11 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId><%= @project_name %></groupId>
-	<artifactId><%= @project_name %></artifactId>
-	<packaging>war</packaging>
+	<artifactId><%= @project_name %></artifactId><%- unless @options[:heroku] %>
+	<packaging>war</packaging><%- end %>
 	<version>0.0.1-SNAPSHOT</version>
 	<name><%= @project_name %></name>
-	<repositories>
-		<repository>
-			<id>JBoss</id>
-			<name>JBoss repository</name>
-			<url>https://repository.jboss.org/nexus/content/groups/public-jboss</url>
-		</repository>
-	</repositories>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
@@ -43,7 +35,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-war-plugin</artifactId>
-				<version>2.1</version>
+				<version>2.1.1</version>
 			</plugin>
 			<plugin>
 				<groupId>org.mortbay.jetty</groupId>
@@ -57,7 +49,31 @@
 						<contextPath>/</contextPath>
 					</webAppConfig>
 				</configuration>
-			</plugin>
+			</plugin><%- if @options[:heroku] %>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>appassembler-maven-plugin</artifactId>
+                <version>1.1.1</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>assemble</goal>
+                        </goals>
+                        <configuration>
+                            <assembleDirectory>target</assembleDirectory>
+                            <generateRepository>false</generateRepository>
+                            <extraJvmArguments>-Xmx512m</extraJvmArguments>
+                            <programs>
+                                <program>
+                                    <mainClass>Main</mainClass>
+                                    <name>webapp</name>
+                                </program>
+                            </programs>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin><%- end %>
 		</plugins>
 	</build>
@@ -96,7 +112,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>cobertura-maven-plugin</artifactId>
-				<version>2.4</version>
+				<version>2.5.1</version>
 			</plugin>
 		</plugins>
 	</reporting>

data/lib/vraptor-scaffold/generators/{app_generator → app}/templates/resources-test/.empty_directory RENAMED

File without changes

data/lib/vraptor-scaffold/generators/app/templates/resources/hibernate.properties ADDED

@@ -0,0 +1,16 @@
+hibernate.connection.driver_class=org.hsqldb.jdbcDriver
+hibernate.connection.url=jdbc:hsqldb:file:tmp/devdb
+hibernate.hbm2ddl.auto=update
+hibernate.query.substitutions=true=1, false=0
+hibernate.show_sql=true
+hibernate.format_sql=true
+#DATASOURCE POOL CONFIGURATIONS
+hibernate.connection.provider_class=org.hibernate.connection.C3P0ConnectionProvider
+maxPoolSize=20
+minPoolSize=3
+initialPoolSize=3
+timeout=25200
+acquireIncrement=5
+preferredTestQuery=select 1
+idleConnectionTestPeriod=100

data/lib/vraptor-scaffold/generators/app/templates/resources/log4j.properties ADDED

@@ -0,0 +1,4 @@
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%d{yy-MM-dd HH:mm:ss,SSS} [%p] %c - %m%n
+log4j.rootLogger=info, console

data/lib/vraptor-scaffold/generators/{app_generator → app}/templates/resources/messages.properties RENAMED

File without changes

data/lib/vraptor-scaffold/generators/app/templates/vraptor-scaffold.erb ADDED

@@ -0,0 +1,7 @@
+build_tool: <%= options[:build_tool] %>
+package: <%= options[:package] %>
+template_engine: <%= options[:template_engine] %>
+orm: <%= options[:orm] %>
+models_package: <%= options[:models_package] %>
+controllers_package: <%= options[:controllers_package] %>
+repositories_package: <%= options[:repositories_package] %>

data/lib/vraptor-scaffold/generators/{app_generator/templates/webapp/WEB-INF/web.xml → app/templates/webapp/WEB-INF/web.xml.tt} RENAMED

@@ -3,11 +3,11 @@
 	xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
 	id="WebApp_ID" version="2.5">
-	<display-name>vraptor-scaffold-project</display-name>
+	<display-name><%= @project_name %></display-name>
 	<context-param>
 		<param-name>br.com.caelum.vraptor.packages</param-name>
-		<param-value>br.com.caelum.vraptor.util.jpa</param-value>
+		<param-value>br.com.caelum.vraptor.util.<%= options[:orm] %></param-value>
 	</context-param>
 	<context-param>

data/lib/vraptor-scaffold/generators/{app_generator/templates/src-test/controllers → app/templates/webapp/images}/.empty_directory RENAMED

File without changes

data/lib/vraptor-scaffold/generators/{app_generator → app}/templates/webapp/index.jsp RENAMED

File without changes

data/lib/vraptor-scaffold/generators/{app_generator → app}/templates/webapp/stylesheets/common.css RENAMED

File without changes

data/lib/vraptor-scaffold/generators/{app_generator → app}/templates/webapp/stylesheets/scaffold.css RENAMED

File without changes

data/lib/vraptor-scaffold/generators/{app_generator → app}/templates/webapp/stylesheets/stylesheets.css RENAMED

File without changes

data/lib/vraptor-scaffold/generators/plugin/plugin_generator.rb ADDED

@@ -0,0 +1,42 @@
+class PluginGenerator < VraptorScaffold::Base
+  argument :name
+  class_option :group, :default => "br.com.caelum.vraptor", :aliases => "-g",
+               :desc => "Plugin group"
+  class_option :version, :aliases => "-v",
+               :desc => "Plugin version"
+  def self.banner
+    "vraptor plugin #{self.arguments.map(&:usage).join(' ')} [options]"
+  end
+  def initialize(args, opts=[])
+    super([args], opts)
+    @version = options[:version]
+    @group = options[:group]
+  end
+  def build
+    if is_ivy?
+      plugin = "\n\t\t<dependency org=\"#{@group}\" name=\"#{name}\" rev=\"#{@version}\" conf=\"default\" />"
+      inject_into_file("ivy.xml", plugin, :after => "<dependencies>")
+    elsif is_maven?
+      plugin = "\n\t\t<dependency>\n\t\t\t<groupId>#{@group}</groupId>\n\t\t\t<artifactId>#{name}</artifactId>\n\t\t\t<version>#{@version}</version>\n\t\t</dependency>"
+      inject_into_file("pom.xml", plugin, :after => "<dependencies>")
+    else
+      plugin = "\n    compile group: '#{@group}', name: '#{name}', version: '#{@version}'\n"
+      inject_into_file("build.gradle", plugin, :after => "dependencies {")
+    end
+  end
+  def is_ivy?
+    File.exist?("ivy.xml")
+  end
+  def is_maven?
+    File.exist?("pom.xml")
+  end
+end

data/lib/vraptor-scaffold/generators/plugin/vraptor_gem.rb ADDED

@@ -0,0 +1,36 @@
+require 'rubygems'
+require 'rubygems/gem_runner'
+require 'net/http'
+class VRaptorGem
+    #def initialize(who)
+    #    @who = who
+    #end
+    #def install_and_configure
+    #    if is_installed?
+    #        configure
+    #    elsif exists?
+    #        install
+    #        configure
+    #    end
+    #end
+    #
+    #private
+    #def is_installed?
+    #    Gem::GemPathSearcher.new.find(@who)
+    #end
+    #def exists?
+    #  url = URI.parse("http://rubygems.org/gems/#{@who}")
+    #  req = Net::HTTP::Get.new(url.path)
+    #  res = Net::HTTP.start(url.host, url.port) {|http|
+    #         http.request(req)
+    #       }
+    #    res.code == '200'
+    #end
+    #def install
+    #    Gem::GemRunner.new.run ["install", @who]
+    #end
+    #def configure
+    #    VraptorScaffold::Execution.new.run(["configure", @who])
+    #end
+end

data/lib/vraptor-scaffold/generators/{scaffold_generator → scaffold}/attribute.rb RENAMED

@@ -2,7 +2,7 @@ class Attribute
   attr_accessor :name, :type
   def initialize(name, type)
-    @name = name.underscore.camelize(:lower)
+    @name = name.underscore.camelize(:lower)
     @type = type.downcase
     validate
   end

data/lib/vraptor-scaffold/generators/{scaffold_generator → scaffold}/base_scaffold.rb RENAMED

@@ -7,11 +7,11 @@ class BaseScaffold < VraptorScaffold::Base
   end
   def model_parameter_name
-    @model.downcase
+    @model.camelize(:lower)
   end
   def class_name
-    @model.capitalize
+    @model.camelize
   end
   def test_class_name
@@ -37,4 +37,8 @@ class BaseScaffold < VraptorScaffold::Base
   def controller_test_class_name
     "#{controller_class_name}Test"
   end
+  def base_path
+    model_parameter_name.pluralize
+  end
 end

data/lib/vraptor-scaffold/generators/{scaffold_generator → scaffold}/controller_generator/controller_generator.rb RENAMED

@@ -5,11 +5,11 @@ class ControllerGenerator < BaseScaffold
   end
   def build
-    template("controller.erb", Configuration.main_class_path("controllers", "#{controller_class_name}.java"))
-    template("controller_test.erb", Configuration.test_class_path("controllers", "#{controller_test_class_name}.java"))
+    template("controller.erb", Configuration.main_class_path(Configuration.controllers_package, "#{controller_class_name}.java"))
+    template("controller_test.erb", Configuration.test_class_path(Configuration.controllers_package, "#{controller_test_class_name}.java"))
   end
   def path
-    "/#{@model.downcase.pluralize}"
+    "/#{base_path}"
   end
 end

data/lib/vraptor-scaffold/generators/{scaffold_generator → scaffold}/controller_generator/templates/controller.erb RENAMED

@@ -1,9 +1,9 @@
-package <%= Configuration.package %>.controllers;
+package <%= Configuration.package %>.<%= Configuration.controllers_package %>;
 import java.util.List;
-import <%= Configuration.package %>.models.<%= class_name %>;
-import <%= Configuration.package %>.repositories.<%= repository_interface_name %>;
+import <%= Configuration.full_models_package %>.<%= class_name %>;
+import <%= Configuration.package %>.<%= Configuration.repositories_package %>.<%= repository_interface_name %>;
 import br.com.caelum.vraptor.Delete;
 import br.com.caelum.vraptor.Get;
 import br.com.caelum.vraptor.Post;

data/lib/vraptor-scaffold/generators/{scaffold_generator → scaffold}/controller_generator/templates/controller_test.erb RENAMED

@@ -1,4 +1,4 @@
-package <%= Configuration.package %>.controllers;
+package <%= Configuration.package %>.<%= Configuration.controllers_package %>;
 import static org.junit.Assert.assertNotNull;

data/lib/vraptor-scaffold/generators/scaffold/model_generator/model_generator.rb ADDED

@@ -0,0 +1,20 @@
+class ModelGenerator < BaseScaffold
+  def self.source_root
+    File.join File.dirname(__FILE__), "templates"
+  end
+  def build
+    template("model.erb", Configuration.main_class_path(Configuration.models_package, "#{class_name}.java"))
+    template("model_test.erb", Configuration.test_class_path(Configuration.models_package, "#{test_class_name}.java"))
+    map_orm_class if Configuration.hibernate?
+  end
+  private
+  def map_orm_class
+    file = File.join Configuration::MAIN_RESOURCES, "hibernate.cfg.xml"
+    model = "#{Configuration.full_models_package}.#{class_name}"
+    line_break = "\n	"
+    inject_into_file(file, "	<mapping class='#{model}'/>#{line_break}", :before => "</session-factory>")
+  end
+end

data/lib/vraptor-scaffold/generators/{scaffold_generator → scaffold}/model_generator/templates/model.erb RENAMED

@@ -1,4 +1,4 @@
-package <%= Configuration.package %>.models;
+package <%= Configuration.full_models_package %>;
 @javax.persistence.Entity
 public class <%= class_name %> extends Entity {
@@ -8,11 +8,11 @@ public class <%= class_name %> extends Entity {
 <% end -%>
 <% @attributes.each do |att| -%>
-	public void set<%= att.name.capitalize %>(<%= att.java_type %> <%= att.name %>) {
+	public void set<%= att.name.camelize %>(<%= att.java_type %> <%= att.name %>) {
 		this.<%= att.name %> = <%= att.name %>;
 	}
-	public <%= att.java_type %> <%= att.getter_prefix + att.name.capitalize %>() {
+	public <%= att.java_type %> <%= att.getter_prefix + att.name.camelize %>() {
 		return <%= att.name %>;
 	}