This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch master
in repository libwww-shorten-perl.

commit 760af09a2f09481fcb50abd6cc8411a1e4e144bb
Author: gregor herrmann <gre...@debian.org>
Date:   Tue Dec 15 20:38:27 2015 +0100

    Imported Upstream version 3.08
---
 Build.PL                    |  47 ++-
 Changes                     | 976 ++++++++++++++++++++++++++++++--------------
 INSTALL                     |   1 -
 META.json                   |  20 +-
 META.yml                    |  43 +-
 Makefile.PL                 |   2 +-
 lib/WWW/Shorten.pm          |   8 +-
 lib/WWW/Shorten/Linkz.pm    |   6 +-
 lib/WWW/Shorten/TinyURL.pm  |  43 +-
 lib/WWW/Shorten/Tinylink.pm |   6 +-
 lib/WWW/Shorten/generic.pm  |  28 +-
 t/tinyurl.t                 |   9 +-
 12 files changed, 806 insertions(+), 383 deletions(-)

diff --git a/Build.PL b/Build.PL
index 3989bb1..04e7689 100644
--- a/Build.PL
+++ b/Build.PL
@@ -1,25 +1,34 @@
 use Module::Build;
 
 my $build = Module::Build->new(
-                              module_name => 'WWW::Shorten',
-                              license     => 'artistic_2',
-                              requires    => {
-                                 'perl'                => '5.006',
-                                 'LWP'                 => '5.75',
-                                 'LWP::UserAgent'      => '2.023',
-                                 'URI'                 => '1.27',
-                                 'Config::Auto'        => 0,
-                               },
-                              build_requires => {
-                                 'Test::More'          => '0.47',
-                               },
-                               build_recommends => {
-                                 'Test::Pod'           => 0,
-                                 'Test::Pod::Coverage' => 0,
-                                 'Test::Signature'     => 0,
-                               },               
-                              create_makefile_pl => 'traditional',
-                               script_files       => [ 'bin/shorten' ],
+    module_name => 'WWW::Shorten',
+    license     => 'artistic_2',
+    requires    => {
+        'perl'                => '5.006',
+        'LWP'                 => '5.75',
+        'LWP::UserAgent'      => '2.023',
+        'URI'                 => '1.27',
+        'Config::Auto'        => 0,
+    },
+    build_requires => {
+        'Test::More'          => '0.47',
+    },
+    build_recommends => {
+        'Test::Pod'           => 0,
+        'Test::Pod::Coverage' => 0,
+        'Test::Signature'     => 0,
+    },               
+    'meta_merge' => {
+        'keywords' => [
+            'short URL',
+            'shortening',
+        ],
+        'resources' => {
+            'repository' => 'https://github.com/davorg/www-shorten'
+        }
+    },
+    create_makefile_pl => 'traditional',
+        script_files       => [ 'bin/shorten' ],
 );
 
 $build->create_build_script;
diff --git a/Changes b/Changes
old mode 100755
new mode 100644
index d48fe41..49e46c9
--- a/Changes
+++ b/Changes
@@ -1,377 +1,749 @@
-www-shorten (0.1.1) unstable; urgency=low
+-------------------------------------------------------------------
+Tue Dec 15 14:54:14 CET 2015 - dav...@broadbean.com
 
-  * bin/shorten, lib/WWW/Shorten.pm, lib/WWW/Shorten/Metamark.pm,
-    t/00load_a.t, t/00load_b.t, t/00noexp.t, t/metamark.t,
-    t/newnames.t: Metamark is dead :-(
+- Bump version for release
+- commit a9b2ae0
 
- -- Dave Cross <d...@dave.org.uk>  Mon, 15 Sep 2014 21:30:35 +0100
+-------------------------------------------------------------------
+Tue Dec 15 14:49:08 CET 2015 - d...@dave.org.uk
 
-www-shorten (0.1.1) unstable; urgency=low
+- Better diagnostics
+- commit 85aa0ff
 
-  * lib/WWW/Shorten.pm: Typo in documentation.
-  * lib/WWW/Shorten.pm: Bump version for CPAN release.
-  * INSTALL: Updated the INSTALL instructions.
-  * t/tinyurl.t: (Possible) fix to the TinyURL test.
-  * README: Modernised README
-  * .travis.yml: Added .travis.yml
+-------------------------------------------------------------------
+Tue Dec 15 14:47:09 CET 2015 - d...@dave.org.uk
 
- -- Dave Cross <d...@dave.org.uk>  Tue, 6 May 2014 15:50:50 +0100
+- Added .gitignore
+- commit 35e5185
 
-www-shorten (0.1.1) unstable; urgency=low
+-------------------------------------------------------------------
+Tue Dec 15 14:22:36 CET 2015 - d...@dave.org.uk
 
-  * MANIFEST: Changes to reflect moved files.
-  * t/98pod-coverage.t, t/99pod.t, xt/98pod-coverage.t, xt/99pod.t:
-    Moved Pod tests into xt. (Pod coverage currently fails on some
-    files. See https://rt.cpan.org/Ticket/Display.html?id=87634 for
-    details.)
+- Fix some formatting that has been broken for a very long time.
+- commit 62dd0c0
 
- -- Dave Cross <d...@dave.org.uk>  Thu, 22 Aug 2013 12:00:16 +0100
+-------------------------------------------------------------------
+Fri Jul 17 18:21:04 CEST 2015 - d...@dave.org.uk
 
-www-shorten (0.1.1) unstable; urgency=low
+- Force another build.
+- commit 84ca8db
 
-  * lib/WWW/Shorten.pm: Bump version number for release.
-  * lib/WWW/Shorten/Linkz.pm, lib/WWW/Shorten/Metamark.pm,
-    lib/WWW/Shorten/TinyURL.pm, lib/WWW/Shorten/Tinylink.pm,
-    t/linkz.t, t/metamark.t, t/newnames.t, t/tinyurl.t: Removed
-    prototypes (and the ampersands in the tests that circumvented
-    them)
+-------------------------------------------------------------------
+Fri Jul 17 18:15:17 CEST 2015 - d...@dave.org.uk
 
- -- Dave Cross <d...@dave.org.uk>  Mon, 12 Nov 2012 16:40:29 +0000
+- Experimentally add coveralls.op and Devel::Cover support
+- commit eaa7f77
 
-www-shorten (0.1.1) unstable; urgency=low
+-------------------------------------------------------------------
+Thu Jun 11 09:32:04 CEST 2015 - alexcho...@gmail.com
 
-  * Artistic, Build.PL, COPYING, LICENCE, MANIFEST,
-    lib/WWW/Shorten.pm, lib/WWW/Shorten/UserAgent.pm: Licensing
-    clean-up.
-  * MANIFEST: Added META.json to MANIFEST.
+- better diagnostics in case of failure in tinyurl.t
+- commit a8659a0
 
- -- Dave Cross <d...@dave.org.uk>  Fri, 6 Apr 2012 17:40:42 +0100
+-------------------------------------------------------------------
+Sun May 24 23:45:41 CEST 2015 - alexcho...@gmail.com
 
-www-shorten (0.1.1) unstable; urgency=low
+- better META.yml
+- commit 1c764ba
 
-  * lib/WWW/Shorten/UserAgent.pm: Added documentation.
-  * MANIFEST, lib/WWW/Shorten/UserAgent.pm,
-    lib/WWW/Shorten/generic.pm: Added a WWW::Shorten::UserAgent object
-    which dies if it receives an HTTP error response.
+-------------------------------------------------------------------
+Sat Jan  3 16:07:07 CET 2015 - michiel.bei...@gmail.com
 
- -- Dave Cross <d...@dave.org.uk>  Thu, 1 Mar 2012 21:49:10 +0000
+- Corrected INSTALL instructions.
+  The INSTALL section links to
+  http://www.cpan.org/modules/by-authors/id/S/SP/SPOON/
+  as the place to download 'the latest release of WWW::Shorten'
+  but this is no longer true.
+  Of course the whole INSTALL file is a little bit huge!
+- commit 6061354
 
-www-shorten (0.1.1) unstable; urgency=low
+-------------------------------------------------------------------
+Mon Sep 15 22:30:35 CEST 2014 - d...@dave.org.uk
 
-  * bin/shorten: Better examples of using bin/shorten
-  * lib/WWW/Shorten.pm: Bump version number for release.
-  * bin/shorten: Be far more intelligent about the code that allows
-    the user to choose which service to use.
-  * MANIFEST.SKIP: Added MYMETA.yml to MANIFEST.SKIP.
-  * bin/shorten: Default to using a service that we currently support.
-  * Build.PL, lib/WWW/Shorten.pm: Added Config::Auto to list of
-    dependencies (it's used by the shorten program). Bumped version
-    for release.
+- Metamark is dead :-(
+- commit 96dabb0
 
- -- Dave Cross <d...@dave.org.uk>  Mon, 6 Dec 2010 12:35:43 +0000
+-------------------------------------------------------------------
+Tue May  6 21:24:27 CEST 2014 - d...@dave.org.uk
 
-www-shorten (0.1.1) unstable; urgency=low
+- Typo in documentation.
+- commit c811d01
 
-  * Build.PL: Removed version number so it's picked up from
-    lib/WWW/Shorten.pm
+-------------------------------------------------------------------
+Tue May  6 20:32:14 CEST 2014 - d...@dave.org.uk
 
- -- Dave Cross <dave@dacross.(none)>  Wed, 20 Jan 2010 16:21:06 +0000
+- Bump version for CPAN release.
+- commit 877589d
 
-www-shorten (0.1.1) unstable; urgency=low
+-------------------------------------------------------------------
+Tue May  6 19:50:00 CEST 2014 - d...@dave.org.uk
 
-  * Build.PL, MANIFEST: Bumped version number. Removed shorl files
-    from MANIFEST.
-  * MANIFEST, lib/WWW/Shorten/Shorl.pm, t/shorl.t: Removed support for
-    shorl.pm (now in WWW::Shorten::Shorl distribution).
+- Updated the INSTALL instructions.
+- commit 4d9cb08
 
- -- Dave Cross <d...@dave.org.uk>  Sat, 19 Dec 2009 15:44:58 +0000
+-------------------------------------------------------------------
+Tue May  6 19:49:37 CEST 2014 - d...@dave.org.uk
 
-www-shorten (0.1.1) unstable; urgency=low
+- (Possible) fix to the TinyURL test.
+- commit 8f93f85
 
-  * lib/WWW/Shorten/Shorl.pm: shorl.com was change the request method
-    ( POST to GET )
+-------------------------------------------------------------------
+Tue May  6 16:50:50 CEST 2014 - d...@dave.org.uk
 
- -- yappo <ya...@shibuya.pl>  Tue, 15 Dec 2009 11:46:14 +0800
+- Modernised README
+- commit 4857429
 
-www-shorten (0.1.1) unstable; urgency=low
+-------------------------------------------------------------------
+Tue May  6 16:45:36 CEST 2014 - d...@dave.org.uk
 
-  * lib/WWW/Shorten/NotLong.pm, lib/WWW/Shorten/OneShortLink.pm,
-    t/notlong.t, t/oneshort.t: Removed support for NotLong and
-    OneShortLink (separate distributions to follow soon). Bumper to
-    version 2.06.
+- Added .travis.yml
+- commit 4785545
 
- -- Dave Cross <d...@angel.mag-sol.com>  Sat, 21 Nov 2009 21:36:14 +0000
+-------------------------------------------------------------------
+Thu Aug 22 13:00:16 CEST 2013 - d...@dave.org.uk
 
-www-shorten (0.1.1) unstable; urgency=low
+- Changes to reflect moved files.
+- commit c872c03
 
-  * Build.PL: Bump to version 2.05 for release.
-  * lib/WWW/Shorten.pm, t/newnames.t: Finish removing all references
-    to SnipURL.pm.
+-------------------------------------------------------------------
+Thu Aug 22 12:11:59 CEST 2013 - d...@dave.org.uk
 
- -- Dave Cross <d...@dave.org.uk>  Fri, 18 Sep 2009 13:46:00 +0100
+- Moved Pod tests into xt.
+  (Pod coverage currently fails on some files.
+  See https://rt.cpan.org/Ticket/Display.html?id=87634 for details.)
+- commit abd0ea0
 
-www-shorten (0.1.1) unstable; urgency=low
+-------------------------------------------------------------------
+Mon Nov 12 17:40:29 CET 2012 - d...@dave.org.uk
 
-  * MANIFEST: Removed snipurl.t from MANIFEST.
-  * Build.PL, MANIFEST, lib/WWW/Shorten/SnipURL.pm, t/snipurl.t:
-    Removed WWW::Shorten::SnipURL (API changed, separate dist will
-    follow). Bumped version to 2.04.
+- Bump version number for release.
+- commit 82ee1a7
 
- -- Dave Cross <d...@dave.org.uk>  Tue, 8 Sep 2009 11:54:17 +0100
+-------------------------------------------------------------------
+Mon Nov 12 17:37:37 CET 2012 - d...@dave.org.uk
 
-www-shorten (0.1.1) unstable; urgency=low
+- Removed prototypes (and the ampersands in the tests that circumvented them)
+- commit ca1fc85
 
-  * lib/WWW/Shorten.pm: Start using $DEFAULT_SERVICE variable.
-  * MANIFEST: Removed files from MANIFEST
-  * lib/WWW/Shorten.pm: Documenation improvements.
-  * lib/WWW/Shorten/BabyURL.pm, lib/WWW/Shorten/EkDk.pm,
-    lib/WWW/Shorten/ShortLink.pm, lib/WWW/Shorten/SmLnk.pm,
-    lib/WWW/Shorten/URLjr.pm, lib/WWW/Shorten/V3.pm,
-    lib/WWW/Shorten/qURL.pm, t/babyurl.t, t/ekdk.t, t/qurl.t,
-    t/shortlink.t, t/smlnk.t, t/urljr.t, t/v3.t: Removed a number of
-    modules that supported services that are no longer around.
+-------------------------------------------------------------------
+Fri Apr  6 18:40:42 CEST 2012 - d...@dave.org.uk
 
- -- Dave Cross <d...@dave.org.uk>  Sat, 11 Apr 2009 12:51:19 +0100
+- Licensing clean-up.
+- commit 647fa04
 
-www-shorten (0.1.1) unstable; urgency=low
+-------------------------------------------------------------------
+Fri Apr  6 18:14:33 CEST 2012 - d...@dave.org.uk
 
-  * Build.PL: Remove signing
-  * t/shorl.t: Fixed typo
-  * Build.PL: Bump version number.
-  * t/tinyurl.t: Fixed TinyURL tests.
+- Added META.json to MANIFEST.
+- commit 9042fc8
 
- -- Dave Cross <d...@dave.org.uk>  Thu, 19 Mar 2009 10:32:23 +0000
+-------------------------------------------------------------------
+Thu Mar  1 22:49:10 CET 2012 - d...@dave.org.uk
 
-www-shorten (0.1.1) unstable; urgency=low
+- Added documentation.
+- commit ad026ea
 
-  * Build.PL: Increment version number
+-------------------------------------------------------------------
+Thu Mar  1 12:13:24 CET 2012 - d...@dave.org.uk
 
- -- Dave Cross <d...@dave.org.uk>  Mon, 2 Feb 2009 15:28:53 +0000
+- Added a WWW::Shorten::UserAgent object which dies if it receives an HTTP 
error response.
+- commit 9b6fe46
 
-www-shorten (0.1.1) unstable; urgency=low
+-------------------------------------------------------------------
+Mon Dec  6 16:31:26 CET 2010 - d...@dave.org.uk
 
-  * Build.PL: Changed require perl 5.6.0 to require perl 5.006 - to
-    deal with older Perl installations.
+- Better examples of using bin/shorten
+- commit 158b173
 
- -- Dave Cross <d...@dave.org.uk>  Mon, 26 Jan 2009 13:27:29 +0000
+-------------------------------------------------------------------
+Mon Dec  6 15:30:20 CET 2010 - d...@dave.org.uk
 
-www-shorten (0.1.1) unstable; urgency=low
+- Bump version number for release.
+- commit cf8df8a
 
-  * Build.PL: Increment version
-  * MANIFEST: Removed SIGNATURE from MANIFEST (as Module::Build adds
-    it automatically).
-  * lib/WWW/Shorten/Tinylink.pm: Typo
+-------------------------------------------------------------------
+Mon Dec  6 15:29:17 CET 2010 - d...@dave.org.uk
 
- -- Dave Cross <d...@dave.org.uk>  Mon, 30 Jun 2008 16:01:36 +0000
+- Be far more intelligent about the code that allows the user to choose which
+  service to use.
+- commit 3fc2494
 
-www-shorten (0.1.1) unstable; urgency=low
+-------------------------------------------------------------------
+Mon Dec  6 15:28:46 CET 2010 - d...@dave.org.uk
 
-  * Build.PL, lib/WWW/Shorten/Tinylink.pm, t/tinylink.t: Marked
-    tinylink.com as dead (it's not - but it's returning nonsense).
-    Bumped to version 2.00.
+- Added MYMETA.yml to MANIFEST.SKIP.
+- commit 6a87adb
 
- -- Dave Cross <d...@dave.org.uk>  Sun, 29 Jun 2008 09:58:31 +0000
+-------------------------------------------------------------------
+Mon Dec  6 13:35:43 CET 2010 - d...@dave.org.uk
 
-www-shorten (0.1.1) unstable; urgency=low
+- Default to using a service that we currently support.
+- commit 5488a67
 
-  * Build.PL: Increment version number
-  * t/snipurl.t: Fixed test so it doesn't include a hard-coded code.
+-------------------------------------------------------------------
+Mon Dec  6 10:27:21 CET 2010 - d...@dave.org.uk
 
- -- Dave Cross <d...@dave.org.uk>  Sun, 20 Apr 2008 09:55:05 +0000
+- Added Config::Auto to list of dependencies (it's used by the shorten
+  program).
+  Bumped version for release.
+- commit e5c57b1
 
-www-shorten (0.1.1) unstable; urgency=low
+-------------------------------------------------------------------
+Wed Jan 20 17:21:06 CET 2010 - dave@dacross.(none)
 
-  * Build.PL: Fixes script_files.
+- Removed version number so it's picked up from lib/WWW/Shorten.pm
+- commit a85b3a2
 
- -- Dave Cross <d...@dave.org.uk>  Sat, 19 Apr 2008 08:28:47 +0000
+-------------------------------------------------------------------
+Sat Dec 19 16:44:58 CET 2009 - d...@dave.org.uk
 
-www-shorten (0.1.1) unstable; urgency=low
+- Bumped version number. Removed shorl files from MANIFEST.
+- commit 6582eae
 
-  * Build.PL: Increment version number for release
-  * Build.PL, MANIFEST, bin/shortenrc: Remove shortenrc. Add
-    script_files to Build.PL
+-------------------------------------------------------------------
+Sat Dec 19 16:43:08 CET 2009 - d...@dave.org.uk
 
- -- Dave Cross <d...@dave.org.uk>  Thu, 17 Apr 2008 05:43:37 +0000
+- Removed support for shorl.pm (now in WWW::Shorten::Shorl distribution).
+- commit 39a69b6
 
-www-shorten (0.1.1) unstable; urgency=low
+-------------------------------------------------------------------
+Tue Dec 15 04:46:14 CET 2009 - ya...@shibuya.pl
 
-  * Build.PL, MANIFEST: Various packaging fixes
-  * t/shorl.t, t/snipurl.t: Various test fixes
-  * lib/WWW/Shorten/LinkToolbot.pm, t/linktoolbot.t: link.toolbot.com
-    is now dead.
-  * lib/WWW/Shorten/SnipURL.pm: Switch to using the snipurl api.
-  * lib/WWW/Shorten/SnipURL.pm: Fixes to reflect changes in the way
-    snipurl.com works.
+- shorl.com was change the request method ( POST to GET )
+- commit 47d32ce
 
- -- Dave Cross <d...@dave.org.uk>  Mon, 14 Apr 2008 21:29:27 +0000
+-------------------------------------------------------------------
+Sat Nov 21 22:36:14 CET 2009 - d...@angel.mag-sol.com
 
-www-shorten (0.1.1) unstable; urgency=low
+- Removed support for NotLong and OneShortLink (separate distributions to 
follow soon).
+  Bumper to version 2.06.
+- commit c467223
 
-  * t/00sig.t, t/98pod-coverage.t, t/99pod.t: Removed unneeded shebang
-    lines
-  * MANIFEST: Removed unused test file
+-------------------------------------------------------------------
+Fri Sep 18 14:46:00 CEST 2009 - d...@dave.org.uk
 
- -- Dave Cross <d...@dave.org.uk>  Sun, 13 May 2007 14:28:43 +0000
+- Bump to version 2.05 for release.
+- commit c3ee866
 
-www-shorten (0.1.1) unstable; urgency=low
+-------------------------------------------------------------------
+Fri Sep 18 14:35:58 CEST 2009 - d...@dave.org.uk
 
-  * lib/WWW/Shorten/LinkToolbot.pm: Reformatted documentation
-  * lib/WWW/Shorten/EkDk.pm, lib/WWW/Shorten/Linkz.pm,
-    lib/WWW/Shorten/OneShortLink.pm, lib/WWW/Shorten/ShortLink.pm,
-    lib/WWW/Shorten/SmLnk.pm, lib/WWW/Shorten/SnipURL.pm,
-    lib/WWW/Shorten/Tinylink.pm, lib/WWW/Shorten/URLjr.pm,
-    lib/WWW/Shorten/V3.pm, lib/WWW/Shorten/qURL.pm: Switch to manual
-    version number
-  * lib/WWW/Shorten/Shorl.pm: Fixed to mirror the way that shorl.com
-    now works.
-  * lib/WWW/Shorten/Shorl.pm: Switched to manual version number.
-  * lib/WWW/Shorten/NotLong.pm, t/notlong.t: Updates to reflect
-    changes in the way that notlong.pm works
-  * t/00noexp.t: test a service that actually works
-  * lib/WWW/Shorten/NotLong.pm: Switch to manual version number
-  * lib/WWW/Shorten/Metamark.pm: Switch to manual version number
-  * t/00load_a.t, t/00load_b.t: Change tests to use a still existing
-    service
-  * lib/WWW/Shorten/TinyClick.pm, t/tinyclick.t: tinyclick.com is dead
-  * lib/WWW/Shorten/TinyURL.pm: Switched to manual version
-  * t/tinyurl.t: TinyURL now works in a slightly different way
-  * t/ws_masl.t: removed unnecessary test
-  * lib/WWW/Shorten/MakeAShorterLink.pm, t/masl.t:
-    makeashorterlink.com is now dead!
-  * lib/WWW/Shorten/BabyURL.pm: Typo
-  * lib/WWW/Shorten/BabyURL.pm, t/babyurl.t: BabyURL is now dead
-  * lib/WWW/Shorten/_dead.pm: Switch to manual version numbers
-  * lib/WWW/Shorten.pm: Change to using manual version number.
-  * lib/WWW/Shorten.pm: Changed email address in docs
-  * lib/WWW/Shorten.pm: Fixed copyright line. Removed changelog from
-    module file.
-  * Build.PL, Makefile.PL: Switched from Makefile.PL to Build.PL.
+- Finish removing all references to SnipURL.pm.
+- commit 702a1bb
 
- -- Dave Cross <d...@dave.org.uk>  Sun, 15 Apr 2007 14:18:09 +0000
-
-www-shorten (0.1.1) unstable; urgency=low
-
-  * MANIFEST, lib/WWW/Shorten/LinkToolbot.pm,
-    lib/WWW/Shorten/generic.pm, t/linktoolbot.t: Added tests for
-    LinkToolbot.pm and fixed module to pass them
-  * lib/WWW/Shorten/LinkToolbot.pm: Added WWW::Shorten::LinkToolbot
-
- -- Dave Cross <d...@dave.org.uk>  Fri, 16 Feb 2007 22:31:15 +0000
-
-www-shorten (0.1.1) unstable; urgency=low
-
-  * lib/WWW/Shorten.pm: Reinstated support for 1sl.net.
-  * lib/WWW/Shorten/OneShortLink.pm, t/oneshort.t: Reinstated suport
-    for 1sl.net.
-
- -- Dave Cross <d...@dave.org.uk>  Sun, 9 Oct 2005 21:54:47 +0000
-
-www-shorten (0.1.1) unstable; urgency=low
-
-  * MANIFEST.SKIP: Fixed previous fix :(
-  * MANIFEST.SKIP: Ignore hidden files
-  * lib/WWW/Shorten.pm: Removed outdated or incorrect references in
-    the Pod.
-  * MANIFEST.SKIP: Ignore vi backup files
-  * MANIFEST, t/98pod-coverage.t: Added Pod coverage tests
-  * t/metamark.t: Changed the URL used for the test.
-  * lib/WWW/Shorten/_dead.pm, lib/WWW/Shorten/generic.pm: Added a bit
-    of Pod.
-  * lib/WWW/Shorten/Metamark.pm: Switched to using the REST API for
-    makealongerlink.
-  * lib/WWW/Shorten/EkDk.pm, lib/WWW/Shorten/OneShortLink.pm,
-    lib/WWW/Shorten/ShortLink.pm, lib/WWW/Shorten/SmLnk.pm,
-    lib/WWW/Shorten/URLjr.pm, lib/WWW/Shorten/V3.pm,
-    lib/WWW/Shorten/_dead.pm, lib/WWW/Shorten/generic.pm,
-    lib/WWW/Shorten/qURL.pm: Added 'use strict', 'use warnings' and
-    cvs $Id$ tag to all modules
-
- -- Dave Cross <d...@dave.org.uk>  Sat, 3 Sep 2005 15:23:57 +0000
-
-www-shorten (0.1.1) unstable; urgency=low
-
-  * t/00noexp.t: Added 00noexp.t
-  * lib/WWW/Shorten.pm, t/linkz.t: Correct copyright signs in pod.
-    Skip lin.kz tests while it's broken.
-
- -- Dave Cross <d...@dave.org.uk>  Tue, 24 May 2005 20:27:56 +0000
-
-www-shorten (0.1.1) unstable; urgency=low
-
-  * MANIFEST.SKIP: Added stuff to MANIFEST.SKIP
-  * lib/WWW/Shorten.pm: Removed a couple of dead services - 1sl and v3
-  * META.yml, Makefile.PL, lib/WWW/Shorten/OneShortLink.pm,
-    lib/WWW/Shorten/Shorl.pm, lib/WWW/Shorten/V3.pm, t/oneshort.t,
-    t/shorl.t, t/tinyurl.t, t/v3.t: Removed some dead services. Fixed
-    WWW::Shorten::Shorl.pm to deal with the new way that shorl works.
-
- -- Dave Cross <d...@dave.org.uk>  Thu, 19 May 2005 21:37:48 +0000
-
-www-shorten (0.1.1) unstable; urgency=low
-
-  * MANIFEST: Added new test files
-  * lib/WWW/Shorten.pm, lib/WWW/Shorten/BabyURL.pm,
-    lib/WWW/Shorten/EkDk.pm, lib/WWW/Shorten/Linkz.pm,
-    lib/WWW/Shorten/MakeAShorterLink.pm, lib/WWW/Shorten/Metamark.pm,
-    lib/WWW/Shorten/NotLong.pm, lib/WWW/Shorten/OneShortLink.pm,
-    lib/WWW/Shorten/Shorl.pm, lib/WWW/Shorten/ShortLink.pm,
-    lib/WWW/Shorten/SmLnk.pm, lib/WWW/Shorten/SnipURL.pm,
-    lib/WWW/Shorten/TinyClick.pm, lib/WWW/Shorten/TinyURL.pm,
-    lib/WWW/Shorten/Tinylink.pm, lib/WWW/Shorten/URLjr.pm,
-    lib/WWW/Shorten/V3.pm, lib/WWW/Shorten/_dead.pm,
-    lib/WWW/Shorten/generic.pm, lib/WWW/Shorten/qURL.pm, t/babyurl.t,
-    t/linkz.t, t/masl.t, t/metamark.t, t/newnames.t, t/notlong.t,
-    t/oneshort.t, t/shorl.t, t/smlnk.t, t/snipurl.t, t/tinyclick.t,
-    t/tinylink.t, t/tinyurl.t, t/urljr.t, t/v3.t, t/ws_masl.t: Work on
-    improving test coverage
-
- -- Dave Cross <d...@dave.org.uk>  Sat, 30 Oct 2004 20:52:33 +0000
-
-www-shorten (0.1.1) unstable; urgency=low
-
-  * lib/WWW/Shorten.pm: Removed unnecessary "no strict 'refs'"
-  * SIGNATURE: SIGNATURE is generated - therefore not in CVS
-  * t/notlong.t, t/smlnk.t, t/tinyclick.t, t/tinyurl.t, t/urljr.t:
-    Various test fixes
-  * lib/WWW/Shorten/V3.pm: Fixed response regex
-
- -- Dave Cross <d...@dave.org.uk>  Mon, 25 Oct 2004 20:55:21 +0000
-
-www-shorten (0.1.1) unstable; urgency=low
-
-  * MANIFEST.SKIP, Makefile.PL, SIGNATURE: New version with fixed
-    SIGNATURE
-  * Makefile.PL, lib/WWW/Shorten.pm: Changed author in Makefile.PL.
-    Get $VERSION from CVS tag.
-  * MANIFEST, lib/WWW/Shorten.pm: Add some CVS tags
-  * Changes: Removed Changes from CVS
-  * ChangeLog, ChangeLog.SPOON: Replaced ChangeLog with
-    ChangeLog.SPOON
-  * AUTHORS: Changed author info
-  * lib/WWW/Shorten.pm: Changed author info.
-  * AUTHORS, Artistic, COPYING, CREDITS, ChangeLog, Changes, INSTALL,
-    LICENCE, MANIFEST, MANIFEST.SKIP, META.yml, Makefile.PL, README,
-    SIGNATURE, TODO, bin/shorten, bin/shortenrc, lib/WWW/Shorten.pm,
-    lib/WWW/Shorten/BabyURL.pm, lib/WWW/Shorten/EkDk.pm,
-    lib/WWW/Shorten/Linkz.pm, lib/WWW/Shorten/MakeAShorterLink.pm,
-    lib/WWW/Shorten/Metamark.pm, lib/WWW/Shorten/NotLong.pm,
-    lib/WWW/Shorten/OneShortLink.pm, lib/WWW/Shorten/Shorl.pm,
-    lib/WWW/Shorten/ShortLink.pm, lib/WWW/Shorten/SmLnk.pm,
-    lib/WWW/Shorten/SnipURL.pm, lib/WWW/Shorten/TinyClick.pm,
-    lib/WWW/Shorten/TinyURL.pm, lib/WWW/Shorten/Tinylink.pm,
-    lib/WWW/Shorten/URLjr.pm, lib/WWW/Shorten/V3.pm,
-    lib/WWW/Shorten/_dead.pm, lib/WWW/Shorten/generic.pm,
-    lib/WWW/Shorten/qURL.pm, t/00load.t, t/00load_a.t, t/00load_b.t,
-    t/00sig.t, t/01version.t, t/99pod.t, t/babyurl.t, t/ekdk.t,
-    t/linkz.t, t/masl.t, t/metamark.t, t/newnames.t, t/notlong.t,
-    t/oneshort.t, t/qurl.t, t/shorl.t, t/shortlink.t, t/smlnk.t,
-    t/snipurl.t, t/tinyclick.t, t/tinylink.t, t/tinyurl.t, t/urljr.t,
-    t/v3.t, t/ws_masl.t: Initial revision
-
- -- Dave Cross <d...@dave.org.uk>  Sun, 24 Oct 2004 16:14:31 +0000
-
-www-shorten (0.1.1) unstable; urgency=low
-
-
- -- (no author) <(no author)>  Sun, 24 Oct 2004 16:09:47 +0000
+-------------------------------------------------------------------
+Tue Sep  8 12:54:17 CEST 2009 - d...@dave.org.uk
+
+- Removed snipurl.t from MANIFEST.
+- commit 9e922c5
+
+-------------------------------------------------------------------
+Tue Sep  8 11:34:25 CEST 2009 - d...@dave.org.uk
+
+- Removed WWW::Shorten::SnipURL (API changed, separate dist will follow).
+  Bumped version to 2.04.
+- commit 1d97a1d
+
+-------------------------------------------------------------------
+Sat Apr 11 17:39:54 CEST 2009 - d...@dave.org.uk
+
+- Start using $DEFAULT_SERVICE variable.
+- commit f696b4c
+
+-------------------------------------------------------------------
+Sat Apr 11 17:39:06 CEST 2009 - d...@dave.org.uk
+
+- Removed files from MANIFEST
+- commit 2fb6642
+
+-------------------------------------------------------------------
+Sat Apr 11 13:51:19 CEST 2009 - d...@dave.org.uk
+
+- Documenation improvements.
+- commit 3a1f4ce
+
+-------------------------------------------------------------------
+Sat Apr 11 13:34:43 CEST 2009 - d...@dave.org.uk
+
+- Removed a number of modules that supported services that are no longer 
around.
+- commit d2ef959
+
+-------------------------------------------------------------------
+Thu Mar 19 11:38:45 CET 2009 - d...@dave.org.uk
+
+- Remove signing
+- commit 419bb82
+
+-------------------------------------------------------------------
+Thu Mar 19 11:35:32 CET 2009 - d...@dave.org.uk
+
+- Fixed typo
+- commit e79a297
+
+-------------------------------------------------------------------
+Thu Mar 19 11:32:23 CET 2009 - d...@dave.org.uk
+
+- Bump version number.
+- commit 4ff0cab
+
+-------------------------------------------------------------------
+Thu Mar 19 11:31:00 CET 2009 - d...@dave.org.uk
+
+- Fixed TinyURL tests.
+- commit c8a9137
+
+-------------------------------------------------------------------
+Mon Feb  2 16:28:53 CET 2009 - d...@dave.org.uk
+
+- Increment version number
+- commit cec12e1
+
+-------------------------------------------------------------------
+Mon Jan 26 14:27:29 CET 2009 - d...@dave.org.uk
+
+- Changed require perl 5.6.0 to require perl 5.006 - to deal with older Perl 
installations.
+- commit e7fd958
+
+-------------------------------------------------------------------
+Mon Jun 30 18:03:18 CEST 2008 - d...@dave.org.uk
+
+- Increment version
+- commit eb437d7
+
+-------------------------------------------------------------------
+Mon Jun 30 18:01:36 CEST 2008 - d...@dave.org.uk
+
+- Removed SIGNATURE from MANIFEST (as Module::Build adds it automatically).
+- commit 7c99293
+
+-------------------------------------------------------------------
+Mon Jun 30 13:30:27 CEST 2008 - d...@dave.org.uk
+
+- Typo
+- commit cd33b84
+
+-------------------------------------------------------------------
+Sun Jun 29 11:58:31 CEST 2008 - d...@dave.org.uk
+
+- Marked tinylink.com as dead (it's not - but it's returning nonsense).
+  Bumped to version 2.00.
+- commit c633cad
+
+-------------------------------------------------------------------
+Sun Apr 20 11:55:05 CEST 2008 - d...@dave.org.uk
+
+- Increment version number
+- commit a36a37b
+
+-------------------------------------------------------------------
+Sun Apr 20 11:54:36 CEST 2008 - d...@dave.org.uk
+
+- Fixed test so it doesn't include a hard-coded code.
+- commit 5385847
+
+-------------------------------------------------------------------
+Sat Apr 19 10:28:47 CEST 2008 - d...@dave.org.uk
+
+- Fixes script_files.
+- commit d4c1384
+
+-------------------------------------------------------------------
+Thu Apr 17 07:43:37 CEST 2008 - d...@dave.org.uk
+
+- Increment version number for release
+- commit 78bc9a8
+
+-------------------------------------------------------------------
+Thu Apr 17 07:43:09 CEST 2008 - d...@dave.org.uk
+
+- Remove shortenrc.
+  Add script_files to Build.PL
+- commit 04c6f04
+
+-------------------------------------------------------------------
+Mon Apr 14 23:50:07 CEST 2008 - d...@dave.org.uk
+
+- Various packaging fixes
+- commit df7a06e
+
+-------------------------------------------------------------------
+Mon Apr 14 23:47:15 CEST 2008 - d...@dave.org.uk
+
+- Various test fixes
+- commit 4331e7b
+
+-------------------------------------------------------------------
+Mon Apr 14 23:40:43 CEST 2008 - d...@dave.org.uk
+
+- link.toolbot.com is now dead.
+- commit 6867f37
+
+-------------------------------------------------------------------
+Mon Apr 14 23:29:27 CEST 2008 - d...@dave.org.uk
+
+- Switch to using the snipurl api.
+- commit 27499ae
+
+-------------------------------------------------------------------
+Mon Apr 14 23:15:16 CEST 2008 - d...@dave.org.uk
+
+- Fixes to reflect changes in the way snipurl.com works.
+- commit 2fd95cb
+
+-------------------------------------------------------------------
+Sun May 13 16:28:43 CEST 2007 - d...@dave.org.uk
+
+- Removed unneeded shebang lines
+- commit e0a7ff0
+
+-------------------------------------------------------------------
+Sun May 13 16:26:51 CEST 2007 - d...@dave.org.uk
+
+- Removed unused test file
+- commit fa763d5
+
+-------------------------------------------------------------------
+Sun Apr 15 21:29:40 CEST 2007 - d...@dave.org.uk
+
+- Reformatted documentation
+- commit c7b0662
+
+-------------------------------------------------------------------
+Sun Apr 15 21:05:34 CEST 2007 - d...@dave.org.uk
+
+- Switch to manual version number
+- commit 0246c28
+
+-------------------------------------------------------------------
+Sun Apr 15 18:25:51 CEST 2007 - d...@dave.org.uk
+
+- Fixed to mirror the way that shorl.com now works.
+- commit e8558da
+
+-------------------------------------------------------------------
+Sun Apr 15 18:15:06 CEST 2007 - d...@dave.org.uk
+
+- Switched to manual version number.
+- commit 2ed93a6
+
+-------------------------------------------------------------------
+Sun Apr 15 18:12:17 CEST 2007 - d...@dave.org.uk
+
+- Updates to reflect changes in the way that notlong.pm works
+- commit 317f9bb
+
+-------------------------------------------------------------------
+Sun Apr 15 18:11:49 CEST 2007 - d...@dave.org.uk
+
+- test a service that actually works
+- commit d7a0249
+
+-------------------------------------------------------------------
+Sun Apr 15 17:38:01 CEST 2007 - d...@dave.org.uk
+
+- Switch to manual version number
+- commit ce459bb
+
+-------------------------------------------------------------------
+Sun Apr 15 17:25:09 CEST 2007 - d...@dave.org.uk
+
+- Switch to manual version number
+- commit 1f518a3
+
+-------------------------------------------------------------------
+Sun Apr 15 17:22:39 CEST 2007 - d...@dave.org.uk
+
+- Change tests to use a still existing service
+- commit 26f32d8
+
+-------------------------------------------------------------------
+Sun Apr 15 17:19:34 CEST 2007 - d...@dave.org.uk
+
+- tinyclick.com is dead
+- commit 076eae8
+
+-------------------------------------------------------------------
+Sun Apr 15 17:12:11 CEST 2007 - d...@dave.org.uk
+
+- Switched to manual version
+- commit 812274d
+
+-------------------------------------------------------------------
+Sun Apr 15 17:09:33 CEST 2007 - d...@dave.org.uk
+
+- TinyURL now works in a slightly different way
+- commit 20da444
+
+-------------------------------------------------------------------
+Sun Apr 15 17:06:19 CEST 2007 - d...@dave.org.uk
+
+- removed unnecessary test
+- commit 0494479
+
+-------------------------------------------------------------------
+Sun Apr 15 17:03:55 CEST 2007 - d...@dave.org.uk
+
+- makeashorterlink.com is now dead!
+- commit a0e0e38
+
+-------------------------------------------------------------------
+Sun Apr 15 17:03:13 CEST 2007 - d...@dave.org.uk
+
+- Typo
+- commit 294776a
+
+-------------------------------------------------------------------
+Sun Apr 15 16:48:02 CEST 2007 - d...@dave.org.uk
+
+- BabyURL is now dead
+- commit 4d49735
+
+-------------------------------------------------------------------
+Sun Apr 15 16:47:30 CEST 2007 - d...@dave.org.uk
+
+- Switch to manual version numbers
+- commit bd87df1
+
+-------------------------------------------------------------------
+Sun Apr 15 16:20:35 CEST 2007 - d...@dave.org.uk
+
+- Change to using manual version number.
+- commit f38ee68
+
+-------------------------------------------------------------------
+Sun Apr 15 16:19:02 CEST 2007 - d...@dave.org.uk
+
+- Changed email address in docs
+- commit 568c63a
+
+-------------------------------------------------------------------
+Sun Apr 15 16:18:09 CEST 2007 - d...@dave.org.uk
+
+- Fixed copyright line. Removed changelog from module file.
+- commit 1a4b887
+
+-------------------------------------------------------------------
+Sun Apr 15 16:17:33 CEST 2007 - d...@dave.org.uk
+
+- Switched from Makefile.PL to Build.PL.
+- commit 0e19e65
+
+-------------------------------------------------------------------
+Fri Feb 16 23:31:15 CET 2007 - d...@dave.org.uk
+
+- Added tests for LinkToolbot.pm and fixed module to pass them
+- commit adce423
+
+-------------------------------------------------------------------
+Fri Feb 16 23:02:47 CET 2007 - d...@dave.org.uk
+
+- Added WWW::Shorten::LinkToolbot
+- commit 6f0451c
+
+-------------------------------------------------------------------
+Sun Oct  9 23:54:47 CEST 2005 - d...@dave.org.uk
+
+- Reinstated support for 1sl.net.
+- commit 320bb4c
+
+-------------------------------------------------------------------
+Sun Oct  9 23:52:00 CEST 2005 - d...@dave.org.uk
+
+- Reinstated suport for 1sl.net.
+- commit a91eae4
+
+-------------------------------------------------------------------
+Sat Sep  3 17:40:54 CEST 2005 - d...@dave.org.uk
+
+- Fixed previous fix :(
+- commit 58bc80f
+
+-------------------------------------------------------------------
+Sat Sep  3 17:35:50 CEST 2005 - d...@dave.org.uk
+
+- Ignore hidden files
+- commit e98a7f2
+
+-------------------------------------------------------------------
+Sat Sep  3 17:32:33 CEST 2005 - d...@dave.org.uk
+
+- Removed outdated or incorrect references in the Pod.
+- commit e09c711
+
+-------------------------------------------------------------------
+Sat Sep  3 17:32:10 CEST 2005 - d...@dave.org.uk
+
+- Ignore vi backup files
+- commit ec67abd
+
+-------------------------------------------------------------------
+Sat Sep  3 17:31:49 CEST 2005 - d...@dave.org.uk
+
+- Added Pod coverage tests
+- commit bbf1e69
+
+-------------------------------------------------------------------
+Sat Sep  3 17:24:41 CEST 2005 - d...@dave.org.uk
+
+- Changed the URL used for the test.
+- commit c21778c
+
+-------------------------------------------------------------------
+Sat Sep  3 17:24:15 CEST 2005 - d...@dave.org.uk
+
+- Added a bit of Pod.
+- commit 4626b5c
+
+-------------------------------------------------------------------
+Sat Sep  3 17:23:57 CEST 2005 - d...@dave.org.uk
+
+- Switched to using the REST API for makealongerlink.
+- commit f495fcc
+
+-------------------------------------------------------------------
+Sat Sep  3 16:46:06 CEST 2005 - d...@dave.org.uk
+
+- Added 'use strict', 'use warnings' and cvs $Id$ tag to all modules
+- commit e1ce370
+
+-------------------------------------------------------------------
+Tue May 24 22:27:56 CEST 2005 - d...@dave.org.uk
+
+- Added 00noexp.t
+- commit de2c4aa
+
+-------------------------------------------------------------------
+Tue May 24 22:20:20 CEST 2005 - d...@dave.org.uk
+
+- Correct copyright signs in pod.
+  Skip lin.kz tests while it's broken.
+- commit 963a84e
+
+-------------------------------------------------------------------
+Fri May 20 00:02:57 CEST 2005 - d...@dave.org.uk
+
+- Added stuff to MANIFEST.SKIP
+- commit 6cabc13
+
+-------------------------------------------------------------------
+Thu May 19 23:37:48 CEST 2005 - d...@dave.org.uk
+
+- Removed a couple of dead services - 1sl and v3
+- commit 263a33e
+
+-------------------------------------------------------------------
+Thu May 19 23:35:46 CEST 2005 - d...@dave.org.uk
+
+- Removed some dead services.
+  Fixed WWW::Shorten::Shorl.pm to deal with the new way that shorl works.
+- commit dd1dc02
+
+-------------------------------------------------------------------
+Sat Oct 30 22:52:33 CEST 2004 - d...@dave.org.uk
+
+- Added new test files
+- commit 7c05b3a
+
+-------------------------------------------------------------------
+Sat Oct 30 14:52:01 CEST 2004 - d...@dave.org.uk
+
+- Work on improving test coverage
+- commit 5a954af
+
+-------------------------------------------------------------------
+Mon Oct 25 23:03:53 CEST 2004 - d...@dave.org.uk
+
+- Removed unnecessary "no strict 'refs'"
+- commit 2c31ea9
+
+-------------------------------------------------------------------
+Mon Oct 25 22:57:09 CEST 2004 - d...@dave.org.uk
+
+- SIGNATURE is generated - therefore not in CVS
+- commit 925534c
+
+-------------------------------------------------------------------
+Mon Oct 25 22:55:21 CEST 2004 - d...@dave.org.uk
+
+- Various test fixes
+- commit 87b9ea4
+
+-------------------------------------------------------------------
+Mon Oct 25 22:51:56 CEST 2004 - d...@dave.org.uk
+
+- Fixed response regex
+- commit 4b66301
+
+-------------------------------------------------------------------
+Mon Oct 25 00:08:38 CEST 2004 - d...@dave.org.uk
+
+- New version with fixed SIGNATURE
+- commit 9a663c2
+
+-------------------------------------------------------------------
+Sun Oct 24 19:35:19 CEST 2004 - d...@dave.org.uk
+
+- Correct CVS versions
+- commit e367e21
+
+-------------------------------------------------------------------
+Sun Oct 24 19:29:40 CEST 2004 - d...@dave.org.uk
+
+- Correct CVS Version
+- commit 8623a73
+
+-------------------------------------------------------------------
+Sun Oct 24 19:29:04 CEST 2004 - d...@dave.org.uk
+
+- Correct CVS version
+- commit 7f9d99d
+
+-------------------------------------------------------------------
+Sun Oct 24 18:31:16 CEST 2004 - d...@dave.org.uk
+
+- Changed author in Makefile.PL.
+  Get $VERSION from CVS tag.
+- commit 8c1cead
+
+-------------------------------------------------------------------
+Sun Oct 24 18:27:45 CEST 2004 - d...@dave.org.uk
+
+- Add some CVS tags
+- commit bc3a79f
+
+-------------------------------------------------------------------
+Sun Oct 24 18:19:19 CEST 2004 - d...@dave.org.uk
+
+- Removed Changes from CVS
+- commit 169a507
+
+-------------------------------------------------------------------
+Sun Oct 24 18:18:09 CEST 2004 - d...@dave.org.uk
+
+- Replaced ChangeLog with ChangeLog.SPOON
+- commit be0a0cc
+
+-------------------------------------------------------------------
+Sun Oct 24 18:15:07 CEST 2004 - d...@dave.org.uk
+
+- Changed author info
+- commit 19e15fa
+
+-------------------------------------------------------------------
+Sun Oct 24 18:14:31 CEST 2004 - d...@dave.org.uk
+
+- Changed author info.
+- commit cde6e0b
+
+-------------------------------------------------------------------
+Sun Oct 24 18:09:47 CEST 2004 - d...@dave.org.uk
+
+- Initial revision
+- commit cd0eb4c
+
+-------------------------------------------------------------------
+Sun Oct 24 18:09:47 CEST 2004 - (no author)
+
+- New repository initialized by cvs2svn.
+- commit a48eebf
 
diff --git a/INSTALL b/INSTALL
index 8d211fe..eb6548b 100644
--- a/INSTALL
+++ b/INSTALL
@@ -30,7 +30,6 @@ OBTAINING THE MODULE
 The latest release version of WWW::Shorten can be downloaded
 from any CPAN site:
 
-    http://www.cpan.org/modules/by-authors/id/S/SP/SPOON/
     https://metacpan.org/release/WWW-Shorten/
 
 Interim and development versions may also be available
diff --git a/META.json b/META.json
index bfe2303..e3956ad 100644
--- a/META.json
+++ b/META.json
@@ -5,7 +5,11 @@
       "Based on WWW::MakeAShorterLink by Dave Cross <d...@mag-sol.com>"
    ],
    "dynamic_config" : 1,
-   "generated_by" : "Module::Build version 0.4007, CPAN::Meta::Converter 
version 2.132140",
+   "generated_by" : "Module::Build version 0.4214",
+   "keywords" : [
+      "short URL",
+      "shortening"
+   ],
    "license" : [
       "artistic_2"
    ],
@@ -22,7 +26,7 @@
       },
       "configure" : {
          "requires" : {
-            "Module::Build" : "0.40"
+            "Module::Build" : "0.42"
          }
       },
       "runtime" : {
@@ -38,7 +42,7 @@
    "provides" : {
       "WWW::Shorten" : {
          "file" : "lib/WWW/Shorten.pm",
-         "version" : "3.06"
+         "version" : "3.08"
       },
       "WWW::Shorten::LinkToolbot" : {
          "file" : "lib/WWW/Shorten/LinkToolbot.pm",
@@ -75,8 +79,12 @@
    "release_status" : "stable",
    "resources" : {
       "license" : [
-         "http://opensource.org/licenses/artistic-license-2.0.php";
-      ]
+         "http://www.perlfoundation.org/artistic_license_2_0";
+      ],
+      "repository" : {
+         "url" : "https://github.com/davorg/www-shorten";
+      }
    },
-   "version" : "3.06"
+   "version" : "3.08",
+   "x_serialization_backend" : "JSON::PP version 2.27300"
 }
diff --git a/META.yml b/META.yml
index 707c016..f74411c 100644
--- a/META.yml
+++ b/META.yml
@@ -4,49 +4,54 @@ author:
   - 'Original Iain Truskett <sp...@cpan.org>'
   - 'Based on WWW::MakeAShorterLink by Dave Cross <d...@mag-sol.com>'
 build_requires:
-  Test::More: 0.47
+  Test::More: '0.47'
 configure_requires:
-  Module::Build: 0.40
+  Module::Build: '0.42'
 dynamic_config: 1
-generated_by: 'Module::Build version 0.4007, CPAN::Meta::Converter version 
2.132140'
+generated_by: 'Module::Build version 0.4214, CPAN::Meta::Converter version 
2.150005'
+keywords:
+  - 'short URL'
+  - shortening
 license: artistic_2
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
-  version: 1.4
+  version: '1.4'
 name: WWW-Shorten
 provides:
   WWW::Shorten:
     file: lib/WWW/Shorten.pm
-    version: 3.06
+    version: '3.08'
   WWW::Shorten::LinkToolbot:
     file: lib/WWW/Shorten/LinkToolbot.pm
-    version: 1.90
+    version: '1.90'
   WWW::Shorten::Linkz:
     file: lib/WWW/Shorten/Linkz.pm
-    version: 1.90
+    version: '1.90'
   WWW::Shorten::MakeAShorterLink:
     file: lib/WWW/Shorten/MakeAShorterLink.pm
-    version: 1.90
+    version: '1.90'
   WWW::Shorten::Metamark:
     file: lib/WWW/Shorten/Metamark.pm
-    version: 1.91
+    version: '1.91'
   WWW::Shorten::TinyClick:
     file: lib/WWW/Shorten/TinyClick.pm
-    version: 1.90
+    version: '1.90'
   WWW::Shorten::TinyURL:
     file: lib/WWW/Shorten/TinyURL.pm
-    version: 1.90
+    version: '1.90'
   WWW::Shorten::UserAgent:
     file: lib/WWW/Shorten/UserAgent.pm
   WWW::Shorten::generic:
     file: lib/WWW/Shorten/generic.pm
-    version: 1.92
+    version: '1.92'
 requires:
-  Config::Auto: 0
-  LWP: 5.75
-  LWP::UserAgent: 2.023
-  URI: 1.27
-  perl: 5.006
+  Config::Auto: '0'
+  LWP: '5.75'
+  LWP::UserAgent: '2.023'
+  URI: '1.27'
+  perl: '5.006'
 resources:
-  license: http://opensource.org/licenses/artistic-license-2.0.php
-version: 3.06
+  license: http://www.perlfoundation.org/artistic_license_2_0
+  repository: https://github.com/davorg/www-shorten
+version: '3.08'
+x_serialization_backend: 'CPAN::Meta::YAML version 0.016'
diff --git a/Makefile.PL b/Makefile.PL
index b2d6147..05c3c4e 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,4 +1,4 @@
-# Note: this file was auto-generated by Module::Build::Compat version 0.4007
+# Note: this file was auto-generated by Module::Build::Compat version 0.4214
 require 5.006;
 use ExtUtils::MakeMaker;
 WriteMakefile
diff --git a/lib/WWW/Shorten.pm b/lib/WWW/Shorten.pm
index c7ce700..ba38e03 100644
--- a/lib/WWW/Shorten.pm
+++ b/lib/WWW/Shorten.pm
@@ -57,7 +57,7 @@ use warnings;
 
 use base qw(WWW::Shorten::generic);
 our @EXPORT = qw(makeashorterlink makealongerlink);
-our $VERSION = '3.06';
+our $VERSION = '3.08';
 
 our $DEFAULT_SERVICE = 'TinyURL';
 
@@ -79,9 +79,9 @@ sub import {
     $style = $DEFAULT_SERVICE unless defined $style;
     my $package = "${class}::${style}";
     eval {
-       my $file = $package;
-       $file =~ s/::/\//g;
-       require "$file.pm";
+        my $file = $package;
+        $file =~ s/::/\//g;
+        require "$file.pm";
     };
     croak $@ if $@;
     $package->import( @_ );
diff --git a/lib/WWW/Shorten/Linkz.pm b/lib/WWW/Shorten/Linkz.pm
index 3b3ed2c..41024a0 100644
--- a/lib/WWW/Shorten/Linkz.pm
+++ b/lib/WWW/Shorten/Linkz.pm
@@ -62,8 +62,8 @@ sub makeashorterlink
     return unless $resp->is_success;
     if ($resp->content =~ m!
         \Q<a href="\E(\Qhttp://lin.kz/?\E\w+)"
-       !x) {
-       return $1;
+        !x) {
+        return $1;
     }
     return;
 }
@@ -81,7 +81,7 @@ If anything goes wrong, then either function will return 
C<undef>.
 sub makealongerlink
 {
     my $code = shift
-       or croak 'No Linkz nickname/URL passed to makealongerlink';
+        or croak 'No Linkz nickname/URL passed to makealongerlink';
     my $ua = __PACKAGE__->ua();
     $code = "http://lin.kz/?$code"; unless $code =~ m!^http://!i;
 
diff --git a/lib/WWW/Shorten/TinyURL.pm b/lib/WWW/Shorten/TinyURL.pm
index 328e94e..69e0266 100644
--- a/lib/WWW/Shorten/TinyURL.pm
+++ b/lib/WWW/Shorten/TinyURL.pm
@@ -29,6 +29,7 @@ use warnings;
 use base qw( WWW::Shorten::generic Exporter );
 our @EXPORT = qw( makeashorterlink makealongerlink );
 our $VERSION = '1.90';
+our $_error_message ='';
 
 use Carp;
 
@@ -44,17 +45,27 @@ it your long URL and will return the shorter TinyURL 
version.
 sub makeashorterlink
 {
     my $url = shift or croak 'No URL passed to makeashorterlink';
+    $_error_message = '';
     my $ua = __PACKAGE__->ua();
     my $tinyurl = 'http://tinyurl.com/api-create.php';
     my $resp = $ua->post($tinyurl, [
-       url => $url,
-       source => "PerlAPI-$VERSION",
-       ]);
+        url => $url,
+        source => "PerlAPI-$VERSION",
+    ]);
     return undef unless $resp->is_success;
     my $content = $resp->content;
-    return undef if $content =~ /Error/;
+    if ($content =~ /Error/) {
+        if ($content =~ /<html/) {
+            $_error_message = 'Error is a html page';
+        } elsif (length($content) > 100) {
+            $_error_message = substr($content, 0, 100);
+        } else {
+            $_error_message = $content;
+        }
+        return undef ;
+    }
     if ($resp->content =~ m!(\Qhttp://tinyurl.com/\E\w+)!x) {
-       return $1;
+        return $1;
     }
     return;
 }
@@ -71,8 +82,9 @@ If anything goes wrong, then either function will return 
C<undef>.
 
 sub makealongerlink
 {
-    my $tinyurl_url = shift 
-       or croak 'No TinyURL key / URL passed to makealongerlink';
+    my $tinyurl_url = shift
+        or croak 'No TinyURL key / URL passed to makealongerlink';
+    $_error_message = '';
     my $ua = __PACKAGE__->ua();
 
     $tinyurl_url = "http://tinyurl.com/$tinyurl_url";
@@ -80,7 +92,22 @@ sub makealongerlink
 
     my $resp = $ua->get($tinyurl_url);
 
-    return undef unless $resp->is_redirect;
+    unless ($resp->is_redirect) {
+        my $content = $resp->content;
+        if ($content =~ /Error/) {
+            if ($content =~ /<html/) {
+                $_error_message = 'Error is a html page';
+            } elsif (length($content) > 100) {
+                $_error_message = substr($content, 0, 100);
+            } else {
+                $_error_message = $content;
+            }
+        } else {
+            $_error_message = 'Unknown error';
+        }
+
+        return undef;
+    }
     my $url = $resp->header('Location');
     return $url;
 
diff --git a/lib/WWW/Shorten/Tinylink.pm b/lib/WWW/Shorten/Tinylink.pm
index 15d2d83..831b4a6 100644
--- a/lib/WWW/Shorten/Tinylink.pm
+++ b/lib/WWW/Shorten/Tinylink.pm
@@ -63,8 +63,8 @@ sub makeashorterlink
     return unless $resp->is_success;
     if ($resp->content =~ m!
         \Q<a href="\E(\Qhttp://tinylink.com/?\E\w+)"
-       !x) {
-       return $1;
+        !x) {
+        return $1;
     }
     return;
 }
@@ -82,7 +82,7 @@ If anything goes wrong, then either function will return 
C<undef>.
 sub makealongerlink
 {
     my $code = shift
-       or croak 'No Tinylink nickname/URL passed to makealongerlink';
+        or croak 'No Tinylink nickname/URL passed to makealongerlink';
     my $ua = __PACKAGE__->ua();
 
     my $short;
diff --git a/lib/WWW/Shorten/generic.pm b/lib/WWW/Shorten/generic.pm
index 3c1da65..380999f 100644
--- a/lib/WWW/Shorten/generic.pm
+++ b/lib/WWW/Shorten/generic.pm
@@ -28,8 +28,8 @@ use Carp;
 
 my %name_sets =
 (
-    default    => [qw( makeashorterlink makealongerlink )],
-    short      => [qw( short_link long_link )],
+    default => [qw( makeashorterlink makealongerlink )],
+    short   => [qw( short_link long_link )],
 );
 
 sub import
@@ -39,21 +39,21 @@ sub import
     ($package) = caller(1) if $package eq 'WWW::Shorten';
     my $set = shift;
     if (defined $set and $set =~ /^ : (\w+) $/x) {
-       $set = $1;
+        $set = $1;
     } else {
-       $set = 'default';
+        $set = 'default';
     }
     if ( exists $name_sets{$set} )
     {
-       no strict 'refs';
-       *{"${package}::$name_sets{$set}[0]"} =
-           *{ "${class}::$name_sets{default}[0]"};
-       *{"${package}::$name_sets{$set}[1]"} =
-           *{ "${class}::$name_sets{default}[1]"};
+        no strict 'refs';
+        *{"${package}::$name_sets{$set}[0]"} =
+            *{ "${class}::$name_sets{default}[0]"};
+        *{"${package}::$name_sets{$set}[1]"} =
+            *{ "${class}::$name_sets{default}[1]"};
     }
     else
     {
-       croak "Unknown function set - $set.";
+        croak "Unknown function set - $set.";
     }
 }
 
@@ -74,10 +74,10 @@ sub ua
     return $ua if defined $ua;
     my $v = $self->VERSION();
     $ua = WWW::Shorten::UserAgent->new(
-       env_proxy => 1,
-       timeout => 30,
-       agent => "$self/$v",
-       requests_redirectable => [],
+        env_proxy => 1,
+        timeout => 30,
+        agent => "$self/$v",
+        requests_redirectable => [],
     );
     return $ua;
 }
diff --git a/t/tinyurl.t b/t/tinyurl.t
index 17adfd9..7896bc9 100644
--- a/t/tinyurl.t
+++ b/t/tinyurl.t
@@ -1,17 +1,20 @@
-use Test::More tests => 6;
+use Test::More tests => 7;
 
 BEGIN { use_ok WWW::Shorten::TinyURL };
 
 my $url = 'https://metacpan.org/release/WWW-Shorten';
 my $return = makeashorterlink($url);
+ok($return, 'not a error') or diag "\$_error_message = $_error_message";
 my ($code) = $return =~ /(\w+)$/;
 my $prefix = 'http://tinyurl.com/';
 is ( makeashorterlink($url), $prefix.$code, 'make it shorter');
 # Slight pause to increase the chance that all of TinyURL's servers
 # know about the new link
 sleep(5);
-is ( makealongerlink($prefix.$code), $url, 'make it longer');
-is ( makealongerlink($code), $url, 'make it longer by Id',);
+is ( makealongerlink($prefix.$code), $url, 'make it longer')
+    or diag "\$_error_message = $_error_message";
+is ( makealongerlink($code), $url, 'make it longer by Id',)
+    or diag "\$_error_message = $_error_message";
 
 eval { makeashorterlink() };
 ok($@, 'makeashorterlink fails with no args');

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-perl/packages/libwww-shorten-perl.git

_______________________________________________
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits

Reply via email to