elasticsearch-extensions 0.0.27 → 0.0.32

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

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require 'elasticsearch/extensions/test/cluster'
 
 namespace :elasticsearch do

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

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require 'ruby-prof'
 require 'benchmark'
 require 'ansi'

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

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 module Elasticsearch
   module Extensions
     module Test

data/lib/elasticsearch/extensions/version.rb

@@ -1,5 +1,22 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 module Elasticsearch
   module Extensions
-    VERSION = "0.0.27"
+    VERSION = '0.0.32'.freeze
   end
 end

data/test/ansi/unit/ansi_test.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require 'test_helper'
 require 'elasticsearch/extensions/ansi'
 
@@ -7,10 +24,10 @@ class Elasticsearch::Extensions::AnsiTest < Elasticsearch::Test::UnitTestCase
       @client = Elasticsearch::Client.new
       @client.stubs(:perform_request).returns \
         Elasticsearch::Transport::Transport::Response.new(200, { "ok" => true, "status" => 200, "name" => "Hit-Maker",
-            "version" => { "number"     => "0.90.7",
-                           "build_hash" => "abc123",
-                           "build_timestamp"=>"2013-11-13T12:06:54Z", "build_snapshot"=>false, "lucene_version"=>"4.5.1" },
-            "tagline"=>"You Know, for Search" })
+                                                                 "version" => { "number"     => "0.90.7",
+                                                                                "build_hash" => "abc123",
+                                                                                "build_timestamp"=>"2013-11-13T12:06:54Z", "build_snapshot"=>false, "lucene_version"=>"4.5.1" },
+                                                                 "tagline"=>"You Know, for Search" })
     end
 
     should "wrap the response" do
@@ -30,7 +47,7 @@ class Elasticsearch::Extensions::AnsiTest < Elasticsearch::Test::UnitTestCase
     should "call the 'awesome_inspect' method when available and no handler found" do
       @client.stubs(:perform_request).returns \
         Elasticsearch::Transport::Transport::Response.new(200, {"index-1"=>{"aliases"=>{}}})
-      response = @client.indices.get_aliases
+      response = @client.cat.aliases
 
       response.instance_eval do
         def awesome_inspect; "---PRETTY---"; end
@@ -41,7 +58,7 @@ class Elasticsearch::Extensions::AnsiTest < Elasticsearch::Test::UnitTestCase
     should "call `to_s` method when no pretty printer or handler found" do
       @client.stubs(:perform_request).returns \
         Elasticsearch::Transport::Transport::Response.new(200, {"index-1"=>{"aliases"=>{}}})
-      response = @client.indices.get_aliases
+      response = @client.cat.aliases
 
       assert_equal '{"index-1"=>{"aliases"=>{}}}', response.to_ansi
     end

data/test/backup/unit/backup_test.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require 'test_helper'
 require 'logger'
 
@@ -106,5 +123,9 @@ class Elasticsearch::Extensions::BackupTest < Elasticsearch::Test::UnitTestCase
 
       @subject.__perform_single
     end
+
+    should "sanitize filename" do
+      assert_equal "foo-bar-baz", @subject.__sanitize_filename("foo/bar\nbaz")
+    end
   end
 end

data/test/reindex/integration/reindex_test.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require 'test_helper'
 require 'elasticsearch/extensions/reindex'
 
@@ -17,7 +34,7 @@ class Elasticsearch::Extensions::ReindexIntegrationTest < Elasticsearch::Test::I
         ANSI.ansi(severity[0] + ' ', color, :faint) + ANSI.ansi(msg, :white, :faint) + "\n"
       end
 
-      @client = Elasticsearch::Client.new host: "localhost:#{@port}", logger: @logger
+      @client = Elasticsearch::Client.new host: "#{TEST_HOST}:#{TEST_PORT}", logger: @logger
       @client.indices.delete index: '_all'
 
       @client.index index: 'test1', type: 'd', id: 1, body: { title: 'TEST 1', category: 'one' }
@@ -37,83 +54,53 @@ class Elasticsearch::Extensions::ReindexIntegrationTest < Elasticsearch::Test::I
     should "copy documents from one index to another" do
       reindex = Elasticsearch::Extensions::Reindex.new \
                   source: { index: 'test1', client: @client },
-                  target: { index: 'test2' },
+                  dest: { index: 'test2' },
                   batch_size: 2,
                   refresh: true
 
       result = reindex.perform
 
       assert_equal 0, result[:errors]
-      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']
+      assert_equal 3, @client.search(index: 'test2')['hits']['total']['value']
     end
 
     should "transform documents with a lambda" do
       reindex = Elasticsearch::Extensions::Reindex.new \
                   source: { index: 'test1', client: @client },
-                  target: { index: 'test2' },
+                  dest: { index: 'test2' },
                   transform: lambda { |d| d['_source']['category'].upcase! },
                   refresh: true
 
       result = reindex.perform
 
       assert_equal 0, result[:errors]
-      assert_equal 3, @client.search(index: 'test2')['hits']['total']
+      assert_equal 3, @client.search(index: 'test2')['hits']['total']['value']
       assert_equal 'ONE', @client.get(index: 'test2', type: 'd', id: 1)['_source']['category']
     end
 
     should "return the number of errors" do
-      @client.indices.create index: 'test3', body: { mappings: { d: { properties: { category: { type: 'integer' } }}}}
+      @client.indices.create index: 'test3', body: { mappings: { properties: { category: { type: 'integer' } }}}
       @client.cluster.health wait_for_status: 'yellow'
 
       reindex = Elasticsearch::Extensions::Reindex.new \
                   source: { index: 'test1', client: @client },
-                  target: { index: 'test3' }
+                  dest: { index: 'test3' }
 
       result = reindex.perform
 
       @client.indices.refresh index: 'test3'
 
       assert_equal 3, result[:errors]
-      assert_equal 0, @client.search(index: 'test3')['hits']['total']
+      assert_equal 0, @client.search(index: 'test3')['hits']['total']['value']
     end
 
     should "reindex via the API integration" do
       @client.indices.create index: 'test4'
 
-      @client.reindex source: { index: 'test1' }, target: { index: 'test4' }
+      @client.reindex source: { index: 'test1' }, dest: { index: 'test4' }
       @client.indices.refresh index: 'test4'
 
-      assert_equal 3, @client.search(index: 'test4')['hits']['total']
+      assert_equal 3, @client.search(index: 'test4')['hits']['total']['value']
     end
   end
 

data/test/reindex/unit/reindex_test.rb

@@ -1,9 +1,26 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require 'test_helper'
 require 'elasticsearch/extensions/reindex'
 
 class Elasticsearch::Extensions::ReindexTest < Elasticsearch::Test::UnitTestCase
   context "The Reindex extension module" do
-    DEFAULT_OPTIONS = { source: { index: 'foo', client: Object.new }, target: { index: 'bar' } }
+    DEFAULT_OPTIONS = { source: { index: 'foo', client: Object.new }, dest: { index: 'bar' } }
 
     should "require options" do
       assert_raise ArgumentError do
@@ -50,7 +67,7 @@ class Elasticsearch::Extensions::ReindexTest < Elasticsearch::Test::UnitTestCase
       should "scroll through the index and save batches in bulk" do
         client  = mock()
         subject = Elasticsearch::Extensions::Reindex.new source: { index: 'foo', client: client },
-                                                         target: { index: 'bar' }
+                                                         dest: { index: 'bar' }
 
         client.expects(:search)
           .returns({ '_scroll_id' => 'scroll_id_1' }.merge(Marshal.load(Marshal.dump(@default_response))))
@@ -70,7 +87,7 @@ class Elasticsearch::Extensions::ReindexTest < Elasticsearch::Test::UnitTestCase
       should "return the number of errors" do
         client  = mock()
         subject = Elasticsearch::Extensions::Reindex.new source: { index: 'foo', client: client },
-                                                         target: { index: 'bar' }
+                                                         dest: { index: 'bar' }
 
         client.expects(:search).returns({ '_scroll_id' => 'scroll_id_1' }.merge(@default_response))
         client.expects(:scroll).returns(@empty_response)
@@ -85,7 +102,7 @@ class Elasticsearch::Extensions::ReindexTest < Elasticsearch::Test::UnitTestCase
         client  = mock()
         subject = Elasticsearch::Extensions::Reindex.new \
           source: { index: 'foo', client: client },
-          target: { index: 'bar' },
+          dest: { index: 'bar' },
           transform: lambda { |d| d['_source']['foo'].upcase!; d }
 
         client.expects(:search).returns({ '_scroll_id' => 'scroll_id_1' }.merge(@default_response))

data/test/test/cluster/integration/cluster_test.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require 'test_helper'
 require 'pathname'
 

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

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require 'test_helper'
 
 require 'elasticsearch/extensions/test/cluster'
@@ -252,7 +269,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
@@ -261,16 +278,37 @@ class Elasticsearch::Extensions::TestClusterTest < Elasticsearch::Test::UnitTest
           File.expects(:exist?).with('/foo/bar/bin/../lib/').returns(false)
           File.expects(:exist?).with('/foo/bar/bin/elasticsearch').returns(true)
 
+          io = mock('IO')
+          io.expects(:pid).returns(123)
+          io.expects(:read).returns('Version: 2.3.0-SNAPSHOT, Build: d1c86b0/2016-03-30T10:43:20Z, JVM: 1.8.0_60')
+          io.expects(:closed?).returns(false)
+          io.expects(:close)
+          IO.expects(:popen).returns(io)
+
           Process.stubs(:wait)
-          Process.expects(:spawn).returns(123)
           Process.expects(:kill).with('INT', 123)
 
-          IO.any_instance.expects(:read)
-            .returns('Version: 2.3.0-SNAPSHOT, Build: d1c86b0/2016-03-30T10:43:20Z, JVM: 1.8.0_60')
-
           assert_equal '2.0', @subject.__determine_version
         end
 
+        should "return version from `elasticsearch --version` when version reaches double digits" do
+          File.expects(:exist?).with('/foo/bar/bin/../lib/').returns(false)
+          File.expects(:exist?).with('/foo/bar/bin/elasticsearch').returns(true)
+
+          io = mock('IO')
+          io.expects(:pid).returns(123)
+          io.expects(:read).returns('Version: 7.11.0-SNAPSHOT, Build: d1c86b0/2016-03-30T10:43:20Z, JVM: 1.8.0_60')
+          io.expects(:closed?).returns(false)
+          io.expects(:close)
+          IO.expects(:popen).returns(io)
+
+          Process.stubs(:wait)
+          Process.expects(:kill).with('INT', 123)
+
+          assert_equal '7.0', @subject.__determine_version
+        end
+
+
         should "return version from arguments" do
           cluster = Elasticsearch::Extensions::Test::Cluster::Cluster.new command: '/foo/bar/bin/elasticsearch', version: '5.2'
           assert_equal '5.0', cluster.__determine_version
@@ -288,12 +326,16 @@ class Elasticsearch::Extensions::TestClusterTest < Elasticsearch::Test::UnitTest
           File.expects(:exist?).with('/foo/bar/bin/../lib/').returns(false)
           File.expects(:exist?).with('/foo/bar/bin/elasticsearch').returns(true)
 
+          io = mock('IO')
+          io.expects(:pid).returns(123)
+          io.expects(:read).returns('Version: FOOBAR')
+          io.expects(:closed?).returns(false)
+          io.expects(:close)
+          IO.expects(:popen).returns(io)
+
           Process.stubs(:wait)
-          Process.expects(:spawn).returns(123)
           Process.expects(:kill).with('INT', 123)
 
-          IO.any_instance.expects(:read).returns('Version: FOOBAR')
-
           assert_raise(RuntimeError) { @subject.__determine_version }
         end