Changeset 19718

Timestamp:

09/22/08 12:04:47 (5 years ago)

Author:

masaki

Message:

bulk_docs のテスト追加

Location:

lang/perl/CouchDB-Object/trunk

Files:

• lib/CouchDB/Object/Database.pm (modified) (2 diffs)
• lib/CouchDB/Object/Document.pm (modified) (2 diffs)
• t/04_documents.t (modified) (2 diffs)

lang/perl/CouchDB-Object/trunk/lib/CouchDB/Object/Database.pm

@@ -92 +92 @@
 
 sub bulk_docs {
-    my ($self, @docs) = @_;
+    my ($self, $docs) = @_;
 
-    my $body = sprintf '{ "docs": [%s] }', join ',', map { $_->to_json } @docs;
+    my $body = { docs => [ map { $_->to_hash } @$docs ] };
+    $body = CouchDB::Object::JSON->encode($body);
+
     my $header = HTTP::Headers->new('Content-Type' => 'application/json');
     my $res = $self->request(POST => $self->uri_for('_bulk_docs'), $header, $body);
@@ -100 +102 @@
     # merge
     if ($res->is_success) {
-        my $ea = each_array(@docs, @{ $res->content->{new_revs} });
+        my $ea = each_array(@$docs, @{ $res->content->{new_revs} });
         while (my ($doc, $content) = $ea->()) {
             $doc->id($content->{id})   if exists $content->{id};

lang/perl/CouchDB-Object/trunk/lib/CouchDB/Object/Document.pm

@@ -44 +44 @@
 sub to_json {
     my $self = shift;
+    return CouchDB::Object::JSON->encode($self->to_hash);
+}
+
+sub to_hash {
+    my $self = shift;
 
     my $hash = {};
@@ -49 +54 @@
     $hash->{_rev} = $self->rev if $self->has_rev;
 
-    $hash = Hash::Merge::merge({%{ $self->_fields }}, $hash);
-    return CouchDB::Object::JSON->encode($hash);
+    return Hash::Merge::merge({%{ $self->_fields }}, $hash);
 }
 

lang/perl/CouchDB-Object/trunk/t/04_documents.t

@@ -9 +9 @@
 }
 else {
-    plan tests => 287;
+    plan tests => 316;
 }
 
@@ -16 +16 @@
 END { $db->drop if $couch->ping }
 
-my $json = read_json('t/docs.json');
-my @docs = map { CouchDB::Object::Document->new_from_json($_) } @$json;
-
 # /{dbname}/_bulk_docs (bulk_docs)
-{ # 3
-    my $res = $db->bulk_docs(@docs);
+{ # 32
+    my $json = read_json('t/docs.json');
+    my @docs = map { CouchDB::Object::Document->new_from_json($_) } @$json;
+    my $res = $db->bulk_docs(\@docs);
     ok $res->is_success;
     ok $res->content->{ok};
-    ok $res->content->{new_revs};
+
+    for my $doc (@docs) { # 1 x 30 = 30
+        ok $doc->has_rev;
+    }
 }