meilisearch 0.15.4 → 0.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03f23776fd7b1baeabbfcc33fcd848f8bd89f56655579756d9e2c06492f8d824
-  data.tar.gz: d5137b74a7def336e41e746d56f714847be1f73185c5f05abf70a03310cc79b4
+  metadata.gz: d989f446194c8260cc87880abfaaf641d0e4b88ae80300d7f9d99fd4c6edfd2e
+  data.tar.gz: cbec6b1faeab1d84990b7b1390eb386e536bbaa2442231593d1377b5a5ba0da4
 SHA512:
-  metadata.gz: c2c1fee375d80f6e0c372438b3fbb4c76b4c504f0c7ddf1d12d810e89f93f8173e838b1d6d8cf1d57ba02f75277f784660379c8961ccb47884eb2e37d7a43f06
-  data.tar.gz: ab566b980a0ab15a5ffef99fb47520f667783c098e3ea81fa35784a12d1806846b18a80f42116f0605e2770655a62f35b97e8881983b08ff865de28fcde89c7a
+  metadata.gz: 328b4fcec0d6ca099c34ee40340a5a191cec576cbef198a4b0a18fd0afaa1c77708146531204347e67a0037599a35b7caa514940674f28e5a8b06ecaba7ba55c
+  data.tar.gz: db01b2e587efc423138437505840b73879d26a0a5d340eb3f1ea56753b8e2f7eaba6f13b22e1a464c8bfec9728b1af42e0c164a735e624844a1a81a99504bd5f

data/lib/meilisearch/client.rb

@@ -6,15 +6,22 @@ module MeiliSearch
   class Client < HTTPRequest
     ### INDEXES
 
+    def raw_indexes
+      http_get('/indexes')
+    end
+
     def indexes
-      http_get '/indexes'
+      raw_indexes.map do |index_hash|
+        index_object(index_hash['uid'], index_hash['primaryKey'])
+      end
     end
 
     # Usage:
     # client.create_index('indexUID')
     # client.create_index('indexUID', primaryKey: 'id')
     def create_index(index_uid, options = {})
-      body = options.merge(uid: index_uid)
+      body = Utils.transform_attributes(options.merge(uid: index_uid))
+
       index_hash = http_post '/indexes', body
       index_object(index_hash['uid'], index_hash['primaryKey'])
     end
@@ -34,6 +41,17 @@ module MeiliSearch
       index_object(index_uid).delete
     end
 
+    # Usage:
+    # client.delete_index_if_exists('indexUID')
+    def delete_index_if_exists(index_uid)
+      index_object(index_uid).delete
+      true
+    rescue ApiError => e
+      raise e if e.code != 'index_not_found'
+
+      false
+    end
+
     # Usage:
     # client.index('indexUID')
     def index(index_uid)
@@ -44,6 +62,10 @@ module MeiliSearch
       index_object(index_uid).fetch_info
     end
 
+    def fetch_raw_index(index_uid)
+      index_object(index_uid).fetch_raw_info
+    end
+
     ### KEYS
 
     def keys

data/lib/meilisearch/error.rb

@@ -29,10 +29,15 @@ module MeiliSearch
 
     def get_meilisearch_error_info(http_body)
       @http_body = JSON.parse(http_body)
-      @ms_code = @http_body['errorCode']
+      @ms_code = @http_body['code']
       @ms_message = @http_body['message']
-      @ms_type = @http_body['errorType']
-      @ms_link = @http_body['errorLink']
+      @ms_type = @http_body['type']
+      @ms_link = @http_body['link']
+    rescue JSON::ParserError
+      # We might receive a JSON::ParserError when, for example, MeiliSearch is running behind
+      # some proxy (ELB or Nginx, for example), and the request timeouts, returning us
+      # a raw HTML body instead of a JSON as we were expecting
+      @ms_message = "The server has not returned a valid JSON HTTP body: #{http_body}"
     end
 
     def details

data/lib/meilisearch/http_request.rb

@@ -17,13 +17,17 @@ module MeiliSearch
         'Content-Type' => 'application/json',
         'X-Meili-API-Key' => api_key
       }.compact
+      @headers_no_body = {
+        'X-Meili-API-Key' => api_key
+      }.compact
     end
 
     def http_get(relative_path = '', query_params = {})
       send_request(
         proc { |path, config| self.class.get(path, config) },
         relative_path,
-        query_params
+        query_params: query_params,
+        headers: @headers_no_body
       )
     end
 
@@ -31,8 +35,9 @@ module MeiliSearch
       send_request(
         proc { |path, config| self.class.post(path, config) },
         relative_path,
-        query_params,
-        body
+        query_params: query_params,
+        body: body,
+        headers: @headers
       )
     end
 
@@ -40,22 +45,24 @@ module MeiliSearch
       send_request(
         proc { |path, config| self.class.put(path, config) },
         relative_path,
-        query_params,
-        body
+        query_params: query_params,
+        body: body,
+        headers: @headers
       )
     end
 
     def http_delete(relative_path = '')
       send_request(
         proc { |path, config| self.class.delete(path, config) },
-        relative_path
+        relative_path,
+        headers: @headers_no_body
       )
     end
 
     private
 
-    def send_request(http_method, relative_path, query_params = nil, body = nil)
-      config = http_config(query_params, body)
+    def send_request(http_method, relative_path, query_params: nil, body: nil, headers: nil)
+      config = http_config(query_params, body, headers)
       begin
         response = http_method.call(@base_url + relative_path, config)
       rescue Errno::ECONNREFUSED => e
@@ -64,12 +71,11 @@ module MeiliSearch
       validate(response)
     end
 
-    def http_config(query_params, body)
-      body = body.to_json
+    def http_config(query_params, body, headers)
       {
-        headers: @headers,
+        headers: headers,
         query: query_params,
-        body: body,
+        body: body.to_json,
         timeout: @options[:timeout] || 1,
         max_retries: @options[:max_retries] || 0
       }.compact

data/lib/meilisearch/index.rb

@@ -5,7 +5,7 @@ require 'timeout'
 
 module MeiliSearch
   class Index < HTTPRequest
-    attr_reader :uid, :primary_key
+    attr_reader :uid, :primary_key, :created_at, :updated_at
 
     def initialize(index_uid, url, api_key = nil, primary_key = nil, options = {})
       @uid = index_uid
@@ -14,27 +14,47 @@ module MeiliSearch
     end
 
     def fetch_info
-      index_hash = http_get "/indexes/#{@uid}"
-      @primary_key = index_hash['primaryKey']
+      index_hash = http_get indexes_path(id: @uid)
+      set_base_properties index_hash
       self
     end
 
+    def fetch_primary_key
+      fetch_info.primary_key
+    end
+    alias get_primary_key fetch_primary_key
+
+    def fetch_raw_info
+      index_hash = http_get indexes_path(id: @uid)
+      set_base_properties index_hash
+      index_hash
+    end
+
     def update(body)
-      index_hash = http_put "/indexes/#{@uid}", body
-      @primary_key = index_hash['primaryKey']
+      index_hash = http_put indexes_path(id: @uid), Utils.transform_attributes(body)
+      set_base_properties index_hash
+
       self
     end
+
     alias update_index update
 
     def delete
-      http_delete "/indexes/#{@uid}"
+      http_delete indexes_path(id: @uid)
     end
     alias delete_index delete
 
-    def fetch_primary_key
-      fetch_info.primary_key
+    def indexes_path(id: nil)
+      "/indexes/#{id}"
     end
-    alias get_primary_key fetch_primary_key
+    private :indexes_path
+
+    def set_base_properties(index_hash)
+      @primary_key = index_hash['primaryKey']
+      @created_at = Time.parse(index_hash['createdAt'])
+      @updated_at = Time.parse(index_hash['updatedAt'])
+    end
+    private :set_base_properties
 
     ### DOCUMENTS
 
@@ -46,7 +66,7 @@ module MeiliSearch
     alias get_one_document document
 
     def documents(options = {})
-      http_get "/indexes/#{@uid}/documents", options
+      http_get "/indexes/#{@uid}/documents", Utils.transform_attributes(options)
     end
     alias get_documents documents
 
@@ -76,6 +96,40 @@ module MeiliSearch
     end
     alias add_or_update_documents! update_documents!
 
+    def add_documents_in_batches(documents, batch_size = 1000, primary_key = nil)
+      update_ids = []
+      documents.each_slice(batch_size) do |batch|
+        update_ids.append(add_documents(batch, primary_key))
+      end
+      update_ids
+    end
+
+    def add_documents_in_batches!(documents, batch_size = 1000, primary_key = nil)
+      update_ids = add_documents_in_batches(documents, batch_size, primary_key)
+      responses = []
+      update_ids.each do |update_object|
+        responses.append(wait_for_pending_update(update_object['updateId']))
+      end
+      responses
+    end
+
+    def update_documents_in_batches(documents, batch_size = 1000, primary_key = nil)
+      update_ids = []
+      documents.each_slice(batch_size) do |batch|
+        update_ids.append(update_documents(batch, primary_key))
+      end
+      update_ids
+    end
+
+    def update_documents_in_batches!(documents, batch_size = 1000, primary_key = nil)
+      update_ids = update_documents_in_batches(documents, batch_size, primary_key)
+      responses = []
+      update_ids.each do |update_object|
+        responses.append(wait_for_pending_update(update_object['updateId']))
+      end
+      responses
+    end
+
     def delete_documents(documents_ids)
       if documents_ids.is_a?(Array)
         http_post "/indexes/#{@uid}/documents/delete-batch", documents_ids
@@ -115,8 +169,9 @@ module MeiliSearch
     ### SEARCH
 
     def search(query, options = {})
-      parsed_options = options.compact
-      http_post "/indexes/#{@uid}/search", { q: query.to_s }.merge(parsed_options)
+      parsed_options = Utils.transform_attributes({ q: query.to_s }.merge(options.compact))
+
+      http_post "/indexes/#{@uid}/search", parsed_options
     end
 
     ### UPDATES
@@ -129,11 +184,15 @@ module MeiliSearch
       http_get "/indexes/#{@uid}/updates"
     end
 
+    def achieved_upate?(update)
+      update['status'] != 'enqueued' && update['status'] != 'processing'
+    end
+
     def wait_for_pending_update(update_id, timeout_in_ms = 5000, interval_in_ms = 50)
       Timeout.timeout(timeout_in_ms.to_f / 1000) do
         loop do
           get_update = get_update_status(update_id)
-          return get_update if get_update['status'] != 'enqueued'
+          return get_update if achieved_upate?(get_update)
 
           sleep interval_in_ms.to_f / 1000
         end
@@ -160,8 +219,8 @@ module MeiliSearch
       stats['lastUpdate']
     end
 
-    def fields_distribution
-      stats['fieldsDistribution']
+    def field_distribution
+      stats['fieldDistribution']
     end
 
     ### SETTINGS - GENERAL
@@ -172,7 +231,7 @@ module MeiliSearch
     alias get_settings settings
 
     def update_settings(settings)
-      http_post "/indexes/#{@uid}/settings", settings
+      http_post "/indexes/#{@uid}/settings", Utils.transform_attributes(settings)
     end
     alias settings= update_settings
 
@@ -220,7 +279,7 @@ module MeiliSearch
     alias get_stop_words stop_words
 
     def update_stop_words(stop_words)
-      body = stop_words.is_a?(Array) ? stop_words : [stop_words]
+      body = stop_words.nil? || stop_words.is_a?(Array) ? stop_words : [stop_words]
       http_post "/indexes/#{@uid}/settings/stop-words", body
     end
     alias stop_words= update_stop_words
@@ -277,20 +336,36 @@ module MeiliSearch
       http_delete "/indexes/#{@uid}/settings/displayed-attributes"
     end
 
-    ### SETTINGS - ATTRIBUTES FOR FACETING
+    ### SETTINGS - FILTERABLE ATTRIBUTES
+
+    def filterable_attributes
+      http_get "/indexes/#{@uid}/settings/filterable-attributes"
+    end
+    alias get_filterable_attributes filterable_attributes
+
+    def update_filterable_attributes(filterable_attributes)
+      http_post "/indexes/#{@uid}/settings/filterable-attributes", filterable_attributes
+    end
+    alias filterable_attributes= update_filterable_attributes
+
+    def reset_filterable_attributes
+      http_delete "/indexes/#{@uid}/settings/filterable-attributes"
+    end
+
+    ### SETTINGS - SORTABLE ATTRIBUTES
 
-    def attributes_for_faceting
-      http_get "/indexes/#{@uid}/settings/attributes-for-faceting"
+    def sortable_attributes
+      http_get "/indexes/#{@uid}/settings/sortable-attributes"
     end
-    alias get_attributes_for_faceting attributes_for_faceting
+    alias get_sortable_attributes sortable_attributes
 
-    def update_attributes_for_faceting(attributes_for_faceting)
-      http_post "/indexes/#{@uid}/settings/attributes-for-faceting", attributes_for_faceting
+    def update_sortable_attributes(sortable_attributes)
+      http_post "/indexes/#{@uid}/settings/sortable-attributes", sortable_attributes
     end
-    alias attributes_for_faceting= update_attributes_for_faceting
+    alias sortable_attributes= update_sortable_attributes
 
-    def reset_attributes_for_faceting
-      http_delete "/indexes/#{@uid}/settings/attributes-for-faceting"
+    def reset_sortable_attributes
+      http_delete "/indexes/#{@uid}/settings/sortable-attributes"
     end
   end
 end

data/lib/meilisearch/version.rb

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

data/lib/meilisearch.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'meilisearch/version'
+require 'meilisearch/utils'
 require 'meilisearch/client'
 require 'meilisearch/index'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: meilisearch
 version: !ruby/object:Gem::Version
-  version: 0.15.4
+  version: 0.17.1
 platform: ruby
 authors:
 - Meili
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-11 00:00:00.000000000 Z
+date: 2021-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -19,7 +19,7 @@ dependencies:
         version: 0.17.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 0.17.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.21.0
 description: An easy-to-use ruby client for Meilisearch API. See https://github.com/meilisearch/MeiliSearch
 email: bonjour@meilisearch.com
 executables: []