Merge pull request #46 from SwiftGen/feature/breaking/rename-stringto…

…swiftidentifier Rename (internal) stringToSwiftIdentifier
SwiftGen · May 27, 2017 · 12db7b1 · 12db7b1
2 parents 01f00e8 + ff17c5b
commit 12db7b1
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -30,6 +30,9 @@ Due to the removal of legacy code, there are a few breaking changes in this new
 * Refactored the `snakeToCamelCase` filter to now accept an (optional) boolean parameter to control the `noPrefix` behaviour.  
   [David Jennes](https://github.com/djbe)
   [#41](https://github.com/SwiftGen/StencilSwiftKit/pull/41)
+* Rename the `stringToSwiftIdentifier` function to `swiftIdentifier` to better match the other method names.  
+  [David Jennes](https://github.com/djbe)
+  [#46](https://github.com/SwiftGen/StencilSwiftKit/pull/46)
 
 ### New Features
 

diff --git a/Documentation/MigrationGuide.md b/Documentation/MigrationGuide.md
@@ -19,3 +19,7 @@ We've removed the following deprecated `typealias`es:
 * `ParametersError`: use `Parameters.Error` instead.
 * `NumFilters`: use `Filters.Numbers` instead.
 * `StringFilters`: use `Filters.Strings` instead.
+
+The following functions have been renamed:
+
+* `stringToSwiftIdentifier` renamed to `swiftIdentifier`.
diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Sources/Environment.swift b/Sources/Environment.swift
@@ -12,7 +12,7 @@ public extension Extension {
     registerTag("macro", parser: MacroNode.parse)
     registerTag("call", parser: CallNode.parse)
     registerTag("map", parser: MapNode.parse)
-    registerFilter("swiftIdentifier", filter: Filters.Strings.stringToSwiftIdentifier)
+    registerFilter("swiftIdentifier", filter: Filters.Strings.swiftIdentifier)
     registerFilter("lowerFirstWord", filter: Filters.Strings.lowerFirstWord)
     registerFilter("snakeToCamelCase", filter: Filters.Strings.snakeToCamelCase)
     registerFilter("camelToSnakeCase", filter: Filters.Strings.camelToSnakeCase)

diff --git a/Sources/Filters+Strings.swift b/Sources/Filters+Strings.swift
@@ -28,9 +28,9 @@ extension Filters {
       "right", "set", "Type", "unowned", "weak", "willSet"
     ]
 
-    static func stringToSwiftIdentifier(value: Any?) throws -> Any? {
+    static func swiftIdentifier(_ value: Any?) throws -> Any? {
       guard let value = value as? String else { throw Filters.Error.invalidInputType }
-      return swiftIdentifier(from: value, replaceWithUnderscores: true)
+      return StencilSwiftKit.swiftIdentifier(from: value, replaceWithUnderscores: true)
     }
 
     /* - If the string starts with only one uppercase letter, lowercase that first letter