elasticsearch-api 0.4.11 → 1.0.0.rc1

data/lib/elasticsearch/api/namespace/cat.rb

@@ -0,0 +1,20 @@
+module Elasticsearch
+  module API
+    module Cat
+      module Actions; end
+
+      # Client for the "cat" namespace (includes the {Cat::Actions} methods)
+      #
+      class CatClient
+        include Common::Client, Common::Client::Base, Cat::Actions
+      end
+
+      # Proxy method for {CatClient}, available in the receiving object
+      #
+      def cat
+        @cat ||= CatClient.new(self)
+      end
+
+    end
+  end
+end

data/lib/elasticsearch/api/namespace/nodes.rb

@@ -0,0 +1,20 @@
+module Elasticsearch
+  module API
+    module Nodes
+      module Actions; end
+
+      # Client for the "nodes" namespace (includes the {Nodes::Actions} methods)
+      #
+      class NodesClient
+        include Common::Client, Common::Client::Base, Nodes::Actions
+      end
+
+      # Proxy method for {NodesClient}, available in the receiving object
+      #
+      def nodes
+        @nodes ||= NodesClient.new(self)
+      end
+
+    end
+  end
+end

data/lib/elasticsearch/api/namespace/snapshot.rb

@@ -0,0 +1,20 @@
+module Elasticsearch
+  module API
+    module Snapshot
+      module Actions; end
+
+      # Client for the "snapshot" namespace (includes the {Snapshot::Actions} methods)
+      #
+      class SnapshotClient
+        include Common::Client, Common::Client::Base, Snapshot::Actions
+      end
+
+      # Proxy method for {SnapshotClient}, available in the receiving object
+      #
+      def snapshot
+        @snapshot ||= SnapshotClient.new(self)
+      end
+
+    end
+  end
+end

data/lib/elasticsearch/api/utils.rb

@@ -30,8 +30,6 @@ module Elasticsearch
       #
       # @api private
       def __listify(*list)
-        # require 'pry'
-        # binding.pry
         Array(list).flatten.
           map { |e| e.respond_to?(:split) ? e.split(',') : e }.
           flatten.
@@ -124,10 +122,10 @@ module Elasticsearch
       def __validate_and_extract_params(arguments, valid_params=[])
         arguments.each do |k,v|
           raise ArgumentError, "URL parameter '#{k}' is not supported" \
-            unless valid_params.include?(k) || COMMON_PARAMS.include?(k)
+            unless COMMON_PARAMS.include?(k) || COMMON_QUERY_PARAMS.include?(k) || valid_params.include?(k)
         end
 
-        params = arguments.select { |k,v| valid_params.include?(k) }
+        params = arguments.select { |k,v| COMMON_QUERY_PARAMS.include?(k) || valid_params.include?(k) }
         params = Hash[params] unless params.is_a?(Hash) # Normalize Ruby 1.8 and Ruby 1.9 Hash#select behaviour
         params
       end

data/lib/elasticsearch/api/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module API
-    VERSION = "0.4.11"
+    VERSION = "1.0.0.rc1"
   end
 end

data/test/integration/yaml_test_runner.rb

@@ -13,6 +13,9 @@ require 'elasticsearch/extensions/test/cluster'
 require 'elasticsearch/extensions/test/startup_shutdown'
 require 'elasticsearch/extensions/test/profiling' unless JRUBY
 
+# Skip features
+SKIP_FEATURES = ENV['TEST_SKIP_FEATURES'] || ''
+
 # Turn configuration
 ENV['ansi'] = 'false' if ENV['CI']
 Turn.config.format = :pretty
@@ -215,7 +218,9 @@ module Elasticsearch
 
       def skip?(actions)
         skip = actions.select { |a| a['skip'] }.first
-        if skip
+
+        # Skip version
+        if skip && skip['skip']['version']
           min, max = skip['skip']['version'].split('-').map(&:strip)
 
           min_normalized = sprintf "%03d-%03d-%03d",
@@ -234,7 +239,14 @@ module Elasticsearch
           if min_normalized <= es_normalized && max_normalized >= es_normalized
             return skip['skip']['reason'] ? skip['skip']['reason'] : true
           end
+
+        # Skip features
+        elsif skip && skip['skip']['features']
+          if (skip['skip']['features'].split(',') & SKIP_FEATURES.split(',') ).size > 0
+            return skip['skip']['features']
+          end
         end
+
         return false
       end
 
@@ -278,9 +290,11 @@ suites.each do |suite|
       # Extract setup actions
       setup_actions = tests.select { |t| t['setup'] }.first['setup'] rescue []
 
-      # Skip all the tests when `skip` is part fo the `setup`
-      # TODO: Implement top-level `setup` expression
-      next if Runner.skip? setup_actions
+      # Skip all the tests when `skip` is part of the `setup` part
+      if features = Runner.skip?(setup_actions)
+        $stdout.puts "#{'SKIP'.ansi(:yellow)} [#{name}] #{file.gsub(PATH.to_s, '').ansi(:bold)} (Feature not implemented: #{features})"
+        next
+      end
 
       # Remove setup actions from tests
       tests = tests.reject { |t| t['setup'] }
@@ -365,10 +379,25 @@ suites.each do |suite|
                 when a = action['match']
                   property, value = a.to_a.first
 
-                  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']
-                  assert_equal(value, result)
+                  if value.is_a?(String) && value =~ %r{\s*^/\s*.*\s*/$\s*}mx # Begins and ends with /
+                    pattern = Regexp.new(value.strip[1..-2], Regexp::EXTENDED|Regexp::MULTILINE)
+                  else
+                    value  = Runner.fetch_or_return(value)
+                  end
+
+                  if property == '$body'
+                    result = $results[test.hash]
+                  else
+                    result = Runner.evaluate(test, property)
+                  end
+
+                  if pattern
+                    $stderr.puts "CHECK: Expected '#{property}' to match #{pattern}, is: #{result.inspect}" if ENV['DEBUG']
+                    assert_match(pattern, result)
+                  else
+                    $stderr.puts "CHECK: Expected '#{property}' to be '#{value}', is: #{result.inspect}" if ENV['DEBUG']
+                    assert_equal(value, result)
+                  end
 
                 when a = action['length']
                   property, value = a.to_a.first

data/test/unit/cat/aliases_test.rb

@@ -0,0 +1,26 @@
+require 'test_helper'
+
+module Elasticsearch
+  module Test
+    class CatAliasesTest < ::Test::Unit::TestCase
+
+      context "Cat: Aliases" 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 '_cat/aliases', url
+            assert_equal Hash.new, params
+            assert_nil   body
+            true
+          end.returns(FakeResponse.new)
+
+          subject.cat.aliases
+        end
+
+      end
+
+    end
+  end
+end

data/test/unit/cat/allocation_test.rb

@@ -0,0 +1,26 @@
+require 'test_helper'
+
+module Elasticsearch
+  module Test
+    class CatAllocationTest < ::Test::Unit::TestCase
+
+      context "Cat: Allocation" 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 '_cat/allocation', url
+            assert_equal Hash.new, params
+            assert_nil   body
+            true
+          end.returns(FakeResponse.new)
+
+          subject.cat.allocation
+        end
+
+      end
+
+    end
+  end
+end

data/test/unit/cat/count_test.rb

@@ -0,0 +1,26 @@
+require 'test_helper'
+
+module Elasticsearch
+  module Test
+    class CatCountTest < ::Test::Unit::TestCase
+
+      context "Cat: Count" 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 '_cat/count', url
+            assert_equal Hash.new, params
+            assert_nil   body
+            true
+          end.returns(FakeResponse.new)
+
+          subject.cat.count
+        end
+
+      end
+
+    end
+  end
+end

data/test/unit/cat/health_test.rb

@@ -0,0 +1,26 @@
+require 'test_helper'
+
+module Elasticsearch
+  module Test
+    class CatHealthTest < ::Test::Unit::TestCase
+
+      context "Cat: Health" 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 '_cat/health', url
+            assert_equal Hash.new, params
+            assert_nil   body
+            true
+          end.returns(FakeResponse.new)
+
+          subject.cat.health
+        end
+
+      end
+
+    end
+  end
+end

data/test/unit/cat/help_test.rb

@@ -0,0 +1,26 @@
+require 'test_helper'
+
+module Elasticsearch
+  module Test
+    class CatHelpTest < ::Test::Unit::TestCase
+
+      context "Cat: Help" 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 '_cat', url
+            assert_equal Hash.new, params
+            assert_nil   body
+            true
+          end.returns(FakeResponse.new)
+
+          subject.cat.help
+        end
+
+      end
+
+    end
+  end
+end

data/test/unit/cat/indices_test.rb

@@ -0,0 +1,26 @@
+require 'test_helper'
+
+module Elasticsearch
+  module Test
+    class CatIndicesTest < ::Test::Unit::TestCase
+
+      context "Cat: Indices" 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 '_cat/indices', url
+            assert_equal Hash.new, params
+            assert_nil   body
+            true
+          end.returns(FakeResponse.new)
+
+          subject.cat.indices
+        end
+
+      end
+
+    end
+  end
+end

data/test/unit/cat/master_test.rb

@@ -0,0 +1,26 @@
+require 'test_helper'
+
+module Elasticsearch
+  module Test
+    class CatMasterTest < ::Test::Unit::TestCase
+
+      context "Cat: Master" 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 '_cat/master', url
+            assert_equal Hash.new, params
+            assert_nil   body
+            true
+          end.returns(FakeResponse.new)
+
+          subject.cat.master
+        end
+
+      end
+
+    end
+  end
+end

data/test/unit/cat/nodes_test.rb

@@ -0,0 +1,26 @@
+require 'test_helper'
+
+module Elasticsearch
+  module Test
+    class CatNodesTest < ::Test::Unit::TestCase
+
+      context "Cat: Nodes" 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 '_cat/nodes', url
+            assert_equal Hash.new, params
+            assert_nil   body
+            true
+          end.returns(FakeResponse.new)
+
+          subject.cat.nodes
+        end
+
+      end
+
+    end
+  end
+end

data/test/unit/cat/pending_tasks_test.rb

@@ -0,0 +1,26 @@
+require 'test_helper'
+
+module Elasticsearch
+  module Test
+    class CatPendingTasksTest < ::Test::Unit::TestCase
+
+      context "Cat: 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 '_cat/pending_tasks', url
+            assert_equal Hash.new, params
+            assert_nil   body
+            true
+          end.returns(FakeResponse.new)
+
+          subject.cat.pending_tasks
+        end
+
+      end
+
+    end
+  end
+end

data/test/unit/cat/recovery_test.rb

@@ -0,0 +1,26 @@
+require 'test_helper'
+
+module Elasticsearch
+  module Test
+    class CatRecoveryTest < ::Test::Unit::TestCase
+
+      context "Cat: Recovery" 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 '_cat/recovery', url
+            assert_equal Hash.new, params
+            assert_nil   body
+            true
+          end.returns(FakeResponse.new)
+
+          subject.cat.recovery
+        end
+
+      end
+
+    end
+  end
+end