Changeset 134

Show
Ignore:
Timestamp:
02/06/07 17:10:31 (2 years ago)
Author:
ingy
Message:
 r3305@skinny:  ingy | 2007-02-06 11:57:56 -0800
 Refactor Socialtext formatter.
 
 Get links to work.
 
 Put all fake classes into one module.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/plugins/share/Kwiki-Formatter-Socialtext/lib/Kwiki/Formatter/Socialtext.pm

    r121 r134  
    11package Kwiki::Formatter::Socialtext; 
    2 use Kwiki::Formatter -Base; 
     2use Kwiki::Plugin -Base; 
    33 
     4use Socialtext::Mock; 
    45use Socialtext::Formatter; 
    56use Socialtext::Formatter::Viewer; 
     7use Kwiki::CGI; 
     8no warnings 'redefine'; 
     9 
     10const class_id => 'formatter_socialtext'; 
     11 
     12sub register { 
     13    my $registry = shift; 
     14    $registry->add(preload => 'formatter_socialtext'); 
     15} 
     16 
     17sub init { 
     18    $self->hub->config->formatter_class(__PACKAGE__);   
     19} 
    620 
    721sub text_to_html { 
    …… 
    1327} 
    1428 
    15 no warnings 'redefine'; 
    16  
    17 sub Socialtext::Page::name_to_id { 
    18     return ''; 
     29package Kwiki::CGI; 
     30sub set_default_page_name { 
     31    my $page_name = shift; 
     32    $page_name = '' if $page_name and $page_name =~ /[^$ALPHANUM\_]/; 
     33    $page_name ||= $self->hub->config->main_page; 
    1934} 
    2035 
    21 sub Kwiki::Pages::title_to_disposition { 
    22     return "bugger off"; 
     36package Socialtext::Page; 
     37sub name_to_id { 
     38    my $name = shift; 
     39    $name = lc($name); 
     40    $name =~ s/[^\w]/_/g; 
     41    $name =~ s/_+/_/g; 
     42    return $name; 
    2343} 
    2444 
    25 sub Socialtext::Formatter::_add_external_wafl { } 
     45package Kwiki::Pages; 
     46sub title_to_disposition { 
     47    my $page_name = shift;  
     48    return ( 
     49        qq{title="$page_name"}, 
     50        Socialtext::Page->name_to_id($page_name), 
     51    ); 
     52} 
     53 
     54package Socialtext::Formatter; 
     55sub _add_external_wafl { } 
    2656 
    2757package Bogus::Hub; 
    …… 
    3161field 'current_workspace' => -init => 'Bogus::Workspace->new'; 
    3262field 'pages' => -init => 'Kwiki::Pages->new'; 
     63field 'viewer' => -init => 'Socialtext::Formatter::Viewer->new'; 
    3364 
    3465package Bogus::Workspace; 
    …… 
    3667 
    3768const external_links_open_new_window => 0; 
     69const name => 'kwiki'; 

  • trunk/src/socialtext/modules.mk

    r120 r134  
    44 
    55SOCIALTEXT_LEVEL_2 = \ 
    6         Socialtext/AppConfig.pm \ 
    76        Socialtext/Base.pm \ 
    87        Socialtext/Formatter.pm \ 
    9         Socialtext/Log.pm \ 
    10         Socialtext/Statistics.pm \ 
     8        Socialtext/Mock.pm \ 
    119 
    1210SOCIALTEXT_LEVEL_3 = \