elasticsearch-api 0.4.0 → 0.4.1

data/test/unit/indices/flush_test.rb

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

data/test/unit/indices/get_alias_test.rb

@@ -34,6 +34,15 @@ module Elasticsearch
           subject.indices.get_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.get_alias :index => 'foo^bar', :name => 'bar/bam'
+        end
+
       end
 
     end

data/test/unit/indices/get_aliases_test.rb

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

data/test/unit/indices/get_mapping_test.rb

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

data/test/unit/indices/get_settings_test.rb

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

data/test/unit/indices/get_template_test.rb

@@ -7,12 +7,6 @@ module Elasticsearch
       context "Indices: Get template" do
         subject { FakeClient.new }
 
-        should "require the :name argument" do
-          assert_raise ArgumentError do
-            subject.indices.get_template
-          end
-        end
-
         should "perform correct request" do
           subject.expects(:perform_request).with do |method, url, params, body|
             assert_equal 'GET', method
@@ -25,6 +19,16 @@ module Elasticsearch
           subject.indices.get_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.get_template :name => 'foo^bar'
+        end
+
+
       end
 
     end

data/test/unit/indices/get_warmer_test.rb

@@ -34,6 +34,15 @@ module Elasticsearch
           subject.indices.get_warmer :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/_warmer/bar%2Fbam', url
+            true
+          end.returns(FakeResponse.new)
+
+          subject.indices.get_warmer :index => 'foo^bar', :name => 'bar/bam'
+        end
+
       end
 
     end

data/test/unit/indices/open_test.rb

@@ -35,6 +35,15 @@ module Elasticsearch
           subject.indices.open :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/_open', url
+            true
+          end.returns(FakeResponse.new)
+
+          subject.indices.open :index => 'foo^bar'
+        end
+
       end
 
     end

data/test/unit/indices/optimize_test.rb

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

data/test/unit/indices/put_alias_test.rb

@@ -40,6 +40,15 @@ module Elasticsearch
           subject.indices.put_alias :index => 'foo', :name => 'bar', :body => { :filter => 'foo' }
         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.put_alias :index => 'foo^bar', :name => 'bar/bam', :body => {}
+        end
+
       end
 
     end

data/test/unit/indices/put_mapping_test.rb

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

data/test/unit/indices/put_settings_test.rb

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

data/test/unit/indices/put_template_test.rb

@@ -41,6 +41,15 @@ module Elasticsearch
           subject.indices.put_template :name => 'foo', :body => {}, :order => 3
         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.put_template :name => 'foo^bar', :body => {}
+        end
+
       end
 
     end

data/test/unit/indices/put_warmer_test.rb

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

data/test/unit/indices/refresh_test.rb

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

data/test/unit/indices/segments_test.rb

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

data/test/unit/indices/snapshot_index_test.rb

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

data/test/unit/indices/stats_test.rb

@@ -48,6 +48,15 @@ module Elasticsearch
           subject.indices.stats :index => 'foo', :fielddata => true
         end
 
+        should "URL-escape the parts" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal 'foo%5Ebar/_stats', url
+            true
+          end.returns(FakeResponse.new)
+
+          subject.indices.stats :index => 'foo^bar'
+        end
+
         should "pass the fields parameter as a list" do
           subject.expects(:perform_request).with do |method, url, params, body|
             assert_equal 'foo/_stats', url

data/test/unit/indices/status_test.rb

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

data/test/unit/indices/validate_query_test.rb

@@ -68,6 +68,15 @@ module Elasticsearch
           subject.indices.validate_query :body => { :filtered => {} }
         end
 
+        should "URL-escape the parts" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal 'foo%5Ebar/_validate/query', url
+            true
+          end.returns(FakeResponse.new)
+
+          subject.indices.validate_query :index => 'foo^bar', :body => {}
+        end
+
       end
 
     end

data/test/unit/mget_test.rb

@@ -54,6 +54,15 @@ module Elasticsearch
           subject.mget :body => {}, :refresh => true
         end
 
+        should "URL-escape the parts" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal 'foo%5Ebar/bar%2Fbam/_mget', url
+            true
+          end.returns(FakeResponse.new)
+
+          subject.mget :index => 'foo^bar', :type => 'bar/bam', :body => { :ids => ['1','2'] }
+        end
+
         should "pass the fields parameter as a list" do
           subject.expects(:perform_request).with do |method, url, params, body|
             assert_equal 'foo,bar', params[:fields]

data/test/unit/mlt_test.rb

@@ -47,6 +47,15 @@ module Elasticsearch
           subject.mlt :index => 'foo', :type => 'bar', :id => '1', :max_doc_freq => 1
         end
 
+        should "URL-escape the parts" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal 'foo%5Ebar/bar%2Fbam/1/_mlt', url
+            true
+          end.returns(FakeResponse.new)
+
+          subject.mlt :index => 'foo^bar', :type => 'bar/bam', :id => '1'
+        end
+
         should "pass the specific parameters as a list" do
           subject.expects(:perform_request).with do |method, url, params, body|
             assert_equal 'foo,bar', params[:mlt_fields]

data/test/unit/msearch_test.rb

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

data/test/unit/percolate_test.rb

@@ -42,6 +42,15 @@ module Elasticsearch
           subject.percolate :index => 'foo', :type => 'bar', :body => { :doc => { :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/_percolate', url
+            true
+          end.returns(FakeResponse.new)
+
+          subject.percolate :index => 'foo^bar', :type => 'bar/bam', :body => { :doc => { :foo => 'bar' } }
+        end
+
       end
 
     end

data/test/unit/search_test.rb

@@ -26,7 +26,7 @@ module Elasticsearch
             true
           end.returns(FakeResponse.new)
 
-          subject.search type: 'foo'
+          subject.search :type => 'foo'
         end
 
         should "post a request definition in body" do
@@ -86,6 +86,21 @@ module Elasticsearch
           subject.search :search_type => 'count'
         end
 
+        should "validate URL parameters" do
+          assert_raise ArgumentError do
+            subject.search :search_type => 'count', :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/_search', url
+            true
+          end.returns(FakeResponse.new)
+
+          subject.search :index => 'foo^bar', :type => 'bar/bam'
+        end
+
       end
 
     end