From e4225543bc8eb0e2235e3076569f6acd97269d19 Mon Sep 17 00:00:00 2001 From: "Gerasimos (Makis) Maropoulos" Date: Tue, 11 Feb 2020 03:24:57 +0200 Subject: [PATCH] minor Former-commit-id: a4030ed3253a730b8283b9f1880b129b54b96774 --- README.md | 33 ++++++++++++++++---------- core/router/api_builder.go | 1 + core/router/handler_execution_rules.go | 2 +- 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index ea501ab9..73326806 100644 --- a/README.md +++ b/README.md @@ -1,22 +1,30 @@ -# News + # Iris Web Framework -[![build status](https://img.shields.io/travis/kataras/iris/master.svg?style=for-the-badge&logo=travis)](https://travis-ci.org/kataras/iris) [![report card](https://img.shields.io/badge/report%20card-a%2B-ff3333.svg?style=for-the-badge)](https://goreportcard.com/report/github.com/kataras/iris) [![view examples](https://img.shields.io/badge/learn%20by-examples-0077b3.svg?style=for-the-badge)](https://github.com/kataras/iris/tree/master/_examples) [![chat](https://img.shields.io/gitter/room/iris_go/community.svg?color=blue&logo=gitter&style=for-the-badge)](https://gitter.im/iris_go/community) [![donate on PayPal](https://img.shields.io/badge/support-PayPal-blue.svg?style=for-the-badge)](https://www.paypal.me/kataras) +[![build status](https://img.shields.io/travis/kataras/iris/master.svg?style=for-the-badge&logo=travis)](https://travis-ci.org/kataras/iris) [![FOSSA Status](https://img.shields.io/badge/LICENSE%20SCAN-PASS❤️-F10FE3?style=for-the-badge&logo=fossa)](https://app.fossa.io/projects/git%2Bgithub.com%2Fkataras%2Firis?ref=badge_shield) [![view examples](https://img.shields.io/badge/learn%20by-examples-0C8EC5.svg?style=for-the-badge&logo=go)](https://github.com/kataras/iris/tree/master/_examples) [![chat](https://img.shields.io/gitter/room/iris_go/community.svg?color=blue&logo=gitter&style=for-the-badge)](https://gitter.im/iris_go/community) Iris is a fast, simple yet fully featured and very efficient web framework for Go. It provides a beautifully expressive and easy to use foundation for your next website or API. -Learn what [others saying about Iris](https://iris-go.com/testimonials/) and **[star](https://github.com/kataras/iris/stargazers)** this open-source project to support its potentials. + -## Learning Iris +

+ +
+ +

+ + + +## 📖 Learning Iris
Quick start @@ -69,22 +77,21 @@ For a more detailed technical documentation you can head over to our [godocs](ht You can [request](https://bit.ly/iris-req-book) a PDF version and online access of the **E-Book** today and be participated in the development of Iris. -## Contributing +## 🙌 Contributing We'd love to see your contribution to the Iris Web Framework! For more information about contributing to the Iris project please check the [CONTRIBUTING.md](CONTRIBUTING.md) file. [List of all Contributors](https://github.com/kataras/iris/graphs/contributors) -## Security Vulnerabilities +## 🛡 Security Vulnerabilities If you discover a security vulnerability within Iris, please send an e-mail to [iris-go@outlook.com](mailto:iris-go@outlook.com). All security vulnerabilities will be promptly addressed. -## License +## 📝 License This project is licensed under the [BSD 3-clause license](LICENSE), just like the Go project itself. The project name "Iris" was inspired by the Greek mythology. + diff --git a/core/router/api_builder.go b/core/router/api_builder.go index 922c912c..356c2b30 100644 --- a/core/router/api_builder.go +++ b/core/router/api_builder.go @@ -729,6 +729,7 @@ func (api *APIBuilder) Reset() Party { api.middleware = api.middleware[0:0] api.doneHandlers = api.doneHandlers[0:0] api.handlerExecutionRules = ExecutionRules{} + api.routeRegisterRule = RouteOverride return api } diff --git a/core/router/handler_execution_rules.go b/core/router/handler_execution_rules.go index ce4ab882..ac2a8af9 100644 --- a/core/router/handler_execution_rules.go +++ b/core/router/handler_execution_rules.go @@ -23,7 +23,7 @@ type ExecutionRules struct { func applyExecutionRules(rules ExecutionRules, begin, done, main *context.Handlers) { if !rules.Begin.Force && !rules.Done.Force && !rules.Main.Force { - return // do not proceed and spend buld-time here if nothing changed. + return // do not proceed and spend build-time here if nothing changed. } beginOK := rules.Begin.apply(begin)