caterpillar 1.4.4 → 1.6.0

data/test/liferay_helpers_test.rb

@@ -6,11 +6,98 @@ require File.dirname(File.expand_path(__FILE__))+'/test_helper'
 
 class LiferayHelpersTest < ActionController::TestCase # :nodoc:
   include Caterpillar::Helpers::Liferay
-  
-  def test_link_to_liferay
-    #user = User.first
-    #flunk
-    assert true
+
+
+  def test_get_liferay_preferences
+    # Simulated value from the cookie sent
+    value = "font_size=20px;background_color=#000000;page_size=20;"
+    
+    hash = get_liferay_preferences(value)
+    assert_not_nil hash
+    assert_equal 3, hash.length
+    [:font_size, :background_color, :page_size].each do |key|
+      hash.has_key? key
+    end
+    
+    ["20px", "#000000", "20"].each do |value|
+      hash.has_value? value
+    end
+    
+    assert_nil get_liferay_preferences(nil)
+  end
+
+  def test_liferay_ResourceUrl_model
+    resource_url_cookie = "http://localhost:8080/web/guest/test?p_p_id=portlet_test_bench&p_p_lifecycle=2&p_p_state=normal&p_p_mode=view&p_p_cacheability=cacheLevelPage&p_p_col_id=column-2&p_p_col_count=1&_portlet_test_bench_railsRoute=caterpillar/test_bench/xhr/resource"
+
+    asserted_path = "http://localhost:8080/web/guest/test"
+    asserted_params = %w{
+      p_p_id=portlet_test_bench
+      p_p_lifecycle=2
+      p_p_state=normal
+      p_p_mode=view
+      p_p_cacheability=cacheLevelPage
+      p_p_col_id=column-2
+      p_p_col_count=1
+      _portlet_test_bench_railsRoute=caterpillar/test_bench/xhr/resource
+      }
+
+    #options = {
+    #  :controller => 'Caterpillar::XhrController',
+    #  :action     => :resource
+    #}
+    #url_for in ResourceUrl can't handle modularized controllers, use explicit route as workaround
+    options = { :route => 'caterpillar/test_bench/xhr/resource' }
+    namespace = 'portlet_test_bench'
+    
+    res = Caterpillar::Helpers::Liferay::ResourceUrl.new(
+      resource_url_cookie, namespace)
+    res.options = options
+
+    path, _params = res.to_s.split('?')
+    assert_equal path, asserted_path
+
+    params = _params.split('&')
+    assert_equal 8, params.size
+    asserted_params.each do |param|
+      assert params.include? param
+    end
+  end
+
+  def test_liferay_ResourceUrl_model_with_params
+    resource_url_cookie = 'http://localhost:8080/web/guest/test?p_p_id=portlet_test_bench&p_p_lifecycle=2&p_p_state=normal&p_p_mode=view&p_p_cacheability=cacheLevelPage&p_p_col_id=column-2&p_p_col_count=1&_portlet_test_bench_railsRoute=caterpillar/test_bench/xhr/resource'
+    asserted_path = "http://localhost:8080/web/guest/test"
+    asserted_params = %w{
+      p_p_id=portlet_test_bench
+      p_p_lifecycle=2
+      p_p_state=normal
+      p_p_mode=view
+      p_p_cacheability=cacheLevelPage
+      p_p_col_id=column-2
+      p_p_col_count=1
+      _portlet_test_bench_railsRoute=caterpillar/test_bench/xhr/index
+      _portlet_test_bench_foo=bar
+      }
+    # test that _portlet_test_bench_railsRoute was updated
+    # and _portlet_test_bench_foo was inserted
+
+    #url_for in ResourceUrl can't handle modularized controllers..
+    options = { :route => 'caterpillar/test_bench/xhr/index' }
+    portlet_params = {:foo => :bar}
+    namespace = 'portlet_test_bench'
+    
+    res = Caterpillar::Helpers::Liferay::ResourceUrl.new(
+      resource_url_cookie, namespace)
+    res.options = options
+    res.params = portlet_params
+
+    path, _params = res.to_s.split('?')
+    assert_equal path, asserted_path
+
+    params = _params.split('&')
+    assert_equal 9, params.size
+    asserted_params.each do |param|
+      assert params.include?(param), 'missing parameter: '+param
+    end
   end
   
   def test_liferay_resource_url
@@ -25,7 +112,7 @@ class LiferayHelpersTest < ActionController::TestCase # :nodoc:
     # expected behavior
     url = liferay_resource_url(params, resource_url)
     assert_not_nil url
-    assert_equal "#{resource_url}&railsRoute=/c1/a1", url
+    assert_equal "#{resource_url}?__railsRoute=/c1/a1", url
     
     params = {
       :controller => :c1
@@ -34,7 +121,7 @@ class LiferayHelpersTest < ActionController::TestCase # :nodoc:
     # expected behavior without :action param
     url = liferay_resource_url(params, resource_url)
     assert_not_nil url
-    assert_equal "#{resource_url}&railsRoute=/c1/index", url
+    assert_equal "#{resource_url}?__railsRoute=/c1", url
     
     # expected behavior without :controller
     params = {}

data/test/portlet_support_test.rb

@@ -4,22 +4,4 @@ require File.dirname(File.expand_path(__FILE__))+'/test_helper'
 class PortletSupportTest < ActionController::TestCase # :nodoc:
   include Caterpillar::PortletSupport
   
-  def test_get_liferay_preferences
-    # Simulated value from the cookie sent
-    value = "font_size=20px;background_color=#000000;page_size=20;"
-    
-    hash = get_liferay_preferences(value)
-    assert_not_nil hash
-    assert_equal 3, hash.length
-    [:font_size, :background_color, :page_size].each do |key|
-      hash.has_key? key
-    end
-    
-    ["20px", "#000000", "20"].each do |value|
-      hash.has_value? value
-    end
-    
-    assert_nil get_liferay_preferences(nil)
-  end
-  
 end

data/test/portlets_test.rb

@@ -6,20 +6,15 @@ require File.dirname(File.expand_path(__FILE__))+'/test_helper'
 
 class PortletsTest < Caterpillar::TestCase # :nodoc:
 
-#   def test_get
-#     @portlets.each do |portlet|
-#       next if portlet[:reqs].empty?
-#       @controller = portlet[:reqs][:controller]
-#       action = portlet[:reqs][:action]
-#       get action
-#     end
-#   end
-
   def test_session
-    key = Caterpillar::Security.get_session_key()
+    assert_not_nil @config.session_secret, 'No session secret in portlets.rb config'
+
+    key = @config.session_secret[:key]
     assert_not_nil key
-    secret = Caterpillar::Security.get_secret()
+    secret = @config.session_secret[:secret]
     assert_not_nil secret
+    assert_not_equal 'somereallylongrandomkey', secret,
+      'Please generate your private random shared secret!'
   end
 
   def test_name

data/test/xml_test.rb

@@ -28,7 +28,7 @@ class XmlTest < Caterpillar::TestCase # :nodoc:
       :path => "/test/path"
     }
 
-    session = {
+    session_secret = {
       :key    => '_test_session',
       :secret => 'XXX'
     }
@@ -38,26 +38,16 @@ class XmlTest < Caterpillar::TestCase # :nodoc:
     assert xml[/#{portlet[:title]}/]
     assert !xml[/secret/]
 
-    xml = Caterpillar::Portlet.portlet_element(portlet,session).to_s
-    assert xml[/#{session[:secret]}/], 'No secret'
+    xml = Caterpillar::Portlet.portlet_element(portlet,session_secret).to_s
+    assert xml[/#{session_secret[: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
-  end
-
   def test_portlet_xml
-    xml = Caterpillar::Portlet.xml(@portlets)
+    xml = Caterpillar::Portlet.xml(@portlets,{})
 
     # parse xml document
     doc = LibXML::XML::Parser.string(xml).parse

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 4
-  - 4
-  version: 1.4.4
+  - 6
+  - 0
+  version: 1.6.0
 platform: ruby
 authors: 
 - Mikael Lammentausta
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-07 00:00:00 +03:00
+date: 2011-06-08 00:00:00 +03:00
 default_executable: caterpillar
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,12 +56,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 3
         segments: 
         - 0
-        - 7
-        - 3
-        version: 0.7.3
+        version: "0"
   type: :runtime
   version_requirements: *id003
 description: = Caterpillar
@@ -75,11 +73,32 @@ extra_rdoc_files:
 - MIT-LICENSE
 - ChangeLog
 files: 
+- .gitignore
+- ChangeLog
+- MIT-LICENSE
+- README.rdoc
 - Rakefile
+- bin/caterpillar
+- caterpillar.gemspec
+- generators/caterpillar/USAGE
+- generators/caterpillar/caterpillar_generator.rb
+- generators/caterpillar/templates/config/portlets.rb
+- generators/caterpillar/templates/images/caterpillar/caterpillar.gif
+- generators/caterpillar/templates/images/portlet_test_bench/Leafy_Sea_Dragon_1.jpg
+- generators/caterpillar/templates/images/portlet_test_bench/debug.jpg
+- generators/caterpillar/templates/images/portlet_test_bench/java.png
+- generators/caterpillar/templates/images/portlet_test_bench/rails.png
+- generators/caterpillar/templates/images/portlet_test_bench/ruby.gif
+- generators/caterpillar/templates/javascripts/portlet_test_bench/main.js
+- generators/caterpillar/templates/stylesheets/portlet_test_bench/main.css
+- generators/html_template/html_template_generator.rb
+- generators/html_template/templates/application.html.erb
 - init.rb
 - install.rb
+- lib/caterpillar.rb
 - lib/caterpillar/config.rb
 - lib/caterpillar/helpers/liferay.rb
+- lib/caterpillar/helpers/portlet.rb
 - lib/caterpillar/liferay.rb
 - lib/caterpillar/navigation.rb
 - lib/caterpillar/parser.rb
@@ -89,25 +108,10 @@ files:
 - lib/caterpillar/task.rb
 - lib/caterpillar/usage.rb
 - lib/caterpillar/util.rb
-- lib/caterpillar.rb
-- lib/java/rails-portlet-0.10.1.jar
+- lib/java/rails-portlet-0.12.0.jar
 - lib/rails_gem_chooser.rb
 - lib/web/portlet.rb
-- generators/caterpillar/caterpillar_generator.rb
-- generators/caterpillar/templates/config/portlets.rb
-- generators/caterpillar/templates/images/caterpillar/caterpillar.gif
-- generators/caterpillar/templates/images/portlet_test_bench/debug.jpg
-- generators/caterpillar/templates/images/portlet_test_bench/java.png
-- generators/caterpillar/templates/images/portlet_test_bench/Leafy_Sea_Dragon_1.jpg
-- generators/caterpillar/templates/images/portlet_test_bench/rails.png
-- generators/caterpillar/templates/images/portlet_test_bench/ruby.gif
-- 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/README.rdoc
 - portlet_test_bench/controllers/caterpillar/application.rb
 - portlet_test_bench/controllers/caterpillar/css_controller.rb
 - portlet_test_bench/controllers/caterpillar/http_methods_controller.rb
@@ -121,7 +125,6 @@ files:
 - portlet_test_bench/controllers/caterpillar/xhr_controller.rb
 - portlet_test_bench/helpers/caterpillar/application_helper.rb
 - portlet_test_bench/helpers/caterpillar/junit_helper.rb
-- portlet_test_bench/README.rdoc
 - portlet_test_bench/resources/jake_sully.jpg
 - portlet_test_bench/routing.rb
 - portlet_test_bench/views/caterpillar/application/_back_to_menu.html.erb
@@ -162,11 +165,23 @@ files:
 - portlet_test_bench/views/caterpillar/resource/exit_portlet.html.erb
 - portlet_test_bench/views/caterpillar/resource/images.html.erb
 - portlet_test_bench/views/caterpillar/session/cookie.html.erb
+- portlet_test_bench/views/caterpillar/session/cookies.html.erb
 - portlet_test_bench/views/caterpillar/session/flash_display.html.erb
+- portlet_test_bench/views/caterpillar/session/namespace.html.erb
 - portlet_test_bench/views/caterpillar/user/home.html.erb
+- portlet_test_bench/views/caterpillar/xhr/resource.html.erb
 - portlet_test_bench/views/caterpillar/xhr/time.html.erb
 - portlet_test_bench/views/layouts/bare.html.erb
 - portlet_test_bench/views/layouts/basic.html.erb
+- spec/app1/config/routes.rb
+- spec/app2/config/routes.rb
+- spec/app3/config/routes.rb
+- spec/caterpillar/helper_spec.rb
+- spec/caterpillar/task_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb
+- spec/xml/liferay-portal-5.2.3/tomcat-6.0.18/webapps/ROOT/WEB-INF/liferay-display.xml
+- test/README
 - test/dtd/liferay-display_5_1_0.dtd
 - test/dtd/liferay-display_5_2_0.dtd
 - test/dtd/liferay-display_6_0_0.dtd
@@ -180,10 +195,8 @@ files:
 - test/rails_task_test.rb
 - test/test_helper.rb
 - test/xml_test.rb
-- bin/caterpillar
-- README.rdoc
-- MIT-LICENSE
-- ChangeLog
+- views/caterpillar/_navigation.html.erb
+- views/layouts/caterpillar.html.erb
 has_rdoc: true
 homepage: http://github.com/lamikae/caterpillar
 licenses: []
@@ -219,9 +232,18 @@ requirements: []
 rubyforge_project: rails-portlet
 rubygems_version: 1.3.7
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Caterpillar helps building Rails applications for JSR286 portlets.
 test_files: 
+- spec/app1/config/routes.rb
+- spec/app2/config/routes.rb
+- spec/app3/config/routes.rb
+- spec/caterpillar/helper_spec.rb
+- spec/caterpillar/task_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb
+- spec/xml/liferay-portal-5.2.3/tomcat-6.0.18/webapps/ROOT/WEB-INF/liferay-display.xml
+- test/README
 - test/dtd/liferay-display_5_1_0.dtd
 - test/dtd/liferay-display_5_2_0.dtd
 - test/dtd/liferay-display_6_0_0.dtd