elasticsearch-extensions 0.0.27 → 0.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79ad05a12ba00c1adf6af3343e8e9cebfab6781b
-  data.tar.gz: e6c39ff2fa59d03fb574c3cb6d7a62c1088c715c
+  metadata.gz: 37f6dc1d7a1b6535a6a8eb2f2acdf4a3d574e771
+  data.tar.gz: 6a93b7b3068e730c86d5bc1b08f47ce09a06d9ef
 SHA512:
-  metadata.gz: 96274d4e00fd3c32c90a9e10a20915975c751e03508ecb83367a4daffe0d338d072ad842a1e93521debcccafc9ea5062baaec10da578c41c6dd2d984024ee487
-  data.tar.gz: a700abdbbd398fceefbac51a0c5333fca9d38a9ff0600c4b0ac7a0e8029310e6e8d2089c98f34f21dd334a57bf5dddbdd10cdd00d03a10c3dac7468a3b37452d
+  metadata.gz: 2181eaf96dabd3ff657d16eab095f36b53ca18736db5577857ede9eb603c87a171f03d5f4c6524903b21f8c326959b60015b1b271718054379134056dfed5085
+  data.tar.gz: fd7e32a3b4b0e824daee180843f60040ad4d34726dc69d963234a4ce510875ffb8369954f244227505186478408f8e168dc0bbc10362d88187e554e5d9677175

data/elasticsearch-extensions.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.email         = ["karel.minarik@elasticsearch.org"]
   s.description   = %q{Extensions for the Elasticsearch Rubygem}
   s.summary       = %q{Extensions for the Elasticsearch Rubygem}
-  s.homepage      = ""
+  s.homepage      = "https://github.com/elasticsearch/elasticsearch-ruby/tree/master/elasticsearch-extensions"
   s.license       = "Apache 2"
 
   s.files         = `git ls-files`.split($/)
@@ -20,8 +20,8 @@ Gem::Specification.new do |s|
 
   s.add_dependency "ansi"
   s.add_dependency "elasticsearch"
-  s.add_dependency "oj"
-  s.add_dependency "patron"
+  s.add_dependency "oj" unless defined?(JRUBY_VERSION)
+  s.add_dependency "patron" unless defined?(JRUBY_VERSION)
 
   if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
     s.add_dependency "ruby-prof" unless defined?(JRUBY_VERSION) || defined?(Rubinius)

data/lib/elasticsearch/extensions/backup.rb

@@ -4,10 +4,10 @@ require 'pathname'
 require 'fileutils'
 
 require 'multi_json'
-require 'oj'
+require 'oj' unless defined?(JRUBY_VERSION)
 
 require 'elasticsearch'
-require 'patron'
+require 'patron' unless defined?(JRUBY_VERSION)
 
 module Backup
   module Database

data/lib/elasticsearch/extensions/test/cluster.rb

@@ -196,6 +196,7 @@ module Elasticsearch
               COMMAND
             }
           }
+          COMMANDS['7.0'] = COMMANDS['6.0'].clone
           COMMANDS.freeze
 
           # Create a new instance of the Cluster class
@@ -407,7 +408,7 @@ module Elasticsearch
                 '0.0.0.0'
               when /^2/
                 '_local_'
-              when /^5|^6/
+              when /^5|^6|^7/
                 '_local_'
               else
                 raise RuntimeError, "Cannot determine default network host from version [#{version}]"
@@ -452,7 +453,7 @@ module Elasticsearch
             path_to_lib = File.dirname(arguments[:command]) + '/../lib/'
             version = if arguments[:version]
               arguments[:version]
-            elsif File.exist?(path_to_lib) && !(jar = Dir.entries(path_to_lib).select { |f| f.start_with? 'elasticsearch' }.first).nil?
+            elsif File.exist?(path_to_lib) && !(jar = Dir.entries(path_to_lib).select { |f| f =~ /^elasticsearch\-\d/ }.first).nil?
               __log "Determining version from [#{jar}]" if ENV['DEBUG']
               if m = jar.match(/elasticsearch\-(\d+\.\d+\.\d+).*/)
                 m[1]
@@ -527,6 +528,8 @@ module Elasticsearch
                 '5.0'
               when /^6\..*/
                 '6.0'
+              when /^7\..*/
+                '7.0'
               else
                 raise RuntimeError, "Cannot determine major version from [#{version}]"
             end

data/lib/elasticsearch/extensions/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module Extensions
-    VERSION = "0.0.27"
+    VERSION = "0.0.28"
   end
 end

data/test/reindex/integration/reindex_test.rb

@@ -47,36 +47,6 @@ class Elasticsearch::Extensions::ReindexIntegrationTest < Elasticsearch::Test::I
       assert_equal 3, @client.search(index: 'test2')['hits']['total']
     end
 
-    should "copy documents with parent/child relationship" do
-      mapping = { mappings: { p: {}, c: { _parent: { type: 'p' } } } }
-      @client.indices.create index: 'test_parent_1', body: mapping
-      @client.indices.create index: 'test_parent_2', body: mapping
-
-      @client.index index: 'test_parent_1', type: 'p', id: 1, body: { title: 'Parent 1' }
-      @client.index index: 'test_parent_1', type: 'p', id: 2, body: { title: 'Parent 2' }
-      @client.index index: 'test_parent_1', type: 'c', parent: 1, body: { title: 'Child One' }
-      @client.index index: 'test_parent_1', type: 'c', parent: 1, body: { title: 'Child Two' }
-
-      @client.indices.refresh index: 'test_parent_1'
-
-      reindex = Elasticsearch::Extensions::Reindex.new \
-                  source: { index: 'test_parent_1', client: @client },
-                  target: { index: 'test_parent_2' },
-                  batch_size: 2,
-                  refresh: true
-
-      result = reindex.perform
-
-      assert_equal 0, result[:errors]
-      assert_equal 4, @client.search(index: 'test_parent_2')['hits']['total']
-
-      response = @client.search index: 'test_parent_2', body: {
-        query: { has_child: { type: 'c', query: { match: { title: 'two' } } } } }
-
-      assert_equal 1, response['hits']['hits'].size
-      assert_equal 'Parent 1', response['hits']['hits'][0]['_source']['title']
-    end
-
     should "transform documents with a lambda" do
       reindex = Elasticsearch::Extensions::Reindex.new \
                   source: { index: 'test1', client: @client },

data/test/test/cluster/unit/cluster_test.rb

@@ -252,7 +252,7 @@ class Elasticsearch::Extensions::TestClusterTest < Elasticsearch::Test::UnitTest
 
         should "return version from lib/elasticsearch.X.Y.Z.jar" do
           File.expects(:exist?).with('/foo/bar/bin/../lib/').returns(true)
-          Dir.expects(:entries).with('/foo/bar/bin/../lib/').returns(['foo.jar', 'elasticsearch-2.3.0.jar'])
+          Dir.expects(:entries).with('/foo/bar/bin/../lib/').returns(['foo.jar', 'elasticsearch-foo-1.0.0.jar', 'elasticsearch-2.3.0.jar', 'elasticsearch-bar-9.9.9.jar'])
 
           assert_equal '2.0', @subject.__determine_version
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-extensions
 version: !ruby/object:Gem::Version
-  version: 0.0.27
+  version: 0.0.28
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-12 00:00:00.000000000 Z
+date: 2018-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi
@@ -267,7 +267,7 @@ files:
 - test/test/cluster/integration/cluster_test.rb
 - test/test/cluster/unit/cluster_test.rb
 - test/test_helper.rb
-homepage: ''
+homepage: https://github.com/elasticsearch/elasticsearch-ruby/tree/master/elasticsearch-extensions
 licenses:
 - Apache 2
 metadata: {}
@@ -287,7 +287,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Extensions for the Elasticsearch Rubygem