Update v2.0.5 (#442)

* Update version
johnfercher · May 26, 2024 · 97de544 · 97de544
1 parent f76ae41
commit 97de544
Show file tree

Hide file tree

Showing 29 changed files with 73 additions and 28 deletions.
diff --git a/.github/workflows/goci.yml b/.github/workflows/goci.yml
@@ -28,4 +28,4 @@ jobs:
         run: go build $(go list -f '{{ .Dir }}' ./... | grep -E -v 'docs|cmd|mocks')
 
       - name: Test
-        run: go test -v $(go list -f '{{ .Dir }}' ./... | grep -E -v 'docs|cmd|mocks')
+        run: go test -v $(go list -f '{{ .Dir }}' ./... | grep -E -v 'docs|cmd|mocks') && go test -v $(go list -f '{{ .Dir }}' ./docs/assets/examples/...)
diff --git a/Makefile b/Makefile
@@ -1,5 +1,6 @@
 GO_FILES = $(shell find . '(' -path '*/.*' -o -path './vendor' ')' -prune -o -name '*.go' -print | cut -b3-)
 GO_PATHS =  $(shell go list -f '{{ .Dir }}' ./... | grep -E -v 'docs|cmd|mocks')
+GO_EXAMPLES =  $(shell go list -f '{{ .Dir }}' ./docs/assets/examples/...)
 
 .PHONY: dod
 dod: build test fmt lint
@@ -11,6 +12,7 @@ build:
 .PHONY: test
 test:
 	go test $(GO_PATHS)
+	go test $(GO_EXAMPLES)
 
 .PHONY: fmt
 fmt:
@@ -43,6 +45,7 @@ godoc:
 .PHONY: mocks
 mocks:
 	mockery
+	make fmt
 
 .PHONY: examples
 examples:

diff --git a/README.md b/README.md
@@ -18,12 +18,12 @@ You can write your PDFs like you are creating a site using Bootstrap. A Row may
 Besides that, pages will be added when content may extrapolate the useful area. You can define a header which will be added
 always when a new page appear, in this case, a header may have many rows, lines or tablelist. 
 
-#### Maroto `v2.0.4` is here! Try out:
+#### Maroto `v2.0.5` is here! Try out:
 
 * Installation with`go get`:
 
 ```bash
-go get github.com/johnfercher/maroto/v2@v2.0.4
+go get github.com/johnfercher/maroto/v2@v2.0.5
 ```
 
 * You can see the full `v2` documentation [here](https://maroto.io/).

diff --git a/docs/README.md b/docs/README.md
@@ -19,12 +19,12 @@
 
 * We are about to create a document processor to generate PDFs by interpreting serialized data as: yml, json or html. Please contribute with your ideas in [this discussion](https://github.com/johnfercher/maroto/discussions/390).
 
-#### 3. Maroto`v2.0.4`is here! Try out:
+#### 3. Maroto`v2.0.5`is here! Try out:
 
 * Installation with`go get`:
 
 ```bash
-go get github.com/johnfercher/maroto/v2@v2.0.4
+go get github.com/johnfercher/maroto/v2@v2.0.5
 ```
 
 The public API was completely redesigned with the aim of enhancing the 

diff --git a/docs/_coverpage.md b/docs/_coverpage.md
@@ -1,6 +1,6 @@
 ![logo](assets/images/logo.png)
 
-# Maroto <small>v2.0.4</small>
+# Maroto <small>v2.0.5</small>
 
 > An open-source golang lib to create PDFs. Fast and Simple.
 

diff --git a/metricsdecorator.go b/metricsdecorator.go
@@ -27,6 +27,7 @@ func NewMetricsDecorator(inner core.Maroto) core.Maroto {
 	}
 }
 
+// FitlnCurrentPage decoratess the FitlnCurrentPage method of maroto instance.
 func (m *MetricsDecorator) FitlnCurrentPage(heightNewLine float64) bool {
 	return m.inner.FitlnCurrentPage(heightNewLine)
 }

diff --git a/metricsdecorator_test.go b/metricsdecorator_test.go
@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/johnfercher/maroto/v2/pkg/core/entity"
+
 	"github.com/johnfercher/maroto/v2/pkg/components/text"
 
 	"github.com/johnfercher/go-tree/node"
@@ -149,16 +151,35 @@ func TestMetricsDecorator_GetStructure(t *testing.T) {
 }
 
 func TestMetricsDecorator_FitlnCurrentPage(t *testing.T) {
+	// Arrange
 	inner := mocks.NewMaroto(t)
 	inner.EXPECT().FitlnCurrentPage(10.0).Return(true)
 	inner.EXPECT().FitlnCurrentPage(20.0).Return(false)
 
 	sut := NewMetricsDecorator(inner)
-	// Assert
+
+	// Act & Assert
 	assert.True(t, sut.FitlnCurrentPage(10))
 	assert.False(t, sut.FitlnCurrentPage(20))
 }
 
+func TestMetricsDecorator_GetCurrentConfig(t *testing.T) {
+	// Arrange
+	cfgToReturn := &entity.Config{
+		MaxGridSize: 15,
+	}
+	inner := mocks.NewMaroto(t)
+	inner.EXPECT().GetCurrentConfig().Return(cfgToReturn)
+
+	sut := NewMetricsDecorator(inner)
+
+	// Act
+	cfg := sut.GetCurrentConfig()
+
+	// Assert
+	assert.Equal(t, cfgToReturn.MaxGridSize, cfg.MaxGridSize)
+}
+
 func TestMetricsDecorator_RegisterHeader(t *testing.T) {
 	// Arrange
 	row := text.NewRow(10, "text")

diff --git a/mocks/Builder.go b/mocks/Builder.go
diff --git a/mocks/Cache.go b/mocks/Cache.go
diff --git a/mocks/CellWriter.go b/mocks/CellWriter.go
diff --git a/mocks/Code.go b/mocks/Code.go
diff --git a/mocks/Col.go b/mocks/Col.go
diff --git a/mocks/Component.go b/mocks/Component.go
diff --git a/mocks/Document.go b/mocks/Document.go
diff --git a/mocks/Font.go b/mocks/Font.go
diff --git a/mocks/Fpdf.go b/mocks/Fpdf.go
diff --git a/mocks/Image.go b/mocks/Image.go
diff --git a/mocks/Line.go b/mocks/Line.go
diff --git a/mocks/Listable.go b/mocks/Listable.go
diff --git a/mocks/Maroto.go b/mocks/Maroto.go
diff --git a/mocks/Math.go b/mocks/Math.go
diff --git a/mocks/Node.go b/mocks/Node.go
diff --git a/mocks/Page.go b/mocks/Page.go
diff --git a/mocks/Provider.go b/mocks/Provider.go
diff --git a/mocks/Repository.go b/mocks/Repository.go
diff --git a/mocks/Row.go b/mocks/Row.go
diff --git a/mocks/Text.go b/mocks/Text.go
diff --git a/pull_request_template.md b/pull_request_template.md
@@ -19,6 +19,5 @@
 - [ ] Updated docs/doc.go and docs/* <!-- If applied -->
 - [ ] Updated ```example_test.go```. <!-- If applied -->
 - [ ] Updated README.md <!-- If applied -->
-- [ ] Executed `make examples` to update all examples inside docs/examples. <!-- If applied -->
 - [ ] New public methods/structs/interfaces has comments upside them explaining they responsibilities <!-- If applied -->
 - [ ] Executed `make dod` with none issues pointed out by `golangci-lint`
diff --git a/test/maroto/examples/metadatas.json b/test/maroto/examples/metadatas.json
@@ -10,6 +10,7 @@
 		"config_metadata_author": "Utf8Text(author, false)",
 		"config_metadata_creation_date": true,
 		"config_metadata_creator": "Utf8Text(creator, false)",
+		"config_metadata_keywords": "Utf8Text(keyword, false)",
 		"config_metadata_subject": "Utf8Text(subject, false)",
 		"config_metadata_title": "Utf8Text(title, false)",
 		"config_provider_type": "gofpdf",
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,6 +27,7 @@ func NewMetricsDecorator(inner core.Maroto) core.Maroto { @@
     	}
     }
+    // FitlnCurrentPage decoratess the FitlnCurrentPage method of maroto instance.
     func (m *MetricsDecorator) FitlnCurrentPage(heightNewLine float64) bool {
     	return m.inner.FitlnCurrentPage(heightNewLine)
     }
@@ Expand Down @@