Prechádzať zdrojové kódy

рефакторинг для логического соответствия описанию формата

kpmy 10 rokov pred
rodič
commit
44ec7d56e9
2 zmenil súbory, kde vykonal 7 pridanie a 7 odobranie
  1. 1 1
      generators/gen.go
  2. 6 6
      odf_test.go

+ 1 - 1
generators/gen.go

@@ -62,7 +62,7 @@ func docParts(m model.Model) (ret Parts) {
 	return
 }
 
-func Generate(m model.Model, embed map[string]Embeddable, out io.Writer, mimetype xmlns.Mime) {
+func GeneratePackage(m model.Model, embed map[string]Embeddable, out io.Writer, mimetype xmlns.Mime) {
 	z := zip.NewWriter(out)
 	mime := &zip.FileHeader{Name: xmlns.Mimetype, Method: zip.Store} //файл mimetype не надо сжимать, режим Store
 	if w, err := z.CreateHeader(mime); err == nil {

+ 6 - 6
odf_test.go

@@ -39,7 +39,7 @@ func TestGenerators(t *testing.T) {
 	fm.ConnectTo(m)
 	fm.MimeType = xmlns.MimeText
 	fm.Init()
-	generators.Generate(m, nil, output, fm.MimeType)
+	generators.GeneratePackage(m, nil, output, fm.MimeType)
 	assert.For(output.Close() == nil, 20)
 }
 
@@ -51,7 +51,7 @@ func TestStructure(t *testing.T) {
 	fm.MimeType = xmlns.MimeText
 	fm.Init()
 	fm.WriteString("Hello, World!   \t   \n   \r	фыва 	фыва		\n фыва")
-	generators.Generate(m, nil, output, fm.MimeType)
+	generators.GeneratePackage(m, nil, output, fm.MimeType)
 	assert.For(output.Close() == nil, 20)
 }
 
@@ -78,7 +78,7 @@ func TestStylesMechanism(t *testing.T) {
 	fm.WritePara("Page break!\r")
 	fm.SetAttr(nil)
 	fm.WriteString(`Hello, Пщ!`)
-	generators.Generate(m, nil, output, fm.MimeType)
+	generators.GeneratePackage(m, nil, output, fm.MimeType)
 	assert.For(output.Close() == nil, 20)
 }
 
@@ -90,7 +90,7 @@ func TestTables(t *testing.T) {
 		fm.ConnectTo(m)
 		fm.MimeType = xmlns.MimeText
 		fm.Init()
-		generators.Generate(m, nil, output, fm.MimeType)
+		generators.GeneratePackage(m, nil, output, fm.MimeType)
 		assert.For(output.Close() == nil, 20)
 	}
 	{
@@ -100,7 +100,7 @@ func TestTables(t *testing.T) {
 		fm.ConnectTo(m)
 		fm.MimeType = xmlns.MimeSpreadsheet
 		fm.Init()
-		generators.Generate(m, nil, output, fm.MimeType)
+		generators.GeneratePackage(m, nil, output, fm.MimeType)
 		assert.For(output.Close() == nil, 20)
 	}
 }
@@ -120,6 +120,6 @@ func TestDraw(t *testing.T) {
 		url := d.WriteTo(fm, "Two Gophers", 6.07, 3.53) //magic? real size of `project.png`
 		embed[url] = d
 	}
-	generators.Generate(m, embed, output, fm.MimeType)
+	generators.GeneratePackage(m, embed, output, fm.MimeType)
 	assert.For(output.Close() == nil, 20)
 }