Merge pull request #156 from qutheory/sh/app-refactor

App Refactor

.travis.yml

@@ -6,17 +6,10 @@ sudo: required
 dist: trusty
 osx_image: xcode7.3
 install:
+  - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/02090c7ede5a637b76e6df1710e83cd0bbe7dcdf/swiftenv-install.sh)"
 script:
-  - . ./.travis.sh # conditionally installs Swift 2.2 on Linux
-  - export PATH=$TRAVIS_BUILD_DIR/swift-2.2-RELEASE-ubuntu14.04/usr/bin/:"${PATH}" # adds Swift 2.2 to PATH
-  - make # compiles project with Swift 2.2
-  - make release # compiles optimized
-  - sudo make install # installs shared libs and CLI
-  - vapor build Sources/VaporDev/main.swift Sources/VaporDev/**/*.swift # builds VaporDev with CLI
-  - rm -rf Packages .build # cleans project to prevent conflicts between 2.2 and 3.0
-  - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/02090c7ede5a637b76e6df1710e83cd0bbe7dcdf/swiftenv-install.sh)" # Installs swiftenv
   - swift build --fetch # clones all dependencies
-  - rm -rf Packages/*/Tests # fixes SPM bug
-  - swift build 
+  - rm -rf Packages/*/Tests
+  - swift build
   - swift build --configuration release
-  - swift test # q_q
+  - swift test

Package.swift

@@ -3,12 +3,11 @@ import PackageDescription
 let package = Package(
     name: "Vapor",
     dependencies: [
-        .Package(url: "https://github.com/qutheory/json.git", majorVersion: 0),
-        .Package(url: "https://github.com/ketzusaka/Hummingbird", majorVersion: 1, minor: 1)
+        .Package(url: "https://github.com/Zewo/String.git", majorVersion: 0, minor: 4),
+        .Package(url: "https://github.com/Zewo/JSON.git", majorVersion: 0, minor: 4),
+        .Package(url: "https://github.com/ketzusaka/Hummingbird", majorVersion: 1)
     ],
     exclude: [
-        "Sources/VaporDev",
-        "Sources/Generator",
         "XcodeProject",
         "Release"
     ],
@@ -27,10 +26,3 @@ let package = Package(
         )
     ]
 )
-
-//with the new swiftpm we have to force it to create a static lib so that we can use it
-//from xcode. this will become unnecessary once official xcode+swiftpm support is done.
-//watch progress: https://github.com/apple/swift-package-manager/compare/xcodeproj?expand=1
-
-let lib = Product(name: "Vapor", type: .Library(.Dynamic), modules: "Vapor")
-products.append(lib)

README.md

@@ -137,7 +137,7 @@ You can also respond with HTML pages.
 
 ```swift
 app.get("/") { request in
-	return try View(path: "index.html")
+    return try app.view("index.html")
 }
 ```
 
@@ -153,7 +153,7 @@ Or [Stencil](https://github.com/kylef/Stencil) templates.
 
 ```swift
 app.get("/") { request in
-	return View(path: "index.stencil", context: ["message": "Hello"])
+    return try app.view("index.stencil", context: ["message": "Hello"])
 }
 ```