aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.PL1
-rw-r--r--lib/WebCoso/Common.pm6
-rw-r--r--lib/WebCoso/Maker.pm4
-rw-r--r--[l---------]t/test-site/src/feed.it.tt15
-rw-r--r--t/test-site/src/feed.tt14
5 files changed, 19 insertions, 21 deletions
diff --git a/Makefile.PL b/Makefile.PL
index c22d054..5124f7b 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -20,6 +20,7 @@ WriteMakefile(
'Path::Class' => '0',
'Slay::Maker' => '0',
'Template' => '0',
+ 'Template::Plugin::DateTime::Format' => '0',
'Test::Exception' => '0',
'Test::More' => '0',
'Text::Restructured' => '0',
diff --git a/lib/WebCoso/Common.pm b/lib/WebCoso/Common.pm
index 00f0b6b..30b18fe 100644
--- a/lib/WebCoso/Common.pm
+++ b/lib/WebCoso/Common.pm
@@ -154,6 +154,7 @@ sub getTags {
sub fromTo {
my ($base,$opts)=@_;
+ DEBUG("fromTo: $base,{@{[ %$opts ]}}");
my $iter=File::Next::files(
{
file_filter=>$opts->{files},
@@ -212,10 +213,7 @@ our %docfiles=(
files=>sub{m{^document\.}},
dirs=>sub{!m{^(tags$|_|\.)}});
our %feedfiles=(
- files=>sub{m{^feed\.(?:[^.]+\.)*tt$}},
- dirs=>sub{!m{^[_.]}});
-our %feedfilesXML=(
- files=>sub{m{^feed\.[^.]+\.xml$}},
+ files=>sub{m{^feed\.(?:[^.]+\.)+tt$}},
dirs=>sub{!m{^[_.]}});
1;
diff --git a/lib/WebCoso/Maker.pm b/lib/WebCoso/Maker.pm
index 11aa9c4..e46eb29 100644
--- a/lib/WebCoso/Maker.pm
+++ b/lib/WebCoso/Maker.pm
@@ -233,9 +233,9 @@ my @passes=(
}),
WebCoso::Common::fromTo("$WebCoso::Common::SRCPATH/",
{
- %WebCoso::Common::feedfilesXML,
+ %WebCoso::Common::feedfiles,
transform=>sub{
- (my $file=$_[0])
+ (my $file=WebCoso::Common::typedAs($_[0],'xml'))
=~s{^\Q$WebCoso::Common::SRCPATH\E/}{$WebCoso::Common::DSTPATH/};
return $file;
},
diff --git a/t/test-site/src/feed.it.tt b/t/test-site/src/feed.it.tt
index 3902f44..398eaf3 120000..100644
--- a/t/test-site/src/feed.it.tt
+++ b/t/test-site/src/feed.it.tt
@@ -1 +1,14 @@
-feed.tt \ No newline at end of file
+[% USE df = DateTime::Format('DateTime::Format::Strptime',
+ { pattern => '%F %T',
+ locale => 'en_US',
+ time_zone => 'GMT' }) -%]
+<?xml version="1.0" encoding="utf-8"?>
+<feed>
+[% FOR c IN changed -%]
+<item>
+ [% IF c.value.creation %]<created>[% df.format(c.value.creation) %]</created>[% END %]
+ [% IF c.value.last_change %]<last>[% df.format(c.value.last_change) %]</last>[% END %]
+ <PH>[% dstUriFor(c.key) %]</PH>
+</item>
+[% END -%]
+</feed>
diff --git a/t/test-site/src/feed.tt b/t/test-site/src/feed.tt
deleted file mode 100644
index 398eaf3..0000000
--- a/t/test-site/src/feed.tt
+++ /dev/null
@@ -1,14 +0,0 @@
-[% USE df = DateTime::Format('DateTime::Format::Strptime',
- { pattern => '%F %T',
- locale => 'en_US',
- time_zone => 'GMT' }) -%]
-<?xml version="1.0" encoding="utf-8"?>
-<feed>
-[% FOR c IN changed -%]
-<item>
- [% IF c.value.creation %]<created>[% df.format(c.value.creation) %]</created>[% END %]
- [% IF c.value.last_change %]<last>[% df.format(c.value.last_change) %]</last>[% END %]
- <PH>[% dstUriFor(c.key) %]</PH>
-</item>
-[% END -%]
-</feed>