From 42115e7d5290d6bc011539c3dc4d0a363f93c710 Mon Sep 17 00:00:00 2001
From: Shuhei Kadowaki <aviatesk@gmail.com>
Date: Sat, 16 May 2020 00:38:18 +0900
Subject: [PATCH] rename writer.jl -> converter.jl

---
 src/Weave.jl                                |  2 +-
 src/{writers.jl => converter.jl}            |  0
 test/runtests.jl                            |  7 +++----
 test/{convert_test.jl => test_converter.jl} | 17 ++++-------------
 4 files changed, 8 insertions(+), 18 deletions(-)
 rename src/{writers.jl => converter.jl} (100%)
 rename test/{convert_test.jl => test_converter.jl} (74%)

diff --git a/src/Weave.jl b/src/Weave.jl
index ea9ab5a..3f13bed 100644
--- a/src/Weave.jl
+++ b/src/Weave.jl
@@ -305,7 +305,7 @@ include("cache.jl")
 include("formatters.jl")
 include("format.jl")
 include("pandoc.jl")
-include("writers.jl")
+include("converter.jl")
 
 export weave,
     list_out_formats,
diff --git a/src/writers.jl b/src/converter.jl
similarity index 100%
rename from src/writers.jl
rename to src/converter.jl
diff --git a/test/runtests.jl b/test/runtests.jl
index f1997f3..4e69ed7 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -1,6 +1,5 @@
-using Weave
+using Weave, Test
 using Weave: run_doc
-using Test
 
 
 # TODO: add test for header processsing
@@ -27,8 +26,8 @@ mock_doc(str, chunk_parser = Weave.parse_markdown) = Weave.WeaveDoc("dummy", chu
         include("test_error_rendering.jl")
     end
 
-    @testset "Conversions" begin
-        include("convert_test.jl")
+    @testset "convertions" begin
+        include("test_converter.jl")
     end
 
     @testset "Formatters" begin
diff --git a/test/convert_test.jl b/test/test_converter.jl
similarity index 74%
rename from test/convert_test.jl
rename to test/test_converter.jl
index 01230a8..f9304db 100644
--- a/test/convert_test.jl
+++ b/test/test_converter.jl
@@ -1,5 +1,4 @@
-using Weave
-using Test
+# TODO: refactor
 
 function convert_test(outfile, infile="documents/chunk_options.noweb")
   outfile = joinpath("documents/convert", outfile)
@@ -16,17 +15,9 @@ convert_test("chunk_options.mdw")
 convert_test("chunk_options_nb.mdw", "documents/chunk_options.ipynb")
 
 # Separate test for notebook (output depends on julia version)
-function contents(chunk::Weave.DocChunk)
-  return join([strip(c.content) for c in chunk.content], "")
-end
-
-function contents(chunk::Weave.CodeChunk)
-  return chunk.content
-end
-
-function contents(doc::Weave.WeaveDoc)
-  return join([contents(chunk) for chunk in doc.chunks], "")
-end
+contents(chunk::Weave.DocChunk) = join([strip(c.content) for c in chunk.content], "")
+contents(chunk::Weave.CodeChunk) = chunk.content
+contents(doc::Weave.WeaveDoc) = join([contents(chunk) for chunk in doc.chunks], "")
 
 outfile = "documents/convert/chunk_options.ipynb"
 infile = "documents/chunk_options.noweb"