caterpillar 0.9.5 → 0.9.6

data/ChangeLog

@@ -1,3 +1,9 @@
+= 0.9.6
+  - added some tables and a notice to sequence migrations
+  - no longer installs css and javascript files, everything is cramped inline into the view
+  - upgrade lportal dependency to version 1.0.9
+
+
 = 0.9.5
   - portlet xml definition to Liferay 5.2.0 standards
   - liferay xml files are tagged by selection based on the configured version

data/LICENSES.txt

@@ -2,7 +2,7 @@
 
 Caterpillar is provided under the terms of the MIT license.
 
-(c) Copyright 2008 Cel'Amanzi Ltd and Mikael Lammentausta
+(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

data/db/migrate/20081205000002_lportal_sequences.rb

@@ -14,10 +14,15 @@ class LportalSequences < ActiveRecord::Migration
     Resource,
     Role,
     User,
+    MB::Category,
+    MB::Discussion,
     MB::Message,
+    MB::MessageFlag,
+    MB::StatsUser,
     MB::Thread,
-    MB::Discussion,
-    MB::Category,
+    RatingsStats,
+    SocialActivity,
+    SocialRelation,
     Tag::Asset,
     Tag::Entry,
     Tag::Property,
@@ -28,25 +33,33 @@ class LportalSequences < ActiveRecord::Migration
   ]
 
   def self.up
-#     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
-#     ActiveRecord::Base.connection.execute(sql)
+    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)
+    # 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/generators/caterpillar/caterpillar_generator.rb

@@ -8,45 +8,39 @@ class CaterpillarGenerator < Rails::Generator::Base
     this_dir = File.dirname(File.expand_path(file))
     tmpl = this_dir+'/templates'
 
-    STDOUT.puts ' * Installing config, stylesheets and images'
+    STDOUT.puts ' * Installing config and images'
 
     record do |m|
 
-      ### migrations ###
+      ### config ###
       m.directory('config')
       file = 'portlets.rb'
       m.file('config/'+file, 'config/'+file)
       ####################################
 
 
-      ### stylesheet ###
-      target = 'public/stylesheets/caterpillar'
-      m.directory(target)
-      file = 'caterpillar.css'
-      m.file('stylesheets/caterpillar/'+file, target+'/'+file)
-      ####################################
-
-      ### javascript ###
-      target = 'public/javascripts/caterpillar'
-      m.directory(target)
-      file = 'caterpillar.js'
-      m.file('javascripts/caterpillar/'+file, target+'/'+file)
-      ####################################
+# these are now cramped inline to the view partial
+#       ### stylesheet ###
+#       target = 'public/stylesheets/caterpillar'
+#       m.directory(target)
+#       file = 'caterpillar.css'
+#       m.file('stylesheets/caterpillar/'+file, target+'/'+file)
+#       ####################################
+# 
+#       ### javascript ###
+#       target = 'public/javascripts/caterpillar'
+#       m.directory(target)
+#       file = 'caterpillar.js'
+#       m.file('javascripts/caterpillar/'+file, target+'/'+file)
+#       ####################################
 
       ### images ###
-      target = 'public/images/caterpillar'
+      target = 'public/images'
       m.directory(target)
       file = 'caterpillar.gif'
       m.file('images/caterpillar/'+file, target+'/'+file)
       ####################################
 
-#       ### views ###
-#       target = 'app/views/caterpillar'
-#       m.directory(target)
-#       file = '_navigation.html.erb'
-#       m.file('views/caterpillar/'+file, target+'/'+file)
-#       ####################################
-# 
     end
   end
 end

data/lib/caterpillar.rb

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

data/lib/caterpillar/liferay.rb

@@ -198,8 +198,6 @@ module Caterpillar
         "chat_status",
         "journalcontentsearch",
         "mbban",
-        "mbmessageflag",
-        "mbstatsuser",
         "membershiprequest",
         "orglabor",
         "passwordpolicyrel",
@@ -221,7 +219,6 @@ module Caterpillar
         "ratingsentry",
         "ratingsstats",
         "region",
-        "release_",
         "scframeworkversion",
         "scframeworkversi_scproductvers",
         "schema_migrations",
@@ -240,8 +237,6 @@ module Caterpillar
         "shoppingitem",
         "shoppingorderitem",
         "shoppingorder",
-        "socialactivity",
-        "socialrelation",
         "subscription",
         "tasksproposal",
         "tasksreview",

data/lib/caterpillar/task.rb

@@ -1,5 +1,5 @@
 #--
-# (c) Copyright 2008 Mikael Lammentausta
+# (c) Copyright 2008,2009 Mikael Lammentausta
 #
 # Thanks to Nick Sieger for the rake structure!
 #
@@ -43,10 +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
-      ]
+      STDOUT.puts 'Caterpillar v.%s (c) Copyright 2008 Mikael Lammentausta' % VERSION
+      #STDOUT.puts 'Caterpillar v.%s' % Caterpillar::VERSION
+      STDOUT.puts 'Provided under the terms of the MIT license.'
+      STDOUT.puts
       send tasks
     end
 
@@ -84,7 +84,7 @@ module Caterpillar
         tasks << "#{@name}:liferayportletapp"
         tasks << "#{@name}:liferaydisplay"
       end
- 
+
       # print produced portlets
       tasks << :portlets
 
@@ -182,6 +182,10 @@ module Caterpillar
       with_namespace_and_config do |name, config|
         desc 'Create JSR286 portlet XML'
         task :portlet do
+          info 'Configured to use %s version %s' % [
+            @config.container.class.to_s.sub('Caterpillar::',''), @config.container.version
+          ]
+
           system('touch %s' % file)
           f=File.open(file,'w')
           f.write Portlet.xml(@portlets)
@@ -389,7 +393,6 @@ module Caterpillar
           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')
@@ -411,10 +414,10 @@ module Caterpillar
           exit 1
         end
         info ''
-        info 'Building WAR using Warbler on JRuby (%s)' % jruby
+        info 'Building WAR using Warbler %s on JRuby (%s)' % [
+          Warbler::VERSION, jruby]
         info ''
         system(jruby+' -S warble war')
-
       end
     end
 
@@ -447,8 +450,6 @@ module Caterpillar
       with_namespace_and_config do |name, config|
         desc 'Deploys the WAR file'
         task :war do
-          info 'deploying WAR package'
-
           file = @config.servlet+'.war'
           unless File.exists?(file)
             info 'cannot find the WAR file %s, exiting' % file
@@ -456,10 +457,12 @@ module Caterpillar
           end
 
           target = File.join(@config.container.root,'webapps')
-          info 'removing previous installs'
+
+          info '..removing previous installs..'
           system('rm -rf %s' % File.join(target,@config.servlet+'*'))
+
+          info 'deploying the WAR package to %s' % target
           system('cp %s %s' % [file,target])
-          info 'copied %s into %s' % [file,target]
 
         end
       end

data/lib/caterpillar/usage.rb

@@ -7,15 +7,11 @@
 module Caterpillar
   class Usage
     def self.show
-puts 'Caterpillar v.%s (c) Copyright 2008 Mikael Lammentausta' % VERSION
-puts 'Caterpillar is provided under the terms of the MIT license.'
-puts
-puts 'Usage:'
-puts '  See "%s --describe" for an overview of the tasks.' % $0
-puts
-puts '  cd to Rails root, and run the "%s pluginize" task' % $0
-# puts '  Run "%s" in Rails root' % $0
-# puts '  See 
+      STDOUT.puts 'Usage:'
+      STDOUT.puts '  See "%s --describe" for an overview of the tasks.' % $0
+      STDOUT.puts
+      STDOUT.puts '  cd to Rails root, and run the "%s pluginize" task' % $0
+      STDOUT.puts
     end
   end
 end

data/views/caterpillar/_navigation.html.erb

@@ -1,3 +1,74 @@
+<%# everything is cramped together to prevent the installation of separate css and js files -%>
+
+<script type="text/javascript">
+
+  function cp_toggle_category(c,categories) {
+    c_el = document.getElementById(c);
+    p_el = document.getElementById(c+'_portlets');
+
+    if (p_el.style.display=='none') {
+      p_el.style.display='block';
+      c_el.style.background='yellow';
+    }
+    else {
+      p_el.style.display='none';
+      c_el.style.background='white';
+    }
+  }
+
+</script>
+
+<style type="text/css">
+  .caterpillar_navigation {
+  background: url('/images/caterpillar.gif') no-repeat;
+  padding: 10px 0 0 50px;
+  margin-left: 10px;
+  min-height: 50px;
+  filter:alpha(opacity=81);-moz-opacity:.81;opacity:.81;
+  /* css3 tags, works on Firefox and Safari */
+  -moz-border-radius: 15px;
+  -webkit-border-radius: 15px;
+  }
+
+  .caterpillar_navigation ul {
+  list-style-type: none;
+  }
+
+  .cp_category {
+  float: left;
+  border: 3px double blue;
+  margin: 0 14px 5px 14px;
+  padding: 5px;
+  -moz-border-radius: 12px;
+  -webkit-border-radius: 12px;
+  background: white;
+  }
+
+  .cp_portlets {
+  float: break;
+  overflow: hidden;
+  margin: 0 40px 10px 40px;
+  border: 3px double green;
+  padding: 5px;
+  }
+
+  .navlink {
+  margin: 5px 14px 5px 14px;
+  padding: 5px;
+  -moz-border-radius: 12px;
+  -webkit-border-radius: 12px;
+  }
+
+  .navlink a {
+  text-decoration: none;
+  }
+
+  .navlink a:hover {
+  -moz-border-radius: 8px;
+  -webkit-border-radius: 8px;
+  }
+</style>
+
 <div class="caterpillar_navigation">
   <%# CATEGORIES -%>
   <%# categories = @caterpillar_navigation.keys -%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: caterpillar
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors: 
 - Mikael Lammentausta
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-07 00:00:00 +02:00
+date: 2009-02-15 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.4
+        version: 1.0.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -67,17 +67,11 @@ files:
 - lib/web/portlet.rb
 - generators/caterpillar
 - generators/caterpillar/templates
-- generators/caterpillar/templates/stylesheets
-- generators/caterpillar/templates/stylesheets/caterpillar
-- generators/caterpillar/templates/stylesheets/caterpillar/caterpillar.css
 - generators/caterpillar/templates/config
 - generators/caterpillar/templates/config/portlets.rb
 - generators/caterpillar/templates/images
 - generators/caterpillar/templates/images/caterpillar
 - generators/caterpillar/templates/images/caterpillar/caterpillar.gif
-- generators/caterpillar/templates/javascripts
-- generators/caterpillar/templates/javascripts/caterpillar
-- generators/caterpillar/templates/javascripts/caterpillar/caterpillar.js
 - generators/caterpillar/caterpillar_generator.rb
 - generators/caterpillar/USAGE
 - db/migrate

data/generators/caterpillar/templates/javascripts/caterpillar/caterpillar.js

@@ -1,15 +0,0 @@
-function cp_toggle_category(c,categories) {
-  c_el = document.getElementById(c);
-  p_el = document.getElementById(c+'_portlets');
-
-  if (p_el.style.display=='none') {
-    p_el.style.display='block';
-    c_el.style.background='yellow';
-  }
-  else {
-    p_el.style.display='none';
-    c_el.style.background='white';
-  }
-
-
-}

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

@@ -1,55 +0,0 @@
-.caterpillar_navigation {
-background: url('/images/caterpillar/caterpillar.gif') no-repeat;
-padding: 10px 0 0 50px;
-margin-left: 10px;
-min-height: 50px;
-filter:alpha(opacity=81);-moz-opacity:.81;opacity:.81;
-/* css3 tags, works on Firefox and Safari */
--moz-border-radius: 15px;
--webkit-border-radius: 15px;
-}
-
-.caterpillar_navigation ul {
-list-style-type: none;
-margin: 4px;
-padding: 4px;
-}
-
-#caterpillar_categories {
-width: 100%;
-overflow: auto;
-}
-
-.cp_category {
-float: left;
-border: 3px double blue;
-margin: 0 14px 5px 14px;
-padding: 5px;
--moz-border-radius: 12px;
--webkit-border-radius: 12px;
-background: white;
-}
-
-.cp_portlets {
-float: break;
-overflow: hidden;
-margin: 0 40px 10px 0px;
-border: 3px double green;
-/* padding: 5px; */
-}
-
-.navlink {
-margin: 5px 14px 5px 14px;
-padding: 5px;
--moz-border-radius: 12px;
--webkit-border-radius: 12px;
-}
-
-.navlink a {
-text-decoration: none;
-}
-
-.navlink a:hover {
--moz-border-radius: 8px;
--webkit-border-radius: 8px;
-}