From 9e4c681beae5a7a223cf84d411a12a1ccb3daa6f Mon Sep 17 00:00:00 2001
From: gmaurice <germain.maurice@linkfluence.net>
Date: Wed, 22 Jun 2011 19:27:21 +0200
Subject: add basic support of riaksearch (need to see what is missed)

---
 lib/Net/Riak/Client.pm           |  5 +++++
 lib/Net/Riak/Role/REST.pm        |  1 +
 lib/Net/Riak/Role/REST/Search.pm | 28 ++++++++++++++++++++++++++++
 lib/Net/Riak/Search.pm           | 15 +++++++++++++++
 4 files changed, 49 insertions(+)
 create mode 100644 lib/Net/Riak/Role/REST/Search.pm
 create mode 100644 lib/Net/Riak/Search.pm

(limited to 'lib/Net/Riak')

diff --git a/lib/Net/Riak/Client.pm b/lib/Net/Riak/Client.pm
index f38bec6..ad9315e 100644
--- a/lib/Net/Riak/Client.pm
+++ b/lib/Net/Riak/Client.pm
@@ -15,6 +15,11 @@ has mapred_prefix => (
     isa     => 'Str',
     default => 'mapred'
 );
+has search_prefix => (
+    is      => 'rw',
+    isa     => 'Str',
+    default => 'solr'
+);
 has [qw/r w dw/] => (
     is      => 'rw',
     isa     => 'Int',
diff --git a/lib/Net/Riak/Role/REST.pm b/lib/Net/Riak/Role/REST.pm
index dfab5a0..261d573 100644
--- a/lib/Net/Riak/Role/REST.pm
+++ b/lib/Net/Riak/Role/REST.pm
@@ -12,6 +12,7 @@ with qw/Net::Riak::Role::REST::Bucket
     Net::Riak::Role::REST::Object 
     Net::Riak::Role::REST::Link
     Net::Riak::Role::REST::MapReduce
+    Net::Riak::Role::REST::Search
     /;
 
 has http_request => (
diff --git a/lib/Net/Riak/Role/REST/Search.pm b/lib/Net/Riak/Role/REST/Search.pm
new file mode 100644
index 0000000..c75b84b
--- /dev/null
+++ b/lib/Net/Riak/Role/REST/Search.pm
@@ -0,0 +1,28 @@
+package Net::Riak::Role::REST::Search;
+use Moose::Role;
+use JSON;
+
+sub search {
+    my ( $self, $params) = @_;
+
+    my $request;
+    $request =
+      $self->new_request( 'GET',
+        [ $self->search_prefix, "select" ], $params ) unless $params->{index};
+    $request =
+      $self->new_request( 'GET',
+        [ $self->search_prefix, $params->{index}, "select" ], $params ) if $params->{index};
+
+    my $http_response = $self->send_request($request);
+
+    return if (!$http_response);
+
+    my $status = $http_response->code;
+    if ($status == 404) {
+        return;
+    }
+    JSON::decode_json($http_response->content);
+};
+
+
+1;
diff --git a/lib/Net/Riak/Search.pm b/lib/Net/Riak/Search.pm
new file mode 100644
index 0000000..ac9f059
--- /dev/null
+++ b/lib/Net/Riak/Search.pm
@@ -0,0 +1,15 @@
+package Net::Riak::Search;
+
+# ABSTRACT: the riaklink object represents a link from one Riak object to another
+
+use Moose;
+
+with 'Net::Riak::Role::Base' => {classes =>
+      [{name => 'client', required => 0},]};
+
+sub search {
+    my ($self, $params) = @_;
+    $self->client->search($params);
+};
+
+1;
-- 
cgit v1.2.3


From 4fe4d90d96b77a2265be5f808f9ed0c2612d28d1 Mon Sep 17 00:00:00 2001
From: gmaurice <germain.maurice@linkfluence.net>
Date: Sat, 25 Jun 2011 20:52:38 +0200
Subject: remove index param from being added to query params

---
 lib/Net/Riak/Role/REST/Search.pm | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'lib/Net/Riak')

diff --git a/lib/Net/Riak/Role/REST/Search.pm b/lib/Net/Riak/Role/REST/Search.pm
index c75b84b..161acf5 100644
--- a/lib/Net/Riak/Role/REST/Search.pm
+++ b/lib/Net/Riak/Role/REST/Search.pm
@@ -9,10 +9,13 @@ sub search {
     $request =
       $self->new_request( 'GET',
         [ $self->search_prefix, "select" ], $params ) unless $params->{index};
-    $request =
-      $self->new_request( 'GET',
-        [ $self->search_prefix, $params->{index}, "select" ], $params ) if $params->{index};
-
+    if ( $params->{index} ){
+        my $index = delete $params->{index};
+        $request =
+            $self->new_request( 'GET',
+                [ $self->search_prefix, $index, "select" ], $params );
+    }
+    
     my $http_response = $self->send_request($request);
 
     return if (!$http_response);
@@ -21,6 +24,8 @@ sub search {
     if ($status == 404) {
         return;
     }
+use YAML::Syck;
+warn Dump $http_response;
     JSON::decode_json($http_response->content);
 };
 
-- 
cgit v1.2.3


From ade1fc13ec613d2318a9c3517bc40837d99f4d99 Mon Sep 17 00:00:00 2001
From: gmaurice <germain.maurice@linkfluence.net>
Date: Sat, 2 Jul 2011 00:03:55 +0200
Subject: allow to setup indexing on a bucket via precommit add tests for
 riaksearch

---
 lib/Net/Riak/Role/REST/Search.pm | 59 ++++++++++++++++++++++++++++++++++------
 lib/Net/Riak/Search.pm           |  7 +++--
 2 files changed, 55 insertions(+), 11 deletions(-)

(limited to 'lib/Net/Riak')

diff --git a/lib/Net/Riak/Role/REST/Search.pm b/lib/Net/Riak/Role/REST/Search.pm
index 161acf5..642964b 100644
--- a/lib/Net/Riak/Role/REST/Search.pm
+++ b/lib/Net/Riak/Role/REST/Search.pm
@@ -3,17 +3,18 @@ use Moose::Role;
 use JSON;
 
 sub search {
-    my ( $self, $params) = @_;
-
+    my $self = shift;
+    my %params = @_;
     my $request;
+
     $request =
       $self->new_request( 'GET',
-        [ $self->search_prefix, "select" ], $params ) unless $params->{index};
-    if ( $params->{index} ){
-        my $index = delete $params->{index};
+        [ $self->search_prefix, "select" ], \%params ) unless $params{index};
+    if ( $params{index} ){
+        my $index = delete $params{index};
         $request =
             $self->new_request( 'GET',
-                [ $self->search_prefix, $index, "select" ], $params );
+                [ $self->search_prefix, $index, "select" ], \%params );
     }
     
     my $http_response = $self->send_request($request);
@@ -24,10 +25,50 @@ sub search {
     if ($status == 404) {
         return;
     }
-use YAML::Syck;
-warn Dump $http_response;
-    JSON::decode_json($http_response->content);
+
+    return JSON::decode_json($http_response->content) if $params{wt} =~ /json/i;
+    $http_response->content;
 };
 
+sub setup_indexing {
+    my ( $self, $bucket ) = @_;
+    my $request = 
+        $self->new_request( 'GET',
+            [ $self->prefix, $bucket ] );
+
+    my $http_response = $self->send_request($request);
+    
+    return if (!$http_response);
+    my $status = $http_response->code;
+    if ($status == 404) {
+        return;
+    }
+    
+    my $precommits = JSON::decode_json($http_response->content)->{props}->{precommit};
+
+    for (@$precommits){
+        return JSON::decode_json($http_response->content) if $_->{mod} eq "riak_search_kv_hook";
+    } 
+    push ( @$precommits, { mod => "riak_search_kv_hook" , fun => "precommit" } );
+
+    $request = $self->new_request( 'PUT', [ $self->prefix, $bucket ] );
+    $request->content( JSON::encode_json({ props => { precommit => $precommits } } ) );
+    $request->header('Content-Type' => "application/json" );
+
+    $http_response = $self->send_request($request);
+    
+    return if (!$http_response);
+    $status = $http_response->code;
+    if ($status == 404) {
+        return;
+    }
+    $request = 
+        $self->new_request( 'GET',
+            [ $self->prefix, $bucket ] );
+
+    $http_response = $self->send_request($request);
+
+    JSON::decode_json($http_response->content);
+} 
 
 1;
diff --git a/lib/Net/Riak/Search.pm b/lib/Net/Riak/Search.pm
index ac9f059..8cf42b7 100644
--- a/lib/Net/Riak/Search.pm
+++ b/lib/Net/Riak/Search.pm
@@ -1,7 +1,5 @@
 package Net::Riak::Search;
 
-# ABSTRACT: the riaklink object represents a link from one Riak object to another
-
 use Moose;
 
 with 'Net::Riak::Role::Base' => {classes =>
@@ -12,4 +10,9 @@ sub search {
     $self->client->search($params);
 };
 
+sub setup_indexing {
+    my ($self, $bucket) = @_;
+    $self->client->setup_indexing($bucket);
+};
+
 1;
-- 
cgit v1.2.3


From 08cf0c72671e94086352b03683e1ad57348bee1f Mon Sep 17 00:00:00 2001
From: gmaurice <germain.maurice@linkfluence.net>
Date: Thu, 7 Jul 2011 13:19:06 +0200
Subject: documentation added for search

---
 lib/Net/Riak/Role/REST/Search.pm |  4 ++-
 lib/Net/Riak/Search.pm           | 69 +++++++++++++++++++++++++++++++++++++++-
 2 files changed, 71 insertions(+), 2 deletions(-)

(limited to 'lib/Net/Riak')

diff --git a/lib/Net/Riak/Role/REST/Search.pm b/lib/Net/Riak/Role/REST/Search.pm
index 642964b..6748b20 100644
--- a/lib/Net/Riak/Role/REST/Search.pm
+++ b/lib/Net/Riak/Role/REST/Search.pm
@@ -2,6 +2,8 @@ package Net::Riak::Role::REST::Search;
 use Moose::Role;
 use JSON;
 
+#ABSTRACT: Search interface
+
 sub search {
     my $self = shift;
     my %params = @_;
@@ -71,4 +73,4 @@ sub setup_indexing {
     JSON::decode_json($http_response->content);
 } 
 
-1;
+1;
\ No newline at end of file
diff --git a/lib/Net/Riak/Search.pm b/lib/Net/Riak/Search.pm
index 8cf42b7..a6282de 100644
--- a/lib/Net/Riak/Search.pm
+++ b/lib/Net/Riak/Search.pm
@@ -1,7 +1,8 @@
 package Net::Riak::Search;
-
 use Moose;
 
+#ABSTRACT: Search interface
+
 with 'Net::Riak::Role::Base' => {classes =>
       [{name => 'client', required => 0},]};
 
@@ -16,3 +17,69 @@ sub setup_indexing {
 };
 
 1;
+
+
+=head1 SYNOPSIS
+
+    my $client = Net::Riak->new(...);
+    my $bucket = $client->bucket('foo');
+
+    # retrieve an existing object
+    my $obj1 = $bucket->get('foo');
+
+    # create/store a new object
+    my $obj2 = $bucket->new_object('foo2', {...});
+    $object->store;
+
+    $bucket->delete_object($key, 3); # optional w val
+
+=head1 DESCRIPTION
+
+L<Net::Riak::Search> allows you to enable indexing documents for a given bucket and querying/searching the index.
+
+=head2 METHODS
+
+=head3 setup_indexing
+
+    $client->setup_indexing('bucket_name');
+
+Does the same as :
+
+    curl -X PUT -H "content-type:application/json" http://localhost:8098/riak/bucket_name -d '{"props":{"precommit":[{"mod":"riak_search_kv_hook","fun":"precommit"}]}' 
+	
+but takes in account previouses precommits.
+
+=head3 search
+
+    my $response = $client->search(
+        index => 'bucket_name',
+        q => 'field:value'
+    );
+    # is the same as :
+    my $response = $client->search(
+        q => 'bucket_name.field:value'
+    );
+
+Search the index
+
+=over 4
+
+=item wt => 'XML|JSON'
+
+defines the response format (XML is the default value as for Solr/Lucene)
+
+=item q
+
+the query string
+
+=item index
+
+is the default index you want to query, if no index is provided you have to add it as a prefix of the fields in the query string
+
+=item rows
+
+is the number of documents you want to be returned in the response
+
+=back
+
+More parameters are available, just check at L<http://wiki.basho.com/Riak-Search---Querying.html#Querying-via-the-Solr-Interface>
\ No newline at end of file
-- 
cgit v1.2.3


From 94209555eaa12357b177f36be40497a9b0d83ed6 Mon Sep 17 00:00:00 2001
From: franck cuny <franck@lumberjaph.net>
Date: Thu, 7 Jul 2011 13:23:39 +0200
Subject: perltidy + whitespaces removed

Signed-off-by: franck cuny <franck@lumberjaph.net>
---
 lib/Net/Riak/Search.pm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'lib/Net/Riak')

diff --git a/lib/Net/Riak/Search.pm b/lib/Net/Riak/Search.pm
index a6282de..ee2ed57 100644
--- a/lib/Net/Riak/Search.pm
+++ b/lib/Net/Riak/Search.pm
@@ -1,4 +1,5 @@
-package Net::Riak::Search;
+package
+Net::Riak::Search;
 use Moose;
 
 #ABSTRACT: Search interface
@@ -18,7 +19,6 @@ sub setup_indexing {
 
 1;
 
-
 =head1 SYNOPSIS
 
     my $client = Net::Riak->new(...);
@@ -45,8 +45,8 @@ L<Net::Riak::Search> allows you to enable indexing documents for a given bucket
 
 Does the same as :
 
-    curl -X PUT -H "content-type:application/json" http://localhost:8098/riak/bucket_name -d '{"props":{"precommit":[{"mod":"riak_search_kv_hook","fun":"precommit"}]}' 
-	
+    curl -X PUT -H "content-type:application/json" http://localhost:8098/riak/bucket_name -d '{"props":{"precommit":[{"mod":"riak_search_kv_hook","fun":"precommit"}]}'
+
 but takes in account previouses precommits.
 
 =head3 search
@@ -82,4 +82,4 @@ is the number of documents you want to be returned in the response
 
 =back
 
-More parameters are available, just check at L<http://wiki.basho.com/Riak-Search---Querying.html#Querying-via-the-Solr-Interface>
\ No newline at end of file
+More parameters are available, just check at L<http://wiki.basho.com/Riak-Search---Querying.html#Querying-via-the-Solr-Interface>
-- 
cgit v1.2.3


From 61ec75a67b45b696c8e078c89f44139117e8360f Mon Sep 17 00:00:00 2001
From: franck cuny <franck@lumberjaph.net>
Date: Thu, 7 Jul 2011 13:24:24 +0200
Subject: removed more white spaces

Signed-off-by: franck cuny <franck@lumberjaph.net>
---
 lib/Net/Riak/Role/REST/Search.pm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'lib/Net/Riak')

diff --git a/lib/Net/Riak/Role/REST/Search.pm b/lib/Net/Riak/Role/REST/Search.pm
index 6748b20..b83e3d4 100644
--- a/lib/Net/Riak/Role/REST/Search.pm
+++ b/lib/Net/Riak/Role/REST/Search.pm
@@ -18,7 +18,7 @@ sub search {
             $self->new_request( 'GET',
                 [ $self->search_prefix, $index, "select" ], \%params );
     }
-    
+
     my $http_response = $self->send_request($request);
 
     return if (!$http_response);
@@ -34,23 +34,23 @@ sub search {
 
 sub setup_indexing {
     my ( $self, $bucket ) = @_;
-    my $request = 
+    my $request =
         $self->new_request( 'GET',
             [ $self->prefix, $bucket ] );
 
     my $http_response = $self->send_request($request);
-    
+
     return if (!$http_response);
     my $status = $http_response->code;
     if ($status == 404) {
         return;
     }
-    
+
     my $precommits = JSON::decode_json($http_response->content)->{props}->{precommit};
 
     for (@$precommits){
         return JSON::decode_json($http_response->content) if $_->{mod} eq "riak_search_kv_hook";
-    } 
+    }
     push ( @$precommits, { mod => "riak_search_kv_hook" , fun => "precommit" } );
 
     $request = $self->new_request( 'PUT', [ $self->prefix, $bucket ] );
@@ -58,19 +58,19 @@ sub setup_indexing {
     $request->header('Content-Type' => "application/json" );
 
     $http_response = $self->send_request($request);
-    
+
     return if (!$http_response);
     $status = $http_response->code;
     if ($status == 404) {
         return;
     }
-    $request = 
+    $request =
         $self->new_request( 'GET',
             [ $self->prefix, $bucket ] );
 
     $http_response = $self->send_request($request);
 
     JSON::decode_json($http_response->content);
-} 
+}
 
-1;
\ No newline at end of file
+1;
-- 
cgit v1.2.3