zelastic 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b20a3c4e66ac288594edfc999f4499ce50c5f0c
-  data.tar.gz: caacc8874bc47d4fa812fdadc06c0795ad732c73
+  metadata.gz: 05b9d19442778ad53fe696cbcf6d202b9216cd53
+  data.tar.gz: 3e8e17c98cc6ee0332449e232c7de492dc94f79e
 SHA512:
-  metadata.gz: 9a09f4b7bc7298a98d99a78345207b0a3cf9ff8855e8ca5b615d4f5f04e21c3495988e4e7a4100e8e1a125c85f5d64cc4b606c07b82ea222eff736d757c0c235
-  data.tar.gz: 8f2fef61bcb084ac942b23fecc6c9dff60fe198dca81387be8b6a0a9e880f2687fd1ae44224c389f4353c652a727d9ae31f6f551a06b0a34cc0888474937cae0
+  metadata.gz: a7186c7a3dd66d97bc7567e33023742c2fda9718846d8e58c2bbe9c17ef18055858e7e5fb0b600d3629b365c300350e6b694068368a40599ccaf9be41c931d74
+  data.tar.gz: bd24900db1022ef69a0a457c03f50e3e2a1ec884e4eba60ddd2084a3555ba0e9921a99b39293dacc1436ebcf441de40eab8184f4269229c93127990dbe2a46e2

data/.circleci/config.yml

@@ -1,8 +1,11 @@
-ruby: &ruby
-  image: carwow/ruby-ci:2.4.3
+references:
+  ruby: &ruby
+    image: carwow/ruby-ci:2.4.4
+    environment:
+      ELASTICSEARCH_URL: http://localhost:9200
 
-elasticsearch_container: &elasticsearch_container
-  image: carwow/elasticsearch-ci:5.5.1
+  elasticsearch_container: &elasticsearch_container
+    image: carwow/elasticsearch-ci:5.5.1
 
 version: 2
 jobs:
@@ -30,7 +33,7 @@ jobs:
       - *ruby
     steps:
       - checkout
-      - restore_cache: { keys: ['bundle-{{ checkout "Gemfile.lock" }}'] }
+      - restore_cache: { keys: ['bundle-{{ checksum "Gemfile.lock" }}'] }
       - run: bundle exec rubocop
 
   tests:
@@ -40,9 +43,17 @@ jobs:
       - *elasticsearch_container
     steps:
       - checkout
-      - restore_cache: { keys: ['bundle-{{ checkout "Gemfile.lock" }}'] }
+      - 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:

data/.rubocop.yml

@@ -1,3 +1,5 @@
+inherit_from: .rubocop_todo.yml
+
 AllCops:
   TargetRubyVersion: 2.4
 
@@ -5,6 +7,7 @@ AllCops:
 Metrics/BlockLength:
   Exclude:
     - '*.gemspec'
+    - 'spec/**/*'
 
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
@@ -18,4 +21,4 @@ Style/Documentation:
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:
-  Max: 102
+  Max: 100

data/.rubocop_todo.yml

@@ -0,0 +1,32 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2018-05-27 17:11:31 +0100 using RuboCop version 0.52.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
+Lint/ShadowingOuterLocalVariable:
+  Exclude:
+    - 'lib/zelastic/indexer.rb'
+
+# Offense count: 1
+Metrics/AbcSize:
+  Max: 17
+
+# Offense count: 1
+# Configuration parameters: CountComments, ExcludedMethods.
+Metrics/BlockLength:
+  Max: 83
+
+# Offense count: 4
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 146
+
+# Offense count: 1
+Naming/AccessorMethodName:
+  Exclude:
+    - 'spec/zelastic/indexer_spec.rb'

data/CHANGELOG.md

@@ -0,0 +1,4 @@
+v0.4.0 - May 29th, 2018
+---
+
+- Warning rather than exception on ignorable version conflicts (#4)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zelastic (0.3.4)
+    zelastic (0.4.0)
       activesupport
 
 GEM
@@ -23,10 +23,22 @@ GEM
     coderay (1.1.2)
     concurrent-ruby (1.0.5)
     diff-lcs (1.3)
+    elasticsearch (6.0.2)
+      elasticsearch-api (= 6.0.2)
+      elasticsearch-transport (= 6.0.2)
+    elasticsearch-api (6.0.2)
+      multi_json
+    elasticsearch-transport (6.0.2)
+      faraday
+      multi_json
+    faraday (0.15.2)
+      multipart-post (>= 1.2, < 3)
     i18n (0.9.1)
       concurrent-ruby (~> 1.0)
     method_source (0.9.0)
     minitest (5.11.1)
+    multi_json (1.13.1)
+    multipart-post (2.0.0)
     parallel (1.12.1)
     parser (2.4.0.2)
       ast (~> 2.3)
@@ -68,6 +80,7 @@ PLATFORMS
 DEPENDENCIES
   activerecord
   bundler
+  elasticsearch
   pry
   rake
   rspec
@@ -75,4 +88,4 @@ DEPENDENCIES
   zelastic!
 
 BUNDLED WITH
-   1.16.1
+   1.16.2

data/lib/zelastic/index_manager.rb

@@ -91,7 +91,9 @@ module Zelastic
         logger.info('Nothing to do: no old indices')
         return
       end
-      logger.info("Deleting #{indices_to_delete.count} old indices: #{indices_to_delete.join(', ')}")
+      logger.info(
+        "Deleting #{indices_to_delete.count} old indices: #{indices_to_delete.join(', ')}"
+      )
       client.indices.delete(index: indices_to_delete)
     end
     # rubocop:enable Metrics/AbcSize

data/lib/zelastic/indexer.rb

@@ -5,10 +5,8 @@ module Zelastic
     class IndexingError < StandardError
       attr_reader :errors
 
-      def initialize(result)
-        @errors = result['items'].map do |item|
-          item['error'] || item.fetch('index', {})['error']
-        end.compact
+      def initialize(errors)
+        @errors = errors
         super("Errors indexing: #{errors.join(', ')}")
       end
     end
@@ -103,9 +101,33 @@ module Zelastic
         commands = indices.flat_map { |index| yield(index) }
 
         current_client.bulk(body: commands).tap do |result|
-          raise IndexingError, result if result['errors']
+          check_errors!(result)
         end
       end
     end
+
+    def check_errors!(result)
+      return false unless result['errors']
+
+      errors = result['items']
+               .map { |item| item['error'] || item.fetch('index', {})['error'] }
+               .compact
+
+      ignorable_errors, important_errors = errors
+                                           .partition { |error| ignorable_error?(error) }
+
+      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+\]$/
+      # rubocop:enable Metrics/LineLength
+      error['type'] == 'version_conflict_engine_exception' &&
+        error['reason'] =~ regexp
+    end
   end
 end

data/lib/zelastic/version.rb

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

data/zelastic.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'activerecord'
   spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'elasticsearch'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zelastic
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - carwow Developers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-22 00:00:00.000000000 Z
+date: 2018-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: elasticsearch
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -119,6 +133,8 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -152,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Zero-downtime (re-)indexing of ActiveRecord models into Elasticsearch.