elastic-app-search 7.3.0 → 7.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77ec30d6589d64d4748196987a812cf8e7fe51ddc740493a75386b7d05a5fa61
-  data.tar.gz: 0dfe079e1fe86aa2bb93bf9dda4db422a97bc14e6af9fb1bbedbf0cb68ea721e
+  metadata.gz: 89a3ded7c81fa35f89b068b462b18afd39598b96028014f9a3f67d116185fb01
+  data.tar.gz: ed95009629d9b59d69681eb88bcc97829644613a22b307a49a7a79c24906bc25
 SHA512:
-  metadata.gz: 1e35fc7b442007cf84f1c530e01aecaaf49c3e0fb2f00f6069eecb714479877e1d88c79332491ce25746100aaafa5ee2d3c98bb30ab419652dc7fe5617ead17a
-  data.tar.gz: 5c92d32d80af5fa318b6fa82f87baf6ad39a019d53c5b913752d7851f2f41407c6a5bcc98c3292f39993f3eea4b31e3ff3def9941c959aa2ede7a1668b69e645
+  metadata.gz: f7e23120e2e4c6185a769a505a53aaa9640be158dbf2bfd01d957f6acf4fc167c471e1403d8e45c396933bb4e66af892a200ddc91b2f233db77a670c6fffaafd
+  data.tar.gz: 174322921e02fcdba0b86075ebd931a4a10273d51ce26593cf1bdecccf1603a01b295fd11652d1e06db45abbe200512bd614bbc6279768d5b4570309c95b40e8

data/README.md

@@ -25,7 +25,7 @@ To install the gem, execute:
 gem install elastic-app-search
 ```
 
-Or place `gem 'elastic-app-search', '~> 7.3.0'` in your `Gemfile` and run `bundle install`.
+Or place `gem 'elastic-app-search', '~> 7.3.1'` in your `Gemfile` and run `bundle install`.
 
 ## Versioning
 

data/lib/elastic/app-search/exceptions.rb

@@ -3,13 +3,16 @@ module Elastic
     class ClientException < StandardError
       attr_reader :errors
 
+      def extract_messages(response)
+        errors_value = response['errors']
+        return errors_value if errors_value && errors_value.is_a?(Array)
+        return [errors_value] if errors_value && !errors_value.is_a?(Array)
+        [response]
+      end
+
       def initialize(response)
-        @errors = if response.is_a?(Array)
-          response.flat_map { |r| r['errors'] }
-        else
-          response['errors'] || [response]
-        end
-        message = (errors.count == 1) ? "Error: #{errors.first}" : "Errors: #{errors.inspect}"
+        @errors = response.is_a?(Array) ? response.flat_map { |r| extract_messages(r) } : extract_messages(response)
+        message = (errors.size == 1) ? "Error: #{errors.first}" : "Errors: #{errors.inspect}"
         super(message)
       end
     end

data/lib/elastic/app-search/version.rb

@@ -1,5 +1,5 @@
 module Elastic
   module AppSearch
-    VERSION = '7.3.0'
+    VERSION = '7.3.1'
   end
 end

data/spec/exceptions_spec.rb

@@ -0,0 +1,69 @@
+describe Elastic::AppSearch::ClientException do
+  describe "when parsing a response body" do
+    describe "and there is an 'errors' property on the response" do
+      it 'will parse a single error message' do
+        expect(Elastic::AppSearch::ClientException.new(
+          { "errors" => [ "Unauthorized action." ] }
+        ).message).to eq("Error: Unauthorized action.")
+      end
+
+      it 'will parse multiple error messages' do
+        expect(Elastic::AppSearch::ClientException.new(
+          { "errors" => [ "Unauthorized action.", "Service unavailable" ] }
+        ).message).to eq("Errors: [\"Unauthorized action.\", \"Service unavailable\"]")
+      end
+
+      it 'will parse when there is a string instead of an array in errors' do
+        expect(Elastic::AppSearch::ClientException.new(
+          { "errors" => "Routing Error. The path you have requested is invalid." }
+        ).message).to eq("Error: Routing Error. The path you have requested is invalid.")
+      end
+    end
+
+    describe "when there is an array of responses" do
+      it 'will parse a single error message' do
+        expect(Elastic::AppSearch::ClientException.new(
+          [
+            { "errors" => [ "Unauthorized action." ] },
+            { "errors" => [ "Service unavailable" ] }
+          ]
+        ).message).to eq("Errors: [\"Unauthorized action.\", \"Service unavailable\"]")
+      end
+
+      it 'will parse multiple error messages' do
+        expect(Elastic::AppSearch::ClientException.new(
+          [
+            { "errors" => [ "Unauthorized action.", "Service unavailable" ] },
+            { "errors" => [ "Another error" ] }
+          ]
+        ).message).to eq("Errors: [\"Unauthorized action.\", \"Service unavailable\", \"Another error\"]")
+      end
+
+      it 'will parse when there is a string instead of an array in errors' do
+        expect(Elastic::AppSearch::ClientException.new(
+          [
+            { "errors" => [ "Unauthorized action.", "Service unavailable" ] },
+            { "errors" => [ "Another error" ] },
+            { "errors" => "Routing Error. The path you have requested is invalid." }
+          ]
+        ).message).to eq("Errors: [\"Unauthorized action.\", \"Service unavailable\", \"Another error\", \"Routing Error. The path you have requested is invalid.\"]")
+      end
+    end
+
+    describe "and there is a single 'error'" do
+      it 'will just return the entire response body' do
+        expect(Elastic::AppSearch::ClientException.new(
+          { "error" => "Unauthorized action." }
+        ).message).to eq("Error: {\"error\"=>\"Unauthorized action.\"}")
+      end
+    end
+
+    describe "and there is a just a string" do
+      it 'will just return the entire response body' do
+        expect(Elastic::AppSearch::ClientException.new(
+          "Unauthorized action."
+        ).message).to eq("Error: Unauthorized action.")
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic-app-search
 version: !ruby/object:Gem::Version
-  version: 7.3.0
+  version: 7.3.1
 platform: ruby
 authors:
 - Quin Hoxie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-26 00:00:00.000000000 Z
+date: 2019-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -119,6 +119,7 @@ files:
 - script/console
 - spec/client_spec.rb
 - spec/config_helper.rb
+- spec/exceptions_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/elastic/app-search-ruby
 licenses:
@@ -147,4 +148,5 @@ summary: Official gem for accessing the Elastic App Search API
 test_files:
 - spec/client_spec.rb
 - spec/config_helper.rb
+- spec/exceptions_spec.rb
 - spec/spec_helper.rb