s/v1/cpan/

oalders · oalders · commit 1a6102f3e823 · 2016-11-19T19:49:28.000-06:00
diff --git a/README.md b/README.md
@@ -82,13 +82,15 @@ v1:
 use Search::Elasticsearch;
 my $es = Search::Elasticsearch->new(
     cxn_pool         => 'Static::NoPing',
-    nodes            => 'https://fastapi.metacpan.org',
+    nodes            => 'https://fastapi.metacpan.org/v1',
     send_get_body_as => 'POST',
     trace_to         => 'Stdout',
 );
 ```
 
-* The URL of the v1 API is https://fastapi.metacpan.org  Note that not only is the host name new, but we've also switched to https.
+* The node URL of the v1 API is https://fastapi.metacpan.org/v1  Note that not
+  only is the host name new, but we've also switched to https and also added
+  the version to the path.
 
 * You'll need to set `send_get_body_as => 'POST'`.  This is because v1 does not accept `GET` with a body.
 
@@ -112,7 +114,7 @@ my $faves = $es->search(
 
 ```perl
 my $faves = es()->search(
-    index => 'v1',
+    index => 'cpan',
     type  => 'favorite',
     body  => {
         aggs => {
@@ -124,7 +126,7 @@ my $faves = es()->search(
 );
 ``` 
 
-* The index is now `v1`
+* The index name is now `cpan`
 * `match_all` is the default query type, so it's not required to specify it
 * `facets` have been replaced by `aggs`
 * The data structure returned for `facets` does not mirror the `aggs` return values, so you'll need to rework your logic when checking the return values.
@@ -138,4 +140,4 @@ v1: `https://fastapi.metacpan.org/v1/author/MSTROUT`
 
 * Note the new host name
 * Note that we now use HTTPS
-* Note that the path begins with v0 rather than v1
+* Note that the path begins with v1 rather than v0
diff --git a/lib/MetaCPAN/Util.pm b/lib/MetaCPAN/Util.pm
@@ -9,7 +9,7 @@ use Sub::Exporter -setup => { exports => ['es'] };
 sub es {
     return Search::Elasticsearch->new(
         cxn_pool         => 'Static::NoPing',
-        nodes            => 'https://fastapi.metacpan.org',
+        nodes            => 'https://fastapi.metacpan.org/v1',
         send_get_body_as => 'POST',
         trace_to         => 'Stdout',
     );
diff --git a/scripts/author/1-fetch-single-author-es.pl b/scripts/author/1-fetch-single-author-es.pl
@@ -13,7 +13,7 @@
 );
 
 my $author = $es->get(
-    index => 'v1',
+    index => 'cpan',
     type  => 'author',
     id    => 'MSTROUT',
 );
diff --git a/scripts/author/1b-scroll-all-authors-es.pl b/scripts/author/1b-scroll-all-authors-es.pl
@@ -9,7 +9,7 @@
 my $scroller = es()->scroll_helper(
     search_type => 'scan',
     scroll      => '5m',
-    index       => 'v1',
+    index       => 'cpan',
     type        => 'author',
     size        => 100,
     body        => {
diff --git a/scripts/author/1c-scroll-all-authors-with-twitter-es.pl b/scripts/author/1c-scroll-all-authors-with-twitter-es.pl
@@ -9,7 +9,7 @@
 my $scroller = es()->scroll_helper(
     search_type => 'scan',
     scroll      => '5m',
-    index       => 'v1',
+    index       => 'cpan',
     type        => 'author',
     size        => 100,
     body        => {
diff --git a/scripts/author/2-twitter-or-github-es.pl b/scripts/author/2-twitter-or-github-es.pl
@@ -9,7 +9,7 @@
 my $scroller = es()->scroll_helper(
     search_type => 'scan',
     scroll      => '5m',
-    index       => 'v1',
+    index       => 'cpan',
     type        => 'author',
     size        => 100,
     body        => {
diff --git a/scripts/distribution/1-bugs-for-dist-es.pl b/scripts/distribution/1-bugs-for-dist-es.pl
@@ -7,7 +7,7 @@
 use MetaCPAN::Util qw( es );
 
 my $dist = es()->get(
-    index => 'v1',
+    index => 'cpan',
     type  => 'distribution',
     id    => 'Moose',
 );
diff --git a/scripts/favorite/1-last-50-favorited-dists-es.pl b/scripts/favorite/1-last-50-favorited-dists-es.pl
@@ -7,7 +7,7 @@
 use MetaCPAN::Util qw( es );
 
 my $faves = es()->search(
-    index => 'v1',
+    index => 'cpan',
     type  => 'favorite',
     body  => {
         query => { match_all => {} },
diff --git a/scripts/favorite/1a-last-100-favorited-dists-by-user-es.pl b/scripts/favorite/1a-last-100-favorited-dists-by-user-es.pl
@@ -11,7 +11,7 @@
 die "usage: ./bin/carton $0 \$user_id" if !$id;
 
 my $faves = es()->search(
-    index => 'v1',
+    index => 'cpan',
     type  => 'favorite',
     body  => {
         query => {
diff --git a/scripts/favorite/2-favorites-previous-month-es.pl b/scripts/favorite/2-favorites-previous-month-es.pl
@@ -11,7 +11,7 @@
 my $then = $now->clone->subtract( months => 1 );
 
 my $faves = es()->search(
-    index => 'v1',
+    index => 'cpan',
     type  => 'favorite',
     body  => {
         query => {
diff --git a/scripts/favorite/3-leaderboard-es.pl b/scripts/favorite/3-leaderboard-es.pl
@@ -7,7 +7,7 @@
 use MetaCPAN::Util qw( es );
 
 my $faves = es()->search(
-    index => 'v1',
+    index => 'cpan',
     type  => 'favorite',
     body  => {
         aggs => {
diff --git a/scripts/favorite/4-leaderboard-previous-month-es.pl b/scripts/favorite/4-leaderboard-previous-month-es.pl
@@ -11,7 +11,7 @@
 my $then = $now->clone->subtract( months => 1 );
 
 my $faves = es()->search(
-    index => 'v1',
+    index => 'cpan',
     type  => 'favorite',
     body  => {
         query => {
diff --git a/scripts/favorite/5-plus-plus-your-favorites-es.pl b/scripts/favorite/5-plus-plus-your-favorites-es.pl
@@ -15,7 +15,7 @@
     unless @modules;
 
 my $module = es()->search(
-    index  => 'v1',
+    index  => 'cpan',
     type   => 'file',
     fields => 'release',
     size   => scalar @modules,
@@ -42,7 +42,7 @@
     = map { $_->{fields}->{release} } @{ $module->{hits}->{hits} };
 
 my $release = es()->search(
-    index => 'v1',
+    index => 'cpan',
     type  => 'release',
     size  => scalar @release_names,
     body  => {
diff --git a/scripts/favorite/6-list-plussers-by-module.pl b/scripts/favorite/6-list-plussers-by-module.pl
@@ -16,7 +16,7 @@
 my $module = MetaCPAN::Client->new->module($module_name);
 
 my $plussers = es()->search(
-    index => 'v1',
+    index => 'cpan',
     type  => 'favorite',
     size  => 1000,
     body  => {
@@ -35,7 +35,7 @@
 my $total = @ids;
 
 my $authors = es()->search(
-    index => 'v1',
+    index => 'cpan',
     type  => 'author',
     size  => scalar @ids,
     body  => {
diff --git a/scripts/file/1-get-files-in-dist-es.pl b/scripts/file/1-get-files-in-dist-es.pl
@@ -8,7 +8,7 @@
 use MetaCPAN::Util qw( es );
 
 my $files = es()->search(
-    index => 'v1',
+    index => 'cpan',
     type  => 'file',
     size  => 300,
     body  => {
diff --git a/scripts/file/2-get-dists-with-cpanfile.pl b/scripts/file/2-get-dists-with-cpanfile.pl
@@ -8,7 +8,7 @@
 use MetaCPAN::Util qw( es );
 
 my $files = es()->search(
-    index => 'v1',
+    index => 'cpan',
     type  => 'file',
     size  => 10,
     body  => {
diff --git a/scripts/file/3-find-files-in-top-level-by-name.pl b/scripts/file/3-find-files-in-top-level-by-name.pl
@@ -8,7 +8,7 @@
 use MetaCPAN::Util qw( es );
 
 my $files = es()->search(
-    index => 'v1',
+    index => 'cpan',
     type  => 'file',
     size  => 10,
     body  => {
diff --git a/scripts/file/4-main-search.pl b/scripts/file/4-main-search.pl
@@ -13,7 +13,7 @@
 }
 
 my $result = es()->search(
-    index => 'v1',
+    index => 'cpan',
     type  => 'file',
     body  => {
         query => {
diff --git a/scripts/module/1-fetch-single-module-es.pl b/scripts/module/1-fetch-single-module-es.pl
@@ -7,7 +7,7 @@
 use MetaCPAN::Util qw( es );
 
 my $module = es()->get(
-    index => 'v1',
+    index => 'cpan',
     type  => 'module',
     id    => 'HTML::Restrict',
 );
diff --git a/scripts/release/1-pkg2url-es.pl b/scripts/release/1-pkg2url-es.pl
@@ -13,7 +13,7 @@
 );
 
 my $release = $es->search(
-    index => 'v1',
+    index => 'cpan',
     type  => 'release',
     body  => {
         filter => { term => { 'archive' => 'Acme-Hoge-0.03.tar.gz' } },
diff --git a/scripts/release/1a-module2url-es.pl b/scripts/release/1a-module2url-es.pl
@@ -13,7 +13,7 @@
 );
 
 my $module = $es->search(
-    index => 'v1',
+    index => 'cpan',
     type  => 'file',
     body  => {
         query  => { match_all => {} },
@@ -30,7 +30,7 @@
 my $release_name = $module->{hits}{hits}[0]{_source}{release};
 
 my $release = $es->search(
-    index => 'v1',
+    index => 'cpan',
     type  => 'release',
     body  => {
         filter => { term => { 'name' => $release_name } },
diff --git a/scripts/release/2-author-upload-leaderboard-es.pl b/scripts/release/2-author-upload-leaderboard-es.pl
@@ -7,7 +7,7 @@
 use MetaCPAN::Util qw( es );
 
 my $uploads = es()->search(
-    index => 'v1',
+    index => 'cpan',
     type  => 'release',
     body  => {
         query => { match_all => {} },
diff --git a/scripts/release/3-author-uploads-one-author-es.pl b/scripts/release/3-author-uploads-one-author-es.pl
@@ -7,7 +7,7 @@
 use MetaCPAN::Util qw( es );
 
 my $uploads = es()->search(
-    index => 'v1',
+    index => 'cpan',
     type  => 'release',
     body  => {
         query => {
diff --git a/scripts/release/4-latest-release-versions-es.pl b/scripts/release/4-latest-release-versions-es.pl
@@ -7,7 +7,7 @@
 use MetaCPAN::Util qw( es );
 
 my $latest = es()->search(
-    index  => 'v1',
+    index  => 'cpan',
     type   => 'release',
     fields => [ 'distribution', 'version' ],
     size   => 3,
diff --git a/scripts/release/4a-latest-release-versions-bool-filter-es.pl b/scripts/release/4a-latest-release-versions-bool-filter-es.pl
@@ -7,7 +7,7 @@
 use MetaCPAN::Util qw( es );
 
 my $latest = es()->search(
-    index  => 'v1',
+    index  => 'cpan',
     type   => 'release',
     fields => [ 'distribution', 'version' ],
     size   => 3,
diff --git a/scripts/release/5-latest-releases-by-author-es.pl b/scripts/release/5-latest-releases-by-author-es.pl
@@ -10,7 +10,7 @@
 die "usage: $0 PAUSEID" if !$author;
 
 my $latest = es()->search(
-    index  => 'v1',
+    index  => 'cpan',
     type   => 'release',
     fields => [ 'distribution', 'provides', 'version' ],
     size   => 500,
diff --git a/scripts/release/6-latest-releases-with-git-repo-es.pl b/scripts/release/6-latest-releases-with-git-repo-es.pl
@@ -24,7 +24,7 @@
     fields      => [ 'author', 'date', 'distribution', 'name', 'resources' ],
     search_type => 'scan',
     scroll      => '5m',
-    index       => 'v1',
+    index       => 'cpan',
     type        => 'release',
     size        => 500,
 );
diff --git a/scripts/release/7-all-releases.pl b/scripts/release/7-all-releases.pl
@@ -10,7 +10,7 @@
 my $scroller = es()->scroll_helper(
     search_type => 'scan',
     scroll      => '5m',
-    index       => 'v1',
+    index       => 'cpan',
     type        => 'release',
     size        => 1_000,
     body        => { fields => ['download_url'] },
diff --git a/scripts/release/all-releases-by-author.pl b/scripts/release/all-releases-by-author.pl
@@ -7,7 +7,7 @@
 use MetaCPAN::Util qw( es );
 
 my $uploads = es()->search(
-    index => 'v1',
+    index => 'cpan',
     type  => 'release',
     body  => {
         query => {

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`my $result = es()->search(`
`16`		`- index => 'v1',`
	`16`	`+ index => 'cpan',`
`17`	`17`	`type => 'file',`
`18`	`18`	`body => {`
`19`	`19`	`query => {`