vraptor-scaffold 1.2.1 → 1.2.3

data/CHANGELOG.rdoc

@@ -1,3 +1,12 @@
+== 1.2.3 / 2011-11-15
+
+* Bugfixes
+    * Run scaffold commands behind proxy.
+    * Humanizing html labels.
+    * Heroku deploy.
+
+== 1.2.2 / 2011-11-15 (Yanked)
+
 == 1.2.1 / 2011-10-18
 
 * New Features

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vraptor-scaffold (1.2.1)
+    vraptor-scaffold (1.2.2)
       activesupport (= 3.0.1)
       rake (= 0.9.2)
       thor (= 0.14.6)
@@ -11,9 +11,13 @@ GEM
   specs:
     ZenTest (4.4.0)
     activesupport (3.0.1)
+    multi_json (1.0.3)
     rake (0.9.2)
-    rcov (0.9.9)
     rspec (1.3.2)
+    simplecov (0.5.4)
+      multi_json (~> 1.0.3)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
     thor (0.14.6)
 
 PLATFORMS
@@ -21,6 +25,6 @@ PLATFORMS
 
 DEPENDENCIES
   ZenTest (= 4.4.0)
-  rcov (= 0.9.9)
   rspec (= 1.3.2)
+  simplecov (= 0.5.4)
   vraptor-scaffold!

data/README.textile

@@ -39,6 +39,7 @@ Vraptor Scaffold was created and is maintained by "Rodolfo Liviero":http://rodol
 h2. Contributors
 
  * Adriano Almeida
+ * Arthur Moura Carvalho
  * Edgar Latorre
  * Felipe Fontoura
  * Guilherme Silveira

data/Rakefile

@@ -7,12 +7,6 @@ Spec::Rake::SpecTask.new(:spec) do |spec|
   spec.spec_files = FileList['spec/**/*_spec.rb']
 end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-  spec.rcov_opts = ['--exclude', 'spec/*,gems/*']
-  spec.rcov = true
-end
-
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
   version = VraptorScaffold::VERSION

data/lib/vraptor-scaffold.rb

@@ -11,4 +11,5 @@ require 'yaml'
 require 'vraptor-scaffold/configuration'
 require 'vraptor-scaffold/runner'
 require 'vraptor-scaffold/execution'
-require 'vraptor-scaffold/load_paths'
+require 'vraptor-scaffold/http_request'
+require 'vraptor-scaffold/load_paths'

data/lib/vraptor-scaffold/generators/app/app_generator.rb

@@ -68,7 +68,7 @@ class AppGenerator < VraptorScaffold::Base
     if build_tool == "ant"
       create_eclipse_files unless options[:skip_eclipse]
       copy_file("build.xml")
-      template("build.properties.erb", "build.properties") 
+      template("build.properties.erb", "build.properties")
       template("ivy.erb", "ivy.xml")
       copy_file(IVY_JAR)
     end
@@ -123,7 +123,7 @@ class AppGenerator < VraptorScaffold::Base
   def create_javascripts
     javascripts = File.join Configuration::WEB_APP, "javascripts"
     create_file File.join javascripts, "application.js"
-    get jquery_url, (File.join javascripts, "jquery.min.js")
+    add_file (File.join javascripts, "jquery.min.js"), get_jquery.body
   end
 
   def configure_scaffold_properties
@@ -142,7 +142,7 @@ class AppGenerator < VraptorScaffold::Base
     empty_directory File.join test_src, options[:controllers_package]
     empty_directory File.join test_src, options[:models_package]
     empty_directory File.join test_src, options[:repositories_package]
-    
+
     directory("resources-test", Configuration::TEST_RESOURCES)
   end
 
@@ -152,12 +152,6 @@ class AppGenerator < VraptorScaffold::Base
     options[:build_tool]
   end
 
-  def jquery_url
-    jquery_version = "1" #this mean get latest version
-    jquery_version = options[:jquery] if options[:jquery] != 'latest version'
-    "http://ajax.googleapis.com/ajax/libs/jquery/#{jquery_version}/jquery.min.js"
-  end
-
   def create_eclipse_files
     template("eclipse/project.erb", ".project")
     template("eclipse/classpath.erb", ".classpath")
@@ -183,14 +177,23 @@ class AppGenerator < VraptorScaffold::Base
       Kernel::exit
     end
 
-    require 'open-uri'
-    begin
-      Kernel::open(jquery_url) if options[:jquery] != 'latest version'
-    rescue OpenURI::HTTPError => e
-      download_url = "http://docs.jquery.com/Downloading_jQuery"
-      puts "jQuery version #{options[:jquery]} was not found. Please visit the download page to see the versions available #{download_url}."
-      Kernel::exit
+    if options[:jquery] != 'latest version'
+      case get_jquery
+      when Net::HTTPClientError, Net::HTTPServerError
+        download_url = "http://docs.jquery.com/Downloading_jQuery"
+        puts "jQuery version #{options[:jquery]} was not found. Please visit the download page to see the versions available #{download_url}."
+        Kernel::exit
+      end
     end
+  end
+
+  def jquery_uri
+    jquery_version = "1" #this mean get latest version
+    jquery_version = options[:jquery] if options[:jquery] != 'latest version'
+    "/ajax/libs/jquery/#{jquery_version}/jquery.min.js"
+  end
 
+  def get_jquery
+    VraptorScaffold::HttpRequest.open_session("ajax.googleapis.com").get jquery_uri
   end
 end

data/lib/vraptor-scaffold/generators/app/templates/pom.erb

@@ -62,7 +62,6 @@
                         </goals>
                         <configuration>
                             <assembleDirectory>target</assembleDirectory>
-                            <generateRepository>false</generateRepository>
                             <extraJvmArguments>-Xmx512m</extraJvmArguments>
                             <programs>
                                 <program>

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

@@ -14,6 +14,10 @@ class Attribute
     input
   end
 
+  def html_label
+    @name.underscore.humanize
+  end
+
   def java_type
     java = type.capitalize
     java = "boolean" if boolean?

data/lib/vraptor-scaffold/generators/scaffold/template_engine_generator/freemarker_generator/templates/form.erb

@@ -13,7 +13,7 @@
 
 <% @attributes.each do |att| -%>
   <div class="field">
-    <%= att.name.camelize %>:<br />
+    <%= att.html_label %>:<br />
     <%= "<@html.#{att.html_input} \"#{model_parameter_name}.#{att.name}\" #{model_parameter_name}.#{att.name}/>"  %>
   </div>
 <% end -%>

data/lib/vraptor-scaffold/generators/scaffold/template_engine_generator/freemarker_generator/templates/index.erb

@@ -4,7 +4,7 @@
 <table>
   <tr>
 <% @attributes.each do |att| -%>
-   <th><%= att.name.camelize %></th>
+   <th><%= att.html_label %></th>
 <% end -%>
    <th></th>
    <th></th>

data/lib/vraptor-scaffold/generators/scaffold/template_engine_generator/freemarker_generator/templates/show.erb

@@ -2,7 +2,7 @@
 
 <% @attributes.each do |att| -%>
 <p>
-  <b><%= att.name.camelize %>:</b>
+  <b><%= att.html_label %>:</b>
    <%= "${#{model_parameter_name}.#{att.name}!\"\"}" unless att.boolean? %>
    <%= "${#{model_parameter_name}.#{att.name}?string}" if att.boolean? %>
 </p>

data/lib/vraptor-scaffold/generators/scaffold/template_engine_generator/jsp_generator/templates/form.erb

@@ -13,7 +13,7 @@
 
 <% @attributes.each do |att| -%>
 	<div class="field">
-		<%= att.name.camelize %>:<br />
+		<%= att.html_label %>:<br />
 		<input type="text" name="<%= model_parameter_name %>.<%=att.name%>" value="${<%=model_parameter_name%>.<%=att.name%>}"/>
 	</div>
 <% end -%>

data/lib/vraptor-scaffold/generators/scaffold/template_engine_generator/jsp_generator/templates/index.erb

@@ -7,7 +7,7 @@
 	<table>
 		<tr>
 			<%- @attributes.each do |att| -%>
-			<th><%= att.name.camelize %></th>
+			<th><%= att.html_label %></th>
 			<%- end -%>
 			<th></th>
 			<th></th>

data/lib/vraptor-scaffold/generators/scaffold/template_engine_generator/jsp_generator/templates/show.erb

@@ -4,7 +4,7 @@
 <body>
 <%- @attributes.each do |att| -%>
 	<p>
-		<b><%= att.name.camelize %>:</b>
+		<b><%= att.html_label %>:</b>
 		<%= "${#{model_parameter_name}.#{att.name}}" %>
 	</p>
 <% end -%>

data/lib/vraptor-scaffold/http_request.rb

@@ -0,0 +1,22 @@
+require 'net/http'
+
+module VraptorScaffold
+
+  class HttpRequest
+
+    def self.open_session url
+      return http.start url
+    end
+
+    protected
+
+    def self.http
+      return Net::HTTP unless ENV['http_proxy']
+      uri = URI.parse(ENV['http_proxy'])
+      proxy_user, proxy_pass = uri.userinfo.split(/:/) if uri.userinfo
+      Net::HTTP::Proxy(uri.host, uri.port, proxy_user, proxy_pass)
+    end
+
+  end
+
+end

data/lib/vraptor-scaffold/version.rb

@@ -1,3 +1,3 @@
 module VraptorScaffold
-  VERSION = "1.2.1"
+  VERSION = "1.2.3"
 end

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require 'simplecov'
+SimpleCov.start
+
 require 'spec'
 require 'spec/autorun'
 require File.dirname(__FILE__) + '/../lib/vraptor-scaffold'

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

@@ -52,4 +52,4 @@ describe JspTemplateEngine do
       exists_and_identical?(source, destination)
     end
   end
-end
+end

data/spec/vraptor-scaffold/generators/app/templates/pom-heroku.xml

@@ -61,7 +61,6 @@
                         </goals>
                         <configuration>
                             <assembleDirectory>target</assembleDirectory>
-                            <generateRepository>false</generateRepository>
                             <extraJvmArguments>-Xmx512m</extraJvmArguments>
                             <programs>
                                 <program>

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

@@ -1,41 +1,41 @@
 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"
+      Attribute.new("active", "boolean").getter_prefix.should == "is"
     end
-    
+
     it "should be 'get' otherwise" do
-       Attribute.new("description", "string").getter_prefix.should == "get"
+      Attribute.new("description", "string").getter_prefix.should == "get"
     end
   end
-  
+
   context "initialize attribute" do
     context "downcase name" do
-      it  "should downcase all words" do
+      it "should downcase all words" do
         Attribute.new("VALUE", "double").name.should == "value"
       end
 
-      it  "should camelize composed name" do
+      it "should camelize composed name" do
         Attribute.new("MyItem", "double").name.should == "myItem"
       end
 
-      it  "should camelize composed name" do
+      it "should camelize composed name" do
         Attribute.new("myItem", "double").name.should == "myItem"
       end
 
-      it  "should keep name in downcase" do
+      it "should keep name in downcase" do
         Attribute.new("value", "double").name.should == "value"
       end
     end
-    
-    it  "should downcase type" do
+
+    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
@@ -141,19 +141,19 @@ describe Attribute do
   context "validate" do
 
     it "should be valid when attribute is supported" do
-      Kernel.should_not_receive(:exit) 
+      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) 
+      Kernel.should_receive(:exit)
       Attribute.new("name", "char")
     end
 
     it "should be valid when attribute is upper case" do
-      Kernel.should_not_receive(:exit) 
+      Kernel.should_not_receive(:exit)
       Attribute.new("name", "String")
     end
   end
@@ -165,4 +165,18 @@ describe Attribute do
   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

data/spec/vraptor-scaffold/generators/scaffold/freemarker_generator/freemarker_generator_spec.rb

@@ -28,6 +28,9 @@ describe FreemarkerGenerator do
 
     it "should create form view" do
       File.exist?("#{@views_path}/form.ftl").should be_true
+      source = File.join File.dirname(__FILE__), "templates", "form.ftl"
+      destination = "#{Configuration::WEB_INF}/views/product/form.ftl"
+      exists_and_identical?(source, destination)
     end
 
     it "should create new view" do

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

@@ -0,0 +1,28 @@
+<#if errors??>
+	<#list errors as error>
+		 ${error.category} - ${error.message}<br />
+	</#list>
+</#if>
+
+<form action="${base}/products" method="post">
+  
+  <#if product.id??>
+    <input type="hidden" name="product.id" value="${product.id}"/>
+    <input type="hidden" name="_method" value="put"/>
+  </#if>
+
+  <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="actions">
+    <button type="submit">send</button>
+  </div>
+</form>
+
+<a href="${base}/products">Back</a>
+

data/spec/vraptor-scaffold/generators/scaffold/jsp_generator/jsp_generator_spec.rb

@@ -27,7 +27,9 @@ describe JspGenerator do
     end
 
     it "should create form view" do
-      File.exist?("#{@views_path}/form.jsp").should be_true
+      source = File.join File.dirname(__FILE__), "templates", "form.jsp"
+      destination = "#{Configuration::WEB_INF}/jsp/product/form.jsp"
+      exists_and_identical?(source, destination)
     end
 
     it "should create new view" do

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

@@ -0,0 +1,28 @@
+<c:if test="${not empty errors}">
+	<c:forEach items="${errors}" var="error">
+		${error.category} - ${error.message}<br />
+	</c:forEach>
+</c:if>
+
+<form action="${pageContext.request.contextPath}/products" method="post">
+  
+	<c:if test="${not empty product.id}">
+		<input type="hidden" name="product.id" value="${product.id}"/>
+		<input type="hidden" name="_method" value="put"/>
+	</c:if>
+
+	<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>
+</form>
+
+<a href="${pageContext.request.contextPath}/products">Back</a>

data/spec/vraptor-scaffold/http_request_spec.rb

@@ -0,0 +1,40 @@
+require "spec_helper"
+
+describe VraptorScaffold::HttpRequest do
+
+  before :all do
+    @http_proxy = ENV['http_proxy']
+  end
+
+  after :all do
+    ENV['http_proxy'] = @http_proxy
+  end
+
+  context "http proxy" do
+    before :each do
+      ENV['http_proxy'] = "http://google.com"
+    end
+
+    after :each do
+      ENV.delete 'http_proxy'
+    end
+
+    it "should use 'http_proxy' env when it is present" do
+      http = VraptorScaffold::HttpRequest.http
+      http.should be_true http.proxy_class?
+    end
+  end
+
+  context "no proxy" do
+
+    before :each do
+      ENV.delete 'http_proxy'
+    end
+
+    it "should not use proxy settings when no http_proxy env exists" do
+      http = VraptorScaffold::HttpRequest.http
+      http.should be_true !http.proxy_class?
+    end
+  end
+
+end

data/vraptor-scaffold.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency('rspec', '1.3.2')
   s.add_development_dependency('ZenTest', '4.4.0')
-  s.add_development_dependency('rcov', '0.9.9')
+  s.add_development_dependency('simplecov', '0.5.4')
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {spec}/*`.split("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vraptor-scaffold
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-18 00:00:00.000000000Z
+date: 2011-11-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70293683728980 !ruby/object:Gem::Requirement
+  requirement: &70300193088140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *70293683728980
+  version_requirements: *70300193088140
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70293683728480 !ruby/object:Gem::Requirement
+  requirement: &70300193087600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70293683728480
+  version_requirements: *70300193087600
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70293683728020 !ruby/object:Gem::Requirement
+  requirement: &70300193087040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *70293683728020
+  version_requirements: *70300193087040
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70293683727560 !ruby/object:Gem::Requirement
+  requirement: &70300193086440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *70293683727560
+  version_requirements: *70300193086440
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &70293683727100 !ruby/object:Gem::Requirement
+  requirement: &70300193085540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,18 +65,18 @@ dependencies:
         version: 4.4.0
   type: :development
   prerelease: false
-  version_requirements: *70293683727100
+  version_requirements: *70300193085540
 - !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &70293683726640 !ruby/object:Gem::Requirement
+  name: simplecov
+  requirement: &70300193085060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 0.9.9
+        version: 0.5.4
   type: :development
   prerelease: false
-  version_requirements: *70293683726640
+  version_requirements: *70300193085060
 description: VRaptor scaffold extension to make it easier configuring new projects
   and plugins.
 email: rodolfoliviero@gmail.com
@@ -170,6 +170,7 @@ files:
 - lib/vraptor-scaffold/generators/scaffold/template_engine_generator/jsp_generator/templates/new.erb
 - lib/vraptor-scaffold/generators/scaffold/template_engine_generator/jsp_generator/templates/show.erb
 - lib/vraptor-scaffold/generators/scaffold/template_engine_generator/template_engine_generator.rb
+- lib/vraptor-scaffold/http_request.rb
 - lib/vraptor-scaffold/load_paths.rb
 - lib/vraptor-scaffold/runner.rb
 - lib/vraptor-scaffold/runner/commands_help.rb
@@ -215,7 +216,9 @@ files:
 - spec/vraptor-scaffold/generators/scaffold/controller_generator/controller_generator_spec.rb
 - 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/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
 - spec/vraptor-scaffold/generators/scaffold/model_generator/templates/Product.java
 - spec/vraptor-scaffold/generators/scaffold/model_generator/templates/hibernate.cfg.xml
@@ -225,6 +228,7 @@ files:
 - spec/vraptor-scaffold/generators/scaffold/repository_generator/templates/ProductRepository.java
 - spec/vraptor-scaffold/generators/scaffold/repository_generator/templates/ProductRepositoryImpl.java
 - spec/vraptor-scaffold/generators/scaffold/scaffold_generator_spec.rb
+- spec/vraptor-scaffold/http_request_spec.rb
 - spec/vraptor-scaffold/runner/commands_help_spec.rb
 - spec/vraptor-scaffold/runner/configure_spec.rb
 - spec/vraptor-scaffold/runner/generator_spec.rb