From 862636f9b7eb1994e59f32cdbcdfcd44f565f30d Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Mon, 23 Jun 2008 22:54:19 +0000 Subject: [PATCH 01/16] Made 01_templates.t pass again (added the expected output of t/templates/expected/web/2.txt to t/templates/expected.html --- t/templates/expected.html | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/t/templates/expected.html b/t/templates/expected.html index 22ee8a0..b0714d8 100644 --- a/t/templates/expected.html +++ b/t/templates/expected.html @@ -11,6 +11,18 @@ Content-Type: text/xhtml; charset=UTF-8

My Weblog

+

2007-11-11

+

Lorem ipsum II

+
+Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso +facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor sit +amet ipso facto.Lorem ipsum dolor sit amet ipso facto. + +Lorem ipso hoccer foer tyr wuz de ras cora dola tymon ipso hoc cer fuz +de ramas cora dola tymon ipso hoccer. Lorem ipso foer tyr wuz de ramas +cora dola tym ipso hor. +
+

posted at: 11:11 | path: /web | permanent link to this entry

2006-07-19

Lorem ipsum

Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso -- 2.30.2 From 9f94051f5dd9294a6d2a6e474087dd94bf1ebfe4 Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Tue, 24 Jun 2008 00:10:21 +0000 Subject: [PATCH 02/16] HTML 4.01 conformance for the default HTML templates --- ChangeLog | 1 + blosxom.cgi | 51 ++++++++++++++++++------------------- t/permalinks/expected.bar | 39 +++++++++++++--------------- t/permalinks/expected.html | 52 ++++++++++++++++++-------------------- t/smoketest/expected.html | 39 +++++++++++++--------------- t/templates/data/head.html | 5 ++-- t/templates/expected.html | 5 ++-- 7 files changed, 90 insertions(+), 102 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5a05b0c..b52dcca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ v2.0.3 * added support for external config file via BLOSXOM_CONFIG_DIR and/or BLOSXOM_CONFIG_FILE environment variables * added support for $plugin_list plugin config file + * made the default templates conforming to HTML 4.01 v2.0.2 * fixed path_info to have correct extension in static mode (bug diff --git a/blosxom.cgi b/blosxom.cgi index 29b9a54..674ff10 100755 --- a/blosxom.cgi +++ b/blosxom.cgi @@ -735,34 +735,31 @@ sub nice_date { __DATA__ html content_type text/html; charset=$blog_encoding +html head html head html head -html head -html head -html head $blog_title $path_info_da $path_info_mo $path_info_yr -html head +html head +html head +html head $blog_title $path_info_da $path_info_mo $path_info_yr html head html head -html head
-html head $blog_title
-html head $path_info_da $path_info_mo $path_info_yr -html head
-html head

+html head

+html head

$blog_title

+html head

$path_info_da $path_info_mo $path_info_yr

+html head
-html story

-html story $title
-html story $body
-html story
-html story posted at: $ti | path: $path | permanent link to this entry -html story

+html story
+html story

$title

+html story
$body
+html story

posted at: $ti | path: $path | permanent link to this entry

+html story
-html date

$dw, $da $mo $yr

+html date

$dw, $da $mo $yr

html foot -html foot

-html foot

-html foot -html foot
+html foot
+html foot powered by blosxom +html foot
html foot html foot @@ -794,15 +791,17 @@ rss foot error content_type text/html +error head error head -error head -error head

Error: I'm afraid this is the first I've heard of a "$flavour" flavoured Blosxom. Try dropping the "/+$flavour" bit from the end of the URL.

+error head Error: unknown Blosxom flavour "$flavour" +error head +error head

Error: unknown Blosxom flavour "$flavour"

+error head

I'm afraid this is the first I've heard of a "$flavour" flavoured Blosxom. Try dropping the "/+$flavour" bit from the end of the URL.

+error story

$title

+error story
$body

#

-error story

$title
-error story $body #

- -error date

$dw, $da $mo $yr

+error date

$dw, $da $mo $yr

error foot error foot diff --git a/t/permalinks/expected.bar b/t/permalinks/expected.bar index c39e86f..883aa85 100644 --- a/t/permalinks/expected.bar +++ b/t/permalinks/expected.bar @@ -1,31 +1,28 @@ Content-Type: text/html; charset=ISO-8859-1 + - - - My Weblog - + + + My Weblog -
- My Weblog
- -
-

-

Tue, 25 Jul 2006

-

- Lorem ipsum
- Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso +

+

My Weblog

+

+
+

Tue, 25 Jul 2006

+
+

Lorem ipsum

+
Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor sit -amet ipso facto.Lorem ipsum dolor sit amet ipso facto.
-
- posted at: 11:02 | path: /foo | permanent link to this entry -

+amet ipso facto.Lorem ipsum dolor sit amet ipso facto.
+

posted at: 11:02 | path: /foo | permanent link to this entry

+
-

-

- -
+
+ powered by blosxom +
diff --git a/t/permalinks/expected.html b/t/permalinks/expected.html index 3577238..5781a52 100644 --- a/t/permalinks/expected.html +++ b/t/permalinks/expected.html @@ -1,43 +1,39 @@ Content-Type: text/html; charset=ISO-8859-1 + - - - My Weblog - + + + My Weblog -
- My Weblog
- -
-

-

Tue, 25 Jul 2006

-

- Lorem ipso
- Lorem ipso hoccer foer tyr wuz de ras cora dola tymon ipso hoc cer fuz +

+

My Weblog

+

+
+

Tue, 25 Jul 2006

+
+

Lorem ipso

+
Lorem ipso hoccer foer tyr wuz de ras cora dola tymon ipso hoc cer fuz de ramas cora dola tymon ipso hoccer. Lorem ipso foer tyr wuz de ramas cora dola tym ipso hor.Lorem ipso foer tyr wuz de ramas cora dola tym ipso hor tyr wuz de ramas cora dola tymon ipso foer tyr wuz de ramas cora dola tymo. Lorem ipso hoccer foer tyr wuz de ras cora dola tymon ipso hoc cer fuz de ramas cora dola tymon ipso hoccer. Lorem ipso foer -tyr wuz de ramas cora dola tym ipso hor.
-
- posted at: 11:03 | path: /foo | permanent link to this entry -

-

- Lorem ipsum
- Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso +tyr wuz de ramas cora dola tym ipso hor.

+

posted at: 11:03 | path: /foo | permanent link to this entry

+
+
+

Lorem ipsum

+
Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor sit -amet ipso facto.Lorem ipsum dolor sit amet ipso facto.
-
- posted at: 11:02 | path: /foo | permanent link to this entry -

+amet ipso facto.Lorem ipsum dolor sit amet ipso facto.
+

posted at: 11:02 | path: /foo | permanent link to this entry

+
-

-

- -
+
+ powered by blosxom +
diff --git a/t/smoketest/expected.html b/t/smoketest/expected.html index 63a7e65..6766b36 100644 --- a/t/smoketest/expected.html +++ b/t/smoketest/expected.html @@ -1,22 +1,21 @@ Content-Type: text/html; charset=ISO-8859-1 + - - - My Weblog - + + + My Weblog -
- My Weblog
- -
-

-

Wed, 19 Jul 2006

-

- Lorem ipsum
- Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso +

+

My Weblog

+

+
+

Wed, 19 Jul 2006

+
+

Lorem ipsum

+
Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto. @@ -30,14 +29,12 @@ cora dola tym ipso hor.Lorem ipso foer tyr wuz de ramas cora dola tym ipso hor tyr wuz de ramas cora dola tymon ipso foer tyr wuz de ramas cora dola tymo. Lorem ipso hoccer foer tyr wuz de ras cora dola tymon ipso hoc cer fuz de ramas cora dola tymon ipso hoccer. Lorem ipso foer -tyr wuz de ramas cora dola tym ipso hor.
-
- posted at: 22:54 | path: | permanent link to this entry -

+tyr wuz de ramas cora dola tym ipso hor.
+

posted at: 22:54 | path: | permanent link to this entry

+
-

-

- -
+
+ powered by blosxom +
diff --git a/t/templates/data/head.html b/t/templates/data/head.html index 7426227..17c1753 100644 --- a/t/templates/data/head.html +++ b/t/templates/data/head.html @@ -2,9 +2,8 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - - $blog_title $path_info_da $path_info_mo $path_info_yr - + + $blog_title $path_info_da $path_info_mo $path_info_yr

$blog_title

diff --git a/t/templates/expected.html b/t/templates/expected.html index b0714d8..c068b57 100644 --- a/t/templates/expected.html +++ b/t/templates/expected.html @@ -4,9 +4,8 @@ Content-Type: text/xhtml; charset=UTF-8 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - - My Weblog - + + My Weblog

My Weblog

-- 2.30.2 From c343f3dced6891665d0da8d1f6194285dc7be0b1 Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Fri, 18 Jul 2008 10:51:31 +0000 Subject: [PATCH 03/16] Updated the changelog to mention (hopefully) all new features added since 2.0.2. (Just made a diff between HEAD and the contents of the 2.0.2 tar ball.) --- ChangeLog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index b52dcca..4cb2964 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,12 @@ v2.0.3 and/or BLOSXOM_CONFIG_FILE environment variables * added support for $plugin_list plugin config file * made the default templates conforming to HTML 4.01 + * added a testsuite for blosxom + * added an encoding setting, defaulting to UTF-8 + * added support for configuration files and therefore blosxom farms + (based on the Debian config file patch) + * many small improvements + * some code refactoring (including a .perltidyrc) v2.0.2 * fixed path_info to have correct extension in static mode (bug -- 2.30.2 From a74db195215299dcfb70d9b3a70cca37624999b9 Mon Sep 17 00:00:00 2001 From: Gavin Carr Date: Mon, 21 Jul 2008 13:04:43 +0000 Subject: [PATCH 04/16] Fix failing test case 01_templates.t. --- t/templates/data/2.txt | 9 +++++++++ t/templates/data/2.txt.200711111111 | 9 +++++++++ t/templates/expected.html | 7 +++---- 3 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 t/templates/data/2.txt create mode 100644 t/templates/data/2.txt.200711111111 diff --git a/t/templates/data/2.txt b/t/templates/data/2.txt new file mode 100644 index 0000000..77f5e5b --- /dev/null +++ b/t/templates/data/2.txt @@ -0,0 +1,9 @@ +Lorem ipsum II + +Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso +facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor sit +amet ipso facto.Lorem ipsum dolor sit amet ipso facto. + +Lorem ipso hoccer foer tyr wuz de ras cora dola tymon ipso hoc cer fuz +de ramas cora dola tymon ipso hoccer. Lorem ipso foer tyr wuz de ramas +cora dola tym ipso hor. diff --git a/t/templates/data/2.txt.200711111111 b/t/templates/data/2.txt.200711111111 new file mode 100644 index 0000000..77f5e5b --- /dev/null +++ b/t/templates/data/2.txt.200711111111 @@ -0,0 +1,9 @@ +Lorem ipsum II + +Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso +facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor sit +amet ipso facto.Lorem ipsum dolor sit amet ipso facto. + +Lorem ipso hoccer foer tyr wuz de ras cora dola tymon ipso hoc cer fuz +de ramas cora dola tymon ipso hoccer. Lorem ipso foer tyr wuz de ramas +cora dola tym ipso hor. diff --git a/t/templates/expected.html b/t/templates/expected.html index c068b57..03e4eab 100644 --- a/t/templates/expected.html +++ b/t/templates/expected.html @@ -15,13 +15,12 @@ Content-Type: text/xhtml; charset=UTF-8
Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor sit -amet ipso facto.Lorem ipsum dolor sit amet ipso facto. +amet ipso facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipso hoccer foer tyr wuz de ras cora dola tymon ipso hoc cer fuz de ramas cora dola tymon ipso hoccer. Lorem ipso foer tyr wuz de ramas -cora dola tym ipso hor. -
-

posted at: 11:11 | path: /web | permanent link to this entry

+cora dola tym ipso hor.
+

posted at: 11:11 | path: | permanent link to this entry

2006-07-19

Lorem ipsum

Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso -- 2.30.2 From eab8087160713565054c7dee8a4c788efd4dbda2 Mon Sep 17 00:00:00 2001 From: Gavin Carr Date: Mon, 21 Jul 2008 13:41:36 +0000 Subject: [PATCH 05/16] Remove bogus rss20 test files. --- t/templates/config/blosxom.conf | 2 ++ t/templates/data/2.txt | 9 ------ t/templates/data/2.txt.200711111111 | 9 ------ t/templates/data/head.html | 5 ++-- t/templates/expected.html | 44 ----------------------------- t/templates/expected.rss | 34 ---------------------- t/templates/spec.yaml | 11 +++++++- 7 files changed, 15 insertions(+), 99 deletions(-) delete mode 100644 t/templates/data/2.txt delete mode 100644 t/templates/data/2.txt.200711111111 delete mode 100644 t/templates/expected.html delete mode 100644 t/templates/expected.rss diff --git a/t/templates/config/blosxom.conf b/t/templates/config/blosxom.conf index ae83e48..27d4b12 100644 --- a/t/templates/config/blosxom.conf +++ b/t/templates/config/blosxom.conf @@ -1 +1,3 @@ $datadir = "$ENV{BLOSXOM_CONFIG_DIR}/../data"; +$plugin_list = "$ENV{BLOSXOM_CONFIG_DIR}/plugins.conf"; +$plugin_path = "$ENV{BLOSXOM_CONFIG_DIR}/../../../general:$ENV{BLOSXOM_CONFIG_DIR}/../../../gavinc"; diff --git a/t/templates/data/2.txt b/t/templates/data/2.txt deleted file mode 100644 index 77f5e5b..0000000 --- a/t/templates/data/2.txt +++ /dev/null @@ -1,9 +0,0 @@ -Lorem ipsum II - -Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso -facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor sit -amet ipso facto.Lorem ipsum dolor sit amet ipso facto. - -Lorem ipso hoccer foer tyr wuz de ras cora dola tymon ipso hoc cer fuz -de ramas cora dola tymon ipso hoccer. Lorem ipso foer tyr wuz de ramas -cora dola tym ipso hor. diff --git a/t/templates/data/2.txt.200711111111 b/t/templates/data/2.txt.200711111111 deleted file mode 100644 index 77f5e5b..0000000 --- a/t/templates/data/2.txt.200711111111 +++ /dev/null @@ -1,9 +0,0 @@ -Lorem ipsum II - -Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso -facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor sit -amet ipso facto.Lorem ipsum dolor sit amet ipso facto. - -Lorem ipso hoccer foer tyr wuz de ras cora dola tymon ipso hoc cer fuz -de ramas cora dola tymon ipso hoccer. Lorem ipso foer tyr wuz de ramas -cora dola tym ipso hor. diff --git a/t/templates/data/head.html b/t/templates/data/head.html index 17c1753..7426227 100644 --- a/t/templates/data/head.html +++ b/t/templates/data/head.html @@ -2,8 +2,9 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - - $blog_title $path_info_da $path_info_mo $path_info_yr + + $blog_title $path_info_da $path_info_mo $path_info_yr +

$blog_title

diff --git a/t/templates/expected.html b/t/templates/expected.html deleted file mode 100644 index 03e4eab..0000000 --- a/t/templates/expected.html +++ /dev/null @@ -1,44 +0,0 @@ -Content-Type: text/xhtml; charset=UTF-8 - - - - - - My Weblog - - -

My Weblog

-

-

2007-11-11

-

Lorem ipsum II

-
-Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso -facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor sit -amet ipso facto.Lorem ipsum dolor sit amet ipso facto. - -Lorem ipso hoccer foer tyr wuz de ras cora dola tymon ipso hoc cer fuz -de ramas cora dola tymon ipso hoccer. Lorem ipso foer tyr wuz de ramas -cora dola tym ipso hor.
-

posted at: 11:11 | path: | permanent link to this entry

-

2006-07-19

-

Lorem ipsum

-
Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso -facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor sit -amet ipso facto.Lorem ipsum dolor sit amet ipso facto. - -facto.Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet -ipso facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor -sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto. - -Lorem ipso hoccer foer tyr wuz de ras cora dola tymon ipso hoc cer fuz -de ramas cora dola tymon ipso hoccer. Lorem ipso foer tyr wuz de ramas -cora dola tym ipso hor.Lorem ipso foer tyr wuz de ramas cora dola tym -ipso hor tyr wuz de ramas cora dola tymon ipso foer tyr wuz de ramas -cora dola tymo. Lorem ipso hoccer foer tyr wuz de ras cora dola tymon -ipso hoc cer fuz de ramas cora dola tymon ipso hoccer. Lorem ipso foer -tyr wuz de ramas cora dola tym ipso hor.
-

posted at: 22:54 | path: | permanent link to this entry

- - - diff --git a/t/templates/expected.rss b/t/templates/expected.rss deleted file mode 100644 index a03fc8a..0000000 --- a/t/templates/expected.rss +++ /dev/null @@ -1,34 +0,0 @@ -Content-Type: text/xml; charset=ISO-8859-1 - - - - - - - - My Weblog - http://localhost/./blosxom.cgi - Yet another Blosxom weblog. - en - - - Lorem ipsum - http://localhost/./blosxom.cgi/2006/07/19#1 - Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso -facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor sit -amet ipso facto.Lorem ipsum dolor sit amet ipso facto. - -facto.Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet -ipso facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor -sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto. - -Lorem ipso hoccer foer tyr wuz de ras cora dola tymon ipso hoc cer fuz -de ramas cora dola tymon ipso hoccer. Lorem ipso foer tyr wuz de ramas -cora dola tym ipso hor.Lorem ipso foer tyr wuz de ramas cora dola tym -ipso hor tyr wuz de ramas cora dola tymon ipso foer tyr wuz de ramas -cora dola tymo. Lorem ipso hoccer foer tyr wuz de ras cora dola tymon -ipso hoc cer fuz de ramas cora dola tymon ipso hoccer. Lorem ipso foer -tyr wuz de ramas cora dola tym ipso hor. - - - diff --git a/t/templates/spec.yaml b/t/templates/spec.yaml index 93883d3..167aadb 100644 --- a/t/templates/spec.yaml +++ b/t/templates/spec.yaml @@ -1,4 +1,13 @@ tests: - - "" - - expected.html + - "expected/index.html" + - + - "path=/index.rss" + - "expected/index.rss" + - + - "path=/web/index.html" + - "expected/web/index.html" + - + - "path=/web/index.rss" + - "expected/web/index.rss" -- 2.30.2 From 6ee4a970fabe88be0935f64e8d4fe232cc393a00 Mon Sep 17 00:00:00 2001 From: Gavin Carr Date: Mon, 21 Jul 2008 13:45:06 +0000 Subject: [PATCH 06/16] Updates to rss20 tests. --- t/static_basic/config/blosxom.conf | 2 + t/static_basic/config/plugins.conf | 2 + t/static_basic/expected/2006/07/19/index.rss | 48 ++++++++++++-------- t/static_basic/expected/2006/07/index.rss | 48 ++++++++++++-------- t/static_basic/expected/2006/index.rss | 48 ++++++++++++-------- t/static_basic/expected/index.rss | 48 ++++++++++++-------- t/templates/config/plugins.conf | 2 + 7 files changed, 126 insertions(+), 72 deletions(-) create mode 100644 t/static_basic/config/plugins.conf create mode 100644 t/templates/config/plugins.conf diff --git a/t/static_basic/config/blosxom.conf b/t/static_basic/config/blosxom.conf index 7d8ef26..18ddf7a 100644 --- a/t/static_basic/config/blosxom.conf +++ b/t/static_basic/config/blosxom.conf @@ -1,4 +1,6 @@ $datadir = "$ENV{BLOSXOM_CONFIG_DIR}/../data"; +$plugin_list = "$ENV{BLOSXOM_CONFIG_DIR}/plugins.conf"; +$plugin_path = "$ENV{BLOSXOM_CONFIG_DIR}/../../../general:$ENV{BLOSXOM_CONFIG_DIR}/../../../gavinc"; $static_dir = "$ENV{BLOSXOM_CONFIG_DIR}/../static"; $static_password = 'static'; @static_flavours = qw/html rss/; diff --git a/t/static_basic/config/plugins.conf b/t/static_basic/config/plugins.conf new file mode 100644 index 0000000..d3be1b1 --- /dev/null +++ b/t/static_basic/config/plugins.conf @@ -0,0 +1,2 @@ +storydate +rss20 diff --git a/t/static_basic/expected/2006/07/19/index.rss b/t/static_basic/expected/2006/07/19/index.rss index 9d5130f..6628437 100644 --- a/t/static_basic/expected/2006/07/19/index.rss +++ b/t/static_basic/expected/2006/07/19/index.rss @@ -1,20 +1,30 @@ - - - My Weblog - http://localhost/ - Yet another Blosxom weblog. - en - http://blogs.law.harvard.edu/tech/rss - blosxom/2.0.2 + - - Lorem ipsum - Wed, 19 Jul 2006 22:54:00 +0000 - http://localhost/2006/07/19#1 - - /1 - Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso + + My Weblog + http://localhost/ + Yet another Blosxom weblog. + author@example.com (A. U. Thor) + author@example.com (A. U. Thor) + Wed, 19 Jul 2006 22:54:00 +0000 + en + blosxom 2.0.2 + + hourly + 1 + 2000-01-01T12:00+00:00 + + + + Lorem ipsum + http://localhost/1.html + http://localhost/1.html + Wed, 19 Jul 2006 22:54:00 +0000 + Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto. @@ -28,7 +38,9 @@ cora dola tym ipso hor.Lorem ipso foer tyr wuz de ramas cora dola tym ipso hor tyr wuz de ramas cora dola tymon ipso foer tyr wuz de ramas cora dola tymo. Lorem ipso hoccer foer tyr wuz de ras cora dola tymon ipso hoc cer fuz de ramas cora dola tymon ipso hoccer. Lorem ipso foer -tyr wuz de ramas cora dola tym ipso hor. - - +tyr wuz de ramas cora dola tym ipso hor. + + + + diff --git a/t/static_basic/expected/2006/07/index.rss b/t/static_basic/expected/2006/07/index.rss index 9d5130f..6628437 100644 --- a/t/static_basic/expected/2006/07/index.rss +++ b/t/static_basic/expected/2006/07/index.rss @@ -1,20 +1,30 @@ - - - My Weblog - http://localhost/ - Yet another Blosxom weblog. - en - http://blogs.law.harvard.edu/tech/rss - blosxom/2.0.2 + - - Lorem ipsum - Wed, 19 Jul 2006 22:54:00 +0000 - http://localhost/2006/07/19#1 - - /1 - Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso + + My Weblog + http://localhost/ + Yet another Blosxom weblog. + author@example.com (A. U. Thor) + author@example.com (A. U. Thor) + Wed, 19 Jul 2006 22:54:00 +0000 + en + blosxom 2.0.2 + + hourly + 1 + 2000-01-01T12:00+00:00 + + + + Lorem ipsum + http://localhost/1.html + http://localhost/1.html + Wed, 19 Jul 2006 22:54:00 +0000 + Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto. @@ -28,7 +38,9 @@ cora dola tym ipso hor.Lorem ipso foer tyr wuz de ramas cora dola tym ipso hor tyr wuz de ramas cora dola tymon ipso foer tyr wuz de ramas cora dola tymo. Lorem ipso hoccer foer tyr wuz de ras cora dola tymon ipso hoc cer fuz de ramas cora dola tymon ipso hoccer. Lorem ipso foer -tyr wuz de ramas cora dola tym ipso hor. - - +tyr wuz de ramas cora dola tym ipso hor. + + + + diff --git a/t/static_basic/expected/2006/index.rss b/t/static_basic/expected/2006/index.rss index 9d5130f..6628437 100644 --- a/t/static_basic/expected/2006/index.rss +++ b/t/static_basic/expected/2006/index.rss @@ -1,20 +1,30 @@ - - - My Weblog - http://localhost/ - Yet another Blosxom weblog. - en - http://blogs.law.harvard.edu/tech/rss - blosxom/2.0.2 + - - Lorem ipsum - Wed, 19 Jul 2006 22:54:00 +0000 - http://localhost/2006/07/19#1 - - /1 - Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso + + My Weblog + http://localhost/ + Yet another Blosxom weblog. + author@example.com (A. U. Thor) + author@example.com (A. U. Thor) + Wed, 19 Jul 2006 22:54:00 +0000 + en + blosxom 2.0.2 + + hourly + 1 + 2000-01-01T12:00+00:00 + + + + Lorem ipsum + http://localhost/1.html + http://localhost/1.html + Wed, 19 Jul 2006 22:54:00 +0000 + Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto. @@ -28,7 +38,9 @@ cora dola tym ipso hor.Lorem ipso foer tyr wuz de ramas cora dola tym ipso hor tyr wuz de ramas cora dola tymon ipso foer tyr wuz de ramas cora dola tymo. Lorem ipso hoccer foer tyr wuz de ras cora dola tymon ipso hoc cer fuz de ramas cora dola tymon ipso hoccer. Lorem ipso foer -tyr wuz de ramas cora dola tym ipso hor. - - +tyr wuz de ramas cora dola tym ipso hor. + + + + diff --git a/t/static_basic/expected/index.rss b/t/static_basic/expected/index.rss index 9d5130f..6628437 100644 --- a/t/static_basic/expected/index.rss +++ b/t/static_basic/expected/index.rss @@ -1,20 +1,30 @@ - - - My Weblog - http://localhost/ - Yet another Blosxom weblog. - en - http://blogs.law.harvard.edu/tech/rss - blosxom/2.0.2 + - - Lorem ipsum - Wed, 19 Jul 2006 22:54:00 +0000 - http://localhost/2006/07/19#1 - - /1 - Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso + + My Weblog + http://localhost/ + Yet another Blosxom weblog. + author@example.com (A. U. Thor) + author@example.com (A. U. Thor) + Wed, 19 Jul 2006 22:54:00 +0000 + en + blosxom 2.0.2 + + hourly + 1 + 2000-01-01T12:00+00:00 + + + + Lorem ipsum + http://localhost/1.html + http://localhost/1.html + Wed, 19 Jul 2006 22:54:00 +0000 + Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto. @@ -28,7 +38,9 @@ cora dola tym ipso hor.Lorem ipso foer tyr wuz de ramas cora dola tym ipso hor tyr wuz de ramas cora dola tymon ipso foer tyr wuz de ramas cora dola tymo. Lorem ipso hoccer foer tyr wuz de ras cora dola tymon ipso hoc cer fuz de ramas cora dola tymon ipso hoccer. Lorem ipso foer -tyr wuz de ramas cora dola tym ipso hor. - - +tyr wuz de ramas cora dola tym ipso hor. + + + + diff --git a/t/templates/config/plugins.conf b/t/templates/config/plugins.conf new file mode 100644 index 0000000..d3be1b1 --- /dev/null +++ b/t/templates/config/plugins.conf @@ -0,0 +1,2 @@ +storydate +rss20 -- 2.30.2 From 680c6eaa4e9ab37048476e42f8f38c8eb52a8c7f Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Tue, 22 Jul 2008 00:15:42 +0000 Subject: [PATCH 07/16] Revert Gavin Garr's (gonzai's) commits to the test suite on 21st of July 2008 since they seem to be at least incomplete and caused the test suite to break badly: 01_templates.......error finding or loading blosxom plugin 'storydate': Can't locate storydate in @INC (@INC contains: /home/abe/blosxom-devel/blosxom2/t/templates/config/../../../general /home/abe/blosxom-devel/blosxom2/t/templates/config/../../../gavinc /etc/perl /usr/local/lib/perl/5.8.8 /usr/local/share/perl/5.8.8 /usr/lib/perl5 /usr/share/perl5 /usr/lib/perl/5.8 /usr/share/perl/5.8 /usr/local/lib/site_perl .) at /home/abe/blosxom-devel/blosxom2/t/templates/../../blosxom.cgi line 318. error finding or loading blosxom plugin 'rss20': Can't locate rss20 in @INC (@INC contains: /home/abe/blosxom-devel/blosxom2/t/templates/config/../../../general /home/abe/blosxom-devel/blosxom2/t/templates/config/../../../gavinc /etc/perl /usr/local/lib/perl/5.8.8 /usr/local/share/perl/5.8.8 /usr/lib/perl5 /usr/share/perl5 /usr/lib/perl/5.8 /usr/share/perl/5.8 /usr/local/lib/site_perl .) at /home/abe/blosxom-devel/blosxom2/t/templates/../../blosxom.cgi line 318. 01_templates.......ok 1/0error finding or loading blosxom plugin 'storydate': Can't locate storydate in @INC (@INC contains: /home/abe/blosxom-devel/blosxom2/t/templates/config/../../../general /home/abe/blosxom-devel/blosxom2/t/templates/config/../../../gavinc /etc/perl /usr/local/lib/perl/5.8.8 /usr/local/share/perl/5.8.8 /usr/lib/perl5 /usr/share/perl5 /usr/lib/perl/5.8 /usr/share/perl/5.8 /usr/local/lib/site_perl .) at /home/abe/blosxom-devel/blosxom2/t/templates/../../blosxom.cgi line 318. error finding or loading blosxom plugin 'rss20': Can't locate rss20 in @INC (@INC contains: /home/abe/blosxom-devel/blosxom2/t/templates/config/../../../general /home/abe/blosxom-devel/blosxom2/t/templates/config/../../../gavinc /etc/perl /usr/local/lib/perl/5.8.8 /usr/local/share/perl/5.8.8 /usr/lib/perl5 /usr/share/perl5 /usr/lib/perl/5.8 /usr/share/perl/5.8 /usr/local/lib/site_perl .) at /home/abe/blosxom-devel/blosxom2/t/templates/../../blosxom.cgi line 318. 01_templates.......NOK 2 The commits also include paths to locations outside the repository which made them look as if they weren't intended the way they happened. The missing plugins were probably located there. We can figure out what exactly went wrong after the 2.1.0 release. --- t/static_basic/config/blosxom.conf | 2 - t/static_basic/config/plugins.conf | 2 - t/static_basic/expected/2006/07/19/index.rss | 48 ++++++++------------ t/static_basic/expected/2006/07/index.rss | 48 ++++++++------------ t/static_basic/expected/2006/index.rss | 48 ++++++++------------ t/static_basic/expected/index.rss | 48 ++++++++------------ t/templates/config/blosxom.conf | 2 - t/templates/config/plugins.conf | 2 - t/templates/data/head.html | 5 +- t/templates/expected.html | 45 ++++++++++++++++++ t/templates/expected.rss | 34 ++++++++++++++ t/templates/spec.yaml | 11 +---- 12 files changed, 154 insertions(+), 141 deletions(-) create mode 100644 t/templates/expected.html create mode 100644 t/templates/expected.rss diff --git a/t/static_basic/config/blosxom.conf b/t/static_basic/config/blosxom.conf index 18ddf7a..7d8ef26 100644 --- a/t/static_basic/config/blosxom.conf +++ b/t/static_basic/config/blosxom.conf @@ -1,6 +1,4 @@ $datadir = "$ENV{BLOSXOM_CONFIG_DIR}/../data"; -$plugin_list = "$ENV{BLOSXOM_CONFIG_DIR}/plugins.conf"; -$plugin_path = "$ENV{BLOSXOM_CONFIG_DIR}/../../../general:$ENV{BLOSXOM_CONFIG_DIR}/../../../gavinc"; $static_dir = "$ENV{BLOSXOM_CONFIG_DIR}/../static"; $static_password = 'static'; @static_flavours = qw/html rss/; diff --git a/t/static_basic/config/plugins.conf b/t/static_basic/config/plugins.conf index d3be1b1..e69de29 100644 --- a/t/static_basic/config/plugins.conf +++ b/t/static_basic/config/plugins.conf @@ -1,2 +0,0 @@ -storydate -rss20 diff --git a/t/static_basic/expected/2006/07/19/index.rss b/t/static_basic/expected/2006/07/19/index.rss index 6628437..9d5130f 100644 --- a/t/static_basic/expected/2006/07/19/index.rss +++ b/t/static_basic/expected/2006/07/19/index.rss @@ -1,30 +1,20 @@ - + + + My Weblog + http://localhost/ + Yet another Blosxom weblog. + en + http://blogs.law.harvard.edu/tech/rss + blosxom/2.0.2 - - My Weblog - http://localhost/ - Yet another Blosxom weblog. - author@example.com (A. U. Thor) - author@example.com (A. U. Thor) - Wed, 19 Jul 2006 22:54:00 +0000 - en - blosxom 2.0.2 - - hourly - 1 - 2000-01-01T12:00+00:00 - - - - Lorem ipsum - http://localhost/1.html - http://localhost/1.html - Wed, 19 Jul 2006 22:54:00 +0000 - Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso + + Lorem ipsum + Wed, 19 Jul 2006 22:54:00 +0000 + http://localhost/2006/07/19#1 + + /1 + Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto. @@ -38,9 +28,7 @@ cora dola tym ipso hor.Lorem ipso foer tyr wuz de ramas cora dola tym ipso hor tyr wuz de ramas cora dola tymon ipso foer tyr wuz de ramas cora dola tymo. Lorem ipso hoccer foer tyr wuz de ras cora dola tymon ipso hoc cer fuz de ramas cora dola tymon ipso hoccer. Lorem ipso foer -tyr wuz de ramas cora dola tym ipso hor. - - - - +tyr wuz de ramas cora dola tym ipso hor. + + diff --git a/t/static_basic/expected/2006/07/index.rss b/t/static_basic/expected/2006/07/index.rss index 6628437..9d5130f 100644 --- a/t/static_basic/expected/2006/07/index.rss +++ b/t/static_basic/expected/2006/07/index.rss @@ -1,30 +1,20 @@ - + + + My Weblog + http://localhost/ + Yet another Blosxom weblog. + en + http://blogs.law.harvard.edu/tech/rss + blosxom/2.0.2 - - My Weblog - http://localhost/ - Yet another Blosxom weblog. - author@example.com (A. U. Thor) - author@example.com (A. U. Thor) - Wed, 19 Jul 2006 22:54:00 +0000 - en - blosxom 2.0.2 - - hourly - 1 - 2000-01-01T12:00+00:00 - - - - Lorem ipsum - http://localhost/1.html - http://localhost/1.html - Wed, 19 Jul 2006 22:54:00 +0000 - Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso + + Lorem ipsum + Wed, 19 Jul 2006 22:54:00 +0000 + http://localhost/2006/07/19#1 + + /1 + Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto. @@ -38,9 +28,7 @@ cora dola tym ipso hor.Lorem ipso foer tyr wuz de ramas cora dola tym ipso hor tyr wuz de ramas cora dola tymon ipso foer tyr wuz de ramas cora dola tymo. Lorem ipso hoccer foer tyr wuz de ras cora dola tymon ipso hoc cer fuz de ramas cora dola tymon ipso hoccer. Lorem ipso foer -tyr wuz de ramas cora dola tym ipso hor. - - - - +tyr wuz de ramas cora dola tym ipso hor. + + diff --git a/t/static_basic/expected/2006/index.rss b/t/static_basic/expected/2006/index.rss index 6628437..9d5130f 100644 --- a/t/static_basic/expected/2006/index.rss +++ b/t/static_basic/expected/2006/index.rss @@ -1,30 +1,20 @@ - + + + My Weblog + http://localhost/ + Yet another Blosxom weblog. + en + http://blogs.law.harvard.edu/tech/rss + blosxom/2.0.2 - - My Weblog - http://localhost/ - Yet another Blosxom weblog. - author@example.com (A. U. Thor) - author@example.com (A. U. Thor) - Wed, 19 Jul 2006 22:54:00 +0000 - en - blosxom 2.0.2 - - hourly - 1 - 2000-01-01T12:00+00:00 - - - - Lorem ipsum - http://localhost/1.html - http://localhost/1.html - Wed, 19 Jul 2006 22:54:00 +0000 - Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso + + Lorem ipsum + Wed, 19 Jul 2006 22:54:00 +0000 + http://localhost/2006/07/19#1 + + /1 + Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto. @@ -38,9 +28,7 @@ cora dola tym ipso hor.Lorem ipso foer tyr wuz de ramas cora dola tym ipso hor tyr wuz de ramas cora dola tymon ipso foer tyr wuz de ramas cora dola tymo. Lorem ipso hoccer foer tyr wuz de ras cora dola tymon ipso hoc cer fuz de ramas cora dola tymon ipso hoccer. Lorem ipso foer -tyr wuz de ramas cora dola tym ipso hor. - - - - +tyr wuz de ramas cora dola tym ipso hor. + + diff --git a/t/static_basic/expected/index.rss b/t/static_basic/expected/index.rss index 6628437..9d5130f 100644 --- a/t/static_basic/expected/index.rss +++ b/t/static_basic/expected/index.rss @@ -1,30 +1,20 @@ - + + + My Weblog + http://localhost/ + Yet another Blosxom weblog. + en + http://blogs.law.harvard.edu/tech/rss + blosxom/2.0.2 - - My Weblog - http://localhost/ - Yet another Blosxom weblog. - author@example.com (A. U. Thor) - author@example.com (A. U. Thor) - Wed, 19 Jul 2006 22:54:00 +0000 - en - blosxom 2.0.2 - - hourly - 1 - 2000-01-01T12:00+00:00 - - - - Lorem ipsum - http://localhost/1.html - http://localhost/1.html - Wed, 19 Jul 2006 22:54:00 +0000 - Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso + + Lorem ipsum + Wed, 19 Jul 2006 22:54:00 +0000 + http://localhost/2006/07/19#1 + + /1 + Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto. @@ -38,9 +28,7 @@ cora dola tym ipso hor.Lorem ipso foer tyr wuz de ramas cora dola tym ipso hor tyr wuz de ramas cora dola tymon ipso foer tyr wuz de ramas cora dola tymo. Lorem ipso hoccer foer tyr wuz de ras cora dola tymon ipso hoc cer fuz de ramas cora dola tymon ipso hoccer. Lorem ipso foer -tyr wuz de ramas cora dola tym ipso hor. - - - - +tyr wuz de ramas cora dola tym ipso hor. + + diff --git a/t/templates/config/blosxom.conf b/t/templates/config/blosxom.conf index 27d4b12..ae83e48 100644 --- a/t/templates/config/blosxom.conf +++ b/t/templates/config/blosxom.conf @@ -1,3 +1 @@ $datadir = "$ENV{BLOSXOM_CONFIG_DIR}/../data"; -$plugin_list = "$ENV{BLOSXOM_CONFIG_DIR}/plugins.conf"; -$plugin_path = "$ENV{BLOSXOM_CONFIG_DIR}/../../../general:$ENV{BLOSXOM_CONFIG_DIR}/../../../gavinc"; diff --git a/t/templates/config/plugins.conf b/t/templates/config/plugins.conf index d3be1b1..e69de29 100644 --- a/t/templates/config/plugins.conf +++ b/t/templates/config/plugins.conf @@ -1,2 +0,0 @@ -storydate -rss20 diff --git a/t/templates/data/head.html b/t/templates/data/head.html index 7426227..17c1753 100644 --- a/t/templates/data/head.html +++ b/t/templates/data/head.html @@ -2,9 +2,8 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - - $blog_title $path_info_da $path_info_mo $path_info_yr - + + $blog_title $path_info_da $path_info_mo $path_info_yr

$blog_title

diff --git a/t/templates/expected.html b/t/templates/expected.html new file mode 100644 index 0000000..c068b57 --- /dev/null +++ b/t/templates/expected.html @@ -0,0 +1,45 @@ +Content-Type: text/xhtml; charset=UTF-8 + + + + + + My Weblog + + +

My Weblog

+

+

2007-11-11

+

Lorem ipsum II

+
+Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso +facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor sit +amet ipso facto.Lorem ipsum dolor sit amet ipso facto. + +Lorem ipso hoccer foer tyr wuz de ras cora dola tymon ipso hoc cer fuz +de ramas cora dola tymon ipso hoccer. Lorem ipso foer tyr wuz de ramas +cora dola tym ipso hor. +
+

posted at: 11:11 | path: /web | permanent link to this entry

+

2006-07-19

+

Lorem ipsum

+
Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso +facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor sit +amet ipso facto.Lorem ipsum dolor sit amet ipso facto. + +facto.Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet +ipso facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor +sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto. + +Lorem ipso hoccer foer tyr wuz de ras cora dola tymon ipso hoc cer fuz +de ramas cora dola tymon ipso hoccer. Lorem ipso foer tyr wuz de ramas +cora dola tym ipso hor.Lorem ipso foer tyr wuz de ramas cora dola tym +ipso hor tyr wuz de ramas cora dola tymon ipso foer tyr wuz de ramas +cora dola tymo. Lorem ipso hoccer foer tyr wuz de ras cora dola tymon +ipso hoc cer fuz de ramas cora dola tymon ipso hoccer. Lorem ipso foer +tyr wuz de ramas cora dola tym ipso hor.
+

posted at: 22:54 | path: | permanent link to this entry

+ + + diff --git a/t/templates/expected.rss b/t/templates/expected.rss new file mode 100644 index 0000000..a03fc8a --- /dev/null +++ b/t/templates/expected.rss @@ -0,0 +1,34 @@ +Content-Type: text/xml; charset=ISO-8859-1 + + + + + + + + My Weblog + http://localhost/./blosxom.cgi + Yet another Blosxom weblog. + en + + + Lorem ipsum + http://localhost/./blosxom.cgi/2006/07/19#1 + Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso +facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor sit +amet ipso facto.Lorem ipsum dolor sit amet ipso facto. + +facto.Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet +ipso facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor +sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto. + +Lorem ipso hoccer foer tyr wuz de ras cora dola tymon ipso hoc cer fuz +de ramas cora dola tymon ipso hoccer. Lorem ipso foer tyr wuz de ramas +cora dola tym ipso hor.Lorem ipso foer tyr wuz de ramas cora dola tym +ipso hor tyr wuz de ramas cora dola tymon ipso foer tyr wuz de ramas +cora dola tymo. Lorem ipso hoccer foer tyr wuz de ras cora dola tymon +ipso hoc cer fuz de ramas cora dola tymon ipso hoccer. Lorem ipso foer +tyr wuz de ramas cora dola tym ipso hor. + + + diff --git a/t/templates/spec.yaml b/t/templates/spec.yaml index 167aadb..93883d3 100644 --- a/t/templates/spec.yaml +++ b/t/templates/spec.yaml @@ -1,13 +1,4 @@ tests: - - "" - - "expected/index.html" - - - - "path=/index.rss" - - "expected/index.rss" - - - - "path=/web/index.html" - - "expected/web/index.html" - - - - "path=/web/index.rss" - - "expected/web/index.rss" + - expected.html -- 2.30.2 From 843e99101526c5103eb6938c4449a34339cb1793 Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Tue, 22 Jul 2008 00:26:27 +0000 Subject: [PATCH 08/16] Next release will be 2.1.0 -- adapt all version strings in blosxom.cgi, ChangeLog and the expected test results --- ChangeLog | 2 +- blosxom.cgi | 4 ++-- t/permalinks/expected.rss | 2 +- t/smoketest/expected.rss | 2 +- t/static_basic/expected/2006/07/19/index.rss | 2 +- t/static_basic/expected/2006/07/index.rss | 2 +- t/static_basic/expected/2006/index.rss | 2 +- t/static_basic/expected/index.rss | 2 +- t/templates/expected.rss | 2 +- t/templates/expected/index.rss | 2 +- t/templates/expected/web/index.rss | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4cb2964..e4240ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -v2.0.3 +v2.1.0 * unescape url returned from CGI.pm to match PATH_INFO escaping * redo path_info handling with much stricter date tests * added support for multiple plugin directories using $plugin_path diff --git a/blosxom.cgi b/blosxom.cgi index 674ff10..3d7727a 100755 --- a/blosxom.cgi +++ b/blosxom.cgi @@ -2,7 +2,7 @@ # Blosxom # Author: Rael Dornfest -# Version: 2.0.2 +# Version: 2.1.0 # Home/Docs/Licensing: http://blosxom.sourceforge.net/ # Development/Downloads: http://sourceforge.net/projects/blosxom @@ -88,7 +88,7 @@ use File::stat; use Time::Local; use CGI qw/:standard :netscape/; -$version = "2.0.2"; +$version = "2.1.0"; # Should I encode entities for xml content-types? (plugins can turn this off if they do it themselves) $encode_xml_entities = 1; diff --git a/t/permalinks/expected.rss b/t/permalinks/expected.rss index 1b076d4..78e043a 100644 --- a/t/permalinks/expected.rss +++ b/t/permalinks/expected.rss @@ -1,7 +1,7 @@ Content-Type: text/xml; charset=ISO-8859-1 - + diff --git a/t/smoketest/expected.rss b/t/smoketest/expected.rss index 579b3bf..5186f52 100644 --- a/t/smoketest/expected.rss +++ b/t/smoketest/expected.rss @@ -8,7 +8,7 @@ Content-Type: text/xml; charset=ISO-8859-1 Yet another Blosxom weblog. en http://blogs.law.harvard.edu/tech/rss - blosxom/2.0.2 + blosxom/2.1.0 Lorem ipsum diff --git a/t/static_basic/expected/2006/07/19/index.rss b/t/static_basic/expected/2006/07/19/index.rss index 9d5130f..4d9eb5b 100644 --- a/t/static_basic/expected/2006/07/19/index.rss +++ b/t/static_basic/expected/2006/07/19/index.rss @@ -6,7 +6,7 @@ Yet another Blosxom weblog. en http://blogs.law.harvard.edu/tech/rss - blosxom/2.0.2 + blosxom/2.1.0 Lorem ipsum diff --git a/t/static_basic/expected/2006/07/index.rss b/t/static_basic/expected/2006/07/index.rss index 9d5130f..4d9eb5b 100644 --- a/t/static_basic/expected/2006/07/index.rss +++ b/t/static_basic/expected/2006/07/index.rss @@ -6,7 +6,7 @@ Yet another Blosxom weblog. en http://blogs.law.harvard.edu/tech/rss - blosxom/2.0.2 + blosxom/2.1.0 Lorem ipsum diff --git a/t/static_basic/expected/2006/index.rss b/t/static_basic/expected/2006/index.rss index 9d5130f..4d9eb5b 100644 --- a/t/static_basic/expected/2006/index.rss +++ b/t/static_basic/expected/2006/index.rss @@ -6,7 +6,7 @@ Yet another Blosxom weblog. en http://blogs.law.harvard.edu/tech/rss - blosxom/2.0.2 + blosxom/2.1.0 Lorem ipsum diff --git a/t/static_basic/expected/index.rss b/t/static_basic/expected/index.rss index 9d5130f..4d9eb5b 100644 --- a/t/static_basic/expected/index.rss +++ b/t/static_basic/expected/index.rss @@ -6,7 +6,7 @@ Yet another Blosxom weblog. en http://blogs.law.harvard.edu/tech/rss - blosxom/2.0.2 + blosxom/2.1.0 Lorem ipsum diff --git a/t/templates/expected.rss b/t/templates/expected.rss index a03fc8a..706a2f2 100644 --- a/t/templates/expected.rss +++ b/t/templates/expected.rss @@ -1,7 +1,7 @@ Content-Type: text/xml; charset=ISO-8859-1 - + diff --git a/t/templates/expected/index.rss b/t/templates/expected/index.rss index 58312d8..e22dfc8 100644 --- a/t/templates/expected/index.rss +++ b/t/templates/expected/index.rss @@ -14,7 +14,7 @@ Content-Type: text/xml; charset=UTF-8 author@example.com (A. U. Thor) Sun, 11 Nov 2007 11:11:00 +0000 en - blosxom 2.0.2 + blosxom 2.1.0 hourly 1 diff --git a/t/templates/expected/web/index.rss b/t/templates/expected/web/index.rss index aabb7b4..748a86e 100644 --- a/t/templates/expected/web/index.rss +++ b/t/templates/expected/web/index.rss @@ -15,7 +15,7 @@ Content-Type: text/xml; charset=UTF-8 author@example.com (A. U. Thor) Sun, 11 Nov 2007 11:11:00 +0000 en - blosxom 2.0.2 + blosxom 2.1.0 hourly 1 -- 2.30.2 From 9cd41cf7b0183b15baa6fcca6cd290b351effeba Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Tue, 22 Jul 2008 01:09:55 +0000 Subject: [PATCH 09/16] Adapt the author string to list the current development team, too --- blosxom.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blosxom.cgi b/blosxom.cgi index 3d7727a..e415d60 100755 --- a/blosxom.cgi +++ b/blosxom.cgi @@ -1,7 +1,7 @@ #!/usr/bin/perl # Blosxom -# Author: Rael Dornfest +# Author: Rael Dornfest (2003), The Blosxom Development Team (2005-2008) # Version: 2.1.0 # Home/Docs/Licensing: http://blosxom.sourceforge.net/ # Development/Downloads: http://sourceforge.net/projects/blosxom -- 2.30.2 From 69dab234ef4126ba5d5a1af720ac54050a0107d8 Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Tue, 22 Jul 2008 01:17:30 +0000 Subject: [PATCH 10/16] Single quotes must be escaped in XML, too --- blosxom.cgi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/blosxom.cgi b/blosxom.cgi index e415d60..fb2a45f 100755 --- a/blosxom.cgi +++ b/blosxom.cgi @@ -667,7 +667,8 @@ sub generate { '<' => '<', '>' => '>', '&' => '&', - '"' => '"' + '"' => '"', + "'" => ''' ); my $escape_re = join '|' => keys %escape; $title =~ s/($escape_re)/$escape{$1}/g; -- 2.30.2 From 3de8259e6bfdb18b5fc581c8f327f6cf0f3bf19d Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Tue, 22 Jul 2008 01:41:11 +0000 Subject: [PATCH 11/16] URLs must be escaped inside XML, e.g. inside the container, too. --- blosxom.cgi | 3 +++ 1 file changed, 3 insertions(+) diff --git a/blosxom.cgi b/blosxom.cgi index fb2a45f..341d296 100755 --- a/blosxom.cgi +++ b/blosxom.cgi @@ -673,6 +673,9 @@ sub generate { my $escape_re = join '|' => keys %escape; $title =~ s/($escape_re)/$escape{$1}/g; $body =~ s/($escape_re)/$escape{$1}/g; + $url =~ s/($escape_re)/$escape{$1}/g; + $path =~ s/($escape_re)/$escape{$1}/g; + $fn =~ s/($escape_re)/$escape{$1}/g; } $story = &$interpolate($story); -- 2.30.2 From 4ca079445f95088dac8bdc7506aa04696513fb12 Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Tue, 22 Jul 2008 01:46:08 +0000 Subject: [PATCH 12/16] Bugfix: Default RSS feed failed feed validation at http://www.feedvalidator.org/ if there was a blank inside a file name since blanks (and other characters) need to be escaped inside an URL. Most browsers do this, but not all. --- blosxom.cgi | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/blosxom.cgi b/blosxom.cgi index 341d296..2e6181f 100755 --- a/blosxom.cgi +++ b/blosxom.cgi @@ -661,6 +661,15 @@ sub generate { } if ( $encode_xml_entities && $content_type =~ m{\bxml\b} ) { + # Escape special characters inside the container + + # The following line should be moved more towards to top for + # performance reasons -- Axel Beckert, 2008-07-22 + my $url_escape_re = qr([^-/a-zA-Z0-9:._]); + + $url =~ s($url_escape_re)(sprintf('%%%02X', ord($&)))eg; + $path =~ s($url_escape_re)(sprintf('%%%02X', ord($&)))eg; + $fn =~ s($url_escape_re)(sprintf('%%%02X', ord($&)))eg; # Escape <, >, and &, and to produce valid RSS my %escape = ( -- 2.30.2 From 3338156aa6ba79dae5ef7e585dc022f175a867fa Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Tue, 22 Jul 2008 02:01:34 +0000 Subject: [PATCH 13/16] Bugfix: Default RSS feed failed feed validation at http://www.feedvalidator.org/ if there was a blank inside a file name since blanks (and other characters) need to be escaped inside an URL. Most browsers do this, but not all. --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index e4240ec..7cd8df3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ v2.1.0 * added support for external config file via BLOSXOM_CONFIG_DIR and/or BLOSXOM_CONFIG_FILE environment variables * added support for $plugin_list plugin config file + * fixed some RSS escaping issues * made the default templates conforming to HTML 4.01 * added a testsuite for blosxom * added an encoding setting, defaulting to UTF-8 -- 2.30.2 From 3ae079e92bfa02656179e5933937c9103f8be48f Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Tue, 22 Jul 2008 02:11:53 +0000 Subject: [PATCH 14/16] Make content a full URL by default (as Gavin had it in his broken patch, too) since it could be ambigous otherwise. Additionally, feed parsers can use the value it as permanent link and it is a good example on how to implement links to articles without the date in the URL. --- blosxom.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blosxom.cgi b/blosxom.cgi index 2e6181f..3ebe972 100755 --- a/blosxom.cgi +++ b/blosxom.cgi @@ -793,7 +793,7 @@ rss story $title rss story $dw, $da $mo $yr $ti:00 $utc_offset rss story $url/$yr/$mo_num/$da#$fn rss story $path -rss story $path/$fn +rss story $url$path/$fn rss story $body rss story -- 2.30.2 From f58f1e6d9a3d9e8f31c8bb80e3a422f4312109ba Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Tue, 22 Jul 2008 02:25:00 +0000 Subject: [PATCH 15/16] A simple Makefile to easily generate tar balls for distribution --- Makefile | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..1bd0d40 --- /dev/null +++ b/Makefile @@ -0,0 +1,10 @@ +VERSION=$(shell head -1 ChangeLog | sed -e s/v//) + +dist: + rm -rf ../blosxom-$(VERSION)/ + mkdir ../blosxom-$(VERSION) + cp -priv * ../blosxom-$(VERSION)/ + cd .. && tar cvzf blosxom-$(VERSION).tar.gz --exclude=CVS --exclude='*~' --exclude=".??*" --exclude="#*#" --exclude="*.t" blosxom-$(VERSION)/ + rm -rf ../blosxom-$(VERSION)/ + + -- 2.30.2 From a821302896ef85f49108f02324a5d95627bb9ff4 Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Tue, 22 Jul 2008 21:35:19 +0000 Subject: [PATCH 16/16] Bugfix: The content type set via template was only honored during dynamic generation via CGI in the HTTP headers. The content type inside the (default) HTML templates was resp. had to be hard-coded. Made $content_type a global package variable so that it can be used inside templates. --- blosxom.cgi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/blosxom.cgi b/blosxom.cgi index 3ebe972..072ddf8 100755 --- a/blosxom.cgi +++ b/blosxom.cgi @@ -79,7 +79,7 @@ $static_entries = 0; # -------------------------------- use vars - qw! $version $blog_title $blog_description $blog_language $blog_encoding $datadir $url %template $template $depth $num_entries $file_extension $default_flavour $static_or_dynamic $config_dir $plugin_list $plugin_path $plugin_dir $plugin_state_dir @plugins %plugins $static_dir $static_password @static_flavours $static_entries $path_info_full $path_info $path_info_yr $path_info_mo $path_info_da $path_info_mo_num $flavour $static_or_dynamic %month2num @num2month $interpolate $entries $output $header $show_future_entries %files %indexes %others $encode_xml_entities !; + qw! $version $blog_title $blog_description $blog_language $blog_encoding $datadir $url %template $template $depth $num_entries $file_extension $default_flavour $static_or_dynamic $config_dir $plugin_list $plugin_path $plugin_dir $plugin_state_dir @plugins %plugins $static_dir $static_password @static_flavours $static_entries $path_info_full $path_info $path_info_yr $path_info_mo $path_info_da $path_info_mo_num $flavour $static_or_dynamic %month2num @num2month $interpolate $entries $output $header $show_future_entries %files %indexes %others $encode_xml_entities $content_type !; use strict; use FileHandle; @@ -436,7 +436,7 @@ if ( !$ENV{GATEWAY_INTERFACE} mkdir "$static_dir/$p", 0755 unless ( -d "$static_dir/$p" or $p =~ /\.$file_extension$/ ); foreach $flavour (@static_flavours) { - my $content_type + $content_type = ( &$template( $p, 'content_type', $flavour ) ); $content_type =~ s!\n.*!!s; my $fn = $p =~ m!^(.+)\.$file_extension$! ? $1 : "$p/index"; @@ -473,7 +473,7 @@ if ( !$ENV{GATEWAY_INTERFACE} # Dynamic else { - my $content_type = ( &$template( $path_info, 'content_type', $flavour ) ); + $content_type = ( &$template( $path_info, 'content_type', $flavour ) ); $content_type =~ s!\n.*!!s; $content_type =~ s/(\$\w+(?:::\w+)*)/"defined $1 ? $1 : ''"/gee; @@ -751,7 +751,7 @@ html content_type text/html; charset=$blog_encoding html head html head html head -html head +html head html head html head $blog_title $path_info_da $path_info_mo $path_info_yr html head -- 2.30.2