Merge pull request #30 from nodes-vapor/refactor

Major refactor

Author: steffendsommer

Package.swift

@@ -4,6 +4,6 @@ let package = Package(
     name: "Bugsnag",
     dependencies: [
         .Package(url: "https://github.com/vapor/vapor.git", Version(2,0,0, prereleaseIdentifiers: ["beta"])),
-        .Package(url: "https://github.com/nodes-vapor/stacked.git", majorVersion: 0, minor: 0)
+        .Package(url: "https://github.com/nodes-vapor/stacked.git", majorVersion: 0, minor: 1)
     ]
 )

Sources/Bugsnag/BugsnagConfig.swift

@@ -0,0 +1,35 @@
+import Vapor
+
+internal struct BugsnagConfig {
+    internal let apiKey: String
+    internal let notifyReleaseStages: [String]?
+    internal let endpoint: String
+    internal let filters: [String]
+    internal let stackTraceSize: Int
+    internal let environment: Environment
+    
+    internal init(_ config: Config) throws {
+        apiKey = try config.get("apiKey")
+        
+        notifyReleaseStages = try config["notifyReleaseStages"]?.array?.map {
+            guard let string = $0.string else {
+                throw Abort(.internalServerError, reason: "Invalid field for: notifyReleaseStages")
+            }
+            
+            return string
+        }
+        
+        endpoint = try config.get("endpoint")
+        filters = try config["filters"]?.array?.map {
+            guard let string = $0.string else {
+                throw Abort(.internalServerError, reason: "Invalid field for: filters")
+            }
+            
+            return string
+        } ?? []
+        
+        stackTraceSize = config["stackTraceSize"]?.int ?? 100
+    
+        environment = config.environment
+    }
+}

Sources/Bugsnag/Configuration.swift

@@ -3,11 +3,7 @@ import HTTP
 import Foundation
 import Stacked
 
-
 public protocol ConnectionManagerType {
-    var client: ClientFactoryProtocol { get }
-    var url: String { get }
-    init(client: ClientFactoryProtocol, url: String)
     func submitPayload(_ json: JSON) throws -> Status
 }
 

Sources/Bugsnag/ConnectionManager.swift

@@ -2,23 +2,9 @@ import Vapor
 import HTTP
 
 public final class Middleware: HTTP.Middleware {
-
-    let drop: Droplet
-    let configuration: ConfigurationType
     let reporter: ReporterType
 
-    public init(drop: Droplet) throws {
-        self.drop = drop
-        self.configuration = try Configuration(drop: drop)
-        self.reporter = Reporter(
-            drop: drop,
-            config: configuration
-        )
-    }
-
     internal init(reporter: ReporterType) throws {
-        self.drop = reporter.drop
-        self.configuration = reporter.config
         self.reporter = reporter
     }
 

Sources/Bugsnag/Middleware.swift

@@ -21,7 +21,7 @@ internal struct PayloadTransformer: PayloadTransformerType {
     let frameAddress: FrameAddressType.Type
     let environment: Environment
     let apiKey: String
-
+    
     internal func payloadFor(
         message: String,
         metadata: Node?,
@@ -68,7 +68,7 @@ internal struct PayloadTransformer: PayloadTransformerType {
 
         try requestObj.set("method", request?.method.description)
         try requestObj.set("headers", headers)
-        try requestObj.set("urlParameters", filterOutKeys(filters, inNode: optionalNode(request?.parameters)))
+        try requestObj.set("urlParameters", filterOutKeys(filters, inNode: optionalNode(request?.parameters.makeNode(in: nil))))
         try requestObj.set("queryParameters", filterOutKeys(filters, inNode: optionalNode(request?.query)))
         try requestObj.set("formParameters", filterOutKeys(filters, inNode: optionalNode(request?.formURLEncoded)))
         try requestObj.set("jsonParameters", filterOutKeys(filters, inNode: optionalNode(request?.json?.makeNode(in: nil))))

Sources/Bugsnag/PayloadTransformer.swift

@@ -1,13 +1,34 @@
 import Vapor
+import Stacked
 
 public final class Provider: Vapor.Provider {
 
     public static var repositoryName = "Bugsnag"
 
-    var config: ConfigurationType
+    var config: BugsnagConfig
 
     public func boot(_ drop: Droplet) {
-        drop.bugsnag = Reporter(drop: drop, config: config)
+        let connectionManager = ConnectionManager(
+            client: EngineClient.factory,
+            url: config.endpoint
+        )
+        
+        let transformer = PayloadTransformer(
+            frameAddress: FrameAddress.self,
+            environment: config.environment,
+            apiKey: config.apiKey
+        )
+        
+        let reporter = Reporter(
+            environment: config.environment,
+            notifyReleaseStages: config.notifyReleaseStages,
+            connectionManager: connectionManager,
+            transformer: transformer,
+            defaultStackSize: config.stackTraceSize,
+            defaultFilters: config.filters
+        )
+        
+        drop.bugsnag = reporter
     }
 
     public func boot(_ config: Config) throws {
@@ -18,11 +39,7 @@ public final class Provider: Vapor.Provider {
             )
         }
 
-        self.config = try Configuration(config: config)
-    }
-    
-    public init(drop: Droplet) throws {
-        config = try Configuration(drop: drop)
+        self.config = try BugsnagConfig(config)
     }
 
     public init(config: Config) throws {
@@ -33,7 +50,7 @@ public final class Provider: Vapor.Provider {
             )
         }
 
-        self.config = try Configuration(config: config)
+        self.config = try BugsnagConfig(config)
     }
 
     // is automatically called directly after boot()