lportal 1.0.18 → 1.0.19

data/ChangeLog

@@ -1,13 +1,9 @@
-= 1.0.18
-	- backported features from master:
-	- fixed layout resources relation
-	- comment on running tests from master branch
-	- print lportal version on init
-	- import fixture name postgresql hack to run master tests on 1.0
-	- fix journal article links
-	- using user.full as message.username if message has user
-	- creation of MB::Thread
+= 1.0.19
+	- Contry model
+	- backports from master branch
 
+= 1.0.18
+	- backports from master branch
 
 = 1.0.17
 	- introduced schema versions, automatic detection from the release_ table

data/Rakefile

@@ -2,10 +2,21 @@ require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
+ENV['RAILS_GEM_VERSION'] ||= '2.3.8' # FIXME: test suite does not work on older versions!
+
+def info(msg)
+  STDOUT.puts msg
+end
+
+load 'tasks/env.rake'
+load 'tasks/fixtures.rake'
+load 'tasks/migrate.rake'
+load 'tasks/database.rake'
+
 desc 'Default: run unit tests.'
 task :default => :test
 
-desc 'Test the liferay plugin.'
+desc 'Test the lportal gem.'
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
   t.pattern = 'test/**/*_test.rb'

data/db_connection.rb

@@ -0,0 +1,9 @@
+# encoding: utf-8
+
+# Database
+env = ENV['LPORTAL_ENV'] # 'test' or 'production' are valid
+
+# Open database connection
+database_configuration = YAML.load_file('config/database.yml')
+ActiveRecord::Base.configurations = database_configuration
+ActiveRecord::Base.establish_connection(database_configuration[env])

data/lib/country.rb

@@ -0,0 +1,5 @@
+# encoding: utf-8
+class Country < ActiveRecord::Base
+  set_table_name       :country
+  set_primary_key      :countryid
+end

data/lib/group.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 # This model represents the user groups (communities) in the lportal database.
 class Group < ActiveRecord::Base
   set_table_name       :group_
@@ -421,4 +422,4 @@ class Group < ActiveRecord::Base
     return portlet.preferences
   end
 
-end
+end

data/lib/web/layout.rb

@@ -168,9 +168,8 @@ module Web
     belongs_to :company,
       :foreign_key => 'companyid'
 
-    def resources
-      Resource.find(:all, :conditions => "primkey like '#{self.plid}'")
-    end
+    has_many :resources,
+      :foreign_key => 'primkey'
 
     def layoutset
       Web::LayoutSet.find(:first, :conditions => "groupid=#{self.groupid} AND privatelayout=#{self.privatelayout}" )

data/lportal.rb

@@ -5,18 +5,6 @@ file = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
 this_dir = File.dirname(File.expand_path(file))
 
 require File.join(this_dir,'version')
-def info(msg)
-  msg = 'lportal: %s' % msg
-  STDOUT.puts(msg)
-end
-
-info 'version ' + Lportal::VERSION
-
-# this would be the proper place to load PostgreSQL hacks from 1.2 branch.
-# fixture hack imported from master branch would be useful while running tests,
-# however the test framework needs to be loaded before loading the fixture hack.
-#require File.join(this_dir,'active_record','fixtures.rb')
-# workaround: load that (^^) in RAILS_ROOT/test/test_helper.rb
 
 # set the migrations directory for Caterpillar
 LPORTAL_MIGRATIONS=File.expand_path(
@@ -46,14 +34,17 @@ end
 
 # define this database's schema version
 require File.join(this_dir,'schema')
-release = Release.current
-last_supported_release = 5201
-Lportal::Schema.buildnumber = (release ? release.buildnumber : last_supported_release)
+Lportal::Schema.buildnumber = 
+  begin
+    Release.current.buildnumber
+  rescue
+    nil
+  end
 
 msg = 'Using Liferay schema build %i, version %s' % [
   Lportal::Schema.buildnumber, Lportal::Schema.version]
 
-puts msg
-
 defined?(RAILS_DEFAULT_LOGGER) ?
   RAILS_DEFAULT_LOGGER.info(msg) : STDOUT.puts(msg)
+
+puts 'ActiveRecord v.%s' % ActiveRecord::VERSION::STRING

data/rails_gem_chooser.rb

@@ -0,0 +1,87 @@
+# encoding: utf-8
+#--
+# (c) Copyright 2009,2010 Mikael Lammentausta
+#
+# See the file MIT-LICENSE included with the distribution for
+# software license details.
+#++
+
+require 'rubygems'
+
+# Rails gem chooser.
+#
+# Selects RAILS_GEM_VERSION from ENV, or from RAILS_ROOT/config/environment.rb.
+# Returns nil otherwise.
+class RailsGemChooser
+  class << self
+
+  def version(config_file=nil)
+    # detect from ENV
+    if ENV['RAILS_GEM_VERSION']
+      return ENV['RAILS_GEM_VERSION']
+    elsif not config_file
+      # load Rails config file
+      if RAILS_ROOT
+          config_file = File.join(
+          File.expand_path(RAILS_ROOT),
+            'config',
+            'environment.rb'
+            )
+      else
+        STDERR.puts 'Could not detect Rails version'
+        return nil
+      end
+	  end
+    # don't attempt to load Rails if building a Rubygem..!
+    if $0[/gem$/] or !File.exist?(config_file)
+      return nil
+    else
+      # read from Rails config file
+      f=File.open(config_file)
+      config = f.read
+      f.close
+      rails_gem_version = config[/^RAILS_GEM_VERSION.*(\d\.\d\.\d)/,1]
+      #STDOUT.puts 'Detected Rails version %s from the config file %s' % [rails_gem_version,config_file]
+      return rails_gem_version
+    end
+  end
+
+  # Load a specific GEM
+  def __load_gem(require_name, gem_name, version)
+    version ? gem(gem_name, '= '+version) : gem(gem_name)
+    begin
+      require require_name
+    rescue LoadError
+      require gem_name
+    end
+  end
+
+  # Either define +rails_gem_version+ or +config_file+
+  def __load(rails_gem_version=nil,config_file=nil)
+    raise 'oops' if config_file and rails_gem_version
+
+    rails_gem_version ||= version(config_file) # also detects ENV['RAILS_GEM_VERSION']
+
+    #STDOUT.puts 'Loading Rails version %s' % rails_gem_version
+    # the gem without underline will be removed in Rails3..
+    #rails_gems = %w{ active_support action_pack active_record }
+    # except that with the underline divider the gem is not found ..
+    #rails_gems = %w{ activesupport actionpack activerecord }
+    
+    rails_gems = {              
+      # require name      gem name
+      "active_support" => "activesupport",
+      "action_pack"    => "actionpack",
+      "active_record"  => "activerecord"
+    }
+
+    rails_gems.keys.each do |rg_key|
+      __load_gem(rg_key, rails_gems[rg_key], rails_gem_version)
+    end
+    require 'action_controller'
+
+    #STDOUT.puts 'Loaded Rails version %s' % Rails::VERSION::STRING
+  end
+
+  end
+end

data/test/unit/account_test.rb

@@ -1,11 +1,13 @@
-require 'test_helper'
+# encoding: utf-8
+
+require 'test/test_helper'
 
 class AccountTest < ActiveSupport::TestCase
-  fixtures :account_
+  fixtures [:Account_, :Company, :User_]
 
   def setup
     @accounts = Account.find :all
-    assert !@accounts.empty?, "No accounts found"
+    flunk 'No accounts found' unless @accounts.any?
   end
 
   def test_company
@@ -16,7 +18,8 @@ class AccountTest < ActiveSupport::TestCase
 
   def test_user
     @accounts.each do |x|
-      #assert_not_nil x.user
+      next if x.send(User.primary_key)==0
+      assert_not_nil x.user, 'Account %i belongs to no user' % x.id
     end
   end
 

data/test/unit/address_test.rb

@@ -1,4 +1,25 @@
-require 'test_helper'
+# encoding: utf-8
+
+require 'test/test_helper'
 
 class AddressTest < ActiveSupport::TestCase
+  fixtures [:Address, :Company, :User_]
+
+  def setup
+    @addresses = Address.all
+    flunk 'No addresses found' unless @addresses.any?
+  end
+
+  def test_company
+    @addresses.each do |x|
+      assert_not_nil x.company
+    end
+  end
+
+  def test_user
+    @addresses.each do |x|
+      next if x.send(User.primary_key)==0
+      assert_not_nil x.user
+    end
+  end
 end

data/test/unit/announcement/delivery_test.rb

@@ -0,0 +1,24 @@
+# encoding: utf-8
+
+require 'test/test_helper'
+
+class Announcement::DeliveryTest < ActiveSupport::TestCase
+  fixtures :Company, :User_, :AnnouncementsDelivery
+
+  def setup
+    @deliveries = Announcement::Delivery.all
+  end
+
+  def test_company
+    @deliveries.each do |x|
+      assert_not_nil x.company, "#{x.id} belongs to no company"
+    end
+  end
+
+  def test_user
+    @deliveries.each do |x|
+      assert_not_nil x.user, "#{x.id} belongs to no user!"
+    end
+  end
+
+end

data/test/unit/announcement/entry_test.rb

@@ -1,7 +1,9 @@
-require 'test_helper'
+# encoding: utf-8
+
+require 'test/test_helper'
 
 class Announcement::EntryTest < ActiveSupport::TestCase
-  fixtures :announcementsentry
+  fixtures :Company, :User_, :AnnouncementsEntry
 
   def setup
     @announcements = Announcement::Entry.all

data/test/unit/blog_post_test.rb

@@ -1,14 +1,26 @@
-require 'test_helper'
+# encoding: utf-8
+
+require 'test/test_helper'
 
 class AssetTest < ActiveSupport::TestCase
   fixtures [
-    :tagsasset,
-    :resource_, :resourcecode,
-    :blogsentry
+    :Company,
+    :TagsAsset,
+    :Resource_, :ResourceCode,
+    :BlogsEntry,
+    :User_,
+    :Group_
   ]
 
   def setup
     @posts = BlogPost.all
+    flunk 'No posts to test' unless @posts.any?
+  end
+
+  def test_company
+    @posts.each do |p|
+      assert_not_nil p.company
+    end
   end
 
   def test_user

data/test/unit/bookmark/entry_test.rb

@@ -1,10 +1,13 @@
-require 'test_helper'
+# encoding: utf-8
+
+require 'test/test_helper'
 
 class Bookmark::EntryTest < ActiveSupport::TestCase
-  fixtures :bookmarksentry, :bookmarksfolder
+  fixtures :Company, :User_, :BookmarksEntry, :BookmarksFolder, :TagsAsset
 
   def setup
     @bookmarks = Bookmark::Entry.all
+    flunk 'No bookmark entries to test' unless @bookmarks.any?
   end
 
   def test_company
@@ -25,4 +28,10 @@ class Bookmark::EntryTest < ActiveSupport::TestCase
     end
   end
 
+  def test_asset
+    @bookmarks.each do |x|
+      assert_not_nil x.asset
+    end
+  end
+
 end

data/test/unit/bookmark/folder_test.rb

@@ -1,10 +1,13 @@
-require 'test_helper'
+# encoding: utf-8
+
+require 'test/test_helper'
 
 class Bookmark::FolderTest < ActiveSupport::TestCase
-  fixtures :bookmarksentry, :bookmarksfolder
+  fixtures :Company, :Group_, :User_, :BookmarksEntry, :BookmarksFolder
 
   def setup
     @folders = Bookmark::Folder.all
+    flunk 'No bookmark folders to test' unless @folders.any?
   end
 
   def test_company
@@ -13,10 +16,25 @@ class Bookmark::FolderTest < ActiveSupport::TestCase
     end
   end
 
+  def test_group
+    @folders.each do |x|
+      assert_not_nil x.group
+    end
+  end
+
   def test_user
     @folders.each do |x|
       assert_not_nil x.user, "#{x.id} belongs to no user!"
     end
   end
 
+  def test_entries
+    @folders.each do |x|
+      assert_not_nil x.entries
+      x.entries.each do |e|
+        assert_equal x, e.folder
+      end
+    end
+  end
+
 end

data/test/unit/calevent_test.rb

@@ -1,7 +1,14 @@
-require 'test_helper'
+# encoding: utf-8
+
+require 'test/test_helper'
 
 class CaleventTest < ActiveSupport::TestCase
-  fixtures  :calevent
+  fixtures  [
+    :Company,
+    :User_,
+    :Group_,
+    :CalEvent
+  ]
 
   def setup
     @events = Calevent.all

data/test/unit/company_test.rb

@@ -1,12 +1,15 @@
-require 'test_helper'
+# encoding: utf-8
+
+require 'test/test_helper'
 
 class CompanyTest < ActiveSupport::TestCase
   fixtures [
-    :company,
-    :user_, :group_,
-    :account_, :organization_, :contact_,
-    :layout, :layoutset,
-    :resource_, :resourcecode
+    :Company,
+    :User_, :Group_,
+    :Account_, :Organization_, :Contact_,
+    :Layout, :LayoutSet,
+    :Resource_, :ResourceCode,
+    :Role_, :Users_Roles
   ]
 
   def setup
@@ -17,42 +20,37 @@ class CompanyTest < ActiveSupport::TestCase
   # each company must have an account
   def test_account
     @companies.each do |c|
-      assert !c.account.nil?, "#{c.id} has no account"
+      assert_not_nil c.account, "#{c.id} has no account"
+      #assert_equal 0, c.account.send(User.primary_key) #?
     end
   end
 
-  # each company must have contacts
+  # address is not required, not included in Liferay 5.2.3 dataset
+  #   def test_address
+  #     @companies.each do |c|
+  #       #assert_not_nil c.address, "#{c.id} has no address"
+  #     end
+  #   end
+
   def test_contacts
     @companies.each do |c|
       assert !c.contacts.empty?, "#{c.id} has no contacts"
     end
   end
 
-  # hmm?
-#   def test_defaultuser
-#     @companies.each do |c|
-#       assert c.account.user.is_default?, "No default user for #{c.id}"
-#       assert c.account.user.is_active?, "Default user account for #{c.id} is not active"
-#       assert c.account.user.company == c, "Default user for #{c.id} has wrong company"
-#       assert !c.account.user.account.nil?, "Default user for #{c.id} has no account"
-#     end
-#   end
-
-  # each company must have a webid
-  def test_webid
+  def test_users
     @companies.each do |c|
-      assert_not_nil c.webid, "#{c.id} has no webid"
+      c.users.each do |u|
+        assert_not_nil u
+      end
     end
   end
 
-  # each company must have a virtualhost
-  def test_virtualhost
-    layoutsets_virtualhosts=Web::LayoutSet.find(:all).map{|s| s.virtualhost }
+  def test_groups
     @companies.each do |c|
-      assert_not_nil c.virtualhost, "#{c.id} has no virtualhost"
-
-      # check that the virtualhost isn't duplicated in any layoutsets
-      assert !layoutsets_virtualhosts.include?(c.virtualhost), "Duplicate virtualhost #{c.virtualhost} in layoutsets"
+      c.groups.each do |g|
+        assert_not_nil g
+      end
     end
   end
 
@@ -64,15 +62,37 @@ class CompanyTest < ActiveSupport::TestCase
     end
   end
 
+  def test_layoutsets
+    @companies.each do |c|
+      assert c.layoutsets.any?, 'Company %i has no layoutsets' % c.id
+      c.layoutsets.each do |ls|
+        assert_equal c, ls.company
+      end
+    end
+  end
+
+#   def test_resources
+#     @companies.each do |c|
+#       assert c.resources.any?, 'Company %i has no resources' % c.id
+#     end
+#   end
+
   def test_administrators
     @companies.each do |c|
+      adminrole = Role.find(:first, :conditions => "companyid=#{c.id} AND name='Administrator'")
+      assert_not_nil adminrole, 'No admin role found'
       assert c.administrators.size > 0, 'Company %s (%i) does not have administrators' % [c.webid, c.id]
     end
   end
 
   def test_guest
     @companies.each do |c|
-      assert_not_nil c.guest, 'Company %i does not have a guest account' % c.id
+      assert_not_nil c.guest, 'Company %s does not have a guest account' % c.webid
+      assert c.guest.is_default?, "No default user for #{c.webid}"
+      assert c.guest.is_active?, "Default user account for #{c.webid} is not active"
+      assert c.guest.company == c, "Default user for #{c.webid} has wrong company"
+      # Liferay 5.2.3 has an account for Guest
+      #assert_nil c.guest.account, "Default user for #{c.webid} has an account"
     end
   end
 
@@ -82,4 +102,48 @@ class CompanyTest < ActiveSupport::TestCase
     end
   end
 
+
+  def test_personal_groups
+    @companies.each do |c|
+      assert_nothing_raised { c.personal_groups }
+    end
+  end
+
+  def test_public_groups
+    @companies.each do |c|
+      assert_nothing_raised { c.public_groups }
+    end
+  end
+
+  def test_open_groups
+    @companies.each do |c|
+      assert_nothing_raised { c.open_groups }
+    end
+  end
+
+  def test_private_groups
+    @companies.each do |c|
+      assert_nothing_raised { c.private_groups }
+    end
+  end
+
+
+  # each company must have a webid
+  def test_webid
+    @companies.each do |c|
+      assert_not_nil c.webid, "#{c.id} has no webid"
+    end
+  end
+
+  # each company must have a virtualhost
+  def test_virtualhost
+    layoutsets_virtualhosts=Web::LayoutSet.find(:all).map{|s| s.virtualhost }
+    @companies.each do |c|
+      assert_not_nil c.virtualhost, "#{c.id} has no virtualhost"
+
+      # check that the virtualhost isn't duplicated in any layoutsets
+      assert !layoutsets_virtualhosts.include?(c.virtualhost), "Duplicate virtualhost #{c.virtualhost} in layoutsets"
+    end
+  end
+
 end