Skip to content

Commit

Permalink
update swift 5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
bbriatte committed May 8, 2019
1 parent 8856560 commit 38fa827
Show file tree
Hide file tree
Showing 13 changed files with 40 additions and 19 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ Packages/
.build/
*.xcodeproj
Package.pins
Package.resolved

# CocoaPods
#
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
BSD 3-Clause License

Copyright (c) 2017, Digipolitan
Copyright (c) 2019, Digipolitan
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
21 changes: 16 additions & 5 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,12 +1,23 @@
// swift-tools-version:3.1
// swift-tools-version:5.0

import PackageDescription

let package = Package(
name: "PerfectMiddleware",
products: [
.library(
name: "PerfectMiddleware",
targets: ["PerfectMiddleware"]),
],
dependencies: [
.Package(url: "https://github.com/PerfectlySoft/Perfect-HTTPServer.git",
majorVersion: 2,
minor: 2)
]
.package(url: "https://github.com/PerfectlySoft/Perfect-HTTPServer.git", from: "3.0.0")
],
targets: [
.target(
name: "PerfectMiddleware",
dependencies: ["PerfectHTTPServer"]),
.testTarget(
name: "PerfectMiddlewareTests",
dependencies: ["PerfectHTTPServer"])
]
)
15 changes: 12 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
PerfectMiddleware
=================================

[![Swift Version](https://img.shields.io/badge/swift-5.0-orange.svg?style=flat)](https://developer.apple.com/swift/)
[![Twitter](https://img.shields.io/badge/twitter-@Digipolitan-blue.svg?style=flat)](http://twitter.com/Digipolitan)

Perfect middleware swift allows developer to register middlewares inside a Perfect HTTPServer
Expand All @@ -12,12 +13,20 @@ Perfect middleware swift allows developer to register middlewares inside a Perfe
To install PerfectMiddleware with SPM, add the following lines to your `Package.swift`.

```swift
import PackageDescription

let package = Package(
name: "XXX",
products: [
.library(
name: "XXX",
targets: ["XXX"]),
],
dependencies: [
.Package(url: "https://github.com/Digipolitan/perfect-middleware-swift.git", majorVersion: 1)
.package(url: "https://github.com/Digipolitan/perfect-middleware-swift.git", from: "1.1.0")
],
targets: [
.target(
name: "XXX",
dependencies: ["PerfectMiddleware"])
]
)
```
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,20 @@ open class RouterMiddleware {
private var verbose: Bool;

public static func sanitize(path: String) -> String {
var characters = path.characters
guard characters.count > 0 && path != "/" else {
guard path.count > 0 && path != "/" else {
return "/"
}
let last = characters.endIndex
var res = path;
let last = res.endIndex
let separator = Character(UnicodeScalar(47))
if characters[characters.index(before: last)] == separator {
characters.removeLast()
if res[res.index(before: last)] == separator {
res.removeLast()
}
let first = characters.startIndex
if characters[first] != separator {
characters.insert(separator, at: first)
let first = res.startIndex
if res[first] != separator {
res.insert(separator, at: first)
}
return String(characters)
return res
}

public convenience init() {
Expand Down Expand Up @@ -179,7 +179,7 @@ public extension HTTPServer {
* Register the router inside the HttpServer by adding all routes
* @param router The router midddleware to register
*/
public func use(router: RouterMiddleware) {
func use(router: RouterMiddleware) {
self.addRoutes(router.getRoutes())
}
}

0 comments on commit 38fa827

Please sign in to comment.