caterpillar 1.3.1 → 1.4.0

data/test/rails_task_test.rb

@@ -6,13 +6,15 @@ class RailsTaskTest < Caterpillar::TestCase
   def test_generated_rails_project
     project_name = 'caterpillar_rails_test'
 
-#    Rake::Task['rails'].execute(project_name)
     `ruby -S caterpillar rails #{project_name}`
     assert FileTest.directory? project_name
     assert File.read("#{project_name}/config/environment.rb") =~ /caterpillar/
     assert FileTest.directory? "#{project_name}/vendor/plugins/caterpillar-#{Caterpillar::VERSION}"
+    assert FileTest.exists? "#{project_name}/app/views/layouts/application.html.erb"
     assert FileTest.exists? "#{project_name}/config/warble.rb"
+    assert File.read("#{project_name}/config/warble.rb") =~ /#{project_name}-portlet/
     assert FileTest.exists? "#{project_name}/config/portlets.rb"
+    assert File.read("#{project_name}/config/portlets.rb") =~ /#{project_name}-portlet/
     FileUtils.rm_rf project_name
   end
     

data/test/xml_test.rb

@@ -19,41 +19,37 @@ class XmlTest < Caterpillar::TestCase # :nodoc:
     }
   end
 
-  def test_portlet_template
+  def test_portlet_elements
     portlet = {
       :name  => "some name",
       :title => "some title",
       :servlet => "Test",
       :path => "/test/path"
     }
-    
+
     session = {
       :key    => '_test_session',
       :secret => 'XXX'
     }
-    
-    xml = Caterpillar::Portlet.template(portlet)
-    assert_not_nil xml
-    assert !xml.empty?
 
+    xml = Caterpillar::Portlet.portlet_element(portlet).to_s
     assert xml[/#{portlet[:name]}/]
     assert xml[/#{portlet[:title]}/]
-    assert xml[/#{portlet[:servlet]}/]
-    assert xml[/#{portlet[:path]}/]
     assert !xml[/secret/]
 
-    xml = Caterpillar::Portlet.template(portlet,session)
-    assert_not_nil xml
-    assert !xml.empty?
-
+    xml = Caterpillar::Portlet.portlet_element(portlet,session).to_s
     assert xml[/#{session[:secret]}/], 'No secret'
+
+    xml = Caterpillar::Portlet.filter_element(portlet).to_s
+    assert xml[/#{portlet[:servlet]}/]
+    assert xml[/#{portlet[:path]}/]
   end
 
   def test_session_key
     key = Caterpillar::Security.get_session_key
     assert_not_nil key
   end
-  
+
   def test_secret
     secret = Caterpillar::Security.get_secret
     assert_not_nil secret
@@ -93,7 +89,6 @@ class XmlTest < Caterpillar::TestCase # :nodoc:
     @liferay_tld_table.each_pair do |version,tld|
       @config.container.version = version
       xml = @config.container.portletapp_xml(@portlets)
-
       assert xml[/liferay-portlet-app.*#{tld}/],
         'Failed to create DTD with proper version; liferay %s' % version
 
@@ -108,5 +103,80 @@ class XmlTest < Caterpillar::TestCase # :nodoc:
       assert doc.validate(dtd)
     end
   end
+  
+  def test_public_render_parameters_xml
+    doc = REXML::Document.new
+    doc << REXML::XMLDecl.new('1.0', 'utf-8') 
+    app = REXML::Element.new('portlet-app', doc)
+    app.attributes['version'] = '2.0'
+    app.attributes['xmlns'] = 'http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd'
+    app.attributes['xmlns:xsi'] = 'http://www.w3.org/2001/XMLSchema-instance'
+    app.attributes['xsi:schemaLocation'] = 'http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd'
+    
+    portlet = {
+      :name  => "test_portlet",
+      :path => "/test/path",
+      :public_render_parameters => [:tag, :folksonomy]
+    }
+          
+    element = Caterpillar::Portlet.portlet_element(portlet, nil, app)
+    xml = element.to_s
+    assert_not_nil xml
+    assert !xml.empty?
+
+    assert xml[/#{portlet[:name]}/]
+    assert xml[/#{portlet[:title]}/]
+    assert xml[/#{portlet[:servlet]}/]
+    assert !xml[/secret/]
+          
+    element = Caterpillar::Portlet.portlet_element(portlet, nil, app)
+    xml = element.to_s
+    assert_not_nil xml
+    assert !xml.empty?
+
+    portlet[:public_render_parameters].each do |param|
+      assert xml[/#{param}/]
+    end
+    
+    assert xml[/<supported-public-render-parameter>/]
+    assert app.to_s[/<public-render-parameter>/]
+  end
 
 end
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: caterpillar
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 7
   prerelease: false
   segments: 
   - 1
-  - 3
-  - 1
-  version: 1.3.1
+  - 4
+  - 0
+  version: 1.4.0
 platform: ruby
 authors: 
 - Mikael Lammentausta
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-15 00:00:00 +03:00
+date: 2010-06-14 00:00:00 +03:00
 default_executable: caterpillar
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,7 +35,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: libxml-ruby
+  name: jrexml
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -78,6 +78,7 @@ files:
 - Rakefile
 - init.rb
 - install.rb
+- portlets-config.rb
 - lib/caterpillar/config.rb
 - lib/caterpillar/helpers/liferay.rb
 - lib/caterpillar/liferay.rb
@@ -90,8 +91,7 @@ files:
 - lib/caterpillar/usage.rb
 - lib/caterpillar/util.rb
 - lib/caterpillar.rb
-- lib/java/rails-portlet-0.10.0.jar
-- lib/java/rails-portlet-0.6.0.jar
+- lib/java/rails-portlet-0.10.1.jar
 - lib/rails_gem_chooser.rb
 - lib/web/portlet.rb
 - generators/caterpillar/caterpillar_generator.rb
@@ -105,6 +105,8 @@ files:
 - generators/caterpillar/templates/javascripts/portlet_test_bench/main.js
 - generators/caterpillar/templates/stylesheets/portlet_test_bench/main.css
 - generators/caterpillar/USAGE
+- generators/html_template/html_template_generator.rb
+- generators/html_template/templates/application.html.erb
 - views/caterpillar/_navigation.html.erb
 - views/layouts/caterpillar.html.erb
 - portlet_test_bench/controllers/caterpillar/application.rb
@@ -138,7 +140,6 @@ files:
 - portlet_test_bench/views/caterpillar/js/prototype.html.erb
 - portlet_test_bench/views/caterpillar/js/scriptaculous.html.erb
 - portlet_test_bench/views/caterpillar/js/simple.html.erb
-- portlet_test_bench/views/caterpillar/junit/basic_tags.html.erb
 - portlet_test_bench/views/caterpillar/junit/css.html.erb
 - portlet_test_bench/views/caterpillar/junit/doctype_html4_strict.html.erb
 - portlet_test_bench/views/caterpillar/junit/doctype_html5.html.erb
@@ -149,6 +150,8 @@ files:
 - portlet_test_bench/views/caterpillar/junit/doctype_xhtml11.html.erb
 - portlet_test_bench/views/caterpillar/junit/form.html.erb
 - portlet_test_bench/views/caterpillar/junit/http_post.html.erb
+- portlet_test_bench/views/caterpillar/junit/images.html.erb
+- portlet_test_bench/views/caterpillar/junit/links.html.erb
 - portlet_test_bench/views/caterpillar/junit/post_and_redirect.html.erb
 - portlet_test_bench/views/caterpillar/junit/target1.html.erb
 - portlet_test_bench/views/caterpillar/junit/xhr.html.erb