From 2fd683a151a9a4bdaf64d44468fbde4fa5226602 Mon Sep 17 00:00:00 2001 From: Mainframe2008 Date: Fri, 1 Feb 2013 12:46:04 +0100 Subject: Added support for searching with secondary indexes --- lib/Net/Riak/Role/REST/Object.pm | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'lib/Net/Riak/Role/REST/Object.pm') diff --git a/lib/Net/Riak/Role/REST/Object.pm b/lib/Net/Riak/Role/REST/Object.pm index fc45f3c..859e06b 100644 --- a/lib/Net/Riak/Role/REST/Object.pm +++ b/lib/Net/Riak/Role/REST/Object.pm @@ -1,6 +1,7 @@ package Net::Riak::Role::REST::Object; use Moose::Role; +use Data::Dumper; use JSON; sub store_object { @@ -32,13 +33,20 @@ sub store_object { $request->header('link' => $self->_links_to_header($object)); } + if ( $object->i2indexes) { + + foreach (keys %{$object->i2indexes}) { + $request->header(':x-riak-index-' . lc($_) => $object->i2indexes->{$_}); + } + } + if (ref $object->data && $object->content_type eq 'application/json') { $request->content(JSON::encode_json($object->data)); } else { $request->content($object->data); } - + my $response = $self->send_request($request); $self->populate_object($object, $response, [200, 201, 204, 300]); return $object; @@ -75,7 +83,8 @@ sub populate_object { $obj->exists(0); return if (!$http_response); - + + my $status = $http_response->code; $obj->data($http_response->content) @@ -91,6 +100,13 @@ sub populate_object { . (join(', ', @$expected)) . ", received: ".$http_response->status_line } + + $HTTP::Headers::TRANSLATE_UNDERSCORE = 0; + foreach ( $http_response->header_field_names ) { + next unless /^X-Riak-Index-(.+_bin)/; + $obj->i2index({ lc($1) => $http_response->header($_) }) + } + $HTTP::Headers::TRANSLATE_UNDERSCORE = 1; if ($status == 404) { $obj->clear; -- cgit v1.2.3 From 1b442767f0bc92b98c3a398dde02dae6212ecd1c Mon Sep 17 00:00:00 2001 From: Mainframe2008 Date: Tue, 26 Feb 2013 08:44:28 +0100 Subject: *Added secondary index support using method names from the riak python client. * Added tests for secondary indexes * Added documentation --- lib/Net/Riak/Role/REST/Object.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/Net/Riak/Role/REST/Object.pm') diff --git a/lib/Net/Riak/Role/REST/Object.pm b/lib/Net/Riak/Role/REST/Object.pm index 859e06b..545e4e0 100644 --- a/lib/Net/Riak/Role/REST/Object.pm +++ b/lib/Net/Riak/Role/REST/Object.pm @@ -103,8 +103,8 @@ sub populate_object { $HTTP::Headers::TRANSLATE_UNDERSCORE = 0; foreach ( $http_response->header_field_names ) { - next unless /^X-Riak-Index-(.+_bin)/; - $obj->i2index({ lc($1) => $http_response->header($_) }) + next unless /^X-Riak-Index-(.+_bin)$/ || /^X-Riak-Index-(.+_int)$/; + $obj->add_index(lc($1), $http_response->header($_) ) } $HTTP::Headers::TRANSLATE_UNDERSCORE = 1; -- cgit v1.2.3