Game => DataModel

LPGhatguy · Oct 19, 2018 · 9719f83 · 9719f83
1 parent b71a0f6
commit 9719f83
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 23 deletions.
diff --git a/lib/Habitat.lua b/lib/Habitat.lua
@@ -8,7 +8,7 @@ local Instance = import("./Instance")
 local TaskScheduler = import("./TaskScheduler")
 local createEnvironment = import("./createEnvironment")
 local fs = import("./fs")
-local Game = import("./instances/Game")
+local DataModel = import("./instances/DataModel")
 local validateType = import("./validateType")
 local assign = import("./assign")
 
@@ -21,7 +21,7 @@ Habitat.__index = Habitat
 
 function Habitat.new(settings)
 	local habitat = {
-		game = Game:new(),
+		game = DataModel:new(),
 		taskScheduler = TaskScheduler.new(),
 		settings = settings or {},
 		environment = nil,

diff --git a/lib/instances/BaseInstance_spec.lua b/lib/instances/BaseInstance_spec.lua
@@ -1,4 +1,4 @@
-local Game = import("./Game")
+local DataModel = import("./DataModel")
 local Folder = import("./Folder")
 local typeof = import("../functions/typeof")
 
@@ -367,7 +367,7 @@ describe("instances.BaseInstance", function()
 		it("should exclude game", function()
 			local instance = BaseInstance:new()
 			instance.Name = "Test"
-			local other = Game:new()
+			local other = DataModel:new()
 			other.Name = "Parent"
 
 			instance.Parent = other

diff --git a/lib/instances/Game.lua → lib/instances/DataModel.lua b/lib/instances/Game.lua → lib/instances/DataModel.lua
@@ -27,9 +27,9 @@ local UserInputService = import("./UserInputService")
 local VirtualInputManager = import("./VirtualInputManager")
 local Workspace = import("./Workspace")
 
-local Game = BaseInstance:extend("DataModel")
+local DataModel = BaseInstance:extend("DataModel")
 
-function Game:init(instance)
+function DataModel:init(instance)
 	AnalyticsService:new().Parent = instance
 	ContentProvider:new().Parent = instance
 	CoreGui:new().Parent = instance
@@ -56,7 +56,7 @@ function Game:init(instance)
 	Workspace:new().Parent = instance
 end
 
-function Game.prototype:GetService(serviceName)
+function DataModel.prototype:GetService(serviceName)
 	local service = self:FindFirstChildOfClass(serviceName)
 
 	if service then
@@ -68,52 +68,52 @@ function Game.prototype:GetService(serviceName)
 	error(string.format("Cannot get service %q", tostring(serviceName)), 2)
 end
 
-Game.properties.CreatorId = InstanceProperty.readOnly({
+DataModel.properties.CreatorId = InstanceProperty.readOnly({
 	getDefault = function()
 		return 0
 	end,
 })
 
-Game.properties.CreatorType = InstanceProperty.readOnly({
+DataModel.properties.CreatorType = InstanceProperty.readOnly({
 	getDefault = function()
 		return CreatorType.User
 	end,
 })
 
-Game.properties.GameId = InstanceProperty.readOnly({
+DataModel.properties.GameId = InstanceProperty.readOnly({
 	getDefault = function()
 		return 0
 	end,
 })
 
-Game.properties.JobId = InstanceProperty.readOnly({
+DataModel.properties.JobId = InstanceProperty.readOnly({
 	getDefault = function()
 		return ""
 	end,
 })
 
-Game.properties.PlaceId = InstanceProperty.readOnly({
+DataModel.properties.PlaceId = InstanceProperty.readOnly({
 	getDefault = function()
 		return 0
 	end,
 })
 
-Game.properties.PlaceVersion = InstanceProperty.readOnly({
+DataModel.properties.PlaceVersion = InstanceProperty.readOnly({
 	getDefault = function()
 		return 0
 	end,
 })
 
-Game.properties.VIPServerId = InstanceProperty.readOnly({
+DataModel.properties.VIPServerId = InstanceProperty.readOnly({
 	getDefault = function()
 		return ""
 	end,
 })
 
-Game.properties.VIPServerOwnerId = InstanceProperty.readOnly({
+DataModel.properties.VIPServerOwnerId = InstanceProperty.readOnly({
 	getDefault = function()
 		return 0
 	end,
 })
 
-return Game
+return DataModel
diff --git a/lib/instances/Game_spec.lua → lib/instances/DataModel_spec.lua b/lib/instances/Game_spec.lua → lib/instances/DataModel_spec.lua
@@ -1,16 +1,16 @@
-local Game = import("./Game")
+local DataModel = import("./DataModel")
 local typeof = import("../functions/typeof")
 
-describe("instances.Game", function()
+describe("instances.DataModel", function()
 	it("should instantiate", function()
-		local instance = Game:new()
+		local instance = DataModel:new()
 
 		assert.not_nil(instance)
 	end)
 
 	describe("GetService", function()
 		it("should have GetService", function()
-			local instance = Game:new()
+			local instance = DataModel:new()
 
 			local ReplicatedStorage = instance:GetService("ReplicatedStorage")
 
@@ -19,7 +19,7 @@ describe("instances.Game", function()
 		end)
 
 		it("should throw when given invalid service names", function()
-			local instance = Game:new()
+			local instance = DataModel:new()
 
 			assert.has.errors(function()
 				instance:GetService("SOMETHING THAT WILL NEVER EXIST")
@@ -28,7 +28,7 @@ describe("instances.Game", function()
 	end)
 
 	it("should have properties defined", function()
-		local instance = Game:new()
+		local instance = DataModel:new()
 
 		assert.equal(typeof(instance.CreatorId), "number")
 		assert.equal(typeof(instance.CreatorType), "EnumItem")

diff --git a/lib/instances/init.lua b/lib/instances/init.lua
@@ -7,9 +7,9 @@ local names = {
 	"ContentProvider",
 	"CoreGui",
 	"CorePackages",
+	"DataModel",
 	"Folder",
 	"Frame",
-	"Game",
 	"GuiButton",
 	"GuiObject",
 	"GuiService",