Merge branch 'release/0.57'

robert-b-clarke · Sep 16, 2012 · 1b68674 · 1b68674
2 parents d792114 + c5adb6c
commit 1b68674
Show file tree

Hide file tree

Showing 21 changed files with 92 additions and 23 deletions.
diff --git a/bin/s3cl b/bin/s3cl
@@ -393,14 +393,15 @@ s3cl sync_up [--acl_short=public-read] /path/ <bucket>:[prefix]
 
 Upload all the files below /path/ to S3, with an optional
 prefix at the start of the key name. The existing S3 files and
-meta data are fetched from S3 and the md5 (etag) is compaired to what is 
-on the local disk, files are not upload if the content has not changed.
+meta data are fetched from S3 and the md5 (etag) is compaired to
+what is on the local disk, files are not upload if the content has
+not changed.
 
-Use --acl_short to set access control, options from 
-L<Net::Amazon::S3::Bucket#set_acl> this is only applied when the 
+Use --acl_short to set access control, options from
+L<Net::Amazon::S3::Bucket#set_acl> this is only applied when the
 file is uploaded.
 
-Each files content-type is worked out using L<MIME::Types>, 
+Each files content-type is worked out using L<MIME::Types>,
 if this does not match 'text/plain' is used for ASCII text files,
 otherwise a warning is issued and the file is NOT uploaded.
 
@@ -436,3 +437,4 @@ following notice (which is also applicicable to this code):
 Leo Lapworth <LLAP@cuckoo.org> - Part of the HinuHinu project
 
 =cut
+
diff --git a/dist.ini b/dist.ini
@@ -6,19 +6,32 @@ version = 0.57
 
 [@Filter]
 -bundle = @Basic
--remove = MakeMaker
 option = for_basic
 
-[ModuleInstall]
 [MetaJSON]
+[MetaResources]
+bugtracker.web = https://github.com/pfig/net-amazon-s3/issues
+repository.url = https://github.com/pfig/net-amazon-s3.git
+repository.web = https://github.com/pfig/net-amazon-s3
+repository.type = git
+
 [AutoPrereqs]
+[CPANFile]
+
+[CheckChangeLog]
+
 [PodWeaver]
+[ReadmeMarkdownFromPod]
+
 [PkgVersion]
 [NextRelease]
 filename = CHANGES
 format = %-4v %{ccc MMM dd HH:mm:ss vvv yyyy}d
 
-[PodSyntaxTests]
-[PodCoverageTests]
-[Test::Perl::Critic]
+[@TestingMania]
+disable = Test::Kwalitee
+disable = Test::Pod::LinkCheck
+disable = PodCoverageTests
 
+[@Git]
+[Git::CommitBuild]
diff --git a/lib/Net/Amazon/S3.pm b/lib/Net/Amazon/S3.pm
@@ -689,7 +689,6 @@ sub _send_request_expect_nothing {
     # warn $http_request->as_string;
 
     my $response = $self->_do_http($http_request);
-    my $content  = $response->content;
 
     return 1 if $response->code =~ /^2\d\d$/;
 
@@ -731,8 +730,6 @@ sub _send_request_expect_nothing_probed {
     $response = $self->_do_http($http_request);
     $self->ua->requests_redirectable($old_redirectable);
 
-    my $content = $response->content;
-
     return 1 if $response->code =~ /^2\d\d$/;
 
     # anything else is a failure, and we save the parsed result

diff --git a/lib/Net/Amazon/S3/Bucket.pm b/lib/Net/Amazon/S3/Bucket.pm
@@ -13,6 +13,9 @@ __PACKAGE__->meta->make_immutable;
 
 # ABSTRACT: convenience object for working with Amazon S3 buckets
 
+=for test_synopsis
+no strict 'vars'
+
 =head1 SYNOPSIS
 
   use Net::Amazon::S3;
@@ -23,7 +26,7 @@ __PACKAGE__->meta->make_immutable;
   ok($bucket->add_key("key", "data", {
      content_type => "text/html",
     'x-amz-meta-colour' => 'orange',
-  });
+  }));
 
   # the err and errstr methods just proxy up to the Net::Amazon::S3's
   # objects err/errstr methods.

diff --git a/lib/Net/Amazon/S3/Client.pm b/lib/Net/Amazon/S3/Client.pm
@@ -127,6 +127,9 @@ sub _send_request_xpc {
 
 __END__
 
+=for test_synopsis
+no strict 'vars'
+
 =head1 SYNOPSIS
 
   my $s3 = Net::Amazon::S3->new(

diff --git a/lib/Net/Amazon/S3/Client/Bucket.pm b/lib/Net/Amazon/S3/Client/Bucket.pm
@@ -145,6 +145,9 @@ sub object {
 
 __END__
 
+=for test_synopsis
+no strict 'vars'
+
 =head1 SYNOPSIS
 
   # return the bucket name

diff --git a/lib/Net/Amazon/S3/Client/Object.pm b/lib/Net/Amazon/S3/Client/Object.pm
@@ -127,7 +127,7 @@ sub put {
     if ( $self->content_encoding ) {
         $conf->{'Content-Encoding'} = $self->content_encoding;
     }
-    if ( $self->content_disposition ) { 
+    if ( $self->content_disposition ) {
         $conf->{'Content-Disposition'} = $self->content_disposition;
     }
 
@@ -176,6 +176,10 @@ sub put_filename {
     if ( $self->content_encoding ) {
         $conf->{'Content-Encoding'} = $self->content_encoding;
     }
+    if ( $self->content_disposition ) {
+        $conf->{'Content-Disposition'} = $self->content_disposition;
+    }
+
 
     my $http_request = Net::Amazon::S3::Request::PutObject->new(
         s3        => $self->client->s3,
@@ -283,6 +287,9 @@ sub _etag {
 
 __END__
 
+=for test_synopsis
+no strict 'vars'
+
 =head1 SYNOPSIS
 
   # show the key
@@ -402,7 +409,8 @@ This module represents objects in buckets.
   );
   $object->put('this is the public value');
 
-You may also set Content-Encoding using content_encoding.
+You may also set Content-Encoding using content_encoding, and
+Content-Disposition using content_disposition.
 
 =head2 put_filename
 
@@ -422,7 +430,8 @@ You may also set Content-Encoding using content_encoding.
   );
   $object->put_filename('hat.jpg');
 
-You may also set Content-Encoding using content_encoding.
+You may also set Content-Encoding using content_encoding, and
+Content-Disposition using content_disposition.
 
 =head2 query_string_authentication_uri
 

diff --git a/lib/Net/Amazon/S3/HTTPRequest.pm b/lib/Net/Amazon/S3/HTTPRequest.pm
@@ -221,6 +221,9 @@ sub _urlencode {
 
 __END__
 
+=for test_synopsis
+no strict 'vars'
+
 =head1 SYNOPSIS
 
   my $http_request = Net::Amazon::S3::HTTPRequest->new(

diff --git a/lib/Net/Amazon/S3/Request/CreateBucket.pm b/lib/Net/Amazon/S3/Request/CreateBucket.pm
@@ -42,6 +42,9 @@ sub http_request {
 
 __END__
 
+=for test_synopsis
+no strict 'vars'
+
 =head1 SYNOPSIS
 
   my $http_request = Net::Amazon::S3::Request::CreateBucket->new(

diff --git a/lib/Net/Amazon/S3/Request/DeleteBucket.pm b/lib/Net/Amazon/S3/Request/DeleteBucket.pm
@@ -22,6 +22,9 @@ sub http_request {
 
 __END__
 
+=for test_synopsis
+no strict 'vars'
+
 =head1 SYNOPSIS
 
   my $http_request = Net::Amazon::S3::Request::DeleteBucket->new(

diff --git a/lib/Net/Amazon/S3/Request/DeleteObject.pm b/lib/Net/Amazon/S3/Request/DeleteObject.pm
@@ -24,6 +24,9 @@ sub http_request {
 
 __END__
 
+=for test_synopsis
+no strict 'vars'
+
 =head1 SYNOPSIS
 
   my $http_request = Net::Amazon::S3::Request::DeleteObject->new(

diff --git a/lib/Net/Amazon/S3/Request/GetBucketAccessControl.pm b/lib/Net/Amazon/S3/Request/GetBucketAccessControl.pm
@@ -23,6 +23,9 @@ sub http_request {
 
 __END__
 
+=for test_synopsis
+no strict 'vars'
+
 =head1 SYNOPSIS
 
   my $http_request = Net::Amazon::S3::Request::GetBucketAccessControl->new(

diff --git a/lib/Net/Amazon/S3/Request/GetBucketLocationConstraint.pm b/lib/Net/Amazon/S3/Request/GetBucketLocationConstraint.pm
@@ -23,6 +23,9 @@ sub http_request {
 
 __END__
 
+=for test_synopsis
+no strict 'vars'
+
 =head1 SYNOPSIS
 
   my $http_request = Net::Amazon::S3::Request::GetBucketLocationConstraint->new(

diff --git a/lib/Net/Amazon/S3/Request/GetObject.pm b/lib/Net/Amazon/S3/Request/GetObject.pm
@@ -35,6 +35,9 @@ sub query_string_authentication_uri {
 
 __END__
 
+=for test_synopsis
+no strict 'vars'
+
 =head1 SYNOPSIS
 
   my $http_request = Net::Amazon::S3::Request::GetObject->new(

diff --git a/lib/Net/Amazon/S3/Request/GetObjectAccessControl.pm b/lib/Net/Amazon/S3/Request/GetObjectAccessControl.pm
@@ -24,6 +24,9 @@ sub http_request {
 
 __END__
 
+=for test_synopsis
+no strict 'vars'
+
 =head1 SYNOPSIS
 
   my $http_request = Net::Amazon::S3::Request::GetObjectAccessControl->new(

diff --git a/lib/Net/Amazon/S3/Request/ListAllMyBuckets.pm b/lib/Net/Amazon/S3/Request/ListAllMyBuckets.pm
@@ -20,6 +20,9 @@ sub http_request {
 
 __END__
 
+=for test_synopsis
+no strict 'vars'
+
 =head1 SYNOPSIS
 
   my $http_request

diff --git a/lib/Net/Amazon/S3/Request/ListBucket.pm b/lib/Net/Amazon/S3/Request/ListBucket.pm
@@ -48,6 +48,9 @@ sub _urlencode {
 
 __END__
 
+=for test_synopsis
+no strict 'vars'
+
 =head1 SYNOPSIS
 
   my $http_request = Net::Amazon::S3::Request::ListBucket->new(

diff --git a/lib/Net/Amazon/S3/Request/PutObject.pm b/lib/Net/Amazon/S3/Request/PutObject.pm
@@ -35,6 +35,9 @@ sub http_request {
 
 __END__
 
+=for test_synopsis
+no strict 'vars'
+
 =head1 SYNOPSIS
 
   my $http_request = Net::Amazon::S3::Request::PutObject->new(

diff --git a/lib/Net/Amazon/S3/Request/SetBucketAccessControl.pm b/lib/Net/Amazon/S3/Request/SetBucketAccessControl.pm
@@ -41,6 +41,9 @@ sub http_request {
 
 __END__
 
+=for test_synopsis
+no strict 'vars'
+
 =head1 SYNOPSIS
 
   my $http_request = Net::Amazon::S3::Request::SetBucketAccessControl->new(

diff --git a/lib/Net/Amazon/S3/Request/SetObjectAccessControl.pm b/lib/Net/Amazon/S3/Request/SetObjectAccessControl.pm
@@ -42,6 +42,9 @@ sub http_request {
 
 __END__
 
+=for test_synopsis
+no strict 'vars'
+
 =head1 SYNOPSIS
 
   my $http_request = Net::Amazon::S3::Request::SetObjectAccessControl->new(

diff --git a/t/02client.t b/t/02client.t
@@ -33,19 +33,19 @@ my $client = Net::Amazon::S3::Client->new( s3 => $s3 );
 my @buckets = $client->buckets;
 
 TODO: {
-    local $TODO = "These tests only work if you're leon";
+    local $TODO = "These tests only work if you're pedro";
     my $first_bucket = $buckets[0];
-    like( $first_bucket->owner_id, qr/^46a801915a1711f/, 'have owner id' );
-    is( $first_bucket->owner_display_name, '_acme_', 'have display name' );
-    is( scalar @buckets, 10, 'have a bunch of buckets' );
+    like( $first_bucket->owner_id, qr/^c7483d612ac7f0c0/, 'have owner id' );
+    is( $first_bucket->owner_display_name, 'pedro_figueiredo', 'have display name' );
+    is( scalar @buckets, 6, 'have a bunch of buckets' );
 }
 
 my $bucket_name = 'net-amazon-s3-test-' . lc $aws_access_key_id;
 
 my $bucket = $client->create_bucket(
     name                => $bucket_name,
     acl_short           => 'public-read',
-    location_constraint => 'US',
+    location_constraint => 'EU',
 );
 
 is( $bucket->name, $bucket_name, 'newly created bucket has correct name' );
@@ -56,7 +56,7 @@ like(
     'newly created bucket is public-readable'
 );
 
-is( $bucket->location_constraint, 'US', 'newly created bucket is in the US' );
+is( $bucket->location_constraint, 'EU', 'newly created bucket is in the EU' );
 
 my $stream = $bucket->list;
 until ( $stream->is_done ) {