caterpillar 1.0.0 → 1.0.1

data/ChangeLog

@@ -1,3 +1,9 @@
+= 1.0.1
+	- added test for liferay session variables
+	- fixed XML validation error on 5.2.3 (all portlets are now uninstanceable)
+	- fix jar installation; do not copy VCS files
+	- require lportal version 1.0.18
+
 = 1.0.0
 	- improved rubygem loading; detect RAILS_GEM_VERSION
 	- included portlet test bench

data/lib/caterpillar.rb

@@ -5,7 +5,7 @@
 #++
 
 module Caterpillar
-  VERSION='1.0.0'
+  VERSION='1.0.1'
 end
 
 this_file = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__

data/lib/caterpillar/liferay.rb

@@ -1,6 +1,7 @@
 #--
 # (c) Copyright 2008,2009 Mikael Lammentausta
-# See the file LICENSES.txt included with the distribution for
+#
+# See the file MIT-LICENSE included with the distribution for
 # software license details.
 #++
 
@@ -227,11 +228,13 @@ module Caterpillar
       xml << "    <portlet-name>%s</portlet-name>\n" % portlet[:name]
       xml << "    <icon>/%s/favicon.ico</icon>\n" % portlet[:servlet]
       # can there be several portlet instances on the same page?
-      xml << "    <instanceable>true</instanceable>\n"
-      # define the control panel category for 5.2 and newer
+      xml << "    <instanceable>false</instanceable>\n"
+      # define the control panel category for 5.2 and newer -
+      # Note that when the control panel settings are defined,
+      # the portlet cannot be instanceable.
       unless @version[/5.1/]
         xml << "    <control-panel-entry-category>#{portlet[:category]}</control-panel-entry-category>\n"
-        xml << "    <control-panel-entry-weight>99.0</control-panel-entry-weight>\n"
+        xml << "    <control-panel-entry-weight>1.0</control-panel-entry-weight>\n"
       end
       # include javascripts?
       js_tag = (@version[/5.1/] ? 'header' : 'footer') + '-portal-javascript'

data/lib/caterpillar/task.rb

@@ -370,7 +370,7 @@ module Caterpillar
 
           require 'find'
           Find.find(source) do |file|
-            if File.basename(file) =~ /rails-portlet-#{version}/
+            if File.basename(file) =~ /^rails-portlet-#{version}.jar$/
               portlet_jar = file
             end
           end
@@ -381,17 +381,17 @@ module Caterpillar
               old_version = file[/(\d.\d.\d).jar/,1]
               # check if there's an update available
               if version.gsub(/\./,'').to_i > old_version.gsub(/\./,'').to_i
-                info 'Rails-portlet version %s is found, but an update is available.' % old_version
+                info 'Rails-portlet version %s is found, but an update is available' % old_version
                 old_jar = file
               else
-                info 'Rails-portlet version %s is already installed.' % old_version
+                info 'Rails-portlet version %s is already installed (%s)' % [old_version,file]
                 exit 0
               end
             end
           end
 
           exit 1 unless system('cp %s %s' % [portlet_jar,target])
-          info 'installed Rails-portlet version %s to %s' % [version, target]
+          info 'installed Rails-portlet version %s (%s)' % [version, File.join(target,portlet_jar)]
           if old_jar
             exit 1 unless system('rm -f %s' % old_jar)
             info '..removed the old version %s' % old_jar

data/portlet_test_bench/controllers/caterpillar/liferay_controller.rb

@@ -0,0 +1,8 @@
+class Caterpillar::LiferayController < Caterpillar::ApplicationController
+
+  def session_variables
+    @uid = params[:uid]
+    @gid = params[:gid]
+  end
+
+end

data/portlet_test_bench/routing.rb

@@ -37,6 +37,29 @@ module Caterpillar #:nodoc:
           'caterpillar/test_bench/user/:action',
           {:controller => 'Caterpillar::User'})
 
+
+        @set.add_route(
+          'caterpillar/test_bench/liferay/:action',
+          {:controller => 'Caterpillar::Liferay'})
+
+        # Liferay session variables.
+        #
+        # Watch out for route conflicts!
+        # If the route would be /something/:uid,
+        # a later defined route /something/:gid would never match.
+
+        @set.add_route(
+          'caterpillar/test_bench/liferay/:action/uid/:uid',
+          {:controller => 'Caterpillar::Liferay'})
+
+        @set.add_route(
+          'caterpillar/test_bench/liferay/:action/gid/:gid',
+          {:controller => 'Caterpillar::Liferay'})
+
+        @set.add_route(
+          'caterpillar/test_bench/liferay/:action/uid/:uid/gid/:gid',
+          {:controller => 'Caterpillar::Liferay'})
+
       end
     end
   end

data/portlet_test_bench/views/caterpillar/application/index.html.erb

@@ -1,8 +1,14 @@
 <body>
+<h1>
+Rails-portlet test bench
+</h1>
+<p style="font-size: 14px;">
+These are isolated test cases of the Rails-portlet. These cases cover the most common techniques used in dynamic web applications. The <%= link_to_exit_portlet 'source code', 'http://rails-portlet.rubyforge.org/svn/trunk/caterpillar/portlet_test_bench/' -%> can be used as a reference for using the same features in other Rails apps.
+</p>
 
 <h1>HTTP</h1>
 
-  <%= link_to 'URL parameters',
+  <%= link_to 'URL parameter passing',
         :controller => 'Caterpillar::HttpMethods', :action => :parameter  -%><br />
 
   <%= link_to 'HTTP POST form',
@@ -60,6 +66,8 @@
   <%= link_to 'Link outside the portlet',
         :controller => 'Caterpillar::Resource', :action => :exit_portlet  -%><br />
 
+  <%= link_to 'Liferay session variables',
+        :controller => 'Caterpillar::Liferay', :action => :session_variables -%><br />
 
 
   <%#= link_to 'Login',

data/portlet_test_bench/views/caterpillar/liferay/session_variables.html.erb

@@ -0,0 +1,34 @@
+<h1>Liferay session variables</h1>
+<p>
+These tests check that Liferay session variables are available in Rails.
+</p>
+
+<p>
+These variables are accessible in Java JSR286 portlets from the Liferay API.
+When the Rails-portlet receives a request where the URL contains keywords %UID% or %GID%, these are replaced by the values received from the Liferay API. Rails receives a request with the actual UID number and GID numbers, respectively. The page (Layout in the database) where the portlet is has defined this Group.
+</p>
+
+<p>
+  <%= link_to 'UID', url_for(:action => :session_variables)+'/uid/%UID%' -%><br/>
+  <%#= link_to 'UID debug', url_for(:action => :session_variables)+'/uid/10000' -%><br/>
+  <% if @uid -%>
+    <span style="font-size: 14px;">
+      Received UID: <%= @uid %>
+    </span>
+  <% end -%>
+</p>
+
+<p>
+  <%= link_to 'GID', url_for(:action => :session_variables)+'/gid/%GID%' -%><br/>
+  <%#= link_to 'GID debug', url_for(:action => :session_variables)+'/gid/20000' -%><br/>
+  <% if @gid -%>
+    <span style="font-size: 14px;">
+      Received GID: <%= @gid %>
+    </span>
+  <% end -%>
+</p>
+
+<p style="font-size: 18px;">
+  <%= link_to 'Reset', :action => :session_variables -%>
+</p>
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: caterpillar
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Mikael Lammentausta
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-22 00:00:00 +03:00
+date: 2009-07-12 00:00:00 +03:00
 default_executable: caterpillar
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -101,6 +101,7 @@ files:
 - portlet_test_bench/controllers/caterpillar/js_controller.rb
 - portlet_test_bench/controllers/caterpillar/user_controller.rb
 - portlet_test_bench/controllers/caterpillar/css_controller.rb
+- portlet_test_bench/controllers/caterpillar/liferay_controller.rb
 - portlet_test_bench/views
 - portlet_test_bench/views/caterpillar
 - portlet_test_bench/views/caterpillar/application
@@ -123,6 +124,8 @@ files:
 - portlet_test_bench/views/caterpillar/resource/images.html.erb
 - portlet_test_bench/views/caterpillar/login
 - portlet_test_bench/views/caterpillar/login/index.html.erb
+- portlet_test_bench/views/caterpillar/liferay
+- portlet_test_bench/views/caterpillar/liferay/session_variables.html.erb
 - portlet_test_bench/views/caterpillar/js
 - portlet_test_bench/views/caterpillar/js/jquery.html.erb
 - portlet_test_bench/views/caterpillar/js/link_to_post.html.erb