Merge pull request #17 from mumez/develop

1.4 support

src/Meilisearch-Core.package/MsIndex.class/instance/setDictionary..st

@@ -0,0 +1,4 @@
+actions-index-settings
+setDictionary: keys
+	^ self applySettingsUsing: [ :opts |
+		  opts dictionary: keys ]

src/Meilisearch-Core.package/MsIndex.class/instance/setNonSeparatorTokens..st

@@ -0,0 +1,4 @@
+actions-index-settings
+setNonSeparatorTokens: nonSeparatorTokens
+	^ self applySettingsUsing: [ :opts |
+		  opts nonSeparatorTokens: nonSeparatorTokens ]

src/Meilisearch-Core.package/MsIndex.class/instance/setSeparatorTokens..st

@@ -0,0 +1,4 @@
+actions-index-settings
+setSeparatorTokens: separatorTokens
+	^ self applySettingsUsing: [ :opts |
+		  opts separatorTokens: separatorTokens ]

src/Meilisearch-Core.package/MsIndexSettings.class/instance/asDictionary.st

@@ -2,13 +2,16 @@ converting
 asDictionary
     | dict |
     dict := Dictionary new.
+    self dictionary ifNotNil: [:v | dict at: 'dictionary' put: v].
     self displayedAttributes ifNotNil: [:v | dict at: 'displayedAttributes' put: v].
     self distinctAttribute ifNotNil: [:v | dict at: 'distinctAttribute' put: v].
     self faceting ifNotNil: [:v | dict at: 'faceting' put: v].
     self filterableAttributes ifNotNil: [:v | dict at: 'filterableAttributes' put: v].
     self pagination ifNotNil: [:v | dict at: 'pagination' put: v].
     self rankingRules ifNotNil: [:v | dict at: 'rankingRules' put: v].
     self searchableAttributes ifNotNil: [:v | dict at: 'searchableAttributes' put: v].
+    self separatorTokens ifNotNil: [:v | dict at: 'separatorTokens' put: v].
+    self nonSeparatorTokens ifNotNil: [:v | dict at: 'nonSeparatorTokens' put: v].
     self sortableAttributes ifNotNil: [:v | dict at: 'sortableAttributes' put: v].
     self stopWords ifNotNil: [:v | dict at: 'stopWords' put: v].
     self synonyms ifNotNil: [:v | dict at: 'synonyms' put: v].

src/Meilisearch-Core.package/MsIndexSettings.class/instance/dictionary..st

@@ -0,0 +1,4 @@
+accessing
+dictionary: anObject
+
+	dictionary := anObject

src/Meilisearch-Core.package/MsIndexSettings.class/instance/dictionary.st

@@ -0,0 +1,4 @@
+accessing
+dictionary
+
+	^ dictionary

src/Meilisearch-Core.package/MsIndexSettings.class/instance/initFromDictionary..st

@@ -1,12 +1,15 @@
 initialization
 initFromDictionary: aDictionary
+    aDictionary at: 'dictionary' ifPresent: [ :v | self dictionary: v ].
     aDictionary at: 'displayedAttributes' ifPresent: [ :v | self displayedAttributes: v ].
     aDictionary at: 'distinctAttribute' ifPresent: [ :v | self distinctAttribute: v ].
     aDictionary at: 'faceting' ifPresent: [ :v | self faceting: v ].
     aDictionary at: 'filterableAttributes' ifPresent: [ :v | self filterableAttributes: v ].
     aDictionary at: 'pagination' ifPresent: [ :v | self pagination: v ].
     aDictionary at: 'rankingRules' ifPresent: [ :v | self rankingRules: v ].
     aDictionary at: 'searchableAttributes' ifPresent: [ :v | self searchableAttributes: v ].
+    aDictionary at: 'separatorTokens' ifPresent: [ :v | self separatorTokens: v ].
+    aDictionary at: 'nonSeparatorTokens' ifPresent: [ :v | self nonSeparatorTokens: v ].
     aDictionary at: 'sortableAttributes' ifPresent: [ :v | self sortableAttributes: v ].
     aDictionary at: 'stopWords' ifPresent: [ :v | self stopWords: v ].
     aDictionary at: 'synonyms' ifPresent: [ :v | self synonyms: v ].

src/Meilisearch-Core.package/MsIndexSettings.class/instance/nonSeparatorTokens..st

@@ -0,0 +1,4 @@
+accessing
+nonSeparatorTokens: anObject
+
+	nonSeparatorTokens := anObject

src/Meilisearch-Core.package/MsIndexSettings.class/instance/nonSeparatorTokens.st

@@ -0,0 +1,4 @@
+accessing
+nonSeparatorTokens
+
+	^ nonSeparatorTokens

src/Meilisearch-Core.package/MsIndexSettings.class/instance/separatorTokens..st

@@ -0,0 +1,4 @@
+accessing
+separatorTokens: anObject
+
+	separatorTokens := anObject

src/Meilisearch-Core.package/MsIndexSettings.class/instance/separatorTokens.st

@@ -0,0 +1,4 @@
+accessing
+separatorTokens
+
+	^ separatorTokens

src/Meilisearch-Core.package/MsIndexSettings.class/properties.json

@@ -6,13 +6,16 @@
 	"pools" : [ ],
 	"classvars" : [ ],
 	"instvars" : [
+		"dictionary",
 		"displayedAttributes",
 		"distinctAttribute",
 		"faceting",
 		"filterableAttributes",
 		"pagination",
 		"rankingRules",
 		"searchableAttributes",
+		"separatorTokens",
+		"nonSeparatorTokens",
 		"sortableAttributes",
 		"stopWords",
 		"synonyms",

src/Meilisearch-Tests.package/MeilisearchTest.class/instance/testSetGetIndexDictionarySettings.st

@@ -0,0 +1,28 @@
+tests
+testSetGetIndexDictionarySettings
+	| originalIndexes newIndexId index settingsTask createIndexTask appliedSettings deleteIndexTask |
+	originalIndexes := meilisearch indexes.
+	newIndexId := 'mailisearch-st-test-index-dictionary-settings'.
+	createIndexTask := meilisearch createIndex: newIndexId.
+	createIndexTask waitEndedForAWhile.
+	self assert: createIndexTask isSucceeded.
+
+	index := (meilisearch index: newIndexId).
+	settingsTask := index applySettingsUsing: [ :opts | 
+		opts dictionary: #('J. R. R.' 'J.R.R.').
+	].
+	settingsTask waitEndedForAWhile.
+
+	appliedSettings := index getAllSettings.
+
+	self assert: appliedSettings dictionary asSortedCollection equals: #('J. R. R.' 'J.R.R.') asSortedCollection.
+
+	(index setDictionary: #('1')) waitEndedForAWhile.
+
+	appliedSettings := index getAllSettings.
+
+	self assert: appliedSettings dictionary asSortedCollection equals: #('1') asSortedCollection.
+
+	deleteIndexTask := index delete.
+	deleteIndexTask waitEndedForAWhile.
+	self assert: deleteIndexTask isSucceeded.

src/Meilisearch-Tests.package/MeilisearchTest.class/instance/testSetGetIndexSeparatorTokensSettings.st

@@ -0,0 +1,31 @@
+tests
+testSetGetIndexSeparatorTokensSettings
+	| originalIndexes newIndexId index settingsTask createIndexTask appliedSettings deleteIndexTask |
+	originalIndexes := meilisearch indexes.
+	newIndexId := 'mailisearch-st-test-index-separator-tokens-settings'.
+	createIndexTask := meilisearch createIndex: newIndexId.
+	createIndexTask waitEndedForAWhile.
+	self assert: createIndexTask isSucceeded.
+
+	index := (meilisearch index: newIndexId).
+	settingsTask := index applySettingsUsing: [ :opts | 
+		opts separatorTokens: #('|' '…'); nonSeparatorTokens: #('@' '#' '&').
+	].
+	settingsTask waitEndedForAWhile.
+
+	appliedSettings := index getAllSettings.
+
+	self assert: appliedSettings separatorTokens asSortedCollection equals: #('|' '…') asSortedCollection.
+	self assert: appliedSettings nonSeparatorTokens asSortedCollection equals: #('@' '#' '&') asSortedCollection.
+
+	(index setSeparatorTokens: #('1')) waitEndedForAWhile.
+	(index setNonSeparatorTokens: #('2')) waitEndedForAWhile.
+
+	appliedSettings := index getAllSettings.
+
+	self assert: appliedSettings separatorTokens asSortedCollection equals: #('1') asSortedCollection.
+	self assert: appliedSettings nonSeparatorTokens asSortedCollection equals: #('2') asSortedCollection.
+
+	deleteIndexTask := index delete.
+	deleteIndexTask waitEndedForAWhile.
+	self assert: deleteIndexTask isSucceeded.