meilisearch 0.11.0 → 0.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a36df5bca77a8d8487a6cfdf12ef055db52aec77d25d0a522e4fecb455d8714
-  data.tar.gz: e6a5b012fa2d4099be7ce43e5790ee032d612d68ce7fbcf697a6928458a23e51
+  metadata.gz: 2540e65f9756b00265d39045cc557a7a70b95379efb9e853a19e2d310b08b641
+  data.tar.gz: b6b2ced9220eab1b917fd4711343e10b50755de3b51e2eb6eb53292a105f0105
 SHA512:
-  metadata.gz: 37cba34617de2798ff77d3f5bd711862a84a14cbea9dca44349897dacff37f004184e6b71fad314ddefc3ce6a1cbcb124c5c9ed85781d7ee2028385bc20d3418
-  data.tar.gz: ce410e17029be8a779f10921aef8b28200dd3ae2fc1cb3924bbb5085596a1adc70c2a5e4aed5492751dee3d6f1ab4dbbdc7186673fe1041d2b4875819ab3ab65
+  metadata.gz: 5827e1e243154d2b431c3a4f678d7db404140f6d19d5bf07a4f402b874de90918ce84fea0793a178527f158931a8de3f1a24f517d391f1aaedf14d09ef272a14
+  data.tar.gz: d084c29d0094e52ab63036439cfaa1415d38fe3148a9591f2ba801f89aa343704bb7e3253560cea0b69172ddf5f267d6b6ad9cff4d1f8f77521dae6d72f5e7af

data/lib/meilisearch/client.rb

@@ -18,11 +18,20 @@ module MeiliSearch
     # client.create_index('indexUID')
     # client.create_index('indexUID', primaryKey: 'id')
     def create_index(index_uid, options = {})
-      body = { uid: index_uid }.merge(options)
+      body = options.merge(uid: index_uid)
       res = http_post '/indexes', body
       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
@@ -66,14 +73,6 @@ module MeiliSearch
       http_get '/version'
     end
 
-    def sysinfo
-      http_get '/sys-info'
-    end
-
-    def pretty_sysinfo
-      http_get '/sys-info/pretty'
-    end
-
     def stats
       http_get '/stats'
     end

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}. 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

@@ -7,66 +7,74 @@ module MeiliSearch
   class HTTPRequest
     include HTTParty
 
-    def initialize(url, api_key = nil)
+    def initialize(url, api_key = nil, options = {})
       @base_url = url
       @api_key = api_key
+      @options = options
       @headers = {
         'Content-Type' => 'application/json',
         'X-Meili-API-Key' => api_key
       }.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: @options[:timeout] || 1,
+        max_retries: @options[:max_retries] || 0
+      }.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

@@ -81,16 +81,8 @@ module MeiliSearch
     ### SEARCH
 
     def search(query, options = {})
-      parsed_options = options.transform_keys(&:to_sym).map do |k, v|
-        if [:facetFilters, :facetsDistribution].include?(k)
-          [k, v.inspect]
-        elsif v.is_a?(Array)
-          [k, v.join(',')]
-        else
-          [k, v]
-        end
-      end.to_h
-      http_get "/indexes/#{@uid}/search", { q: query }.merge(parsed_options)
+      parsed_options = options.compact
+      http_post "/indexes/#{@uid}/search", { q: query }.merge(parsed_options)
     end
 
     ### UPDATES
@@ -113,7 +105,7 @@ module MeiliSearch
         end
       end
     rescue Timeout::Error
-      raise MeiliSearch::MeiliSearchTimeoutError
+      raise MeiliSearch::TimeoutError
     end
 
     ### STATS
@@ -244,17 +236,6 @@ module MeiliSearch
       http_delete "/indexes/#{@uid}/settings/displayed-attributes"
     end
 
-    ### SETTINGS - ACCEPT NEW FIELS VALUE
-
-    def accept_new_fields
-      http_get "/indexes/#{@uid}/settings/accept-new-fields"
-    end
-    alias get_accept_new_fields accept_new_fields
-
-    def update_accept_new_fields(accept_new_fields)
-      http_post "/indexes/#{@uid}/settings/accept-new-fields", accept_new_fields
-    end
-
     ### SETTINGS - ATTRIBUTES FOR FACETING
 
     def attributes_for_faceting

data/lib/meilisearch/version.rb

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

metadata

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