Merge #238

238: Enhancement/Remove Globals r=curquiza a=brunoocasali

Related to #233

Co-authored-by: Bruno Casali <[email protected]>

Author: bors[bot]

.rubocop.yml

@@ -20,9 +20,3 @@ Style/SymbolArray:
 
 Style/WordArray:
   EnforcedStyle: brackets
-
-Style/GlobalVars:
-  AllowedVariables:
-    - $URL
-    - $MASTER_KEY
-    - $DEFAULT_SEARCH_RESPONSE_KEYS

spec/meilisearch/client/dumps_spec.rb

@@ -2,7 +2,7 @@
 
 RSpec.describe 'MeiliSearch::Client - Dumps' do
   before(:all) do
-    @client = MeiliSearch::Client.new($URL, $MASTER_KEY)
+    @client = MeiliSearch::Client.new(URL, MASTER_KEY)
     clear_all_indexes(@client)
   end
 

spec/meilisearch/client/health_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 RSpec.describe 'MeiliSearch::Client - Health' do
-  let(:client)       { MeiliSearch::Client.new($URL, $MASTER_KEY) }
+  let(:client)       { MeiliSearch::Client.new(URL, MASTER_KEY) }
   let(:wrong_client) { MeiliSearch::Client.new('bad_url') }
 
   it 'is healthy when the url is valid' do

spec/meilisearch/client/indexes_spec.rb

@@ -2,7 +2,7 @@
 
 RSpec.describe 'MeiliSearch::Client - Indexes' do
   before(:all) do
-    @client = MeiliSearch::Client.new($URL, $MASTER_KEY)
+    @client = MeiliSearch::Client.new(URL, MASTER_KEY)
     clear_all_indexes(@client)
     @uid1 = 'uid1'
     @uid2 = 'uid2'

spec/meilisearch/client/keys_spec.rb

@@ -2,7 +2,7 @@
 
 RSpec.describe 'MeiliSearch::Client - Keys' do
   before(:all) do
-    @client = MeiliSearch::Client.new($URL, $MASTER_KEY)
+    @client = MeiliSearch::Client.new(URL, MASTER_KEY)
     @uid = 'uid'
     @client.create_index(@uid)
   end
@@ -20,37 +20,37 @@
 
   it 'fails to get settings if public key used' do
     public_key = @client.keys['public']
-    new_client = MeiliSearch::Client.new($URL, public_key)
+    new_client = MeiliSearch::Client.new(URL, public_key)
     expect do
       new_client.index(@uid).settings
     end.to raise_meilisearch_api_error_with(403, 'invalid_token', 'authentication_error')
   end
 
   it 'fails to get keys if private key used' do
     private_key = @client.keys['private']
-    new_client = MeiliSearch::Client.new($URL, private_key)
+    new_client = MeiliSearch::Client.new(URL, private_key)
     expect do
       new_client.keys
     end.to raise_meilisearch_api_error_with(403, 'invalid_token', 'authentication_error')
   end
 
   it 'fails to search if no key used' do
-    new_client = MeiliSearch::Client.new($URL)
+    new_client = MeiliSearch::Client.new(URL)
     expect do
       new_client.index(@uid).settings
     end.to raise_meilisearch_api_error_with(401, 'missing_authorization_header', 'authentication_error')
   end
 
   it 'succeeds to search when using public key' do
     public_key = @client.keys['public']
-    new_client = MeiliSearch::Client.new($URL, public_key)
+    new_client = MeiliSearch::Client.new(URL, public_key)
     response = new_client.index(@uid).search('test')
     expect(response).to have_key('hits')
   end
 
   it 'succeeds to get settings when using private key' do
     private_key = @client.keys['private']
-    new_client = MeiliSearch::Client.new($URL, private_key)
+    new_client = MeiliSearch::Client.new(URL, private_key)
     response = new_client.index(@uid).settings
     expect(response).to have_key('rankingRules')
   end

spec/meilisearch/client/stats_spec.rb

@@ -2,7 +2,7 @@
 
 RSpec.describe 'MeiliSearch::Client - Stats' do
   before(:all) do
-    @client = MeiliSearch::Client.new($URL, $MASTER_KEY)
+    @client = MeiliSearch::Client.new(URL, MASTER_KEY)
   end
 
   it 'gets version' do

spec/meilisearch/index/base_spec.rb

@@ -5,7 +5,7 @@
     @uid1 = 'UID_1'
     @uid2 = 'UID_2'
     @primary_key = 'objectId'
-    client = MeiliSearch::Client.new($URL, $MASTER_KEY)
+    client = MeiliSearch::Client.new(URL, MASTER_KEY)
     clear_all_indexes(client)
     @index1 = client.create_index(@uid1)
     @index2 = client.create_index(@uid2, primaryKey: @primary_key)
@@ -54,14 +54,14 @@
 
   it 'supports options' do
     options = { timeout: 2, max_retries: 1 }
-    client = MeiliSearch::Client.new($URL, $MASTER_KEY, options)
+    client = MeiliSearch::Client.new(URL, MASTER_KEY, options)
     index_uid = 'options'
     index = client.create_index(index_uid)
     expect(index.options).to eq({ timeout: 2, max_retries: 1 })
     expect(MeiliSearch::Index).to receive(:get).with(
-      "#{$URL}/indexes/#{index_uid}",
+      "#{URL}/indexes/#{index_uid}",
       {
-        headers: { 'Content-Type' => 'application/json', 'X-Meili-API-Key' => $MASTER_KEY },
+        headers: { 'Content-Type' => 'application/json', 'X-Meili-API-Key' => MASTER_KEY },
         body: 'null',
         query: {},
         max_retries: 1,

spec/meilisearch/index/documents_spec.rb

@@ -2,7 +2,7 @@
 
 RSpec.describe 'MeiliSearch::Index - Documents' do
   before(:all) do
-    @client = MeiliSearch::Client.new($URL, $MASTER_KEY)
+    @client = MeiliSearch::Client.new(URL, MASTER_KEY)
     clear_all_indexes(@client)
   end
 

spec/meilisearch/index/search/attributes_to_crop_spec.rb

@@ -7,7 +7,7 @@
       title: 'The Hitchhiker\'s Guide to the Galaxy',
       description: 'The Hitchhiker\'s Guide to the Galaxy is a comedy science fiction series by Douglas Adams.'
     }
-    client = MeiliSearch::Client.new($URL, $MASTER_KEY)
+    client = MeiliSearch::Client.new(URL, MASTER_KEY)
     clear_all_indexes(client)
     @index = client.create_index('books')
     response = @index.add_documents(@document)

spec/meilisearch/index/search/attributes_to_highlight.rb

@@ -11,7 +11,7 @@
       { objectId: 4,    title: 'Harry Potter and the Half-Blood Prince', genre: 'fantasy' },
       { objectId: 42,   title: 'The Hitchhiker\'s Guide to the Galaxy' }
     ]
-    client = MeiliSearch::Client.new($URL, $MASTER_KEY)
+    client = MeiliSearch::Client.new(URL, MASTER_KEY)
     clear_all_indexes(client)
     @index = client.create_index('books')
     response = @index.add_documents(@documents)
@@ -25,7 +25,7 @@
   it 'does a custom search with highlight' do
     response = @index.search('the', attributesToHighlight: ['title'])
     expect(response).to be_a(Hash)
-    expect(response.keys).to contain_exactly(*$DEFAULT_SEARCH_RESPONSE_KEYS)
+    expect(response.keys).to contain_exactly(*DEFAULT_SEARCH_RESPONSE_KEYS)
     expect(response['hits'].count).to eq(3)
     expect(response['hits'].first).to have_key('_formatted')
     expect(response['hits'].first['_formatted']['title']).to eq('<em>The</em> Hobbit')
@@ -34,15 +34,15 @@
   it 'does a placeholder search with attributes to highlight' do
     response = @index.search('', attributesToHighlight: ['*'])
     expect(response).to be_a(Hash)
-    expect(response.keys).to contain_exactly(*$DEFAULT_SEARCH_RESPONSE_KEYS)
+    expect(response.keys).to contain_exactly(*DEFAULT_SEARCH_RESPONSE_KEYS)
     expect(response['hits'].count).to eq(7)
     expect(response['hits'].first).to have_key('_formatted')
   end
 
   it 'does a placeholder search (nil) with attributes to highlight' do
     response = @index.search(nil, attributesToHighlight: ['*'])
     expect(response).to be_a(Hash)
-    expect(response.keys).to contain_exactly(*$DEFAULT_SEARCH_RESPONSE_KEYS)
+    expect(response.keys).to contain_exactly(*DEFAULT_SEARCH_RESPONSE_KEYS)
     expect(response['hits'].count).to eq(@documents.count)
     expect(response['hits'].first).to have_key('_formatted')
   end