From: Alexis Laferrière Date: Wed, 14 Sep 2016 20:09:07 +0000 (-0400) Subject: refund & nitrpg: rename 2 conflictual to_json to to_json_object X-Git-Url: http://nitlanguage.org refund & nitrpg: rename 2 conflictual to_json to to_json_object Signed-off-by: Alexis Laferrière --- diff --git a/contrib/nitrpg/src/achievements.nit b/contrib/nitrpg/src/achievements.nit index 9055b22..2097ec3 100644 --- a/contrib/nitrpg/src/achievements.nit +++ b/contrib/nitrpg/src/achievements.nit @@ -120,7 +120,7 @@ class Achievement json["reward"].as(Int)) end - redef fun to_json do + redef fun to_json_object do var json = super json["id"] = id json["name"] = name diff --git a/contrib/nitrpg/src/events.nit b/contrib/nitrpg/src/events.nit index c540dc5..08d387d 100644 --- a/contrib/nitrpg/src/events.nit +++ b/contrib/nitrpg/src/events.nit @@ -104,7 +104,7 @@ class GameEvent time = new ISODate.from_string(json["time"].as(String)) end - redef fun to_json do + redef fun to_json_object do var json = new JsonObject json["internal_id"] = internal_id.to_s json["kind"] = kind diff --git a/contrib/nitrpg/src/game.nit b/contrib/nitrpg/src/game.nit index 504c445..b1d8916 100644 --- a/contrib/nitrpg/src/game.nit +++ b/contrib/nitrpg/src/game.nit @@ -42,10 +42,10 @@ interface GameEntity fun key: String is abstract # Saves `self` in db. - fun save do game.db.collection(collection_name).save(to_json) + fun save do game.db.collection(collection_name).save(to_json_object) # Json representation of `self`. - fun to_json: JsonObject do + fun to_json_object: JsonObject do var json = new JsonObject json["_id"] = key return json @@ -102,7 +102,7 @@ class Game # Used to load entities from saved data. fun from_json(json: JsonObject) do end - redef fun to_json do + redef fun to_json_object do var json = super json["name"] = name return json @@ -166,7 +166,7 @@ class Game end # Erase all saved data for this game. - fun clear do db.collection(collection_name).remove(to_json) + fun clear do db.collection(collection_name).remove(to_json_object) # Verbosity level used fo stdout. # @@ -236,7 +236,7 @@ class Player nitcoins = json["nitcoins"].as(Int) end - redef fun to_json do + redef fun to_json_object do var json = super json["game"] = game.key json["name"] = name diff --git a/contrib/nitrpg/src/statistics.nit b/contrib/nitrpg/src/statistics.nit index cde6816..764616f 100644 --- a/contrib/nitrpg/src/statistics.nit +++ b/contrib/nitrpg/src/statistics.nit @@ -172,7 +172,7 @@ class GameStats for k, v in values do self[k] = v.as(Int) end - redef fun to_json do + redef fun to_json_object do var obj = super obj["period"] = period obj["owner"] = owner.key diff --git a/contrib/nitrpg/src/test_achievements.nit b/contrib/nitrpg/src/test_achievements.nit index 033832f..c210c60 100644 --- a/contrib/nitrpg/src/test_achievements.nit +++ b/contrib/nitrpg/src/test_achievements.nit @@ -51,7 +51,7 @@ class TestGame var a3 = new Achievement(game, "test_id3", "test_name", "test_desc", 15) game.add_achievement(a1) game.add_achievement(a2) - game.db.collection("achievements").insert(a3.to_json) + game.db.collection("achievements").insert(a3.to_json_object) var ok = [a1.id, a2.id] var res = game.load_achievements assert res.length == 2 diff --git a/contrib/nitrpg/src/test_events.nit b/contrib/nitrpg/src/test_events.nit index b960501..640e8dc 100644 --- a/contrib/nitrpg/src/test_events.nit +++ b/contrib/nitrpg/src/test_events.nit @@ -51,7 +51,7 @@ class TestGame var event3 = new GameEvent(game, "test_kind", new JsonObject) game.add_event(event1) game.add_event(event2) - game.db.collection("events").insert(event3.to_json) + game.db.collection("events").insert(event3.to_json_object) var ok = [event1.internal_id, event2.internal_id] var res = game.load_events assert res.length == 2 @@ -115,7 +115,7 @@ class TestGameEvent var db = gen_test_db var game = load_game("Morriar/nit", db) var event = new GameEvent(game, "test_kind", new JsonObject) - assert event.to_json["kind"] == "test_kind" + assert event.to_json_object["kind"] == "test_kind" end fun test_init_from_json do diff --git a/contrib/nitrpg/src/test_game.nit b/contrib/nitrpg/src/test_game.nit index fceafb9..25ddcad 100644 --- a/contrib/nitrpg/src/test_game.nit +++ b/contrib/nitrpg/src/test_game.nit @@ -43,8 +43,8 @@ class TestGame var player1 = new Player(game, "Morriar") var player2 = new Player(ogame, "privat") - game.db.collection("players").insert(player1.to_json) - ogame.db.collection("players").insert(player2.to_json) + game.db.collection("players").insert(player1.to_json_object) + ogame.db.collection("players").insert(player2.to_json_object) assert game.load_player("privat") == null assert game.load_player("Morriar").name == "Morriar" @@ -60,9 +60,9 @@ class TestGame var player1 = new Player(game, "Morriar") var player2 = new Player(ogame, "privat") var player3 = new Player(game, "xymus") - game.db.collection("players").insert(player1.to_json) - ogame.db.collection("players").insert(player2.to_json) - game.db.collection("players").insert(player3.to_json) + game.db.collection("players").insert(player1.to_json_object) + ogame.db.collection("players").insert(player2.to_json_object) + game.db.collection("players").insert(player3.to_json_object) var players = game.load_players var ok = ["Morriar", "xymus"] diff --git a/contrib/refund/src/refund_json.nit b/contrib/refund/src/refund_json.nit index 4da71f5..130ad2a 100644 --- a/contrib/refund/src/refund_json.nit +++ b/contrib/refund/src/refund_json.nit @@ -118,7 +118,7 @@ redef class RefundProcessor exit 1 end - redef fun show_stats do print load_stats.to_json.to_pretty_json + redef fun show_stats do print load_stats.to_json_object.to_pretty_json redef fun load_stats do # If no stats found, return a new object @@ -134,7 +134,7 @@ redef class RefundProcessor end redef fun save_stats(stats) do - write_output(stats.to_json.to_pretty_json, stats_file) + write_output(stats.to_json_object.to_pretty_json, stats_file) end end @@ -146,7 +146,7 @@ redef class RefundStats end # Outputs `self` as a JSON string. - fun to_json: JsonObject do + fun to_json_object: JsonObject do var obj = new JsonObject for k, v in self do obj[k] = v return obj