lportal 1.0.9 → 1.0.17

data/lib/mb/message.rb

@@ -3,6 +3,8 @@ module MB
     set_table_name       :mbmessage
     set_primary_key      :messageid
 
+    acts_as_resourceful
+
 #     validates_presence_of :user, :category, :subject, :body
 
 
@@ -22,9 +24,11 @@ module MB
       }
     end
 
+    # Parameters:
     #  - user
     #  - category or parent message
     #  - body
+    #  - flag (Fixnum)
     def initialize(params)
       raise 'No user' unless params[:user] or params[:userid]
       unless ((params[:category] or params[:categoryid]) || (params[:parent] or params[:parentmessageid]))
@@ -95,13 +99,12 @@ module MB
       # COPY mbmessageflag (messageflagid, userid, messageid, flag) FROM stdin;
       # +10313	10129	10308	1
 
-      unless self.flag # wtf?
-        MB::MessageFlag.create(
-          :user    => self.user,
-          :message => self,
-          :flag    => 1
-        )
-      end
+      flag = (params[:flag] || 1)
+      self.flag = MB::MessageFlag.create(
+        :user    => self.user,
+        :message => self,
+        :flag    => flag
+      )
 
 
       # COPY mbstatsuser (statsuserid, groupid, userid, messagecount, lastpostdate) FROM stdin;
@@ -182,53 +185,12 @@ module MB
 
       # only create resources with scope 1,2 for rootmessages
       if self.is_root?
-        rc = self.resource_code(1)
-        unless rc
-          rc = ResourceCode.create(
-            :companyid => self.companyid,
-            :name => self.liferay_class,
-            :scope => 1
-          )
-        end
-        unless Resource.find(:first, :conditions => "codeid=#{rc.id} AND primkey='#{self.companyid}'")
-          Resource.create(
-            :codeid  => rc.id,
-            :primkey => self.companyid
-          )
-        end
-
-        rc = self.resource_code(2)
-        unless rc
-          rc = ResourceCode.create(
-            :companyid => self.companyid,
-            :name => self.liferay_class,
-            :scope => 2
-          )
-        end
-        unless Resource.find(:first, :conditions => "codeid=#{rc.id} AND primkey='#{category.groupid}'")
-          Resource.create(
-            :codeid  => rc.id,
-            :primkey => category.groupid
-          )
-        end
+        get_resource(:scope => 1)
+        get_resource(:scope => 2)
       end
 
       # Create a resource with scope=4
-      rc = self.resource_code(4)
-      unless rc
-        rc = ResourceCode.create(
-          :companyid => self.companyid,
-          :name => self.liferay_class,
-          :scope => 4
-        )
-      end
-      resource = Resource.find(:first, :conditions => "codeid=#{rc.id} AND primkey='#{self.id}'")
-      unless resource
-        resource = Resource.create(
-          :codeid  => rc.id,
-          :primkey => self.id
-        )
-      end
+      resource = get_resource(:scope => 4)
 
 
       # COPY permission_ (permissionid, companyid, actionid, resourceid) FROM stdin;
@@ -246,16 +208,12 @@ module MB
       # +10129	327
 
       self.class.actions.each do |actionid|
-        permission = Permission.find(:first,
-          :conditions => "companyid=#{self.companyid} AND actionid='#{actionid}' AND resourceid=#{resource.id}")
-        unless permission
-          permission = Permission.create(
-            :companyid  => self.companyid,
-            :actionid   => actionid,
-            :resourceid => resource.id
-          )
-        end
-        self.user.user_permissions << permission
+        permission = Permission.get({
+          :companyid  => self.companyid,
+          :actionid   => actionid,
+          :resourceid => resource.id
+        })
+        self.user.permissions << permission
       end
 
       self.save
@@ -287,6 +245,11 @@ module MB
       :foreign_key => 'classpk'
 
 
+    def scope2_primkey
+      raise 'instance does not belong to a category' unless self.category
+      self.category.groupid
+    end
+
     # Parent message
     def parent
       self.is_root? ? nil : MB::Message.find(self.parentmessageid)
@@ -323,11 +286,5 @@ module MB
       self.anonymous
     end
 
-    # ResourceCode associated to this instance (and scope)
-    def resource_code(scope=4)
-      ResourceCode.find(:first,
-        :conditions => "companyid=#{self.companyid} AND name='#{self.liferay_class}' AND scope=#{scope}")
-    end
-
   end
 end

data/lib/permission.rb

@@ -24,6 +24,22 @@ class Permission < ActiveRecord::Base
     :foreign_key             => 'permissionid',
     :association_foreign_key => 'groupid'
 
+  # finds or creates
+  def self.get(args)
+    conditions = []
+    args.each_pair{ |k,v|
+      conditions << (k==:actionid ?
+        ("%s='%s'" % [k,v]) : ("%s=%s" % [k,v]))
+    }
+    #puts conditions.inspect
+    p = Permission.find(:first, :conditions => conditions.join(' AND '))
+    unless p
+      logger.debug 'creating new Permission'
+      p = self.create(args)
+    end
+    return p
+  end
+
   def holders
     self.users + self.roles + self.groups
   end

data/lib/release.rb

@@ -0,0 +1,9 @@
+class Release < ActiveRecord::Base
+  set_table_name       :release_
+  set_primary_key      :releaseid
+
+  def self.current
+    self.find(:first, :order => "releaseid ASC")
+  end
+
+end

data/lib/resource.rb

@@ -20,6 +20,25 @@ class Resource < ActiveRecord::Base
     :class_name => 'Web::Layout',
     :foreign_key => 'primkey'
 
+  # Finds existing or creates a new Resource. TODO: DRY to resourceful
+  # Args Hash:
+  #  - :codeid
+  #  - :primkey
+  def self.get(args)
+    conditions = []
+    args.each_pair{ |k,v|
+      conditions << (k==:primkey ?
+        ("%s='%s'" % [k,v]) : ("%s=%s" % [k,v]))
+    }
+    #puts conditions.inspect
+    r = self.find(:first, :conditions => conditions.join(' AND '))
+    unless r
+      logger.debug 'creating new %s' % self.class
+      r = self.create(args)
+    end
+    r.reload
+  end
+
   def plid
     self.primkey[/([0-9]*)_LAYOUT_(.*)/,1]
   end

data/lib/resource_code.rb

@@ -18,8 +18,28 @@ class ResourceCode < ActiveRecord::Base
   #  - :scope (defaults to 4)
   def self.find_by_liferay_class(args={})
     args.update(:scope => 4) unless args[:scope]
-    ResourceCode.find(:first,
+    ResourceCode.get(:first,
       :conditions => "companyid=#{args[:companyid]} AND name='#{args[:name]}' AND scope=#{args[:scope]}")
   end
 
+  # Finds existing or creates a new ResourceCode
+  # Args:
+  #  - :companyid
+  #  - :name
+  #  - :scope
+  def self.get(args)
+    conditions = []
+    args.each_pair{ |k,v|
+      conditions << (k==:name ?
+        ("%s='%s'" % [k,v]) : ("%s=%s" % [k,v]))
+    }
+    #logger.debug conditions.inspect
+    rc = ResourceCode.find(:first, :conditions => conditions.join(' AND '))
+    unless rc
+      logger.debug 'creating new ResourceCode'
+      rc = self.create(args)
+    end
+    return rc
+  end
+
 end

data/lib/role.rb

@@ -2,6 +2,8 @@ class Role < ActiveRecord::Base
   set_table_name       :role_
   set_primary_key      :roleid
 
+  acts_as_resourceful
+
   validates_uniqueness_of :name, :scope => 'companyid'
 
   # com.liferay.portal.model.Role
@@ -71,22 +73,8 @@ class Role < ActiveRecord::Base
     # +33	29	10109
     # +34	30	10151
 
-    rc = self.resource_code(1)
-    raise 'Required ResourceCode not found' unless rc
-    r = Resource.find(:first, :conditions => "codeid=#{rc.id} AND primkey='#{self.companyid}'")
-    unless r
-      Resource.create(
-        :codeid  => rc.id,
-        :primkey => self.companyid
-      )
-    end
-
-    rc = self.resource_code(4)
-    raise 'Required ResourceCode not found' unless rc
-    r = Resource.create(
-      :codeid  => rc.id,
-      :primkey => self.id
-    )
+    self.get_resource(:scope => 1)
+    r = self.get_resource(:scope => 4)
 
     # Permissions (given to administrators)
 
@@ -109,13 +97,13 @@ class Role < ActiveRecord::Base
     # +10129	76
 
     self.class.actions.each do |actionid|
-      p = Permission.create(
+      p = Permission.get(
         :companyid  => self.companyid,
         :actionid   => actionid,
         :resourceid => r.id
       )
       self.company.administrators.each do |user|
-        user.user_permissions << p
+        user.permissions << p
       end
     end
   end
@@ -131,7 +119,7 @@ class Role < ActiveRecord::Base
               :conditions => "companyid=#{self.companyid} AND actionid='#{actionid}' AND resourceid=#{r.id}")
             next unless p
             p.users.each do |user|
-              user.user_permissions.delete(p)
+              user.permissions.delete(p)
             end
             p.groups.each do |group|
               group.permissions.delete(p)
@@ -157,8 +145,6 @@ class Role < ActiveRecord::Base
     freeze
   end
 
-
-
   belongs_to :company,
     :foreign_key => "companyid"
 
@@ -179,10 +165,4 @@ class Role < ActiveRecord::Base
                            :foreign_key             => "roleid",
                            :association_foreign_key => "groupid"
 
-  # ResourceCode associated to this instance (and scope)
-  def resource_code(scope=4)
-    ResourceCode.find(:first,
-      :conditions => "companyid=#{self.companyid} AND name='#{self.liferay_class}' AND scope=#{scope}")
-  end
-
 end

data/lib/tag/asset.rb

@@ -4,14 +4,14 @@ module Tag
     set_table_name       :tagsasset
     set_primary_key      :assetid
 
+
     # com.liferay.portlet.tags.model.TagsAsset
     def liferay_class
       'com.liferay.portlet.tags.model.TagsAsset'
     end
 
-# COPY tagsasset (assetid, groupid, companyid, userid, username, createdate, modifieddate, classnameid, classpk, startdate, enddate, publishdate, expirationdate, mimetype, title, description, summary, url, height, width, priority, viewcount) FROM stdin;
-# +10311	10166	10109	10129	Test Test	2009-01-17 08:07:12.039	2009-01-17 08:07:12.039	10071	10308	\N	\N	\N	\N	text/html	New thread				0	0	0	0
-
+    # COPY tagsasset (assetid, groupid, companyid, userid, username, createdate, modifieddate, classnameid, classpk, startdate, enddate, publishdate, expirationdate, mimetype, title, description, summary, url, height, width, priority, viewcount) FROM stdin;
+    # +10311	10166	10109	10129	Test Test	2009-01-17 08:07:12.039	2009-01-17 08:07:12.039	10071	10308	\N	\N	\N	\N	text/html	New thread				0	0	0	0
 
     def initialize(params)
       super(params)
@@ -101,9 +101,31 @@ module Tag
       if self.resource.respond_to?(:name) && self.resource.name.any?
         return self.resource.name
       else
-        STDERR.puts 'Asset %i has no title' % self.id
+        logger.warn 'Asset %i has no title' % self.id
+        return ''
+      end
+    end
+
+    # Presents the Asset resource in a portlet that is capable of viewing tagged content.
+    # This depends on the version of Liferay. See Group#asset_viewer_portlet.
+    #
+    # This method requires that the Asset belongs to a Group, or that the portletpreferences is given.
+    #
+    # Params:
+    #  - content_id           the id of the resource (not always self.resource.id)
+    #  - portletpreferences   defaults to the asset_viewer_portlet of the Asset's Group.
+    def path(portletpreferences=self.group.asset_viewer_portlet)
+      if self.group==0
+        logger.warn 'No asset path will be given for assets with groupid 0'
+        return ''
+      elsif !portletpreferences.is_a?(Web::PortletPreferences)
+        logger.error 'No portletpreferences for asset display given'
         return ''
       end
+      logger.debug portletpreferences.inspect
+      path = portletpreferences.path(:asset => self)
+      logger.debug path
+      return path
     end
 
   end

data/lib/user.rb

@@ -3,6 +3,8 @@ class User < ActiveRecord::Base
   set_table_name       :user_
   set_primary_key      :userid
 
+  acts_as_resourceful
+
   validates_uniqueness_of :uuid_
   validates_uniqueness_of :emailaddress, :scope => :companyid
   validates_uniqueness_of :screenname, :scope => :companyid
@@ -131,23 +133,16 @@ class User < ActiveRecord::Base
     # +10168	10166	10109	f	f	0		01	mobile	01		0	
 
 
-    # scope=4 means that the resource is "owned" by User
-    rc = self.resource_code(4)
-    raise 'Required ResourceCode not found' unless rc
 
     # insert data into counter_ so that Hibernate won't die
-    Counter.increment(:resource, 100)
+#     Counter.increment(:resource, 100)
 
     # COPY resource_ (resourceid, codeid, primkey) FROM stdin;
     # +44	5	10164
 
-    resource = Resource.create(
-      :codeid  => rc.id,
-      :primkey => self.id
-    )
+    # scope=4 means that the resource is "owned" by User
+    resource = get_resource(:scope => 4)
 
-    permissions = []
-    # insert data into counter_ so that Hibernate won't die
 
     # COPY permission_ (permissionid, companyid, actionid, resourceid) FROM stdin;
     # +114	10109	DELETE	44
@@ -163,9 +158,10 @@ class User < ActiveRecord::Base
     # +10129	117
     # +10129	118
 
-    Counter.increment(:permission, 100)
+    # insert data into counter_ so that Hibernate won't die
+#     Counter.increment(:permission, 100)
     self.class.actions.each do |action|
-      self.user_permissions << Permission.create(
+      self.permissions << Permission.get(
         :companyid  => self.companyid,
         :actionid   => action,
         :resourceid => resource.id
@@ -239,7 +235,7 @@ class User < ActiveRecord::Base
                            :association_foreign_key => 'roleid'
 
   # association to direct user permissions.
-  has_and_belongs_to_many  :user_permissions,
+  has_and_belongs_to_many  :permissions,
                            :class_name              => 'Permission',
                            :join_table              => 'users_permissions',
                            :foreign_key             => 'userid',
@@ -289,8 +285,8 @@ class User < ActiveRecord::Base
 
   # All permissions that the user has.
   # Permissions are summed up from user, group and role permissions.
-  def permissions
-    user_permissions + group_permissions + role_permissions
+  def all_permissions
+    (self.permissions + group_permissions + role_permissions).flatten
   end
 
 
@@ -479,12 +475,6 @@ class User < ActiveRecord::Base
     self.address.save
   end
 
-  # ResourceCode associated to this instance (and scope)
-  def resource_code(scope=4)
-    ResourceCode.find(:first,
-      :conditions => "companyid=#{self.companyid} AND name='#{self.liferay_class}' AND scope=#{scope}")
-  end
-
   # Resources associated to this instance
   def resources
     Resource.find(:all, :conditions => "primkey='#{self.id}'")
@@ -517,13 +507,20 @@ class User < ActiveRecord::Base
 
   # URL path to this User's public or private page
   def path(pl=:public)
-    self.hive.nil? ? nil : self.hive.path(pl)
+    self.hive.nil? ? '' : self.hive.path(pl)
   end
 
   # URL to user's portrait (needs to be prefixed with Liferay server URL).
   # Unless the user has a portrait, a default image should be displayed.
   def portrait_path
-    path = '/image/user_%s_portrait' % (self.contact.male ? 'male' : 'female')
+    gender = (
+      if self.contact
+        self.contact.male ? 'male' : 'female'
+      else
+        'male'
+      end
+    )
+    path = '/image/user_%s_portrait' % gender
     path << "?img_id=#{self.portraitid}" if self.portraitid != 0
     return path
   end