vraptor-scaffold 1.3.0.rc → 1.3.0

data/spec/vraptor-scaffold/generators/plugin/expected_configs/ivy.xml

@@ -10,13 +10,13 @@
 	</configurations>
 
 	<dependencies>
-		<dependency org="br.com.caelum.vraptor.plugin" name="vraptor-environment" rev="0.0.8" conf="default" />
-		<dependency org="br.com.caelum" name="vraptor" rev="3.4.0" conf="default" />
+		<dependency org="br.com.caelum.vraptor" name="vraptor-environment" rev="0.0.8" conf="default" />
+		<dependency org="br.com.caelum" name="vraptor" rev="3.4.1" conf="default" />
 		<dependency org="opensymphony" name="sitemesh" rev="2.4.2" conf="default" />
 		<dependency org="javax.servlet" name="jstl" rev="1.2" conf="default" />
-		<dependency org="org.hsqldb" name="hsqldb" rev="2.2.4" conf="default" />
-		<dependency org="org.hibernate" name="hibernate-entitymanager" rev="3.6.7.Final" conf="default" />
-		<dependency org="org.hibernate" name="hibernate-c3p0" rev="3.6.7.Final" conf="default" />
+		<dependency org="org.hsqldb" name="hsqldb" rev="2.2.8" conf="default" />
+		<dependency org="org.hibernate" name="hibernate-entitymanager" rev="4.0.1.Final" conf="default" />
+		<dependency org="org.hibernate" name="hibernate-c3p0" rev="4.0.1.Final" conf="default" />
 		<dependency org="org.hibernate" name="hibernate-validator" rev="4.2.0.Final" conf="default" />
 		<dependency org="joda-time" name="joda-time" rev="2.0" conf="default" />
 		<dependency org="com.thoughtworks.xstream" name="xstream" rev="1.4.1" conf="default" />
@@ -28,7 +28,7 @@
 		<!-- Test dependencies -->
 		<dependency org="junit" name="junit" rev="4.10" conf="test->default" />
 		<dependency org="org.hamcrest" name="hamcrest-all" rev="1.1" conf="test->default" />
-		<dependency org="org.mockito" name="mockito-all" rev="1.8.5" conf="test->default" />
+		<dependency org="org.mockito" name="mockito-all" rev="1.9.0" conf="test->default" />
 
 		<!-- Jetty dependencies -->
 		<dependency org="org.mortbay.jetty" name="jsp-api-2.1" rev="6.1.14" conf="jetty->default" />

data/spec/vraptor-scaffold/generators/plugin/expected_configs/pom.xml

@@ -55,14 +55,14 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>br.com.caelum.vraptor.plugin</groupId>
+			<groupId>br.com.caelum.vraptor</groupId>
 			<artifactId>vraptor-environment</artifactId>
 			<version>0.0.8</version>
 		</dependency>
 		<dependency>
 			<groupId>br.com.caelum</groupId>
 			<artifactId>vraptor</artifactId>
-			<version>3.4.0</version>
+			<version>3.4.1</version>
 		</dependency>
 		<dependency>
 			<groupId>opensymphony</groupId>
@@ -77,17 +77,17 @@
 		<dependency>
 			<groupId>org.hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>2.2.4</version>
+			<version>2.2.8</version>
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-entitymanager</artifactId>
-			<version>3.6.7.Final</version>
+			<version>4.0.1.Final</version>
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-c3p0</artifactId>
-			<version>3.6.7.Final</version>
+			<version>4.0.1.Final</version>
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
@@ -121,7 +121,7 @@
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-all</artifactId>
-			<version>1.8.5</version>
+			<version>1.9.0</version>
 			<scope>test</scope>
 		</dependency>
 

data/spec/vraptor-scaffold/generators/plugin/plugin_generator_spec.rb

@@ -9,9 +9,9 @@ describe PluginGenerator do
     @gradle_projet = "#{@project_path}/gradle"
     @ant_projet = "#{@project_path}/ant"
 
-    AppGenerator.new(@maven_projet, ["-b=mvn"]).invoke_all
-    AppGenerator.new(@gradle_projet, ["-b=gradle"]).invoke_all
-    AppGenerator.new(@ant_projet, ["-b=ant"]).invoke_all
+    AppGenerator.new(@maven_projet, ["-b=mvn", "--skip-jquery"]).invoke_all
+    AppGenerator.new(@gradle_projet, ["-b=gradle", "--skip-jquery"]).invoke_all
+    AppGenerator.new(@ant_projet, ["-b=ant", "--skip-jquery"]).invoke_all
   end
 
   after :all do
@@ -46,7 +46,7 @@ describe PluginGenerator do
 
     before :each do
       FileUtils.chdir(@maven_projet)
-      @generator = PluginGenerator.new("vraptor-environment", ["-v=0.0.8", "-g=br.com.caelum.vraptor.plugin"])
+      @generator = PluginGenerator.new("vraptor-environment", ["-v=0.0.8", "-g=br.com.caelum.vraptor"])
       @generator.build
       back
     end
@@ -78,7 +78,7 @@ describe PluginGenerator do
 
     before :each do
       FileUtils.chdir(@ant_projet)
-      @generator = PluginGenerator.new("vraptor-environment", ["-v=0.0.8", "-g=br.com.caelum.vraptor.plugin"])
+      @generator = PluginGenerator.new("vraptor-environment", ["-v=0.0.8", "-g=br.com.caelum.vraptor"])
       @generator.build
       back
     end
@@ -94,7 +94,7 @@ describe PluginGenerator do
 
     before :each do
       FileUtils.chdir(@gradle_projet)
-      @generator = PluginGenerator.new("vraptor-environment", ["-v=0.0.8"])
+      @generator = PluginGenerator.new("vraptor-environment", ["-v=0.0.8", "-g=br.com.caelum.vraptor"])
       @generator.build
       back
     end
@@ -110,7 +110,7 @@ describe PluginGenerator do
 
     before :each do
       FileUtils.chdir(@gradle_projet)
-      @generator = PluginGenerator.new("vraptor-environment", ["-v=0.0.8", "-g=br.com.caelum.vraptor.plugin"])
+      @generator = PluginGenerator.new("vraptor-environment", ["-v=0.0.8"])
       @generator.build
       back
     end

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

@@ -2,185 +2,202 @@ require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper")
 
 describe Attribute do
 
-  context "getter method prefix" do
-    it "should be 'is' to boolean attributes" do
-      Attribute.new("active", "boolean").getter_prefix.should == "is"
-    end
-
-    it "should be 'get' otherwise" do
-      Attribute.new("description", "string").getter_prefix.should == "get"
-    end
-  end
-
-  context "initialize attribute" do
-    context "downcase name" do
-      it "should downcase all words" do
-        Attribute.new("VALUE", "double").name.should == "value"
-      end
-
-      it "should camelize composed name" do
-        Attribute.new("MyItem", "double").name.should == "myItem"
-      end
-
-      it "should camelize composed name" do
-        Attribute.new("myItem", "double").name.should == "myItem"
-      end
-
-      it "should keep name in downcase" do
-        Attribute.new("value", "double").name.should == "value"
-      end
-    end
-
-    it "should downcase type" do
-      Attribute.new("value", "DoublE").type.should == "double"
-    end
-  end
-
-  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
-
-    it "should not support other" do
-      Attribute.valid_types.include?("other").should be_false
-    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 correct java type to boolean" do
-      Attribute.new("flag", "boolean").java_type.should eql("boolean")
-    end
-
-    it "should know correct java type to text" do
-      Attribute.new("description", "text").java_type.should eql("String")
-    end
-
-    it "should know correct java type to string" do
-      Attribute.new("name", "string").java_type.should eql("String")
-    end
-
-    it "should know correct java type to double" do
-      Attribute.new("name", "double").java_type.should eql("Double")
-    end
-
-    it "should know correct java type to float" do
-      Attribute.new("name", "float").java_type.should eql("Float")
-    end
-
-    it "should know correct java type to short" do
-      Attribute.new("name", "short").java_type.should eql("Short")
-    end
-
-    it "should know correct java type to integer" do
-      Attribute.new("name", "integer").java_type.should eql("Integer")
-    end
-
-    it "should know correct java type to long" do
-      Attribute.new("name", "long").java_type.should eql("Long")
-    end
-  end
-
-  context "validate" do
-
-    it "should be valid when attribute is supported" do
-      Kernel.should_not_receive(:exit)
-      Attribute.valid_types.each do |type|
-        Attribute.new("name", type)
-      end
-    end
-
-    it "cannot be valid when attribute is not supported" do
-      Kernel.should_receive(:exit)
-      Attribute.new("name", "char")
-    end
-
-    it "should be valid when attribute is upper case" do
-      Kernel.should_not_receive(:exit)
-      Attribute.new("name", "String")
-    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
-
-  context "html label" do
-    it "should humanize composed name" do
-      Attribute.new("MyItem", "double").html_label.should == "My item"
-    end
-
-    it "should humanize composed name" do
-      Attribute.new("myItem", "double").html_label.should == "My item"
-    end
-
-    it "should humanize single name" do
-      Attribute.new("item", "double").html_label.should == "Item"
-    end
-  end
+	context "getter method prefix" do
+		it "should be 'is' to boolean attributes" do
+			Attribute.new("active", "boolean").getter_prefix.should == "is"
+		end
+
+		it "should be 'get' otherwise" do
+			Attribute.new("description", "string").getter_prefix.should == "get"
+		end
+	end
+
+	context "initialize attribute" do
+		context "downcase name" do
+			it "should downcase all words" do
+				Attribute.new("VALUE", "double").name.should == "value"
+			end
+
+			it "should camelize composed name" do
+				Attribute.new("MyItem", "double").name.should == "myItem"
+			end
+
+			it "should camelize composed name" do
+				Attribute.new("myItem", "double").name.should == "myItem"
+			end
+
+			it "should keep name in downcase" do
+				Attribute.new("value", "double").name.should == "value"
+			end
+		end
+
+		it "should downcase type" do
+			Attribute.new("value", "DoublE").type.should == "double"
+		end
+	end
+
+	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
+
+		it "should not support other" do
+			Attribute.valid_types.include?("other").should be_false
+		end
+
+		it "should suport date" do
+			Attribute.valid_types.include?("date").should be_true
+		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
+
+			it "should know html input to date" do
+				Attribute.new("price", "date").html_input.should eql("text")
+			end
+		end
+
+		context "java type" do
+			it "should know correct java type to boolean" do
+				Attribute.new("flag", "boolean").java_type.should eql("boolean")
+			end
+
+			it "should know correct java type to text" do
+				Attribute.new("description", "text").java_type.should eql("String")
+			end
+
+			it "should know correct java type to string" do
+				Attribute.new("name", "string").java_type.should eql("String")
+			end
+
+			it "should know correct java type to double" do
+				Attribute.new("name", "double").java_type.should eql("Double")
+			end
+
+			it "should know correct java type to float" do
+				Attribute.new("name", "float").java_type.should eql("Float")
+			end
+
+			it "should know correct java type to short" do
+				Attribute.new("name", "short").java_type.should eql("Short")
+			end
+
+			it "should know correct java type to integer" do
+				Attribute.new("name", "integer").java_type.should eql("Integer")
+			end
+
+			it "should know correct java type to long" do
+				Attribute.new("name", "long").java_type.should eql("Long")
+			end
+
+			it "should know correct java type to Date" do
+				Attribute.new("price", "date").java_type.should eql("Date")
+			end
+
+			it "should know correct type to relationship many to one" do
+				Attribute.new("product", "references").java_type.should eql("Product")
+			end
+
+		end
+
+		context "validate" do
+
+			it "should be valid when attribute is supported" do
+				Kernel.should_not_receive(:exit)
+				Attribute.valid_types.each do |type|
+					Attribute.new("name", type)
+				end
+			end
+
+			it "cannot be valid when attribute is not supported" do
+				Kernel.should_receive(:exit)
+				Attribute.new("name", "char")
+			end
+
+			it "should be valid when attribute is upper case" do
+				Kernel.should_not_receive(:exit)
+				Attribute.new("name", "String")
+			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
+
+		context "html label" do
+			it "should humanize composed name" do
+				Attribute.new("MyItem", "double").html_label.should == "My item"
+			end
+
+			it "should humanize composed name" do
+				Attribute.new("myItem", "double").html_label.should == "My item"
+			end
+
+			it "should humanize single name" do
+				Attribute.new("item", "double").html_label.should == "Item"
+			end
+		end
+	end
 end