lportal 1.0.4 → 1.0.7

data/README

@@ -1,6 +1,6 @@
-== Liferay
+== Liferay & ActiveRecord
 
-This is a collection of (some) Liferay models for developers that use the database with ActiveRecord. You may want to check out the Rails-portlet package if you're going to deploy Rails applications of Liferay.
+This is a collection of (some) Liferay models for developers that use the database with ActiveRecord. You may want to check out the Rails-portlet package if you're going to deploy Rails applications on Liferay.
 
 
 == Follow these steps
@@ -12,4 +12,17 @@ This is a collection of (some) Liferay models for developers that use the databa
 This gem quite effectively pollutes your namespace, and that is intentional. If you are working in the context of the portal, having your users modeled by User is more convenient rather than having to reference them as Lportal::Users.
 
 
+== Tips & Tricks
+Find the public layouts of a Group "g" that have the Message Board portlet:
+(only possible with Caterpillar)
+
+  title = 'Message Boards'
+  g = Group.find 15833
+
+  layout = g.public_layouts.select{
+    |l| l.portlets.find{|p| p.title=="#{title}"}}.first
+
+  puts layout.inspect
+
+
 Copyright (c) 2008 Mikael Lammentausta, released under the MIT license

data/init.rb

@@ -1,4 +1,4 @@
 file = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
 this_dir = File.dirname(File.expand_path(file))
 
-require this_dir+'/lportal'
+require File.join(this_dir,'lportal')

data/lib/announcement/delivery.rb

@@ -0,0 +1,13 @@
+module Announcement
+  class Delivery < ActiveRecord::Base
+    set_table_name       :announcementsdelivery
+    set_primary_key      :deliveryid
+
+    belongs_to :company,
+      :foreign_key => 'companyid'
+
+    belongs_to :user,
+      :foreign_key => 'userid'
+
+  end
+end

data/lib/classname.rb

@@ -27,26 +27,26 @@ class Classname < ActiveRecord::Base
     when 'com.liferay.portal.model.UserGroup'
       Usergroup
 
+    when 'com.liferay.portlet.announcements.model.AnnouncementsEntry'
+      Announcement::Entry
+
     when 'com.liferay.portlet.blogs.model.BlogsEntry'
       BlogPost
 
-    when 'com.liferay.portlet.documentlibrary.model.DLFileEntry'
-      DlFile
+    when 'com.liferay.portlet.bookmarks.model.BookmarksEntry'
+      Bookmark::Entry
 
-    when 'com.liferay.portlet.documentlibrary.model.DLFolder'
-      DlFolder
+    when 'com.liferay.portlet.bookmarks.model.BookmarksFolder'
+      Bookmark::Folder
 
     when 'com.liferay.portlet.calendar.model.CalEvent'
       Calevent
 
-    when 'com.liferay.portlet.announcements.model.AnnouncementsEntry'
-      Announcement::Entry
-
-    when 'com.liferay.portlet.bookmarks.model.BookmarksEntry'
-      Bookmark::Entry
+    when 'com.liferay.portlet.documentlibrary.model.DLFileEntry'
+      DlFile
 
-    when 'com.liferay.portlet.bookmarks.model.BookmarksFolder'
-      Bookmark::Folder
+    when 'com.liferay.portlet.documentlibrary.model.DLFolder'
+      DlFolder
 
     when 'com.liferay.portlet.imagegallery.model.IGFolder'
       IG::Folder
@@ -60,12 +60,24 @@ class Classname < ActiveRecord::Base
     when 'com.liferay.portlet.journal.model.JournalArticleResource'
       Journal::ArticleResource
 
+    when 'com.liferay.portlet.journal.model.JournalFeed'
+      Journal::Feed
+
+    when 'com.liferay.portlet.journal.model.JournalStructure'
+      Journal::Structure
+
+    when 'com.liferay.portlet.journal.model.JournalTemplate'
+      Journal::Template
+
     when 'com.liferay.portlet.messageboards.model.MBCategory'
       MB::Category
 
     when 'com.liferay.portlet.messageboards.model.MBMessage'
       MB::Message
 
+    when 'com.liferay.portlet.polls.model.PollsQuestion'
+      Poll::Question
+
     when 'com.liferay.portlet.wiki.model.WikiNode'
       Wiki::Node
 

data/lib/company.rb

@@ -33,10 +33,14 @@ class Company < ActiveRecord::Base
   end
 
   def administrators
-    adminrole = Role.find_by_name 'Administrator'
+    adminrole = Role.find(:first, :conditions => "companyid=#{self.id} AND name='Administrator'")
     return self.users.select{|u| u.roles.include?(adminrole) }
   end
+  alias :admins :administrators
 
+  def guest
+    User.find(:first, :conditions => "companyid=#{self.id} AND defaultuser = true" )
+  end
 
 #   has_one :frontpage,
 #     :class_name  => "Web::LayoutSet",

data/lib/contact.rb

@@ -18,32 +18,55 @@ class Contact < ActiveRecord::Base
   belongs_to :account,
     :foreign_key => 'accountid'
 
+  # Creates new contact_
   def initialize(params)
     super(params)
+
+    if !self.companyid and self.user
+      self.companyid = self.user.companyid
+    end
+    self.username ||= ''
     self.createdate   = Time.now
     self.modifieddate = Time.now
-    self.prefixid ||= 0
-    self.suffixid ||= 0
+    if !self.accountid and self.company
+      self.accountid = self.company.accountid
+    end
     self.parentcontactid ||= 0
-    self.birthday ||= Date.new(1970,1,1)
+    self.firstname       ||= ''
+    self.middlename      ||= ''
+    self.lastname        ||= ''
 
-    unless self.companyid
-      u = User.find self.userid
-      self.companyid = u.company.id
-    end
-    unless self.accountid
-      c = Company.find self.companyid
-      self.accountid   = c.accountid
-    end
-  end
+    # values for prefixid and suffixid are defined in table listtype
+    self.prefixid         ||= 0
+    self.suffixid         ||= 0
+    self.male=true if self.male.nil?
+    self.birthday         ||= Time.mktime(1970,1,1)
+    self.smssn            ||= ''
+    self.aimsn            ||= ''
+    self.icqsn            ||= ''
+    self.jabbersn         ||= ''
+    self.msnsn            ||= ''
+    self.skypesn          ||= ''
+    self.ymsn             ||= ''
+    self.employeestatusid ||= ''
+    self.employeenumber   ||= ''
+    self.jobtitle         ||= ''
+    self.jobclass         ||= ''
+    self.hoursofoperation ||= ''
+    self.facebooksn       ||= ''
+    self.myspacesn        ||= ''
+    self.twittersn        ||= ''
 
-  def save
-    if !self.username and self.firstname and self.lastname
-      self.username = fullname
-    end
-    super
+    self.save
   end
 
+#   def save
+#     if !self.username and self.firstname and self.lastname
+#       self.username = fullname
+#     end
+#     super
+#   end
+
   def fullname
     (self.firstname.empty? and self.lastname.empty?) ?
       false : self.firstname+' '+self.lastname

data/lib/counter.rb

@@ -1,4 +1,22 @@
 class Counter < ActiveRecord::Base
-    set_table_name       :counter
-    set_primary_key      :name
+  set_table_name       :counter
+  set_primary_key      :name
+
+  # Increments the counter
+  def self.increment(name, value)
+    if name.is_a?(Symbol)
+      name = (
+        case name
+        when :permission
+          'com.liferay.portal.model.Permission'
+        when :resource
+          'com.liferay.portal.model.Resource'
+        end
+      )
+    end
+    c = self.find(name)
+    c.currentid += value
+    c.save
+  end
+
 end

data/lib/group.rb

@@ -10,13 +10,29 @@ class Group < ActiveRecord::Base
     'com.liferay.portal.model.Group'
   end
 
+  def initialize(params)
+    super(params)
+    self.parentgroupid ||= 0
+    self.livegroupid   ||= 0
+    self.type_         ||= 0
+    self.active_       ||= true
+    self.name          ||= ''
+    self.description   ||= ''
+    self.typesettings  ||= ''
+
+    self.save
+  end
+
   belongs_to :company,
     :foreign_key => 'companyid'
 
   belongs_to :creator,
     :class_name  => 'User',
     :foreign_key => 'creatoruserid'
-  alias :owner :creator
+
+  belongs_to :parent,
+    :class_name  => 'Group',
+    :foreign_key => 'parentgroupid'
 
   # association to organizations
   has_and_belongs_to_many  :organizations,
@@ -85,16 +101,51 @@ class Group < ActiveRecord::Base
     :foreign_key => 'groupid',
     :conditions  => 'privatelayout = true'
 
-  # myös classpk ?
+  # find owner by classnameid + classpk
+  def owner
+    return nil if self.classnameid==0
+    _class = Classname.model(Classname.find(self.classnameid).value)
+    _class.find self.classpk
+  end
+
   has_one :resource,
     :foreign_key => 'primkey'
 
   has_many :mbcategories,
-    :class_name => 'MB::Category',
+    :class_name  => 'MB::Category',
     :foreign_key => 'groupid'
 
   def is_active?
     self.active_
   end
 
+  def is_public?
+    self.type_ == 1
+  end
+
+  def is_protected?
+    self.type_ == 2
+  end
+
+  def is_private?
+    self.type_ == 3
+  end
+
+  # the URL to this Group's public or private page
+  def path(pl=:public)
+    case pl
+    when :public
+      self.public_layouts.any? ?
+        self.public_layoutset.url_prefix + self.friendlyurl : nil
+
+    when :private
+      self.private_layouts.any? ?
+        self.private_layoutset.url_prefix + self.friendlyurl : nil
+
+    else
+      nil
+    end
+  end
+
+
 end

data/lib/journal/feed.rb

@@ -0,0 +1,21 @@
+module Journal
+  class Feed < ActiveRecord::Base
+    set_table_name       :journalfeed
+    set_primary_key      :id_
+
+    # com.liferay.portlet.journal.model.JournalFeed
+    def liferay_class
+      'com.liferay.portlet.journal.model.JournalFeed'
+    end
+
+    belongs_to :company,
+      :foreign_key => 'companyid'
+
+    belongs_to :user,
+      :foreign_key => 'userid'
+
+    belongs_to :group,
+      :foreign_key => 'groupid'
+
+  end
+end

data/lib/journal/structure.rb

@@ -0,0 +1,21 @@
+module Journal
+  class Structure < ActiveRecord::Base
+    set_table_name       :journalstructure
+    set_primary_key      :id_
+
+    # com.liferay.portlet.journal.model.JournalStructure
+    def liferay_class
+      'com.liferay.portlet.journal.model.JournalStructure'
+    end
+
+    belongs_to :company,
+      :foreign_key => 'companyid'
+
+    belongs_to :user,
+      :foreign_key => 'userid'
+
+    belongs_to :group,
+      :foreign_key => 'groupid'
+
+  end
+end

data/lib/journal/template.rb

@@ -0,0 +1,21 @@
+module Journal
+  class Template < ActiveRecord::Base
+    set_table_name       :journaltemplate
+    set_primary_key      :id_
+
+    # com.liferay.portlet.journal.model.JournalTemplate
+    def liferay_class
+      'com.liferay.portlet.journal.model.JournalTemplate'
+    end
+
+    belongs_to :company,
+      :foreign_key => 'companyid'
+
+    belongs_to :user,
+      :foreign_key => 'userid'
+
+    belongs_to :group,
+      :foreign_key => 'groupid'
+
+  end
+end

data/lib/list_type.rb

@@ -0,0 +1,4 @@
+class ListType < ActiveRecord::Base
+  set_table_name       :listtype
+  set_primary_key      :listtypeid
+end

data/lib/organization.rb

@@ -30,4 +30,8 @@ class Organization < ActiveRecord::Base
     self.group
   end
 
+  belongs_to :status,
+    :class_name => 'ListType',
+    :foreign_key => :statusid
+
 end

data/lib/phone.rb

@@ -10,16 +10,17 @@ class Phone < ActiveRecord::Base
 
   def initialize(params)
     super(params)
-    self.classnameid = 10005
-    self.createdate  = Time.now
-    unless self.companyid
-      u = User.find self.userid
-      self.companyid = u.companyid
-    end
-    unless self.username
-      u = User.find self.userid
-      self.username = u.fullname
-    end
+
+    self.createdate   ||= Time.now
+    self.modifieddate = Time.now
+    self.companyid    = self.user.companyid
+    self.username     ||= self.user.fullname
+    self.classnameid  = Classname.find_by_value('com.liferay.portal.model.Contact').id
+    self.classpk      = self.user.contact.id
+    self.typeid       ||= ListType.find_by_name('Mobile').id
+    self.primary_=true if self.primary_.nil?
+
+    self.save
   end
 
   def number
@@ -30,4 +31,8 @@ class Phone < ActiveRecord::Base
     self.number_ = val
   end
 
+  def is_primary?
+    self.primary_
+  end
+
 end

data/lib/poll/question.rb

@@ -0,0 +1,21 @@
+module Poll
+  class Question < ActiveRecord::Base
+    set_table_name       :pollsquestion
+    set_primary_key      :questionid
+
+    # com.liferay.portlet.polls.model.PollsQuestion
+    def liferay_class
+      'com.liferay.portlet.polls.model.PollsQuestion'
+    end
+
+    belongs_to :company,
+      :foreign_key => 'companyid'
+
+    belongs_to :user,
+      :foreign_key => 'userid'
+
+    belongs_to :group,
+      :foreign_key => 'groupid'
+
+  end
+end

data/lib/user.rb

@@ -3,16 +3,35 @@ class User < ActiveRecord::Base
   set_table_name       :user_
   set_primary_key      :userid
 
+  validates_uniqueness_of :uuid_
+  validates_uniqueness_of :emailaddress
   validates_uniqueness_of :screenname
 
   public
 
+  # com.liferay.portal.model.User
   def liferay_class
     'com.liferay.portal.model.User'
   end
 
+  # Creates a new user.
+  #
+  # It is a complicated process, as Liferay inserts new data into many tables.
+  # This process is figured by creating a new user with Liferay's (v. 5.1.1) tools and
+  # inspected by diff'ing the database dump.
   def initialize(params)
+    raise 'No firstname' unless params[:firstname]
+    raise 'No lastname' unless params[:lastname]
+    # Do not create Contact before creating self!
+    firstname = params.delete(:firstname)
+    lastname = params.delete(:lastname)
+    # Do not create contact before creating self!
+    gsm = params.delete(:gsm)
+    male = params.delete(:male)
+
     super(params)
+
+    # insert data into user_
     unless self.uuid_
       require 'rubygems'
       require 'uuidtools'
@@ -21,14 +40,124 @@ class User < ActiveRecord::Base
     self.createdate          = Time.now
     self.modifieddate        = Time.now
     self.defaultuser         = false
+    unless self.password_
+      self.password_         = firstname
+      self.passwordencrypted = false
+    end
+    self.passwordreset=false if self.passwordreset.nil?
     self.gracelogincount     = 0
+    self.screenname          ||= [firstname, lastname].join('-').downcase
+    self.emailaddress        ||= ''
     self.portraitid          ||= 0
+    self.languageid          ||= ''
     self.timezoneid          ||= 'Europe/Istanbul'
+    self.greeting            ||= 'Welcome'
+    self.comments            ||= ''
+    self.loginip             ||= ''
+    self.lastloginip         ||= ''
     self.failedloginattempts = 0
     self.lockout             = false
     self.agreedtotermsofuse  = true
-    self.active_             = true
+    self.active_ = true if self.active_.nil?
+    self.openid              ||= ''
+
+    self.save
+    self.reload
+
+    # create new contact
+    if male.is_a?(String)
+      male = (male=='true')
+    end
+    self.contact = Contact.create({
+      :userid => self.id,
+      :username => '', # name of the user who created this user
+      :firstname => firstname,
+      :lastname => lastname,
+      :male => male
+    })
+
+    # organization membership
+    org = self.company.organizations.select{|o| o.parent==nil}.first
+    self.organizations << org
+
+    org_role = Role.find(:first, :conditions => "companyid=#{self.companyid} AND name='Organization Member'")
+    group = org.group
+
+    # can ActiveRecord handle 3-way associations?
+    ActiveRecord::Base.connection.execute(
+      "INSERT INTO usergrouprole (userid, groupid, roleid) VALUES (%i, %i, %i);" % [
+        self.id, org.group.id, org_role.id])
+
+
+    # Personal group
+    g = Group.create(
+      :companyid     => self.companyid,
+      :creatoruserid => self.id,
+      :classnameid   => Classname.find_by_value(self.liferay_class).id,
+      :classpk       => self.id,
+      :friendlyurl   => '/'+self.screenname
+    )
+
+    # assign "User" and "Power User" roles
+    self.roles << Role.find(:first, :conditions => "companyid=#{self.companyid} AND name='User'")
+    self.roles << Role.find(:first, :conditions => "companyid=#{self.companyid} AND name='Power User'")
+
+    # Group's layoutset (only for Power Users)
+    # public + private
+    [true, false].each do |privacy|
+      Web::LayoutSet.create(
+        :groupid       => g.id,
+        :companyid     => self.companyid,
+        :privatelayout => privacy
+      )
+    end
+
+    # scope=4 is a bit of a mystery..
+    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)
+    resource = Resource.create(
+      :codeid  => rc.id,
+      :primkey => self.id
+    )
+
+    permissions = []
+    # insert data into counter_ so that Hibernate won't die
+    Counter.increment(:permission, 100)
+    %w{ DELETE IMPERSONATE PERMISSIONS UPDATE VIEW }.each do |action|
+      self.user_permissions << Permission.create(
+        :companyid  => self.companyid,
+        :actionid   => action,
+        :resourceid => resource.id
+      )
+    end
 
+    # announcementsdelivery
+    %w{ general news test }.each do |type|
+      Announcement::Delivery.create(
+        :userid    => self.id,
+        :companyid => self.companyid,
+        :type_     => type,
+        :email     => false,
+        :sms       => false,
+        :website   => true
+      )
+    end
+
+    self.save
+
+    # insert data into phone
+    self.gsm=gsm if gsm
+  end
+
+  def save
+    super
+
+    raise self.errors[:uuid_] if self.errors[:uuid_]
+    raise self.errors[:emailaddress] if self.errors[:emailaddress]
+    raise self.errors[:screenname] if self.errors[:screenname]
   end
 
   has_one :account,
@@ -71,6 +200,40 @@ class User < ActiveRecord::Base
                            :foreign_key             => 'userid',
                            :association_foreign_key => 'permissionid'
 
+  # association to usergroups
+  has_and_belongs_to_many  :usergroups,
+                           :class_name              => 'Usergroup',
+                           :join_table              => 'users_usergroups',
+                           :foreign_key             => 'userid',
+                           :association_foreign_key => 'usergroupid'
+
+  # User's own group
+  has_one :hive,
+    :class_name => 'Group',
+    :foreign_key => 'classpk'
+
+  # association to tags
+  has_many :tags,
+           :class_name => 'Tag::Entry',
+           :foreign_key => 'userid'
+
+  # association to assets
+  has_many :assets,
+           :order       => 'publishdate',
+           :foreign_key => 'userid'
+
+  # association to wiki pages
+  has_many :wikipages,
+    :class_name  => 'Wiki::Page',
+    :foreign_key => 'userid'
+  alias :articles :wikipages
+
+  # association to MessageBoardMessages
+  has_many :messages,
+           :class_name  => 'MB::Message',
+           :foreign_key => 'userid'
+
+
   def group_permissions
     self.groups.map{|g| g.permissions }.flatten
   end
@@ -79,18 +242,24 @@ class User < ActiveRecord::Base
     self.roles.map{|g| g.permissions }.flatten
   end
 
-  # permissions are summed up from user, group and role permissions
+  # All permissions that the user has.
+  # Permissions are summed up from user, group and role permissions.
   def permissions
     user_permissions + group_permissions + role_permissions
   end
 
-  def fullname
-    self.contact ? 
+  # Fullname is fetched from Contact
+  def name
+    self.contact ?
       self.contact.fullname : nil
   end
+  alias :fullname :name
+
   def firstname
-    self.contact.firstname
+    self.contact ?
+      self.contact.firstname : nil
   end
+  # Creates a new Contact unless it exists
   def firstname=(v)
     if self.contact
       c = self.contact
@@ -103,10 +272,13 @@ class User < ActiveRecord::Base
       self.contact = c
       self.save
     end
+    true
   end
   def lastname
-    self.contact.lastname
+    self.contact ?
+      self.contact.lastname : nil
   end
+  # Creates a new Contact unless it exists
   def lastname=(v)
     if self.contact
       c = self.contact
@@ -119,8 +291,16 @@ class User < ActiveRecord::Base
       self.contact = c
       self.save
     end
+    true
+  end
+
+  # Sex. 0=female, 1=male
+  def sex
+    self.contact.male==true ? 1 : 0
   end
 
+  # Creates a new Contact unless it exists
+  #
   # 1=female, 2=male
   def sex=(v)
     male = (v==2 ? true : false)
@@ -135,46 +315,15 @@ class User < ActiveRecord::Base
       self.contact = c
       self.save
     end
+    true
   end
 
-  # User's own group
-  has_one :hive,
-    :class_name => 'Group',
-    :foreign_key => 'classpk'
-
-  # association to usergroups
-#   has_and_belongs_to_many  :usergroups,
-#                            :class_name              => 'Usergroup',
-#                            :join_table              => 'users_usergroups',
-#                            :foreign_key             => 'userid',
-#                            :association_foreign_key => 'usergroupid'
-
-  # association to tags
-  has_many :tags,
-           :class_name => 'Tag::Entry',
-           :foreign_key => 'userid'
-
-  # association to assets
-  has_many :assets,
-           :order       => 'publishdate',
-           :foreign_key => 'userid'
-
-  # association to wiki pages
-  has_many :wikipages,
-    :class_name  => 'Wiki::Page',
-    :foreign_key => 'userid'
-  alias :articles :wikipages
-
-  # association to MessageBoardMessages
-  has_many :messages,
-           :class_name  => 'MB::Message',
-           :foreign_key => 'userid'
-
 
 #   def address
 #     self.address || Address.new(:user=>self, :company=>self.company)
 #   end
 
+  # Creates a Address, unless one exists.
   def address
     return @address if @address
     @address = Address.find_by_userid self.id
@@ -192,11 +341,13 @@ class User < ActiveRecord::Base
   end
   def lang=(value)
     self.languageid=value
+    true
   end
 
   def gsm
     self.phones.any? ? self.phones.first.number : nil
   end
+  # Creates a new Phone unless it exists
   def gsm=(number)
     if self.phones.any?
       phone = self.phones.first
@@ -205,15 +356,18 @@ class User < ActiveRecord::Base
     else
       Phone.create(
         :userid => self.id,
-        :number => number,
+        :number_ => number,
         :primary_ => true
       )
+      self.phones.reload
     end
+    true
   end
 
   def birthday
     self.contact.birthday
   end
+  # FIXME: should create a new Contact
   def birthday=(val)
     self.contact.birthday = val
     self.contact.save
@@ -222,6 +376,7 @@ class User < ActiveRecord::Base
   def streetaddress
     self.address.street1
   end
+  # FIXME: should create a new Address
   def streetaddress=(val)
     self.address.street1 = val
     self.address.save
@@ -230,6 +385,7 @@ class User < ActiveRecord::Base
   def zipcode
     self.address.zip
   end
+  # FIXME: should create a new Address
   def zipcode=(val)
     self.address.zip = val
     self.address.save
@@ -238,11 +394,23 @@ class User < ActiveRecord::Base
   def city
     self.address.city
   end
+  # FIXME: should create a new Address
   def city=(val)
     self.address.city = val
     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}'")
+  end
+
   def is_active?
     self.active_
   end
@@ -250,6 +418,7 @@ class User < ActiveRecord::Base
   def is_default?
     self.defaultuser
   end
+  alias :is_guest? :is_default?
 
 
 end

data/lib/web/layout.rb

@@ -67,5 +67,10 @@ module Web
       self.hidden_
     end
 
+    # the URL path to this Layout
+    def path
+      self.layoutset.url_prefix + self.group.friendlyurl + self.friendlyurl
+    end
+
   end
 end

data/lib/web/layout_set.rb

@@ -9,6 +9,21 @@ module Web
       'com.liferay.portal.model.LayoutSet'
     end
 
+    def initialize(params)
+      super(params)
+      self.logo             ||= false
+      self.logoid           ||= 0
+      self.pagecount        ||= 0
+      self.themeid          ||= ''
+      self.colorschemeid    ||= '01'
+      self.wapthemeid       ||= 'mobile'
+      self.wapcolorschemeid ||= '01'
+      self.css              ||= ''
+      self.virtualhost      ||= ''
+
+      self.save
+    end
+
     public
 
     belongs_to :group,
@@ -33,6 +48,25 @@ module Web
       Web::Layout.find(:all, :conditions => "groupid=#{self.groupid} AND privatelayout=#{self.privatelayout}" )
     end
 
+    # lookup the path prefix for this LayoutSet
+    def url_prefix
+      return '/web' if self.is_public?
+
+      _class = Classname.model(Classname.find(self.group.classnameid).value)
+      if _class == User
+        return '/user' #if self.is_private?
+        #return '/web'
+
+      elsif _class == Group
+        return '/group' #if self.is_private?
+        #return '/web'
+
+      else
+        logger.debug 'FIXME: ' + _class
+        return nil
+      end
+    end
+
     #?
     #   has_one :resource,
     #     :foreign_key => 'primkey'

data/lib/web/portlet.rb

@@ -9,6 +9,10 @@ module Web
     belongs_to :company,
       :foreign_key => "companyid"
 
+    def name
+      self.portletid
+    end
+
     # primkey in resource_ table
     def primkey(plid)
       "#{plid}_LAYOUT_#{self.portletid}"
@@ -34,7 +38,7 @@ module Web
       self.active_
     end
 
-    # comply API with Web::Portlet.resource
+    # comply API with Web::PortletPreferences
     def preferences_
       ""
     end

data/lib/web/portlet_preferences.rb

@@ -13,6 +13,10 @@ module Web
       :class_name => 'User',
       :foreign_key => 'ownerid'
 
+    def name
+      self.portletid.split(/_INSTANCE_/)[0]
+    end
+
     # primkey in resource_ table
     def primkey
       "#{self.plid}_LAYOUT_#{self.portletid}"
@@ -37,6 +41,6 @@ module Web
       end
       return preferences
     end
-  
+
   end
 end

data/test/unit/journal/feed_test.rb

@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class Journal::FeedTest < ActiveSupport::TestCase
+  # Replace this with your real tests.
+  def test_truth
+    assert true
+  end
+end

data/test/unit/journal/structure_test.rb

@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class Journal::StructureTest < ActiveSupport::TestCase
+  # Replace this with your real tests.
+  def test_truth
+    assert true
+  end
+end

data/test/unit/journal/template_test.rb

@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class Journal::TemplateTest < ActiveSupport::TestCase
+  # Replace this with your real tests.
+  def test_truth
+    assert true
+  end
+end

data/test/unit/poll/question_test.rb

@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class Poll::QuestionTest < ActiveSupport::TestCase
+  # Replace this with your real tests.
+  def test_truth
+    assert true
+  end
+end

data/test/unit/tag/asset_test.rb

@@ -2,8 +2,9 @@ require 'test_helper'
 
 class Tag::AssetTest < ActiveSupport::TestCase
   fixtures [
-    :tagsasset,
+    :tagsasset, :tagsassets_tagsentries,
     :resource_, :resourcecode,
+    :classname_,
     :igimage,
     :mbmessage,
     :blogsentry,
@@ -14,7 +15,7 @@ class Tag::AssetTest < ActiveSupport::TestCase
   ]
 
   def setup
-    @assets = Asset.all
+    @assets = Tag::Asset.all
   end
 
   # each asset _must_ belong to a company

data/test/unit/tag/entry_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class Tag::EntryTest < ActiveSupport::TestCase
-  fixtures :tagsentry, :tagsproperty, :tagsasset
+  fixtures :tagsentry, :tagsproperty, :tagsasset, :tagsassets_tagsentries, :classname_
 
   def setup
     @tags = Tag::Entry.find :all

data/test/unit/user_test.rb

@@ -3,13 +3,20 @@ require 'test_helper'
 class UserTest < ActiveSupport::TestCase
   fixtures [
     :organization_,
-    :contact_
+    :address,
+    :phone,
+    :contact_,
+    :classname_,
+    :layoutset
   ]
 
   def setup
     @users = User.all
   end
 
+  def test_create
+  end
+
   # each user must belong to a company
   def test_company
     @users.each do |x|
@@ -73,6 +80,16 @@ class UserTest < ActiveSupport::TestCase
     end
   end
 
+  def test_gsm
+    @users.each do |u|
+      gsm = '+35840' + rand(10000000).to_s
+      u.gsm = gsm
+      phones = Phone.find(:all, :conditions => "userid = #{u.id}")
+      assert !phones.empty?
+      assert phones.collect(&:number).include?(gsm)
+    end
+  end
+
   def test_rigidity
     # each group must exist!
     groups = @users.map{|x| x.groups}.uniq

data/version.rb

@@ -1,4 +1,4 @@
 # bogus module that only defines the VERSION.
 module Lportal
-  VERSION='1.0.4'
+  VERSION='1.0.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lportal
 version: !ruby/object:Gem::Version 
-  version: 1.0.4
+  version: 1.0.7
 platform: ruby
 authors: 
 - Mikael Lammentausta
@@ -9,7 +9,7 @@ autorequire: init
 bindir: bin
 cert_chain: []
 
-date: 2008-12-09 00:00:00 +02:00
+date: 2009-01-05 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,8 +50,11 @@ files:
 - lib/dl_folder.rb
 - lib/blog_post.rb
 - lib/journal
+- lib/journal/template.rb
+- lib/journal/structure.rb
 - lib/journal/article_resource.rb
 - lib/journal/article.rb
+- lib/journal/feed.rb
 - lib/journal/article_image.rb
 - lib/user.rb
 - lib/organization.rb
@@ -63,11 +66,14 @@ files:
 - lib/ig
 - lib/ig/image.rb
 - lib/ig/folder.rb
+- lib/poll
+- lib/poll/question.rb
 - lib/phone.rb
 - lib/company.rb
 - lib/calevent.rb
 - lib/announcement
 - lib/announcement/entry.rb
+- lib/announcement/delivery.rb
 - lib/account.rb
 - lib/tag
 - lib/tag/entry.rb
@@ -91,6 +97,7 @@ files:
 - lib/bookmark
 - lib/bookmark/entry.rb
 - lib/bookmark/folder.rb
+- lib/list_type.rb
 - lib/contact.rb
 - lib/resource.rb
 - lib/role.rb
@@ -129,8 +136,11 @@ test_files:
 - test/unit/role_test.rb
 - test/unit/usergroup_test.rb
 - test/unit/blog_post_test.rb
+- test/unit/journal/structure_test.rb
 - test/unit/journal/article_resource_test.rb
 - test/unit/journal/article_test.rb
+- test/unit/journal/feed_test.rb
+- test/unit/journal/template_test.rb
 - test/unit/journal/article_image_test.rb
 - test/unit/wiki/node_test.rb
 - test/unit/wiki/page_test.rb
@@ -139,6 +149,7 @@ test_files:
 - test/unit/dl_folder_test.rb
 - test/unit/ig/image_test.rb
 - test/unit/ig/folder_test.rb
+- test/unit/poll/question_test.rb
 - test/unit/account_test.rb
 - test/unit/announcement/entry_test.rb
 - test/unit/resource_test.rb