nitcorn clients: remove `write_to_string` when a Writable is given as body

Signed-off-by: Jean Privat <jean@pryen.org>

diff --git a/contrib/benitlux/src/server/benitlux_controller.nit b/contrib/benitlux/src/server/benitlux_controller.nit
index a2ab392..8f96182 100644 (file)
--- a/contrib/benitlux/src/server/benitlux_controller.nit
+++ b/contrib/benitlux/src/server/benitlux_controller.nit
@@ -77,7 +77,7 @@ class BenitluxSubscriptionAction
                end
 
                var response = new HttpResponse(200)
-               response.body = template.write_to_string
+               response.body = template
                return response
        end
 end

diff --git a/contrib/nitiwiki/src/wiki_edit.nit b/contrib/nitiwiki/src/wiki_edit.nit
index 3b1abb7..436760b 100644 (file)
--- a/contrib/nitiwiki/src/wiki_edit.nit
+++ b/contrib/nitiwiki/src/wiki_edit.nit
@@ -50,7 +50,7 @@ class WikiEditForm
        fun to_http_response: HttpResponse
        do
                var resp = new HttpResponse(200)
-               resp.body = tpl_page.write_to_string
+               resp.body = tpl_page
                return resp
        end
 end

diff --git a/contrib/nitrpg/src/web.nit b/contrib/nitrpg/src/web.nit
index f624f48..c563af7 100644 (file)
--- a/contrib/nitrpg/src/web.nit
+++ b/contrib/nitrpg/src/web.nit
@@ -50,7 +50,7 @@ class RpgAction
                var page = new NitRpgPage(root_url)
                var error = new ErrorPanel(msg)
                page.flow_panels.add error
-               rsp.body = page.write_to_string
+               rsp.body = page
                return rsp
        end
 
@@ -95,7 +95,7 @@ class RpgHome
                page = new NitRpgPage(root_url)
                page.side_panels.add new GamesShortListPanel(root_url, games)
                page.flow_panels.add new MDPanel(readme)
-               response.body = page.write_to_string
+               response.body = page
                return response
        end
 
@@ -126,7 +126,7 @@ class ListGames
                page.breadcrumbs = new Breadcrumbs
                page.breadcrumbs.add_link(root_url / "games", "games")
                page.flow_panels.add new GamesListPanel(root_url, games)
-               response.body = page.write_to_string
+               response.body = page
                return response
        end
 end
@@ -196,7 +196,7 @@ class RepoHome
                page.flow_panels.add new PodiumPanel(game)
                page.flow_panels.add new EventListPanel(game, list_limit, list_from)
                page.flow_panels.add new AchievementsListPanel(game)
-               rsp.body = page.write_to_string
+               rsp.body = page
                return rsp
        end
 end
@@ -210,7 +210,7 @@ class ListPlayers
                if is_response_error(rsp) then return rsp
                page.breadcrumbs.add_link(game.url / "players", "players")
                page.flow_panels.add new ListPlayersPanel(game)
-               rsp.body = page.write_to_string
+               rsp.body = page
                return rsp
        end
 end
@@ -239,7 +239,7 @@ class PlayerHome
                page.flow_panels.add new PlayerWorkPanel(game, player)
                page.flow_panels.add new AchievementsListPanel(player)
                page.flow_panels.add new EventListPanel(player, list_limit, list_from)
-               rsp.body = page.write_to_string
+               rsp.body = page
                return rsp
        end
 end
@@ -253,7 +253,7 @@ class ListAchievements
                if is_response_error(rsp) then return rsp
                page.breadcrumbs.add_link(game.url / "achievements", "achievements")
                page.flow_panels.add new AchievementsListPanel(game)
-               rsp.body = page.write_to_string
+               rsp.body = page
                return rsp
        end
 end
@@ -278,7 +278,7 @@ class AchievementHome
                page.breadcrumbs.add_link(achievement.url, achievement.name)
                page.flow_panels.add new AchievementPanel(achievement)
                page.flow_panels.add new EventListPanel(achievement, list_limit, list_from)
-               rsp.body = page.write_to_string
+               rsp.body = page
                return rsp
        end
 end

diff --git a/contrib/opportunity/src/opportunity_controller.nit b/contrib/opportunity/src/opportunity_controller.nit
index 214c843..3266502 100644 (file)
--- a/contrib/opportunity/src/opportunity_controller.nit
+++ b/contrib/opportunity/src/opportunity_controller.nit
@@ -31,7 +31,7 @@ abstract class OpportunityAction
        # TODO: Add a specific body to the bad request page.
        fun bad_req: HttpResponse do
                var rsp = new HttpResponse(400)
-               rsp.body = (new OpportunityHomePage).write_to_string
+               rsp.body = new OpportunityHomePage
                return rsp
        end
 end
@@ -73,7 +73,7 @@ class OpportunityWelcome
                                meetpage.ans = ansset
                                meetpage.meet = meet
                                meetpage.error = "'Meetup name' is a mandatory fields."
-                               rsp.body = meetpage.write_to_string
+                               rsp.body = meetpage
                                return rsp
 
                        end
@@ -85,7 +85,7 @@ class OpportunityWelcome
                                var meetpage = new MeetupCreationPage
                                meetpage.meet = meet
                                meetpage.error = "You need to input at least one answer."
-                               rsp.body = meetpage.write_to_string
+                               rsp.body = meetpage
                                return rsp
                        end
 
@@ -100,7 +100,7 @@ class OpportunityWelcome
 <p>Failed to create event</p>
 <p>This is a server side error, it has been logged.
    You may still want to contact the maintainers of this website.</p>"""
-                               rsp.body = meetpage.write_to_string
+                               rsp.body = meetpage
                                return rsp
                        end
 
@@ -111,22 +111,22 @@ class OpportunityWelcome
                        end
                        db.close
                        var rsp = new HttpResponse(200)
-                       rsp.body = (new MeetupConfirmation(meet)).write_to_string
+                       rsp.body = new MeetupConfirmation(meet)
                        return rsp
                end
                if rq.has("new_meetup") then
                        var rsp = new HttpResponse(200)
                        var page = new MeetupCreationPage
-                       rsp.body = page.write_to_string
+                       rsp.body = page
                        return rsp
                end
                if get.has_key("meetup_id") then
                        var rsp = new HttpResponse(200)
-                       rsp.body = (new OpportunityMeetupPage.from_id(get["meetup_id"])).write_to_string
+                       rsp.body = new OpportunityMeetupPage.from_id(get["meetup_id"])
                        return rsp
                end
                var rsp = new HttpResponse(200)
-               rsp.body = (new OpportunityHomePage).write_to_string
+               rsp.body = new OpportunityHomePage
                return rsp
        end
 

diff --git a/lib/nitcorn/file_server.nit b/lib/nitcorn/file_server.nit
index a9ef5f6..96293f6 100644 (file)
--- a/lib/nitcorn/file_server.nit
+++ b/lib/nitcorn/file_server.nit
@@ -125,7 +125,7 @@ class FileServer
                if response.status_code != 200 then
                        var tmpl = error_page(response.status_code)
                        if header != null and tmpl isa ErrorTemplate then tmpl.header = header
-                       response.body = tmpl.to_s
+                       response.body = tmpl
                end
 
                return response

diff --git a/lib/popcorn/pop_handlers.nit b/lib/popcorn/pop_handlers.nit
index e657d68..cd7a380 100644 (file)
--- a/lib/popcorn/pop_handlers.nit
+++ b/lib/popcorn/pop_handlers.nit
@@ -431,7 +431,7 @@ redef class HttpResponse
        # Write data in body response and send it.
        fun send(raw_data: nullable Writable, status: nullable Int) do
                if raw_data != null then
-                       body += raw_data.write_to_string
+                       body = raw_data
                end
                if status != null then
                        status_code = status