elasticsearch-api 0.4.0 → 0.4.1

data/test/integration/yaml_test_runner.rb

@@ -8,7 +8,7 @@ require 'elasticsearch/transport/extensions/test_cluster'
 
 # Launch test cluster
 #
-Elasticsearch::TestCluster.start if ENV['SERVER']
+Elasticsearch::TestCluster.start if ENV['SERVER'] and not Elasticsearch::TestCluster.running?
 
 # Register `at_exit` handler for server shutdown.
 # MUST be called before requiring `test/unit`.
@@ -44,7 +44,7 @@ module Shoulda
   module Context
     class Context
       def create_test_from_should_hash(should)
-        test_name = ["test:", full_name, "--", "#{should[:name]}. "].flatten.join(' ').to_sym
+        test_name = ["test:", full_name, "|", "#{should[:name]}"].flatten.join(' ').to_sym
 
         if test_methods[test_unit_class][test_name.to_s] then
           raise DuplicateTestError, "'#{test_name}' is defined more than once."
@@ -76,7 +76,7 @@ module Elasticsearch
 
     module Utils
       def titleize(word)
-        word.to_s.gsub(/[^\w]+/, ' ').gsub(/\b('?[a-z])/) { $1.capitalize }
+        word.to_s.gsub(/[^\w]+/, ' ').gsub(/\b('?[a-z])/) { $1.capitalize }.tr('_', ' ')
       end
 
       def symbolize_keys(object)
@@ -206,7 +206,6 @@ suites.each do |suite|
 
     files = Dir[suite.join('*.{yml,yaml}')]
     files.each do |file|
-
       tests = YAML.load_documents File.new(file)
 
       # Extract setup actions
@@ -220,7 +219,7 @@ suites.each do |suite|
 
       tests.each do |test|
         context '' do
-          test_name = test.keys.first
+          test_name = test.keys.first.to_s + (ENV['QUIET'] ? '' : " | #{ANSI.ansi(file.gsub(PATH.to_s, ''), :bold)}")
           actions   = test.values.first
 
           if reason = Runner.skip?(actions)

data/test/test_helper.rb

@@ -1,6 +1,6 @@
 RUBY_1_8 = defined?(RUBY_VERSION) && RUBY_VERSION < '1.9'
 
-if RUBY_1_8
+if RUBY_1_8 and not ENV['BUNDLE_GEMFILE']
   require 'rubygems'
   gem 'test-unit'
 end

data/test/unit/bulk_test.rb

@@ -78,6 +78,15 @@ module Elasticsearch
           subject.bulk :refresh => true, :body => []
         end
 
+        should "URL-escape the parts" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal 'foo%5Ebar/_bulk', url
+            true
+          end.returns(FakeResponse.new)
+
+          subject.bulk :index => 'foo^bar', :body => []
+        end
+
       end
 
     end

data/test/unit/cluster/node_hot_threads_test.rb

@@ -28,6 +28,15 @@ module Elasticsearch
           subject.cluster.node_hot_threads :node_id => 'foo'
         end
 
+        should "URL-escape the parts" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal '_cluster/nodes/foo%5Ebar/hot_threads', url
+            true
+          end.returns(FakeResponse.new)
+
+          subject.cluster.node_hot_threads :node_id => 'foo^bar'
+        end
+
       end
 
     end

data/test/unit/create_document_test.rb

@@ -31,6 +31,15 @@ module Elasticsearch
 
           subject.create :index => 'foo', :type => 'bar', :id => '123', :body => {:foo => 'bar'}
         end
+
+        should "URL-escape the parts" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal 'foo/bar%2Fbam/123', url
+            true
+          end.returns(FakeResponse.new)
+
+          subject.create :index => 'foo', :type => 'bar/bam', :id => '123', :body => {}
+        end
       end
 
     end

data/test/unit/delete_document_test.rb

@@ -47,11 +47,26 @@ module Elasticsearch
           subject.delete :index => 'foo', :type => 'bar', :id => '1', :routing => 'abc123'
         end
 
+        should "validate URL parameters" do
+          assert_raise ArgumentError do
+            subject.delete :index => 'foo', :type => 'bar', :id => '1', :qwertypoiuy => 'asdflkjhg'
+          end
+        end
+
+        should "URL-escape the parts" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal 'foo%5Ebar/bar%2Fbam/1', url
+            true
+          end.returns(FakeResponse.new)
+
+          subject.delete :index => 'foo^bar', :type => 'bar/bam', :id => 1
+        end
+
         should "catch a NotFound exception with the ignore parameter" do
           subject.expects(:perform_request).raises(NotFound)
 
           assert_nothing_raised do
-            subject.get :index => 'foo', :type => 'bar', :id => 'XXX', ignore: 404
+            subject.get :index => 'foo', :type => 'bar', :id => 'XXX', :ignore => 404
           end
         end
 

data/test/unit/exists_document_test.rb

@@ -47,6 +47,15 @@ module Elasticsearch
           subject.exists :index => 'foo', :type => 'bar', :id => '1', :routing => 'abc123'
         end
 
+        should "URL-escape the parts" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal 'foo/bar%2Fbam/1', url
+            true
+          end.returns(FakeResponse.new)
+
+          subject.exists :index => 'foo', :type => 'bar/bam', :id => '1'
+        end
+
         should "return true for successful response" do
           subject.expects(:perform_request).returns(FakeResponse.new 200, 'OK')
           assert_equal true, subject.exists(:index => 'foo', :type => 'bar', :id => '1')

data/test/unit/explain_document_test.rb

@@ -57,6 +57,15 @@ module Elasticsearch
           subject.explain :index => 'foo', :type => 'bar', :id => 1, :body => { :query => { :match => {} } }
         end
 
+        should "URL-escape the parts" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal 'foo%5Ebar/bar%2Fbam/1/_explain', url
+            true
+          end.returns(FakeResponse.new)
+
+          subject.explain :index => 'foo^bar', :type => 'bar/bam', :id => '1', :body => {}
+        end
+
       end
 
     end

data/test/unit/get_document_source_test.rb

@@ -47,11 +47,20 @@ module Elasticsearch
           subject.get_source :index => 'foo', :type => 'bar', :id => '1', :routing => 'abc123'
         end
 
+        should "URL-escape the parts" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal 'foo%5Ebar/bar%2Fbam/1/_source', url
+            true
+          end.returns(FakeResponse.new)
+
+          subject.get_source :index => 'foo^bar', :type => 'bar/bam', :id => '1'
+        end
+
         should "catch a NotFound exception with the ignore parameter" do
           subject.expects(:perform_request).raises(NotFound)
 
           assert_nothing_raised do
-            subject.get :index => 'foo', :type => 'bar', :id => 'XXX', ignore: 404
+            subject.get :index => 'foo', :type => 'bar', :id => 'XXX', :ignore => 404
           end
         end
 

data/test/unit/get_document_test.rb

@@ -47,11 +47,26 @@ module Elasticsearch
           subject.get :index => 'foo', :type => 'bar', :id => '1', :routing => 'abc123'
         end
 
+        should "URL-escape the parts" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal 'foo%5Ebar/bar%2Fbam/1', url
+            true
+          end.returns(FakeResponse.new)
+
+          subject.exists :index => 'foo^bar', :type => 'bar/bam', :id => '1'
+        end
+
+        should "validate URL parameters" do
+          assert_raise ArgumentError do
+            subject.get :index => 'foo', :type => 'bar', :id => '1', :qwertypoiuy => 'asdflkjhg'
+          end
+        end
+
         should "catch a NotFound exception with the ignore parameter" do
           subject.expects(:perform_request).raises(NotFound)
 
           assert_nothing_raised do
-            subject.get :index => 'foo', :type => 'bar', :id => 'XXX', ignore: 404
+            subject.get :index => 'foo', :type => 'bar', :id => 'XXX', :ignore => 404
           end
         end
 

data/test/unit/index_document_test.rb

@@ -41,6 +41,21 @@ module Elasticsearch
 
           subject.index :index => 'foo', :type => 'bar', :id => '123', :body => {:foo => 'bar'}
         end
+
+        should "URL-escape the parts" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal 'foo/bar%2Fbam/123', url
+            true
+          end.returns(FakeResponse.new)
+
+          subject.index :index => 'foo', :type => 'bar/bam', :id => '123', :body => {}
+        end
+
+        should "validate URL parameters" do
+          assert_raise ArgumentError do
+            subject.index :index => 'foo', :type => 'bar/bam', :id => '123', :body => {}, :qwertypoiuy => 'asdflkjhg'
+          end
+        end
       end
 
       context "Creating a document" do

data/test/unit/indices/analyze_test.rb

@@ -60,6 +60,15 @@ module Elasticsearch
           subject.indices.analyze :text => 'Test', :tokenizer => 'whitespace', :filters => ['foo,bar']
         end
 
+        should "URL-escape the parts" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal 'foo%5Ebar/_analyze', url
+            true
+          end.returns(FakeResponse.new)
+
+          subject.indices.analyze :index => 'foo^bar', :text => 'Test'
+        end
+
       end
 
     end

data/test/unit/indices/clear_cache_test.rb

@@ -38,6 +38,15 @@ module Elasticsearch
           subject.indices.clear_cache :field_data => true
         end
 
+        should "URL-escape the parts" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal 'foo%5Ebar/_cache/clear', url
+            true
+          end.returns(FakeResponse.new)
+
+          subject.indices.clear_cache :index => 'foo^bar'
+        end
+
       end
 
     end

data/test/unit/indices/close_test.rb

@@ -35,6 +35,15 @@ module Elasticsearch
           subject.indices.close :index => 'foo', :timeout => '1s'
         end
 
+        should "URL-escape the parts" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal 'foo%5Ebar/_close', url
+            true
+          end.returns(FakeResponse.new)
+
+          subject.indices.close :index => 'foo^bar'
+        end
+
       end
 
     end

data/test/unit/indices/create_test.rb

@@ -35,6 +35,15 @@ module Elasticsearch
           subject.indices.create :index => 'foo', :timeout => '1s'
         end
 
+        should "URL-escape the parts" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal 'foo%5Ebar', url
+            true
+          end.returns(FakeResponse.new)
+
+          subject.indices.create :index => 'foo^bar'
+        end
+
       end
 
     end

data/test/unit/indices/delete_alias_test.rb

@@ -31,6 +31,15 @@ module Elasticsearch
           subject.indices.delete_alias :index => 'foo', :name => 'bar'
         end
 
+        should "URL-escape the parts" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal 'foo%5Ebar/_alias/bar%2Fbam', url
+            true
+          end.returns(FakeResponse.new)
+
+          subject.indices.delete_alias :index => 'foo^bar', :name => 'bar/bam'
+        end
+
       end
 
     end

data/test/unit/indices/delete_mapping_test.rb

@@ -40,6 +40,15 @@ module Elasticsearch
           subject.indices.delete_mapping :index => ['foo','bar'], :type => 'baz'
         end
 
+        should "URL-escape the parts" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal 'foo%5Ebar/bar%2Fbam', url
+            true
+          end.returns(FakeResponse.new)
+
+          subject.indices.delete_mapping :index => 'foo^bar', :type => 'bar/bam'
+        end
+
       end
 
     end

data/test/unit/indices/delete_template_test.rb

@@ -19,6 +19,15 @@ module Elasticsearch
           subject.indices.delete_template :name => 'foo'
         end
 
+        should "URL-escape the parts" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal '_template/foo%5Ebar', url
+            true
+          end.returns(FakeResponse.new)
+
+          subject.indices.delete_template :name => 'foo^bar'
+        end
+
       end
 
     end

data/test/unit/indices/delete_test.rb

@@ -38,6 +38,15 @@ module Elasticsearch
           subject.indices.delete :index => 'foo', :timeout => '1s'
         end
 
+        should "URL-escape the parts" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal 'foo%5Ebar', url
+            true
+          end.returns(FakeResponse.new)
+
+          subject.indices.delete :index => 'foo^bar'
+        end
+
       end
 
     end

data/test/unit/indices/delete_warmer_test.rb

@@ -52,6 +52,15 @@ module Elasticsearch
           subject.indices.delete_warmer :index => 'foo', :name => ['bar', 'baz']
         end
 
+        should "URL-escape the parts" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal 'foo%5Ebar/_warmer/bar%2Fbam', url
+            true
+          end.returns(FakeResponse.new)
+
+          subject.indices.delete_warmer :index => 'foo^bar', :name => 'bar/bam'
+        end
+
       end
 
     end

data/test/unit/indices/exists_alias_test.rb

@@ -34,6 +34,15 @@ module Elasticsearch
           subject.indices.exists_alias :index => ['foo','bar'], :name => 'bam'
         end
 
+        should "URL-escape the parts" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal 'foo%5Ebar/_alias/bar%2Fbam', url
+            true
+          end.returns(FakeResponse.new)
+
+          subject.indices.exists_alias :index => 'foo^bar', :name => 'bar/bam'
+        end
+
         should "return true for successful response" do
           subject.expects(:perform_request).returns(FakeResponse.new 200, 'OK')
           assert_equal true, subject.indices.exists_alias(:name => 'foo')

data/test/unit/indices/exists_test.rb

@@ -28,6 +28,15 @@ module Elasticsearch
           subject.indices.exists(:index => ['foo', 'bar'])
         end
 
+        should "URL-escape the parts" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal 'foo%5Ebar,bar%2Fbam', url
+            true
+          end.returns(FakeResponse.new)
+
+          subject.indices.exists :index => 'foo^bar,bar/bam'
+        end
+
         should "return true for successful response" do
           subject.expects(:perform_request).returns(FakeResponse.new 200, 'OK')
           assert_equal true, subject.indices.exists(:index => 'foo')

data/test/unit/indices/exists_type_test.rb

@@ -28,6 +28,15 @@ module Elasticsearch
           subject.indices.exists_type :index => ['foo','bar'], :type => 'bam'
         end
 
+        should "URL-escape the parts" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal 'foo%5Ebar/bar%2Fbam', url
+            true
+          end.returns(FakeResponse.new)
+
+          subject.indices.exists_type :index => 'foo^bar', :type => 'bar/bam'
+        end
+
         should "return true for successful response" do
           subject.expects(:perform_request).returns(FakeResponse.new 200, 'OK')
           assert_equal true, subject.indices.exists_type(:index => 'foo', :type => 'bar')