vraptor-scaffold 0.0.1.beta5 → 0.0.1.rc

data/Gemfile

@@ -2,7 +2,7 @@ source :rubygems
 
 gem "thor", ">=0.14.0"
 gem "rake", ">=0.8.7"
-gem "activesupport", ">=3.0.0.beta4"
+gem "activesupport", ">=3.0.0.rc"
 
 gem "ruby-debug", :group => [:development, :test]
 

data/History.txt

@@ -1,4 +1,16 @@
-=== 0.0.1.beta4 / 2010-07-?
+=== 0.0.1.rc / 2010-08-23
+
+== New Features
+* Added Hamcrest 1.1
+* Added text support(textarea).
+
+== Improvements
+* Create forder to put images.
+
+== Bugfixes
+* Works on windows OS.
+
+=== 0.0.1.beta4 / 2010-08-04
 
 == New Features
 * Added generic repository.

data/README.rdoc

@@ -4,6 +4,12 @@ Scaffold for vraptor 3.
 == Installation
  gem install vraptor-scaffold --pre
  
+== Dependencies
+Ensures that you already have installed:
+
+- Java 6 
+- Maven 2
+ 
 == Getting Started
 At the command line client:
  
@@ -24,7 +30,7 @@ The default web server is jetty but you can import the project in your favorite
 and run your project with tomcat or jboss as for example.
 
 == Supported Java Types
-The only supported types for now are: boolean, double, float, short, integer, long and string.
+The only supported types for now are: boolean, double, float, short, integer, long, string and text.
 
 == Architecture Overview
 When you run vraptor new command will be created a java web application with:
@@ -36,6 +42,7 @@ When you run vraptor new command will be created a java web application with:
 - Maven2 = Project Management 
 - jQuery = JavaScript
 - Junit
+- Hamcrest
 - Mockito    
 
 == Description of Contents
@@ -55,9 +62,6 @@ src/main/webapp
 src/main/webapp/decorators
   Decorators will be placed here.
   
-src/main/webapp/macros
-  Freemarker macros will be placed here.
-  
 src/main/webapp/javascripts
   JavaScripts will be placed here.
   
@@ -76,17 +80,22 @@ src/test/java/app/models
 src/test/java/app/repositories
   Tests to repositories will be placed here.
 
-== Dependencies
-Ensures that you already have installed:
-
-- Java 6 
-- Maven 2
+== Where next?
+- Anothers build framework like ant, gradle and ivy. 
+- More views generators like velocity, jsp and scaml.
+- More ORM generators with openJPA and TopLink.
+- Relationship(ManyToOne, OneToMany, etc) and date(LocalDate, LocalDateTime, LocalTime) support.
+- JPA2 support.
 
 == Note on Patches/Pull Requests
-- Fork the project.
-- Make your feature addition or bug fix.
-- Add tests for it.
-- Send me a pull request.
+ 
+* Fork the project.
+* Make your feature addition or bug fix.
+* Add tests for it. This is important so I don't break it in a
+  future version unintentionally.
+* Commit, do not mess with rakefile, version, or history.
+  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+* Send me a pull request. Bonus points for topic branches.
 
 == Author
 -- Rodolfo Liviero [mailto:rodolfoliviero@gmail.com]

data/Rakefile

@@ -6,17 +6,15 @@ begin
   Jeweler::Tasks.new do |gem|
     gem.name = "vraptor-scaffold"
     gem.summary = "Scaffold for vraptor 3."
-    gem.description = ""
+    gem.description = "Scaffold for vraptor 3 with jpa, freemarker, maven, mockito, junit and jquery."
     gem.email = "rodolfoliviero@gmail.com"
     gem.homepage = "http://github.com/rodolfoliviero/vraptor-scaffold"
     gem.authors = ["Rodolfo Liviero"]
     
     gem.add_dependency "thor", ">=0.14.0"
-	gem.add_dependency "rake", ">=0.8.7"
-  	gem.add_dependency "activesupport", ">=3.0.0.beta4"
-	gem.add_dependency "bundler", ">=1.0.0.rc.2"
-	
-	gem.post_install_message = "Thank you for installing vraptor-scaffold. Please read http://github.com/rodolfoliviero/vraptor-scaffold/blob/master/README.rdoc for more information."
+    gem.add_dependency "rake", ">=0.8.7"
+    gem.add_dependency "activesupport", ">=3.0.0.rc"
+    gem.post_install_message = "Thank you for installing vraptor-scaffold. Please read http://github.com/rodolfoliviero/vraptor-scaffold/blob/master/README.rdoc for more information."
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/TODO.txt

@@ -1,8 +1,7 @@
-unit tests to generated code
+better unit tests to generated code
 datetime, date and time support.(jquery-ui?)
 relationship support(many-to-one, one-to-many, many-to-many)
 
-gem description
 generators help
 usage file to each generator
 create others persistence unit(maven profile?)
@@ -10,7 +9,6 @@ update jpa to jpa2(hibernate 3.5.?-FINAL)
 
 put all html input in macros
 i18n messages
-it works on windowns?
 hibernate joda-time support
 top leval package
 scaml support

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :minor: 0
 :patch: 1
-:build: beta5
+:build: rc
 :major: 0

data/lib/generators/app_generator/app_generator.rb

@@ -81,6 +81,7 @@ class AppGenerator < VraptorScaffold::Base
       inside webapp do
         template_from_root("index.jsp", "#{webapp}/index.jsp")
         create_decorators
+        empty_directory "images"
         create_js
         create_css
         create_macros

data/lib/generators/app_generator/templates/macros/html.ftl

@@ -1,11 +1,23 @@
 <#macro checkbox name checked=false>
 	<#if checked>
-  		<input type="checkbox" name="${name}" checked>
+  		<input id="${name}" type="checkbox" name="${name}" checked/>
 	<#else>
-  		<input type="checkbox" name="${name}">
+  		<input id="${name}" type="checkbox" name="${name}"/>
 	</#if>  
 </#macro>
 
 <#macro text name value="">
-    <input type="text" name="${name}" value="${value}">
+    <input type="text" id="${name}" name="${name}" value="${value}"/>
+</#macro>
+
+<#macro textarea name value="">
+    <textarea id="${name}" name="${name}" cols="40" rows="20">${value}</textarea>
+</#macro>
+
+<#macro css name>
+	<link rel="stylesheet" type="text/css" href="${base}/stylesheets/${name}.css" />  
+</#macro>
+
+<#macro js name>
+	<script type="text/javascript" src="${base}/javascripts/${name}.js"></script>  
 </#macro>

data/lib/generators/app_generator/templates/main.ftl

@@ -2,13 +2,13 @@
 <html>
     <head>
     	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    	<link rel="stylesheet" type="text/css" href="${base}/stylesheets/scaffold.css" />  
-      <title>${title}</title>
-      ${head}
+    	<@html.css "scaffold"/>  
+      	<title>Vraptor Scaffold</title>
+    	${head}
     </head>
 
     <body>
       ${body}
-      <script type="text/javascript" src="${base}/javascripts/jquery-1.4.2.min.js"></script>
+      <@html.js "jquery-1.4.2.min"/>
     </body>
 </html>

data/lib/generators/app_generator/templates/pom.erb

@@ -55,6 +55,12 @@
 			<version>4.8.1</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.hamcrest</groupId>
+			<artifactId>hamcrest-all</artifactId>
+			<version>1.1</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-all</artifactId>

data/lib/generators/{attribute.rb → scaffold_generator/attribute.rb}

@@ -3,25 +3,28 @@ class Attribute
   
   def initialize(name, type)
     @name = name
-    set_type(type)
-  end
-  
-  def set_type(type)
     @type = type
-    @type = @type.capitalize unless boolean?
   end
   
   def html_input
     input = "text"
     input = "checkbox" if boolean?
+    input = "textarea" if type.eql?("text")
     input
   end
   
-  def boolean?
-    type.eql? "boolean"
+  def java_type
+    java = type.capitalize
+    java = "boolean" if boolean?
+    java = "String" if type.eql?("text")
+    java
   end
   
   def self.valid_types
-    %w(boolean double float short integer long string)
+    %w(boolean double float short integer long string text)
+  end
+  
+  def boolean?
+    type.eql? "boolean"
   end
 end

data/lib/generators/scaffold_generator/base_scaffold.rb

@@ -1,6 +1,6 @@
 class BaseScaffold < VraptorScaffold::Base
   
-  def initialize(model, attributes)
+  def initialize(model, attributes={})
     super
     @model = model
     @attributes = attributes
@@ -9,4 +9,24 @@ class BaseScaffold < VraptorScaffold::Base
   def class_name
     @model.capitalize
   end
+  
+  def test_class_name
+    "#{class_name}Test"
+  end
+  
+  def repository_class_name
+   	"#{class_name}Repository"
+  end
+  
+  def repository_test_class_name
+   	"#{repository_class_name}Test"
+  end
+  
+  def controller_class_name
+    "#{class_name}Controller"
+  end
+  
+  def controller_test_class_name
+    "#{controller_class_name}Test"
+  end
 end

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

@@ -6,11 +6,7 @@ class ControllerGenerator < BaseScaffold
   
   def build
     template("templates/controller.erb", "src/main/java/app/controllers/#{controller_class_name}.java")
-    template("templates/controller_test.erb", "src/test/java/app/controllers/#{controller_class_name}Test.java")
-  end
-  
-  def controller_class_name
-    "#{class_name}Controller"
+    template("templates/controller_test.erb", "src/test/java/app/controllers/#{controller_test_class_name}.java")
   end
   
   def path

data/lib/generators/scaffold_generator/controller_generator/templates/controller.erb

@@ -3,7 +3,7 @@ package app.controllers;
 import java.util.List;
 
 import app.models.<%= class_name %>;
-import app.repositories.<%= class_name %>Repository;
+import app.repositories.<%= repository_class_name %>;
 import br.com.caelum.vraptor.Delete;
 import br.com.caelum.vraptor.Get;
 import br.com.caelum.vraptor.Path;
@@ -17,10 +17,10 @@ import br.com.caelum.vraptor.Validator;
 public class <%= controller_class_name %> {
 
 	private final Result result;
-	private final <%= class_name %>Repository repository;
+	private final <%= repository_class_name %> repository;
 	private final Validator validator;
 	
-	public <%= controller_class_name %>(Result result, <%= class_name %>Repository repository, Validator validator) {
+	public <%= controller_class_name %>(Result result, <%= repository_class_name %> repository, Validator validator) {
 		this.result = result;
 		this.repository = repository;
 		this.validator = validator;

data/lib/generators/scaffold_generator/controller_generator/templates/controller_test.erb

@@ -4,7 +4,7 @@ import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 
-public class <%= controller_class_name %>Test {
+public class <%= controller_test_class_name %> {
 
 	@Test public void fakeTest() {
 		assertNotNull("put something real.", new <%= controller_class_name %>(null, null, null));

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

@@ -6,6 +6,6 @@ class ModelGenerator < BaseScaffold
   
   def build
     template("templates/model.erb", "src/main/java/app/models/#{class_name}.java")
-    template("templates/model_test.erb", "src/test/java/app/models/#{class_name}Test.java")
+    template("templates/model_test.erb", "src/test/java/app/models/#{test_class_name}.java")
   end
 end

data/lib/generators/scaffold_generator/model_generator/templates/model.erb

@@ -4,15 +4,15 @@ package app.models;
 public class <%= class_name %> extends Entity {
 	
 <% @attributes.each do |att| -%>
-	private <%= att.type %> <%= att.name %>;
+	private <%= att.java_type %> <%= att.name %>;
 <% end -%>
 	
 <% @attributes.each do |att| -%>
-	public void set<%= att.name.capitalize %>(<%= att.type %> <%= att.name %>) {
+	public void set<%= att.name.capitalize %>(<%= att.java_type %> <%= att.name %>) {
 		this.<%= att.name %> = <%= att.name %>;
 	}
 	
-	public <%= att.type %> get<%= att.name.capitalize %>() {
+	public <%= att.java_type %> get<%= att.name.capitalize %>() {
 		return <%= att.name %>;
 	}
 	

data/lib/generators/scaffold_generator/model_generator/templates/model_test.erb

@@ -4,7 +4,7 @@ import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 
-public class <%= class_name %>Test {
+public class <%= test_class_name %> {
 
     @Test public void fakeTest() {
   		assertNotNull("put something real.", new <%= class_name %>());

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

@@ -5,11 +5,7 @@ class RepositoryGenerator < BaseScaffold
   end
   
   def build
-    template("templates/repository.erb", "src/main/java/app/repositories/#{class_name}Repository.java")
-    template("templates/repository_test.erb", "src/test/java/app/repositories/#{repository_class_name}Test.java")
-  end
-  
-  def repository_class_name
-    "#{class_name}Repository"
+    template("templates/repository.erb", "src/main/java/app/repositories/#{repository_class_name}.java")
+    template("templates/repository_test.erb", "src/test/java/app/repositories/#{repository_test_class_name}.java")
   end
 end

data/lib/generators/scaffold_generator/repository_generator/templates/repository_test.erb

@@ -4,7 +4,7 @@ import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 
-public class <%= repository_class_name %>Test {
+public class <%= repository_test_class_name %> {
 
     @Test public void fakeTest() {
   		assertNotNull("put something real.", new <%= repository_class_name %>(null));

data/lib/generators/scaffold_generator/scaffold_generator.rb

@@ -21,17 +21,17 @@ class ScaffoldGenerator
         puts "To run scaffold please go to the project root folder."
         Kernel::exit
       end
-      validate_parse_attributes(args)
+      validate_attributes(args)
     end
   
-    def validate_parse_attributes(args)
+    def validate_attributes(args)
       args.each do |arg|
         parsedAttribute = arg.split(":")
-        validate_parse_attribute(parsedAttribute)
+        parse_attribute(parsedAttribute)
       end
     end
     
-    def validate_parse_attribute(parsedAttribute) 
+    def parse_attribute(parsedAttribute) 
       type = parsedAttribute.last.downcase 
       unless Attribute.valid_types.include?(type)
         puts "Attribute #{type} is not supported. The supported attributes types are: #{Attribute.valid_types.join(" ")}"

data/lib/load_paths.rb

@@ -1,12 +1,11 @@
 require 'rubygems'
-require "bundler/setup"
 
 require 'thor/actions'
 require 'thor/group'
 require 'active_support/inflector'
 
-require File.dirname(__FILE__) + '/../lib/generators/attribute'
 require File.dirname(__FILE__) + '/../lib/generators/base'
+require File.dirname(__FILE__) + '/../lib/generators/scaffold_generator/attribute'
 require File.dirname(__FILE__) + '/../lib/generators/scaffold_generator/scaffold_generator'
 require File.dirname(__FILE__) + '/../lib/generators/scaffold_generator/base_scaffold'
 require File.dirname(__FILE__) + '/../lib/generators/scaffold_generator/model_generator/model_generator'

data/lib/vraptor-scaffold.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/load_paths'
 module VraptorScaffold
   class Main
 	def self.execute(args)
-		  action = args.shift
+		 action = args.shift
 	    AppGenerator.new.build(args[0]) if action == "new"
 	    ScaffoldGenerator.new(args).build if action == "scaffold"
 	    exec("mvn compile war:inplace jetty:run") if action == "start"

data/spec/lib/generators/app_generator/app_generator_spec.rb

@@ -163,6 +163,10 @@ describe AppGenerator do
         to = "#{@webapp}/javascripts/jquery-1.4.2.min.js"
         FileUtils.compare_file(from, to).should be_true
       end
+      
+      it "should create images folder" do
+         File.exist?("#{@webapp}/images").should be_true 
+      end
     end
     context "creating test" do
       before(:all) do

data/spec/lib/generators/app_generator/templates/pom.xml

@@ -55,6 +55,12 @@
 			<version>4.8.1</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.hamcrest</groupId>
+			<artifactId>hamcrest-all</artifactId>
+			<version>1.1</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-all</artifactId>

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

@@ -0,0 +1,114 @@
+require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper")
+
+describe Attribute do
+  
+  context "supported types" do
+    it "should support boolean" do
+      Attribute.valid_types.include?("boolean").should be_true
+    end
+    
+    it "should support double" do
+      Attribute.valid_types.include?("double").should be_true
+    end
+    
+    it "should support string" do
+      Attribute.valid_types.include?("string").should be_true
+    end
+    
+    it "should support float" do
+      Attribute.valid_types.include?("float").should be_true
+    end
+    
+    it "should support short" do
+      Attribute.valid_types.include?("short").should be_true
+    end
+    
+    it "should support integer" do
+      Attribute.valid_types.include?("integer").should be_true
+    end
+    
+    it "should support long" do
+      Attribute.valid_types.include?("long").should be_true
+    end
+    
+    it "should support text" do
+      Attribute.valid_types.include?("text").should be_true
+    end
+  end
+  
+  context "html_input" do
+    it "should know html input to boolean" do
+      Attribute.new("flag", "boolean").html_input.should eql("checkbox")
+    end
+    
+    it "should know html input to string" do
+      Attribute.new("name", "string").html_input.should eql("text")
+    end
+    
+    it "should know html input to double" do
+      Attribute.new("name", "double").html_input.should eql("text")
+    end
+    
+    it "should know html input to float" do
+      Attribute.new("name", "float").html_input.should eql("text")
+    end
+    
+    it "should know html input to short" do
+      Attribute.new("name", "short").html_input.should eql("text")
+    end
+    
+    it "should know html input to integer" do
+      Attribute.new("name", "integer").html_input.should eql("text")
+    end
+    
+    it "should know html input to long" do
+      Attribute.new("name", "long").html_input.should eql("text")
+    end
+    
+     it "should know html input to text" do
+      Attribute.new("name", "text").html_input.should eql("textarea")
+    end
+  end
+  
+  context "java type" do
+    it "should know corret java type to boolean" do
+      Attribute.new("flag", "boolean").java_type.should eql("boolean")
+    end
+    
+    it "should know corret java type to text" do
+      Attribute.new("description", "text").java_type.should eql("String")
+    end
+    
+    it "should know corret java type to string" do
+      Attribute.new("name", "string").java_type.should eql("String")
+    end
+    
+    it "should know corret java type to double" do
+      Attribute.new("name", "double").java_type.should eql("Double")
+    end
+    
+    it "should know corret java type to float" do
+      Attribute.new("name", "float").java_type.should eql("Float")
+    end
+    
+    it "should know corret java type to short" do
+      Attribute.new("name", "short").java_type.should eql("Short")
+    end
+    
+    it "should know corret java type to integer" do
+      Attribute.new("name", "integer").java_type.should eql("Integer")
+    end
+    
+    it "should know corret java type to long" do
+      Attribute.new("name", "long").java_type.should eql("Long")
+    end
+  end
+  
+  it "should be boolean when type is boolean" do
+    Attribute.new("flag", "boolean").boolean?.should be_true
+  end
+  
+  it "cannot be boolean otherwise" do
+    Attribute.new("flag", "short").boolean?.should be_false
+  end
+end

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

@@ -0,0 +1,32 @@
+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
+end

data/vraptor-scaffold.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{vraptor-scaffold}
-  s.version = "0.0.1.beta5"
+  s.version = "0.0.1.rc"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rodolfo Liviero"]
-  s.date = %q{2010-08-04}
+  s.date = %q{2010-08-24}
   s.default_executable = %q{vraptor}
-  s.description = %q{}
+  s.description = %q{Scaffold for vraptor 3 with jpa, freemarker, maven, mockito, junit and jquery.}
   s.email = %q{rodolfoliviero@gmail.com}
   s.executables = ["vraptor"]
   s.extra_rdoc_files = [
@@ -44,8 +44,8 @@ Gem::Specification.new do |s|
      "lib/generators/app_generator/templates/pom.erb",
      "lib/generators/app_generator/templates/stylesheets/scaffold.css",
      "lib/generators/app_generator/templates/web.xml",
-     "lib/generators/attribute.rb",
      "lib/generators/base.rb",
+     "lib/generators/scaffold_generator/attribute.rb",
      "lib/generators/scaffold_generator/base_scaffold.rb",
      "lib/generators/scaffold_generator/controller_generator/controller_generator.rb",
      "lib/generators/scaffold_generator/controller_generator/templates/controller.erb",
@@ -67,7 +67,8 @@ Gem::Specification.new do |s|
      "lib/vraptor-scaffold.rb",
      "spec/lib/generators/app_generator/app_generator_spec.rb",
      "spec/lib/generators/app_generator/templates/pom.xml",
-     "spec/lib/generators/attribute_spec.rb",
+     "spec/lib/generators/scaffold_generator/attribute_spec.rb",
+     "spec/lib/generators/scaffold_generator/base_scaffold_spec.rb",
      "spec/lib/generators/scaffold_generator/controller_generator/controller_generator_spec.rb",
      "spec/lib/generators/scaffold_generator/controller_generator/templates/ProductController.java",
      "spec/lib/generators/scaffold_generator/freemarker_generator/freemarker_generator_spec.rb",
@@ -88,15 +89,16 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Scaffold for vraptor 3.}
   s.test_files = [
-    "spec/lib/vraptor-scaffold_spec.rb",
+    "spec/spec_helper.rb",
      "spec/lib/generators/app_generator/app_generator_spec.rb",
-     "spec/lib/generators/scaffold_generator/controller_generator/controller_generator_spec.rb",
      "spec/lib/generators/scaffold_generator/repository_generator/repository_generator_spec.rb",
-     "spec/lib/generators/scaffold_generator/scaffold_generator_spec.rb",
      "spec/lib/generators/scaffold_generator/model_generator/model_generator_spec.rb",
      "spec/lib/generators/scaffold_generator/freemarker_generator/freemarker_generator_spec.rb",
-     "spec/lib/generators/attribute_spec.rb",
-     "spec/spec_helper.rb"
+     "spec/lib/generators/scaffold_generator/attribute_spec.rb",
+     "spec/lib/generators/scaffold_generator/scaffold_generator_spec.rb",
+     "spec/lib/generators/scaffold_generator/base_scaffold_spec.rb",
+     "spec/lib/generators/scaffold_generator/controller_generator/controller_generator_spec.rb",
+     "spec/lib/vraptor-scaffold_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -106,19 +108,16 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<thor>, [">= 0.14.0"])
       s.add_runtime_dependency(%q<rake>, [">= 0.8.7"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0.beta4"])
-      s.add_runtime_dependency(%q<bundler>, [">= 1.0.0.rc.2"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0.rc"])
     else
       s.add_dependency(%q<thor>, [">= 0.14.0"])
       s.add_dependency(%q<rake>, [">= 0.8.7"])
-      s.add_dependency(%q<activesupport>, [">= 3.0.0.beta4"])
-      s.add_dependency(%q<bundler>, [">= 1.0.0.rc.2"])
+      s.add_dependency(%q<activesupport>, [">= 3.0.0.rc"])
     end
   else
     s.add_dependency(%q<thor>, [">= 0.14.0"])
     s.add_dependency(%q<rake>, [">= 0.8.7"])
-    s.add_dependency(%q<activesupport>, [">= 3.0.0.beta4"])
-    s.add_dependency(%q<bundler>, [">= 1.0.0.rc.2"])
+    s.add_dependency(%q<activesupport>, [">= 3.0.0.rc"])
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: vraptor-scaffold
 version: !ruby/object:Gem::Version 
-  hash: 299253581
+  hash: 7712030
   prerelease: true
   segments: 
   - 0
   - 0
   - 1
-  - beta5
-  version: 0.0.1.beta5
+  - rc
+  version: 0.0.1.rc
 platform: ruby
 authors: 
 - Rodolfo Liviero
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-04 00:00:00 -03:00
+date: 2010-08-24 00:00:00 -03:00
 default_executable: vraptor
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,34 +59,16 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 299253624
+        hash: 7712042
         segments: 
         - 3
         - 0
         - 0
-        - beta4
-        version: 3.0.0.beta4
-  type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: bundler
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15424049
-        segments: 
-        - 1
-        - 0
-        - 0
         - rc
-        - 2
-        version: 1.0.0.rc.2
+        version: 3.0.0.rc
   type: :runtime
-  version_requirements: *id004
-description: ""
+  version_requirements: *id003
+description: Scaffold for vraptor 3 with jpa, freemarker, maven, mockito, junit and jquery.
 email: rodolfoliviero@gmail.com
 executables: 
 - vraptor
@@ -121,8 +103,8 @@ files:
 - lib/generators/app_generator/templates/pom.erb
 - lib/generators/app_generator/templates/stylesheets/scaffold.css
 - lib/generators/app_generator/templates/web.xml
-- lib/generators/attribute.rb
 - lib/generators/base.rb
+- lib/generators/scaffold_generator/attribute.rb
 - lib/generators/scaffold_generator/base_scaffold.rb
 - lib/generators/scaffold_generator/controller_generator/controller_generator.rb
 - lib/generators/scaffold_generator/controller_generator/templates/controller.erb
@@ -144,7 +126,8 @@ files:
 - lib/vraptor-scaffold.rb
 - spec/lib/generators/app_generator/app_generator_spec.rb
 - spec/lib/generators/app_generator/templates/pom.xml
-- spec/lib/generators/attribute_spec.rb
+- spec/lib/generators/scaffold_generator/attribute_spec.rb
+- spec/lib/generators/scaffold_generator/base_scaffold_spec.rb
 - spec/lib/generators/scaffold_generator/controller_generator/controller_generator_spec.rb
 - spec/lib/generators/scaffold_generator/controller_generator/templates/ProductController.java
 - spec/lib/generators/scaffold_generator/freemarker_generator/freemarker_generator_spec.rb
@@ -194,12 +177,13 @@ signing_key:
 specification_version: 3
 summary: Scaffold for vraptor 3.
 test_files: 
-- spec/lib/vraptor-scaffold_spec.rb
+- spec/spec_helper.rb
 - spec/lib/generators/app_generator/app_generator_spec.rb
-- spec/lib/generators/scaffold_generator/controller_generator/controller_generator_spec.rb
 - spec/lib/generators/scaffold_generator/repository_generator/repository_generator_spec.rb
-- spec/lib/generators/scaffold_generator/scaffold_generator_spec.rb
 - spec/lib/generators/scaffold_generator/model_generator/model_generator_spec.rb
 - spec/lib/generators/scaffold_generator/freemarker_generator/freemarker_generator_spec.rb
-- spec/lib/generators/attribute_spec.rb
-- spec/spec_helper.rb
+- spec/lib/generators/scaffold_generator/attribute_spec.rb
+- spec/lib/generators/scaffold_generator/scaffold_generator_spec.rb
+- spec/lib/generators/scaffold_generator/base_scaffold_spec.rb
+- spec/lib/generators/scaffold_generator/controller_generator/controller_generator_spec.rb
+- spec/lib/vraptor-scaffold_spec.rb

data/spec/lib/generators/attribute_spec.rb

@@ -1,82 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
-
-describe Attribute do
-  
-  context "supported types" do
-    it "should support boolean" do
-      Attribute.valid_types.include?"boolean".should be_true
-    end
-    
-    it "should support double" do
-      Attribute.valid_types.include?"double".should be_true
-    end
-    
-    it "should support string" do
-      Attribute.valid_types.include?"string".should be_true
-    end
-    
-    it "should support float" do
-      Attribute.valid_types.include?"float".should be_true
-    end
-    
-    it "should support short" do
-      Attribute.valid_types.include?"short".should be_true
-    end
-    
-    it "should support integer" do
-      Attribute.valid_types.include?"integer".should be_true
-    end
-    
-    it "should support long" do
-      Attribute.valid_types.include?"long".should be_true
-    end
-  end
-  
-  context "html_input" do
-    it "should know html input to boolean" do
-      Attribute.new("flag", "boolean").html_input.should eql("checkbox")
-    end
-    
-    it "should know html input to string" do
-      Attribute.new("name", "string").html_input.should eql("text")
-    end
-    
-    it "should know html input to double" do
-      Attribute.new("name", "double").html_input.should eql("text")
-    end
-    
-    it "should know html input to float" do
-      Attribute.new("name", "float").html_input.should eql("text")
-    end
-    
-    it "should know html input to short" do
-      Attribute.new("name", "short").html_input.should eql("text")
-    end
-    
-    it "should know html input to integer" do
-      Attribute.new("name", "integer").html_input.should eql("text")
-    end
-    
-    it "should know html input to long" do
-      Attribute.new("name", "long").html_input.should eql("text")
-    end
-  end
-  
-   context "set type" do
-    it "should set corret type to boolean" do
-      Attribute.new("flag", "boolean").type.should eql("boolean")
-    end
-    
-     it "should set corret type otherwise" do
-      Attribute.new("id", "long").type.should eql("Long")
-    end
-  end
-  
-  it "should be boolean when type is boolean" do
-    Attribute.new("flag", "boolean").boolean?.should be_true
-  end
-  
-  it "cannot be boolean otherwise" do
-    Attribute.new("flag", "short").boolean?.should be_false
-  end
-end