Merge pull request #18 from nodes-vapor/feature/update-sugar

Feature/update sugar

Author: siemensikkema

Package.swift

@@ -7,7 +7,7 @@ let package = Package(
         .library(name: "Bootstrap", targets: ["Bootstrap"])
     ],
     dependencies: [
-        .package(url: "https://github.com/nodes-vapor/sugar.git", from: "3.0.0-beta"),
+        .package(url: "https://github.com/nodes-vapor/sugar.git", from: "4.0.0-beta.2"),
         .package(url: "https://github.com/vapor/leaf.git", from: "3.0.0-rc"),
         .package(url: "https://github.com/vapor/vapor.git", from: "3.0.0"),
     ],

README.md

@@ -13,9 +13,26 @@ This package wraps Bootstrap elements into convenient Leaf-Tags.
 
 # Installation
 
-Update your `Package.swift` file.
+Add `Bootstrap` to the package dependencies (in your `Package.swift` file):
+
+```swift
+dependencies: [
+    ...,
+    .package(url: "https://github.com/nodes-vapor/bootstrap.git", from: "4.0.0-beta")
+]
+```
+
+as well as to your target (e.g. "App"):
+
 ```swift
-.package(url: "https://github.com/nodes-vapor/bootstrap.git", from: "1.0.0")
+targets: [
+    ...
+    .target(
+        name: "App",
+        dependencies: [... "Bootstrap" ...]
+    ),
+    ...
+]
 ```
 
 ## Getting started 🚀
@@ -27,12 +44,6 @@ import Bootstrap
 import Leaf
 ```
 
-### Adding the provider
-
-```swift
-try services.register(BootstrapProvider())
-```
-
 ### Adding the Leaf tags
 
 In order to render the Bootstrap elements, you will need to add the Bootstrap Leaf tags:

Sources/Bootstrap/Bootstrap.swift

@@ -0,0 +1,17 @@
+import Leaf
+
+extension LeafTagConfig {
+    public mutating func useBootstrapLeafTags() {
+        use([
+            "bs:button": ButtonTag(),
+            "bs:buttonGroup": ButtonGroupTag(),
+            "bs:buttonToolbar": ButtonToolbarTag(),
+            "bs:alert": AlertTag(),
+            "bs:input": InputTag(),
+            "bs:badge": BadgeTag(),
+            "bs:breadCrumb": BreadCrumbTag(),
+            "bs:breadCrumbItem": BreadCrumbItemTag(),
+            "bs:textArea": TextAreaTag()
+        ])
+    }
+}

Sources/Bootstrap/Extensions/LeafTagConfig.swift

@@ -0,0 +1,19 @@
+/// Bootstrap Color Definitions
+enum ColorKeys: String {
+    /// Bootstrap Primary Color
+    case primary
+    /// Bootstrap Secondary Color
+    case secondary
+    /// Bootstrap Success Color
+    case success
+    /// Bootstrap Danger Color
+    case danger
+    /// Bootstrap Warning Color
+    case warning
+    /// Bootstrap Info Color
+    case info
+    /// Bootstrap Light Color
+    case light
+    /// Bootstrap Dark Color
+    case dark
+}

Sources/Bootstrap/Models/ColorKeys.swift

@@ -10,7 +10,9 @@ public final class AlertTag: TagRenderer {
 
         if tag.parameters.count > 0 {
             guard let param = tag.parameters[0].string else {
-                throw tag.error(reason: "Wrong type given (expected a string): \(type(of: tag.parameters[0]))")
+                throw tag.error(
+                    reason: "Wrong type given (expected a string): \(type(of: tag.parameters[0]))"
+                )
             }
 
             if param.count > 0 {
@@ -20,7 +22,9 @@ public final class AlertTag: TagRenderer {
 
         if tag.parameters.count > 1 {
             guard let param = tag.parameters[1].string else {
-                throw tag.error(reason: "Wrong type given (expected a string): \(type(of: tag.parameters[1]))")
+                throw tag.error(
+                    reason: "Wrong type given (expected a string): \(type(of: tag.parameters[1]))"
+                )
             }
 
             if param.count > 0 {
@@ -30,7 +34,9 @@ public final class AlertTag: TagRenderer {
 
         if tag.parameters.count > 2 {
             guard let param = tag.parameters[2].string else {
-                throw tag.error(reason: "Wrong type given (expected a string): \(type(of: tag.parameters[2]))")
+                throw tag.error(
+                    reason: "Wrong type given (expected a string): \(type(of: tag.parameters[2]))"
+                )
             }
 
             if param.count > 0 {

Sources/Bootstrap/Tags/Alert.swift

@@ -1,4 +1,5 @@
 import Leaf
+import Sugar
 import TemplateKit
 
 public final class BadgeTag: TagRenderer {
@@ -18,7 +19,7 @@ public final class BadgeTag: TagRenderer {
                 case 0: style = param
                 case 1: classes = param
                 case 2: attributes = param
-                default: ()
+                default: break
                 }
             }
         }

Sources/Bootstrap/Tags/Badge.swift

@@ -1,4 +1,5 @@
 import Leaf
+import Sugar
 import TemplateKit
 
 public final class BreadCrumbTag: TagRenderer {
@@ -15,7 +16,7 @@ public final class BreadCrumbTag: TagRenderer {
                 switch index {
                 case 0: classes = param
                 case 1: attributes = param
-                default: ()
+                default: break
                 }
             }
         }
@@ -49,7 +50,7 @@ public final class BreadCrumbItemTag: TagRenderer {
                 switch index {
                 case 0: classes = param
                 case 1: attributes = param
-                default: ()
+                default: break
                 }
             }
         }

Sources/Bootstrap/Tags/Breadcrumb.swift

@@ -1,4 +1,5 @@
 import Leaf
+import Sugar
 import TemplateKit
 
 public final class ButtonTag: TagRenderer {
@@ -23,7 +24,7 @@ public final class ButtonTag: TagRenderer {
                 case 0: style = param
                 case 1: classes = param
                 case 2: attributes = param
-                default: ()
+                default: break
                 }
             }
         }

Sources/Bootstrap/Tags/Button.swift

@@ -15,23 +15,27 @@ public final class ButtonGroupTag: TagRenderer {
 
         try tag.requireParameterCount(upTo: ButtonGroupTag.paramCount)
 
-        var group = GroupKeys.standard.rawValue
+        var group = GroupKeys.standard
         var classes: String?
         var aria = UUID().uuidString
 
         if tag.parameters.count > 0 {
             guard let param = tag.parameters[0].bool else {
-                throw tag.error(reason: "Wrong type given (expected a bool): \(type(of: tag.parameters[0]))")
+                throw tag.error(
+                    reason: "Wrong type given (expected a bool): \(type(of: tag.parameters[0]))"
+                )
             }
 
             if param {
-                group = GroupKeys.vertical.rawValue
+                group = .vertical
             }
         }
 
         if tag.parameters.count > 1 {
             guard let param = tag.parameters[1].string else {
-                throw tag.error(reason: "Wrong type given (expected a string): \(type(of: tag.parameters[1]))")
+                throw tag.error(
+                    reason: "Wrong type given (expected a string): \(type(of: tag.parameters[1]))"
+                )
             }
 
             if param.count > 0 {
@@ -41,7 +45,9 @@ public final class ButtonGroupTag: TagRenderer {
 
         if tag.parameters.count > 2 {
             guard let param = tag.parameters[2].string else {
-                throw tag.error(reason: "Wrong type given (expected a string): \(type(of: tag.parameters[2]))")
+                throw tag.error(
+                    reason: "Wrong type given (expected a string): \(type(of: tag.parameters[2]))"
+                )
             }
 
             if param.count > 0 {
@@ -57,7 +63,7 @@ public final class ButtonGroupTag: TagRenderer {
                 throw tag.error(reason: "Body Data Expected")
             }
 
-            var group = "<div class='\(group)"
+            var group = "<div class='\(group.rawValue)"
             if let classes = classes {
                 group += " \(classes)"
             }