[popfile-commit] engine/POPFile Module.pm,1.12,1.13 Configuration.pm,1.28,1.29

[<jgr...@us...>]

Update of /cvsroot/popfile/engine/POPFile
In directory sc8-pr-cvs1:/tmp/cvs-serv311/POPFile

Modified Files:
	Module.pm Configuration.pm 
Log Message:
Multi-user Phase #1
-------------------

Make POPFile work relative to two special environment variables:

POPFILE_ROOT         The location where popfile.pl is installed
POPFILE_USER         The location where this user's config is kept


POPFile/Module.pm:

Add two methods

get_root_path_
get_user_path_

that convert passed in relative paths to absolute paths relative
to either POPFILE_ROOT or POPFILE_USER.  This two helpers simply
call the relevant public interface in POPFile/Configuration.pm.

POPFile/Configuration.pm:

Add two methods

get_root_path
get_user_path

that convert passed in relative paths to absolute paths relative
to either POPFILE_ROOT or POPFILE_USER. 

Classifer/WordMangle.pm:

Make this a PLM (with name 'wordmangle') so that it can get access
to the POPFILE_USER variable so that stopwords are per user.  

Classifier/Bayes.pm:

Remove unused Classifier::WordMangle object.

Change all path usage to call get_user_path_ to set the path 
correctly relative to the current user.

UI/HTML.pm:

Change path usage to call get_root_path_ or get_user_path_ to get 
the path relative to the current root or user.  The root is used to
access skins, manual and language files.  Everything else is in the
user directory.

POPFile/Module.pm:

Use the POPFILE_ROOT to control the loading of modules.

popfile.pl:

If POPFILE_ROOT is defined the add it to @INC so that we can load
the POPFile::Loader module.

tests/TestWordMangle.tst:

Since Classifier::WordMangle is now a PLM the tests need to be 
updated to load the mangler correctly and link it in with the
other POPFile modules that is depends on.

tests/TestPOP3.tst
tests/TestMailParse.tst
tests/TestBayes.tst:

Since Classifier::WordMangle is now a PLM test suites that relied
upon Classifier::MailParse creating the mangler needed updating to
actually create and pass in the mangler object.

tests/TestHTTP.tst:

Make tests work on non-Windows systems.  One test was relying on
\n being \r\n.

TODO

Write tests for get_user_path and get_root_path, is_absolute_path,
root_path and path_join
Write tests for POPFILE_ROOT and POPFILE_USER
Make HTML test suite run on Linux
Debug MailParse test suite, fix Japanese handling (026).
Debug POP3 suite/TOP handling



Index: Module.pm
===================================================================
RCS file: /cvsroot/popfile/engine/POPFile/Module.pm,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Module.pm	10 Sep 2003 03:54:15 -0000	1.12
--- Module.pm	10 Nov 2003 19:55:35 -0000	1.13
***************
*** 1,540 ****
! #----------------------------------------------------------------------------
! #
! # This is POPFile's top level Module object.
! #
! # Copyright (c) 2001-2003 John Graham-Cumming
! #
! #   This file is part of POPFile
! #
! #   POPFile is free software; you can redistribute it and/or modify
! #   it under the terms of the GNU General Public License as published by
[...1099 lines suppressed...]
! 
! sub version
! {
!     my ( $self, $value ) = @_;
! 
!     if ( defined( $value ) ) {
!         $self->{version_} = $value;
!     }
! 
!     return $self->{version_};
! }
! 
! sub last_ten_log_entries
! {
!     my ( $self ) = @_;
! 
!     return $self->{logger__}->last_ten();
! }
! 
! 1;

Index: Configuration.pm
===================================================================
RCS file: /cvsroot/popfile/engine/POPFile/Configuration.pm,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** Configuration.pm	20 Oct 2003 12:53:50 -0000	1.28
--- Configuration.pm	10 Nov 2003 19:55:35 -0000	1.29
***************
*** 1,521 ****
! # POPFILE LOADABLE MODULE
! package POPFile::Configuration;
! 
! use POPFile::Module;
! @ISA = ( "POPFile::Module" );
! 
! #----------------------------------------------------------------------------
! #
! # This module handles POPFile's configuration parameters.  It is used to
! # load and save from the popfile.cfg file and individual POPFile modules
[...1129 lines suppressed...]
! 
!     my $path = "$left/$right";
! 
!     # Strip any amount of leading ./
! 
!     $path =~ s/^(\.\/)+//;
! 
!     return $path;
! }
! 
! # GETTER
! 
! sub configuration_parameters
! {
!     my ( $self ) = @_;
! 
!     return sort keys %{$self->{configuration_parameters__}};
! }
! 
! 1;