meilisearch 0.11.1 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53ba8f68eca0a4b76da0d0a967c2ee67757496072a13acb79d82de18f29c2fc4
-  data.tar.gz: 0ec5a423d738a7274cf85362d87919994fe137aac50768e0fe6efc22d3d4a9f7
+  metadata.gz: 17248185a6d2ba10e2e5fac61b6d9d07a0cac218a2accc4cd5b3bd130517f837
+  data.tar.gz: dd20f35451242677ec05ac52d95cbc14915dea6676562ef23c58a58655db24ad
 SHA512:
-  metadata.gz: 5ac3a7446b8b86e952337866228149ca7ab2767c56bcba623e86e53c25ae934bf39bd238640945799d2ec9a6ea4928fa672da9f69b7e3ecb9a3c12ebb603e485
-  data.tar.gz: fc6d734865d2e23827143e15acf9738091753be549899c3e10230adff950fedba1881e1915b30ac8de78d910a243156fb19b2852f21d3a5e93480337af188f37
+  metadata.gz: f0c0c7a6726257c62e14108f33df551cd5ec3d7c5f4b6f8eb3fa975988da3915d7b3167e0074c3e21134f49d1a40d84a55e4145ae7b4ffac45cd1daa8954e00d
+  data.tar.gz: 3cb711d0577b92fe428b90ec16d2cbc7fb593aba63f014206c17a88bca2ba4de0fdd58b51e2b014640ae7118996142b9edc4c4d4d00250fc8a6893df117e3527

data/lib/meilisearch/client.rb

@@ -23,6 +23,15 @@ module MeiliSearch
       index_object(res['uid'])
     end
 
+    def get_or_create_index(index_uid, options = {})
+      begin
+        create_index(index_uid, options)
+      rescue ApiError => e
+        raise e unless e.code == 'index_already_exists'
+      end
+      index_object(index_uid)
+    end
+
     def delete_index(index_uid)
       index_object(index_uid).delete
     end
@@ -30,8 +39,6 @@ module MeiliSearch
     # Usage:
     # client.index('indexUID')
     def index(index_uid)
-      raise IndexUidError if index_uid.nil?
-
       index_object(index_uid)
     end
     alias get_index index

data/lib/meilisearch/error.rb

@@ -1,45 +1,58 @@
 # frozen_string_literal: true
 
 module MeiliSearch
-  class MeiliSearchError < StandardError; end
-  class IndexUidError < MeiliSearchError; end
-  class MeiliSearchTimeoutError < MeiliSearchError
-    attr_reader :message
+  class ApiError < StandardError
+    attr_reader :http_code    # e.g. 400, 404...
+    attr_reader :http_message # e.g. Bad Request, Not Found...
+    attr_reader :http_body    # The response body received from the MeiliSearch API
+    attr_reader :ms_code      # The error code given by the MeiliSearch API
+    attr_reader :ms_type      # The error type given by the MeiliSearch API
+    attr_reader :ms_link      # The documentation link given by the MeiliSearch API
+    attr_reader :ms_message   # The error message given by the MeiliSearch API
+    attr_reader :message      # The detailed error message of this error class
 
-    def initialize
-      @message = "MeiliSearchTimeoutError: update wasn't processed in the expected time"
+    alias code ms_code
+    alias type ms_type
+    alias link ms_link
+
+    def initialize(http_code, http_message, http_body)
+      get_meilisearch_error_info(http_body) unless http_body.nil? || http_body.empty?
+      @http_code = http_code
+      @http_message = http_message
+      @ms_message ||= 'MeiliSearch API has not returned any error message'
+      @ms_link ||= '<no documentation link found>'
+      @message = "#{http_code} #{http_message} - #{@ms_message.capitalize}. See #{ms_link}."
+      super(details)
+    end
+
+    def get_meilisearch_error_info(http_body)
+      @http_body = JSON.parse(http_body)
+      @ms_code = @http_body['errorCode']
+      @ms_message = @http_body['message']
+      @ms_type = @http_body['errorType']
+      @ms_link = @http_body['errorLink']
     end
 
-    def to_s
-      "#{@message}."
+    def details
+      "MeiliSearch::ApiError - code: #{@ms_code} - type: #{ms_type} - message: #{@ms_message} - link: #{ms_link}"
     end
   end
 
-  class HTTPError < MeiliSearchError
-    attr_reader :status
+  class CommunicationError < StandardError
     attr_reader :message
-    attr_reader :http_body
-    attr_reader :http_body_message
-    attr_reader :details
-
-    alias code         status
-    alias body         http_body
-    alias body_message http_body_message
-
-    def initialize(status, message, http_body, details = nil)
-      @status = status
-      unless http_body.nil? || http_body.empty?
-        @http_body = JSON.parse(http_body)
-        @http_body_message = @http_body['message']
-      end
-      @message = message.capitalize
-      @message = "#{@message} - #{@http_body_message.capitalize}" unless @http_body_message.nil?
-      @details = details
+
+    def initialize(message)
+      @message = "An error occurred while trying to connect to the MeiliSearch instance: #{message}"
+      super(@message)
     end
+  end
 
-    def to_s
-      final_message = @details.nil? ? @message : "#{@message}. #{@details}"
-      "#{@status}: #{final_message}."
+  class TimeoutError < StandardError
+    attr_reader :message
+
+    def initialize
+      @message = 'The update was not processed in the expected time'
+      super(@message)
     end
   end
 end

data/lib/meilisearch/http_request.rb

@@ -16,57 +16,63 @@ module MeiliSearch
       }.compact
     end
 
-    def http_get(path = '', query_params = {})
-      response = self.class.get(
-        @base_url + path,
-        query: query_params,
-        headers: @headers,
-        timeout: 1
+    def http_get(relative_path = '', query_params = {})
+      send_request(
+        proc { |path, config| self.class.get(path, config) },
+        relative_path,
+        query_params
       )
-      validate(response)
     end
 
-    def http_post(path = '', body = nil, query_params = nil)
-      body = body.to_json unless body.nil?
-      response = self.class.post(
-        @base_url + path,
-        {
-          body: body,
-          query: query_params,
-          headers: @headers,
-          timeout: 1
-        }.compact
+    def http_post(relative_path = '', body = nil, query_params = nil)
+      send_request(
+        proc { |path, config| self.class.post(path, config) },
+        relative_path,
+        query_params,
+        body
       )
-      validate(response)
     end
 
-    def http_put(path = '', body = nil, query_params = nil)
-      body = body.to_json unless body.nil?
-      response = self.class.put(
-        @base_url + path,
-        {
-          body: body,
-          query: query_params,
-          headers: @headers,
-          timeout: 1
-        }.compact
+    def http_put(relative_path = '', body = nil, query_params = nil)
+      send_request(
+        proc { |path, config| self.class.put(path, config) },
+        relative_path,
+        query_params,
+        body
       )
-      validate(response)
     end
 
-    def http_delete(path = '')
-      response = self.class.delete(
-        @base_url + path,
-        headers: @headers,
-        timeout: 1
+    def http_delete(relative_path = '')
+      send_request(
+        proc { |path, config| self.class.delete(path, config) },
+        relative_path
       )
-      validate(response)
     end
 
     private
 
+    def send_request(http_method, relative_path, query_params = nil, body = nil)
+      config = http_config(query_params, body)
+      begin
+        response = http_method.call(@base_url + relative_path, config)
+      rescue Errno::ECONNREFUSED => e
+        raise CommunicationError, e.message
+      end
+      validate(response)
+    end
+
+    def http_config(query_params, body)
+      body = body.to_json unless body.nil?
+      {
+        headers: @headers,
+        query: query_params,
+        body: body,
+        timeout: 1
+      }.compact
+    end
+
     def validate(response)
-      raise HTTPError.new(response.code, response.message, response.body) unless response.success?
+      raise ApiError.new(response.code, response.message, response.body) unless response.success?
 
       response.parsed_response
     end

data/lib/meilisearch/index.rb

@@ -113,7 +113,7 @@ module MeiliSearch
         end
       end
     rescue Timeout::Error
-      raise MeiliSearch::MeiliSearchTimeoutError
+      raise MeiliSearch::TimeoutError
     end
 
     ### STATS

data/lib/meilisearch/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MeiliSearch
-  VERSION = '0.11.1'
+  VERSION = '0.12.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: meilisearch
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.12.0
 platform: ruby
 authors:
 - Meili
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-23 00:00:00.000000000 Z
+date: 2020-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty