vraptor-scaffold 1.2.3 → 1.3.0.rc

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

@@ -0,0 +1,22 @@
+package <%= Configuration.package %>.<%= Configuration.repositories_package %>;
+
+import java.util.List;
+
+import <%= Configuration.full_models_package %>.<%= class_name %>;
+
+public interface <%= repository_interface_name %> {
+	/*
+	 * Delete the methods you don't want to expose
+	 */
+	 
+	void create(<%= class_name %> entity);
+	
+	void update(<%= class_name %> entity);
+	
+	void destroy(<%= class_name %> entity);
+	
+	<%= class_name %> find(Long id);
+	
+	List<<%= class_name %>> findAll();
+
+}

data/lib/vraptor-scaffold/generators/scaffold/repository_generator/templates/objectify_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 %>>
+    implements <%= repository_interface_name %> {
+
+	<%= repository_impl_name %>(<%= orm_class %> <%= orm_parameter_name %>) {
+		super(<%= orm_parameter_name %>);
+	}
+}

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

@@ -2,7 +2,8 @@ class ScaffoldGenerator < VraptorScaffold::Base
 
   attr_accessor :generated_attributes
   argument :model
-  argument :attributes, :type => :hash, :default => {}, :banner => "field:type field:type" 
+  argument :attributes, :type => :hash, :default => {}, :banner => "field:type field:type"
+
 
   def self.banner
     "vraptor scaffold #{self.arguments.map(&:usage).join(' ')}"
@@ -21,11 +22,17 @@ class ScaffoldGenerator < VraptorScaffold::Base
   end
 
   def model_generator
-    ModelGenerator.new(model, @generated_attributes).build
+    models_generator_available = {"jpa" => ModelGenerator,
+                                  "hibernate" => ModelGenerator,
+                                  "objectify" => ObjectifyModelGenerator }
+    models_generator_available.fetch(Configuration.orm).new(model, @generated_attributes).build
   end
 
   def repository_generator
-    RepositoryGenerator.new(model, @generated_attributes).build
+    repository_generators_available = {"jpa" => RepositoryGenerator,
+                                       "hibernate" => RepositoryGenerator,
+                                       "objectify" => ObjectifyRepositoryGenerator }
+    repository_generators_available.fetch(Configuration.orm).new(model, @generated_attributes).build
   end
 
   def template_engine_generator

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

@@ -1,9 +1,5 @@
 class FreemarkerGenerator < TemplateEngineGenerator
 
-  def self.source_root
-    File.dirname(__FILE__)
-  end
-
   def view_folder
     "views"
   end
@@ -15,4 +11,9 @@ class FreemarkerGenerator < TemplateEngineGenerator
   def path
     "${base}/#{base_path}"
   end
+  
+  def source_root
+    File.join File.dirname(__FILE__), "templates"
+  end
+  
 end

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

@@ -1,9 +1,5 @@
 class JspGenerator < TemplateEngineGenerator
 
-  def self.source_root
-    File.dirname(__FILE__)
-  end
-
   def view_folder
     "jsp"
   end
@@ -15,4 +11,9 @@ class JspGenerator < TemplateEngineGenerator
   def path url=""
     %Q{${pageContext.request.contextPath}/#{base_path}#{url}}
   end
+  
+  def source_root
+    File.join File.dirname(__FILE__), "templates"
+  end
+  
 end

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

@@ -1,6 +1,7 @@
 class TemplateEngineGenerator < BaseScaffold
 
   def build
+    define_source_paths
     create_view("index")
     create_view("show")
     create_view("form")
@@ -9,12 +10,17 @@ class TemplateEngineGenerator < BaseScaffold
   end
 
   def create_view(template_name, file_name=template_name)
-    template("templates/#{template_name}.erb", "#{views_path}/#{file_name}.#{extension}")
+    template("#{template_name}.erb", "#{views_path}/#{file_name}.#{extension}")
   end
 
   def views_path
     File.join Configuration::WEB_INF, view_folder, model_parameter_name
   end
+  
+  def template_path
+    "src/templates/views"
+  end
+
 end
 
 require File.dirname(__FILE__) + "/jsp_generator/jsp_generator"

data/lib/vraptor-scaffold/load_paths.rb

@@ -9,6 +9,8 @@ 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/model_generator/objectify_model_generator'
 require File.dirname(__FILE__) + '/generators/scaffold/repository_generator/repository_generator'
+require File.dirname(__FILE__) + '/generators/scaffold/repository_generator/objectify_repository_generator'
 require File.dirname(__FILE__) + '/generators/scaffold/controller_generator/controller_generator'
-require File.dirname(__FILE__) + '/generators/scaffold/template_engine_generator/template_engine_generator'
+require File.dirname(__FILE__) + '/generators/scaffold/template_engine_generator/template_engine_generator'

data/lib/vraptor-scaffold/runner.rb

@@ -9,3 +9,4 @@ require 'vraptor-scaffold/runner/generator'
 require 'vraptor-scaffold/runner/commands_help'
 require 'vraptor-scaffold/runner/plugin'
 require 'vraptor-scaffold/runner/configure'
+require 'vraptor-scaffold/runner/start'

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

@@ -0,0 +1,29 @@
+module VraptorScaffold
+  module Runner
+
+    class Start
+      def run(args)
+        validate
+        Kernel.system("ant compile")
+        Kernel.system("sh $APPENGINE_SDK_HOME/bin/dev_appserver.sh #{Configuration::WEB_APP}")
+      end
+
+      private
+
+      def validate
+        unless File.exist?("src")
+          Kernel.puts "To run vraptor start please go to the project root folder."
+          Kernel::exit
+        end
+        unless Configuration.orm == "objectify"
+          Kernel.puts "vraptor start command is available only for gae apps."
+          Kernel::exit
+        end
+        unless ENV['APPENGINE_SDK_HOME']
+          Kernel.puts "To run vraptor start, configure environment variable APPENGINE_SDK_HOME."
+          Kernel::exit
+        end
+      end
+    end
+  end
+end

data/lib/vraptor-scaffold/version.rb

@@ -1,3 +1,3 @@
 module VraptorScaffold
-  VERSION = "1.2.3"
+  VERSION = "1.3.0.rc"
 end

data/spec/resources/vraptor-scaffold-objectify.properties

@@ -0,0 +1,7 @@
+build_tool: mvn
+package: app
+template_engine: jsp
+orm: objectify
+models_package: model
+controllers_package: controller
+repositories_package: repository

data/spec/spec_helper.rb

@@ -14,6 +14,11 @@ def mock_config_file
   Configuration.stub!(:config).and_return(file)
 end
 
+def mock_objectify_config_file
+  file = YAML.load_file File.join( File.dirname(__FILE__), "resources", "vraptor-scaffold-objectify.properties")
+  Configuration.stub!(:config).and_return(file)
+end
+
 def exists_and_identical?(source, created)
   c = File.open(created).read.gsub( /\r/m, "" )
   c2 = File.open(source).read.gsub( /\r/m, "" )

data/spec/vraptor-scaffold/configuration_spec.rb

@@ -81,11 +81,13 @@ describe Configuration do
       Configuration.test_class_path("models", "Product.java").should == "src/test/java/br/com/caelum/models/Product.java"
     end
   end
+
   context "hibernate" do
     before(:each) do
       config = {"template_engine" => "jsp", "package" => "br.com.caelum", "orm" => "hibernate"}
       YAML.stub!(:load_file).with(Configuration::FILENAME).and_return(config)
     end
+
     it "should know orm" do
       Configuration.orm.should == "hibernate"
     end
@@ -94,6 +96,7 @@ describe Configuration do
       Configuration.hibernate?.should be_true
     end
   end
+
   context "properties without default configs" do
     before(:each) do
       config = {}

data/spec/vraptor-scaffold/execution_spec.rb

@@ -31,6 +31,10 @@ describe VraptorScaffold::Execution do
       @execution.runner_for("plugin").should == VraptorScaffold::Runner::Plugin
     end
 
+    it "should be start application when start action" do
+      @execution.runner_for("start").should == VraptorScaffold::Runner::Start
+    end
+
     it "should be commands help when scaffold when unknown action" do
       @execution.runner_for("xpto").should == VraptorScaffold::Runner::CommandsHelp
     end
@@ -44,4 +48,4 @@ describe VraptorScaffold::Execution do
     @execution.run(['new', 'app'])
   end
   
-end
+end

data/spec/vraptor-scaffold/generators/app/app_generator_spec.rb

@@ -74,7 +74,7 @@ describe AppGenerator do
       end
 
       it "should create generic repository" do
-        source =  File.join File.dirname(__FILE__), "templates", "Repository.java"
+        source =  File.join File.dirname(__FILE__), "templates", "RepositoryJPA.java"
         destination = "#{@app}/repository/Repository.java"
         exists_and_identical?(source, destination)
       end
@@ -290,7 +290,7 @@ describe AppGenerator do
     end
 
     it "should create build.xml" do
-      source = File.join AppGenerator.source_root, "build.xml"
+      source = File.join File.dirname(__FILE__), "templates", "build.xml"
       destination = "#{@project_path}/build.xml"
       exists_and_identical?(source, destination)
     end
@@ -441,6 +441,11 @@ describe AppGenerator do
       Kernel.should_receive(:exit)
       AppGenerator.new(@project_path, ["-j=1.x"])
     end
+
+    it "should be invalid when gae and heroku are selected" do
+      Kernel.should_receive(:exit)
+      AppGenerator.new(@project_path, ["-g", "-h"])
+    end
   end
 
   context "heroku app" do
@@ -468,4 +473,74 @@ describe AppGenerator do
     end
   end
 
+  context "gae app" do
+    before(:all) do
+      @project_path = "gae"
+      AppGenerator.new(@project_path, ["--gae"]).invoke_all
+      @main_java = "#{@project_path}/#{Configuration::MAIN_SRC}"
+      @app = "#{@main_java}/app"
+    end
+
+    after(:all) do
+      FileUtils.remove_dir(@project_path)
+    end
+
+    it "should create ivy.xml" do
+      source = File.join File.dirname(__FILE__), "templates", "ivy-gae.xml"
+      destination = "#{@project_path}/ivy.xml"
+      exists_and_identical?(source, destination)
+    end
+
+    it "should create ivysettings.xml" do
+      File.exist?("#{@project_path}/ivysettings.xml").should be_true
+    end
+
+    it "should not create generic entity" do
+      File.exist?("#{@app}/model/Entity.java").should be_false
+    end
+
+    it "should create appengine-web xml to run gae apps" do
+      File.exist?("#{@project_path}/#{Configuration::WEB_INF}/appengine-web.xml").should be_true
+    end
+
+    it "should create logging properties for gae apps" do
+      File.exist?("#{@project_path}/#{Configuration::WEB_INF}/logging.properties").should be_true
+    end
+
+    it "should create web.xml" do
+      source = File.join File.dirname(__FILE__), "templates", "gae-jsp-web.xml"
+      destination = "#{@project_path}/#{Configuration::WEB_INF}/web.xml"
+      exists_and_identical?(source, destination)
+    end
+
+    it "should generate a objectify repository" do
+      source = File.join File.dirname(__FILE__), "templates", "RepositoryObjectify.java"
+      destination = "#{@project_path}/#{Configuration::MAIN_SRC}/app/repositories/Repository.java"
+      exists_and_identical?(source, destination)
+    end
+
+    it "should generate a objectify resource factory" do
+      source = File.join File.dirname(__FILE__), "templates", "ObjectifyFactory.java"
+      destination = "#{@project_path}/#{Configuration::MAIN_SRC}/app/infra/ObjectifyFactory.java"
+      exists_and_identical?(source, destination)
+    end
+
+    it "should create a specific .classpath for gae" do
+      source = File.join File.dirname(__FILE__), "templates", "classpath-gae"
+      destination = "#{@project_path}/.classpath"
+      exists_and_identical?(source, destination)
+    end
+
+    it "should create a specific .project for gae" do
+      source = File.join File.dirname(__FILE__), "templates", "project-gae"
+      destination = "#{@project_path}/.project"
+      exists_and_identical?(source, destination)
+    end
+
+    it "should create .settings" do
+      settings = File.join @project_path, ".settings"
+      File.exist?(settings).should be_true
+    end
+  end
+
 end

data/spec/vraptor-scaffold/generators/app/dependency_manager_spec.rb

@@ -1,19 +1,34 @@
 require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper")
 
 describe DependencyManager do
-  
+
   before(:each) do
     others_dependency = mock(Dependency)
     others_dependency.stub!(:exclusions).and_return([])
     Dependency.stub!(:new).and_return(others_dependency)
     @dependency = mock(Dependency)
   end
-  
+
   context "compile scope" do
     it "should include freemarker dependency when template is freemarker" do
       options = {:template_engine => "ftl"}
       Dependency.stub!(:new).with("org.freemarker", "freemarker", "2.3.18").and_return(@dependency)
       DependencyManager.new(options).compile_scope.include?(@dependency).should be_true
     end
+
+    context "dependencies for a gae app" do
+      it "should include gae dependencies when gae project option is selected" do
+        options = {:gae => true}
+        Dependency.stub!(:new).with("com.googlecode.objectify", "objectify", "3.1").and_return(@dependency)
+        DependencyManager.new(options).compile_scope.include?(@dependency).should be_true
+      end
+
+      it "should not have hibernate persistence dependencies when gae project option is selected" do
+        options = {:gae => true}
+        Dependency.stub!(:new).with("org.hibernate", "hibernate-entitymanager", "3.6.7.Final").and_return(@dependency)
+        DependencyManager.new(options).compile_scope.include?(@dependency).should be_false
+      end
+    end
   end
-end
+
+end

data/spec/vraptor-scaffold/generators/app/templates/ObjectifyFactory.java

@@ -0,0 +1,30 @@
+package app.infra;
+
+import javax.annotation.PostConstruct;
+
+import br.com.caelum.vraptor.ioc.Component;
+import br.com.caelum.vraptor.ioc.ComponentFactory;
+import br.com.caelum.vraptor.ioc.RequestScoped;
+
+import com.googlecode.objectify.Objectify;
+import com.googlecode.objectify.ObjectifyService;
+
+@Component
+@RequestScoped
+public class ObjectifyFactory implements ComponentFactory<Objectify> {
+
+	private Objectify session;
+	
+	static {
+	}
+
+	@PostConstruct
+	public void abreSession() {
+		session = ObjectifyService.begin();
+	}
+	
+	@Override
+	public Objectify getInstance() {
+		return session;
+	}
+}

data/spec/vraptor-scaffold/generators/app/templates/RepositoryObjectify.java

@@ -0,0 +1,41 @@
+package app.repositories;
+
+import java.lang.reflect.ParameterizedType;
+import java.util.List;
+
+import com.googlecode.objectify.Objectify;
+
+class Repository<T> {
+	
+	protected final Objectify objectify;
+	
+	public Repository(Objectify objectify) {
+		this.objectify = objectify;
+	}
+	
+	public void create(T entity) {
+		objectify.put(entity);
+	}
+	
+	public void update(T entity) {
+		objectify.put(entity);
+	}
+	
+	public void destroy(T entity) {
+		objectify.delete(entity);
+	}
+	
+	public T find(Long id) {
+		return objectify.get(getParameterizedClass(), id);
+	}
+	
+	public List<T> findAll() {
+		return objectify.query(getParameterizedClass()).list();
+	}
+	
+	@SuppressWarnings("unchecked")
+	private Class<T> getParameterizedClass() {
+		ParameterizedType parameterizedType = (ParameterizedType) getClass().getGenericSuperclass();
+		return (Class<T>) parameterizedType.getActualTypeArguments()[0];
+	}
+}