vraptor-scaffold 0.0.1.rc → 0.0.1

data/spec/lib/generators/scaffold_generator/base_scaffold_spec.rb

@@ -2,31 +2,35 @@ require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper")
 
 describe BaseScaffold do
 
-	before(:each) do
-   		@base = BaseScaffold.new("client")
- 	end	
-	  
-	it "should know model class name" do
-		@base.class_name.should eql("Client")
-	end
-	
-	it "should know model test class name" do
-		@base.test_class_name.should eql("ClientTest")
-	end
-	
-	it "should know repository class name" do
-		@base.repository_class_name.should eql("ClientRepository")
-	end
-	
-	it "should know repository test class name" do
-		@base.repository_test_class_name.should eql("ClientRepositoryTest")
-	end
-	
-	it "should know controller class name" do
-		@base.controller_class_name.should eql("ClientController")
-	end
-	
-	it "should know controller test class name" do
-		@base.controller_test_class_name.should eql("ClientControllerTest")
-	end
+  before(:each) do
+    @base = BaseScaffold.new("client")
+  end	
+
+  it "should know model class name" do
+    @base.class_name.should eql("Client")
+  end
+
+  it "should know model test class name" do
+    @base.test_class_name.should eql("ClientTest")
+  end
+
+  it "should know repository class name impl" do
+    @base.repository_impl_name.should eql("ClientRepositoryImpl")
+  end
+
+  it "should know repository interface name" do
+    @base.repository_interface_name.should eql("ClientRepository")
+  end
+
+  it "should know repository test class name" do
+    @base.repository_test_class_name.should eql("ClientRepositoryImplTest")
+  end
+
+  it "should know controller class name" do
+    @base.controller_class_name.should eql("ClientController")
+  end
+
+  it "should know controller test class name" do
+    @base.controller_test_class_name.should eql("ClientControllerTest")
+  end
 end

data/spec/lib/generators/scaffold_generator/controller_generator/controller_generator_spec.rb

@@ -1,24 +1,26 @@
 require File.expand_path(File.dirname(__FILE__) + "/../../../../spec_helper")
 
 describe ControllerGenerator do
-  
+
   before(:each) do
+    mock_config_file
     @generator = ControllerGenerator.new("product", build_attributes)
     @generator.build
   end
-  
+
   after(:each) do
     FileUtils.remove_dir("src") 
   end
-  
+
   it "should create controller" do
-    from = File.expand_path(File.dirname(__FILE__) + "/templates/ProductController.java")
-    to = "src/main/java/app/controllers/ProductController.java"
-    FileUtils.compare_file(from, to).should be_true
+    source = File.join File.dirname(__FILE__), "templates", "ProductController.java"
+    destination = Configuration.main_class_path "controllers", "ProductController.java"
+    exists_and_identical?(source, destination)
   end
-  
+
   it "should create controller test" do
-    File.exist?("src/test/java/app/controllers/ProductControllerTest.java").should be_true 
+    test_class = Configuration.test_class_path "controllers", "ProductControllerTest.java"
+    File.exist?(test_class).should be_true 
   end
-  
+
 end	

data/spec/lib/generators/scaffold_generator/controller_generator/templates/ProductController.java

@@ -63,13 +63,13 @@ public class ProductController {
 	}
 
 	@Get
-	@Path("/products/{product.id}/show")
+	@Path("/products/{product.id}")
 	public Product show(Product product) {
 		return repository.find(product.getId());
 	}
 
 	@Delete
-	@Path("/products")
+	@Path("/products/{product.id}")
 	public void destroy(Product product) {
 		repository.destroy(repository.find(product.getId()));
 		result.redirectTo(this).index();  

data/spec/lib/generators/scaffold_generator/freemarker_generator/freemarker_generator_spec.rb

@@ -1,34 +1,36 @@
 require File.expand_path(File.dirname(__FILE__) + "/../../../../spec_helper")
 
 describe FreemarkerGenerator do
-  
+
   before(:each) do
-    @generator = FreemarkerGenerator.new("product", build_attributes)
+    model = "product"
+    @views_path = File.join Configuration::WEB_INF, "views", model
+    @generator = FreemarkerGenerator.new(model, build_attributes)
     @generator.build
   end
-  
+
   after(:each) do
     FileUtils.remove_dir("src") 
   end
-  
+
   it "should create index view" do
-    File.exist?("src/main/webapp/WEB-INF/views/product/index.ftl").should be_true 
+    File.exist?("#{@views_path}/index.ftl").should be_true 
   end
-  
+
   it "should create show view" do
-    File.exist?("src/main/webapp/WEB-INF/views/product/show.ftl").should be_true 
+    File.exist?("#{@views_path}/show.ftl").should be_true 
   end
-  
+
   it "should create form view" do
-    File.exist?("src/main/webapp/WEB-INF/views/product/form.ftl").should be_true 
+    File.exist?("#{@views_path}/form.ftl").should be_true 
   end
-  
+
   it "should create new view" do
-    File.exist?("src/main/webapp/WEB-INF/views/product/newProduct.ftl").should be_true 
+    File.exist?("#{@views_path}/newProduct.ftl").should be_true 
   end
-  
+
   it "should create edit view" do
-    File.exist?("src/main/webapp/WEB-INF/views/product/edit.ftl").should be_true 
+    File.exist?("#{@views_path}/edit.ftl").should be_true 
   end
-  
+
 end	

data/spec/lib/generators/scaffold_generator/jsp_generator/jsp_generator_spec.rb

@@ -0,0 +1,34 @@
+require File.expand_path(File.dirname(__FILE__) + "/../../../../spec_helper")
+
+describe JspGenerator do
+  before(:each) do
+    model = "product"
+    @views_path = File.join Configuration::WEB_INF, "jsp", model
+    @generator = JspGenerator.new(model, build_attributes)
+    @generator.build
+  end
+
+  after(:each) do
+    FileUtils.remove_dir("src") 
+  end
+
+  it "should create index view" do
+    File.exist?("#{@views_path}/index.jsp").should be_true 
+  end
+
+  it "should create show view" do
+    File.exist?("#{@views_path}/show.jsp").should be_true 
+  end
+
+  it "should create form view" do
+    File.exist?("#{@views_path}/form.jsp").should be_true 
+  end
+
+  it "should create new view" do
+    File.exist?("#{@views_path}/newProduct.jsp").should be_true 
+  end
+
+  it "should create edit view" do
+    File.exist?("#{@views_path}/edit.jsp").should be_true 
+  end
+end	

data/spec/lib/generators/scaffold_generator/model_generator/model_generator_spec.rb

@@ -1,23 +1,25 @@
 require File.expand_path(File.dirname(__FILE__) + "/../../../../spec_helper")
 
 describe ModelGenerator do
-  
+
   before(:each) do
+    mock_config_file
     @generator = ModelGenerator.new("product", build_attributes)
     @generator.build
   end
-  
+
   after(:each) do
     FileUtils.remove_dir("src") 
   end
-  
+
   it "should create model" do
-    from = File.expand_path(File.dirname(__FILE__) + "/templates/Product.java")
-    to = "src/main/java/app/models/Product.java"
-    FileUtils.compare_file(from, to).should be_true
+    source = File.join File.dirname(__FILE__), "templates", "Product.java"
+    destination = Configuration.main_class_path "models", "Product.java"
+    exists_and_identical?(source, destination)
   end
-  
-   it "should create model test" do
-    File.exist?("src/test/java/app/models/ProductTest.java").should be_true 
+
+  it "should create model test" do
+    test_class = Configuration.test_class_path "models", "ProductTest.java"
+    File.exist?(test_class).should be_true 
   end
 end	

data/spec/lib/generators/scaffold_generator/repository_generator/repository_generator_spec.rb

@@ -1,23 +1,31 @@
 require File.expand_path(File.dirname(__FILE__) + "/../../../../spec_helper")
 
 describe RepositoryGenerator do
-  
+
   before(:each) do
+    mock_config_file
     @generator = RepositoryGenerator.new("product", build_attributes)
     @generator.build
   end
-  
+
   after(:each) do
     FileUtils.remove_dir("src") 
   end
   
-  it "should create repository" do
-    from = File.expand_path(File.dirname(__FILE__) + "/templates/ProductRepository.java")
-    to = "src/main/java/app/repositories/ProductRepository.java"
-    FileUtils.compare_file(from, to).should be_true
+  it "should create repository interface" do
+    source = File.join File.dirname(__FILE__), "templates", "ProductRepository.java"
+    destination = Configuration.main_class_path "repositories", "ProductRepository.java"
+    exists_and_identical?(source, destination)
   end
-  
-   it "should create repository" do
-    File.exist?("src/test/java/app/repositories/ProductRepositoryTest.java").should be_true
+
+  it "should create repository impl" do
+    source = File.join File.dirname(__FILE__), "templates", "ProductRepositoryImpl.java"
+    destination = Configuration.main_class_path "repositories", "ProductRepositoryImpl.java"
+    exists_and_identical?(source, destination)
+  end
+
+  it "should create repository test" do
+    test_class = Configuration.test_class_path "repositories", "ProductRepositoryImplTest.java" 
+    File.exist?(test_class).should be_true
   end
 end	

data/spec/lib/generators/scaffold_generator/repository_generator/templates/ProductRepository.java

@@ -1,14 +1,22 @@
 package app.repositories;
 
-import javax.persistence.EntityManager;
+import java.util.List;
 
-import br.com.caelum.vraptor.ioc.Component;
 import app.models.Product;
 
-@Component
-public class ProductRepository extends Repository<Product> {
+public interface ProductRepository {
+	/*
+	 * Delete the methods you don't want to expose
+	 */
+	 
+	void create(Product entity);
+	
+	void update(Product entity);
+	
+	void destroy(Product entity);
+	
+	Product find(Long id);
+	
+	List<Product> findAll();
 
-	public ProductRepository(EntityManager entityManager) {
-		super(entityManager);
-	}
 }

data/spec/lib/generators/scaffold_generator/repository_generator/templates/ProductRepositoryImpl.java

@@ -0,0 +1,16 @@
+package app.repositories;
+
+import javax.persistence.EntityManager;
+
+import br.com.caelum.vraptor.ioc.Component;
+import app.models.Product;
+
+@Component
+public class ProductRepositoryImpl 
+    extends Repository<Product, Long>
+    implements ProductRepository {
+
+	public ProductRepositoryImpl(EntityManager entityManager) {
+		super(entityManager);
+	}
+}

data/spec/lib/generators/scaffold_generator/scaffold_generator_spec.rb

@@ -1,68 +1,66 @@
 require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper")
 
 describe ScaffoldGenerator do
-  
+
   before(:each) do
-    @args = ["product", "name:String", "value:double"]
+    @model = "product"
+    args = [@model, {"name" => "string", "value" => "double"}]
+    @generator = ScaffoldGenerator.new(args)
+    @attributes = @generator.generated_attributes
   end
-  
-  context "invalid scaffold command" do
-    it "outside project root" do
-      File.stub!(:exist?).with("pom.xml").and_return(false)
-      Kernel.should_receive(:exit)
-      ScaffoldGenerator.new(@args)
+
+  context "generated attributes" do
+    it "should generate name attribute" do
+      att = @attributes.first
+      att.name.should == "name"
+      att.type.should == "string"
     end
-    
-    it "invalid attribute type" do
-      File.stub!(:exist?).and_return(true)
-      args = ["product", "name:string", "value:char"] 
-      Kernel.should_receive(:exit)
-      ScaffoldGenerator.new(args)
+
+    it "should generate value attribute" do
+      att = @attributes.last
+      att.name.should == "value"
+      att.type.should == "double"
     end
   end
-  
-  context "valid scaffold command" do
-    
-    before(:each) do
-      File.stub!(:exist?).and_return(true)
-      @generator = ScaffoldGenerator.new(@args)
-    
-      @model_generator = mock(ModelGenerator)
-      ModelGenerator.stub!(:new).with(@generator.model, @generator.attributes).and_return(@model_generator)
-      
-      @repository_generator = mock(RepositoryGenerator)
-      RepositoryGenerator.stub!(:new).with(@generator.model, @generator.attributes).and_return(@repository_generator)
-      
-      @controller_generator = mock(ControllerGenerator)
-      ControllerGenerator.stub!(:new).with(@generator.model, @generator.attributes).and_return(@controller_generator)
-      
-      @freemarker_generator = mock(FreemarkerGenerator)
-      FreemarkerGenerator.stub!(:new).with(@generator.model, @generator.attributes).and_return(@freemarker_generator)
-    
-      @model_generator.stub!(:build)
-      @repository_generator.stub!(:build)
-      @controller_generator.stub!(:build)
-      @freemarker_generator.stub!(:build)
+
+  it "should call model generator" do
+    @model_generator = mock(ModelGenerator)
+    ModelGenerator.stub!(:new).with(@model, @attributes).and_return(@model_generator)
+    @model_generator.should_receive(:build)
+    @generator.model_generator
   end
-    
-    it "should call model generator" do
-      @model_generator.should_receive(:build)
-      @generator.build
-    end
-    
-    it "should call controller generator" do
-      @controller_generator.should_receive(:build)
-      @generator.build
-    end
-    
-   it "should call freemarker generator" do
-      @freemarker_generator.should_receive(:build)
-      @generator.build
-    end
-    
-    it "should call repository generator" do
-      @repository_generator.should_receive(:build)
-      @generator.build
-    end
+
+  it "should call controller generator" do
+    @controller_generator = mock(ControllerGenerator)
+    ControllerGenerator.stub!(:new).with(@model, @attributes).and_return(@controller_generator)
+    @controller_generator.should_receive(:build)
+    @generator.controller_generator
+  end
+
+  it "should call freemarker generator" do
+    Configuration.stub!(:template_engine).and_return("ftl")
+    @freemarker_generator = mock(FreemarkerGenerator)
+    FreemarkerGenerator.stub!(:new).with(@model, @attributes).and_return(@freemarker_generator)
+    @freemarker_generator.should_receive(:build)
+    @generator.template_engine_generator
+  end
+
+  it "should call jsp generator" do
+    Configuration.stub!(:template_engine).and_return("jsp")
+    @jsp_generator = mock(JspGenerator)
+    JspGenerator.stub!(:new).with(@model, @attributes).and_return(@jsp_generator)
+    @jsp_generator.should_receive(:build)
+    @generator.template_engine_generator
+  end
+
+  it "should call repository generator" do
+    @repository_generator = mock(RepositoryGenerator)
+    RepositoryGenerator.stub!(:new).with(@model, @attributes).and_return(@repository_generator)
+    @repository_generator.should_receive(:build)
+    @generator.repository_generator
+  end
+
+  it "should configure banner" do
+    ScaffoldGenerator.banner.should == "vraptor scaffold MODEL [field:type field:type]"
   end
 end