lportal 1.0.7 → 1.0.8

data/lib/web/typesettings.rb

@@ -0,0 +1,113 @@
+module Web
+  # Typesettings for portlets. Used in Web::Layout.
+  class Typesettings
+
+    attr_accessor :template_id
+    attr_accessor :portlets
+
+    # Takes either existing raw typesettings string (to be parsed) or a Hash, when clean Typesettings is created.
+    def initialize(params={})
+      @portlets = {}
+      if params.is_a?(String)
+        self.read(params)
+      else
+        self.columns = (params[:columns] || 2)
+      end
+    end
+
+    # Parses raw typesettings String into internal format.
+    def read(raw)
+      _x = raw.split(/\n/)
+      #puts _x.inspect
+
+      template_id = _x.find{|z| z[/layout-template-id.*/]}
+      if template_id
+        _x.delete_at(_x.index(template_id))
+        @template_id = template_id[/=(.*)/,1]
+      end
+
+      _x.each do |col|
+        @portlets[col[/-(.)=/,1].to_i] = col[/=(.*)/,1].split(/,/)
+      end
+    end
+
+    # Choose the number of columns in the Layout
+    def columns=(nr)
+      @template_id = (
+        case nr
+        when 1
+          '1_column'
+        when 2
+          '2_columns_ii'
+        else
+          raise 'Invalid column number'
+        end
+      )
+    end
+
+    # Output String
+    def to_s
+      s = ''
+      s << "layout-template-id=%s\n" % @template_id if @template_id
+      s << self.parse
+      return s
+    end
+
+    # Accepts a PortletName as the first parameter,
+    # the second parameter acceps a Hash {:column => nr} where nr is the column to place the portlet.
+    def method_missing(method, *args, &block)
+      begin
+        portlet = Web::PortletName.find_by_name(method.to_s)
+        return nil unless portlet
+
+        column = 1
+        if args.any?
+          if args.first[:column]
+            column = args.first[:column]
+          end
+        end
+
+        @portlets.update(column => [portlet.portletid])
+
+      rescue
+        STDERR.puts $!.message
+        STDERR.puts 'Have you installed Caterpillar?'
+        return nil
+      end
+      self
+    end
+
+    # Formulates the typesettings columns string for portlets
+    def parse
+      columns = []
+      @portlets.each_pair do |column,portlets|
+        columns << "column-%i=%s," % [column, portlets.join(",")]
+      end
+      columns.join("\n")
+    end
+
+    # Does this Typesettings include this portlet?
+    # Params:
+    #  - portlet (either name as String, or Web::PortletName)
+    def include?(args)
+      if args.is_a?(String)
+        p = Web::PortletName.find_by_name args
+      elsif args.is_a?(Web::PortletName)
+        p = args
+      else
+        raise 'Invalid input class: %s' % args.class
+      end
+
+      #!@portlets_s[/[=,]#{p.portletid},/].nil?
+
+      # this may be handy if columns are needed
+      #_x = @portlets.find{|k,v| v.include?(p.portletid)}
+      #return false if _x.nil?
+      #column = _x.first[0] 
+      #return true
+
+      @portlets.any?{|k,v| v.include?(p.portletid)}
+    end
+
+  end
+end

data/lib/wiki/pageresource.rb

@@ -14,6 +14,7 @@ module Wiki
       :foreign_key => "nodeid"
 
     has_one :asset,
+      :class_name  => 'Tag::Asset',
       :foreign_key => 'classpk'
 
   end

data/test/unit/blog_post_test.rb

@@ -35,4 +35,10 @@ class AssetTest < ActiveSupport::TestCase
 #     end
 #   end
 
+#   def test_path
+#     @posts.each do |p|
+#       assert_not_nil p.path
+#     end
+#   end
+
 end

data/test/unit/group_test.rb

@@ -1,11 +1,92 @@
 require 'test_helper'
 
 class GroupTest < ActiveSupport::TestCase
-  fixtures :organization_
+  fixtures [
+    :organization_,
+    :users_orgs,
+    :usergroup,
+    :role_,
+    :classname_
+  ]
 
   def setup
     @groups = Group.find :all
     assert !@groups.empty?, "No groups"
+
+    @company = Company.first
+    flunk 'No company!' unless @company
+  end
+
+  def test_create_group
+    user = @company.administrators.first
+    flunk 'No user!' unless user
+
+    # Type Group
+    group = Group.create(
+      :name          => 'Test',
+      :company       => @company,
+      :creatoruserid => user.id
+    )
+    assert_not_nil group
+
+    assert_equal @company, group.company
+    assert_equal user.id, group.creatoruserid
+    assert_equal 0, group.classnameid
+    assert_equal 0, group.classpk
+    assert_equal 1, group.type_ # open
+
+    rc = group.resource_code(4)
+    assert_not_nil rc
+    r = Resource.find(:first, :conditions => "codeid=#{rc.id} AND primkey='#{group.id}'")
+    assert_not_nil r
+
+    group.class.actions.each do |actionid|
+      p = Permission.find(:first,
+        :conditions => "companyid=#{group.companyid} AND actionid='#{actionid}' AND resourceid=#{r.id}")
+      assert_not_nil p
+
+      # Permissions to administrators
+      group.company.administrators.each do |user|
+        assert user.user_permissions.include?(p)
+      end
+    end
+  end
+
+  def test_create_user_group
+    user = User.first
+    flunk 'No user!' unless user
+
+    # Type User
+    group = Group.create(
+      :company       => user.company,
+      :creatoruserid => user.id,
+      :classnameid   => Classname.find_by_value(User.liferay_class).id,
+      :classpk       => user.id,
+      :friendlyurl   => '/'+user.screenname
+    )
+
+    assert_not_nil group
+
+    assert_equal user.companyid, group.companyid
+    assert_equal user.id, group.creatoruserid
+    assert_equal Classname.find_by_value(User.liferay_class).id, group.classnameid
+    assert_equal user.id, group.classpk
+    assert_equal 0, group.parentgroupid
+    assert_equal 0, group.livegroupid
+    assert_equal 0, group.type_
+    assert_equal '/'+user.screenname, group.friendlyurl
+    assert group.is_active?
+
+    assert_not_nil group.public_layoutset
+    assert_not_nil group.private_layoutset
+
+    group.layoutsets.each do |ls|
+      assert_equal user.companyid, ls.companyid
+      assert_equal false, ls.logo
+      assert_equal 0, ls.logoid
+      assert_equal 0, ls.pagecount
+    end
+
   end
 
   # each group must belong to a company
@@ -64,15 +145,40 @@ class GroupTest < ActiveSupport::TestCase
   # each group must have one or more layouts
   def test_layoutsets
     @groups.each do |x|
-      assert !x.layoutsets.empty?, "#{x.id} has no layoutsets"
-      assert !(x.layoutsets.size > 2), "#{x.id} has more than 2 layoutsets"
+      assert !x.layoutsets.empty?, "#{x.id} (#{x.name}) has no layoutsets"
+      assert !(x.layoutsets.size > 2), "#{x.id} (#{x.name}) has more than 2 layoutsets"
+      assert_not_nil x.public_layoutset
+      assert_not_nil x.private_layoutset
     end
   end
 
-  def test_resource
+  def test_members
     @groups.each do |x|
-#       assert !x.resource.nil?, "#{x.id} has no resource"
+      if x.owner.kind_of?(Organization)
+        assert_equal x.owner.members, x.members
+      end
     end
   end
 
+  def test_path
+    @groups.each do |x|
+      if x.private_layouts.any?
+        assert_not_nil x.path(:private)
+      else
+        assert_nil x.path(:private)
+      end
+      if x.public_layouts.any?
+        assert_not_nil x.path(:public)
+      else
+        assert_nil x.path(:public)
+      end
+    end
+  end
+
+#   def test_resource
+#     @groups.each do |x|
+# #       assert !x.resource.nil?, "#{x.id} has no resource"
+#     end
+#   end
+
 end

data/test/unit/mb/category_test.rb

@@ -5,7 +5,10 @@ class MB::CategoryTest < ActiveSupport::TestCase
     :mbcategory,
     :mbdiscussion,
     :mbmessage,
-    :mbthread
+    :mbthread,
+    :group_,
+    :layout,
+    :portlet_names
   ]
 
   def setup
@@ -14,6 +17,55 @@ class MB::CategoryTest < ActiveSupport::TestCase
     @categories.delete @rootcategory
   end
 
+  def test_create
+    # find first user that has a personal group
+    user = nil
+    User.all.each do |user|
+      break if user.hive
+    end
+    group = user.hive
+    assert_not_nil group
+
+    category = MB::Category.create(
+      :name => 'Test',
+      :group => group,
+      :user => user
+    )
+    assert_not_nil category
+
+    assert_equal group, category.group
+    assert_equal user, category.user
+    assert_equal user.fullname, category.username
+    assert_equal 0, category.parentcategoryid
+
+    # ResourceCode with scope 1 => Resource for Company
+    # ResourceCode with scope 2 => Resource for this Group and Guest's Group
+    # ResourceCode with scope 4 => Resource for self
+
+    rc = category.resource_code(1)
+    assert_not_nil rc
+    assert_not_nil Resource.find(:first,
+      :conditions => "codeid=#{rc.id} AND primkey='#{group.companyid}'")
+
+    rc = category.resource_code(2)
+    assert_not_nil rc
+    assert_not_nil Resource.find(:first,
+      :conditions => "codeid=#{rc.id} AND primkey='#{group.id}'")
+
+    rc = category.resource_code(4)
+    assert_not_nil rc
+    resource = Resource.find(:first,
+      :conditions => "codeid=#{rc.id} AND primkey='#{category.id}'")
+    assert_not_nil resource
+
+    category.class.actions.each do |actionid|
+      p = Permission.find(:first,
+        :conditions => "companyid=#{category.companyid} AND actionid='#{actionid}' AND resourceid=#{resource.id}")
+      assert_not_nil p
+      assert user.user_permissions.include?(p)
+    end
+  end
+
   # each article must belong to a company
   def test_company
     @categories.each do |x|
@@ -48,4 +100,14 @@ class MB::CategoryTest < ActiveSupport::TestCase
     assert_equal 0, @rootcategory.parentcategoryid
   end
 
+  def test_path
+    @categories.each do |x|
+      if x.group.layouts_include?('message_boards')
+        assert_not_nil x.path
+      else
+        assert_nil x.path
+      end
+    end
+  end
+
 end

data/test/unit/phone_test.rb

@@ -0,0 +1,33 @@
+require 'test_helper'
+
+class PhoneTest < ActiveSupport::TestCase
+  fixtures [
+    :company,
+    :user_,
+    :phone,
+    :contact_,
+    :classname_,
+    :listtype
+  ]
+
+  def setup
+    @phones = Phone.all
+  end
+
+  def test_phones
+    @phones.each do |phone|
+      assert_not_nil phone.company
+      assert_not_nil phone.user
+      assert_equal phone.company, phone.user.company
+
+      classnameid = Classname.find_by_value('com.liferay.portal.model.Contact').id
+      assert_equal classnameid, phone.classnameid
+
+      assert_equal phone.user.contact.id, phone.classpk
+
+#       mobile = ListType.find_by_name('Mobile').id
+#       assert_equal mobile, phone.typeid
+    end
+  end
+
+end

data/test/unit/role_test.rb

@@ -1,24 +1,143 @@
 require 'test_helper'
 
 class RoleTest < ActiveSupport::TestCase
-  fixtures :role_
+  fixtures [
+    :role_,
+    :users_roles,
+    :groups_roles,
+    :permission_,
+    :users_permissions,
+    :groups_permissions,
+    :resource_,
+    :resourcecode
+  ]
 
   def setup
     @roles = Role.all
+    @company = Company.first
+    flunk 'No company!' unless @company
   end
 
+  def test_create
+    name = 'Regular role'
+    description = 'test'
+
+    role = Role.create(
+      :company => @company,
+      :name => name,
+      :description => description
+    )
+    role.reload
+
+    assert_equal @company, role.company
+    assert_equal name, role.name
+    assert_equal description, role.description
+    assert_equal 0, role.classnameid
+    assert_equal 0, role.classpk
+    assert_equal 1, role.type_
+
+    # ResourceCode & Resource
+    rc = role.resource_code(1)
+    assert_not_nil rc
+    r = Resource.find(:first, :conditions => "codeid=#{rc.id} AND primkey='#{role.companyid}'")
+    assert_not_nil r
+
+    rc = role.resource_code(4)
+    assert_not_nil rc
+    r = Resource.find(:first, :conditions => "codeid=#{rc.id} AND primkey='#{role.id}'")
+    assert_not_nil r
+
+    role.class.actions.each do |actionid|
+      p = Permission.find(:first,
+        :conditions => "companyid=#{role.companyid} AND actionid='#{actionid}' AND resourceid=#{r.id}")
+      assert_not_nil p
+
+      # Permissions to administrators
+      role.company.administrators.each do |user|
+        assert user.user_permissions.include?(p)
+      end
+    end
+  end
+
+  def test_destroy
+    Role.all.each do |role|
+      rc = role.resource_code(4)
+
+      company = role.company
+      users = role.users
+      groups = role.groups
+
+      role.destroy
+
+      users.each do |user|
+        assert !user.roles.include?(role)
+      end
+
+      groups.each do |group|
+        assert !group.roles.include?(role)
+      end
+
+      assert_raise(ActiveRecord::RecordNotFound) { role.reload }
+
+
+      next unless rc
+      r = Resource.find(:first, :conditions => "codeid=#{rc.id} AND primkey='#{role.id}'")
+      next unless r
+
+      %w{
+      ASSIGN_MEMBERS
+      DEFINE_PERMISSIONS
+      DELETE
+      MANAGE_ANNOUNCEMENTS
+      PERMISSIONS
+      UPDATE
+      VIEW }.each do |actionid|
+        p = Permission.find(:first,
+          :conditions => "companyid=#{company.id} AND actionid='#{actionid}' AND resourceid=#{r.id}")
+        assert_nil p
+
+        # User + group permissions
+        users.each do |user|
+          assert !user.user_permissions.include?(p)
+        end
+        groups.each do |group|
+          assert !group.permissions.include?(p)
+        end
+      end
+      assert_raise(ActiveRecord::RecordNotFound) { r.reload }
+    end
+  end
+
+
   # each role must belong to a company
   def test_company
-    @roles.each do |x|
-      assert_not_nil x.company, "#{x.id} belongs to no companies"
+    @roles.each do |r|
+      assert_not_nil r.company, "#{r.id} belongs to no companies"
     end
   end
 
-  def test_rigidity
-    # each user must exist!
-    users = @roles.map{|x| x.users}.uniq
-    users.each do |user|
-      assert_not_nil user
+  def test_users
+    @roles.each do |r|
+      r.users.each do |user|
+        assert_not_nil user
+      end
     end
   end
+
+  def test_groups
+    @roles.each do |r|
+      r.groups.each do |group|
+        assert_not_nil group
+      end
+    end
+  end
+
+  def test_permissions
+    @roles.each do |r|
+      r.permissions.each do |permission|
+        assert_not_nil permission
+      end
+    end
+  end
+
 end

data/test/unit/tag/asset_test.rb

@@ -18,40 +18,52 @@ class Tag::AssetTest < ActiveSupport::TestCase
     @assets = Tag::Asset.all
   end
 
-  # each asset _must_ belong to a company
-  def test_company
+  def test_resource
     @assets.each do |asset|
       assert_not_nil asset.company
-    end
-  end
 
-  # each asset's resource _must_ belong to a company
-  def test_resource
-    @assets.each do |asset|
       classname = Classname.find(asset.classnameid).value
+      assert_not_nil classname
+
       resource = asset.resource
+      assert_not_nil resource
+
+      assert_equal asset.company, resource.company
 
       assert_not_nil resource.liferay_class, '%s has not defined its Java class' % resource.class
       assert_equal classname,resource.liferay_class, 'Asset %i' % asset.id
 
-      assert_not_nil resource.company, "Asset's #{asset.id} resource #{resource.id} does not belong to any company"
+      #assert_not_nil resource.content
+    end
+  end
 
-      assert_equal asset.company,resource.company, "Asset #{asset.id} and resource #{resource.id} belong to a different company"
+  def test_label
+    @assets.each do |asset|
+      assert_not_nil asset.label
+      assert_not_equal '', asset.label
+      assert_equal asset.title, asset.label unless asset.title.empty?
+    end
+  end
+
+  def test_owner
+    @assets.each do |asset|
+      assert_not_nil asset.owner
+      assert_equal User, asset.owner.class
     end
   end
 
   def test_asset_types
-    Asset.resource_types.each do |type|
+    Tag::Asset.resource_types.each do |type|
       type.find(:all).each do |obj|
         if defined? obj.asset
-          assert_not_nil obj.asset
+          assert_not_nil obj.asset, '%s (%i) has no Tag::Asset' % [obj.class, obj.id]
 
           # problems with versioned wiki and journal pages..
           unless obj.class==Wiki::Page or obj.class==Journal::Article
             assert_equal obj,obj.asset.resource
           end
         else
-          #STDERR.puts '%s has not defined the asset method!' % obj.class
+          STDERR.puts '%s has no asset relation' % obj.class
         end
 
         assert_not_nil obj.liferay_class, '%s has not defined its Java class' % obj.class