add additional hacks around to ESXM to avoid type on ES7

Author: haarg

lib/ElasticSearchX/Model/Document/Role.pm

@@ -0,0 +1,24 @@
+package ElasticSearchX::Model::Document::Role;
+use strict;
+use warnings;
+
+use MetaCPAN::Model::Hacks;
+
+no warnings 'redefine';
+
+my $_put = \&_put;
+*_put = sub {
+    my ($self) = @_;
+    my $es = $self->index->model->es;
+
+    my %return = &$_put;
+
+    if ( $es->api_version le '6_0' ) {
+        return %return;
+    }
+
+    delete $return{type};
+    return %return;
+};
+
+1;

lib/MetaCPAN/Model/ESWrapper.pm

@@ -0,0 +1,61 @@
+package MetaCPAN::Model::ESWrapper;
+use strict;
+use warnings;
+
+use MetaCPAN::Types::TypeTiny qw(ES);
+
+sub new {
+    my ( $class, $es ) = @_;
+    if ( $es->api_version le '6_0' ) {
+        return $es;
+    }
+    return bless { es => ES->assert_coerce($es) }, $class;
+}
+
+sub DESTROY { }
+
+sub AUTOLOAD {
+    my $sub  = our $AUTOLOAD =~ s/.*:://r;
+    my $self = shift;
+    $self->{es}->$sub(@_);
+}
+
+sub _args {
+    my $self = shift;
+    if ( @_ == 1 ) {
+        return ( $self, %{ $_[0] } );
+    }
+    return ( $self, @_ );
+}
+
+sub count {
+    my ( $self, %args ) = &_args;
+    delete $args{type};
+    $self->{es}->count(%args);
+}
+
+sub get {
+    my ( $self, %args ) = &_args;
+    delete $args{type};
+    $self->{es}->get(%args);
+}
+
+sub delete {
+    my ( $self, %args ) = &_args;
+    delete $args{type};
+    $self->{es}->delete(%args);
+}
+
+sub search {
+    my ( $self, %args ) = &_args;
+    delete $args{type};
+    $self->{es}->search(%args);
+}
+
+sub scroll_helper {
+    my ( $self, %args ) = &_args;
+    delete $args{type};
+    $self->{es}->scroll_helper(%args);
+}
+
+1;

lib/MetaCPAN/Role/Script.pm

@@ -2,14 +2,15 @@ package MetaCPAN::Role::Script;
 
 use Moose::Role;
 
-use Carp                      ();
-use IO::Prompt::Tiny          qw( prompt );
-use Log::Contextual           qw( :log :dlog );
-use MetaCPAN::Model           ();
-use MetaCPAN::Types::TypeTiny qw( AbsPath Bool ES HashRef Int Path Str );
-use MetaCPAN::Util            qw( root_dir );
-use Mojo::Server              ();
-use Term::ANSIColor           qw( colored );
+use Carp                       ();
+use IO::Prompt::Tiny           qw( prompt );
+use Log::Contextual            qw( :log :dlog );
+use MetaCPAN::Model            ();
+use MetaCPAN::Types::TypeTiny  qw( AbsPath Bool ES HashRef Int Path Str );
+use MetaCPAN::Util             qw( root_dir );
+use Mojo::Server               ();
+use Term::ANSIColor            qw( colored );
+use MetaCPAN::Model::ESWrapper ();
 
 use MooseX::Getopt::OptionTypeMap ();
 for my $type ( Path, AbsPath, ES ) {
@@ -136,7 +137,9 @@ sub _build_model {
     my $self = shift;
 
     # es provided by ElasticSearchX::Model::Role
-    return MetaCPAN::Model->new( es => $self->es );
+
+    my $es = MetaCPAN::Model::ESWrapper->new( $self->es );
+    return MetaCPAN::Model->new( es => $es );
 }
 
 sub _build_ua {

lib/MetaCPAN/Server/Model/ESModel.pm

@@ -2,7 +2,8 @@ package MetaCPAN::Server::Model::ESModel;
 
 use Moose;
 
-use MetaCPAN::Model ();
+use MetaCPAN::Model            ();
+use MetaCPAN::Model::ESWrapper ();
 
 extends 'Catalyst::Model';
 
@@ -16,7 +17,8 @@ has _esx_model => (
     lazy    => 1,
     default => sub {
         my $self = shift;
-        MetaCPAN::Model->new( es => $self->es );
+        my $es   = MetaCPAN::Model::ESWrapper->new( $self->es );
+        MetaCPAN::Model->new( es => $es );
     },
 );