vraptor-scaffold 1.1.0 → 1.2.0

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

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

data/lib/vraptor-scaffold/generators/scaffold/repository_generator/repository_generator.rb

@@ -0,0 +1,27 @@
+class RepositoryGenerator < BaseScaffold
+
+  def self.source_root
+    File.join File.dirname(__FILE__), "templates"
+  end
+
+  def build
+    template("repository.erb", Configuration.main_class_path(Configuration.repositories_package, "#{repository_interface_name}.java"))
+    template("repository_impl.erb", Configuration.main_class_path(Configuration.repositories_package, "#{repository_impl_name}.java"))
+    template("repository_test.erb", Configuration.test_class_path(Configuration.repositories_package, "#{repository_test_class_name}.java"))
+  end
+
+  def orm_import
+    return "org.hibernate.Session" if Configuration.hibernate?
+    "javax.persistence.EntityManager"
+  end
+
+  def orm_parameter_name
+    return "session" if Configuration.hibernate?
+    "entityManager"
+  end
+
+  def orm_class
+    orm_parameter_name.camelize
+  end
+
+end

data/lib/vraptor-scaffold/generators/{scaffold_generator → scaffold}/repository_generator/templates/repository.erb

@@ -1,8 +1,8 @@
-package <%= Configuration.package %>.repositories;
+package <%= Configuration.package %>.<%= Configuration.repositories_package %>;
 
 import java.util.List;
 
-import <%= Configuration.package %>.models.<%= class_name %>;
+import <%= Configuration.full_models_package %>.<%= class_name %>;
 
 public interface <%= repository_interface_name %> {
 	/*
@@ -11,7 +11,7 @@ public interface <%= repository_interface_name %> {
 	 
 	void create(<%= class_name %> entity);
 	
-	void update(<%= class_name %> entity);
+	<%= class_name %> update(<%= class_name %> entity);
 	
 	void destroy(<%= class_name %> entity);
 	

data/lib/vraptor-scaffold/generators/scaffold/repository_generator/templates/repository_impl.erb

@@ -0,0 +1,16 @@
+package <%= Configuration.package %>.<%= Configuration.repositories_package %>;
+
+import <%= orm_import %>;
+
+import br.com.caelum.vraptor.ioc.Component;
+import <%= Configuration.full_models_package %>.<%= class_name %>;
+
+@Component
+public class <%= repository_impl_name %>
+    extends Repository<<%= class_name %>, Long>
+    implements <%= repository_interface_name %> {
+
+	<%= repository_impl_name %>(<%= orm_class %> <%= orm_parameter_name %>) {
+		super(<%= orm_parameter_name %>);
+	}
+}

data/lib/vraptor-scaffold/generators/{scaffold_generator → scaffold}/repository_generator/templates/repository_test.erb

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

data/lib/vraptor-scaffold/generators/scaffold/template_engine_generator/freemarker_generator/freemarker_generator.rb

@@ -0,0 +1,18 @@
+class FreemarkerGenerator < TemplateEngineGenerator
+
+  def self.source_root
+    File.dirname(__FILE__)
+  end
+
+  def view_folder
+    "views"
+  end
+
+  def extension
+    "ftl"
+  end
+
+  def path
+    "${base}/#{base_path}"
+  end
+end

data/lib/vraptor-scaffold/generators/{scaffold_generator → scaffold/template_engine_generator}/freemarker_generator/templates/form.erb

@@ -6,15 +6,15 @@
 
 <form action="<%= path %>" method="post">
   
-  <#if <%= "#{@model}.id" %>??>
-    <input type="hidden" name="<%= "#{@model}.id" %>" value="<%= "${#{@model}.id}" %>"/>
+  <#if <%= "#{model_parameter_name}.id" %>??>
+    <input type="hidden" name="<%= "#{model_parameter_name}.id" %>" value="<%= "${#{model_parameter_name}.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}/>"  %>
+    <%= att.name.camelize %>:<br />
+    <%= "<@html.#{att.html_input} \"#{model_parameter_name}.#{att.name}\" #{model_parameter_name}.#{att.name}/>"  %>
   </div>
 <% end -%>
   <div class="actions">

data/lib/vraptor-scaffold/generators/scaffold/template_engine_generator/freemarker_generator/templates/index.erb

@@ -0,0 +1,36 @@
+<body>
+<h1>Listing <%= class_name.pluralize %></h1>
+
+<table>
+  <tr>
+<% @attributes.each do |att| -%>
+   <th><%= att.name.camelize %></th>
+<% end -%>
+   <th></th>
+   <th></th>
+   <th></th>
+  </tr>
+
+<#list <%= "#{model_parameter_name}List as #{model_parameter_name}" %>>
+  <tr>
+  <% @attributes.each do |att| -%>
+    <td>
+      <%= "${#{model_parameter_name}.#{att.name}!\"\"}" unless att.boolean? %>
+      <%= "${#{model_parameter_name}.#{att.name}?string}" if att.boolean? %>
+    </td>
+  <% end -%>
+    <td><a href="<%= "#{path}/${#{model_parameter_name}.id}" %>">show</a></td>
+    <td><a href="<%= "#{path}/${#{model_parameter_name}.id}/edit" %>">edit</a></td>
+    <td>
+      <form action="<%= "#{path}/${#{model_parameter_name}.id}" %>" method="post">
+    	  <input type="hidden" name="_method" value="delete"/>
+    	  <button type="submit" onclick="return confirm('Are you sure?')">destroy</button>
+	    </form>
+	  </td>
+    </tr>
+</#list>
+</table>
+
+<br />
+<a href="<%= path %>/new">New <%= class_name %></a> 
+</body>

data/lib/vraptor-scaffold/generators/scaffold/template_engine_generator/freemarker_generator/templates/show.erb

@@ -0,0 +1,14 @@
+<body>
+
+<% @attributes.each do |att| -%>
+<p>
+  <b><%= att.name.camelize %>:</b>
+   <%= "${#{model_parameter_name}.#{att.name}!\"\"}" unless att.boolean? %>
+   <%= "${#{model_parameter_name}.#{att.name}?string}" if att.boolean? %>
+</p>
+<% end -%>
+
+<a href="<%= "#{path}/${#{model_parameter_name}.id}/edit" %>">Edit</a>
+<a href="<%= path %>">Back</a>
+
+</body>

data/lib/vraptor-scaffold/generators/scaffold/template_engine_generator/jsp_generator/jsp_generator.rb

@@ -0,0 +1,18 @@
+class JspGenerator < TemplateEngineGenerator
+
+  def self.source_root
+    File.dirname(__FILE__)
+  end
+
+  def view_folder
+    "jsp"
+  end
+
+  def extension
+    "jsp"
+  end
+
+  def path url=""
+    %Q{${pageContext.request.contextPath}/#{base_path}#{url}}
+  end
+end

data/lib/vraptor-scaffold/generators/{scaffold_generator → scaffold/template_engine_generator}/jsp_generator/templates/form.erb

@@ -6,15 +6,15 @@
 
 <form action="<%= path %>" method="post">
   
-	<c:if test="${not empty <%= @model %>.id}">
-		<input type="hidden" name="<%= @model %>.id" value="${<%=@model%>.id}"/>
+	<c:if test="${not empty <%= model_parameter_name %>.id}">
+		<input type="hidden" name="<%= model_parameter_name %>.id" value="${<%= model_parameter_name%>.id}"/>
 		<input type="hidden" name="_method" value="put"/>
 	</c:if>
 
 <% @attributes.each do |att| -%>
 	<div class="field">
-		<%= att.name.capitalize %>:<br />
-		<input type="text" name="<%= @model %>.<%=att.name%>" value="${<%=@model%>.<%=att.name%>}"/>
+		<%= att.name.camelize %>:<br />
+		<input type="text" name="<%= model_parameter_name %>.<%=att.name%>" value="${<%=model_parameter_name%>.<%=att.name%>}"/>
 	</div>
 <% end -%>
 

data/lib/vraptor-scaffold/generators/{scaffold_generator → scaffold/template_engine_generator}/jsp_generator/templates/index.erb

@@ -7,22 +7,22 @@
 	<table>
 		<tr>
 			<%- @attributes.each do |att| -%>
-			<th><%= att.name %></th>
+			<th><%= att.name.camelize %></th>
 			<%- end -%>
 			<th></th>
 			<th></th>
 			<th></th>
 		</tr>
 
-		<c:forEach items="${<%=@model%>List}" var="<%=@model%>">
+		<c:forEach items="${<%=model_parameter_name%>List}" var="<%=model_parameter_name%>">
 			<tr>
 				<%- @attributes.each do |att| -%>
-				<td><%= "${#{@model}.#{att.name}}" %></td>
+				<td><%= "${#{model_parameter_name}.#{att.name}}" %></td>
 				<%- end -%>
-				<td><a href="<%= path "/${#{@model}.id}" %>">show</a></td>
-				<td><a href="<%= path "/${#{@model}.id}/edit" %>">edit</a></td>
+				<td><a href="<%= path "/${#{model_parameter_name}.id}" %>">show</a></td>
+				<td><a href="<%= path "/${#{model_parameter_name}.id}/edit" %>">edit</a></td>
 				<td>
-					<form action="<%= path "/${#{@model}.id}" %>" method="post">
+					<form action="<%= path "/${#{model_parameter_name}.id}" %>" method="post">
 						<input type="hidden" name="_method" value="delete"/>
 						<button type="submit" onclick="return confirm('Are you sure?')">destroy</button>
 					</form>

data/lib/vraptor-scaffold/generators/scaffold/template_engine_generator/jsp_generator/templates/show.erb

@@ -0,0 +1,14 @@
+<head>
+	<title><%= class_name %> [show]</title>
+</head>
+<body>
+<%- @attributes.each do |att| -%>
+	<p>
+		<b><%= att.name.camelize %>:</b>
+		<%= "${#{model_parameter_name}.#{att.name}}" %>
+	</p>
+<% end -%>
+
+	<a href="<%= path "/${#{model_parameter_name}.id}/edit" %>">Edit</a>
+	<a href="<%= path %>">Back</a>
+</body>

data/lib/vraptor-scaffold/generators/scaffold/template_engine_generator/template_engine_generator.rb

@@ -0,0 +1,21 @@
+class TemplateEngineGenerator < BaseScaffold
+
+  def build
+    create_view("index")
+    create_view("show")
+    create_view("form")
+    create_view("edit")
+    create_view("new", "new#{class_name}")
+  end
+
+  def create_view(template_name, file_name=template_name)
+    template("templates/#{template_name}.erb", "#{views_path}/#{file_name}.#{extension}")
+  end
+
+  def views_path
+    File.join Configuration::WEB_INF, view_folder, model_parameter_name
+  end
+end
+
+require File.dirname(__FILE__) + "/jsp_generator/jsp_generator"
+require File.dirname(__FILE__) + "/freemarker_generator/freemarker_generator"

data/lib/vraptor-scaffold/load_paths.rb

@@ -1,22 +1,14 @@
-require 'rubygems'
-
-require 'thor/actions'
-require 'thor/group'
-require 'active_support/inflector'
-require 'yaml'
-
-require File.dirname(__FILE__) + '/configuration'
 require File.dirname(__FILE__) + '/generators/base'
-require File.dirname(__FILE__) + '/generators/app_generator/app_generator'
-require File.dirname(__FILE__) + '/generators/app_generator/dependency'
-require File.dirname(__FILE__) + '/generators/app_generator/dependency_manager'
-require File.dirname(__FILE__) + '/generators/app_generator/freemarker_template_engine'
-require File.dirname(__FILE__) + '/generators/app_generator/jsp_template_engine'
-require File.dirname(__FILE__) + '/generators/scaffold_generator/attribute'
-require File.dirname(__FILE__) + '/generators/scaffold_generator/scaffold_generator'
-require File.dirname(__FILE__) + '/generators/scaffold_generator/base_scaffold'
-require File.dirname(__FILE__) + '/generators/scaffold_generator/model_generator/model_generator'
-require File.dirname(__FILE__) + '/generators/scaffold_generator/repository_generator/repository_generator'
-require File.dirname(__FILE__) + '/generators/scaffold_generator/controller_generator/controller_generator'
-require File.dirname(__FILE__) + '/generators/scaffold_generator/freemarker_generator/freemarker_generator'
-require File.dirname(__FILE__) + '/generators/scaffold_generator/jsp_generator/jsp_generator'
+require File.dirname(__FILE__) + '/generators/plugin/plugin_generator'
+require File.dirname(__FILE__) + '/generators/app/app_generator'
+require File.dirname(__FILE__) + '/generators/app/dependency'
+require File.dirname(__FILE__) + '/generators/app/dependency_manager'
+require File.dirname(__FILE__) + '/generators/app/freemarker_template_engine'
+require File.dirname(__FILE__) + '/generators/app/jsp_template_engine'
+require File.dirname(__FILE__) + '/generators/scaffold/attribute'
+require File.dirname(__FILE__) + '/generators/scaffold/scaffold_generator'
+require File.dirname(__FILE__) + '/generators/scaffold/base_scaffold'
+require File.dirname(__FILE__) + '/generators/scaffold/model_generator/model_generator'
+require File.dirname(__FILE__) + '/generators/scaffold/repository_generator/repository_generator'
+require File.dirname(__FILE__) + '/generators/scaffold/controller_generator/controller_generator'
+require File.dirname(__FILE__) + '/generators/scaffold/template_engine_generator/template_engine_generator'

data/lib/vraptor-scaffold/runner.rb

@@ -0,0 +1,11 @@
+module VraptorScaffold
+  module Runner
+  end
+end
+
+require 'vraptor-scaffold/runner/help'
+require 'vraptor-scaffold/runner/scaffold'
+require 'vraptor-scaffold/runner/generator'
+require 'vraptor-scaffold/runner/commands_help'
+require 'vraptor-scaffold/runner/plugin'
+require 'vraptor-scaffold/runner/configure'

data/lib/vraptor-scaffold/runner/commands_help.rb

@@ -0,0 +1,13 @@
+module VraptorScaffold
+  module Runner
+
+    class CommandsHelp
+      def run(args)
+        Kernel.puts "Available runners for vraptor are: #{VraptorScaffold::COMMANDS.keys.join(', ')}"
+        Kernel.puts "Usage:"
+        Kernel.puts "  vraptor runner"
+      end
+    end
+
+  end
+end

data/lib/vraptor-scaffold/runner/configure.rb

@@ -0,0 +1,21 @@
+module VraptorScaffold
+  module Runner
+
+    class Configure
+
+      #def run(args)
+      #  if VraptorScaffold::Runner::Help.help?(args.first) || args.size < 2
+      #    Kernel.puts "vraptor configure usage:"
+      #    Kernel.puts "\tvraptor configure PLUGIN_NAME"
+      #  else
+      #    plugin_name = args.first
+      #    require plugin_name
+      #    puts "Configuring plugin '#{plugin_name}'"
+      #    plugin = plugin_name.gsub('-','_').camelize.constantize.new(args)
+      #    plugin.invoke_all
+      #    plugin
+      #  end
+      #end
+    end
+  end
+end

data/lib/vraptor-scaffold/runner/generator.rb

@@ -0,0 +1,15 @@
+module VraptorScaffold
+  module Runner
+
+    class Generator
+      def run(args)
+        project_path = args.shift
+        if VraptorScaffold::Runner::Help.help? project_path
+          AppGenerator.start(["-h"])
+        else
+          AppGenerator.new(project_path, args).invoke_all
+        end
+      end
+    end
+  end
+end

data/lib/vraptor-scaffold/runner/help.rb

@@ -0,0 +1,12 @@
+module VraptorScaffold
+  module Runner
+
+    class Help
+
+      def self.help?(arg)
+        [nil, "-h", "--help"].include?(arg)
+      end
+
+    end
+  end
+end

data/lib/vraptor-scaffold/runner/plugin.rb

@@ -0,0 +1,19 @@
+module VraptorScaffold
+  module Runner
+
+    class Plugin
+
+      def run(args)
+        if VraptorScaffold::Runner::Help.help?(args.first) || args.size < 2
+          PluginGenerator.start(["-h"])
+        elsif File.exist?("src")
+          PluginGenerator.new(args.shift, args).invoke_all
+        else
+          puts "To run vraptor plugin please go to the project root folder."
+        end
+      end
+    end
+
+  end
+end
+

data/lib/vraptor-scaffold/runner/scaffold.rb

@@ -0,0 +1,16 @@
+module VraptorScaffold
+  module Runner
+
+    class Scaffold
+      def run(args)
+        if VraptorScaffold::Runner::Help.help? args.first
+          ScaffoldGenerator.start(["-h"])
+        elsif File.exist?("src")
+          ScaffoldGenerator.new(args).invoke_all
+        else
+          puts "To run vraptor scaffold please go to the project root folder."
+        end
+      end
+    end
+  end
+end