zelastic 0.5.1 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7688ccc666c5845c29e20e163691a19f35ee368d
-  data.tar.gz: 6de7dbb95705106006706f62d03425345d7509c1
+SHA256:
+  metadata.gz: 118f50ebd50d4291a03b2274b4129a9d69e15aee8b744ce986524ab3a7496845
+  data.tar.gz: ef294b31041ecf9a0cdae04008950eb76fd2e19c60058db234b19549dd646ea6
 SHA512:
-  metadata.gz: 113fedb974cb28813e3b8084dbec4dd154b2821afcd0127cbef7b6874b0438b5986fa336bdcc2159502f0869d9f2455ce836907821026393e0814a6e36350456
-  data.tar.gz: 8af284f5e38267416325426ea8a72ad62a485698ee51e2e66790bac8590e9e3e6a61c1b85671e31bf0ec35c3d63a9dbbc8c3017abb28ef6d655021b666140975
+  metadata.gz: d22f6e8c566c3e400ab3d02e3a4fe6f6aa114ac00533ca42848058a297e2593450f3cefebb19206d21acaf5d62da74f08ad247be137af07404e9bdc388faf900
+  data.tar.gz: 7e369fe3a13e13289e98ee18e1b55cd83c0034a85ab3e0282a4ab70c302b05b41cbb7a329a69261880285e437f42e654ad332e2143f08babda5efbc5f54e1208

data/.circleci/config.yml

@@ -7,6 +7,9 @@ references:
   elasticsearch_container: &elasticsearch_container
     image: carwow/elasticsearch-ci:5.5.1
 
+  elasticsearch_7_container: &elasticsearch_7_container
+    image: carwow/elasticsearch-ci:7.6.1
+
 version: 2
 jobs:
   bundle:
@@ -54,6 +57,24 @@ jobs:
       - run: |
           bundle exec rspec --pattern "**/*_spec.rb" --format "progress"
 
+  tests_7:
+    working_directory: ~/zelastic
+    docker:
+      - *ruby
+      - *elasticsearch_7_container
+    steps:
+      - checkout
+      - restore_cache: { keys: ['bundle-{{ checksum "Gemfile.lock" }}'] }
+      - run:
+          name: Wait for ES to be ready
+          command: |
+            until curl $ELASTICSEARCH_URL/_cat/health | egrep '(green|yellow)' 2>&1 > /dev/null; do
+              echo -n .
+              sleep 1
+            done
+      - run: |
+          bundle exec rspec --pattern "**/*_spec.rb" --format "progress"
+
 workflows:
   version: 2
   build:
@@ -63,3 +84,5 @@ workflows:
           requires: [bundle]
       - tests:
           requires: [bundle]
+      - tests_7:
+          requires: [bundle]

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zelastic (0.5.1)
+    zelastic (0.6.0)
       activesupport
 
 GEM
@@ -47,7 +47,7 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     rainbow (3.0.0)
-    rake (12.3.0)
+    rake (13.0.1)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
       rspec-expectations (~> 3.7.0)
@@ -88,4 +88,4 @@ DEPENDENCIES
   zelastic!
 
 BUNDLED WITH
-   1.16.2
+   1.17.2

data/lib/zelastic/config.rb

@@ -15,9 +15,14 @@ module Zelastic
       @data_source = data_source
       @mapping = mapping
       @index_data = index_data
+      @_type = overrides.fetch(:type, true)
       @overrides = overrides
     end
 
+    def type?
+      @_type
+    end
+
     def index_data(model)
       @index_data.call(model)
     end
@@ -36,13 +41,14 @@ module Zelastic
 
     def logger
       return Rails.logger if defined?(Rails)
+
       @logger ||= Logger.new(STDOUT)
     end
 
     def index_definition
       {
         settings: overrides.fetch(:index_settings, {}),
-        mappings: { type => mapping }
+        mappings: type ? { type => mapping } : mapping
       }
     end
 

data/lib/zelastic/index_manager.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 module Zelastic
-  class IndexManager
+  # rubocop:disable Metrics/AbcSize
+  class IndexManager # rubocop:disable Metrics/ClassLength
     extend Forwardable
 
     def initialize(config, client: nil)
@@ -25,7 +26,6 @@ module Zelastic
       end
     end
 
-    # rubocop:disable Metrics/AbcSize
     def switch_read_index(new_name)
       new_index = [config.read_alias, new_name].join('_')
 
@@ -89,7 +89,6 @@ module Zelastic
       )
       client.indices.delete(index: indices_to_delete)
     end
-    # rubocop:enable Metrics/AbcSize
 
     private
 
@@ -118,7 +117,14 @@ module Zelastic
     end
 
     def current_index_size
-      @current_index_size ||= client.count(index: config.read_alias, type: config.type)['count']
+      @current_index_size ||= client.count(**count_params)['count']
+    end
+
+    def count_params
+      {
+        index: config.read_alias,
+        type: config.type? ? config.type : nil
+      }.compact
     end
 
     def indexed_percent(batch_size, batch_number)
@@ -129,4 +135,5 @@ module Zelastic
       client.indices.exists?(index: config.read_alias)
     end
   end
+  # rubocop:enable Metrics/AbcSize
 end

data/lib/zelastic/indexer.rb

@@ -43,13 +43,10 @@ module Zelastic
 
       execute_bulk do |index_name|
         ids.map do |id|
-          {
-            delete: {
-              _index: index_name,
-              _type: config.type,
-              _id: id
-            }
-          }
+          delete_params = { _index: index_name, _id: id }
+          delete_params[:_type] = config.type if config.type?
+
+          { delete: delete_params }
         end
       end
     end
@@ -78,15 +75,19 @@ module Zelastic
     end
 
     def index_command(index:, version:, record:)
+      version_params =
+        if config.type?
+          { _version: version, _version_type: :external, _type: config.type }
+        else
+          { version: version, version_type: :external }
+        end
+
       {
         index: {
           _index: index,
-          _type: config.type,
           _id: record.id,
-          _version: version,
-          _version_type: :external,
           data: config.index_data(record)
-        }
+        }.merge(version_params)
       }
     end
 
@@ -117,12 +118,18 @@ module Zelastic
       logger.warn("Ignoring #{ignorable_errors.count} version conflicts") if ignorable_errors.any?
 
       return unless important_errors.any?
+
       raise IndexingError, important_errors
     end
 
     def ignorable_error?(error)
       # rubocop:disable Metrics/LineLength
-      regexp = /^\[#{config.type}\]\[\d+\]: version conflict, current version \[\d+\] is higher or equal to the one provided \[\d+\]$/
+      regexp =
+        if config.type?
+          /^\[#{config.type}\]\[\d+\]: version conflict, current version \[\d+\] is higher or equal to the one provided \[\d+\]$/
+        else
+          /^\[\d+\]: version conflict, current version \[\d+\] is higher or equal to the one provided \[\d+\]$/
+        end
       # rubocop:enable Metrics/LineLength
       error['type'] == 'version_conflict_engine_exception' &&
         error['reason'] =~ regexp

data/lib/zelastic/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Zelastic
-  VERSION = '0.5.1'
+  VERSION = '0.6.1'
 end

data/zelastic.gemspec

@@ -1,7 +1,6 @@
-
 # frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'zelastic/version'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zelastic
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.1
 platform: ruby
 authors:
 - carwow Developers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-08 00:00:00.000000000 Z
+date: 2020-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -167,8 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Zero-downtime (re-)indexing of ActiveRecord models into Elasticsearch.