WIP: Remove EsX::Model dependency

This is WIP, do NOT merge into master !!!

Author: mickeyn

lib/MetaCPAN/Document/Contributor.pm

@@ -2,7 +2,6 @@ package MetaCPAN::Document::Contributor;
 
 use MetaCPAN::Moose;
 
-use ElasticSearchX::Model::Document;
 use MetaCPAN::Types qw( Str );
 
 has distribution => (

lib/MetaCPAN/Document/Release/Set.pm

@@ -6,7 +6,7 @@ use MetaCPAN::Util qw( single_valued_arrayref_to_scalar );
 
 use MetaCPAN::Query::Release;
 
-extends 'ElasticSearchX::Model::Document::Set';
+with 'MetaCPAN::Role::ES';
 
 has query_release => (
     is      => 'ro',
@@ -37,9 +37,10 @@ has query_release => (
 
 sub _build_query_release {
     my $self = shift;
+
     return MetaCPAN::Query::Release->new(
         es         => $self->es,
-        index_name => $self->index->name,
+        index_name => 'cpan',
     );
 }
 

lib/MetaCPAN/Role/ES.pm

@@ -0,0 +1,22 @@
+package MetaCPAN::Role::ES;
+
+use Moose::Role;
+use MooseX::Types::ElasticSearch qw(:all);
+
+has es => (
+    is      => 'ro',
+    isa     => ES,
+    lazy    => 1,
+    coerce  => 1,
+    builder => '_build_es',
+);
+
+sub _build_es {
+    return Search::Elasticsearch->new(
+        client => '2_0::Direct',
+        ( $ENV{ES} ? ( nodes => [ $ENV{ES} ] ) : () ),
+    );
+}
+
+no Moose::Role;
+1;

lib/MetaCPAN/Role/Script.pm

@@ -2,11 +2,9 @@ package MetaCPAN::Role::Script;
 
 use Moose::Role;
 
-use ElasticSearchX::Model::Document::Types qw(:all);
 use FindBin;
 use Git::Helpers qw( checkout_root );
 use Log::Contextual qw( :log :dlog );
-use MetaCPAN::Model;
 use MetaCPAN::Types qw(:all);
 use Mojo::Server;
 use Term::ANSIColor qw( colored );
@@ -16,8 +14,10 @@ use File::Path ();
 
 use Carp ();
 
-with( 'MetaCPAN::Role::HasConfig', 'MetaCPAN::Role::Fastly',
-    'MetaCPAN::Role::Logger' );
+with(
+    'MetaCPAN::Role::HasConfig', 'MetaCPAN::Role::Fastly',
+    'MetaCPAN::Role::Logger',    'MetaCPAN::Role::ES'
+);
 
 has cpan => (
     is      => 'ro',
@@ -48,21 +48,6 @@ has proxy => (
     default => '',
 );
 
-has es => (
-    is            => 'ro',
-    isa           => ES,
-    required      => 1,
-    coerce        => 1,
-    documentation => 'Elasticsearch http connection string',
-);
-
-has model => (
-    is      => 'ro',
-    lazy    => 1,
-    builder => '_build_model',
-    traits  => ['NoGetopt'],
-);
-
 has index => (
     reader  => '_index',
     is      => 'ro',
@@ -119,7 +104,6 @@ sub BUILDARGS {
             unless $ENV{'ES_SCRIPT_INDEX'}
             and $args{'index'} eq $ENV{'ES_SCRIPT_INDEX'};
     }
-
     return \%args;
 }
 
@@ -133,18 +117,6 @@ sub handle_error {
     Carp::croak $error if $self->die_on_error;
 }
 
-sub index {
-    my $self = shift;
-    return $self->model->index( $self->_index );
-}
-
-sub _build_model {
-    my $self = shift;
-
-    # es provided by ElasticSearchX::Model::Role
-    return MetaCPAN::Model->new( es => $self->es );
-}
-
 sub _build_ua {
     my $self  = shift;
     my $ua    = LWP::UserAgent->new;

lib/MetaCPAN/Script/Contributor.pm

@@ -84,7 +84,7 @@ sub run {
     my $scroll = $self->es->scroll_helper(
         size   => 500,
         scroll => $timeout,
-        index  => $self->index->name,
+        index  => 'cpan',
         type   => 'release',
         body   => { query => $query },
         fields => [qw( author distribution name )],

lib/MetaCPAN/Script/Role/Contributor.pm

@@ -5,12 +5,14 @@ use Moose::Role;
 use MetaCPAN::Util qw( digest );
 use Ref::Util qw( is_arrayref );
 
+use MetaCPAN::Document::Release::Set;
+
 sub get_cpan_author_contributors {
     my ( $self, $author, $release, $distribution ) = @_;
     my @ret;
     my $es = $self->es;
 
-    my $type = $self->index->type('release');
+    my $type = MetaCPAN::Document::Release::Set->new();
     my $data;
     eval {
         $data = $type->get_contributors( $author, $release );
@@ -21,7 +23,7 @@ sub get_cpan_author_contributors {
         next unless exists $d->{pauseid};
 
         # skip existing records
-        my $id     = digest( $d->{pauseid}, $release );
+        my $id = digest( $d->{pauseid}, $release );
         my $exists = $es->exists(
             index => 'contributor',
             type  => 'contributor',