refactor id generators and fix load bug (#119)

bitbrain · Sep 7, 2023 · a356939 · a356939
1 parent b42c57f
commit a356939
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 23 deletions.
diff --git a/addons/pandora/util/nanoid_generator.gd b/addons/pandora/util/nanoid_generator.gd
@@ -4,18 +4,18 @@ extends RefCounted
 
 
 const ALPHABET := "useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict"
-const SIZE := 21
+const DEFAULT_LENGTH := 21
 
 
-var size: int
+var default_length := DEFAULT_LENGTH
 
 
-func _init(size := SIZE) -> void:
-	self.size = size
+func _init(length := DEFAULT_LENGTH) -> void:
+	default_length = length
 
 
-func generate() -> String:
+func generate(length := default_length) -> String:
 	var id: String
-	for i in range(size):
+	for i in range(length):
 		id += ALPHABET[randi() % ALPHABET.length()]
 	return id
diff --git a/addons/pandora/util/sequential_id_generator.gd b/addons/pandora/util/sequential_id_generator.gd
@@ -2,19 +2,13 @@ class_name PandoraSequentialIDGenerator
 extends RefCounted
 
 
-const DEFAULT_CONTEXT := "default"
+const DEFAULT_CONTEXT: String = "default"
 
 
 var _ids_by_context: Dictionary = {}
 
-var context: String
 
-
-func _init(context: String = DEFAULT_CONTEXT):
-	self.context = context
-
-
-func generate() -> String:
+func generate(context:String = DEFAULT_CONTEXT) -> String:
 	if not _ids_by_context.has(context):
 		_ids_by_context[context] = 0
 	_ids_by_context[context] += 1

diff --git a/test/util/id_generator_test.gd b/test/util/id_generator_test.gd
@@ -13,7 +13,7 @@ func test_generate() -> void:
 	var id_generator = auto_free(preload(__source).new())
 
 	PandoraSettings.set_id_type(PandoraSettings.IDType.NANOID)
-	id_generator._nanoid.size = 3
+	id_generator._nanoid.default_length = 3
 	assert_that(len(id_generator.generate())).is_equal(3)
 
 	PandoraSettings.set_id_type(PandoraSettings.IDType.SEQUENTIAL)

diff --git a/test/util/nanoid_generator_test.gd b/test/util/nanoid_generator_test.gd
@@ -12,5 +12,4 @@ const __source = 'res://addons/pandora/util/nanoid_generator.gd'
 func test_generate_size() -> void:
 	var id_generator = auto_free(preload(__source).new(3))
 	assert_that(len(id_generator.generate())).is_equal(3)
-	id_generator.size = 4
-	assert_that(len(id_generator.generate())).is_equal(4)
+	assert_that(len(id_generator.generate(4))).is_equal(4)
diff --git a/test/util/sequential_id_generator_test.gd b/test/util/sequential_id_generator_test.gd
@@ -13,8 +13,7 @@ func test_generate_clear() -> void:
 	var id_generator = auto_free(preload(__source).new())
 	assert_that(id_generator.generate()).is_equal("1")
 	assert_that(id_generator.generate()).is_equal("2")
-	id_generator.context = "other-context"
-	assert_that(id_generator.generate()).is_equal("1")
+	assert_that(id_generator.generate("other-context")).is_equal("1")
 	assert_dict(id_generator._ids_by_context).is_not_empty()
 	id_generator.clear()
 	assert_dict(id_generator._ids_by_context).is_empty()
@@ -23,11 +22,9 @@ func test_generate_clear() -> void:
 func test_save_load_data() -> void:
 	var id_generator = auto_free(preload(__source).new())
 	assert_that(id_generator.generate()).is_equal("1")
-	id_generator.context = "other-context"
-	assert_that(id_generator.generate()).is_equal("1")
+	assert_that(id_generator.generate("other-context")).is_equal("1")
 
 	var other_id_generator = auto_free(preload(__source).new())
 	other_id_generator.load_data(id_generator.save_data())
 	assert_that(other_id_generator.generate()).is_equal("2")
-	other_id_generator.context = "other-context"
-	assert_that(other_id_generator.generate()).is_equal("2")
+	assert_that(other_id_generator.generate("other-context")).is_equal("2")