elasticsearch-api 0.4.7 → 0.4.8

data/Gemfile

@@ -2,3 +2,11 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in elasticsearch-api.gemspec
 gemspec
+
+if File.exists? File.expand_path("../../elasticsearch-extensions", __FILE__)
+  gem 'elasticsearch-extensions', :path => File.expand_path("../../elasticsearch-extensions", __FILE__), :require => true
+end
+
+if File.exists? File.expand_path("../../elasticsearch-transport", __FILE__)
+  gem 'elasticsearch-transport', :path => File.expand_path("../../elasticsearch-transport", __FILE__), :require => true
+end

data/README.md

@@ -14,6 +14,13 @@ library.
 
 The library is compatible with Ruby 1.8.7 or higher.
 
+The library is compatible with Elasticsearch 0.90 and 1.0 -- you have to install and use a matching version, though.
+
+The 1.0 pre-release version and the master branch are compatible with **Elasticsearch 1.0** API.
+
+To use the **Elasticsearch 0.90** API, install the **0.4.x** gem version or use the corresponding
+[`0.4`](https://github.com/elasticsearch/elasticsearch-ruby/tree/0.4) branch.
+
 ## Installation
 
 Install the package from [Rubygems](https://rubygems.org):

data/Rakefile

@@ -49,7 +49,7 @@ namespace :test do
     current_branch = branches.
       split("\n").
       select { |b| b =~ /^\*/ }.
-      reject { |b| b =~ /detached/ }.
+      reject { |b| b =~ /no branch|detached/ }.
       map    { |b| b.gsub(/^\*\s*/, '') }.
       first
 
@@ -78,6 +78,7 @@ namespace :test do
 
     checkout_specs_version = ENV['TEST_NO_CHECKOUT'].nil? ? true : false
     checkout_build_hash    = ENV['TEST_BUILD_REF'] || build_hash
+    ENV['TEST_BUILD_REF']  = checkout_build_hash
 
     begin
       unless checkout_specs_version
@@ -91,7 +92,8 @@ namespace :test do
 
       if checkout_specs_version && checkout_build_hash
         # Checkout the commit corresponding to the running server build, or passed TEST_BUILD_REF
-        STDERR.puts '-'*80, "YAML tests: Switching to [\e[1m#{checkout_build_hash}\e[0m]", '-'*80
+        name = ENV['CI'] ? checkout_build_hash : "[\e[1m#{checkout_build_hash}\e[0m]"
+        STDERR.puts '-'*80, "YAML tests: Switching to #{name} from #{current_branch}", '-'*80
         git_specs "checkout #{checkout_build_hash} --force --quiet"
       end
 
@@ -110,7 +112,7 @@ namespace :test do
       end
 
     ensure
-      git_specs "checkout --force --quiet #{current_branch}" if checkout_specs_version
+      git_specs "checkout #{current_branch} --force --quiet" if checkout_specs_version && current_branch
     end
   end
 

data/elasticsearch-api.gemspec

@@ -52,10 +52,11 @@ Gem::Specification.new do |s|
   end
 
   if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
-    s.add_development_dependency "ruby-prof"
+    s.add_development_dependency "ruby-prof" unless defined? JRUBY_VERSION
     s.add_development_dependency "jbuilder"
-    s.add_development_dependency "escape_utils"
+    s.add_development_dependency "escape_utils" unless defined? JRUBY_VERSION
     s.add_development_dependency "simplecov"
+    s.add_development_dependency "simplecov-rcov"
     s.add_development_dependency "cane"
     s.add_development_dependency "require-prof"
     s.add_development_dependency "coveralls"

data/lib/elasticsearch/api/actions/clear_scroll.rb

@@ -0,0 +1,24 @@
+module Elasticsearch
+  module API
+    module Actions
+
+      # Abort a particular scroll search and clear all the resources associated with it.
+      #
+      # @option arguments [List] :scroll_id A comma-separated list of scroll IDs to clear;
+      #                                     use `_all` clear all scroll search contexts
+      #
+      # @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-request-search-type.html#clear-scroll
+      #
+      def clear_scroll(arguments={})
+        raise ArgumentError, "Required argument 'scroll_id' missing" unless arguments[:scroll_id]
+
+        method = 'DELETE'
+        path   = Utils.__pathify '_search/scroll', Utils.__listify(arguments[:scroll_id])
+        params = {}
+        body   = nil
+
+        perform_request(method, path, params, body).body
+      end
+    end
+  end
+end

data/lib/elasticsearch/api/actions/cluster/get_settings.rb

@@ -5,12 +5,22 @@ module Elasticsearch
 
         # Get the cluster settings (previously set with {Cluster::Actions#put_settings})
         #
+        # @example Get cluster settings
+        #
+        #     client.cluster.get_settings
+        #
+        # @option arguments [Boolean] :flat_settings Return settings in flat format (default: false)
+        #
         # @see http://elasticsearch.org/guide/reference/api/admin-cluster-update-settings/
         #
         def get_settings(arguments={})
+          valid_params = [
+            :flat_settings
+          ]
+
           method = 'GET'
           path   = "_cluster/settings"
-          params = {}
+          params = Utils.__validate_and_extract_params arguments, valid_params
           body   = nil
 
           perform_request(method, path, params, body).body

data/lib/elasticsearch/api/actions/cluster/pending_tasks.rb

@@ -0,0 +1,33 @@
+module Elasticsearch
+  module API
+    module Cluster
+      module Actions
+
+        # Returns a list of any cluster-level changes (e.g. create index, update mapping, allocate or fail shard)
+        # which have not yet been executed and are queued up.
+        #
+        # @example Get a list of currently queued up tasks in the cluster
+        #
+        #     client.cluster.pending_tasks
+        #
+        # @option arguments [Boolean] :local Return local information, do not retrieve the state from master node
+        #                                    (default: false)
+        # @option arguments [Time] :master_timeout Specify timeout for connection to master
+        #
+        # @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/cluster-pending.html
+        #
+        def pending_tasks(arguments={})
+          valid_params = [
+            :local,
+            :master_timeout ]
+          method = 'GET'
+          path   = "/_cluster/pending_tasks"
+          params = Utils.__validate_and_extract_params arguments, valid_params
+          body   = nil
+
+          perform_request(method, path, params, body).body
+        end
+      end
+    end
+  end
+end

data/lib/elasticsearch/api/actions/delete.rb

@@ -55,7 +55,7 @@ module Elasticsearch
 
       rescue Exception => e
         # NOTE: Use exception name, not full class in Elasticsearch::Client to allow client plugability
-        if arguments[:ignore] == 404 && e.class.to_s =~ /NotFound/; false
+        if Array(arguments[:ignore]).include?(404) && e.class.to_s =~ /NotFound/; false
         else raise(e)
         end
       end

data/lib/elasticsearch/api/actions/get.rb

@@ -59,7 +59,7 @@ module Elasticsearch
 
       rescue Exception => e
         # NOTE: Use exception name, not full class in Elasticsearch::Client to allow client plugability
-        if arguments[:ignore] == 404 && e.class.to_s =~ /NotFound/; false
+        if Array(arguments[:ignore]).include?(404) && e.class.to_s =~ /NotFound/; false
         else raise(e)
         end
       end

data/lib/elasticsearch/api/actions/get_source.rb

@@ -62,7 +62,7 @@ module Elasticsearch
 
       rescue Exception => e
         # NOTE: Use exception name, not full class in Elasticsearch::Client to allow client plugability
-        if arguments[:ignore] == 404 && e.class.to_s =~ /NotFound/; false
+        if Array(arguments[:ignore]).include?(404) && e.class.to_s =~ /NotFound/; false
         else raise(e)
         end
       end

data/lib/elasticsearch/api/actions/indices/delete_template.rb

@@ -28,7 +28,7 @@ module Elasticsearch
 
         rescue Exception => e
           # NOTE: Use exception name, not full class in Elasticsearch::Client to allow client plugability
-          if arguments[:ignore] == 404 && e.class.to_s =~ /NotFound/; false
+          if Array(arguments[:ignore]).include?(404) && e.class.to_s =~ /NotFound/; false
           else raise(e)
           end
         end

data/lib/elasticsearch/api/actions/indices/get_settings.rb

@@ -9,19 +9,50 @@ module Elasticsearch
         #
         #     client.indices.get_settings
         #
+        # @example Get settings for the 'foo' index
+        #
+        #     client.indices.get_settings index: 'foo'
+        #
+        # @example Get settings for indices beginning with foo
+        #
+        #     client.indices.get_settings prefix: 'foo'
+        #
         # @example Get settings for an index named _myindex_
         #
         #     client.indices.get_settings index: 'myindex'
         #
         # @option arguments [List] :index A comma-separated list of index names; use `_all` or empty string
         #                                 to perform the operation on all indices
+        # @option arguments [String] :prefix The prefix all settings must have in order to be included
+        # @option arguments [Boolean] :allow_no_indices Whether to ignore if a wildcard indices expression resolves into
+        #                                               no concrete indices. (This includes `_all` string or when no
+        #                                               indices have been specified)
+        # @option arguments [String] :expand_wildcards Whether to expand wildcard expression to concrete indices that
+        #                                              are open, closed or both. (options: open, closed)
+        # @option arguments [String] :ignore_indices When performed on multiple indices, allows to ignore
+        #                                            `missing` ones (options: none, missing) @until 1.0
+        # @option arguments [Boolean] :ignore_unavailable Whether specified concrete indices should be ignored when
+        #                                                 unavailable (missing, closed, etc)
+        # @option arguments [Boolean] :flat_settings Return settings in flat format (default: false)
         #
         # @see http://www.elasticsearch.org/guide/reference/api/admin-indices-get-settings/
         #
         def get_settings(arguments={})
+          valid_params = [
+            :prefix,
+            :ignore_indices,
+            :ignore_unavailable,
+            :allow_no_indices,
+            :expand_wildcards,
+            :flat_settings
+          ]
+
           method = 'GET'
-          path   = Utils.__pathify Utils.__listify(arguments[:index]), Utils.__listify(arguments[:type]), '_settings'
-          params = {}
+          path   = Utils.__pathify Utils.__listify(arguments[:index]),
+                                   Utils.__listify(arguments[:type]),
+                                   arguments.delete(:prefix),
+                                   '_settings'
+          params = Utils.__validate_and_extract_params arguments, valid_params
           body   = nil
 
           perform_request(method, path, params, body).body

data/lib/elasticsearch/api/actions/indices/put_settings.rb

@@ -37,6 +37,7 @@ module Elasticsearch
         # @option arguments [Boolean] :ignore_unavailable Whether specified concrete indices should be ignored when
         #                                                 unavailable (missing, closed, etc)
         # @option arguments [Time] :master_timeout Specify timeout for connection to master
+        # @option arguments [Boolean] :flat_settings Return settings in flat format (default: false)
         #
         # @see http://www.elasticsearch.org/guide/reference/api/admin-indices-update-settings/
         #
@@ -48,7 +49,8 @@ module Elasticsearch
             :ignore_unavailable,
             :allow_no_indices,
             :expand_wildcards,
-            :master_timeout
+            :master_timeout,
+            :flat_settings
           ]
 
           method = 'PUT'

data/lib/elasticsearch/api/actions/update.rb

@@ -98,7 +98,7 @@ module Elasticsearch
 
       rescue Exception => e
         # NOTE: Use exception name, not full class in Elasticsearch::Client to allow client plugability
-        if arguments[:ignore] == 404 && e.class.to_s =~ /NotFound/; false
+        if Array(arguments[:ignore]).include?(404) && e.class.to_s =~ /NotFound/; false
         else raise(e)
         end
       end

data/lib/elasticsearch/api/utils.rb

@@ -13,6 +13,7 @@ module Elasticsearch
       #
       # @api private
       def __escape(string)
+        return string if string == '*'
         defined?(EscapeUtils) ? EscapeUtils.escape_url(string.to_s) : CGI.escape(string.to_s)
       end
 

data/lib/elasticsearch/api/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module API
-    VERSION = "0.4.7"
+    VERSION = "0.4.8"
   end
 end

data/test/integration/yaml_test_runner.rb

@@ -1,12 +1,21 @@
+RUBY_1_8 = defined?(RUBY_VERSION) && RUBY_VERSION < '1.9'
+JRUBY    = defined?(JRUBY_VERSION)
+
 require 'pathname'
-require 'active_support/inflector'
+require 'logger'
 require 'yaml'
-require 'pry'
+require 'active_support/inflector'
+require 'ansi'
+require 'turn'
 
 require 'elasticsearch'
 require 'elasticsearch/extensions/test/cluster'
 require 'elasticsearch/extensions/test/startup_shutdown'
-require 'elasticsearch/extensions/test/profiling'
+require 'elasticsearch/extensions/test/profiling' unless JRUBY
+
+# Turn configuration
+ENV['ansi'] = 'false' if ENV['CI']
+Turn.config.format = :pretty
 
 # Launch test cluster
 #
@@ -17,10 +26,32 @@ Elasticsearch::Extensions::Test::Cluster.start(nodes: 1) if ENV['SERVER'] and no
 #
 at_exit { Elasticsearch::Extensions::Test::Cluster.stop if ENV['SERVER'] }
 
-require 'logger'
-require 'ansi'
+class String
+  # Reset the `ansi` method on CI
+  def ansi(*args)
+    self
+  end
+end if ENV['CI']
+
+module CapturedLogger
+  def self.included base
+    base.class_eval do
+      %w[ info error warn fatal debug ].each do |m|
+        alias_method "#{m}_without_capture", m
 
-logger = Logger.new(STDERR)
+        define_method m do |*args|
+          @logdev.__send__ :puts, *(args.join("\n") + "\n")
+          self.__send__ "#{m}_without_capture", *args
+        end
+      end
+    end
+  end
+end
+
+Logger.__send__ :include, CapturedLogger if ENV['CI']
+
+logger = Logger.new($stderr)
+logger.progname = 'elasticsearch'
 logger.formatter = proc do |severity, datetime, progname, msg|
   color = case severity
     when /INFO/ then :green
@@ -28,17 +59,23 @@ logger.formatter = proc do |severity, datetime, progname, msg|
     when /DEBUG/ then :cyan
     else :white
   end
-  ANSI.ansi(severity[0] + ' ', color, :faint) + ANSI.ansi(msg, :white, :faint) + "\n"
+  "#{severity[0]} ".ansi(color, :faint) + msg.ansi(:white, :faint) + "\n"
 end
 
+tracer = Logger.new($stdout)
+tracer.progname = 'elasticsearch.tracer'
+tracer.formatter = proc { |severity, datetime, progname, msg| "#{msg}\n" }
+
 # Set up the client for the test
 #
 # To set up your own client, just set the `$client` variable in a file, and then require it:
 #
 #     ruby -I lib:test -r ./tmp/my_special_client.rb test/integration/yaml_test_runner.rb
 #
-$client ||= Elasticsearch::Client.new host: "localhost:#{ENV['TEST_CLUSTER_PORT'] || 9250}",
-                                      logger: (ENV['QUIET'] ? nil : logger)
+$client ||= Elasticsearch::Client.new host: "localhost:#{ENV['TEST_CLUSTER_PORT'] || 9250}"
+
+$client.transport.logger = logger unless ENV['QUIET'] || ENV['CI']
+$client.transport.tracer = tracer if ENV['CI']
 
 # Store Elasticsearch version
 #
@@ -46,7 +83,7 @@ es_version_info = $client.info['version']
 $es_version = es_version_info['number']
 
 puts '-'*80,
-     "Elasticsearch #{ANSI.ansi($es_version, :bold)} [#{es_version_info['build_hash'].to_s[0...7]}]".center(80),
+     "Elasticsearch #{$es_version.ansi(:bold)} [#{es_version_info['build_hash'].to_s[0...7]}]".center(80),
      '-'*80
 
 require 'test_helper'
@@ -136,7 +173,7 @@ module Elasticsearch
           end
         ]
 
-        STDERR.puts "ARGUMENTS: #{arguments.inspect}" if ENV['DEBUG']
+        $stderr.puts "ARGUMENTS: #{arguments.inspect}" if ENV['DEBUG']
 
         $results[test.hash] = namespace.reduce($client) do |memo, current|
           unless current == namespace.last
@@ -253,11 +290,11 @@ suites.each do |suite|
 
       tests.each do |test|
         context '' do
-          test_name = test.keys.first.to_s + (ENV['QUIET'] ? '' : " | #{ANSI.ansi(file.gsub(PATH.to_s, ''), :bold)}")
+          test_name = test.keys.first.to_s + (ENV['QUIET'] ? '' : " | #{file.gsub(PATH.to_s, '').ansi(:bold)}")
           actions   = test.values.first
 
           if reason = Runner.skip?(actions)
-            STDOUT.puts "#{ANSI.ansi('SKIP', :yellow)}: [#{name}] #{test_name} (Reason: #{reason})"
+            $stdout.puts "#{'SKIP'.ansi(:yellow)} [#{name}] #{test_name} (Reason: #{reason})"
             next
           end
 
@@ -273,8 +310,14 @@ suites.each do |suite|
 
           # --- Register test method ------------------------------------------
           should test_name do
+            if ENV['CI']
+              ref = ENV['TEST_BUILD_REF'].to_s.gsub(/origin\//, '') || 'master'
+              $stderr.puts "https://github.com/elasticsearch/elasticsearch/blob/#{ref}/rest-api-spec/test/" \
+                          + file.gsub(PATH.to_s, ''), ""
+              $stderr.puts YAML.dump(test)
+            end
             actions.each do |action|
-              STDERR.puts "ACTION: #{action.inspect}" if ENV['DEBUG']
+              $stderr.puts "ACTION: #{action.inspect}" if ENV['DEBUG']
 
               case
 
@@ -289,7 +332,7 @@ suites.each do |suite|
                     $results[test.hash] = Runner.perform_api_call(test, api, arguments)
                   rescue Exception => e
                     if catch_exception
-                      STDERR.puts "CATCH '#{catch_exception}': #{e.inspect}" if ENV['DEBUG']
+                      $stderr.puts "CATCH '#{catch_exception}': #{e.inspect}" if ENV['DEBUG']
                       case e
                         when 'missing'
                           assert_match /\[404\]/, e.message
@@ -311,12 +354,12 @@ suites.each do |suite|
                 #
                 when property = action['is_true']
                   result = Runner.evaluate(test, property)
-                  STDERR.puts "CHECK: Expected '#{property}' to be true, is: #{result.inspect}" if ENV['DEBUG']
+                  $stderr.puts "CHECK: Expected '#{property}' to be true, is: #{result.inspect}" if ENV['DEBUG']
                   assert(result, "Property '#{property}' should be true, is: #{result.inspect}")
 
                 when property = action['is_false']
                   result = Runner.evaluate(test, property)
-                  STDERR.puts "CHECK: Expected '#{property}' to be false, is: #{result.inspect}" if ENV['DEBUG']
+                  $stderr.puts "CHECK: Expected '#{property}' to be false, is: #{result.inspect}" if ENV['DEBUG']
                   assert( !!! result, "Property '#{property}' should be false, is: #{result.inspect}")
 
                 when a = action['match']
@@ -324,7 +367,7 @@ suites.each do |suite|
 
                   value  = Runner.fetch_or_return(value)
                   result = Runner.evaluate(test, property)
-                  STDERR.puts "CHECK: Expected '#{property}' to be '#{value}', is: #{result.inspect}" if ENV['DEBUG']
+                  $stderr.puts "CHECK: Expected '#{property}' to be '#{value}', is: #{result.inspect}" if ENV['DEBUG']
                   assert_equal(value, result)
 
                 when a = action['length']
@@ -332,7 +375,7 @@ suites.each do |suite|
 
                   result = Runner.evaluate(test, property)
                   length = result.size
-                  STDERR.puts "CHECK: Expected '#{property}' to be #{value}, is: #{length.inspect}" if ENV['DEBUG']
+                  $stderr.puts "CHECK: Expected '#{property}' to be #{value}, is: #{length.inspect}" if ENV['DEBUG']
                   assert_equal(value, length)
 
                 when a = action['lt'] || action['gt']
@@ -343,14 +386,14 @@ suites.each do |suite|
                   result  = Runner.evaluate(test, property)
                   message = "Expected '#{property}' to be #{operator} #{value}, is: #{result.inspect}"
 
-                  STDERR.puts "CHECK: #{message}" if ENV['DEBUG']
+                  $stderr.puts "CHECK: #{message}" if ENV['DEBUG']
                   # operator == 'less than' ? assert(value.to_f < result.to_f, message) : assert(value.to_f > result.to_f, message)
                   assert_operator result, operator.to_sym, value.to_i
 
                 when stash = action['set']
                   property, variable = stash.to_a.first
                   result  = Runner.evaluate(test, property)
-                  STDERR.puts "STASH: '$#{variable}' => #{result.inspect}" if ENV['DEBUG']
+                  $stderr.puts "STASH: '$#{variable}' => #{result.inspect}" if ENV['DEBUG']
                   Runner.set variable, result
               end
             end

data/test/test_helper.rb

@@ -1,17 +1,28 @@
 RUBY_1_8 = defined?(RUBY_VERSION) && RUBY_VERSION < '1.9'
+JRUBY    = defined?(JRUBY_VERSION)
 
 if RUBY_1_8 and not ENV['BUNDLE_GEMFILE']
   require 'rubygems'
   gem 'test-unit'
 end
 
-require 'simplecov' and SimpleCov.start { add_filter "/test|test_/" } if ENV["COVERAGE"]
+if ENV['COVERAGE'] && ENV['CI'].nil? && !RUBY_1_8
+  require 'simplecov'
+  SimpleCov.start { add_filter "/test|test_/" }
+end
+
+if ENV['CI'] && !RUBY_1_8
+  require 'simplecov'
+  require 'simplecov-rcov'
+  SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
+  SimpleCov.start { add_filter "/test|test_" }
+end
 
 require 'test/unit'
 require 'shoulda-context'
 require 'mocha/setup'
 
-unless ENV["TM_FILEPATH"] || ENV["NOTURN"] || RUBY_1_8
+unless ENV["NOTURN"] || RUBY_1_8
   require 'turn'
 
   if ENV['QUIET']
@@ -27,7 +38,7 @@ RequireProf.print_timing_infos if ENV["REQUIRE_PROF"]
 if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
   require 'elasticsearch/extensions/test/cluster'
   require 'elasticsearch/extensions/test/startup_shutdown'
-  require 'elasticsearch/extensions/test/profiling'
+  require 'elasticsearch/extensions/test/profiling' unless JRUBY
 end
 
 module Elasticsearch

data/test/unit/clear_scroll_test.rb

@@ -0,0 +1,38 @@
+require 'test_helper'
+
+module Elasticsearch
+  module Test
+    class ClearScrollTest < ::Test::Unit::TestCase
+
+      context "Clear scroll" do
+        subject { FakeClient.new }
+
+        should "perform correct request" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal 'DELETE', method
+            assert_equal '_search/scroll/abc123', url
+            assert_equal Hash.new, params
+            assert_nil   body
+            true
+          end.returns(FakeResponse.new)
+
+          subject.clear_scroll :scroll_id => 'abc123'
+        end
+
+        should "listify scroll IDs" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal 'DELETE', method
+            assert_equal '_search/scroll/abc123,def456', url
+            assert_equal Hash.new, params
+            assert_nil   body
+            true
+          end.returns(FakeResponse.new)
+
+          subject.clear_scroll :scroll_id => ['abc123', 'def456']
+        end
+
+      end
+
+    end
+  end
+end

data/test/unit/cluster/pending_tasks_test.rb

@@ -0,0 +1,26 @@
+require 'test_helper'
+
+module Elasticsearch
+  module Test
+    class ClusterPendingTasksTest < ::Test::Unit::TestCase
+
+      context "Cluster: Pending tasks" do
+        subject { FakeClient.new }
+
+        should "perform correct request" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal 'GET', method
+            assert_equal '/_cluster/pending_tasks', url
+            assert_equal Hash.new, params
+            assert_nil   body
+            true
+          end.returns(FakeResponse.new)
+
+          subject.cluster.pending_tasks
+        end
+
+      end
+
+    end
+  end
+end

data/test/unit/utils_test.rb

@@ -21,6 +21,10 @@ module Elasticsearch
             assert_equal 'foo%5Ebar', __escape('foo^bar')
           end
 
+          should "not encode asterisks" do
+            assert_equal '*', __escape('*')
+          end
+
           should "use CGI.escape by default" do
             CGI.expects(:escape)
             __escape('foo bar')
@@ -31,7 +35,7 @@ module Elasticsearch
             CGI.expects(:escape).never
             EscapeUtils.expects(:escape_url)
             __escape('foo bar')
-          end unless RUBY_1_8
+          end unless RUBY_1_8 || JRUBY
 
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-api
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-11 00:00:00.000000000 Z
+date: 2014-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -315,6 +315,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov-rcov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cane
   requirement: !ruby/object:Gem::Requirement
@@ -383,12 +399,14 @@ files:
 - lib/elasticsearch-api.rb
 - lib/elasticsearch/api.rb
 - lib/elasticsearch/api/actions/bulk.rb
+- lib/elasticsearch/api/actions/clear_scroll.rb
 - lib/elasticsearch/api/actions/cluster/get_settings.rb
 - lib/elasticsearch/api/actions/cluster/health.rb
 - lib/elasticsearch/api/actions/cluster/node_hot_threads.rb
 - lib/elasticsearch/api/actions/cluster/node_info.rb
 - lib/elasticsearch/api/actions/cluster/node_shutdown.rb
 - lib/elasticsearch/api/actions/cluster/node_stats.rb
+- lib/elasticsearch/api/actions/cluster/pending_tasks.rb
 - lib/elasticsearch/api/actions/cluster/put_settings.rb
 - lib/elasticsearch/api/actions/cluster/reroute.rb
 - lib/elasticsearch/api/actions/cluster/state.rb
@@ -453,6 +471,7 @@ files:
 - test/integration/yaml_test_runner.rb
 - test/test_helper.rb
 - test/unit/bulk_test.rb
+- test/unit/clear_scroll_test.rb
 - test/unit/client_test.rb
 - test/unit/cluster/get_settings_test.rb
 - test/unit/cluster/health_test.rb
@@ -460,6 +479,7 @@ files:
 - test/unit/cluster/node_info_test.rb
 - test/unit/cluster/node_shutdown_test.rb
 - test/unit/cluster/node_stats_test.rb
+- test/unit/cluster/pending_tasks_test.rb
 - test/unit/cluster/put_settings_test.rb
 - test/unit/cluster/reroute_test.rb
 - test/unit/cluster/state_test.rb
@@ -549,6 +569,7 @@ test_files:
 - test/integration/yaml_test_runner.rb
 - test/test_helper.rb
 - test/unit/bulk_test.rb
+- test/unit/clear_scroll_test.rb
 - test/unit/client_test.rb
 - test/unit/cluster/get_settings_test.rb
 - test/unit/cluster/health_test.rb
@@ -556,6 +577,7 @@ test_files:
 - test/unit/cluster/node_info_test.rb
 - test/unit/cluster/node_shutdown_test.rb
 - test/unit/cluster/node_stats_test.rb
+- test/unit/cluster/pending_tasks_test.rb
 - test/unit/cluster/put_settings_test.rb
 - test/unit/cluster/reroute_test.rb
 - test/unit/cluster/state_test.rb