lucy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mar...@apache.org
Subject [lucy-commits] svn commit: r1099907 - in /incubator/lucy/site/trunk/lib: LucySiteDotiacFilter.pm view.pm
Date Thu, 05 May 2011 18:26:50 GMT
Author: marvin
Date: Thu May  5 18:26:49 2011
New Revision: 1099907

URL: http://svn.apache.org/viewvc?rev=1099907&view=rev
Log:
Avoid Dotiac::DTL::Filter::addon.

The Dotiac::DTL::Filter::addon module, which is part of the Apache CMS,
depends on the Python markdown module and a running markdownd daemon.  We
replace it with a simple module based on Text::Markdown.  The new setup has
fewer features, but only uses core Perl and dependencies bundled inside the
CMS subversion checkout.

Added:
    incubator/lucy/site/trunk/lib/LucySiteDotiacFilter.pm   (with props)
Modified:
    incubator/lucy/site/trunk/lib/view.pm

Added: incubator/lucy/site/trunk/lib/LucySiteDotiacFilter.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/site/trunk/lib/LucySiteDotiacFilter.pm?rev=1099907&view=auto
==============================================================================
--- incubator/lucy/site/trunk/lib/LucySiteDotiacFilter.pm (added)
+++ incubator/lucy/site/trunk/lib/LucySiteDotiacFilter.pm Thu May  5 18:26:49 2011
@@ -0,0 +1,48 @@
+package LucySiteDotiacFilter;
+use strict;
+use warnings;
+use Text::Markdown qw( markdown );
+use Dotiac::DTL::Value;
+use Dotiac::DTL::Filter;
+
+sub import {
+    *Dotiac::DTL::Filter::markdown = \&markdown_filter;
+}
+
+sub markdown_filter {
+    my $value = shift;
+
+    # Use raw value rather than escape (by calling repr() rather than
+    # string()) so that we can embed html in our .mdtext documents.
+    my $raw  = $value->repr;
+    my $html = markdown($raw);
+
+    # Blindly mark return value as safe.
+    my $retval = Dotiac::DTL::Value->safe($html);
+
+    return $retval;
+}
+
+1;
+
+__END__
+
+=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.
+
+=cut
+

Propchange: incubator/lucy/site/trunk/lib/LucySiteDotiacFilter.pm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/lucy/site/trunk/lib/view.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/site/trunk/lib/view.pm?rev=1099907&r1=1099906&r2=1099907&view=diff
==============================================================================
--- incubator/lucy/site/trunk/lib/view.pm (original)
+++ incubator/lucy/site/trunk/lib/view.pm Thu May  5 18:26:49 2011
@@ -33,8 +33,8 @@ use strict;
 use warnings;
 use Carp;
 use Dotiac::DTL;
-use Dotiac::DTL::Addon::markup;
 use ASF::Util qw( read_text_file );
+use LucySiteDotiacFilter;
 
 BEGIN { push @Dotiac::DTL::TEMPLATE_DIRS, "templates"; }
 



Mime
View raw message