yoga_pants 0.1.0 → 0.1.1

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+# v0.1.1
+
+- ElasticSearch errors now have their own exceptions
+
 # v0.1.0
 
 - Added multi_search (thanks to @dhotson)

data/lib/yoga_pants/client.rb

@@ -5,15 +5,6 @@ module YogaPants
     #   * failing over to nodes in a list
     #   * ES-specific error handling
 
-    class RequestError < RuntimeError
-      attr_reader :http_error
-
-      def initialize(message, http_error = nil)
-        @http_error = nil
-        super(message)
-      end
-    end
-
     attr_accessor :hosts, :options, :active_host
 
     def initialize(hosts, options = {})
@@ -55,6 +46,8 @@ module YogaPants
 
     BULK_OPERATIONS_WITH_DATA = [:index, :create].freeze
     def bulk(path, operations, args = {})
+      return [] if operations.empty?
+
       path = path.sub(%r{/(?:_bulk)?$}, '/_bulk')
 
       with_error_handling do
@@ -112,6 +105,38 @@ module YogaPants
       connection.reset
     end
 
+    class RequestError < RuntimeError; end
+
+    class HTTPRequestError < RequestError
+      attr_reader :http_error
+
+      def initialize(message, http_error)
+        super(message)
+        @http_error = http_error
+      end
+    end
+
+    class ElasticSearchError < RequestError
+      attr_reader :elasticsearch_exception_name
+      attr_reader :elasticsearch_exception_details
+
+      def initialize(elasticsearch_error_message, original_exception)
+        super(elasticsearch_error_message)
+        set_backtrace(original_exception.backtrace)
+        parse_and_set_elasticsearch_error_message(elasticsearch_error_message)
+      end
+
+      def parse_and_set_elasticsearch_error_message(message)
+        if message =~ /(\w+)\[(.+)\]/m
+          @elasticsearch_exception_name = $1
+          @elasticsearch_exception_details = $2
+        else
+          @elasticsearch_exception_name = message
+        end
+      end
+
+    end
+
     private
 
     def connection
@@ -134,10 +159,10 @@ module YogaPants
         @retries += 1
         pick_next_host
         retry
-      elsif e.body.is_a?(Hash) && error = e.body['error']
-        raise RequestError.new("ElasticSearch Error: #{error}", e).tap { |ex| ex.set_backtrace(e.backtrace) }
+      elsif e.body.is_a?(Hash) && error_message = e.body['error']
+        raise ElasticSearchError.new(error_message, e)
       else
-        raise RequestError.new(e.message, e).tap { |ex| ex.set_backtrace(e.backtrace) }
+        raise HTTPRequestError.new(e.message, e)
       end
     end
   end

data/lib/yoga_pants/connection.rb

@@ -33,6 +33,7 @@ module YogaPants
       @host = host.chomp('/')
       @options = options || {}
       @http = HTTPClient.new
+      @http.debug_dev = @options[:debug_io] if @options[:debug_io].respond_to?(:<<)
 
       default_timeout      = @options[:timeout] || 5
       http.connect_timeout = @options[:connect_timeout] || default_timeout

data/lib/yoga_pants/version.rb

@@ -1,3 +1,3 @@
 module YogaPants
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/integration/basic_spec.rb

@@ -97,7 +97,7 @@ module YogaPants
               [:index, {:_index => 'yoga_pants_test', :_type => 'doc', :_id => 1}, {:bar => 1}],
               [:index, {:_index => '', :_type => 'doc', :_id => 2}, {:bar => 'invalid'}],
             ])
-          end.to raise_error(Client::RequestError, "ElasticSearch Error: ElasticSearchException[String index out of range: 0]; nested: StringIndexOutOfBoundsException[String index out of range: 0]; ")
+          end.to raise_error(Client::ElasticSearchError, "ElasticSearchException[String index out of range: 0]; nested: StringIndexOutOfBoundsException[String index out of range: 0]; ")
 
           subject.exists?("/yoga_pants_test/doc/1").should be_false
           subject.exists?("/yoga_pants_test/doc/2").should be_false
@@ -137,7 +137,7 @@ module YogaPants
         subject.post("/yoga_pants_test/doc/1", :body => {
           :foo => 'bar'
         })
-        expect { subject.get("/yoga_pants_test/doc/1/_mlt?min_term_freq=invalid") }.to raise_error(Client::RequestError, "ElasticSearch Error: Failed to parse int parameter [min_term_freq] with value [invalid]")
+        expect { subject.get("/yoga_pants_test/doc/1/_mlt?min_term_freq=invalid") }.to raise_error(Client::ElasticSearchError, "Failed to parse int parameter [min_term_freq] with value [invalid]")
       end
     end
 
@@ -154,7 +154,7 @@ module YogaPants
 
       it "raises an RequestError" do
         VCR.use_cassette('connection_refused') do
-          expect { subject.exists?("/foo") }.to raise_error(Client::RequestError, "Connection refused to http://localhost:1")
+          expect { subject.exists?("/foo") }.to raise_error(Client::HTTPRequestError, "Connection refused to http://localhost:1")
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yoga_pants
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-27 00:00:00.000000000 Z
+date: 2013-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
-  requirement: &70351042094460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 2.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *70351042094460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.2.5
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70351042094000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70351042094000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70351042093480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70351042093480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70351042093000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70351042093000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70351042092560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70351042092560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70351042092020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +101,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70351042092020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A super lightweight interface to ElasticSearch's HTTP REST API
 email: 
 executables: []
@@ -129,10 +159,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A super lightweight interface to ElasticSearch's HTTP REST API.
 test_files:
 - spec/integration/basic_spec.rb
 - spec/spec_helper.rb
+has_rdoc: