caterpillar 0.9.8 → 0.9.15

data/lib/caterpillar/util.rb

@@ -12,6 +12,8 @@ module Caterpillar
     # Reads the configuration
     def eval_configuration(config=nil)
       cf = File.join([RAILS_ROOT,Caterpillar::Config::FILE])
+      STDERR.puts 'Caterpillar configuration file could not be found' unless File.exists?(cf)
+
       if config.nil? && File.exists?(cf)
         config = eval(File.open(cf) {|f| f.read})
       end

data/lib/web/portlet.rb

@@ -1,6 +1,8 @@
+require 'rubygems'
 require 'active_record'
 
-module Web
+module Web # :nodoc:
+  # Adds Caterpillar portlets to available portlets.
   class Portlet < ActiveRecord::Base
 
     @@caterpillar_portlets = nil
@@ -27,9 +29,36 @@ module Web
         |p| p.name=='%s' % name }.first # find_by_name
     end
 
-    def title
-      p = Web::PortletName.find_by_portletid(self.portletid)
-      p ? p.title : nil
+#     def self.find_by_portletid(*args)
+#     puts args.inspect
+#       super(args)
+#       # TODO: find caterpillar_portlets
+#     end
+
+    # searches both Liferay and Caterpillar portlets
+    # TODO: DRY up with super
+    def self.find_by_name(name)
+      begin
+        pp = Web::PortletProperties.find_by_name(name)
+        if pp
+          p = self.find_by_portletid pp.portletid
+          return p if p
+        end
+
+        pp = find_caterpillar_portlet(name) unless pp
+
+        unless pp
+          raise ActiveRecord::RecordNotFound
+        else
+          return self.create(
+            :portletid => pp.portletid
+          )
+        end
+      rescue
+        STDERR.puts 'Portlet by name "%s" could not be found -- try "caterpillar db:migrate"' % name
+        logger.debug $!.message
+        return nil
+      end
     end
 
   end

data/views/caterpillar/_navigation.html.erb

@@ -24,7 +24,7 @@
   padding: 10px 0 0 50px;
   min-height: 55px;
   overflow: auto;
-  
+
   filter:alpha(opacity=81);-moz-opacity:.81;opacity:.81;
   /* css3 tags, works on Firefox and Safari */
   -moz-border-radius: 15px;
@@ -36,6 +36,11 @@
   list-style-type: none;
   }
 
+  #caterpillar_categories {
+  width: 99%;
+  overflow: auto;
+  }
+
   .cp_category {
   float: left;
   border: 3px double blue;
@@ -102,12 +107,17 @@
         <% begin -%>
           <%# check required variables -%>
           <% portlet[:vars].each do |var|
-              raise if params[var].nil?
+              #puts params.inspect
+               raise if params[var].nil?
              end -%>
 
-          <li><%= link_to( portlet[:title], portlet[:reqs] ) -%></li>
+          <li>
+            <%= link_to( portlet[:title], self.send('%s_url' % portlet[:name]) ) %>
+            <%#= link_to( portlet[:title], portlet[:reqs] ) -%>
+          </li>
 
         <% rescue
+             logger.error $!.message
              vars = {}
              undef_vars = []
              portlet[:vars].each do |var|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: caterpillar
 version: !ruby/object:Gem::Version 
-  version: 0.9.8
+  version: 0.9.15
 platform: ruby
 authors: 
 - Mikael Lammentausta
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-24 00:00:00 +02:00
+date: 2009-03-22 00:00:00 +02:00
 default_executable: caterpillar
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.9
+        version: 1.0.17
     version: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -40,14 +40,16 @@ extensions: []
 
 extra_rdoc_files: 
 - README
-- LICENSES.txt
+- MIT-LICENSE
+- ChangeLog
 files: 
 - Rakefile
-- ChangeLog
 - install.rb
 - init.rb
 - lib/java
+- lib/java/rails-portlet-0.6.0.jar
 - lib/java/rails-portlet-0.5.2.jar
+- lib/java/rails-portlet-0.6.2.jar
 - lib/java/rails-portlet-0.6.1.jar
 - lib/caterpillar
 - lib/caterpillar/config.rb
@@ -62,8 +64,6 @@ files:
 - lib/caterpillar/task.rb
 - lib/caterpillar.rb
 - lib/web
-- lib/web/portlet_name.rb
-- lib/web/portlet_preferences.rb
 - lib/web/portlet.rb
 - generators/caterpillar
 - generators/caterpillar/templates
@@ -75,12 +75,11 @@ files:
 - generators/caterpillar/caterpillar_generator.rb
 - generators/caterpillar/USAGE
 - db/migrate
-- db/migrate/20081205000001_portlet_names.rb
-- db/migrate/20081205000002_lportal_sequences.rb
 - views/caterpillar
 - views/caterpillar/_navigation.html.erb
 - README
-- LICENSES.txt
+- MIT-LICENSE
+- ChangeLog
 has_rdoc: true
 homepage: http://rails-portlet.rubyforge.org
 post_install_message: 

data/db/migrate/20081205000001_portlet_names.rb

@@ -1,17 +0,0 @@
-class PortletNames < ActiveRecord::Migration
-  def self.up
-    # dealing with tables that have no id is a pain with ActiveRecord,
-    # and using the 'id' column for portletid does not work either,
-    # ActiveRecord does not let that column to be set manually.
-    create_table :portlet_names do |t|
-      t.column :portletid, :string, :null => false
-      t.column :name,      :string, :null => false
-      t.column :title,     :string, :null => false
-    end
-  end
-
-  def self.down
-    drop_table :portlet_names
-    #ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS portlet_names")
-  end
-end

data/db/migrate/20081205000002_lportal_sequences.rb

@@ -1,65 +0,0 @@
-require 'lportal'
-
-class LportalSequences < ActiveRecord::Migration
-  @@tables = [
-    Account,
-    Address,
-    Announcement::Delivery,
-    Announcement::Entry,
-    Contact,
-    Group,
-    Permission,
-    Phone,
-    ResourceCode,
-    Resource,
-    Role,
-    User,
-    MB::Category,
-    MB::Discussion,
-    MB::Message,
-    MB::MessageFlag,
-    MB::StatsUser,
-    MB::Thread,
-    RatingsStats,
-    SocialActivity,
-    SocialRelation,
-    Tag::Asset,
-    Tag::Entry,
-    Tag::Property,
-    Web::Layout,
-    Web::LayoutSet,
-    Web::PortletPreferences,
-    Web::Portlet
-  ]
-
-  def self.up
-    STDOUT.puts 'This migration does not do anything.'
-    STDOUT.puts 'The process is not refined properly yet, and could be quite disastrous if reverted unappropriately.'
-    STDOUT.puts 'If you are sure you need the sequences, copy this file to db/migrate and modify it.'
-    STDOUT.puts __FILE__
-
-    start = 8400000 # bigint = 8^8 bytes = 16 million bits, this is halfway up the possible range, rounded up
-    sql = ""
-    @@tables.each do |model|
-      table = model.table_name
-      primkey = model.primary_key
-      seq = table+'_'+primkey+'_seq'
-      sql += "CREATE SEQUENCE #{seq} START #{start}; ALTER TABLE #{table} ALTER #{primkey} SET default nextval('#{seq}');"
-    end
-
-    # To activate, uncomment this line.
-    #ActiveRecord::Base.connection.execute(sql)
-  end
-
-  # This is VERY DANGEROUS and may lead to breakage.
-  def self.down
-    # sql = ""
-    # @@tables.each do |model|
-    #   table = model.table_name
-    #   primkey = model.primary_key
-    #   seq = table+'_'+primkey+'_seq'
-    #   sql += "ALTER TABLE #{table} ALTER #{primkey} DROP default; DROP SEQUENCE #{seq};"
-    # end
-    # ActiveRecord::Base.connection.execute(sql)
-  end
-end

data/lib/web/portlet_name.rb

@@ -1,8 +0,0 @@
-require 'active_record'
-
-module Web # :nodoc:
-  # This model does not appear in the lportal database. This is created by a migration and contains the portlet id => name mappings.
-  class PortletName < ActiveRecord::Base
-    set_table_name       :portlet_names
-  end
-end

data/lib/web/portlet_preferences.rb

@@ -1,10 +0,0 @@
-require 'active_record'
-
-module Web
-  class PortletPreferences < ActiveRecord::Base
-    def title
-      p = Web::PortletName.find_by_portletid(self.name)
-      p ? p.title : nil
-    end
-  end
-end