elasticsearch-api 2.0.2 → 5.0.0.pre

data/test/unit/ingest/get_pipeline_test.rb

@@ -7,12 +7,6 @@ module Elasticsearch
       context "Ingest: Get pipeline" do
         subject { FakeClient.new }
 
-        should "require the :id argument" do
-          assert_raise ArgumentError do
-            subject.ingest.get_pipeline
-          end
-        end
-
         should "perform correct request" do
           subject.expects(:perform_request).with do |method, url, params, body|
             assert_equal 'GET', method

data/test/unit/search_exists_test.rb

@@ -19,38 +19,6 @@ module Elasticsearch
           subject.search_exists :q => 'foo'
         end
 
-        should "perform request against an index" do
-          subject.expects(:perform_request).with do |method, url, params, body|
-            assert_equal 'POST', method
-            assert_equal 'books/_search/exists', url
-            assert_nil   body
-            true
-          end.returns(FakeResponse.new)
-
-          subject.search_exists :index => 'books'
-        end
-
-        should "perform request against an index and type" do
-          subject.expects(:perform_request).with do |method, url, params, body|
-            assert_equal 'POST', method
-            assert_equal 'books/holly/_search/exists', url
-            assert_nil   body
-            true
-          end.returns(FakeResponse.new)
-
-          subject.search_exists :index => 'books', :type => 'holly'
-        end
-
-        should "perform request against default index if type given" do
-          subject.expects(:perform_request).with do |method, url, params, body|
-            assert_equal 'POST', method
-            assert_equal '_all/holly/_search/exists', url
-            assert_nil   body
-            true
-          end.returns(FakeResponse.new)
-
-          subject.search_exists :type => 'holly'
-        end
       end
 
     end

data/utils/thor/generate_source.rb

@@ -62,6 +62,18 @@ module Elasticsearch
           @namespace_depth  = @full_namespace.size > 0 ? @full_namespace.size-1 : 0
           @module_namespace = @full_namespace[0, @namespace_depth]
           @method_name      = @full_namespace.last
+          @http_method      = "HTTP_#{@spec['methods'].first}"
+          @http_path        = unless @spec['url']['parts'].empty?
+                                @spec['url']['path']
+                                  .split('/')
+                                  .compact
+                                  .reject { |p| p =~ /^\s*$/ }
+                                  .map { |p| p =~ /\{/ ? "\#\{arguments[:#{p.tr('{}', '')}]\}" : p }
+                                  .join('/')
+                                  .gsub(/^\//, '')
+                              else
+                                @spec['url']['path'].gsub(/^\//, '')
+                              end
 
           # -- Ruby files
 

data/utils/thor/templates/ruby/method.erb

@@ -1,7 +1,7 @@
 module Elasticsearch
   module API
     <%- @module_namespace.each_with_index do |name, i| -%>
-    <%= '  '*i %>module <%= name.capitalize %>
+    <%= '  '*i %>module <%= name == 'xpack' ? 'XPack' : name.capitalize %>
     <%- end -%>
     <%= '  '*@namespace_depth %>module Actions
 
@@ -35,17 +35,13 @@ module Elasticsearch
       <%= '  '*(@namespace_depth+1) + "raise ArgumentError, \"Required argument 'body' missing\" unless arguments[:body]" + "\n" -%>
 <%- end -%>
 <%# Method, path, params, body  -%>
+      <%- unless @spec['url']['params'].empty? -%>
       <%= '  '*@namespace_depth %>  valid_params = [
       <%= '  '*(@namespace_depth+2) %><%= @spec['url']['params'].keys.map { |k| ":#{k}" }.join(",\n#{'  '*(@namespace_depth+5)}") %> ]
-      <%= '  '*@namespace_depth %>  method = '<%= @spec['methods'].first %>'
-      <%- unless @spec['url']['parts'].empty?  -%>
-      <%= '  '*@namespace_depth %>  path   = "<%= @spec['url']['path'].split('/').compact.reject {|p| p =~ /^\s*$/}.map do |p|
-        p =~ /\{/ ? "\#\{arguments[:#{p.tr('{}', '')}]\}" : p
-      end.join('/') %>"
-      <%- else -%>
-      <%= '  '*@namespace_depth %>  path   = "<%= @spec['url']['path'] %>"
       <%- end -%>
-      <%- unless @spec['url']['params'].keys.empty? -%>
+      <%= '  '*@namespace_depth %>  method = <%= @http_method %>
+      <%= '  '*@namespace_depth %>  path   = "<%= @http_path %>"
+      <%- unless @spec['url']['params'].empty? -%>
       <%= '  '*@namespace_depth %>  params = Utils.__validate_and_extract_params arguments, valid_params
       <%- else -%>
       <%= '  '*@namespace_depth %>  params = {}

data/utils/thor/templates/ruby/test.erb

@@ -2,9 +2,9 @@ require 'test_helper'
 
 module Elasticsearch
   module Test
-    class <%= @module_namespace.empty? ? @method_name.camelize : @module_namespace.map {|n| n.capitalize}.join + @method_name.camelize %>Test < ::Test::Unit::TestCase
+    class <%= @module_namespace.map {|n| n.capitalize}.map { |n| n == 'Xpack' ? 'XPack' : n  }.join('') + @method_name.camelize %>Test < ::Test::Unit::TestCase
 
-      context "<%= @module_namespace.empty? ? '' : @module_namespace.map {|n| n.capitalize}.join + ': ' %><%= @method_name.humanize %>" do
+      context "<%= @module_namespace.map {|n| n.capitalize}.map { |n| n == 'Xpack' ? 'XPack' : n  }.join(' ') + ': ' %><%= @method_name.humanize %>" do
         subject { FakeClient.new }
 
         should "perform correct request" do
@@ -16,7 +16,7 @@ module Elasticsearch
             true
           end.returns(FakeResponse.new)
 
-          subject.<%= @full_namespace.join('.') %>
+          subject.<%= @full_namespace.join('.') %> <%= @spec['url']['parts'].select { |name, info| info['required'] }.keys.map { |d| ":#{d} => 'foo'" }.join(', ') %>
         end
 
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-api
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 5.0.0.pre
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-07 00:00:00.000000000 Z
+date: 2016-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -386,6 +386,7 @@ files:
 - lib/elasticsearch/api/actions/cat/shards.rb
 - lib/elasticsearch/api/actions/cat/snapshots.rb
 - lib/elasticsearch/api/actions/cat/tasks.rb
+- lib/elasticsearch/api/actions/cat/templates.rb
 - lib/elasticsearch/api/actions/cat/thread_pool.rb
 - lib/elasticsearch/api/actions/clear_scroll.rb
 - lib/elasticsearch/api/actions/cluster/allocation_explain.rb
@@ -444,9 +445,11 @@ files:
 - lib/elasticsearch/api/actions/indices/put_warmer.rb
 - lib/elasticsearch/api/actions/indices/recovery.rb
 - lib/elasticsearch/api/actions/indices/refresh.rb
+- lib/elasticsearch/api/actions/indices/rollover.rb
 - lib/elasticsearch/api/actions/indices/seal.rb
 - lib/elasticsearch/api/actions/indices/segments.rb
 - lib/elasticsearch/api/actions/indices/shard_stores.rb
+- lib/elasticsearch/api/actions/indices/shrink.rb
 - lib/elasticsearch/api/actions/indices/snapshot_index.rb
 - lib/elasticsearch/api/actions/indices/stats.rb
 - lib/elasticsearch/api/actions/indices/status.rb
@@ -528,6 +531,7 @@ files:
 - test/unit/cat/shards_test.rb
 - test/unit/cat/snapshots_test.rb
 - test/unit/cat/tasks_test.rb
+- test/unit/cat/templates_test.rb
 - test/unit/cat/thread_pool_test.rb
 - test/unit/clear_scroll_test.rb
 - test/unit/client_test.rb
@@ -588,9 +592,11 @@ files:
 - test/unit/indices/put_warmer_test.rb
 - test/unit/indices/recovery_test.rb
 - test/unit/indices/refresh_test.rb
+- test/unit/indices/rollover_test.rb
 - test/unit/indices/seal_test.rb
 - test/unit/indices/segments_test.rb
 - test/unit/indices/shard_stores_test.rb
+- test/unit/indices/shrink_test.rb
 - test/unit/indices/snapshot_index_test.rb
 - test/unit/indices/stats_test.rb
 - test/unit/indices/status_test.rb
@@ -664,12 +670,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby API for Elasticsearch.
@@ -698,6 +704,7 @@ test_files:
 - test/unit/cat/shards_test.rb
 - test/unit/cat/snapshots_test.rb
 - test/unit/cat/tasks_test.rb
+- test/unit/cat/templates_test.rb
 - test/unit/cat/thread_pool_test.rb
 - test/unit/clear_scroll_test.rb
 - test/unit/client_test.rb
@@ -758,9 +765,11 @@ test_files:
 - test/unit/indices/put_warmer_test.rb
 - test/unit/indices/recovery_test.rb
 - test/unit/indices/refresh_test.rb
+- test/unit/indices/rollover_test.rb
 - test/unit/indices/seal_test.rb
 - test/unit/indices/segments_test.rb
 - test/unit/indices/shard_stores_test.rb
+- test/unit/indices/shrink_test.rb
 - test/unit/indices/snapshot_index_test.rb
 - test/unit/indices/stats_test.rb
 - test/unit/indices/status_test.rb