vraptor-scaffold 1.3.0.rc → 1.3.0

data/spec/vraptor-scaffold/generators/scaffold/base_scaffold_spec.rb

@@ -70,4 +70,10 @@ describe BaseScaffold do
       BaseScaffold.new("OrderItem").base_path.should eql("orderItems")
     end
   end
-end
+
+  it "should not allow duplicate import" do
+    @base = BaseScaffold.new("person", [Attribute.new("born", "date"), Attribute.new("death", "date")])
+    @base.imports.one?.should be_true
+  end
+
+end

data/spec/vraptor-scaffold/generators/scaffold/controller_generator/templates/ProductController.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import app.model.Product;
 import app.repository.ProductRepository;
+import app.repositories.CategoryRepository;		
 import br.com.caelum.vraptor.Delete;
 import br.com.caelum.vraptor.Get;
 import br.com.caelum.vraptor.Post;
@@ -17,11 +18,15 @@ public class ProductController {
 
 	private final Result result;
 	private final ProductRepository repository;
+	private final CategoryRepository categoryRepository;		
+	
 	private final Validator validator;
 	
-	ProductController(Result result, ProductRepository repository, Validator validator) {
+	public ProductController(Result result, ProductRepository repository, 
+	CategoryRepository categoryRepository,	Validator validator) {
 		this.result = result;
 		this.repository = repository;
+		this.categoryRepository = categoryRepository;	
 		this.validator = validator;
 	}
 	
@@ -40,6 +45,7 @@ public class ProductController {
 	
 	@Get("/products/new")
 	public Product newProduct() {
+		result.include("categoryList", categoryRepository.findAll());		
 		return new Product();
 	}
 	
@@ -53,6 +59,8 @@ public class ProductController {
 	
 	@Get("/products/{product.id}/edit")
 	public Product edit(Product product) {
+		result.include("categoryList", categoryRepository.findAll());		
+		
 		return repository.find(product.getId());
 	}
 

data/spec/vraptor-scaffold/generators/scaffold/freemarker_generator/templates/form.ftl

@@ -13,12 +13,27 @@
 
   <div class="field">
     Name:<br />
+	
     <@html.text "product.name" product.name/>
   </div>
   <div class="field">
     My flag:<br />
+	
     <@html.checkbox "product.myFlag" product.myFlag/>
   </div>
+  <div class="field">
+    Price:<br />
+	
+    <@html.text "product.price" product.price/>
+  </div>
+  <div class="field">
+    Category:<br />
+    <select name="product.category.id">
+	  	<#list categoryList as category>
+				<option value="${category.id}" <#if product.category?? && product.category.id == category.id>selected="true"</#if> >${category.id}</option>
+	  	</#list>
+    </select>
+  </div>
   <div class="actions">
     <button type="submit">send</button>
   </div>

data/spec/vraptor-scaffold/generators/scaffold/import_manager_spec.rb

@@ -0,0 +1,9 @@
+require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper")
+
+describe ImportManager do
+
+  it "should import package when type is Date" do
+    ImportManager.new("date").package.include?("java.util.Date").should be_true
+  end
+
+end

data/spec/vraptor-scaffold/generators/scaffold/jsp_generator/templates/form.jsp

@@ -13,15 +13,35 @@
 
 	<div class="field">
 		Name:<br />
+	
 		<input type="text" name="product.name" value="${product.name}"/>
 	</div>
+	
 	<div class="field">
 		My flag:<br />
+	
 		<input type="text" name="product.myFlag" value="${product.myFlag}"/>
 	</div>
-
-<div class="actions">
-	<button type="submit">send</button>
+	
+	<div class="field">
+		Price:<br />
+	
+		<input type="text" name="product.price" value="${product.price}"/>
+	</div>
+	
+	<div class="field">
+		Category:<br />
+		<select name="product.category.id">
+		  <c:forEach var="category" items="${categoryList}">
+		    <option value="${category.id}" <c:if test = "${product.category.id == category.id}">selected="true"</c:if>>
+		      ${category.id}
+			</option>
+		  </c:forEach>
+		</select>
+	</div>
+	
+  <div class="actions">
+	  <button type="submit">send</button>
 	</div>
 </form>
 

data/spec/vraptor-scaffold/generators/scaffold/model_generator/model_generator_spec.rb

@@ -33,7 +33,7 @@ describe ModelGenerator do
     before(:each) do
       config = {"package" => "app", "orm" => "hibernate", "models_package" => "model"}
       YAML.stub!(:load_file).with(Configuration::FILENAME).and_return(config)
-      AppGenerator.new("src", ["-o=hibernate"]).configure_orm
+      AppGenerator.new("src", ["-o=hibernate", "--skip_jquery"]).configure_orm
       FileUtils.chdir("src")
       @generator = ModelGenerator.new("product", build_attributes)
       @generator.build
@@ -43,7 +43,7 @@ describe ModelGenerator do
     after(:each) do
       FileUtils.remove_dir("src")
     end
-    
+
     it "should map entity in hibernate.cfg.xml when orm is hibernate" do
       source = File.join File.dirname(__FILE__), "templates", "hibernate.cfg.xml"
       destination = File.join "src", Configuration::MAIN_RESOURCES, "hibernate.cfg.xml"

data/spec/vraptor-scaffold/generators/scaffold/model_generator/objectify_model_generator_spec.rb

@@ -4,20 +4,20 @@ describe ObjectifyModelGenerator do
 
   context "objectify" do
     before(:all) do
-      AppGenerator.new("src", ["-o=objectify", "--gae"]).invoke_all
-      FileUtils.chdir("src")
+      GaeAppGenerator.new("gae-project", ["-o=objectify", "--skip_jquery"]).invoke_all
+      FileUtils.chdir("gae-project")
       @generator = ObjectifyModelGenerator.new("product", build_attributes)
       @generator.build
       FileUtils.chdir("..")
-      @project_path = "src"
+      @project_path = "gae-project"
     end
 
-    before(:each) do 
+    before(:each) do
       mock_objectify_config_file
     end
 
     after(:all) do
-      FileUtils.remove_dir "src"
+      FileUtils.remove_dir "gae-project"
     end
 
     it "should create model" do
@@ -33,7 +33,7 @@ describe ObjectifyModelGenerator do
 
     it "should map model in objetify factory" do
       source = File.join File.dirname(__FILE__), "templates", "ObjectifyFactory.java"
-      destination = File.join "src", Configuration::MAIN_SRC, "app", "infra", "ObjectifyFactory.java"
+      destination = File.join "gae-project", Configuration::MAIN_SRC, "app", "infra", "ObjectifyFactory.java"
       exists_and_identical?(source, destination)
     end
   end

data/spec/vraptor-scaffold/generators/scaffold/model_generator/templates/Objectify_Product.java

@@ -10,7 +10,9 @@ public class Product {
 	private Long id;
 	private String name;
 	private boolean myFlag;
-	
+	private Double price;
+	private Category category;
+
 	public void setId(Long id) {
 		this.id = id;
 	}
@@ -22,17 +24,33 @@ public class Product {
 	public void setName(String name) {
 		this.name = name;
 	}
-	
+
 	public String getName() {
 		return name;
 	}
-	
+
 	public void setMyFlag(boolean myFlag) {
 		this.myFlag = myFlag;
 	}
-	
+
 	public boolean isMyFlag() {
 		return myFlag;
 	}
-	
+
+	public void setPrice(Double price) {
+		this.price = price;
+	}
+
+	public Double getPrice() {
+		return price;
+	}
+
+	public void setCategory(Category category) {
+		this.category = category;
+	}
+
+	public Category getCategory() {
+		return category;
+	}
+
 }

data/spec/vraptor-scaffold/generators/scaffold/model_generator/templates/Product.java

@@ -2,24 +2,42 @@ package app.model;
 
 @javax.persistence.Entity
 public class Product extends Entity {
-	
+
 	private String name;
 	private boolean myFlag;
-	
+	private Double price;
+	private Category category;
+
 	public void setName(String name) {
 		this.name = name;
 	}
-	
+
 	public String getName() {
 		return name;
 	}
-	
+
 	public void setMyFlag(boolean myFlag) {
 		this.myFlag = myFlag;
 	}
-	
+
 	public boolean isMyFlag() {
 		return myFlag;
 	}
-	
+
+	public void setPrice(Double price) {
+		this.price = price;
+	}
+
+	public Double getPrice() {
+		return price;
+	}
+
+	public void setCategory(Category category) {
+		this.category = category;
+	}
+
+	public Category getCategory() {
+		return category;
+	}
+
 }

data/spec/vraptor-scaffold/http_request_spec.rb

@@ -37,4 +37,14 @@ describe VraptorScaffold::HttpRequest do
     end
   end
 
+  context "open session" do
+    it "should open a http session" do
+      http_request = mock(Net::HTTP)
+      VraptorScaffold::HttpRequest.stub!(:http).and_return(http_request)
+      http_request.stub!(:start).and_return(http_request)
+
+      http = VraptorScaffold::HttpRequest.open_session "http://any_url/here"
+      http.should be_true
+    end
+  end
 end

data/spec/vraptor-scaffold/runner/generator_spec.rb

@@ -13,7 +13,7 @@ describe VraptorScaffold::Runner::Generator do
     @generator_runner.new.run(["--help"])
   end
 
-  context "app generator" do
+  context "default app generator" do
     before(:each) do
       @generator = mock(AppGenerator)
       project_name = "vraptor-scaffold"
@@ -28,4 +28,20 @@ describe VraptorScaffold::Runner::Generator do
       @generator_runner.new.run(@args)
     end
   end
-end
+
+  context "gae app generator" do
+    before(:each) do
+      @generator = mock(GaeAppGenerator)
+      project_name = "gae-project"
+      option = "--gae"
+      @args = [project_name, option]
+      GaeAppGenerator.stub!(:new).with(project_name, [option]).and_return(@generator)
+    end
+
+    it "should invoke all app generator tasks when typed new" do
+      @help.stub!(:help).and_return false
+      @generator.should_receive(:invoke_all)
+      @generator_runner.new.run(@args)
+    end
+  end
+end

metadata

@@ -1,82 +1,112 @@
 --- !ruby/object:Gem::Specification
 name: vraptor-scaffold
 version: !ruby/object:Gem::Version
-  version: 1.3.0.rc
-  prerelease: 6
+  version: 1.3.0
+  prerelease: 
 platform: ruby
 authors:
 - Rodolfo Liviero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-12 00:00:00.000000000Z
+date: 2012-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70109776560460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *70109776560460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.14.6
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70109776559700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70109776559700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70109776559020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *70109776559020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70109776558260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *70109776558260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &70109776557740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 4.4.0
   type: :development
   prerelease: false
-  version_requirements: *70109776557740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.4.0
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70109776557280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.5.4
   type: :development
   prerelease: false
-  version_requirements: *70109776557280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.5.4
 description: VRaptor scaffold extension to make it easier configuring new projects
   and plugins.
 email: rodolfoliviero@gmail.com
@@ -86,6 +116,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rvmrc.example
 - .travis.yml
 - CHANGELOG.rdoc
 - Gemfile
@@ -99,10 +130,15 @@ files:
 - lib/vraptor-scaffold/configuration.rb
 - lib/vraptor-scaffold/execution.rb
 - lib/vraptor-scaffold/generators/app/app_generator.rb
-- lib/vraptor-scaffold/generators/app/dependency.rb
-- lib/vraptor-scaffold/generators/app/dependency_manager.rb
+- lib/vraptor-scaffold/generators/app/dependency/default_dependencies.rb
+- lib/vraptor-scaffold/generators/app/dependency/dependency.rb
+- lib/vraptor-scaffold/generators/app/dependency/dependency_manager.rb
+- lib/vraptor-scaffold/generators/app/dependency/gae_dependencies.rb
+- lib/vraptor-scaffold/generators/app/dependency/heroku_dependencies.rb
 - lib/vraptor-scaffold/generators/app/freemarker_template_engine.rb
+- lib/vraptor-scaffold/generators/app/gae_app_generator.rb
 - lib/vraptor-scaffold/generators/app/jsp_template_engine.rb
+- lib/vraptor-scaffold/generators/app/templates/build-gae.xml
 - lib/vraptor-scaffold/generators/app/templates/build.gradle.erb
 - lib/vraptor-scaffold/generators/app/templates/build.properties.erb
 - lib/vraptor-scaffold/generators/app/templates/build.xml
@@ -111,6 +147,7 @@ files:
 - lib/vraptor-scaffold/generators/app/templates/eclipse/classpath.erb
 - lib/vraptor-scaffold/generators/app/templates/eclipse/project-gae.erb
 - lib/vraptor-scaffold/generators/app/templates/eclipse/project.erb
+- lib/vraptor-scaffold/generators/app/templates/eclipse/settings-gae/com.google.appengine.eclipse.core.prefs
 - lib/vraptor-scaffold/generators/app/templates/eclipse/settings-gae/com.google.gdt.eclipse.core.prefs
 - lib/vraptor-scaffold/generators/app/templates/eclipse/settings-gae/org.eclipse.jdt.core.prefs
 - lib/vraptor-scaffold/generators/app/templates/eclipse/settings-gae/org.eclipse.wst.common.component.tt
@@ -125,17 +162,18 @@ files:
 - lib/vraptor-scaffold/generators/app/templates/freemarker/freemarker-web.xml
 - lib/vraptor-scaffold/generators/app/templates/freemarker/infrastructure/FreemarkerPathResolver.java.tt
 - lib/vraptor-scaffold/generators/app/templates/freemarker/macros/html.ftl
-- lib/vraptor-scaffold/generators/app/templates/freemarker/main.ftl
+- lib/vraptor-scaffold/generators/app/templates/freemarker/main.ftl.erb
 - lib/vraptor-scaffold/generators/app/templates/gae/ObjectifyFactory.java.tt
 - lib/vraptor-scaffold/generators/app/templates/gae/appengine-web.xml.tt
 - lib/vraptor-scaffold/generators/app/templates/gae/ivysettings.xml
 - lib/vraptor-scaffold/generators/app/templates/gae/logging.properties
+- lib/vraptor-scaffold/generators/app/templates/gitignore-gae
 - lib/vraptor-scaffold/generators/app/templates/heroku/Main.java
 - lib/vraptor-scaffold/generators/app/templates/heroku/Procfile
 - lib/vraptor-scaffold/generators/app/templates/ivy-2.2.0.jar
 - lib/vraptor-scaffold/generators/app/templates/ivy.erb
 - lib/vraptor-scaffold/generators/app/templates/jsp/jsp-web.xml
-- lib/vraptor-scaffold/generators/app/templates/jsp/main.jsp
+- lib/vraptor-scaffold/generators/app/templates/jsp/main.jsp.erb
 - lib/vraptor-scaffold/generators/app/templates/jsp/prelude.jspf
 - lib/vraptor-scaffold/generators/app/templates/models/Entity.erb
 - lib/vraptor-scaffold/generators/app/templates/orm/Repository-hibernate.java.tt
@@ -148,6 +186,7 @@ files:
 - lib/vraptor-scaffold/generators/app/templates/resources/hibernate.properties
 - lib/vraptor-scaffold/generators/app/templates/resources/log4j.properties
 - lib/vraptor-scaffold/generators/app/templates/resources/messages.properties
+- lib/vraptor-scaffold/generators/app/templates/vraptor-scaffold-gae.erb
 - lib/vraptor-scaffold/generators/app/templates/vraptor-scaffold.erb
 - lib/vraptor-scaffold/generators/app/templates/webapp/WEB-INF/web.xml.tt
 - lib/vraptor-scaffold/generators/app/templates/webapp/images/.empty_directory
@@ -162,6 +201,7 @@ files:
 - lib/vraptor-scaffold/generators/scaffold/controller_generator/controller_generator.rb
 - lib/vraptor-scaffold/generators/scaffold/controller_generator/templates/controller.erb
 - lib/vraptor-scaffold/generators/scaffold/controller_generator/templates/controller_test.erb
+- lib/vraptor-scaffold/generators/scaffold/import_manager.rb
 - lib/vraptor-scaffold/generators/scaffold/model_generator/model_generator.rb
 - lib/vraptor-scaffold/generators/scaffold/model_generator/objectify_model_generator.rb
 - lib/vraptor-scaffold/generators/scaffold/model_generator/templates/model.erb
@@ -200,6 +240,7 @@ files:
 - lib/vraptor-scaffold/runner/start.rb
 - lib/vraptor-scaffold/version.rb
 - maven/repo/br/com/caelum/vraptor-gae/1.0/vraptor-gae-1.0.jar
+- maven/repo/br/com/caelum/vraptor3.4-compatible-gae/1.1/vraptor3.4-compatible-gae-1.1.jar
 - spec/resources/vraptor-scaffold-objectify.properties
 - spec/resources/vraptor-scaffold.properties
 - spec/simple_custom_plugin.rb
@@ -208,9 +249,12 @@ files:
 - spec/vraptor-scaffold/configuration_spec.rb
 - spec/vraptor-scaffold/execution_spec.rb
 - spec/vraptor-scaffold/generators/app/app_generator_spec.rb
-- spec/vraptor-scaffold/generators/app/dependency_manager_spec.rb
-- spec/vraptor-scaffold/generators/app/dependency_spec.rb
+- spec/vraptor-scaffold/generators/app/dependency/dependency_manager_spec.rb
+- spec/vraptor-scaffold/generators/app/dependency/dependency_spec.rb
+- spec/vraptor-scaffold/generators/app/dependency/gae_dependencies_spec.rb
+- spec/vraptor-scaffold/generators/app/dependency/heroku_dependencies_spec.rb
 - spec/vraptor-scaffold/generators/app/freemarker_template_engine_spec.rb
+- spec/vraptor-scaffold/generators/app/gae_app_generator_spec.rb
 - spec/vraptor-scaffold/generators/app/jsp_template_engine_spec.rb
 - spec/vraptor-scaffold/generators/app/templates/Entity.java
 - spec/vraptor-scaffold/generators/app/templates/FreemarkerPathResolver.java
@@ -228,9 +272,14 @@ files:
 - spec/vraptor-scaffold/generators/app/templates/ivy-gae.xml
 - spec/vraptor-scaffold/generators/app/templates/ivy.xml
 - spec/vraptor-scaffold/generators/app/templates/jsp-web.xml
+- spec/vraptor-scaffold/generators/app/templates/main-with-jquery.ftl
+- spec/vraptor-scaffold/generators/app/templates/main-with-jquery.jsp
+- spec/vraptor-scaffold/generators/app/templates/main-without-jquery.ftl
+- spec/vraptor-scaffold/generators/app/templates/main-without-jquery.jsp
 - spec/vraptor-scaffold/generators/app/templates/pom-heroku.xml
 - spec/vraptor-scaffold/generators/app/templates/pom.xml
 - spec/vraptor-scaffold/generators/app/templates/project-gae
+- spec/vraptor-scaffold/generators/app/templates/vraptor-scaffold-gae.properties
 - spec/vraptor-scaffold/generators/app/templates/vraptor-scaffold.properties
 - spec/vraptor-scaffold/generators/plugin/expected_configs/build.gradle
 - spec/vraptor-scaffold/generators/plugin/expected_configs/default_org_build.gradle
@@ -245,6 +294,7 @@ files:
 - spec/vraptor-scaffold/generators/scaffold/controller_generator/templates/ProductController.java
 - spec/vraptor-scaffold/generators/scaffold/freemarker_generator/freemarker_generator_spec.rb
 - spec/vraptor-scaffold/generators/scaffold/freemarker_generator/templates/form.ftl
+- spec/vraptor-scaffold/generators/scaffold/import_manager_spec.rb
 - spec/vraptor-scaffold/generators/scaffold/jsp_generator/jsp_generator_spec.rb
 - spec/vraptor-scaffold/generators/scaffold/jsp_generator/templates/form.jsp
 - spec/vraptor-scaffold/generators/scaffold/model_generator/model_generator_spec.rb
@@ -285,15 +335,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3171756196067631773
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: -3171756196067631773
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: VRaptor Scaffold.