Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package perl-XML-LibXSLT for openSUSE:Factory checked in at 2022-06-03 14:16:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-XML-LibXSLT (Old) and /work/SRC/openSUSE:Factory/.perl-XML-LibXSLT.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-XML-LibXSLT" Fri Jun 3 14:16:41 2022 rev:39 rq:980493 version:2.002000 Changes: -------- --- /work/SRC/openSUSE:Factory/perl-XML-LibXSLT/perl-XML-LibXSLT.changes 2022-04-16 00:13:00.961550300 +0200 +++ /work/SRC/openSUSE:Factory/.perl-XML-LibXSLT.new.1548/perl-XML-LibXSLT.changes 2022-06-03 14:16:45.605323794 +0200 @@ -1,0 +2,20 @@ +Wed May 18 03:10:45 UTC 2022 - Tina M??ller <timueller+p...@suse.de> + +- updated to 2.002000 + see /usr/share/doc/packages/perl-XML-LibXSLT/Changes + + 2.002000 2022-05-17 + - lib/XML/LibXSLT/Quick.pm . + - clarify license + - https://github.com/shlomif/perl-XML-LibXSLT/issues/5 + - add docs and a $source 'string' type + - Makefile.PL + - cleanups + - Require perl-5.14.0 at a minimum + - https://github.com/shlomif/supporting-older-perl5-releases + + 2.001000 2022-05-16 + - lib/XML/LibXSLT/Quick.pm . + - Add 'params' support for generic_transform(). + +------------------------------------------------------------------- Old: ---- XML-LibXSLT-2.000000.tar.gz New: ---- XML-LibXSLT-2.002000.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-XML-LibXSLT.spec ++++++ --- /var/tmp/diff_new_pack.DiFeN6/_old 2022-06-03 14:16:46.081324412 +0200 +++ /var/tmp/diff_new_pack.DiFeN6/_new 2022-06-03 14:16:46.085324418 +0200 @@ -18,7 +18,7 @@ %define cpan_name XML-LibXSLT Name: perl-XML-LibXSLT -Version: 2.000000 +Version: 2.002000 Release: 0 License: Artistic-1.0 OR GPL-1.0-or-later Summary: Interface to GNOME libxslt library ++++++ XML-LibXSLT-2.000000.tar.gz -> XML-LibXSLT-2.002000.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXSLT-2.000000/Changes new/XML-LibXSLT-2.002000/Changes --- old/XML-LibXSLT-2.000000/Changes 2022-04-09 08:11:37.000000000 +0200 +++ new/XML-LibXSLT-2.002000/Changes 2022-05-17 19:37:02.000000000 +0200 @@ -1,5 +1,19 @@ Revision history for Perl extension XML::LibXSLT. +2.002000 2022-05-17 + - lib/XML/LibXSLT/Quick.pm . + - clarify license + - https://github.com/shlomif/perl-XML-LibXSLT/issues/5 + - add docs and a $source 'string' type + - Makefile.PL + - cleanups + - Require perl-5.14.0 at a minimum + - https://github.com/shlomif/supporting-older-perl5-releases + +2.001000 2022-05-16 + - lib/XML/LibXSLT/Quick.pm . + - Add 'params' support for generic_transform(). + 2.000000 2022-04-09 - Add lib/XML/LibXSLT/Quick.pm . - Cleanups. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXSLT-2.000000/LICENSE new/XML-LibXSLT-2.002000/LICENSE --- old/XML-LibXSLT-2.000000/LICENSE 2018-02-21 10:47:30.000000000 +0100 +++ new/XML-LibXSLT-2.002000/LICENSE 2022-05-17 11:06:08.000000000 +0200 @@ -6,6 +6,8 @@ Copyright 2001-2006 AxKit.com Ltd. +NOTE that individual files may be licensed under different but compatible +licenses??- https://github.com/shlomif/perl-XML-LibXSLT/issues/5 . DISCLAIMER ========== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXSLT-2.000000/META.json new/XML-LibXSLT-2.002000/META.json --- old/XML-LibXSLT-2.000000/META.json 2022-04-09 08:13:43.000000000 +0200 +++ new/XML-LibXSLT-2.002000/META.json 2022-05-17 19:38:53.000000000 +0200 @@ -34,7 +34,7 @@ "requires" : { "Encode" : "0", "XML::LibXML" : "1.70", - "perl" : "5.008001", + "perl" : "5.014", "strict" : "0", "warnings" : "0" } @@ -48,6 +48,6 @@ "web" : "https://github.com/shlomif/perl-XML-LibXSLT" } }, - "version" : "2.000000", + "version" : "2.002000", "x_serialization_backend" : "JSON::PP version 4.06" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXSLT-2.000000/META.yml new/XML-LibXSLT-2.002000/META.yml --- old/XML-LibXSLT-2.000000/META.yml 2022-04-09 08:13:43.000000000 +0200 +++ new/XML-LibXSLT-2.002000/META.yml 2022-05-17 19:38:53.000000000 +0200 @@ -20,10 +20,10 @@ requires: Encode: '0' XML::LibXML: '1.70' - perl: '5.008001' + perl: '5.014' strict: '0' warnings: '0' resources: repository: https://github.com/shlomif/perl-XML-LibXSLT -version: '2.000000' +version: '2.002000' x_serialization_backend: 'CPAN::Meta::YAML version 0.018' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXSLT-2.000000/Makefile.PL new/XML-LibXSLT-2.002000/Makefile.PL --- old/XML-LibXSLT-2.000000/Makefile.PL 2020-11-02 07:46:51.000000000 +0100 +++ new/XML-LibXSLT-2.002000/Makefile.PL 2022-05-17 16:19:15.000000000 +0200 @@ -1,38 +1,37 @@ -# -------------------------------------------------------------------------- # -# $Id$ -# -------------------------------------------------------------------------- # -# Makefile.PL for XML::LibXML. -# This file is required to generate a localized Makefile -# -------------------------------------------------------------------------- # - use strict; use warnings; +use 5.014; use vars qw/$DEVNULL $is_Win32/; -BEGIN { - if ($] < 5.008_001) { - warn "\nSorry, at least Perl 5.8.1 is required for this module!\n\n"; - exit; - } -} - use ExtUtils::MakeMaker; use Config; +use Cwd qw/ cwd /; +use File::Spec (); +BEGIN { + $::is_Win32 = ($^O =~ /Win32/); + if ($::is_Win32) { + $DEVNULL = 'DEVNULL'; + } + else { + $DEVNULL = eval { File::Spec->devnull }; + if ($@) { $DEVNULL = '/dev/null' } + } +}; -$|=0; +STDOUT->autoflush(1); my %config; -while($_ = shift) { - my ($key, $val) = split(/=/, $_, 2); +while (my $arg = shift(@ARGV)) { + my ($key, $val) = split(/=/, $arg, 2); $config{$key} = $val; } my $DEBUG = delete $config{DEBUG}; -if ( $] < 5.008 or $config{NO_THREADS} ) { +if ( $config{NO_THREADS} ) { warn "disabling XML::LibXML support for Perl threads\n"; $config{DEFINE} .= " -DNO_XML_LIBXML_THREADS"; } @@ -106,7 +105,7 @@ $config{LIBS} = '-L/usr/local/lib -L/usr/lib -lxslt -lxml2 -lz -lm'; $config{INC} = '-I/usr/local/include -I/usr/include'; - print <<OPT; + print <<"OPT"; options: LIBS='$config{LIBS}' INC='$config{INC}' @@ -121,15 +120,15 @@ if ($config{LIBS} !~ /\-l(lib)?xslt\b/) { # in this case we are not able to run xml2-config. therefore we need to # expand the libz as well. - if ($::is_Win32) { - if( $ENV{ACTIVEPERL_MINGW} ) { - $config{LIBS} .= ' -llibxslt.lib -llibxml2.lib'; + if ($::is_Win32) { + if( $ENV{ACTIVEPERL_MINGW} ) { + $config{LIBS} .= ' -llibxslt.lib -llibxml2.lib'; + } else { + $config{LIBS} .= ' -llibxslt -llibxml2'; + } } else { - $config{LIBS} .= ' -llibxslt -llibxml2'; + $config{LIBS} .= ' -lxml2 -lz'; } - } else { - $config{LIBS} .= ' -lxml2 -lz'; - } } if ($config{LIBS} !~ /\-lz(lib)?\b/ and !($::is_Win32 && $config{LIBS} !~ /\-lzlib\b/)) { @@ -141,15 +140,15 @@ warn "zlib was not configured\n"; warn "set zlib\n" if $::is_Win32; } - if ($::is_Win32) { - if( $ENV{ACTIVEPERL_MINGW} ) { - $config{LIBS} .= ''; + if ($::is_Win32) { + if( $ENV{ACTIVEPERL_MINGW} ) { + $config{LIBS} .= ''; + } else { + $config{LIBS} .= ' -lzlib'; + } } else { - $config{LIBS} .= ' -lzlib'; + $config{LIBS} .= ' -lz'; } - } else { - $config{LIBS} .= ' -lz'; - } } if ($config{LIBS} !~ /\-lm\b/) { @@ -158,7 +157,7 @@ } if (!have_library($::is_Win32 ? "libxslt" : "xslt")) { - print STDERR <<DEATH; + print STDERR <<"DEATH"; libxslt not found Try setting LIBS and INC values on the command line Or get libxslt and libxml2 from @@ -199,8 +198,8 @@ } if ($DEBUG) { - print "LIBS: $config{LIBS}\n"; - print "INC: $config{INC}\n"; + print "LIBS: $config{LIBS}\n"; + print "INC: $config{INC}\n"; } my $ldflags = delete $config{LDFLAGS}; @@ -213,28 +212,9 @@ # To handle this we are gonna rename module's DLL to LibXSLT.xs.dll. if ($::is_Win32) { - if ($] eq '5.010000') - { - print STDERR <<'BUG'; -******************************** !!!WARNING!!! ******************************** -According to the version string you are running a win32 perl 5.10.0 that is -known to be suffering from dynaloader bug that prevents using non-default -module's DLL name. Therefore we have to use LibXSLT.dll that will clash with the -standard name of xslt library DLL. Please consider renaming your xslt library -to e.g. libxslt_win32.dll and then make the appropriate changes to this module's -build process to look for that instead of standard libxslt.dll. If you do not -make the proposed changes you will got during the tests many error popups with -slightly confusing message about "xsltApplyOneTemplate" function. -This bug is not present in perl 5.8.* and will be fixed in 5.10.1. -******************************************************************************* -BUG - } - else - { - # Fix for RT #94516 : - # https://rt.cpan.org/Ticket/Display.html?id=94516 - $config{DLEXT} = 'xs.'.$Config{dlext}; - } + # Fix for RT #94516 : + # https://rt.cpan.org/Ticket/Display.html?id=94516 + $config{DLEXT} = 'xs.'.$Config{dlext}; } WriteMakefile( @@ -252,7 +232,7 @@ }, 'OBJECT' => '$(O_FILES)', (($ExtUtils::MakeMaker::VERSION >= 6.48) - ? (MIN_PERL_VERSION => '5.008001',) + ? (MIN_PERL_VERSION => '5.014',) : () ), 'META_MERGE' => { @@ -275,28 +255,11 @@ # - these should really be in MakeMaker... But &shrug; ################################################################### -use Config; -use Cwd; -use Symbol; -use File::Spec; - - -BEGIN { - $::is_Win32 = ($^O =~ /Win32/); - if ($::is_Win32) { - $DEVNULL = 'DEVNULL'; - } - else { - $DEVNULL = eval { File::Spec->devnull }; - if ($@) { $DEVNULL = '/dev/null' } - } -} - sub rm_f { my @files = @_; my @realfiles; - foreach (@files) { - push @realfiles, glob($_); + foreach my $pat (@files) { + push @realfiles, glob($pat); } if (@realfiles) { chmod(0777, @realfiles); @@ -307,8 +270,8 @@ sub rm_fr { my @files = @_; my @realfiles; - foreach (@files) { - push @realfiles, glob($_); + foreach my $pat (@files) { + push @realfiles, glob($pat); } foreach my $file (@realfiles) { if (-d $file) { @@ -326,7 +289,7 @@ } sub xsystem { - my (@command)=@_; + my (@command)=@_; if ($DEBUG) { print "@command\n"; if (system(@command) != 0) { @@ -373,9 +336,36 @@ return $results; } +sub _write_utf8_file +{ + my ($out_path, $contents) = @_; + + open my $out_fh, '>:encoding(utf8)', $out_path + or die "Cannot open '$out_path' for writing - $!"; + + print {$out_fh} $contents; + + close($out_fh); + + return; +} + +sub _write_raw_file +{ + my ($out_path, $contents) = @_; + + open my $out_fh, '>:raw', $out_path + or die "Cannot open '$out_path' for writing - $!"; + + print {$out_fh} $contents; + + close($out_fh); + + return; +} + sub try_link0 { my ($src, $opt) = @_; - my $cfile = gensym(); # local $config{LIBS}; # $config{LIBS} .= $opt; unless (mkdir(".testlink", 0777)) { @@ -383,8 +373,7 @@ mkdir(".testlink", 0777) || die "Cannot create .testlink dir: $!"; } chdir(".testlink"); - open($cfile, ">Conftest.xs") || die "Cannot write to file Conftest.xs: $!"; -print $cfile <<EOT; + _write_utf8_file("Conftest.xs", <<"EOT"); #ifdef __cplusplus extern "C" { #endif @@ -394,19 +383,15 @@ #ifdef __cplusplus } #endif - -EOT - print $cfile $src; - print $cfile <<EOT; +$src MODULE = Conftest PACKAGE = Conftest PROTOTYPES: DISABLE EOT - close($cfile); - open($cfile, ">Conftest.pm") || die "Cannot write to file Conftest.pm: $!"; - print $cfile <<'EOT'; + + _write_utf8_file("Conftest.pm", <<'EOT'); package Conftest; $VERSION = 1.0; require DynaLoader; @@ -414,9 +399,7 @@ bootstrap Conftest $VERSION; 1; EOT - close($cfile); - open($cfile, ">Makefile.PL") || die "Cannot write to file Makefile.PL: $!"; - print $cfile <<'EOT'; +_write_utf8_file("Makefile.PL", <<'EOT'); use ExtUtils::MakeMaker; my %config; while($_ = shift @ARGV) { @@ -426,14 +409,13 @@ } WriteMakefile(NAME => "Conftest", VERSION_FROM => "Conftest.pm", %config); EOT - close($cfile); - open($cfile, ">test.pl") || die "Cannot write to file test.pl: $!"; - print $cfile <<EOT; -use Test; BEGIN { plan tests => 1; } END { ok(\$loaded) } -use Conftest; \$loaded++; + _write_utf8_file("test.pl", <<"EOT"); +use Test::More tests => 1; +use Conftest; +++\$::loaded; +ok(\$::loaded, "loaded") ; EOT - close($cfile); - xsystem($^X,'Makefile.PL',map "$_=$config{$_}", keys %config); + xsystem($^X, 'Makefile.PL', map { "$_=$config{$_}" } keys %config); xsystem($Config{make}, ($config{MAKEAPERL} ? qw(-f Makefile.aperl FIRST_MAKEFILE=Makefile.aperl) : ()), 'test'); #,"OTHERLDFLAGS=".$opt); @@ -452,8 +434,14 @@ sub have_library { my ($lib, $func) = (@_, "blank"); - printf("checking for %s() in -l%s... ", $func, $lib) if $func ne "blank"; - printf("looking for -l%s... ", $lib) if $func eq "blank"; + if ($func eq "blank") + { + printf("looking for -l%s... ", $lib); + } + else + { + printf("checking for %s() in -l%s... ", $func, $lib); + } my $result; if ($func) { @@ -510,4 +498,3 @@ MAKE_FRAG } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXSLT-2.000000/lib/XML/LibXSLT/Quick.pm new/XML-LibXSLT-2.002000/lib/XML/LibXSLT/Quick.pm --- old/XML-LibXSLT-2.000000/lib/XML/LibXSLT/Quick.pm 2022-04-09 08:10:42.000000000 +0200 +++ new/XML-LibXSLT-2.002000/lib/XML/LibXSLT/Quick.pm 2022-05-17 19:35:12.000000000 +0200 @@ -12,7 +12,7 @@ use vars qw( $VERSION ); -$VERSION = '2.000000'; +$VERSION = '2.002000'; sub stylesheet { @@ -92,12 +92,17 @@ my $stylesheet = $self->stylesheet(); my $ret; + my $params = {}; if ( ref($source) eq '' ) { $source = $xml_parser->parse_string($source); } elsif ( ref($source) eq 'HASH' ) { + if ( my $p = $source->{'params'} ) + { + $params = $p; + } my $type = $source->{type}; if (0) { @@ -106,14 +111,18 @@ { $source = $xml_parser->parse_file( $source->{path} ); } + elsif ( $type eq "string" ) + { + $source = $xml_parser->parse_string( $source->{string} ); + } else { Carp::confess("unknown source type"); } } - my $results = $stylesheet->transform( $source, ); - my $calc_ret = sub { - return ( $ret //= $stylesheet->output_as_chars( $results, ) ); + my $dom_results = $stylesheet->transform( $source, %$params, ); + my $calc_ret = sub { + return ( $ret //= $stylesheet->output_as_chars( $dom_results, ) ); }; my $destref = ref($dest); if ( $destref eq "SCALAR" ) @@ -137,7 +146,7 @@ } elsif ( $type eq "dom" ) { - return $results; + return $dom_results; } elsif ( $type eq "file" ) { @@ -185,9 +194,11 @@ __END__ +=encoding utf8 + =head1 NAME -XML::LibXSLT::Quick - a quicker interface to XML::LibXSLT +XML::LibXSLT::Quick - an easier to use (= "quicker") interface to XML::LibXSLT =head1 SYNOPSIS @@ -202,13 +213,17 @@ type => 'file', path => $out_fn, }, - $source, + $xml1_text, ); =head1 DESCRIPTION This is a module that wraps L<XML::LibXSLT> with an easier to use interface. +It can be used to process XML documents using +L<XSLT (Extensible Stylesheet Language Transformations)|https://en.wikipedia.org/wiki/XSLT> +stylesheets. + =head1 METHODS =head2 XML::LibXSLT::Quick->new({ location=>"./xslt/my.xslt", }); @@ -229,6 +244,24 @@ See C<t/using-quick-wrapper.t> . +$dest can be: + +C<\$my_string_var> + +C<<< {type => 'dom', } >>> - the DOM will be returned. + +C<<< {type => 'path', path => $filepath, } >>> - the output string will be written to $filepath . + +C<<< {type => 'return', } >>> - the output string will be returned. + +$source can be: + +A string. + +C<<< {type => 'file', path => $filepath, params => +{}, } >>> - the file will be parsed. + +C<<< {type => 'string', string => $my_xml_string, params => +{}, } >>> - the string will be parsed. + =head2 $obj->output_as_chars($dom) =head2 $obj->transform(...) @@ -243,4 +276,51 @@ L<XML::LibXSLT> - used as the backend of this module. +=head1 COPYRIGHT & LICENSE + +B<NOTE!!! :> this licence applies to this file alone. The blanket licence +for the distribution is "same as Perl 5". + +(I??am not a lawyer (= "IANAL")??/ etc. ) + +For more information, consult: + +=over 4 + +=item * L<https://www.shlomifish.org/philosophy/computers/open-source/foss-licences-wars/rev2/#which-licence-same-as-perl> + +=item * L<https://github.com/shlomif/perl-XML-LibXSLT/issues/5> + +=item * L<https://en.wikiquote.org/w/index.php?title=Rick_Cook&oldid=3060266> + +???Programming today is a race between software engineers striving to build bigger and better idiot-proof programs, and the Universe trying to produce bigger and better idiots. So far, the Universe is winning.??? + +=back + +Copyright 2022 by Shlomi Fish + +This program is distributed under the MIT / Expat License: +L<http://www.opensource.org/licenses/mit-license.php> + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + =cut diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXSLT-2.000000/lib/XML/LibXSLT.pm new/XML-LibXSLT-2.002000/lib/XML/LibXSLT.pm --- old/XML-LibXSLT-2.000000/lib/XML/LibXSLT.pm 2022-04-09 08:11:05.000000000 +0200 +++ new/XML-LibXSLT-2.002000/lib/XML/LibXSLT.pm 2022-05-17 19:36:05.000000000 +0200 @@ -30,7 +30,7 @@ require Exporter; - $VERSION = '2.000000'; + $VERSION = '2.002000'; require DynaLoader; @@ -1216,9 +1216,11 @@ Security callbacks implementation contributed by Shane Corgatelli. +Petr Pajas , pa...@matfyz.org + =head1 MAINTAINER -Petr Pajas , pa...@matfyz.org +Shlomi Fish, L<https://www.shlomifish.org/me/contact-me/> . =head1 BUGS @@ -1228,6 +1230,6 @@ =head1 SEE ALSO -XML::LibXML +L<XML::LibXML> , L<XML::LibXSLT::Quick> . =cut diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXSLT-2.000000/scripts/tag-release.pl new/XML-LibXSLT-2.002000/scripts/tag-release.pl --- old/XML-LibXSLT-2.000000/scripts/tag-release.pl 2020-01-14 13:07:35.000000000 +0100 +++ new/XML-LibXSLT-2.002000/scripts/tag-release.pl 2022-05-16 04:25:47.000000000 +0200 @@ -3,20 +3,21 @@ use strict; use warnings; -use IO::All qw/ io /; +use Path::Tiny qw/ path /; my ($version) = ( map { m{\$VERSION *= *'([^']+)'} ? ($1) : () } - io->file('LibXSLT.pm')->getlines() ); + path('lib/XML/LibXSLT.pm')->lines_utf8() ); if ( !defined($version) ) { die "Version is undefined!"; } -my @cmd = ( - "git", "tag", "-m", "Tagging the XML-LibXSLT release as $version", - "XML-LibXSLT-$version", +my $DIST = "XML-LibXSLT"; +my @cmd = ( + "git", "tag", "-m", "Tagging the $DIST release as $version", + "${DIST}-$version", ); print join( " ", map { /\s/ ? qq{"$_"} : $_ } @cmd ), "\n"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXSLT-2.000000/t/using-quick-wrapper.t new/XML-LibXSLT-2.002000/t/using-quick-wrapper.t --- old/XML-LibXSLT-2.000000/t/using-quick-wrapper.t 2022-04-09 06:38:04.000000000 +0200 +++ new/XML-LibXSLT-2.002000/t/using-quick-wrapper.t 2022-05-17 17:43:42.000000000 +0200 @@ -3,7 +3,7 @@ use warnings; use autodie; -use Test::More tests => 20; +use Test::More tests => 29; use XML::LibXML (); use XML::LibXSLT (); @@ -60,6 +60,7 @@ } my $expected_output; +my $param_expected_output; { my $xslt_parser = XML::LibXSLT->new(); my $stylesheet = XML::LibXSLT::Quick->new( @@ -76,6 +77,25 @@ # TEST ok( $out1, 'output' ); } +{ + my $xslt_parser = XML::LibXSLT->new(); + my $stylesheet = XML::LibXSLT::Quick->new( + { + xslt_parser => $xslt_parser, + location => 'example/1.xsl', + } + ); + my $results = $stylesheet->transform( $xml1_dom, 'yearfrom' => "'1999'", ); + my $out1 = $stylesheet->output_as_chars($results); + + $param_expected_output = $out1; + + # TEST + ok( $out1, 'output' ); +} + +# TEST +isnt( $expected_output, $param_expected_output, "non-identical", ); { my $stylesheet = @@ -102,9 +122,17 @@ path => $fn, } }, + +{ + name => 'params from str', + source => +{ + type => 'string', + string => $xml1_text, + } + }, ) { - # TEST:FILTER(MULT(3)) + # TEST*2 + # TEST:FILTER(MULT(4)) my $name = $rec->{name}; my $source = $rec->{source}; { @@ -136,21 +164,45 @@ my $stylesheet = XML::LibXSLT::Quick->new( { location => 'example/1.xsl', } ); my $out_fn = 'foo.xml'; - $stylesheet->generic_transform( - +{ - type => 'file', - path => $out_fn, - - }, - $source, - ); - - my $out_str = _utf8_slurp($out_fn); - - # TEST - is( $out_str, $expected_output, - "generic_transform() : ${name} -> file path name" ); - unlink($out_fn); + { + $stylesheet->generic_transform( + +{ + type => 'file', + path => $out_fn, + + }, + $source, + ); + + my $out_str = _utf8_slurp($out_fn); + + # TEST + is( $out_str, $expected_output, + "generic_transform() : ${name} -> file path name" ); + unlink($out_fn); + } + if ( ( $name eq 'from file' ) or ( $name eq 'params from str' ) ) + { + $out_fn = 'pppp0.xml'; + $stylesheet->generic_transform( + +{ + type => 'file', + path => $out_fn, + }, + +{ + %$source, + params => +{ + 'yearfrom' => "'1999'", + }, + }, + ); + + my $out_str = _utf8_slurp($out_fn); + + is( $out_str, $param_expected_output, + "generic_transform() : ${name} -> file path name" ); + unlink($out_fn); + } } { @@ -189,8 +241,29 @@ } __END__ +=encoding utf8 + =head1 COPYRIGHT & LICENSE +B<NOTE!!! :> this licence applies to this file alone. The blanket licence +for the distribution is "same as Perl 5". + +(I??am not a lawyer (= "IANAL")??/ etc. ) + +For more information, consult: + +=over 4 + +=item * L<https://www.shlomifish.org/philosophy/computers/open-source/foss-licences-wars/rev2/#which-licence-same-as-perl> + +=item * L<https://github.com/shlomif/perl-XML-LibXSLT/issues/5> + +=item * L<https://en.wikiquote.org/w/index.php?title=Rick_Cook&oldid=3060266> + +???Programming today is a race between software engineers striving to build bigger and better idiot-proof programs, and the Universe trying to produce bigger and better idiots. So far, the Universe is winning.??? + +=back + Copyright 2022 by Shlomi Fish This program is distributed under the MIT / Expat License: