caterpillar 1.4.4 → 1.6.0

data/.gitignore

@@ -0,0 +1,9 @@
+.DS_Store
+.#*
+pkg
+*~
+coverage
+*.xml
+*.gem
+caterpillar-developer
+examples

data/ChangeLog

@@ -1,3 +1,30 @@
+= 1.6.0
+Tested with Rails 2 and Liferay 5 and 6.
+  - upgrade to Rails-portlet jar 0.12, which supports both Liferay5 and Liferay6
+  - use most recent Liferay version (6.0.6) in the default config template, although container version in configuration is now obsolete
+  - remove parsing of :uid and :gid path variables
+  - update portlet test bench to get Liferay UID and GID from a cookie, and move the helper methods to Caterpillar::Helpers::Liferay
+  - refactor shared secret to portlets.rb - requires config file update for existing installations - see the portlets.rb config template
+  - removed useless and broken link_to_liferay() method
+  - cleaned up some of the init process
+  - update test bench cookie actions
+  - change test bench css colors to human-readable
+
+= 1.5.0
+This version contains a number of changes over a long period of time.
+Tested to work on Rails 2.3.8 and 2.3.10.
+Major changes include:
+  - compatibility with rails 2.3.10
+  - added PortletSupport#ajax_response method
+  - introduce ResourceUrl
+
+Smaller changes include:
+
+  - fixed return link in test bench
+  - some new test cases
+  - removed rake related libraries from gemspec
+  - pruning of the Rakefile: removing the RDoc task that was broken, add a 'gem' task
+
 = 1.4.4
 	- XML fixes
 	- added /caterpillar view

data/MIT-LICENSE

@@ -1,9 +1,5 @@
-= Caterpillar
-
 Caterpillar is provided under the terms of the MIT license.
 
-(c) Copyright 2008,2009 Mikael Lammentausta for Cel'Amanzi Ltd
-
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation files
 (the "Software"), to deal in the Software without restriction,

data/README.rdoc

@@ -138,12 +138,12 @@ For example:
     :preferences_route => '/my_portlet/test/preferences'
   }
 
-Rails-portlet will provide us a hash with all saved preferences, to access this method we need to include the Caterpillar::PortletSupport module, like:
-  include Caterpillar::PortletSupport
+Rails-portlet will provide us a hash with all saved preferences, to access this method we need to include the Caterpillar::Helpers::Liferay module, like:
+  include Caterpillar::Helpers::Liferay
 
 This module will provide <b>get_liferay_preferences</b> method which returns the preferences hash. A good approach is to include this module on <i>ApplicationController</i>, like:
   class ApplicationController < ActionController::Base
-    include Caterpillar::PortletSupport
+    include Caterpillar::Helpers::Liferay
 
     helper :all # include all helpers, all the time
     protect_from_forgery # See ActionController::RequestForgeryProtection for details

data/Rakefile

@@ -1,17 +1,17 @@
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
-require 'rake/gempackagetask'
-load 'caterpillar.gemspec'
-
-# gem install rspec -v 1.3.0
 require 'spec/rake/spectask'
-# gem install rcov
 require 'spec/rake/verify_rcov'
 
 desc 'Default: create API doc.'
 task :default => :rdoc
 
+desc "Create the caterpillar gem file"
+task :gem do
+  spec = eval(IO.read("caterpillar.gemspec"))
+  Gem::Builder.new(spec).build
+end
+
 Spec::Rake::SpecTask.new do |t|
   t.spec_opts ||= []
   t.spec_opts << "--options" << "spec/spec.opts"
@@ -21,21 +21,5 @@ Spec::Rake::SpecTask.new("spec:rcov") do |t|
   t.spec_opts ||= []
   t.spec_opts << "--options" << "spec/spec.opts"
   t.rcov = true
-#  t.rcov_opts = ['--text-report', '--exclude', "gems/,spec/,rcov.rb,#{File.expand_path(File.join(File.dirname(__FILE__),'../../..'))}"] 
   t.rcov_opts = ['--exclude', 'diff-lcs,rake,spec,rcov,active_support,action_controller,action_view,json,rack']
 end
-
-RCov::VerifyTask.new(:rcov => "spec:rcov") do |t|
-  t.threshold = 100
-end
-
-desc 'Generate documentation for the example plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Caterpillar'
-  rdoc.main = 'README.rdoc'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-  rdoc.rdoc_files.include('generators/**/*.rb')
-  rdoc.options << '--line-numbers' << '--inline-source' << '-U'
-end

data/caterpillar.gemspec

@@ -0,0 +1,28 @@
+require 'rubygems'
+require 'lib/caterpillar'
+
+Gem::Specification.new do |s|
+  s.name = %q{caterpillar}
+  s.authors = ["Mikael Lammentausta"]
+  s.email = %q{mikael.lammentausta@gmail.com}
+  s.homepage = %q{http://github.com/lamikae/caterpillar}
+  s.version = Caterpillar::VERSION
+    
+	s.add_dependency("hpricot", ">= 0.6.164")
+	s.add_dependency("jrexml")
+	s.add_dependency("rake")
+
+  s.description = %q{= Caterpillar}
+
+  s.executables = ["caterpillar"]
+  s.default_executable = %q{caterpillar}
+
+  s.files = `git ls-files`.split("\n")
+
+  s.extra_rdoc_files = ["README.rdoc","MIT-LICENSE","ChangeLog"]
+  s.rdoc_options = ["--main", "README.rdoc"]
+  s.rdoc_options << '--line-numbers' << '--inline-source'
+  s.rubyforge_project = %q{rails-portlet}
+  s.summary = %q{Caterpillar helps building Rails applications for JSR286 portlets.}
+  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+end

data/generators/caterpillar/caterpillar_generator.rb

@@ -18,6 +18,16 @@ class CaterpillarGenerator < Rails::Generator::Base
   end
 
   def after_generate
+    # generate random shared secret
+    msg(
+      "Generating new random shared secret to config/portlets.rb"
+    )
+    File.open(File.join('config','portlets.rb'), "r+") do |f|
+      newconf = f.read().sub('somereallylongrandomkey', Caterpillar::Security::random_secret)
+      f.seek 0
+      f.write newconf
+    end
+
     msg(
       "If you want to use the portlet test bench,\n" + \
       "put the following line in your config/routes.rb before other routes.\n" + \
@@ -37,10 +47,8 @@ class CaterpillarGenerator < Rails::Generator::Base
     record do |m|
 
       ### config ###
-#     m.directory('config')
-#     file = 'portlets.rb'
-#     m.file(File.join('config',file), File.join('config',file))
-      m.template('config/portlets.rb','config/portlets.rb')
+      file = File.join('config','portlets.rb')
+      m.template(file,file)
 
       ### Navigation ###
       target = File.join('public','images')

data/generators/caterpillar/templates/config/portlets.rb

@@ -5,7 +5,7 @@ Caterpillar::Config.new do |portlet|
   # By default only portlet.xml is created.
   # Currently only Liferay is supported. You may optionally define the version.
   portlet.container = Liferay
-  # portlet.container.version = '5.2.3'
+  # portlet.container.version = '6.0.6'
 
   # If you want to install the Rails-portlet JAR into the container, the container
   # WEB-INF will be used.
@@ -15,7 +15,7 @@ Caterpillar::Config.new do |portlet|
   #
   # No changes are made to any of the files in this directory while making XML,
   # only the deploy and install tasks make any changes.
-  # portlet.container.root = '/usr/local/liferay/tomcat/'
+  # portlet.container.root = '/usr/local/liferay-portal-6.0.6/tomcat-6.0.29'
 
   # The server that the container is running on.
   # Possible values:
@@ -87,6 +87,14 @@ Caterpillar::Config.new do |portlet|
     :title    => 'Rails-portlet test bench',
     :category => 'Caterpillar'
   }
+  
+  # This secret string is shared between the portlets and the Rails server,
+  # and passed in a cookie with every request.
+  # It is used to prevent spoofed requests from unauthorized clients.
+  portlet.session_secret = {
+    :key    => '_rails_portlet',
+    :secret => 'somereallylongrandomkey'
+  }
 
   # this will include all named routes without further configuration
   portlet.include_all_named_routes = true

data/generators/caterpillar/templates/stylesheets/portlet_test_bench/main.css

@@ -1,7 +1,7 @@
 /* main.css */
 
 body {
-background-color: #FFFFCC;
+background-color: gray;
 }
 
 /* testing leading whitespaces */
@@ -38,7 +38,7 @@ font: 14px Times New Roman;
 
 /* used on css test page */
 #simple_content {
-margin: 25px; padding: 10px; border: 1px solid #000000; background: #93FFE4;
+margin: 25px; padding: 10px; border: 1px solid #000000; background: purple; color: white;
 }
 
 /* resource test page */

data/init.rb

@@ -1,14 +1,13 @@
 # encoding: utf-8
-
-
 #--
-# (c) Copyright 2008,2009 Mikael Lammentausta
+# (c) Copyright 2008 - 2011 Mikael Lammentausta
+#               2010 - 2011 Tulio Ornelas dos Santos
 #
 # See the file MIT-LICENSE included with the distribution for
 # software license details.
 #++
 
-### Initialize the Rails plugin.
+### Initializes the Rails2 plugin
 
 file = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
 this_dir = File.dirname(File.expand_path(file))
@@ -16,21 +15,34 @@ this_dir = File.dirname(File.expand_path(file))
 # load the main file
 require File.join(this_dir, 'lib', 'caterpillar')
 
-#STDERR.puts 'Caterpillar: version %s' % Caterpillar::VERSION
-
 # Add Caterpillar portlet navigation to views paths
 ActionController::Base.append_view_path File.join(this_dir, 'views')
 
+# Detect Rails version to use proper load commands
+v = RailsGemChooser.version
+raise 'Unable to detect available Rails version' unless v
+rails_version = v.gsub('.','').to_i
+
 ### Initialize the portlet test bench
 
 # Adding directories to the load path makes them appear just like files in the the main app directory.
 %w{ controllers helpers }.each do |path|
-  ActiveSupport::Dependencies.load_paths << File.join(this_dir, 'portlet_test_bench', path)
+  if rails_version > 238
+    # this changed between 2.3.8 and 2.3.10
+    ActiveSupport::Dependencies.autoload_paths << File.join(this_dir, 'portlet_test_bench', path)
+  else
+    ActiveSupport::Dependencies.load_paths << File.join(this_dir, 'portlet_test_bench', path)
+  end
 end
 
 # Removing a directory from the load once paths allow changes
 # to be picked up as soon as you save the file – without having to restart the web server.
-ActiveSupport::Dependencies.load_once_paths.delete(File.join(this_dir, 'portlet_test_bench'))
+if rails_version > 238
+  # this changed between 2.3.8 and 2.3.10
+  ActiveSupport::Dependencies.autoload_once_paths.delete(File.join(this_dir, 'portlet_test_bench'))
+else
+  ActiveSupport::Dependencies.load_once_paths.delete(File.join(this_dir, 'portlet_test_bench'))
+end
 
 # Add views
 ActionController::Base.append_view_path File.join(this_dir, 'portlet_test_bench','views')

data/lib/caterpillar.rb

@@ -1,16 +1,18 @@
 # encoding: utf-8
 #--
-# (c) Copyright 2008-2010 Mikael Lammentausta
-#                    2010 Tulio Ornelas
+# (c) Copyright 2008 - 2011 Mikael Lammentausta
+#               2010 Tulio Ornelas dos Santos
 #
 # See the file MIT-LICENSE included with the distribution for
 # software license details.
 #++
 
-module Caterpillar   
-  VERSION = '1.4.4' unless defined? Caterpillar::VERSION
+module Caterpillar
+  VERSION = '1.6.0' unless defined? Caterpillar::VERSION
 end
 
+STDOUT.puts 'Caterpillar: version %s' % Caterpillar::VERSION
+
 this_file = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
 this_dir = File.dirname(File.expand_path(this_file))
 
@@ -32,30 +34,34 @@ require 'find'
 require 'rake'
 require 'rake/tasklib'
 
-if defined? RAILS_ROOT
-	# NOTE: During normal startup (not while building the gem),
-	# ActiveRecord should be loaded at this point, before loading any of the models.
-	# However, this may conflict later when Rails' rake task activates the boot process.
-	# The correct versions should be loaded at this point.
-	require File.join(this_dir,'rails_gem_chooser')
-	RailsGemChooser.__load # detects the Rails config file from RAILS_ROOT
+require File.join(this_dir,'rails_gem_chooser')
+
+if (defined? RAILS_ROOT)
+  # ActiveRecord should be loaded at this point, before loading any of the models.
+  # However, this may conflict later when Rails' rake task activates the boot process.
+  # The correct versions should be loaded at this point.
+  RailsGemChooser.__load # detects the Rails config file from RAILS_ROOT
 end
 
 # include all ruby files
-Find.find(this_dir) do |file|
-  if FileTest.directory?(file)
-    if File.basename(file) == 'deprecated'
-      Find.prune # Don't look any further into this directory.
-
-    # load helpers only in Rails environment
-    elsif (not defined?(RAILS_ENV) and %w{web helpers}.include?(File.basename(file)))
-      Find.prune
-
-    else
-      next
-    end
-  else
-    # do not require this file twice
-    require file if file[/.rb$/] and File.basename(file) != File.basename(this_file)
-  end
+%w{
+  config
+  util
+  usage
+  task
+  security
+  portlet_support
+  portlet
+  parser
+  navigation
+  liferay
+}.each do |src|
+  require File.join(this_dir, 'caterpillar', src+'.rb')
+end
+
+# these are used in Rails environment
+if (defined? RAILS_ENV)
+  require File.join(this_dir, 'web', 'portlet.rb')
+  require File.join(this_dir, 'caterpillar', 'helpers', 'portlet.rb')
+  require File.join(this_dir, 'caterpillar', 'helpers', 'liferay.rb')
 end

data/lib/caterpillar/config.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 #--
 # (c) Copyright 2008 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.
 #++
 
@@ -41,6 +41,8 @@ module Caterpillar
     attr_accessor :warbler_conf
 
     attr_accessor :logger
+    
+    attr_accessor :session_secret
 
     # Sets sane defaults that are overridden in the config file.
     def initialize(detect_configuration_file = true)

data/lib/caterpillar/helpers/liferay.rb

@@ -1,35 +1,129 @@
 # encoding: utf-8
-
+#--
+# Copyright (c) 2007-2011 Mikael Lammmentausta
+#               2010 Tulio Ornelas dos Santos
+#
+# See the file MIT-LICENSE included with the distribution for
+# software license details.
+#++
 
 require 'rubygems'
 require 'action_controller'
 
-module Caterpillar
-module Helpers
+module Caterpillar # :nodoc:
+module Helpers # :nodoc:
   
   # This module contains Rails helpers that provide methods to deal with various aspects
   # of portlet functionality in Liferay.
-  #
-  # Currently this consists of things that were constructed whenever needed during development,
-  # and concidered general enough to be included here.
-  #
-  # link_to_liferay is deprecated, and is clearly a wrong way to solve the problem in question.
-  # A better way has been constructed, but it is not perfect due to its dependency on a specific portlet.
   module Liferay
-    include ActionView::Helpers::UrlHelper
     include ActionView::Helpers::TagHelper
-
-    def liferay_resource_url(params, resource_url = cookies[:Liferay_resourceUrl])
-      if resource_url.nil? then return raise "resource_url is needed!" end
+    include Portlet
+    
+    class ResourceUrl
+      include ActionController::UrlWriter
+      
+      require 'uri'
       
-      controller = params.delete :controller
-      action = params.delete :action
+      attr_accessor :resource_uri
+      attr_accessor :namespace
+      attr_accessor :options
+      attr_accessor :params
       
-      if controller.nil? then return resource_url end
-      if action.nil? then action = :index end
+      def initialize(base_url, namespace = '', options = {}, params = {})
+        @resource_uri = URI.parse(base_url)
+        @namespace = namespace
+        @options = options
+        @params = params
+      end
       
-      url = "#{resource_url}&railsRoute=/#{controller}/#{action}"
+      def to_s()
+        uri = @resource_uri.dup
+        if @options.values.compact.empty?
+          # pass
+        else
+          query = {}
+          # unpack query
+          unless uri.query.nil?
+            uri.query.split('&').map do |p| p.split('=').reduce {|k,v| query.update({k => v})} end
+          end
+          # since url_for can't handle modularized controllers at this point,
+          # offer an explicit route as a workaround.
+          if @options[:route]
+            route = @options[:route]
+          else
+            # need controller and action
+            options = @options.dup
+            options.update(:host => 'localhost') unless options[:host]
+            options.update(:only_path => true)
+            if options[:action].nil? then options.update(:action => 'index') end
+            route = url_for(options)
+          end
+          query.update('_%s_%s' % [@namespace,'railsRoute'] => route)
+          @params.each_pair do |k,v|
+            query.update('_%s_%s' % [@namespace,k] => v)
+          end
+          # pack query
+          uri.query = query.each_pair.map{|k,v| '%s=%s' % [k,v]}.join('&')
+        end
+        return '%s://%s:%i%s' % [uri.scheme, uri.host, uri.port, uri.request_uri]
+      end
       
+    end
+    
+    def resource_url_cookie
+      cookies[:Liferay_resourceUrl]
+    end
+    
+    def preferences_cookie
+      cookies[:Liferay_preferences]
+    end
+    
+    # Get the Liferay UID from cookie.
+    def get_liferay_uid
+      uid_key = 'Liferay_UID'
+      unless cookies.nil? or cookies[uid_key].nil?
+        @uid = cookies[uid_key]
+        logger.debug("Liferay UID %s" % @uid)
+      else
+        logger.debug("UID key is not present in cookies %s" % cookies.inspect)
+      end
+    end
+
+    # Get the Liferay GID from cookie.
+    def get_liferay_gid
+      gid_key = 'Liferay_GID'
+      unless cookies.nil? or cookies[gid_key].nil?
+        @gid = cookies[gid_key]
+        logger.debug("Liferay GID %s" % @gid)
+      else
+        logger.debug("GID key is not present in cookies %s" % cookies.inspect)
+      end
+    end
+    
+    # Formulate resource URL for Liferay.
+    # The request will be handled by serveResource().
+    # The cookie "Liferay_resourceUrl" should be automatically included into 
+    # available cookies by "rails-portlet".
+    def liferay_resource_url(_params, resource_url=resource_url_cookie)
+      if resource_url.nil? then return raise "resource_url is needed!" end
+      params = _params.dup # create duplicate params, do not modify originals!
+      
+      options = {
+        :controller => params.delete(:controller),
+        :action => params.delete(:action),
+        :route => params.delete(:route)
+        }
+      
+      res = ResourceUrl.new(resource_url)
+      res.options = options
+      res.namespace = @namespace || namespace_cookie
+      res.params = params
+      #p res
+      return res.to_s
+=begin
+      if options[:controller].nil? then return resource_url end
+      #if route_params[:action].nil? then action = :index end
+      url = "#{resource_url}&#{namespace}railsRoute=/#{path}"
       unless params.empty?
         url += '?'
         params.keys.each do |key|
@@ -37,127 +131,30 @@ module Helpers
         end
         url.gsub!(/&$/, '')
       end
-      
       url
+=end
     end
 
-    # Link that the rails-portlet will leave unparsed.
-    def link_to_exit_portlet(name, options = {}, html_options = {})
-      link_to(name, url_to_exit_portlet(options), html_options)
-    end
-
-    # Formulates a link to Liferay. DEPRECATED.
+    # Gets portlet preferences from a cookie (Liferay_preferences) and generates
+    # a hash with it. Returns nil if cookie do not exists or the value is nil.
     #
-    # Parameters:
-    #  - obj is an instance of a model from the lportal library.
-    #  - options
-    def link_to_liferay(obj,options={})
-
-      # Rails-portlet cannot pass the actual redirect parameter.
-      # Workaround with JavaScript.
-      redirect = 'javascript: history.go(-1)'
-
-      title = 'n/a' # link title
-      begin
-        logger.debug "Formulating Liferay link for #{obj}"
-        case obj.liferay_class
-
-        ### group
-        when 'com.liferay.portal.model.Group'
-          STDERR.puts 'Called DEPRECATED method - use %s.path instead' % obj
-
-
-        when 'com.liferay.portal.model.Layout'
-          STDERR.puts 'Called DEPRECATED method - use %s.path instead' % obj
-
-
-        ### user
-        when 'com.liferay.portal.model.User'
-          STDERR.puts 'Called DEPRECATED method - use %s.path instead' % obj
-
-
-        ### blog
-        when 'com.liferay.portlet.blogs.model.BlogsEntry'
-          STDERR.puts 'FIXME: %s.path' % obj
-
-        ### document library file
-        #
-        # tämä toimii hiukan eri logiikalla kuin toiset, koska
-        # sama malli joutuu mallintamaan myös tyyppinsä tiedostopäätteestä
-        when 'com.liferay.portlet.documentlibrary.model.DLFileEntry'
-          STDERR.puts 'Called DEPRECATED method - use %s.path instead' % obj
-          redirect_link=request.env["PATH_INFO"] # ei toimi portletissa
-
-          label = 'Tiedostotyyppiä %s ei vielä tueta' % obj.type[:name]
-            #_('Lataa tiedosto "%s"') % obj.asset.title
-          case obj.type[:uuid]
-            when :video
-              label = _('Linkki videoon "%s"') % obj.asset.title
-              link_to_exit_portlet( label, url_for(
-                { :controller => :video,
-                  :action => :asset,
-                  :id => obj.asset.id,
-                  :uid => @user.id,
-                  :redirect => redirect_link
-                }))
-
-            when :pdf
-              label = _('Linkki dokumenttiin "%s"') % obj.asset.title
-              redirect = ''
-              url = LiferayUrl.new(obj,nil,redirect).static_url
-              link_to_exit_portlet( label, url )
-
-          end
-
-
-        ### galleriakuva
-        when 'com.liferay.portlet.imagegallery.model.IGImage'
-          STDERR.puts 'FIXME: %s.path' % obj
-          base_url = "#{$LIFERAY_SERVER}/image/image_gallery"
-          options.update(:use_large_igpreview => false) unless options[:use_large_igpreview]
-          img_id = (options[:use_large_igpreview] == true ? obj.large.id : obj.small.id)
-
-          img = link_to_exit_portlet(
-            image_tag( "#{base_url}?img_id=#{img_id}", :alt => obj.description, :class => 'asset_image' ),
-            "#{base_url}?img_id=#{obj.large.id}"
-          )
-          logger.debug img
-          return img
-
-
-        when 'com.liferay.portlet.journal.model.JournalArticle'
-          STDERR.puts 'FIXME: %s.path' % obj
-          url = LiferayUrl.new(obj,@user,redirect).instance_url
-          link_to_exit_portlet( _('Lue koko artikkeli "%s"') % obj.asset.title, url )
-
-        when 'com.liferay.portlet.messageboards.model.MBCategory'
-          STDERR.puts 'Called DEPRECATED method - use %s.path instead' % obj
-
-
-        when 'com.liferay.portlet.messageboards.model.MBMessage'
-          STDERR.puts 'FIXME: %s.path' % obj
-          url = LiferayUrl.new(obj,@user,redirect).instance_url
-          link_to_exit_portlet( _('Lue viesti "%s"') % obj.asset.title, url )
-
-  #       when 'com.liferay.portlet.messageboards.model.MBThread'
-
-        when 'com.liferay.portlet.wiki.model.WikiPage'
-          STDERR.puts 'FIXME: %s.path' % obj
-          url = LiferayUrl.new(obj,@user,redirect).instance_url
-          link_to_exit_portlet( _('Lue sivu "%s"') % obj.asset.title, url )
-
-        else
-          STDERR.puts 'Called DEPRECATED method, but no method can handle %s' % obj
-          raise _('This type of link cannot be handled.')
-
+    def get_liferay_preferences(value = preferences_cookie)
+      preferences = {}
+      if value and (not value.empty?)
+        value.split(";").each do |pair|
+          if pair.nil? or pair.empty? then next end
+          result = pair.split("=")
+          preferences[result[0].intern] = result[1]
         end
-
-      rescue Exception => err
-        logger.error '*** ERROR ***: %s' % err.message
-        link_to_function( _('Cannot link to resource.'), "alert('#{err.message}')" )
+        return preferences
       end
+      nil
     end
 
+    # Link that the rails-portlet will leave unparsed.
+    def link_to_exit_portlet(name, options = {}, html_options = {})
+      link_to(name, url_to_exit_portlet(options), html_options)
+    end
 
     # Appends parameters "exit_portlet=true" into the url.
     # Url might be either Hash or String.
@@ -182,4 +179,4 @@ module Helpers
 
   end
 end
-end
+end