r25972 - in /trunk/libflickr-api-perl: Changes MANIFEST META.yml Makefile.PL README debian/changelog debian/control lib/Flickr/API.pm lib/Flickr/API/Request.pm test.pl
gwolf at users.alioth.debian.org
gwolf at users.alioth.debian.org
Sun Oct 12 17:41:55 UTC 2008
Author: gwolf
Date: Sun Oct 12 17:41:52 2008
New Revision: 25972
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=25972
Log:
Preparing new upstream release
Added:
trunk/libflickr-api-perl/Changes
- copied unchanged from r25970, branches/upstream/libflickr-api-perl/current/Changes
Modified:
trunk/libflickr-api-perl/MANIFEST
trunk/libflickr-api-perl/META.yml
trunk/libflickr-api-perl/Makefile.PL
trunk/libflickr-api-perl/README
trunk/libflickr-api-perl/debian/changelog
trunk/libflickr-api-perl/debian/control
trunk/libflickr-api-perl/lib/Flickr/API.pm
trunk/libflickr-api-perl/lib/Flickr/API/Request.pm
trunk/libflickr-api-perl/test.pl
Modified: trunk/libflickr-api-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libflickr-api-perl/MANIFEST?rev=25972&op=diff
==============================================================================
--- trunk/libflickr-api-perl/MANIFEST (original)
+++ trunk/libflickr-api-perl/MANIFEST Sun Oct 12 17:41:52 2008
@@ -5,4 +5,5 @@
MANIFEST
README
test.pl
+Changes
META.yml Module meta-data (added by MakeMaker)
Modified: trunk/libflickr-api-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libflickr-api-perl/META.yml?rev=25972&op=diff
==============================================================================
--- trunk/libflickr-api-perl/META.yml (original)
+++ trunk/libflickr-api-perl/META.yml Sun Oct 12 17:41:52 2008
@@ -1,7 +1,7 @@
# http://module-build.sourceforge.net/META-spec.html
#XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX#
name: Flickr-API
-version: 0.09
+version: 1.01
version_from: lib/Flickr/API.pm
installdirs: site
requires:
@@ -11,7 +11,7 @@
LWP::UserAgent: 0
Test::More: 0
URI: 1.18
- XML::Parser::Lite::Tree: 0.03
+ XML::Parser::Lite::Tree: 0.06
distribution_type: module
-generated_by: ExtUtils::MakeMaker version 6.17
+generated_by: ExtUtils::MakeMaker version 6.30
Modified: trunk/libflickr-api-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libflickr-api-perl/Makefile.PL?rev=25972&op=diff
==============================================================================
--- trunk/libflickr-api-perl/Makefile.PL (original)
+++ trunk/libflickr-api-perl/Makefile.PL Sun Oct 12 17:41:52 2008
@@ -8,7 +8,7 @@
'HTTP::Request' => 0,
'HTTP::Response' => 0,
'URI' => 1.18,
- 'XML::Parser::Lite::Tree' => 0.03,
+ 'XML::Parser::Lite::Tree' => 0.06,
'Digest::MD5' => 0,
'Test::More' => 0,
},
Modified: trunk/libflickr-api-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libflickr-api-perl/README?rev=25972&op=diff
==============================================================================
--- trunk/libflickr-api-perl/README (original)
+++ trunk/libflickr-api-perl/README Sun Oct 12 17:41:52 2008
@@ -29,6 +29,6 @@
COPYRIGHT AND LICENCE
-Copyright (C) 2004-2006 Cal Henderson <cal at iamcal.com>
+Copyright (C) 2004-2008 Cal Henderson <cal at iamcal.com>
License: Perl Artistic License
Modified: trunk/libflickr-api-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libflickr-api-perl/debian/changelog?rev=25972&op=diff
==============================================================================
--- trunk/libflickr-api-perl/debian/changelog (original)
+++ trunk/libflickr-api-perl/debian/changelog Sun Oct 12 17:41:52 2008
@@ -1,8 +1,13 @@
-libflickr-api-perl (0.09-2) UNRELEASED; urgency=low
+libflickr-api-perl (1.01-1) unstable; urgency=low
+ [ Gunnar Wolf ]
+ * New upstream release
+ * Standards-version -> 3.8.0 (no changes needed)
+
+ [ MartÃn Ferrari ]
* Updating my email address
-
- -- MartÃn Ferrari <tincho at debian.org> Fri, 13 Jun 2008 00:04:49 +0000
+
+ -- Gunnar Wolf <gwolf at debian.org> Sun, 12 Oct 2008 12:21:11 -0500
libflickr-api-perl (0.09-1) unstable; urgency=low
Modified: trunk/libflickr-api-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libflickr-api-perl/debian/control?rev=25972&op=diff
==============================================================================
--- trunk/libflickr-api-perl/debian/control (original)
+++ trunk/libflickr-api-perl/debian/control Sun Oct 12 17:41:52 2008
@@ -7,7 +7,7 @@
Build-Depends-Indep: perl, libxml-parser-lite-tree-perl (>= 0.03-2),
libwww-perl, liburi-perl
Build-Depends: cdbs, debhelper (>= 6)
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
Homepage: http://search.cpan.org/dist/Flickr-API/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libflickr-api-perl/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libflickr-api-perl/
Modified: trunk/libflickr-api-perl/lib/Flickr/API.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libflickr-api-perl/lib/Flickr/API.pm?rev=25972&op=diff
==============================================================================
--- trunk/libflickr-api-perl/lib/Flickr/API.pm (original)
+++ trunk/libflickr-api-perl/lib/Flickr/API.pm Sun Oct 12 17:41:52 2008
@@ -10,14 +10,16 @@
our @ISA = qw(LWP::UserAgent);
-our $VERSION = '0.09';
+our $VERSION = '1.01';
sub new {
my $class = shift;
my $options = shift;
my $self = new LWP::UserAgent;
- $self->{api_key} = $options->{key};
- $self->{api_secret} = $options->{secret};
+ $self->{api_key} = $options->{key};
+ $self->{api_secret} = $options->{secret};
+ $self->{rest_uri} = $options->{rest_uri} || 'http://www.flickr.com/services/rest/';
+ $self->{auth_uri} = $options->{auth_uri} || 'http://www.flickr.com/services/auth/';
eval {
require Compress::Zlib;
@@ -65,7 +67,7 @@
my $sig = $self->sign_args(\%args);
$args{api_sig} = $sig;
- my $uri = URI->new('http://flickr.com/services/auth');
+ my $uri = URI->new($self->{auth_uri});
$uri->query_form(%args);
return $uri;
@@ -74,7 +76,7 @@
sub execute_method {
my ($self, $method, $args) = @_;
- my $request = new Flickr::API::Request({'method' => $method, 'args' => $args});
+ my $request = new Flickr::API::Request({'method' => $method, 'args' => $args, rest_uri => $self->{rest_uri}});
$self->execute_request($request);
}
@@ -133,7 +135,7 @@
sub _find_tag {
my ($self, $children) = @_;
for my $child(@{$children}){
- return $child if $child->{type} eq 'tag';
+ return $child if $child->{type} eq 'element';
}
return {};
}
Modified: trunk/libflickr-api-perl/lib/Flickr/API/Request.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libflickr-api-perl/lib/Flickr/API/Request.pm?rev=25972&op=diff
==============================================================================
--- trunk/libflickr-api-perl/lib/Flickr/API/Request.pm (original)
+++ trunk/libflickr-api-perl/lib/Flickr/API/Request.pm Sun Oct 12 17:41:52 2008
@@ -6,18 +6,20 @@
use URI;
our @ISA = qw(HTTP::Request);
-our $VERSION = '0.02';
+our $VERSION = '0.03';
sub new {
my $class = shift;
+ my $options = shift;
my $self = new HTTP::Request;
- my $options = shift;
- $self->{api_method} = $options->{method};
- $self->{api_args} = $options->{args};
+ $self->{api_method} = $options->{method};
+ $self->{api_args} = $options->{args};
+ $self->{rest_uri} = $options->{rest_uri} || 'http://www.flickr.com/services/rest/';
+
bless $self, $class;
$self->method('POST');
- $self->uri('http://www.flickr.com/services/rest/');
+ $self->uri($self->{rest_uri});
return $self;
}
Modified: trunk/libflickr-api-perl/test.pl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libflickr-api-perl/test.pl?rev=25972&op=diff
==============================================================================
--- trunk/libflickr-api-perl/test.pl (original)
+++ trunk/libflickr-api-perl/test.pl Sun Oct 12 17:41:52 2008
@@ -21,10 +21,12 @@
# check we get the 'method not found' error
#
-# this error code will change in future!
-is($rsp->{error_code}, 112, 'checking the error code for "method not found"');
-
-#print "code was $rsp->{error_code}, msg was $rsp->{error_message}\n";
+if ($rsp->{_rc} eq '200'){
+ # this error code may change in future!
+ is($rsp->{error_code}, 112, 'checking the error code for "method not found"');
+}else{
+ is(1, 1, "skipping error code check, since we couldn't reach the API");
+}
##################################################
@@ -33,7 +35,12 @@
#
$rsp = $api->execute_method('flickr.test.echo', {format => 'fake'});
-is($rsp->{error_code}, 111, 'checking the error code for "format not found"');
+
+if ($rsp->{_rc} eq '200'){
+ is($rsp->{error_code}, 111, 'checking the error code for "format not found"');
+}else{
+ is(1, 1, "skipping error code check, since we couldn't reach the API");
+}
##################################################
@@ -70,8 +77,8 @@
is($expect{$item}, $got{$item}, "Checking that the $item item in the query matches in reverse");
}
-ok($uri->path eq '/services/auth', "Checking correct return path");
-ok($uri->host eq 'flickr.com', "Checking return domain");
+ok($uri->path eq '/services/auth/', "Checking correct return path");
+ok($uri->host eq 'www.flickr.com', "Checking return domain");
ok($uri->scheme eq 'http', "Checking return protocol");
More information about the Pkg-perl-cvs-commits
mailing list