caterpillar 0.9.4 → 0.9.5

data/ChangeLog

@@ -1,3 +1,13 @@
+= 0.9.5
+  - portlet xml definition to Liferay 5.2.0 standards
+  - liferay xml files are tagged by selection based on the configured version
+  - portlet jar installation based on Liferay version
+  - Upgrade to rails-portlet 0.6.1 for Liferay 5.2.x
+  - Fixed the sequences migration
+  - include ActionView helpers, raise an error if given exit_portlet url is nil
+  - fixed a small bug with inline JS parsing
+
+
 = 0.9.4
   - Web::PortletNames migrations + model
   - random small fixes

data/db/migrate/20081205000002_lportal_sequences.rb

@@ -6,7 +6,6 @@ class LportalSequences < ActiveRecord::Migration
     Address,
     Announcement::Delivery,
     Announcement::Entry,
-    Asset,
     Contact,
     Group,
     Permission,
@@ -19,6 +18,7 @@ class LportalSequences < ActiveRecord::Migration
     MB::Thread,
     MB::Discussion,
     MB::Category,
+    Tag::Asset,
     Tag::Entry,
     Tag::Property,
     Web::Layout,

data/lib/caterpillar.rb

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

data/lib/caterpillar/helpers/liferay.rb

@@ -1,8 +1,8 @@
 module Caterpillar
 module Helpers
   module Liferay
-#     include ActionView::Helpers::UrlHelper
-#     include ActionView::Helpers::TagHelper
+    include ActionView::Helpers::UrlHelper
+    include ActionView::Helpers::TagHelper
 
     # Formulates a link to Liferay.
     # Parameters:
@@ -69,9 +69,9 @@ module Helpers
 
         ### blog
         when 'com.liferay.portlet.blogs.model.BlogsEntry'
-          title = _('Linkki blogimerkintään "%s"') % obj.title
-          url = LiferayUrl.new(obj,@user,redirect).instance_url
-          link_to_exit_portlet( title, url )
+#           title = _('Linkki blogimerkintään "%s"') % obj.title
+#           url = LiferayUrl.new(obj,@user,redirect).instance_url
+#           link_to_exit_portlet( title, url )
 
 
         ### document library file
@@ -175,6 +175,7 @@ module Helpers
 
     # formulates a link that the rails286-portlet will leave unparsed.
     def link_to_exit_portlet(label, url)
+      raise 'No url given' if url.nil?
       link_to label, url_to_exit_portlet(url)
     end
 

data/lib/caterpillar/liferay.rb

@@ -1,5 +1,5 @@
 #--
-# (c) Copyright 2008 Mikael Lammentausta
+# (c) Copyright 2008,2009 Mikael Lammentausta
 # See the file LICENSES.txt included with the distribution for
 # software license details.
 #++
@@ -114,14 +114,17 @@ module Caterpillar
       xml << "\n"
       xml << '<!DOCTYPE %s PUBLIC' % doctype
       case doctype
+
       when 'liferay-portlet-app'
         xml << '  "-//Liferay//DTD Portlet Application %s//EN"' % version
         xml << '  "http://www.liferay.com/dtd/%s_%s.dtd">' % [
         doctype, version.gsub('.','_') ]
+
       when 'display'
         xml << '  "-//Liferay//DTD Display %s//EN"' % version
         xml << '  "http://www.liferay.com/dtd/liferay-%s_%s.dtd">' % [
         doctype, version.gsub('.','_') ]
+
       end
       xml << "\n\n"
       xml << '<%s>' % doctype
@@ -138,9 +141,17 @@ module Caterpillar
     def dtd_version(type)
       case type
       when 'liferay-portlet-app'
-        '5.1.0'
+        if @version[/5.1/]
+          '5.1.0'
+        elsif @version[/5.2/]
+          '5.2.0'
+        end
       when 'display'
-        '5.1.0'
+        if @version[/5.1/]
+          '5.1.0'
+        elsif @version[/5.2/]
+          '5.2.0'
+        end
       end
     end
 

data/lib/caterpillar/portlet.rb

@@ -37,16 +37,18 @@ module Caterpillar
 
     protected
 
+    # JSR 286 portlet XML header. Opens portlet-app.
     def header
-      xml =  '<?xml version="1.0" encoding="UTF-8"?>'
-      xml << "\n"
+      xml =  '<?xml version="1.0" encoding="UTF-8"?>' +"\n"
       xml << '<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd">'
+             xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
+             version="2.0">'
       xml << "\n\n"
       return xml
     end
 
+    # Closes portlet-app.
     def footer
       '</portlet-app>' + "\n"
     end

data/lib/caterpillar/task.rb

@@ -43,6 +43,10 @@ module Caterpillar
       @config = Util.eval_configuration(config)
       yield self if block_given?
       @xml_files = []
+      info 'Caterpillar v.%s' % Caterpillar::VERSION
+      info 'Configured to use %s version %s' % [
+        @config.container.class.to_s.sub('Caterpillar::',''), @config.container.version
+      ]
       send tasks
     end
 
@@ -80,7 +84,10 @@ module Caterpillar
         tasks << "#{@name}:liferayportletapp"
         tasks << "#{@name}:liferaydisplay"
       end
-      tasks << "portlets" # finally print produced portlets
+ 
+      # print produced portlets
+      tasks << :portlets
+
       task :xml => tasks
     end
 
@@ -112,6 +119,7 @@ module Caterpillar
     def define_portlets_task
       desc 'Prints portlet configuration'
       task :portlets => :parse do
+        info 'Portlet configuration ***********************'
         print_portlets(@portlets)
       end
     end
@@ -166,9 +174,9 @@ module Caterpillar
       @name = :xml
       # set the output filename
       if @config.container.kind_of? Liferay
-        file = 'portlet-ext.xml'
+        file = File.join('tmp','portlet-ext.xml')
       else
-        file = 'portlet.xml'
+        file = File.join('tmp','portlet.xml')
       end
       @xml_files << file
       with_namespace_and_config do |name, config|
@@ -178,7 +186,7 @@ module Caterpillar
           f=File.open(file,'w')
           f.write Portlet.xml(@portlets)
           f.close
-          STDOUT.puts 'Created %s' % file
+          info '-> %s' % file
         end
       end
     end
@@ -186,7 +194,7 @@ module Caterpillar
     # Writes liferay-portlet-ext.xml
     def define_liferayportletappxml_task
       @name = :xml
-      file = 'liferay-portlet-ext.xml'
+      file = File.join('tmp','liferay-portlet-ext.xml')
       @xml_files << file
       with_namespace_and_config do |name, config|
         desc 'Create Liferay portlet XML'
@@ -195,7 +203,7 @@ module Caterpillar
           f=File.open(file,'w')
           f.write config.container.portletapp_xml(@portlets)
           f.close
-          STDOUT.puts 'Created %s' % file
+          info '-> %s' % file
         end
       end
     end
@@ -203,8 +211,10 @@ module Caterpillar
     # Writes liferay-display.xml
     def define_liferaydisplayxml_task
       @name = :xml
-      file = 'liferay-display.xml'
+      file = File.join('tmp','liferay-display.xml')
       @xml_files << file
+      raise 'This version of Liferay is broken!' if @config.container.version == '5.1.2'
+
       with_namespace_and_config do |name, config|
         desc 'Create Liferay display XML'
         task :liferaydisplay do
@@ -212,7 +222,7 @@ module Caterpillar
           f=File.open(file,'w')
           f.write config.container.display_xml(@portlets)
           f.close
-          STDOUT.puts 'Created %s' % file
+          info '-> %s' % file
         end
       end
     end
@@ -277,8 +287,13 @@ module Caterpillar
           raise 'Only Liferay is supported' unless @config.container.kind_of? Liferay
           require 'find'
 
-          #version = '0.5.2'
-          version = '0.6.0'
+          version = (
+            if @config.container.version[/^5.2/]
+              '0.6.1'
+            else
+              version = '0.5.2' # think of a way to branch properly
+            end
+          )
 
           portlet_jar = nil
           old_jar = nil
@@ -306,11 +321,11 @@ module Caterpillar
             end
           end
 
-          info 'Installing Rails-portlet version %s to %s' % [version, target]
           system('cp %s %s' % [portlet_jar,target])
+          info 'installed Rails-portlet version %s to %s' % [version, target]
           if old_jar
-            info 'Removing old version'
             system('rm -f %s' % old_jar)
+            info '..removed the old version %s' % old_jar
           end
 
         end
@@ -371,30 +386,41 @@ module Caterpillar
       desc 'Create a WAR package with Warbler'
       task :warble do
         unless ENV['JRUBY_HOME']
-          info 'Environment variable JRUBY_HOME is not set, exiting'
+          info ''
+          info 'Environment variable JRUBY_HOME is not set, exiting -'
+          info 'You should `export JRUBY_HOME="/usr/local/jruby"` and `sudo -E caterpillar %s`' % ARGV[0]
+          info ''
           exit 1
         end
         jruby = File.join(ENV['JRUBY_HOME'],'bin','jruby')
         unless File.exists?(jruby)
+          info ''
           info 'JRuby executable was not found in %s, exiting' % jruby
           exit 1
         end
-        unless system('which warble')
-          info 'Warbler was not found in PATH, exiting'
+        begin
+          require 'warbler'
+        rescue
+          info ''
+          info 'Warbler module was not found, exiting. Install Warbler for JRuby.'
           exit 1
         end
         unless File.exists?(@config.warbler_conf)
+          info ''
           info 'Warbler configuration file %s was not found, exiting' % @config.warbler_conf
           exit 1
         end
-        info 'building WAR package using JRuby (%s)' % jruby
+        info ''
+        info 'Building WAR using Warbler on JRuby (%s)' % jruby
+        info ''
         system(jruby+' -S warble war')
 
       end
     end
 
     def define_deploy_task
-      desc 'Deploy XML files and WAR package to the portlet container'
+      desc 'Deploy XML files and the application WAR to the portlet container'
+      #info 'Deploying XML files and the application WAR'
 
       raise 'Only deployment to Liferay on Tomcat is supported' unless @config.container.kind_of? Liferay
       tasks = [:xml, :warble, 'deploy:xml', 'deploy:war']
@@ -406,12 +432,12 @@ module Caterpillar
       with_namespace_and_config do |name, config|
         desc 'Deploys the XML files'
         task :xml do
-          info 'deploying XML files'
           target = @config.container.WEB_INF
+          info 'deploying XML files to %s' % target
 
           @xml_files.each do |file|
             system('cp %s %s' % [file,target])
-            info 'copied %s into %s' % [file,target]
+            info ' %s' % [file]
           end
         end
       end

data/lib/caterpillar/util.rb

@@ -11,8 +11,9 @@ module Caterpillar
 
     # Reads the configuration
     def eval_configuration(config=nil)
-      if config.nil? && File.exists?(Config::FILE)
-        config = eval(File.open(Config::FILE) {|f| f.read})
+      cf = File.join([RAILS_ROOT,Caterpillar::Config::FILE])
+      if config.nil? && File.exists?(cf)
+        config = eval(File.open(cf) {|f| f.read})
       end
       config ||= Config.new
       unless config.kind_of? Config

data/test/xml_test.rb

@@ -10,15 +10,23 @@ class XmlTest < Caterpillar::TestCase # :nodoc:
   end
 
   def test_liferay_display_xml
-    xml = Caterpillar::Liferay.new(@config).display_xml(@portlets)
+    xml = @config.container.display_xml(@portlets)
     assert_not_nil xml
     assert !xml.empty?
   end
 
   def test_liferay_portlet_xml
-    xml = Caterpillar::Liferay.new(@config).portletapp_xml(@portlets)
-    assert_not_nil xml
-    assert !xml.empty?
+    { '5.1.1' => '5.1.0',
+      '5.2.0' => '5.2.0' }.each_pair do |version,tld|
+
+      @config.container.version = version
+      xml = @config.container.portletapp_xml(@portlets)
+      assert_not_nil xml
+      assert !xml.empty?
+      assert_not_nil xml[/liferay-portlet-app.*#{tld}/], 'Failed to create DTD with proper version; liferay %s' % version
+    end
   end
 
+
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: caterpillar
 version: !ruby/object:Gem::Version 
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors: 
 - Mikael Lammentausta
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-23 00:00:00 +02:00
+date: 2009-02-07 00:00:00 +02:00
 default_executable: caterpillar
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,11 +47,8 @@ files:
 - install.rb
 - init.rb
 - lib/java
-- lib/java/rails-portlet-0.6.0.jar
 - lib/java/rails-portlet-0.5.2.jar
-- lib/java/commons-httpclient-3.1.jar
-- lib/java/htmlparser-1.6.jar
-- lib/java/commons-codec-1.3.jar
+- lib/java/rails-portlet-0.6.1.jar
 - lib/caterpillar
 - lib/caterpillar/config.rb
 - lib/caterpillar/helpers