r61956 - in /trunk/libdata-phrasebook-perl: ./ debian/ examples/ lib/Data/ lib/Data/Phrasebook/ lib/Data/Phrasebook/Loader/ lib/Data/Phrasebook/SQL/ t/
periapt-guest at users.alioth.debian.org
periapt-guest at users.alioth.debian.org
Tue Aug 24 08:35:45 UTC 2010
Author: periapt-guest
Date: Tue Aug 24 08:35:24 2010
New Revision: 61956
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=61956
Log:
New upstream release
Added:
trunk/libdata-phrasebook-perl/META.json
- copied unchanged from r61955, branches/upstream/libdata-phrasebook-perl/current/META.json
trunk/libdata-phrasebook-perl/t/95changedate.t
- copied unchanged from r61955, branches/upstream/libdata-phrasebook-perl/current/t/95changedate.t
trunk/libdata-phrasebook-perl/t/96metatest.t
- copied unchanged from r61955, branches/upstream/libdata-phrasebook-perl/current/t/96metatest.t
Removed:
trunk/libdata-phrasebook-perl/Artistic
trunk/libdata-phrasebook-perl/COPYING
Modified:
trunk/libdata-phrasebook-perl/Changes
trunk/libdata-phrasebook-perl/LICENSE
trunk/libdata-phrasebook-perl/MANIFEST
trunk/libdata-phrasebook-perl/META.yml
trunk/libdata-phrasebook-perl/Makefile.PL
trunk/libdata-phrasebook-perl/README
trunk/libdata-phrasebook-perl/debian/changelog
trunk/libdata-phrasebook-perl/examples/examples.txt
trunk/libdata-phrasebook-perl/lib/Data/Phrasebook.pm
trunk/libdata-phrasebook-perl/lib/Data/Phrasebook/Debug.pm
trunk/libdata-phrasebook-perl/lib/Data/Phrasebook/Generic.pm
trunk/libdata-phrasebook-perl/lib/Data/Phrasebook/Loader.pm
trunk/libdata-phrasebook-perl/lib/Data/Phrasebook/Loader/Base.pm
trunk/libdata-phrasebook-perl/lib/Data/Phrasebook/Loader/Text.pm
trunk/libdata-phrasebook-perl/lib/Data/Phrasebook/Plain.pm
trunk/libdata-phrasebook-perl/lib/Data/Phrasebook/SQL.pm
trunk/libdata-phrasebook-perl/lib/Data/Phrasebook/SQL/Query.pm
trunk/libdata-phrasebook-perl/t/90podtest.t
trunk/libdata-phrasebook-perl/t/91podcover.t
trunk/libdata-phrasebook-perl/t/94metatest.t
Modified: trunk/libdata-phrasebook-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-phrasebook-perl/Changes?rev=61956&op=diff
==============================================================================
--- trunk/libdata-phrasebook-perl/Changes (original)
+++ trunk/libdata-phrasebook-perl/Changes Tue Aug 24 08:35:24 2010
@@ -1,4 +1,11 @@
# Changes log for Data::Phrasebook
+
+0.30 20/08/2010
+ - removed 5.006 dependency
+ - upgrade to Test::CPAN::Meta.
+ - added META.json
+ - minor code clean
+ - now released under the Artistic License v2.
0.29 02/03/2007
- RT#25089 - if delimiters are set via new(), the default settings no
@@ -39,39 +46,39 @@
replacement of parameters as well as binding of parameters.
(Thanks to Tielman De Villiers for the idea and the code examples)
-0.24 22 Sep 2005
+0.24 22/09/2005
- Added sorting to keywords() for Text.pm loader.
-0.23 09 Aug 2005
+0.23 09/08/2005
- Fixed fetch/execute code in Query.pm (Tielman De Villiers)
- provide support for returning the list of keywords available.
-0.22 13 Jun 2005
+0.22 13/06/2005
- POD suggestions (Jon Allen).
- delimiters now a generic class behaviour.
- provide support for returning the list of dictionaries available
(suggested by Jon Allen).
-0.21 13 May 2005
+0.21 13/05/2005
- More POD to explain Classes and Dictionaries.
- file & dictionary reloading.
- DESTROY bug fix in SQL/Query.pm (Ray Miller).
- Aligned versions, just to make life easy.
-0.20 03 Mar 2005
+0.20 03/03/2005
- POD updates.
-0.19 02 Mar 2005
+0.19 02/03/2005
- Removed Test::MockObject from tests. No longer needed.
-0.18 01 Mar 2005
+0.18 01/03/2005
- Name change from Phrasebook to Data::Phrasebook.
- Loader now uses Module::Pluggable due to ease of use and the fact
that Class::MethodMaker now regularly fails on Win32.
- Removed Class::WhiteHole.
- Major documentation overhaul.
-0.17 09 Feb 2004
+0.17 09/02/2004
- New maintainer - Barbie - as of 31 Jan 2003.
- Default loader, YAML, now a separate distribution.
- Default loader is now plain text. This was done to minimise the
@@ -80,7 +87,7 @@
- dictionary/section setting now implemented as:
Phrasebook->new( dict => 'NEW' );
-0.16 3 Aug 2003
+0.16 03/08/2003
- Fixed execution logic.
- Take the right number of arguments off the stack.
- A bit more elegant at getting the method's name.
@@ -88,7 +95,7 @@
- Documentation fixed regarded some implementations.
- No tabs.
-0.15 27 July 2003
+0.15 27/07/2003
- Abstracted the loader aspect.
- Changed default Plain delimiters to match TT.
- Added facility to let one change delimiters.
@@ -103,9 +110,9 @@
- Add strict+warnings.
- Fix variable name.
-0.14 25 July 2003
+0.14 25/07/2003
- Added versions to everything.
- Added WhiteHole to generic.pm to catch wayward methods.
-0.13 25 July 2003
+0.13 25/07/2003
- Initial release.
Modified: trunk/libdata-phrasebook-perl/LICENSE
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-phrasebook-perl/LICENSE?rev=61956&op=diff
==============================================================================
--- trunk/libdata-phrasebook-perl/LICENSE (original)
+++ trunk/libdata-phrasebook-perl/LICENSE Tue Aug 24 08:35:24 2010
@@ -1,12 +1,7 @@
LICENSE FOR Data-Phrasebook
Copyright © 2003 Iain Truskett.
-Copyright © 2004-2007 Barbie for Miss Barbell Productions.
+Copyright © 2004-2010 Barbie for Miss Barbell Productions.
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself.
-
-The full text of the licenses can be found in the Artistic and
-COPYING files included with this module, or in perlartistic and
-perlgpl in Perl 5.8.1 or later.
-
+This module is free software; you can redistribute it and/or
+modify it under the Artistic Licence v2.
Modified: trunk/libdata-phrasebook-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-phrasebook-perl/MANIFEST?rev=61956&op=diff
==============================================================================
--- trunk/libdata-phrasebook-perl/MANIFEST (original)
+++ trunk/libdata-phrasebook-perl/MANIFEST Tue Aug 24 08:35:24 2010
@@ -1,5 +1,3 @@
-Artistic
-COPYING
ChangeLog
Changes
INSTALL
@@ -7,6 +5,7 @@
MANIFEST
MANIFEST.SKIP
META.yml
+META.json
Makefile.PL
README
examples/examples.txt
@@ -36,6 +35,8 @@
t/90podtest.t
t/91podcover.t
t/94metatest.t
+t/95changedate.t
+t/96metatest.t
t/lib/BookDB.pm
t/lib/Data/Phrasebook/Loader/Fake.pm
t/lib/MyClass.pm
Modified: trunk/libdata-phrasebook-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-phrasebook-perl/META.yml?rev=61956&op=diff
==============================================================================
--- trunk/libdata-phrasebook-perl/META.yml (original)
+++ trunk/libdata-phrasebook-perl/META.yml Tue Aug 24 08:35:24 2010
@@ -1,11 +1,11 @@
--- #YAML:1.0
name: Data-Phrasebook
-version: 0.29
+version: 0.30
abstract: A collection of modules for accessing phrasebooks from various data sources.
author:
- Barbie <barbie at cpan.org>
-license: gpl
+license: artistic_2
distribution_type: module
installdirs: site
@@ -13,41 +13,42 @@
Module::Pluggable: 2.7
Test::More: 0.47
recommends:
- Test::More: 0.47
+ Test::More: 0.70
Test::Pod: 1.00
Test::Pod::Coverage: 0.08
- Test::YAML::Meta: 0
+ Test::CPAN::Meta: 0.13
+ Test::CPAN::Meta: 0.08
build_requires:
Test::More: 0.47
provides:
Data::Phrasebook:
file: lib/Data/Phrasebook.pm
- version: 0.29
+ version: 0.30
Data::Phrasebook::Debug:
file: lib/Data/Phrasebook/Debug.pm
- version: 0.29
+ version: 0.30
Data::Phrasebook::Generic:
file: lib/Data/Phrasebook/Generic.pm
- version: 0.29
+ version: 0.30
Data::Phrasebook::Loader:
file: lib/Data/Phrasebook/Loader.pm
- version: 0.29
+ version: 0.30
Data::Phrasebook::Loader::Base:
file: lib/Data/Phrasebook/Loader/Base.pm
- version: 0.29
+ version: 0.30
Data::Phrasebook::Loader::Text:
file: lib/Data/Phrasebook/Loader/Text.pm
- version: 0.29
+ version: 0.30
Data::Phrasebook::Plain:
file: lib/Data/Phrasebook/Plain.pm
- version: 0.29
+ version: 0.30
Data::Phrasebook::SQL:
file: lib/Data/Phrasebook/SQL.pm
- version: 0.29
+ version: 0.30
Data::Phrasebook::SQL::Query:
file: lib/Data/Phrasebook/SQL/Query.pm
- version: 0.29
+ version: 0.30
no_index:
directory:
- t
Modified: trunk/libdata-phrasebook-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-phrasebook-perl/Makefile.PL?rev=61956&op=diff
==============================================================================
--- trunk/libdata-phrasebook-perl/Makefile.PL (original)
+++ trunk/libdata-phrasebook-perl/Makefile.PL Tue Aug 24 08:35:24 2010
@@ -6,7 +6,7 @@
'Module::Pluggable' => '2.7',
'Test::More' => '0.47',
},
- NO_META => 1,
+ NO_META => 1,
($] >= 5.005 ?
(ABSTRACT_FROM => 'lib/Data/Phrasebook.pm',
Modified: trunk/libdata-phrasebook-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-phrasebook-perl/README?rev=61956&op=diff
==============================================================================
--- trunk/libdata-phrasebook-perl/README (original)
+++ trunk/libdata-phrasebook-perl/README Tue Aug 24 08:35:24 2010
@@ -29,6 +29,7 @@
Test::Pod >= 1.00
Test::Pod::Coverage >= 0.08
Pod::Coverage
+ Test::CPAN::Meta >= 0.12
INSTALLATION
@@ -76,7 +77,7 @@
COPYRIGHT AND LICENSE
- Copyright (C) 2004-2006 Barbie for Miss Barbell Productions.
+ Copyright (C) 2004-2010 Barbie for Miss Barbell Productions.
Copyright (C) 2003 Iain Truskett.
This module is free software; you can redistribute it and/or
Modified: trunk/libdata-phrasebook-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-phrasebook-perl/debian/changelog?rev=61956&op=diff
==============================================================================
--- trunk/libdata-phrasebook-perl/debian/changelog (original)
+++ trunk/libdata-phrasebook-perl/debian/changelog Tue Aug 24 08:35:24 2010
@@ -1,3 +1,9 @@
+libdata-phrasebook-perl (0.30-1) UNRELEASED; urgency=low
+
+ * New upstream release
+
+ -- Nicholas Bamber <nicholas at periapt.co.uk> Tue, 24 Aug 2010 09:34:04 +0100
+
libdata-phrasebook-perl (0.29-1) unstable; urgency=low
[ Nicholas Bamber ]
Modified: trunk/libdata-phrasebook-perl/examples/examples.txt
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-phrasebook-perl/examples/examples.txt?rev=61956&op=diff
==============================================================================
--- trunk/libdata-phrasebook-perl/examples/examples.txt (original)
+++ trunk/libdata-phrasebook-perl/examples/examples.txt Tue Aug 24 08:35:24 2010
@@ -1,5 +1,5 @@
To see examples for this distribution, it is recommended you read the test
-scripts included under ./t, which cover basic phrasebooks and SQL phrasebooks.
+scripts included under ./t, which cover the basic usage of the modules.
I may add further examples should the need ever arise. If you have any example
scripts that use the distribution in an unusual way or make good use of all the
Modified: trunk/libdata-phrasebook-perl/lib/Data/Phrasebook.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-phrasebook-perl/lib/Data/Phrasebook.pm?rev=61956&op=diff
==============================================================================
--- trunk/libdata-phrasebook-perl/lib/Data/Phrasebook.pm (original)
+++ trunk/libdata-phrasebook-perl/lib/Data/Phrasebook.pm Tue Aug 24 08:35:24 2010
@@ -4,7 +4,8 @@
use base qw( Data::Phrasebook::Debug );
use Carp qw( croak );
-our $VERSION = '0.29';
+use vars qw($VERSION);
+$VERSION = '0.30';
=head1 NAME
@@ -64,7 +65,7 @@
The SQL class allows specific database handling. Phrases are retrieved via the
query() method. The query() method internally retrieves the SQL phrase, then
-returns the statement handler object, which the user can then perform a
+returns the statement handler object, which the user can then perform a
prepare/execute/fetch/finish sequence on. For more details see
Data::Phrasebook::SQL.
@@ -111,8 +112,7 @@
=cut
-sub new
-{
+sub new {
my $class = shift;
my %args = @_;
@@ -172,7 +172,7 @@
platform=Windows
The phrasebook object is then created and used as:
-
+
my $q = Data::Phrasebook->new(
class => 'Plain',
loader => 'Ini',
@@ -201,7 +201,7 @@
=head2 Multiple Dictionaries
-As of version 0.25, the ability to provide prescendence over multiple
+As of version 0.25, the ability to provide prescendence over multiple
dictionaries for the same phrasebook. Using Data::Phrasebook::Loader::Ini
again as an example, the phrasebook might be laid out as:
@@ -218,7 +218,7 @@
platform=Windows
The phrasebook object is then created and used as:
-
+
my $q = Data::Phrasebook->new(
class => 'Plain',
loader => 'Ini',
@@ -230,7 +230,7 @@
my $platform = $q->fetch('platform'); # retrieves 'Windows'
my $network = $q->fetch('nework'); # retrieves 'WLAN'
-The first dictionary, if not specified and supported by the Loader module, is
+The first dictionary, if not specified and supported by the Loader module, is
still used as the default dictionary.
The dictionaries can be specified, or reordered, using the object method:
@@ -241,12 +241,12 @@
=head1 DEDICATION
-Much of the work original class framework is from Iain's original code. My
-code was alot simpler and was tied to using just an INI data source. Merging
+Much of the work original class framework is from Iain's original code. My
+code was alot simpler and was tied to using just an INI data source. Merging
all the ideas and code together we came up with this distribution.
Unfortunately Iain died in December 2003, so he never got to see or play
-with the final working version. I can only thank him for his thoughts and
+with the final working version. I can only thank him for his thoughts and
ideas in getting this distribution into a state worthy of release.
Iain Campbell Truskett (16.07.1979 - 29.12.2003)
@@ -283,13 +283,9 @@
=head1 COPYRIGHT AND LICENSE
Copyright (C) 2003 Iain Truskett.
- Copyright (C) 2004-2007 Barbie for Miss Barbell Productions.
-
- This library is free software; you can redistribute it and/or modify
- it under the same terms as Perl itself.
-
-The full text of the licenses can be found in the F<Artistic> and
-F<COPYING> files included with this module, or in L<perlartistic> and
-L<perlgpl> in Perl 5.8.1 or later.
+ Copyright (C) 2004-2010 Barbie for Miss Barbell Productions.
+
+ This module is free software; you can redistribute it and/or
+ modify it under the Artistic Licence v2.
=cut
Modified: trunk/libdata-phrasebook-perl/lib/Data/Phrasebook/Debug.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-phrasebook-perl/lib/Data/Phrasebook/Debug.pm?rev=61956&op=diff
==============================================================================
--- trunk/libdata-phrasebook-perl/lib/Data/Phrasebook/Debug.pm (original)
+++ trunk/libdata-phrasebook-perl/lib/Data/Phrasebook/Debug.pm Tue Aug 24 08:35:24 2010
@@ -3,7 +3,8 @@
use warnings FATAL => 'all';
use Carp qw( croak );
-our $VERSION = '0.29';
+use vars qw($VERSION);
+$VERSION = '0.30';
=head1 NAME
@@ -44,7 +45,7 @@
The first three are simple strings that are recorded during the processing.
However, the latter is specifically for dumping the contents of significant
-variables.
+variables.
Through the use of the debug() method, the debugging can be switched on and
off at significant points. The clear() method will clear the current trail of
@@ -63,8 +64,7 @@
=cut
-sub debug
-{
+sub debug {
my $self = shift;
return @_ ? $debug = shift : $debug;
}
@@ -75,8 +75,7 @@
=cut
-sub clear
-{
+sub clear {
return @debug = ();
}
@@ -86,8 +85,7 @@
=cut
-sub store
-{
+sub store {
return unless($debug);
my ($self, $id, @args) = @_;
@@ -103,8 +101,7 @@
=cut
-sub retrieve
-{
+sub retrieve {
my $self = shift;
my $id = shift || 1;
@@ -117,8 +114,7 @@
=cut
-sub dumper
-{
+sub dumper {
my $self = shift;
my $dump = 'Data::Dumper';
if(eval { require $dump }) {
@@ -147,13 +143,9 @@
=head1 COPYRIGHT AND LICENSE
- Copyright (C) 2004-2007 Barbie for Miss Barbell Productions.
+ Copyright (C) 2004-2010 Barbie for Miss Barbell Productions.
- This module is free software; you can redistribute it and/or
- modify it under the same terms as Perl itself.
-
-The full text of the licenses can be found in the F<Artistic> and
-F<COPYING> files included with this module, or in L<perlartistic> and
-L<perlgpl> in Perl 5.8.1 or later.
+ This module is free software; you can redistribute it and/or
+ modify it under the Artistic Licence v2.
=cut
Modified: trunk/libdata-phrasebook-perl/lib/Data/Phrasebook/Generic.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-phrasebook-perl/lib/Data/Phrasebook/Generic.pm?rev=61956&op=diff
==============================================================================
--- trunk/libdata-phrasebook-perl/lib/Data/Phrasebook/Generic.pm (original)
+++ trunk/libdata-phrasebook-perl/lib/Data/Phrasebook/Generic.pm Tue Aug 24 08:35:24 2010
@@ -5,7 +5,8 @@
use base qw( Data::Phrasebook::Debug );
use Carp qw( croak );
-our $VERSION = '0.29';
+use vars qw($VERSION);
+$VERSION = '0.30';
=head1 NAME
@@ -57,7 +58,7 @@
my $self = bless {}, $class;
- # set default delimiters, in case custom delimiters
+ # set default delimiters, in case custom delimiters
# are provided in the hash
$self->{delimiters} = qr{ :(\w+) }x;
@@ -171,7 +172,7 @@
my @dicts = $pb->dicts( $path );
-=cut
+=cut
sub dicts {
my $self = shift;
@@ -196,7 +197,7 @@
=head2 keywords
Having instantiated the C<Data::Phrasebook> object class, using the C<dict>
-attribute as required, the object can return a list of the current keywords
+attribute as required, the object can return a list of the current keywords
available (provided the plugin supports it) as:
my $pb = Data::Phrasebook->new(
@@ -214,7 +215,7 @@
Note the list will be a combination of the default and any named dictionary.
However, not all Loader plugins may support the second usage.
-=cut
+=cut
sub keywords {
my $self = shift;
@@ -238,7 +239,7 @@
=head2 data
-Loads the data source, if not already loaded, and returns the data block
+Loads the data source, if not already loaded, and returns the data block
associated with the given key.
my $data = $self->data($key);
@@ -247,8 +248,7 @@
=cut
-sub data
-{
+sub data {
my $self = shift;
my $id = shift;
@@ -304,7 +304,7 @@
=head1 SEE ALSO
-L<Data::Phrasebook>,
+L<Data::Phrasebook>,
L<Data::Phrasebook::Loader>.
=head1 SUPPORT
@@ -320,13 +320,9 @@
=head1 COPYRIGHT AND LICENSE
Copyright (C) 2003 Iain Truskett.
- Copyright (C) 2004-2007 Barbie for Miss Barbell Productions.
-
- This library is free software; you can redistribute it and/or modify
- it under the same terms as Perl itself.
-
-The full text of the licenses can be found in the F<Artistic> and
-F<COPYING> files included with this module, or in L<perlartistic> and
-L<perlgpl> in Perl 5.8.1 or later.
-
-=cut
+ Copyright (C) 2004-2010 Barbie for Miss Barbell Productions.
+
+ This module is free software; you can redistribute it and/or
+ modify it under the Artistic Licence v2.
+
+=cut
Modified: trunk/libdata-phrasebook-perl/lib/Data/Phrasebook/Loader.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-phrasebook-perl/lib/Data/Phrasebook/Loader.pm?rev=61956&op=diff
==============================================================================
--- trunk/libdata-phrasebook-perl/lib/Data/Phrasebook/Loader.pm (original)
+++ trunk/libdata-phrasebook-perl/lib/Data/Phrasebook/Loader.pm Tue Aug 24 08:35:24 2010
@@ -6,7 +6,8 @@
use Module::Pluggable search_path => ['Data::Phrasebook::Loader'];
-our $VERSION = '0.29';
+use vars qw($VERSION);
+$VERSION = '0.30';
=head1 NAME
@@ -97,13 +98,9 @@
=head1 COPYRIGHT AND LICENSE
Copyright (C) 2003 Iain Truskett.
- Copyright (C) 2004-2007 Barbie for Miss Barbell Productions.
+ Copyright (C) 2004-2010 Barbie for Miss Barbell Productions.
- This library is free software; you can redistribute it and/or modify
- it under the same terms as Perl itself.
-
-The full text of the licenses can be found in the F<Artistic> and
-F<COPYING> files included with this module, or in L<perlartistic> and
-L<perlgpl> in Perl 5.8.1 or later.
+ This module is free software; you can redistribute it and/or
+ modify it under the Artistic Licence v2.
=cut
Modified: trunk/libdata-phrasebook-perl/lib/Data/Phrasebook/Loader/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-phrasebook-perl/lib/Data/Phrasebook/Loader/Base.pm?rev=61956&op=diff
==============================================================================
--- trunk/libdata-phrasebook-perl/lib/Data/Phrasebook/Loader/Base.pm (original)
+++ trunk/libdata-phrasebook-perl/lib/Data/Phrasebook/Loader/Base.pm Tue Aug 24 08:35:24 2010
@@ -4,9 +4,8 @@
use base qw( Data::Phrasebook::Debug );
use Carp qw( croak );
-our $VERSION = '0.29';
-
-my $something = 0;
+use vars qw($VERSION);
+$VERSION = '0.30';
=head1 NAME
@@ -18,8 +17,12 @@
=head1 DESCRIPTION
-C<Data::Phrasebook::Loader::Base> acts as a base class for phrasebook
+C<Data::Phrasebook::Loader::Base> acts as a base class for phrasebook
plugins.
+
+=cut
+
+my $something = 0;
=head1 CONSTRUCTOR
@@ -94,13 +97,9 @@
=head1 COPYRIGHT AND LICENSE
- Copyright (C) 2004-2007 Barbie for Miss Barbell Productions.
+ Copyright (C) 2004-2010 Barbie for Miss Barbell Productions.
- This module is free software; you can redistribute it and/or
- modify it under the same terms as Perl itself.
-
-The full text of the licenses can be found in the F<Artistic> and
-F<COPYING> files included with this module, or in L<perlartistic> and
-L<perlgpl> in Perl 5.8.1 or later.
+ This module is free software; you can redistribute it and/or
+ modify it under the Artistic Licence v2.
=cut
Modified: trunk/libdata-phrasebook-perl/lib/Data/Phrasebook/Loader/Text.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-phrasebook-perl/lib/Data/Phrasebook/Loader/Text.pm?rev=61956&op=diff
==============================================================================
--- trunk/libdata-phrasebook-perl/lib/Data/Phrasebook/Loader/Text.pm (original)
+++ trunk/libdata-phrasebook-perl/lib/Data/Phrasebook/Loader/Text.pm Tue Aug 24 08:35:24 2010
@@ -5,7 +5,8 @@
use Carp qw( croak );
use IO::File;
-our $VERSION = '0.29';
+use vars qw($VERSION);
+$VERSION = '0.30';
=head1 NAME
@@ -30,10 +31,10 @@
=head1 DESCRIPTION
-This loader plugin implements phrasebook patterns using plain text files.
-
-Phrases can be contained within one or more dictionaries, with each phrase
-accessible via a unique key. Phrases may contain placeholders, please see
+This loader plugin implements phrasebook patterns using plain text files.
+
+Phrases can be contained within one or more dictionaries, with each phrase
+accessible via a unique key. Phrases may contain placeholders, please see
L<Data::Phrasebook> for an explanation of how to use these. Groups of phrases
are kept in a dictionary. In this implementation a single file is one
complete dictionary.
@@ -42,7 +43,7 @@
foo=Welcome to :my world. It is a nice :place.
-Within the phrase text placeholders can be used, which are then replaced with
+Within the phrase text placeholders can be used, which are then replaced with
the appropriate values once the get() method is called. The default style of
placeholders can be altered using the delimiters() method.
@@ -160,7 +161,7 @@
=head2 keywords
Having instantiated the C<Data::Phrasebook> object class, using the C<file>
-and C<dict> attributes as required, the object can return a list of the
+and C<dict> attributes as required, the object can return a list of the
current keywords available as:
my $pb = Data::Phrasebook->new(
@@ -175,10 +176,10 @@
my @keywords = $pb->keywords( $path, $dict );
-Note that $path can either be the directory path, where $dict must be the
+Note that $path can either be the directory path, where $dict must be the
specific file name of the dictionary, or the full path of the dictionary file.
-In the second instance, the function will not load a dictionary, but can be
+In the second instance, the function will not load a dictionary, but can be
used to interrogate the contents of a known dictionary.
=cut
@@ -223,13 +224,9 @@
=head1 COPYRIGHT AND LICENSE
- Copyright (C) 2004-2007 Barbie for Miss Barbell Productions.
-
- This module is free software; you can redistribute it and/or
- modify it under the same terms as Perl itself.
-
-The full text of the licenses can be found in the F<Artistic> and
-F<COPYING> files included with this module, or in L<perlartistic> and
-L<perlgpl> in Perl 5.8.1 or later.
-
-=cut
+ Copyright (C) 2004-2010 Barbie for Miss Barbell Productions.
+
+ This module is free software; you can redistribute it and/or
+ modify it under the Artistic Licence v2.
+
+=cut
Modified: trunk/libdata-phrasebook-perl/lib/Data/Phrasebook/Plain.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-phrasebook-perl/lib/Data/Phrasebook/Plain.pm?rev=61956&op=diff
==============================================================================
--- trunk/libdata-phrasebook-perl/lib/Data/Phrasebook/Plain.pm (original)
+++ trunk/libdata-phrasebook-perl/lib/Data/Phrasebook/Plain.pm Tue Aug 24 08:35:24 2010
@@ -4,7 +4,8 @@
use base qw( Data::Phrasebook::Generic Data::Phrasebook::Debug );
use Carp qw( croak );
-our $VERSION = '0.29';
+use vars qw($VERSION);
+$VERSION = '0.30';
=head1 NAME
@@ -31,14 +32,14 @@
=head1 DESCRIPTION
-This module is the fallback or default phrasebook class. It doesn't do much
+This module is the fallback or default phrasebook class. It doesn't do much
except act as a very simple templating facility.
=head1 METHODS
=head2 fetch
-Retrieves the specified C<template> and substitutes any C<keywords> for
+Retrieves the specified C<template> and substitutes any C<keywords> for
C<values>.
Thus, given:
@@ -59,8 +60,7 @@
=cut
-sub fetch
-{
+sub fetch {
my $self = shift;
my ($id, $args) = @_;
@@ -90,7 +90,7 @@
=head1 SEE ALSO
-L<Data::Phrasebook>,
+L<Data::Phrasebook>,
L<Data::Phrasebook::Generic>.
=head1 SUPPORT
@@ -106,13 +106,9 @@
=head1 COPYRIGHT AND LICENSE
Copyright (C) 2003 Iain Truskett.
- Copyright (C) 2004-2007 Barbie for Miss Barbell Productions.
+ Copyright (C) 2004-2010 Barbie for Miss Barbell Productions.
- This library is free software; you can redistribute it and/or modify
- it under the same terms as Perl itself.
-
-The full text of the licenses can be found in the F<Artistic> and
-F<COPYING> files included with this module, or in L<perlartistic> and
-L<perlgpl> in Perl 5.8.1 or later.
+ This module is free software; you can redistribute it and/or
+ modify it under the Artistic Licence v2.
=cut
Modified: trunk/libdata-phrasebook-perl/lib/Data/Phrasebook/SQL.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-phrasebook-perl/lib/Data/Phrasebook/SQL.pm?rev=61956&op=diff
==============================================================================
--- trunk/libdata-phrasebook-perl/lib/Data/Phrasebook/SQL.pm (original)
+++ trunk/libdata-phrasebook-perl/lib/Data/Phrasebook/SQL.pm Tue Aug 24 08:35:24 2010
@@ -6,7 +6,8 @@
use Data::Phrasebook::SQL::Query;
-our $VERSION = '0.29';
+use vars qw($VERSION);
+$VERSION = '0.30';
=head1 NAME
@@ -49,7 +50,7 @@
=head2 new
-Not to be accessed directly, but via the parent L<Data::Phrasebook>, by
+Not to be accessed directly, but via the parent L<Data::Phrasebook>, by
specifying the class as SQL.
Additional arguments to those described in L<Data::Phrasebook::Generic> are:
@@ -77,7 +78,7 @@
=head2 query
-Constructs a L<Data::Phrasebook::SQL::Query> object from a template. Takes at
+Constructs a L<Data::Phrasebook::SQL::Query> object from a template. Takes at
least one argument, this being the identifier for the query. The identifier is
used as a key into the phrasebook C<file>. A second argument can be provided,
which is an optional hashref of key to value mappings.
@@ -110,16 +111,16 @@
In the above examples, the parameters are bound to the SQL using the bind
parameters functionality. This is more efficient in most cases where the
-same SQL is reused with different values for fields.
+same SQL is reused with different values for fields.
However, not all SQL statements just need to bind parameters, some may require
-the ability to replace parameters, such as a field list.
+the ability to replace parameters, such as a field list.
---
find_author:
sql: select :fields from books where author = :author
- my $q = $book->query( 'find_author',
+ my $q = $book->query( 'find_author',
replace => { fields => 'class,title,author' },
bind => { author => 'Lance Parkin' }
);
@@ -127,7 +128,7 @@
# sql = select class,title,author from books where author = ?
# args = 'Lance Parkin'
-In all instances, if the SQL template requested does not exist or has no
+In all instances, if the SQL template requested does not exist or has no
definition, then an error will be thrown.
Consult L<Data::Phrasebook::SQL::Query> for what you can then do with your
@@ -135,7 +136,7 @@
For reference: the bind hashref argument, if it is given, is given to the
query object's C<order_args> and then C<args> methods.
-
+
=cut
sub query {
@@ -200,7 +201,7 @@
$self->store(4,'->query order=['.join(',', at order).']');
$self->store(4,'->query params=['.$self->dumper($params).']');
}
-
+
my $q = Data::Phrasebook::SQL::Query->new(
sql => $sql,
order => \@order,
@@ -210,7 +211,6 @@
return $q;
}
-
1;
__END__
@@ -234,13 +234,9 @@
=head1 COPYRIGHT AND LICENSE
Copyright (C) 2003 Iain Truskett.
- Copyright (C) 2004-2007 Barbie for Miss Barbell Productions.
-
- This library is free software; you can redistribute it and/or modify
- it under the same terms as Perl itself.
-
-The full text of the licenses can be found in the F<Artistic> and
-F<COPYING> files included with this module, or in L<perlartistic> and
-L<perlgpl> in Perl 5.8.1 or later.
+ Copyright (C) 2004-2010 Barbie for Miss Barbell Productions.
+
+ This module is free software; you can redistribute it and/or
+ modify it under the Artistic Licence v2.
=cut
Modified: trunk/libdata-phrasebook-perl/lib/Data/Phrasebook/SQL/Query.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-phrasebook-perl/lib/Data/Phrasebook/SQL/Query.pm?rev=61956&op=diff
==============================================================================
--- trunk/libdata-phrasebook-perl/lib/Data/Phrasebook/SQL/Query.pm (original)
+++ trunk/libdata-phrasebook-perl/lib/Data/Phrasebook/SQL/Query.pm Tue Aug 24 08:35:24 2010
@@ -5,7 +5,8 @@
use vars qw( $AUTOLOAD );
use Carp qw( croak );
-our $VERSION = '0.29';
+use vars qw($VERSION);
+$VERSION = '0.30';
=head1 NAME
@@ -25,7 +26,7 @@
=head2 new
-Not to be accessed directly, but via the parent L<Data::Phrasebook>, by
+Not to be accessed directly, but via the parent L<Data::Phrasebook>, by
specifying the class as SQL.
=head1 METHODS
@@ -114,8 +115,7 @@
=cut
-sub execute
-{
+sub execute {
my $self = shift;
$self->store(3,"->execute IN: @_") if($self->debug);
my $sth = $self->sth;
@@ -140,8 +140,7 @@
=cut
-sub order_args
-{
+sub order_args {
my $self = shift;
my %args = (@_ == 1 ? %{$_[0]} : @_);
my @order = $self->order;
@@ -168,8 +167,7 @@
=cut
-sub prepare
-{
+sub prepare {
my $self = shift;
$self->store(3,"$self->prepare IN") if($self->debug);
my $sql = $self->sql;
@@ -190,8 +188,7 @@
=cut
-sub rebind
-{
+sub rebind {
my $self = shift;
my $sth = $self->sth;
my $args = $self->args;
@@ -217,16 +214,14 @@
#Any C<fetch*> methods will additionally call C<execute>
#unless the statement handle is already active.
-sub _call_other
-{
+sub _call_other {
my ($self, $execute, $method) = splice @_, 0, 3;
my $sth = $self->sth || $self->prepare();
$self->execute() if $execute and not $sth->{Active};
return $sth->$method( @_ );
}
-sub AUTOLOAD
-{
+sub AUTOLOAD {
my $self = shift;
my ($method) = $AUTOLOAD =~ /([^:]+)$/;
#print STDERR "\n#[$AUTOLOAD][$method]\n";
@@ -251,7 +246,7 @@
=head1 SEE ALSO
-L<Data::Phrasebook>,
+L<Data::Phrasebook>,
L<Data::Phrasebook::SQL>.
=head1 SUPPORT
@@ -267,13 +262,9 @@
=head1 COPYRIGHT AND LICENSE
Copyright (C) 2003 Iain Truskett.
- Copyright (C) 2004-2007 Barbie for Miss Barbell Productions.
-
- This library is free software; you can redistribute it and/or modify
- it under the same terms as Perl itself.
-
-The full text of the licenses can be found in the F<Artistic> and
-F<COPYING> files included with this module, or in L<perlartistic> and
-L<perlgpl> in Perl 5.8.1 or later.
-
-=cut
+ Copyright (C) 2004-2010 Barbie for Miss Barbell Productions.
+
+ This module is free software; you can redistribute it and/or
+ modify it under the Artistic Licence v2.
+
+=cut
Modified: trunk/libdata-phrasebook-perl/t/90podtest.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-phrasebook-perl/t/90podtest.t?rev=61956&op=diff
==============================================================================
--- trunk/libdata-phrasebook-perl/t/90podtest.t (original)
+++ trunk/libdata-phrasebook-perl/t/90podtest.t Tue Aug 24 08:35:24 2010
@@ -1,5 +1,9 @@
use Test::More;
+
+# Skip if doing a regular install
+plan skip_all => "Author tests not required for installation"
+ unless ( $ENV{AUTOMATED_TESTING} );
+
eval "use Test::Pod 1.00";
plan skip_all => "Test::Pod 1.00 required for testing POD" if $@;
all_pod_files_ok();
-
Modified: trunk/libdata-phrasebook-perl/t/91podcover.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-phrasebook-perl/t/91podcover.t?rev=61956&op=diff
==============================================================================
--- trunk/libdata-phrasebook-perl/t/91podcover.t (original)
+++ trunk/libdata-phrasebook-perl/t/91podcover.t Tue Aug 24 08:35:24 2010
@@ -1,4 +1,9 @@
use Test::More;
+
+# Skip if doing a regular install
+plan skip_all => "Author tests not required for installation"
+ unless ( $ENV{AUTOMATED_TESTING} );
+
eval "use Test::Pod::Coverage 0.08";
plan skip_all => "Test::Pod::Coverage 0.08 required for testing POD coverage" if $@;
all_pod_coverage_ok();
Modified: trunk/libdata-phrasebook-perl/t/94metatest.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-phrasebook-perl/t/94metatest.t?rev=61956&op=diff
==============================================================================
--- trunk/libdata-phrasebook-perl/t/94metatest.t (original)
+++ trunk/libdata-phrasebook-perl/t/94metatest.t Tue Aug 24 08:35:24 2010
@@ -1,6 +1,9 @@
use Test::More;
-eval "use Test::YAML::Meta";
-plan skip_all => "Test::YAML::Meta required for testing META.yml" if $@;
+
+# Skip if doing a regular install
+plan skip_all => "Author tests not required for installation"
+ unless ( $ENV{AUTOMATED_TESTING} );
+
+eval "use Test::CPAN::Meta 0.12";
+plan skip_all => "Test::CPAN::Meta 0.12 required for testing META.yml" if $@;
meta_yaml_ok();
-
-
More information about the Pkg-perl-cvs-commits
mailing list