metacrunch-elasticsearch 4.1.1 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 557dc97f5b3b92a3a15a11e5b3681cb005259d6e31e1ad9d5b996e6c434de4c5
-  data.tar.gz: 1b67def0d926076333f652c19447f42aca47634c0514b46418af2af528278254
+  metadata.gz: 02614d3061d72be9a70250f462610b60fdf8cb06dfefe850741e852baa5b09ac
+  data.tar.gz: bbae9023c2444706dd8b7cf7c3103c46a6515b062be8d20820be88aa0cf8cfed
 SHA512:
-  metadata.gz: ddac314b817cde1815eccddff1cae96f244991c3f1f516f03c7b652f2d9374a90dfe9868e533edbec299ea0250d81b75ef197fc6da3312cb467ddc7701087e6e
-  data.tar.gz: e860389ee22786b18493128c0e9bf251e65aefc9406c510e7b0d21cf34c5410350ce1544ac3bb14819b72bae81ba95fa7a931adb2092aed5dc8b500f4d37cb52
+  metadata.gz: cc0b6b97caa0e621b509e8e3695f51bba7668cfc79606be88a9fecbff0a6196df05bed12b8636a51b822ae83653ada990a8adb77d0409b83e178f782a27c913d
+  data.tar.gz: 7ae72bda460570e586a5165ac93f8b1c059c05f02f026c0f714057537b45f0dbf23dad80dd9242b8cc673d7db5ee7f34c7705ae2e4ba9de616c8cf0527703fdc

data/.circleci/config.yml

@@ -1,13 +1,13 @@
-# Ruby CircleCI 2.0 configuration file
-#
-# Check https://circleci.com/docs/2.0/language-ruby/ for more details
-#
-version: 2
+version: 2.1
+
+orbs:
+  ruby: circleci/ruby@1.1.1
+
 jobs:
   build:
     docker:
-      - image: circleci/ruby:2.4.1-node-browsers
-      - image: docker.elastic.co/elasticsearch/elasticsearch:5.6.3
+      - image: circleci/ruby:2.6-node-browsers
+      - image: docker.elastic.co/elasticsearch/elasticsearch:7.9.0
         environment:
           - "discovery.type=single-node"
           - "xpack.security.enabled=false"
@@ -43,4 +43,3 @@ jobs:
       - run:
           name: Upload test coverage report to CodeClimate
           command: ./cc-test-reporter after-build --exit-code $?
-

data/Gemfile

@@ -15,5 +15,5 @@ group :test do
   gem "faker",                 ">= 1.8.4"
   gem "rspec",                 ">= 3.5.0", "< 4.0.0"
   gem "rspec_junit_formatter", ">= 0.3.0"
-  gem "simplecov",             ">= 0.15.0"
+  gem "simplecov",             "= 0.17.1"
 end

data/Readme.md

@@ -8,13 +8,15 @@ metacrunch-elasticsearch
 
 This is the official [Elasticsearch](https://www.elastic.co) package for the [metacrunch ETL toolkit](https://github.com/ubpb/metacrunch).
 
+*NOTE: metacrunch-elasticsearch 5.x requires Elasticsearch 7.x. For older versions of Elasticsearch try metacrunch-elasticsearch 4.x*
+
 Installation
 ------------
 
 Include the gem in your `Gemfile`
 
 ```ruby
-gem "metacrunch-elasticsearch", "~> 4.1.0"
+gem "metacrunch-elasticsearch", "~> 5.0.0"
 ```
 
 and run `$ bundle install` to install it.
@@ -67,7 +69,6 @@ transformation ->(data) do
   {
     index: {
       _index: "my-index",
-      _type: "my-type",
       _id: data.delete(:id),
       data: data
     }

data/lib/metacrunch/elasticsearch/source.rb

@@ -41,8 +41,8 @@ module Metacrunch
   private
 
     def call_total_hits_callback(result)
-      if @options[:total_hits_callback]&.respond_to?(:call) && result["hits"]["total"]
-        @options[:total_hits_callback].call(result["hits"]["total"])
+      if @options[:total_hits_callback]&.respond_to?(:call) && total = result.dig("hits", "total", "value")
+        @options[:total_hits_callback].call(total)
       end
     end
 

data/lib/metacrunch/elasticsearch/version.rb

@@ -1,5 +1,5 @@
 module Metacrunch
   module Elasticsearch
-    VERSION = "4.1.1"
+    VERSION = "5.0.0"
   end
 end

data/metacrunch-elasticsearch.gemspec

@@ -16,6 +16,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "activesupport", ">= 0"
-  spec.add_dependency "elasticsearch", ">= 5.0.4"
+  spec.add_dependency "elasticsearch", ">= 7"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metacrunch-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 5.0.0
 platform: ruby
 authors:
 - René Sprotte
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-11-08 00:00:00.000000000 Z
+date: 2020-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,16 +30,16 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.4
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.4
-description: 
-email: 
+        version: '7'
+description:
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -61,7 +61,7 @@ homepage: http://github.com/ubpb/metacrunch-elasticsearch
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -76,9 +76,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Elasticsearch package for the metacrunch ETL toolkit.
 test_files: []