Refactor stencil swift extensions registration for easier use with an existing Extension.

CHANGELOG.md

@@ -13,6 +13,9 @@
 * Renamed `SwiftTemplate` to `StencilSwiftTemplate`.  
   [David Jennes](https://github.com/djbe)
   [#14](https://github.com/SwiftGen/StencilSwiftKit/issues/14)
+* Refactor stencil swift extensions registration for easier use with an existing `Extension`.  
+  [David Jennes](https://github.com/djbe)
+  [#16](https://github.com/SwiftGen/StencilSwiftKit/issues/16)
 
 ## Before 5.0.0
 

Sources/Environment.swift

@@ -0,0 +1,32 @@
+//
+// StencilSwiftKit
+// Copyright (c) 2017 SwiftGen
+// MIT Licence
+//
+
+import Stencil
+
+public extension Extension {
+  public func registerStencilSwiftExtensions() {
+    registerTag("set", parser: SetNode.parse)
+    registerTag("macro", parser: MacroNode.parse)
+    registerTag("call", parser: CallNode.parse)
+    registerFilter("swiftIdentifier", filter: StringFilters.stringToSwiftIdentifier)
+    registerFilter("join", filter: ArrayFilters.join)
+    registerFilter("lowerFirstWord", filter: StringFilters.lowerFirstWord)
+    registerFilter("snakeToCamelCase", filter: StringFilters.snakeToCamelCase)
+    registerFilter("snakeToCamelCaseNoPrefix", filter: StringFilters.snakeToCamelCaseNoPrefix)
+    registerFilter("titlecase", filter: StringFilters.titlecase)
+    registerFilter("hexToInt", filter: NumFilters.hexToInt)
+    registerFilter("int255toFloat", filter: NumFilters.int255toFloat)
+    registerFilter("percent", filter: NumFilters.percent)
+    registerFilter("escapeReservedKeywords", filter: StringFilters.escapeReservedKeywords)
+  }
+}
+
+public func stencilSwiftEnvironment() -> Environment {
+  let ext = Extension()
+  ext.registerStencilSwiftExtensions()
+
+  return Environment(extensions: [ext], templateClass: StencilSwiftTemplate.self)
+}

Sources/StencilSwiftTemplate.swift

@@ -40,26 +40,3 @@ open class StencilSwiftTemplate: Template {
     return unmarkedNewlines
   }
 }
-
-// Create StencilSwiftKit-specific namespace including custom tags & filters
-func stencilSwiftExtension() -> Extension {
-  let namespace = Extension()
-  namespace.registerTag("set", parser: SetNode.parse)
-  namespace.registerTag("macro", parser: MacroNode.parse)
-  namespace.registerTag("call", parser: CallNode.parse)
-  namespace.registerFilter("swiftIdentifier", filter: StringFilters.stringToSwiftIdentifier)
-  namespace.registerFilter("join", filter: ArrayFilters.join)
-  namespace.registerFilter("lowerFirstWord", filter: StringFilters.lowerFirstWord)
-  namespace.registerFilter("snakeToCamelCase", filter: StringFilters.snakeToCamelCase)
-  namespace.registerFilter("snakeToCamelCaseNoPrefix", filter: StringFilters.snakeToCamelCaseNoPrefix)
-  namespace.registerFilter("titlecase", filter: StringFilters.titlecase)
-  namespace.registerFilter("hexToInt", filter: NumFilters.hexToInt)
-  namespace.registerFilter("int255toFloat", filter: NumFilters.int255toFloat)
-  namespace.registerFilter("percent", filter: NumFilters.percent)
-  namespace.registerFilter("escapeReservedKeywords", filter: StringFilters.escapeReservedKeywords)
-  return namespace
-}
-
-public func stencilSwiftEnvironment() -> Environment {
-  return Environment(extensions: [stencilSwiftExtension()], templateClass: StencilSwiftTemplate.self)
-}