swiftstencil/swiftpm-stencil
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(loader): Rename TemplateLoader to Loader

Browse Source
This commit is contained in:
Kyle Fuller
2016-11-28 18:25:38 +00:00
parent c59b263446
commit c99a40c5d9
4 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md
View File

@@ -4,11 +4,9 @@
### Breaking ### Breaking
- `TemplateLoader` is now a protocol with the file system based loader now - `TemplateLoader` has been renamed to `FileSystemLoader`. The
called `FileSystemLoader`. You will need to use `FileSystemLoader` instead. `loadTemplate(s)` methods are now throwing and now take labels for the `name`
and `names` arguments.
- `TemplateLoader` `loadTemplate` methods are now throwing and now take labels
for the `name` and `names` arguments.
- Many internal classes are no longer private. Some APIs were previously - Many internal classes are no longer private. Some APIs were previously
accessible due to earlier versions of Swift requiring the types to be public accessible due to earlier versions of Swift requiring the types to be public

2
Sources/Include.swift
View File

@@ -19,7 +19,7 @@ class IncludeNode : NodeType {
} }
func render(_ context: Context) throws -> String { func render(_ context: Context) throws -> String {
guard let loader = context["loader"] as? TemplateLoader else { guard let loader = context["loader"] as? Loader else {
throw TemplateSyntaxError("Template loader not in context") throw TemplateSyntaxError("Template loader not in context")
} }

2
Sources/Inheritence.swift
View File

@@ -59,7 +59,7 @@ class ExtendsNode : NodeType {
} }
func render(_ context: Context) throws -> String { func render(_ context: Context) throws -> String {
guard let loader = context["loader"] as? TemplateLoader else { guard let loader = context["loader"] as? Loader else {
throw TemplateSyntaxError("Template loader not in context") throw TemplateSyntaxError("Template loader not in context")
} }

6
Sources/TemplateLoader.swift
View File

@@ -2,13 +2,13 @@ import Foundation
import PathKit import PathKit
public protocol TemplateLoader { public protocol Loader {
func loadTemplate(name: String) throws -> Template? func loadTemplate(name: String) throws -> Template?
func loadTemplate(names: [String]) throws -> Template? func loadTemplate(names: [String]) throws -> Template?
} }
extension TemplateLoader { extension Loader {
func loadTemplate(names: [String]) throws -> Template? { func loadTemplate(names: [String]) throws -> Template? {
for name in names { for name in names {
let template = try loadTemplate(name: name) let template = try loadTemplate(name: name)
@@ -24,7 +24,7 @@ extension TemplateLoader {
// A class for loading a template from disk // A class for loading a template from disk
public class FileSystemLoader: TemplateLoader { public class FileSystemLoader: Loader {
public let paths: [Path] public let paths: [Path]
public init(paths: [Path]) { public init(paths: [Path]) {