Merge pull request #2 from brokenhandsio/vapor-4

Update project name to avoid conflicts

Author: ptoffy

.github/workflows/ci.yml

@@ -1,6 +1,3 @@
-# This workflow will build a Swift project
-# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-swift
-
 name: CI
 
 on:

Package.swift

@@ -2,28 +2,28 @@
 import PackageDescription
 
 let package = Package(
-    name: "bootstrap",
+    name: "leaf-bootstrap",
     platforms: [
         .macOS(.v13)
     ],
     products: [
-        .library(name: "Bootstrap", targets: ["Bootstrap"])
+        .library(name: "LeafBootstrap", targets: ["LeafBootstrap"]),
     ],
     dependencies: [
         .package(url: "https://github.com/vapor/leaf.git", from: "4.0.0"),
         .package(url: "https://github.com/vapor/vapor.git", from: "4.0.0"),
     ],
     targets: [
         .target(
-            name: "Bootstrap",
+            name: "LeafBootstrap",
             dependencies: [
                 .product(name: "Leaf", package: "leaf"),
                 .product(name: "Vapor", package: "vapor")
             ]),
         .testTarget(
-            name: "BootstrapTests",
+            name: "LeafBootstrapTests",
             dependencies: [
-                .target(name: "Bootstrap"),
+                .target(name: "LeafBootstrap"),
                 .product(name: "XCTVapor", package: "vapor")
             ]
         )

README.md

@@ -1,34 +1,34 @@
-# Bootstrap 🍃
+# LeafBootstrap 🍃
 
 [![Swift Version](https://img.shields.io/badge/Swift-5.7-brightgreen.svg)](http://swift.org)
 [![Vapor Version](https://img.shields.io/badge/Vapor-4-30B6FC.svg)](http://vapor.codes)
-[![Build Status](https://github.com/brokenhandsio/bootstrap/workflows/CI/badge.svg?branch=master)](https://github.com/brokenhandsio/bootstrap/actions)
-[![codecov](https://codecov.io/gh/nodes-vapor/bootstrap/branch/master/graph/badge.svg)](https://codecov.io/gh/nodes-vapor/bootstrap)
+[![Build Status](https://github.com/brokenhandsio/leaf-bootstrap/workflows/CI/badge.svg?branch=vapor-4)](https://github.com/brokenhandsio/leaf-bootstrap/actions)
+[![codecov](https://codecov.io/gh/brokenhandsio/bootstrap/branch/master/graph/badge.svg)](https://codecov.io/gh/nodes-vapor/leaf-bootstrap)
 [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/nodes-vapor/bootstrap/master/LICENSE)
 
 This package wraps Bootstrap elements into convenient Leaf-Tags.
 
 
 # Installation
 
-Add `Bootstrap` to the package dependencies (in your `Package.swift` file):
+Add `LeafBootstrap` to the package dependencies (in your `Package.swift` file):
 
 ```swift
-.package(url: "https://github.com/nodes-vapor/bootstrap.git", from: "1.0.0-beta")
+.package(url: "https://github.com/brokenhandsio/leaf-bootstrap.git", from: "1.0.0-beta")
 ```
 
 as well as to your target:
 
 ```swift
-.product(name: "Bootstrap", package: "bootstrap")
+.product(name: "LeafBootstrap", package: "leaf-bootstrap")
 ```
 
 ## Getting started 🚀
 
-First import Bootstrap and Leaf inside your `configure.swift`
+First import LeafBootstrap and Leaf inside your `configure.swift`
 
 ```swift
-import Bootstrap
+import LeafBootstrap
 import Leaf
 ```
 

Sources/Bootstrap/Extensions/Application+Bootstrap.swift renamed to Sources/LeafBootstrap/Extensions/Application+Bootstrap.swift

@@ -8,6 +8,7 @@ extension Application.Leaf {
         self.tags["bsButton"] = ButtonTag()
         self.tags["bsInput"] = InputTag()
         self.tags["bsFileInput"] = FormFileTag()
+        self.tags["bsFormCheckbox"] = FormCheckboxTag()
         self.tags["bsTextArea"] = TextAreaTag()
         self.tags["bsCheckbox"] = FormCheckboxTag()
     }

Sources/Bootstrap/Extensions/LeafContext+BodyParser.swift renamed to Sources/LeafBootstrap/Extensions/LeafContext+BodyParser.swift

@@ -14,4 +14,17 @@ extension LeafContext {
         .filter { !$0.isEmpty }
         .joined()
     }
+    
+    func getCustomTagBody() throws -> String {
+        try self.requireBody().compactMap { element in
+            guard case .custom(_) = element else {
+                return nil
+            }
+            return "#" + element.description
+                .replacingOccurrences(of: "\n", with: "")
+                .trimmingCharacters(in: .whitespaces)
+        }
+        .filter { !$0.isEmpty }
+        .joined()
+    }
 }