openinteract-commits — CVS updates for OpenInteract/SPOPS

[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2/Response Apache.pm,1.21,1.22

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Response
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4027

Modified Files:
	Apache.pm 
Log Message:
sometimes $apache->print() won't deal with scalars properly...


Index: Apache.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Response/Apache.pm,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Apache.pm	17 Mar 2005 14:58:04 -0000	1.21
--- Apache.pm	21 Sep 2005 03:35:23 -0000	1.22
***************
*** 30,34 ****
      $log ||= get_logger( LOG_RESPONSE );
  
!     $log->is_info && $log->info( "Sending Apache response" );
  
      my $apache = $self->apache;
--- 30,34 ----
      $log ||= get_logger( LOG_RESPONSE );
  
!     $log->is_info && $log->info( "Sending Apache 1.x response..." );
  
      my $apache = $self->apache;
***************
*** 68,72 ****
      else {
          $self->_send_header;
!         $apache->print( $self->content );
      }
  }
--- 68,73 ----
      else {
          $self->_send_header;
!         my $content = $self->content;
!         $apache->print( ( ref $content ) ? ${ $content } : $content );
      }
  }

[Openinteract-commits] CVS: OpenInteract2/pkg/base_page package.ini,1.4,1.5 Changes,1.31,1.32

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/pkg/base_page
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3943

Modified Files:
	package.ini Changes 
Log Message:
meta


Index: package.ini
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_page/package.ini,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** package.ini	15 Mar 2005 02:41:26 -0000	1.4
--- package.ini	21 Sep 2005 03:34:51 -0000	1.5
***************
*** 1,5 ****
  [package]
  name          = base_page
! version       = 2.32
  author        = Chris Winters <ch...@cw...>
  url           = http://www.openinteract.org/
--- 1,5 ----
  [package]
  name          = base_page
! version       = 2.33
  author        = Chris Winters <ch...@cw...>
  url           = http://www.openinteract.org/
***************
*** 8,13 ****
  module        = LWP::UserAgent
  sql_installer = OpenInteract2::SQLInstall::Page
! description   = Object and handler representing a static web page, either \
!   from the filesystem or from objects stored within a database, or both. \
!   (Choose the default in 'conf/spops_page.ini'.) This will be the default \
!   handler for most OpenInteract applications, and is a fundamental part of the system. 
--- 8,14 ----
  module        = LWP::UserAgent
  sql_installer = OpenInteract2::SQLInstall::Page
! description   = Object and handler representing a static web page, \
!   either from the filesystem or from objects stored within a database, \ 
!   or both. (Choose the default in 'conf/spops_page.ini'.) This will \ 
!   be the default handler for most OpenInteract applications, and is \
!   a fundamental part of the system. 

Index: Changes
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_page/Changes,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** Changes	15 Mar 2005 02:41:26 -0000	1.31
--- Changes	21 Sep 2005 03:34:51 -0000	1.32
***************
*** 1,4 ****
--- 1,14 ----
  Revision history for OpenInteract package base_page.
  
+ 2.33  Tue Sep 20 23:32:31 EDT 2005
+ 
+       Make configurable the wrapper template when displaying a page
+       using the parameter 'wrapper_template'. If you don't change your
+       configuration the old behavior will hold.
+ 
+       Also, ensure we respect the 'main_template' setting in a page
+       and communicate that up to the relevant controller
+       (OI2::Controller::MainTemplate).
+ 
  2.32  Mon Mar 14 21:38:00 EST 2005
  

[Openinteract-commits] CVS: OpenInteract2/pkg/base_page/OpenInteract2/Action Page.pm,1.27,1.28

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/pkg/base_page/OpenInteract2/Action
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3903/OpenInteract2/Action

Modified Files:
	Page.pm 
Log Message:
make page wrapper configurable; if 'main_template' is configured in
displayable page, communicate that info up to the controller


Index: Page.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_page/OpenInteract2/Action/Page.pm,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** Page.pm	18 Mar 2005 04:09:44 -0000	1.27
--- Page.pm	21 Sep 2005 03:34:40 -0000	1.28
***************
*** 30,33 ****
--- 30,35 ----
  # etc.) get sent to the user directly
  
+ use constant DEFAULT_WRAPPER => 'base_page::page_displayable';
+ 
  my %DISPLAY_TYPES = map { $_ => 1 } ( 'text/html', 'text/plain' );
  
***************
*** 773,776 ****
--- 775,799 ----
      }
  
+     # If we've defined a 'main_template' then we'll assign it to the
+     # controller, add any boxes ourselves and not parse content
+     if ( my $main_template = $page->main_template ) {
+         eval {
+             my $ctl = CTX->controller;
+             if ( $main_template eq 'base_raw' ) { #compatibility...
+                 $ctl->no_template( 'yes' );
+             }
+             else {
+                 $ctl->main_template( $main_template );
+             }
+             $ctl->add_box( $_ )    for ( @box_add );
+             $ctl->remove_box( $_ ) for ( @box_remove );
+         };
+         return ( ref $page->{content} )
+                  ? ${ $page->{content} }
+                  : $page->{content};
+     }
+ 
+ 
+ 
      my %params = (
          box_add    => \@box_add,
***************
*** 788,793 ****
      }
      $params{content} = $base_display_content;
      return $self->generate_content(
!                     \%params, { name => 'base_page::page_displayable' });
  }
  
--- 811,818 ----
      }
      $params{content} = $base_display_content;
+     my $wrapper_template = $self->param( 'wrapper_template' )
+                            || DEFAULT_WRAPPER;
      return $self->generate_content(
!                     \%params, { name => $wrapper_template });
  }
  

[Openinteract-commits] CVS: OpenInteract2/pkg/base_page/conf action.ini,1.6,1.7

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/pkg/base_page/conf
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3853/conf

Modified Files:
	action.ini 
Log Message:
add default impl of configurable wrapper template


Index: action.ini
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_page/conf/action.ini,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** action.ini	8 Jul 2003 12:24:33 -0000	1.6
--- action.ini	21 Sep 2005 03:34:03 -0000	1.7
***************
*** 5,8 ****
--- 5,9 ----
  page_separator            = <!--PAGE-->
  c_object_type             = page
+ wrapper_template          = base_page::page_displayable
  c_search_form_template    = base_page::page_search_form
  c_search_results_template = base_page::page_search_results

[Openinteract-commits] CVS: OpenInteract2/pkg/base_page/template admin_actions.tmpl,1.4,1.5

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/pkg/base_page/template
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3811/template

Modified Files:
	admin_actions.tmpl 
Log Message:
wrap page in class to display ok


Index: admin_actions.tmpl
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_page/template/admin_actions.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** admin_actions.tmpl	30 Aug 2003 16:33:07 -0000	1.4
--- admin_actions.tmpl	21 Sep 2005 03:33:40 -0000	1.5
***************
*** 8,12 ****
  [% END -%]
  
! <div align="center">
  
  <h2>Page Admin Actions</h2>
--- 8,12 ----
  [% END -%]
  
! <div align="center" class="demarcatePage">
  
  <h2>Page Admin Actions</h2>

[Openinteract-commits] CVS: OpenInteract2/doc/Manual FAQ.pod,NONE,1.1

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/doc/Manual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23426

Added Files:
	FAQ.pod 
Log Message:
OIN-88: add a FAQ with a few questions (no answers, yet)


--- NEW FILE: FAQ.pod ---
=head1 NAME

OpenInteract2::Manual::FAQ - Frequently Asked Questions for OpenInteract2

=head1 SYNOPSIS

This document is for people developing OpenInteract2 applications. It
should also have some gentle introductions for people interested in
learning how the internals work.

=head1 TEMPLATES

=head2 Q: How do I create good templates? 


=head2 Q: What functionality is available from the templates? 


=head2 Q: Any gotchas I should know about? 

=head1 DEVELOPING APPLICATIONS

=head2 Q: How do I start?


=head2 Q: What sort of functionality can I implement?


=head2 Q: How do I talk to a database?


=head2 Q: What Perl modules can I use?


=head2 Q: How do I generate HTML?


=head1 FRAMEWORK

=head2 Q: How do the different parts of OI2 fit together? 


=head2 Q: How is a HTTP request handled?
 

=head2 Q: How do I access different functionality in OI2 from my modules? 


=head2 Q: Where can I find diagrams for an overview of how OI2 is glued together? 

=head1 COPYRIGHT

Copyright (c) 2005 Chris Winters. All rights reserved.

This library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself.

=head1 AUTHORS

Chris Winters E<lt>ch...@cw...E<gt>

[Openinteract-commits] CVS: OpenInteract2/sample/daemon oi2_daemon.ini,1.2,1.3

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/sample/daemon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31147/sample/daemon

Modified Files:
	oi2_daemon.ini 
Log Message:
fix problems with daemon and multiple requests

Index: oi2_daemon.ini
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/sample/daemon/oi2_daemon.ini,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** oi2_daemon.ini	22 May 2004 16:02:13 -0000	1.2
--- oi2_daemon.ini	30 Jul 2005 22:44:08 -0000	1.3
***************
*** 8,11 ****
--- 8,12 ----
  LocalPort = 8080
  Proto     = tcp
+ ReuseAddr = 1
  
  # Declare any number of regular expressions that tell the daemon to

[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2/Setup CreateTemporaryLibraryDirectory.pm,1.4,1.5

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Setup
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31019/lib/OpenInteract2/Setup

Modified Files:
	CreateTemporaryLibraryDirectory.pm 
Log Message:
add 'devel_mode' to top-level server config; if set to 'yes' we recreate the temporary library directory every restart

Index: CreateTemporaryLibraryDirectory.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Setup/CreateTemporaryLibraryDirectory.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CreateTemporaryLibraryDirectory.pm	4 Jul 2005 03:06:49 -0000	1.4
--- CreateTemporaryLibraryDirectory.pm	30 Jul 2005 22:43:43 -0000	1.5
***************
*** 35,40 ****
      $self->param( created => [] ); # default: don't create anything
  
!     my $devel_mode = $ctx->server_config->{devel_mode} eq 'yes';;
!     my $do_create = $self->param( 'create_templib' ) || $devel_mode || 0;
      if ( ! $do_create && -d $full_temp_lib_dir ) {
          my $refresh_file = catfile( $full_temp_lib_dir,
--- 35,43 ----
      $self->param( created => [] ); # default: don't create anything
  
!     # should probably assign this default when we read in the config?
!     $ctx->server_config->{devel_mode} ||= 'no';
! 
!     my $in_devel_mode = $ctx->server_config->{devel_mode} eq 'yes';
!     my $do_create = $self->param( 'create_templib' ) || $in_devel_mode || 0;
      if ( ! $do_create && -d $full_temp_lib_dir ) {
          my $refresh_file = catfile( $full_temp_lib_dir,

[Openinteract-commits] CVS: OpenInteract2/sample/website/conf server.ini,1.55,1.56

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/sample/website/conf
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31019/sample/website/conf

Modified Files:
	server.ini 
Log Message:
add 'devel_mode' to top-level server config; if set to 'yes' we recreate the temporary library directory every restart

Index: server.ini
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/sample/website/conf/server.ini,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** server.ini	27 May 2005 16:25:44 -0000	1.55
--- server.ini	30 Jul 2005 22:43:43 -0000	1.56
***************
*** 23,26 ****
--- 23,27 ----
  ConfigurationRevision = $Revision$
  timezone              = America/New_York
+ devel_mode            = no
  
  #  General information about the context of your server

[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2 Context.pm,1.88,1.89

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25040

Modified Files:
	Context.pm 
Log Message:
don't log an error when we cannot find an action by name

Index: Context.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Context.pm,v
retrieving revision 1.88
retrieving revision 1.89
diff -C2 -d -r1.88 -r1.89
*** Context.pm	29 Mar 2005 16:50:49 -0000	1.88
--- Context.pm	4 Jul 2005 14:56:19 -0000	1.89
***************
*** 388,394 ****
      my $action_info = $self->lookup_action_info( $action_name );
      unless ( $action_info ) {
!         my $msg = "No action found for '$action_name'";
!         $log_act->error( $msg );
!         OpenInteract2::Exception->throw( $msg );
      }
      return OpenInteract2::Action->new( $action_info, $props );
--- 388,392 ----
      my $action_info = $self->lookup_action_info( $action_name );
      unless ( $action_info ) {
!         OpenInteract2::Exception->throw( "No action found for '$action_name'" );
      }
      return OpenInteract2::Action->new( $action_info, $props );

[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2/ActionResolver MatchRegex.pm,NONE,1.1

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/ActionResolver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18279/ActionResolver

Added Files:
	MatchRegex.pm 
Log Message:
add new action resolver to match URLs to actions based on regular expressions

--- NEW FILE: MatchRegex.pm ---
package OpenInteract2::ActionResolver::MatchRegex;

# $Id: MatchRegex.pm,v 1.1 2005/07/04 03:09:57 lachoy Exp $

use strict;
use base qw( OpenInteract2::ActionResolver );
use Log::Log4perl            qw( get_logger );
use OpenInteract2::Constants qw( LOG_ACTION );
use OpenInteract2::Context qw( CTX );

$OpenInteract2::ActionResolver::MatchRegex::VERSION  = sprintf("%d.%02d", q$Revision: 1.1 $ =~ /(\d+)\.(\d+)/);

my ( $log );

sub get_name  { return 'match_url_regex' }

sub get_order { return 4 }

my @PATTERN_ACTIONS = ();
my $ACTIONS_CHECKED = 0;

sub resolve {
    my ( $self, $request, $url ) = @_;
    $log ||= get_logger( LOG_ACTION );
    unless ( $ACTIONS_CHECKED ) {
        @PATTERN_ACTIONS = $self->_fill_actions();
        $ACTIONS_CHECKED++;
    }
    my ( $action );
    foreach my $info ( @PATTERN_ACTIONS ) {
        next unless ( $url =~ /$info->[1]/ );
        $log->debug( "URL '$url' matches url_pattern '$info->[1]' from ",
                     "action '$info->[0]'" );
        my $task_and_params = $1;
        $action = eval { CTX->lookup_action( $info->[0] ) };
        unless ( $action ) {
            $log->debug( "...but no action returned with name '$info->[0]'" );
            next;
        }

        if ( my $capture_pat = $action->url_pattern_group ) {
            $url =~ /$capture_pat/;
            $task_and_params = $1;
        }
        $task_and_params =~ s|^/||;
        $task_and_params =~ s|/$||;
        my ( $task, @params ) = split /\\/, $task_and_params;
        $log->debug( "Got task '$task' ugand additional URL parameters ",
                     '[', join( ', ', @params ), "] from regex-captured ",
                     "group '$task_and_params'" );
        $action->task( $task );
        $self->assign_additional_params_from_url( $request, @params );
        last;
    }
    return $action;
}

sub _fill_actions {
    my ( $self ) = @_;
    $log->debug( "Finding actions with 'url_pattern'..." );
    my $action_table = CTX->action_table;
    my @actions = ();
    while ( my ( $name, $info ) = %{ $action_table } ) {
        my $pat =  $info->{url_pattern};
        next unless ( $pat );
        push @actions, [ $name, qr/$pat/ ];
        $log->debug( "Action '$name' to be matched with '$pat'" );
    }
    return @actions;
}

1;

__END__

=head1 NAME

OpenInteract2::ActionResolver::MatchRegex - Match an incoming URL by regex

=head1 SYNOPSIS

 # Tell OI2 which URLs are bound to it -- the capturing group
 # should return the task and additional arguments
 
 [myaction]
 url_pattern = ^/foo\w+(.*)
 
 # Same as above but modify how we return the task +  params
 [myaction]
 url_pattern = ^/foo(\w+)?
 url_pattern_group = ^/.*?/(.*)/$

=head1 DESCRIPTION

This is a simple action resolver that allows you to pair an incoming
URL with an action. All actions with a property 'url_pattern' will get
checked against the URL and if none match the next action resolver
will get invoked.

If we find a match we also need to determine the task and any
additional URL parameters from the URL. Since we don't know exactly
how you'll be matching the URL it's not as simple as the job in
L<OpenInteract2::ActionResolver::NameAndTask>. So we allow for two
ways:

If you define the action property 'url_pattern_group' we evaluate it
as a regular expression and use the first capturing group, otherwise
we use the first capturing group from 'url_pattern'. Whichever is used
we treat the value as a '/'-delimited list with the first value being
the task and the remainder being the additional URL parameters.

If no capturing is defined your action won't have a task and no
additional URL parameters will be available by default (so your action
will have to do a little more work).

Example:

 URL: http://myhost/Frobnicate/view/43
 
 [some_action]
 ...
 url_pattern = ^/(?:frob|blob)nicate/(.*)$

 Result: match
   task = view
   additional params = [ 43 ]
 
 # Another way to do it with the same result
 
 [some_action]
 ...
 url_pattern = ^/(frob|blob)nicate
 url_pattern_group = ^/\w+/(.*)$

=head1 OBJECT METHODS

B<get_order()>

Returns 4 so it runs before L<OpenInteract2::ActionResolver::NameAndTask>.

B<resolve( $request, $url )>

Finds all the actions with a 'url_pattern' property and tries to match
the pattern against C<$url>. See L<DESCRIPTION> above.

=head1 SEE ALSO

L<OpenInteract2::ActionResolver>

=head1 COPYRIGHT

Copyright (c) 2005 Chris Winters. All rights reserved.

This library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself.

=head1 AUTHORS

Chris Winters E<lt>ch...@cw...E<gt>

[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2 ActionResolver.pm,1.3,1.4

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17851

Modified Files:
	ActionResolver.pm 
Log Message:
add docs for internal assign_additional_params_from_url()

Index: ActionResolver.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/ActionResolver.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ActionResolver.pm	2 Mar 2005 15:30:38 -0000	1.3
--- ActionResolver.pm	4 Jul 2005 03:09:10 -0000	1.4
***************
*** 191,194 ****
--- 191,199 ----
   }
  
+ B<assign_additional_params_from_url( $request, @params )>
+ 
+ Just assigns the values in C<@params> to C<$request> using its
+ C<param_url_additional()> method.
+ 
  =head1 SEE ALSO
  

[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2 Action.pm,1.74,1.75

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17127

Modified Files:
	Action.pm 
Log Message:
add properties 'url_pattern' and 'url_pattern_group'

Index: Action.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Action.pm,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** Action.pm	29 Mar 2005 17:01:54 -0000	1.74
--- Action.pm	4 Jul 2005 03:07:53 -0000	1.75
***************
*** 56,59 ****
--- 56,61 ----
      cache_param       => 'Parameters to use when caching contnent',
      url_additional    => 'Parameter names to which additional URL parameters get assigned; may be segmented by task',
+     url_pattern       => 'Regular expression used to determine if an incoming URL is bound to action',
+     url_pattern_group => 'Regular expression used to get the task + params from the URL after it matches "url_pattern" (optional)',
  );
  
***************
*** 2009,2012 ****
--- 2011,2036 ----
   }
  
+ B<url_pattern> ($)
+ 
+ If you don't want to map an incoming URL to your action with a name
+ (using L<OpenInteract2::ActionResulver::NameAndTask>) you can do it
+ with a regular expression. Define the expression in this property and
+ it will get picked up by L<OpenInteract2::ActionResolver::MatchRegex>.
+ 
+ Since we don't know exactly what/how you'll be matching the URL or
+ what the task and additional URL parameters will be, we assume in the
+ common case that you're going to return it as the first captured
+ group from the regular expression.
+ 
+ In the uncommon case you'll define C<url_pattern_group> with your
+ capturing grou; see below.
+ 
+ B<url_pattern_group> ($)
+ 
+ If your C<url_pattern> matches you can define this as a regular
+ expression; the first capturing group will be used to determine the
+ task and additional URL parameters. See
+ L<OpenInteract2::ActionResolver::MatchRegex> for examples.
+ 
  B<message_name> ($)
  

[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2/Setup CreateTemporaryLibraryDirectory.pm,1.3,1.4

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Setup
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16732

Modified Files:
	CreateTemporaryLibraryDirectory.pm 
Log Message:
if we're running in devel_mode, wipe out the temporary library directory with every restart

Index: CreateTemporaryLibraryDirectory.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Setup/CreateTemporaryLibraryDirectory.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CreateTemporaryLibraryDirectory.pm	18 Mar 2005 04:09:51 -0000	1.3
--- CreateTemporaryLibraryDirectory.pm	4 Jul 2005 03:06:49 -0000	1.4
***************
*** 35,39 ****
      $self->param( created => [] ); # default: don't create anything
  
!     my $do_create = $self->param( 'create_templib' ) || 0;
      if ( ! $do_create && -d $full_temp_lib_dir ) {
          my $refresh_file = catfile( $full_temp_lib_dir,
--- 35,40 ----
      $self->param( created => [] ); # default: don't create anything
  
!     my $devel_mode = $ctx->server_config->{devel_mode} eq 'yes';;
!     my $do_create = $self->param( 'create_templib' ) || $devel_mode || 0;
      if ( ! $do_create && -d $full_temp_lib_dir ) {
          my $refresh_file = catfile( $full_temp_lib_dir,
***************
*** 155,158 ****
--- 156,164 ----
   $setup->run();
   
+  # You can also force the library to be recreated in the server.ini
+  [Global]
+  ...
+  devel_mode = yes
+  
   my $files_copied = $setup->param( 'copied' );
   print "Copied the following files:\n";

[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2 Cache.pm,1.14,1.15

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16248

Modified Files:
	Cache.pm 
Log Message:
be able to save non-SPOPS objects in the cache

Index: Cache.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Cache.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Cache.pm	3 Jul 2005 16:24:21 -0000	1.14
--- Cache.pm	4 Jul 2005 03:05:54 -0000	1.15
***************
*** 7,10 ****
--- 7,11 ----
  use OpenInteract2::Constants qw( :log );
  use OpenInteract2::Context   qw( CTX );
+ use Scalar::Util             qw( blessed );
  
  $OpenInteract2::Cache::VERSION = sprintf("%d.%02d", q$Revision$ =~ /(\d+)\.(\d+)/);
***************
*** 100,104 ****
      my $data = $p->{data};
      my ( $obj );
!     if ( _is_object( $data ) ) {
          $obj = $data;
          $key = _make_spops_idx( ref $obj, $obj->id );
--- 101,105 ----
      my $data = $p->{data};
      my ( $obj );
!     if ( _is_spops_object( $data ) ) {
          $obj = $data;
          $key = _make_spops_idx( ref $obj, $obj->id );
***************
*** 124,128 ****
  
      my $key = $p->{key};
!     if ( ! $key and _is_object( $p->{data} ) ) {
          $key = _make_spops_idx( ref $p->{data}, $p->{data}->id );
      }
--- 125,129 ----
  
      my $key = $p->{key};
!     if ( ! $key and _is_spops_object( $p->{data} ) ) {
          $key = _make_spops_idx( ref $p->{data}, $p->{data}->id );
      }
***************
*** 154,162 ****
  
  
! sub _is_object {
      my ( $item ) = @_;
      my $typeof = ref $item;
!     return undef if ( ! $typeof );
!     return undef if ( $typeof =~ /^(HASH|ARRAY|SCALAR)$/ );
      return 1;
  }
--- 155,163 ----
  
  
! sub _is_spops_object {
      my ( $item ) = @_;
      my $typeof = ref $item;
!     return undef unless ( blessed( $item ) );
!     return undef unless ( $item->isa( 'SPOPS' ) );
      return 1;
  }
***************
*** 271,277 ****
  =item *
  
! B<data>: The data to save in the cache. This can be an SPOPS object,
! HTML content or any cacheable Perl data structure. (Don't try to store
! database handles, filehandles, or any other object with 'live'
  connections to real-world resources.)
  
--- 272,278 ----
  =item *
  
! B<data>: The data to save in the cache. This can be an object, HTML
! content or any other cacheable Perl data structure. (Don't try to
! store database handles, filehandles, or any other object with 'live'
  connections to real-world resources.)
  

[Openinteract-commits] CVS: OpenInteract2/pkg/object_tags/OpenInteract2/TT2 - New directory

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/pkg/object_tags/OpenInteract2/TT2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10349/TT2

Log Message:
Directory /cvsroot/openinteract/OpenInteract2/pkg/object_tags/OpenInteract2/TT2 added to the repository

[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2/Manage/Website ListActions.pm,1.12,1.13

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Manage/Website
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32166/lib/OpenInteract2/Manage/Website

Modified Files:
	ListActions.pm 
Log Message:
add more interesting information to the status message; also include the action package in the parameters...

Index: ListActions.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Manage/Website/ListActions.pm,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ListActions.pm	17 Mar 2005 14:58:04 -0000	1.12
--- ListActions.pm	3 Jul 2005 20:10:25 -0000	1.13
***************
*** 32,44 ****
              $urls = [ 'n/a' ];
          }
          $self->_ok(
              'OpenInteract2 Action',
!             "Action $name mapped to $urls->[0]",
!             url     => $urls,
!             name    => $name,
!             type    => $action_info->{type},
!             class   => $action_info->{class},
!             method  => $action_info->{method},
!             template => $action_info->{template}
          );
      }
--- 32,47 ----
              $urls = [ 'n/a' ];
          }
+         my $package_name = $action->package_name;
+         my $url_desc = '[' . join( '] [', @{ $urls } ) . ']';
          $self->_ok(
              'OpenInteract2 Action',
!             "Action $name in package $package_name mapped to URLs $url_desc",
!             url      => $urls,
!             name     => $name,
!             type     => $action_info->{type},
!             class    => $action_info->{class},
!             method   => $action_info->{method},
!             template => $action_info->{template},
!             package  => $package_name,
          );
      }
***************
*** 67,71 ****
   my @status = $task->execute;
   foreach my $s ( @status ) {
!      print "Action [[$s->{name}]]\n",
             "Type:     $s->{type}\n",
             "Class:    $s->{class}\n",
--- 70,74 ----
   my @status = $task->execute;
   foreach my $s ( @status ) {
!      print "Action [[$s->{name}]] in package $s->{package}\n",
             "Type:     $s->{type}\n",
             "Class:    $s->{class}\n",
***************
*** 88,91 ****
--- 91,98 ----
  Name of the action
  
+ =item B<package>
+ 
+ OpenInteract2 package action came from
+ 
  =item B<url>
  

[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2 Cache.pm,1.13,1.14

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10769/lib/OpenInteract2

Modified Files:
	Cache.pm 
Log Message:
add some sugar to get() to allow just a single argument (the key) to be passed in

Index: Cache.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Cache.pm,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Cache.pm	18 Mar 2005 04:09:48 -0000	1.13
--- Cache.pm	3 Jul 2005 16:24:21 -0000	1.14
***************
*** 45,49 ****
      }
  
!     my $key       = $p->{key};
      my $is_object = 0;
      my $obj_class = undef;
--- 45,58 ----
      }
  
!     # allow for get( $key ) and get({ key => $key }) calling methods
!     my ( $key );
!     if ( ref $p ) {
!         $key = $p->{key};
!     }
!     else {
!         $key = $p;
!         $p   = {}; 
!     }
! 
      my $is_object = 0;
      my $obj_class = undef;
***************
*** 57,62 ****
      }
      unless ( $key ) {
!         $log->is_debug &&
!             $log->debug( "Cache MISS (no key)" );
          return undef;
      }
--- 66,70 ----
      }
      unless ( $key ) {
!         $log->is_debug && $log->debug( "Cache MISS (no key)" );
          return undef;
      }
***************
*** 64,74 ****
      my $data = $self->get_data( $self->{_cache_object}, $key );
      unless ( $data ) {
!         $log->is_debug &&
!             $log->debug( "Cache MISS [$key]" );
          return undef;
      }
  
!     $log->is_debug &&
!         $log->debug( "Cache HIT [$key]" );
      if ( $is_object ) {
          return undef unless ( $obj_class->post_cache_get( $data ) );
--- 72,80 ----
      my $data = $self->get_data( $self->{_cache_object}, $key );
      unless ( $data ) {
!         $log->is_debug && $log->debug( "Cache MISS [$key]" );
          return undef;
      }
  
!     $log->is_debug && $log->debug( "Cache HIT [$key]" );
      if ( $is_object ) {
          return undef unless ( $obj_class->post_cache_get( $data ) );
***************
*** 244,252 ****
  =back
  
! B<get( \%params )>
  
  Returns the data in the cache associated with a key; undef if data
  corresponding to the key is not found.
  
  B<set( \%params )>
  
--- 250,262 ----
  =back
  
! B<get( $key || \%params )>
  
  Returns the data in the cache associated with a key; undef if data
  corresponding to the key is not found.
  
+ Note that the common case (where you just want to retrieve a cached
+ item by key) allows you to skip creating a hashref to pass in a single
+ argument.
+ 
  B<set( \%params )>
  

[Openinteract-commits] CVS: OpenInteract2/sample/website/template error_message,1.5,1.6

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/sample/website/template
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2352

Modified Files:
	error_message 
Log Message:
OIN-185: apply patch (slightly modified)

Index: error_message
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/sample/website/template/error_message,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** error_message	10 Feb 2004 03:04:31 -0000	1.5
--- error_message	28 Jun 2005 17:21:27 -0000	1.6
***************
*** 23,28 ****
  </td></tr>
  <tr><td>
!    [% FOREACH error = error_msg -%]
!    <p>[% theme.bullet %] <font color="[% error_font_color %]">[% error_msg %]</font></p>
     [% END %]
  </td></tr>
--- 23,28 ----
  </td></tr>
  <tr><td>
!    [% FOREACH error_item = error_msg -%]
!    <p>[% theme.bullet %] <font color="[% error_font_color %]">[% error_item %]</font></p>
     [% END %]
  </td></tr>

[Openinteract-commits] CVS: OpenInteract2/sample/website/conf server.ini,1.54,1.55

[Salve J. N. <sj...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/sample/website/conf
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28017/sample/website/conf

Modified Files:
	server.ini 
Log Message:
- documentation fix


Index: server.ini
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/sample/website/conf/server.ini,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** server.ini	25 Apr 2005 15:01:26 -0000	1.54
--- server.ini	27 May 2005 16:25:44 -0000	1.55
***************
*** 442,446 ****
  # cache_size: How many templates TT should cache in memory
  #
! # cache_size: How long TT should keep cached templates in memory (seconds)
  #
  # compile_cleanup: If true, will remove all compiled files on server
--- 442,446 ----
  # cache_size: How many templates TT should cache in memory
  #
! # cache_expire: How long TT should keep cached templates in memory (seconds)
  #
  # compile_cleanup: If true, will remove all compiled files on server

[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2/ContentGenerator TT2Process.pm,1.21,1.22

[Salve J. N. <sj...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/ContentGenerator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4721/lib/OpenInteract2/ContentGenerator

Modified Files:
	TT2Process.pm 
Log Message:
- Doc fix: change unused "tt_config" to "template_config" (which also is
  used more often in the docs)


Index: TT2Process.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/ContentGenerator/TT2Process.pm,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** TT2Process.pm	18 Mar 2005 04:09:50 -0000	1.21
--- TT2Process.pm	23 May 2005 10:21:04 -0000	1.22
***************
*** 411,415 ****
   
   sub custom_template_initialize {
!      my ( $class, $tt_config, $init_params ) = @_;
       $template_config->{SUNSET} = '7:13 AM';
   }
--- 411,415 ----
   
   sub custom_template_initialize {
!      my ( $class, $template_config, $init_params ) = @_;
       $template_config->{SUNSET} = '7:13 AM';
   }

[Openinteract-commits] CVS: OpenInteract2/sample/website/conf server.ini,1.53,1.54

[Salve J. N. <sj...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/sample/website/conf
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10083/sample/website/conf

Modified Files:
	server.ini 
Log Message:
Allways allow access to main.css. Even people that aren't logged in are
entitled to some CSS. :)


Index: server.ini
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/sample/website/conf/server.ini,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** server.ini	29 Mar 2005 16:50:49 -0000	1.53
--- server.ini	25 Apr 2005 15:01:26 -0000	1.54
***************
*** 302,305 ****
--- 302,306 ----
  required_skip         = ^/Login.*
  required_skip         = ^/help.*
+ required_skip         = ^/main.css$
  
  

[Openinteract-commits] CVS: OpenInteract2/sample/apache httpd_modperl.conf,1.3,1.4

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/sample/apache
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5637

Modified Files:
	httpd_modperl.conf 
Log Message:
remove reference to old proxy-helper, thanks to Ken for the spot


Index: httpd_modperl.conf
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/sample/apache/httpd_modperl.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** httpd_modperl.conf	13 Apr 2003 17:35:24 -0000	1.3
--- httpd_modperl.conf	20 Apr 2005 00:12:29 -0000	1.4
***************
*** 27,38 ****
  PerlRequire [% website_dir %]/conf/startup.pl
  
- # This is used to read the 'X-Forwarded-For' header created by the
- # mod_proxy_add_forward.c Apache module that should be compiled into
- # your front-end proxy server. If you don't have this, then every
- # request will appear to come from the proxy server, which can be
- # annoying.
- 
- PerlPostReadRequestHandler OpenInteract::ProxyRemoteAddr
- 
  # This sends all incoming requests to the OpenInteract Apache content
  # handler (Apache::OpenInteract2)
--- 27,30 ----

[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2/Manage/Website UpdatePackageFromWebsite.pm,1.5,1.6

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Manage/Website
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3445

Modified Files:
	UpdatePackageFromWebsite.pm 
Log Message:
missed one of the package.conf -> package.ini changes, caught by Ken Youens-Clark


Index: UpdatePackageFromWebsite.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Manage/Website/UpdatePackageFromWebsite.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** UpdatePackageFromWebsite.pm	18 Mar 2005 04:09:50 -0000	1.5
--- UpdatePackageFromWebsite.pm	19 Apr 2005 11:53:19 -0000	1.6
***************
*** 57,61 ****
          }
          my $changelog = catfile( $param_value, 'Changes' );
!         my $package_conf = catfile( $param_value, 'package.conf' );
          unless ( -f $changelog && -f $package_conf ) {
              return "Does not appear to be a valid package directory";
--- 57,61 ----
          }
          my $changelog = catfile( $param_value, 'Changes' );
!         my $package_conf = catfile( $param_value, 'package.ini' );
          unless ( -f $changelog && -f $package_conf ) {
              return "Does not appear to be a valid package directory";

[Openinteract-commits] CVS: OpenInteract2/pkg/base_user MANIFEST,1.11,1.12

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/pkg/base_user
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17931

Modified Files:
	MANIFEST 
Log Message:
fix csv/dat problem

Index: MANIFEST
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_user/MANIFEST,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** MANIFEST	13 Apr 2005 09:21:57 -0000	1.11
--- MANIFEST	13 Apr 2005 11:10:52 -0000	1.12
***************
*** 8,12 ****
  conf/ldap_spops_user.ini
  data/install_security.csv
! data/install_user_language.dat
  msg/base_user-messages-en.msg
  msg/base_user-messages-no.msg
--- 8,12 ----
  conf/ldap_spops_user.ini
  data/install_security.csv
! data/install_user_language.csv
  msg/base_user-messages-en.msg
  msg/base_user-messages-no.msg