Skip to content

Commit 269b832

Browse files
kataraskataras
committed
Update to version 12.1.4
Former-commit-id: aeb039ea25a831ad1087b1994be97b349a8ed4aa
1 parent a30fe26 commit 269b832

File tree

16 files changed

+30
-20
lines changed

16 files changed

+30
-20
lines changed

‎HISTORY.md

+4
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ Developers are not forced to upgrade if they don't really need it. Upgrade whene
2121

2222
**How to upgrade**: Open your command-line and execute this command: `go get github.com/kataras/iris/v12@latest`.
2323

24+
# We, 29 December 2019 | v12.1.4
25+
26+
Minor fix on serving [embedded files](https://github.com/kataras/iris/wiki/File-server).
27+
2428
# We, 25 December 2019 | v12.1.3
2529

2630
Fix [[BUG] [iris.Default] RegisterView](https://github.com/kataras/iris/issues/1410)

‎HISTORY_ES.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ Los desarrolladores no están obligados a actualizar si realmente no lo necesita
2121

2222
**Cómo actualizar**: Abra su línea de comandos y ejecute este comando: `go get github.com/kataras/iris/v12@latest`.
2323

24-
# We, 25 December 2019 | v12.1.3
24+
# Su, 29 December 2019 | v12.1.4
2525

26-
Not translated yet, please navigate to the [english version](HISTORY.md#we-25-december-2019--v1213) instead.
26+
Not translated yet, please navigate to the [english version](HISTORY.md#su-29-december-2019--v1214) instead.
2727

2828
# Sábado, 26 de octubre 2019 | v12.0.0
2929

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# ![](https://iris-go.com/images/santa.png) Merry Christmas everyone!
1+
# ![](https://iris-go.com/images/santa.png) Happy Holidays Everyone!
22

3-
![](https://iris-go.com/images/release.png) Iris version 12.1.3 has been [released](HISTORY.md#we-25-december-2019--v1213)!
3+
![](https://iris-go.com/images/release.png) Iris version **12.1.4** has been [released](HISTORY.md#su-29-december-2019--v1214)!
44

55
![](https://iris-go.com/images/cli.png) The official Iris Command Line Interface will soon be near you in 2020!
66

‎VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
12.1.3:https://github.com/kataras/iris/releases/tag/v12.1.3
1+
12.1.4:https://github.com/kataras/iris/releases/tag/v12.1.4

‎_examples/apidoc/yaag/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ go 1.13
44

55
require (
66
github.com/betacraft/yaag v1.0.1-0.20191027021412-565f65e36090
7-
github.com/kataras/iris/v12 v12.1.3
7+
github.com/kataras/iris/v12 v12.1.4
88
)

‎_examples/file-server/embedding-files-into-app/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
)
66

77
// Follow these steps first:
8-
// $ go get -u github.com/shuLhan/go-bindata/...
8+
// $ go get -u github.com/go-bindata/go-bindata/...
99
// $ go-bindata ./assets/...
1010
// $ go build
1111
// $ ./embedding-files-into-app

‎_examples/file-server/single-page-application/embedded-single-page-application-with-other-routes/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package main
22

33
import "github.com/kataras/iris/v12"
44

5-
// $ go get -u github.com/shuLhan/go-bindata/...
5+
// $ go get -u github.com/go-bindata/go-bindata/...
66
// $ go-bindata ./public/...
77
// $ go build
88
// $ ./embedded-single-page-application-with-other-routes

‎_examples/file-server/single-page-application/embedded-single-page-application/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"github.com/kataras/iris/v12"
55
)
66

7-
// $ go get -u github.com/shuLhan/go-bindata/...
7+
// $ go get -u github.com/go-bindata/go-bindata/...
88
// $ go-bindata ./public/...
99
// $ go run .
1010

‎_examples/view/embedding-templates-into-app/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ func main() {
1313
return "Greetings " + s + "!"
1414
})
1515

16-
// $ go get -u github.com/shuLhan/go-bindata/...
16+
// $ go get -u github.com/go-bindata/go-bindata/...
1717
// $ go-bindata ./templates/...
1818
// $ go build
1919
// $ ./embedding-templates-into-app

‎_examples/view/template_jet_1_embedded/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ This example teaches you how to use jet templates embedded in your applications
66

77
This example is a customized fork of https://github.com/CloudyKit/jet/tree/master/examples/asset_packaging, so you can
88
notice the differences side by side. For example, you don't have to use any external package inside your application,
9-
Iris manually builds the template loader for binary data when Asset and AssetNames are available through tools like the [go-bindata](github.com/shuLhan/go-bindata).
9+
Iris manually builds the template loader for binary data when Asset and AssetNames are available through tools like the [go-bindata](github.com/go-bindata/go-bindata).
1010

1111
Note that you can still use any custom loaders through the `JetEngine.SetLoader`
1212
which overrides any previous loaders like `JetEngine.Binary` we use on this example.
1313

1414
## How to run
1515

1616
```sh
17-
$ go get -u github.com/shuLhan/go-bindata/... # or any active alternative
17+
$ go get -u github.com/go-bindata/go-bindata/...
1818
$ go-bindata ./views/...
1919
$ go build
2020
$ ./template_jet_0_embedded

‎_examples/websocket/socketio/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ go 1.13
44

55
require (
66
github.com/googollee/go-socket.io v1.4.3-0.20191109153049-7451e2f8c2e0 // indirect
7-
github.com/kataras/iris/v12 v12.1.3
7+
github.com/kataras/iris/v12 v12.1.4
88
)

‎core/router/fs.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ func (f *embeddedFile) Stat() (os.FileInfo, error) {
9595
}
9696

9797
// func (f *embeddedFile) Name() string {
98-
// return strings.TrimLeft(f.vdir, f.FileInfo.Name())
98+
// return strings.TrimPrefix(f.vdir, f.FileInfo.Name())
9999
// }
100100

101101
type embeddedFileSystem struct {
@@ -109,7 +109,7 @@ type embeddedFileSystem struct {
109109
var _ http.FileSystem = (*embeddedFileSystem)(nil)
110110

111111
func (fs *embeddedFileSystem) Open(name string) (http.File, error) {
112-
// name = fs.vdir + name <- no need, check the TrimLeft(name, vdir) on names loop and the asset and assetInfo redefined on `HandleDir`.
112+
// name = fs.vdir + name <- no need, check the TrimPrefix(name, vdir) on names loop and the asset and assetInfo redefined on `HandleDir`.
113113
if d, ok := fs.dirNames[name]; ok {
114114
return d, nil
115115
}
@@ -221,7 +221,7 @@ func FileServer(directory string, opts ...DirOptions) context.Handler {
221221
continue
222222
}
223223

224-
names = append(names, strings.TrimLeft(name, vdir))
224+
names = append(names, strings.TrimPrefix(name, vdir))
225225
}
226226

227227
if len(names) == 0 {

‎doc.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Source code and other details for the project are available at GitHub:
3838
3939
Current Version
4040
41-
12.1.3
41+
12.1.4
4242
4343
Installation
4444

‎iris.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import (
3939
)
4040

4141
// Version is the current version number of the Iris Web Framework.
42-
const Version = "12.1.3"
42+
const Version = "12.1.4"
4343

4444
// HTTP status codes as registered with IANA.
4545
// See: http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml.

‎middleware/logger/logger.go

+6
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,13 @@ func (l *requestLoggerMiddleware) ServeHTTP(ctx context.Context) {
120120
if headerMessage != nil {
121121
line += fmt.Sprintf(" %v", headerMessage)
122122
}
123+
124+
// if context.StatusCodeNotSuccessful(ctx.GetStatusCode()) {
125+
// ctx.Application().Logger().Warn(line)
126+
// } else {
123127
ctx.Application().Logger().Info(line)
128+
// }
129+
124130
}
125131

126132
// Columnize formats the given arguments as columns and returns the formatted output,

‎view/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ func hi(ctx iris.Context) {
126126

127127
## Embedded
128128

129-
View engine supports bundled(https://github.com/shuLhan/go-bindata) template files too.
129+
View engine supports bundled(https://github.com/go-bindata/go-bindata) template files too.
130130
`go-bindata` gives you two functions, `Assset` and `AssetNames`,
131131
these can be set to each of the template engines using the `.Binary` function.
132132

@@ -139,7 +139,7 @@ import "github.com/kataras/iris/v12"
139139

140140
func main() {
141141
app := iris.New()
142-
// $ go get -u github.com/shuLhan/go-bindata/...
142+
// $ go get -u github.com/go-bindata/go-bindata/...
143143
// $ go-bindata ./templates/...
144144
// $ go build
145145
// $ ./embedding-templates-into-app

0 commit comments

Comments
 (0)