svn commit: r1578559 - /thrift/cms-site/trunk/lib/view.pm

[jo...@apache.org]

Author: joes
Date: Mon Mar 17 20:44:41 2014
New Revision: 1578559

URL: http://svn.apache.org/r1578559
Log:
support templating within markdown

Modified:
    thrift/cms-site/trunk/lib/view.pm

Modified: thrift/cms-site/trunk/lib/view.pm
URL: http://svn.apache.org/viewvc/thrift/cms-site/trunk/lib/view.pm?rev=1578559&r1=1578558&r2=1578559&view=diff
==============================================================================
--- thrift/cms-site/trunk/lib/view.pm (original)
+++ thrift/cms-site/trunk/lib/view.pm Mon Mar 17 20:44:41 2014
@@ -1,142 +1,4 @@
 package view;
-
-use strict;
-use warnings;
-use Dotiac::DTL qw/Template *TEMPLATE_DIRS/;
-use Dotiac::DTL::Addon::markup;
-use ASF::Util qw/read_text_file sort_tables parse_filename/;
-use File::Temp;
-
-push our @TEMPLATE_DIRS, "templates";
-
-# This is most widely used view.  It takes a
-# 'template' argument and a 'path' argument.
-# Assuming the path ends in foo.mdtext, any files
-# like foo.page/bar.mdtext will be parsed and
-# passed to the template in the "bar" (hash)
-# variable.
-
-sub single_narrative {
-    my %args = @_;
-    my $file = "content$args{path}";
-    my $template = $args{template};
-    $args{path} =~ s/\.md(?:text)?$/\.html/;
-    $args{breadcrumbs} = breadcrumbs($args{path});
-
-    read_text_file $file, \%args;
-
-    my $page_path = $file;
-    $page_path =~ s!\.[^./]+$!.page!;
-    if (-d $page_path) {
-        for my $f (grep -f, glob "$page_path/*.mdtext") {
-            $f =~ m!/([^/]+)\.mdtext$! or die "Bad filename: $f\n";
-            $args{$1} = {};
-            read_text_file $f, $args{$1};
-            $args{$1}->{conf} = $args{conf} if exists $args{conf};
-            $args{$1}->{content} = sort_tables(Template($args{$1}->{content})->
-                                                   render($args{$1}));
-        }
-    }
-    $args{content} = sort_tables(Template($args{content})->render(\%args));
-
-    # the extra (3rd) return value is for sitemap support
-    return Template($template)->render(\%args), html => \%args;
-}
-
-
-# Has the same behavior as the above for foo.page/bar.mdtext
-# files, parsing them into a bar variable for the template.
-# Otherwise presumes the template is the path.
-
-sub news_page {
-    my %args = @_;
-    my $template = "content$args{path}";
-    $args{breadcrumbs} = breadcrumbs($args{path});
-
-    my $page_path = $template;
-    $page_path =~ s!\.[^./]+$!.page!;
-    if (-d $page_path) {
-        for my $f (grep -f, glob "$page_path/*.mdtext") {
-            $f =~ m!/([^/]+)\.mdtext$! or die "Bad filename: $f\n";
-            $args{$1} = {};
-            read_text_file $f, $args{$1};
-        }
-    }
-
-    # the extra (3rd) return value is for sitemap support
-    return Template($template)->render(\%args), html => \%args;
-}
-
-# presumes the dependencies are all mdtext files with subheadings of the form
-## foo ## {#bar}
-
-sub sitemap {
-    my %args = @_;
-    my $template = "content$args{path}";
-    $args{breadcrumbs} = breadcrumbs($args{path});
-    my %data;
-    for (@{$path::dependencies{$args{path}}}) {
-        my $file = $_;
-        my ($filename, $dirname) = parse_filename;
-        no warnings 'once';
-        for my $p (@path::patterns) {
-            my ($re, $method, $args) = @$p;
-            next unless $file =~ $re;
-            my $s = view->can($method) or die "Can't locate method: $method\n";
-            my ($content, $ext, $vars) = $s->(path => $file, %$args); # 3rd return value used here
-            $file = "$dirname$filename.$ext";
-            $data{$file} = $vars;
-            last;
-        }
-    }
-
-    my $content = "";
-
-    for (sort keys %data) {
-        $content .= "- [$data{$_}->{headers}->{title}]($_)\n";
-        for my $hdr (grep /^#/, split "\n", $data{$_}->{content}) {
-            $hdr =~ /^(#+)\s+([^#]+)?\s+\1\s+\{#([^}]+)\}$/ or next;
-            my $level = length $1;
-            $level *= 4;
-            $content .= " " x $level;
-            $content .= "- [$2]($_#$3)\n";
-        }
-    }
-    $args{content} = $content;
-    # the extra (3rd) return value is for sitemap support
-    return Template($template)->render(\%args), html => \%args;
-}
-
-sub breadcrumbs {
-    my @path = split m!/!, shift;
-    pop @path;
-    my @rv;
-    my $relpath = "";
-    for (@path) {
-        $relpath .= "$_/";
-        $_ ||= "Home";
-        push @rv, qq(<a href="$relpath">\u$_</a>);
-    }
-    return join "&nbsp;&raquo&nbsp;", @rv;
-}
+use base 'ASF::View';
 
 1;
-
-=head1 LICENSE
-
-           Licensed to the Apache Software Foundation (ASF) under one
-           or more contributor license agreements.  See the NOTICE file
-           distributed with this work for additional information
-           regarding copyright ownership.  The ASF licenses this file
-           to you under the Apache License, Version 2.0 (the
-           "License"); you may not use this file except in compliance
-           with the License.  You may obtain a copy of the License at
-
-             http://www.apache.org/licenses/LICENSE-2.0
-
-           Unless required by applicable law or agreed to in writing,
-           software distributed under the License is distributed on an
-           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-           KIND, either express or implied.  See the License for the
-           specific language governing permissions and limitations
-           under the License.