Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Prepare v5.4.0

  • Loading branch information...
commit 3f5fceeb6ac58cef4c233515cc250a357c67bd8c 1 parent b6a39ab
@groue authored
View
4 AppledocSettings.plist
@@ -3,9 +3,9 @@
<plist version="1.0">
<dict>
<key>--project-name</key>
- <string>GRMustache 5.3</string>
+ <string>GRMustache 5.4</string>
<key>--project-version</key>
- <string>5.3</string>
+ <string>5.4</string>
<key>--project-company</key>
<string>Gwendal Roué</string>
<key>--create-html</key>
View
74 src/GRMustache.xcodeproj/project.pbxproj
@@ -51,12 +51,12 @@
564D9AAC15CA373800A32AA7 /* GRMustacheScopedExpression_private.h in Headers */ = {isa = PBXBuildFile; fileRef = 564D9AA915CA373700A32AA7 /* GRMustacheScopedExpression_private.h */; };
564D9AAD15CA373800A32AA7 /* GRMustacheScopedExpression.m in Sources */ = {isa = PBXBuildFile; fileRef = 564D9AAA15CA373800A32AA7 /* GRMustacheScopedExpression.m */; };
564D9AAE15CA373800A32AA7 /* GRMustacheScopedExpression.m in Sources */ = {isa = PBXBuildFile; fileRef = 564D9AAA15CA373800A32AA7 /* GRMustacheScopedExpression.m */; };
- 5660B6D7161417F0007F7FD5 /* GRMustacheTemplateRepositoryWithBaseURL_future_Test.m in Sources */ = {isa = PBXBuildFile; fileRef = 5660B6D5161417F0007F7FD5 /* GRMustacheTemplateRepositoryWithBaseURL_future_Test.m */; };
- 5660B6D8161417F0007F7FD5 /* GRMustacheTemplateRepositoryWithBaseURL_future_Test.m in Sources */ = {isa = PBXBuildFile; fileRef = 5660B6D5161417F0007F7FD5 /* GRMustacheTemplateRepositoryWithBaseURL_future_Test.m */; };
- 5660B6D9161417F0007F7FD5 /* GRMustacheTemplateRepositoryWithDirectory_future_Test.m in Sources */ = {isa = PBXBuildFile; fileRef = 5660B6D6161417F0007F7FD5 /* GRMustacheTemplateRepositoryWithDirectory_future_Test.m */; };
- 5660B6DA161417F0007F7FD5 /* GRMustacheTemplateRepositoryWithDirectory_future_Test.m in Sources */ = {isa = PBXBuildFile; fileRef = 5660B6D6161417F0007F7FD5 /* GRMustacheTemplateRepositoryWithDirectory_future_Test.m */; };
- 5660B6DC1614183B007F7FD5 /* GRMustacheTemplateRepository_future_Test in Resources */ = {isa = PBXBuildFile; fileRef = 5660B6DB1614183B007F7FD5 /* GRMustacheTemplateRepository_future_Test */; };
- 5660B6DD1614183B007F7FD5 /* GRMustacheTemplateRepository_future_Test in Resources */ = {isa = PBXBuildFile; fileRef = 5660B6DB1614183B007F7FD5 /* GRMustacheTemplateRepository_future_Test */; };
+ 5660B6D7161417F0007F7FD5 /* GRMustacheTemplateRepositoryWithBaseURLTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 5660B6D5161417F0007F7FD5 /* GRMustacheTemplateRepositoryWithBaseURLTest.m */; };
+ 5660B6D8161417F0007F7FD5 /* GRMustacheTemplateRepositoryWithBaseURLTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 5660B6D5161417F0007F7FD5 /* GRMustacheTemplateRepositoryWithBaseURLTest.m */; };
+ 5660B6D9161417F0007F7FD5 /* GRMustacheTemplateRepositoryWithDirectoryTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 5660B6D6161417F0007F7FD5 /* GRMustacheTemplateRepositoryWithDirectoryTest.m */; };
+ 5660B6DA161417F0007F7FD5 /* GRMustacheTemplateRepositoryWithDirectoryTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 5660B6D6161417F0007F7FD5 /* GRMustacheTemplateRepositoryWithDirectoryTest.m */; };
+ 5660B6DC1614183B007F7FD5 /* GRMustacheTemplateRepositoryTest in Resources */ = {isa = PBXBuildFile; fileRef = 5660B6DB1614183B007F7FD5 /* GRMustacheTemplateRepositoryTest */; };
+ 5660B6DD1614183B007F7FD5 /* GRMustacheTemplateRepositoryTest in Resources */ = {isa = PBXBuildFile; fileRef = 5660B6DB1614183B007F7FD5 /* GRMustacheTemplateRepositoryTest */; };
5664EBF416136F2400922B50 /* GRMustacheVariableTagHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 5664EBF216136F2300922B50 /* GRMustacheVariableTagHelper.h */; settings = {ATTRIBUTES = (Public, ); }; };
5664EBF516136F2400922B50 /* GRMustacheVariableTagHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 5664EBF216136F2300922B50 /* GRMustacheVariableTagHelper.h */; settings = {ATTRIBUTES = (Public, ); }; };
5664EBF616136F2400922B50 /* GRMustacheVariableTagHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 5664EBF316136F2300922B50 /* GRMustacheVariableTagHelper.m */; };
@@ -127,12 +127,12 @@
5682B4791528372000ADD123 /* GRMustacheTemplateRenderMethodsTest.mustache in Resources */ = {isa = PBXBuildFile; fileRef = 5682B4731528371F00ADD123 /* GRMustacheTemplateRenderMethodsTest.mustache */; };
5682B48B1528473200ADD123 /* GRMustacheTemplateRepositoryDataSourceTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 5682B4821528472900ADD123 /* GRMustacheTemplateRepositoryDataSourceTest.m */; };
5682B48C1528473200ADD123 /* GRMustacheTemplateRepositoryDataSourceTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 5682B4821528472900ADD123 /* GRMustacheTemplateRepositoryDataSourceTest.m */; };
- 5682B48D1528473200ADD123 /* GRMustacheTemplateRepositoryWithBaseURLTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 5682B4841528472A00ADD123 /* GRMustacheTemplateRepositoryWithBaseURLTest.m */; };
- 5682B48E1528473200ADD123 /* GRMustacheTemplateRepositoryWithBaseURLTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 5682B4841528472A00ADD123 /* GRMustacheTemplateRepositoryWithBaseURLTest.m */; };
+ 5682B48D1528473200ADD123 /* GRMustacheTemplateRepositoryWithBaseURL_5_0_Test.m in Sources */ = {isa = PBXBuildFile; fileRef = 5682B4841528472A00ADD123 /* GRMustacheTemplateRepositoryWithBaseURL_5_0_Test.m */; };
+ 5682B48E1528473200ADD123 /* GRMustacheTemplateRepositoryWithBaseURL_5_0_Test.m in Sources */ = {isa = PBXBuildFile; fileRef = 5682B4841528472A00ADD123 /* GRMustacheTemplateRepositoryWithBaseURL_5_0_Test.m */; };
5682B48F1528473200ADD123 /* GRMustacheTemplateRepositoryWithBundleTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 5682B4861528472C00ADD123 /* GRMustacheTemplateRepositoryWithBundleTest.m */; };
5682B4901528473200ADD123 /* GRMustacheTemplateRepositoryWithBundleTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 5682B4861528472C00ADD123 /* GRMustacheTemplateRepositoryWithBundleTest.m */; };
- 5682B4911528473200ADD123 /* GRMustacheTemplateRepositoryWithDirectoryTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 5682B4881528472E00ADD123 /* GRMustacheTemplateRepositoryWithDirectoryTest.m */; };
- 5682B4921528473200ADD123 /* GRMustacheTemplateRepositoryWithDirectoryTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 5682B4881528472E00ADD123 /* GRMustacheTemplateRepositoryWithDirectoryTest.m */; };
+ 5682B4911528473200ADD123 /* GRMustacheTemplateRepositoryWithDirectory_5_0_Test.m in Sources */ = {isa = PBXBuildFile; fileRef = 5682B4881528472E00ADD123 /* GRMustacheTemplateRepositoryWithDirectory_5_0_Test.m */; };
+ 5682B4921528473200ADD123 /* GRMustacheTemplateRepositoryWithDirectory_5_0_Test.m in Sources */ = {isa = PBXBuildFile; fileRef = 5682B4881528472E00ADD123 /* GRMustacheTemplateRepositoryWithDirectory_5_0_Test.m */; };
5682B4931528473200ADD123 /* GRMustacheTemplateRepositoryWithPartialsDictionaryTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 5682B48A1528472F00ADD123 /* GRMustacheTemplateRepositoryWithPartialsDictionaryTest.m */; };
5682B4941528473200ADD123 /* GRMustacheTemplateRepositoryWithPartialsDictionaryTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 5682B48A1528472F00ADD123 /* GRMustacheTemplateRepositoryWithPartialsDictionaryTest.m */; };
5682B4971528486C00ADD123 /* GRMustacheTemplateRepositoryTest_ISOLatin1 in Resources */ = {isa = PBXBuildFile; fileRef = 5682B4951528486900ADD123 /* GRMustacheTemplateRepositoryTest_ISOLatin1 */; };
@@ -336,9 +336,9 @@
564D9AA415CA36A200A32AA7 /* GRMustacheImplicitIteratorExpression.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GRMustacheImplicitIteratorExpression.m; sourceTree = "<group>"; };
564D9AA915CA373700A32AA7 /* GRMustacheScopedExpression_private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GRMustacheScopedExpression_private.h; sourceTree = "<group>"; };
564D9AAA15CA373800A32AA7 /* GRMustacheScopedExpression.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GRMustacheScopedExpression.m; sourceTree = "<group>"; };
- 5660B6D5161417F0007F7FD5 /* GRMustacheTemplateRepositoryWithBaseURL_future_Test.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GRMustacheTemplateRepositoryWithBaseURL_future_Test.m; sourceTree = "<group>"; };
- 5660B6D6161417F0007F7FD5 /* GRMustacheTemplateRepositoryWithDirectory_future_Test.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GRMustacheTemplateRepositoryWithDirectory_future_Test.m; sourceTree = "<group>"; };
- 5660B6DB1614183B007F7FD5 /* GRMustacheTemplateRepository_future_Test */ = {isa = PBXFileReference; lastKnownFileType = folder; path = GRMustacheTemplateRepository_future_Test; sourceTree = "<group>"; };
+ 5660B6D5161417F0007F7FD5 /* GRMustacheTemplateRepositoryWithBaseURLTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GRMustacheTemplateRepositoryWithBaseURLTest.m; sourceTree = "<group>"; };
+ 5660B6D6161417F0007F7FD5 /* GRMustacheTemplateRepositoryWithDirectoryTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GRMustacheTemplateRepositoryWithDirectoryTest.m; sourceTree = "<group>"; };
+ 5660B6DB1614183B007F7FD5 /* GRMustacheTemplateRepositoryTest */ = {isa = PBXFileReference; lastKnownFileType = folder; path = GRMustacheTemplateRepositoryTest; sourceTree = "<group>"; };
5662BA3E15A05268001FD2CA /* AppledocSettings.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = AppledocSettings.plist; path = ../AppledocSettings.plist; sourceTree = "<group>"; };
5664EBF216136F2300922B50 /* GRMustacheVariableTagHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GRMustacheVariableTagHelper.h; sourceTree = "<group>"; };
5664EBF316136F2300922B50 /* GRMustacheVariableTagHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GRMustacheVariableTagHelper.m; sourceTree = "<group>"; };
@@ -375,9 +375,9 @@
5682B4721528371F00ADD123 /* GRMustacheTemplateRenderMethodsTest.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = GRMustacheTemplateRenderMethodsTest.json; sourceTree = "<group>"; };
5682B4731528371F00ADD123 /* GRMustacheTemplateRenderMethodsTest.mustache */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = GRMustacheTemplateRenderMethodsTest.mustache; sourceTree = "<group>"; };
5682B4821528472900ADD123 /* GRMustacheTemplateRepositoryDataSourceTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GRMustacheTemplateRepositoryDataSourceTest.m; sourceTree = "<group>"; };
- 5682B4841528472A00ADD123 /* GRMustacheTemplateRepositoryWithBaseURLTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GRMustacheTemplateRepositoryWithBaseURLTest.m; sourceTree = "<group>"; };
+ 5682B4841528472A00ADD123 /* GRMustacheTemplateRepositoryWithBaseURL_5_0_Test.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GRMustacheTemplateRepositoryWithBaseURL_5_0_Test.m; sourceTree = "<group>"; };
5682B4861528472C00ADD123 /* GRMustacheTemplateRepositoryWithBundleTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GRMustacheTemplateRepositoryWithBundleTest.m; sourceTree = "<group>"; };
- 5682B4881528472E00ADD123 /* GRMustacheTemplateRepositoryWithDirectoryTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GRMustacheTemplateRepositoryWithDirectoryTest.m; sourceTree = "<group>"; };
+ 5682B4881528472E00ADD123 /* GRMustacheTemplateRepositoryWithDirectory_5_0_Test.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GRMustacheTemplateRepositoryWithDirectory_5_0_Test.m; sourceTree = "<group>"; };
5682B48A1528472F00ADD123 /* GRMustacheTemplateRepositoryWithPartialsDictionaryTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GRMustacheTemplateRepositoryWithPartialsDictionaryTest.m; sourceTree = "<group>"; };
5682B4951528486900ADD123 /* GRMustacheTemplateRepositoryTest_ISOLatin1 */ = {isa = PBXFileReference; lastKnownFileType = folder; path = GRMustacheTemplateRepositoryTest_ISOLatin1; sourceTree = "<group>"; };
5682B4961528486A00ADD123 /* GRMustacheTemplateRepositoryTest_UTF8 */ = {isa = PBXFileReference; lastKnownFileType = folder; path = GRMustacheTemplateRepositoryTest_UTF8; sourceTree = "<group>"; };
@@ -565,14 +565,22 @@
path = jrswizzle;
sourceTree = "<group>";
};
- 5660B6D31614178F007F7FD5 /* future */ = {
+ 5660B6D31614178F007F7FD5 /* v5.4 */ = {
isa = PBXGroup;
children = (
- 5660B6D5161417F0007F7FD5 /* GRMustacheTemplateRepositoryWithBaseURL_future_Test.m */,
- 5660B6D6161417F0007F7FD5 /* GRMustacheTemplateRepositoryWithDirectory_future_Test.m */,
- 5660B6DB1614183B007F7FD5 /* GRMustacheTemplateRepository_future_Test */,
+ 5660B6DE1616246A007F7FD5 /* GRMustacheTemplateRepositoryWithFileSystemTest */,
);
- path = future;
+ path = v5.4;
+ sourceTree = "<group>";
+ };
+ 5660B6DE1616246A007F7FD5 /* GRMustacheTemplateRepositoryWithFileSystemTest */ = {
+ isa = PBXGroup;
+ children = (
+ 5660B6D5161417F0007F7FD5 /* GRMustacheTemplateRepositoryWithBaseURLTest.m */,
+ 5660B6D6161417F0007F7FD5 /* GRMustacheTemplateRepositoryWithDirectoryTest.m */,
+ 5660B6DB1614183B007F7FD5 /* GRMustacheTemplateRepositoryTest */,
+ );
+ name = GRMustacheTemplateRepositoryWithFileSystemTest;
sourceTree = "<group>";
};
56683CCA16137F680035FD9C /* Deprecated */ = {
@@ -714,8 +722,8 @@
5682B4AF15284B8E00ADD123 /* GRMustacheTemplateRepositoryWithFileSystemTest */ = {
isa = PBXGroup;
children = (
- 5682B4841528472A00ADD123 /* GRMustacheTemplateRepositoryWithBaseURLTest.m */,
- 5682B4881528472E00ADD123 /* GRMustacheTemplateRepositoryWithDirectoryTest.m */,
+ 5682B4841528472A00ADD123 /* GRMustacheTemplateRepositoryWithBaseURL_5_0_Test.m */,
+ 5682B4881528472E00ADD123 /* GRMustacheTemplateRepositoryWithDirectory_5_0_Test.m */,
5682B4951528486900ADD123 /* GRMustacheTemplateRepositoryTest_ISOLatin1 */,
5682B4961528486A00ADD123 /* GRMustacheTemplateRepositoryTest_UTF8 */,
);
@@ -919,7 +927,7 @@
56EB54A9160D8146006A5F57 /* v5.1 */,
56EB54D3160EFAB0006A5F57 /* v5.2 */,
56683CFF161389070035FD9C /* v5.3 */,
- 5660B6D31614178F007F7FD5 /* future */,
+ 5660B6D31614178F007F7FD5 /* v5.4 */,
);
path = Public;
sourceTree = "<group>";
@@ -1214,7 +1222,7 @@
56EB54D8160EFED0006A5F57 /* GRMustacheSuites5_2 in Resources */,
56683D0B16138A2B0035FD9C /* GRMustacheTemplateDelegateTest_wrapper.mustache in Resources */,
56683D0D16138A2B0035FD9C /* GRMustacheTemplateDelegateTest.mustache in Resources */,
- 5660B6DC1614183B007F7FD5 /* GRMustacheTemplateRepository_future_Test in Resources */,
+ 5660B6DC1614183B007F7FD5 /* GRMustacheTemplateRepositoryTest in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1252,7 +1260,7 @@
56EB54D9160EFED0006A5F57 /* GRMustacheSuites5_2 in Resources */,
56683D0C16138A2B0035FD9C /* GRMustacheTemplateDelegateTest_wrapper.mustache in Resources */,
56683D0E16138A2B0035FD9C /* GRMustacheTemplateDelegateTest.mustache in Resources */,
- 5660B6DD1614183B007F7FD5 /* GRMustacheTemplateRepository_future_Test in Resources */,
+ 5660B6DD1614183B007F7FD5 /* GRMustacheTemplateRepositoryTest in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1347,9 +1355,9 @@
5682B46115282B8200ADD123 /* GRMustacheTemplateFromMethodsTest.m in Sources */,
5682B46C1528342D00ADD123 /* GRMustacheTemplateRenderMethodsTest.m in Sources */,
5682B48B1528473200ADD123 /* GRMustacheTemplateRepositoryDataSourceTest.m in Sources */,
- 5682B48D1528473200ADD123 /* GRMustacheTemplateRepositoryWithBaseURLTest.m in Sources */,
+ 5682B48D1528473200ADD123 /* GRMustacheTemplateRepositoryWithBaseURL_5_0_Test.m in Sources */,
5682B48F1528473200ADD123 /* GRMustacheTemplateRepositoryWithBundleTest.m in Sources */,
- 5682B4911528473200ADD123 /* GRMustacheTemplateRepositoryWithDirectoryTest.m in Sources */,
+ 5682B4911528473200ADD123 /* GRMustacheTemplateRepositoryWithDirectory_5_0_Test.m in Sources */,
5682B4931528473200ADD123 /* GRMustacheTemplateRepositoryWithPartialsDictionaryTest.m in Sources */,
56907F171604B5C50081BC2A /* GRMustacheFilterLibraryTest.m in Sources */,
56907F191604B5C50081BC2A /* GRMustacheFilterTest.m in Sources */,
@@ -1359,8 +1367,8 @@
56683D03161389070035FD9C /* GRMustacheSectionTagHelperTest.m in Sources */,
56683D05161389070035FD9C /* GRMustacheTemplateDelegateTest.m in Sources */,
56683D07161389070035FD9C /* GRMustacheVariableTagHelperTest.m in Sources */,
- 5660B6D7161417F0007F7FD5 /* GRMustacheTemplateRepositoryWithBaseURL_future_Test.m in Sources */,
- 5660B6D9161417F0007F7FD5 /* GRMustacheTemplateRepositoryWithDirectory_future_Test.m in Sources */,
+ 5660B6D7161417F0007F7FD5 /* GRMustacheTemplateRepositoryWithBaseURLTest.m in Sources */,
+ 5660B6D9161417F0007F7FD5 /* GRMustacheTemplateRepositoryWithDirectoryTest.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1423,9 +1431,9 @@
5682B46215282B8200ADD123 /* GRMustacheTemplateFromMethodsTest.m in Sources */,
5682B46D1528342D00ADD123 /* GRMustacheTemplateRenderMethodsTest.m in Sources */,
5682B48C1528473200ADD123 /* GRMustacheTemplateRepositoryDataSourceTest.m in Sources */,
- 5682B48E1528473200ADD123 /* GRMustacheTemplateRepositoryWithBaseURLTest.m in Sources */,
+ 5682B48E1528473200ADD123 /* GRMustacheTemplateRepositoryWithBaseURL_5_0_Test.m in Sources */,
5682B4901528473200ADD123 /* GRMustacheTemplateRepositoryWithBundleTest.m in Sources */,
- 5682B4921528473200ADD123 /* GRMustacheTemplateRepositoryWithDirectoryTest.m in Sources */,
+ 5682B4921528473200ADD123 /* GRMustacheTemplateRepositoryWithDirectory_5_0_Test.m in Sources */,
5682B4941528473200ADD123 /* GRMustacheTemplateRepositoryWithPartialsDictionaryTest.m in Sources */,
56907F181604B5C50081BC2A /* GRMustacheFilterLibraryTest.m in Sources */,
56907F1A1604B5C50081BC2A /* GRMustacheFilterTest.m in Sources */,
@@ -1435,8 +1443,8 @@
56683D04161389070035FD9C /* GRMustacheSectionTagHelperTest.m in Sources */,
56683D06161389070035FD9C /* GRMustacheTemplateDelegateTest.m in Sources */,
56683D08161389070035FD9C /* GRMustacheVariableTagHelperTest.m in Sources */,
- 5660B6D8161417F0007F7FD5 /* GRMustacheTemplateRepositoryWithBaseURL_future_Test.m in Sources */,
- 5660B6DA161417F0007F7FD5 /* GRMustacheTemplateRepositoryWithDirectory_future_Test.m in Sources */,
+ 5660B6D8161417F0007F7FD5 /* GRMustacheTemplateRepositoryWithBaseURLTest.m in Sources */,
+ 5660B6DA161417F0007F7FD5 /* GRMustacheTemplateRepositoryWithDirectoryTest.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
View
2  src/bin/buildGRMustacheAvailabilityMacros
@@ -1,7 +1,7 @@
#!/usr/bin/env ruby
MAJOR_VERSION = 5
-MAX_MINOR_VERSION = 3
+MAX_MINOR_VERSION = 4
puts <<-LICENSE
// The MIT License
View
94 src/classes/GRMustacheAvailabilityMacros.h
@@ -32,6 +32,7 @@
#define GRMUSTACHE_VERSION_5_1 5010
#define GRMUSTACHE_VERSION_5_2 5020
#define GRMUSTACHE_VERSION_5_3 5030
+#define GRMUSTACHE_VERSION_5_4 5040
@@ -39,10 +40,10 @@
/*
- * If max GRMustacheVersion not specified, assume 5.3
+ * If max GRMustacheVersion not specified, assume 5.4
*/
#ifndef GRMUSTACHE_VERSION_MAX_ALLOWED
-#define GRMUSTACHE_VERSION_MAX_ALLOWED GRMUSTACHE_VERSION_5_3
+#define GRMUSTACHE_VERSION_MAX_ALLOWED GRMUSTACHE_VERSION_5_4
#endif
/*
@@ -289,3 +290,92 @@
+/*
+ * AVAILABLE_GRMUSTACHE_VERSION_5_4_AND_LATER
+ *
+ * Used on declarations introduced in GRMustache 5.4
+ */
+#if GRMUSTACHE_VERSION_MAX_ALLOWED < GRMUSTACHE_VERSION_5_4
+#define AVAILABLE_GRMUSTACHE_VERSION_5_4_AND_LATER UNAVAILABLE_ATTRIBUTE
+#elif GRMUSTACHE_VERSION_MIN_REQUIRED < GRMUSTACHE_VERSION_5_4
+#define AVAILABLE_GRMUSTACHE_VERSION_5_4_AND_LATER WEAK_IMPORT_ATTRIBUTE
+#else
+#define AVAILABLE_GRMUSTACHE_VERSION_5_4_AND_LATER
+#endif
+
+/*
+ * AVAILABLE_GRMUSTACHE_VERSION_5_4_AND_LATER_BUT_DEPRECATED
+ *
+ * Used on declarations introduced in GRMustache 5.4,
+ * and deprecated in GRMustache 5.4
+ */
+#if GRMUSTACHE_VERSION_MIN_REQUIRED >= GRMUSTACHE_VERSION_5_4
+#define AVAILABLE_GRMUSTACHE_VERSION_5_4_AND_LATER_BUT_DEPRECATED DEPRECATED_ATTRIBUTE
+#else
+#define AVAILABLE_GRMUSTACHE_VERSION_5_4_AND_LATER_BUT_DEPRECATED AVAILABLE_GRMUSTACHE_VERSION_5_4_AND_LATER
+#endif
+
+/*
+ * AVAILABLE_GRMUSTACHE_VERSION_5_0_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_5_4
+ *
+ * Used on declarations introduced in GRMustache 5.0,
+ * but later deprecated in GRMustache 5.4
+ */
+#if GRMUSTACHE_VERSION_MIN_REQUIRED >= GRMUSTACHE_VERSION_5_4
+#define AVAILABLE_GRMUSTACHE_VERSION_5_0_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_5_4 DEPRECATED_ATTRIBUTE
+#else
+#define AVAILABLE_GRMUSTACHE_VERSION_5_0_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_5_4 AVAILABLE_GRMUSTACHE_VERSION_5_0_AND_LATER
+#endif
+
+/*
+ * AVAILABLE_GRMUSTACHE_VERSION_5_1_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_5_4
+ *
+ * Used on declarations introduced in GRMustache 5.1,
+ * but later deprecated in GRMustache 5.4
+ */
+#if GRMUSTACHE_VERSION_MIN_REQUIRED >= GRMUSTACHE_VERSION_5_4
+#define AVAILABLE_GRMUSTACHE_VERSION_5_1_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_5_4 DEPRECATED_ATTRIBUTE
+#else
+#define AVAILABLE_GRMUSTACHE_VERSION_5_1_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_5_4 AVAILABLE_GRMUSTACHE_VERSION_5_1_AND_LATER
+#endif
+
+/*
+ * AVAILABLE_GRMUSTACHE_VERSION_5_2_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_5_4
+ *
+ * Used on declarations introduced in GRMustache 5.2,
+ * but later deprecated in GRMustache 5.4
+ */
+#if GRMUSTACHE_VERSION_MIN_REQUIRED >= GRMUSTACHE_VERSION_5_4
+#define AVAILABLE_GRMUSTACHE_VERSION_5_2_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_5_4 DEPRECATED_ATTRIBUTE
+#else
+#define AVAILABLE_GRMUSTACHE_VERSION_5_2_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_5_4 AVAILABLE_GRMUSTACHE_VERSION_5_2_AND_LATER
+#endif
+
+/*
+ * AVAILABLE_GRMUSTACHE_VERSION_5_3_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_5_4
+ *
+ * Used on declarations introduced in GRMustache 5.3,
+ * but later deprecated in GRMustache 5.4
+ */
+#if GRMUSTACHE_VERSION_MIN_REQUIRED >= GRMUSTACHE_VERSION_5_4
+#define AVAILABLE_GRMUSTACHE_VERSION_5_3_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_5_4 DEPRECATED_ATTRIBUTE
+#else
+#define AVAILABLE_GRMUSTACHE_VERSION_5_3_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_5_4 AVAILABLE_GRMUSTACHE_VERSION_5_3_AND_LATER
+#endif
+
+/*
+ * DEPRECATED_IN_GRMUSTACHE_VERSION_5_4_AND_LATER
+ *
+ * Used on types deprecated in GRMustache 5.4
+ */
+#if GRMUSTACHE_VERSION_MIN_REQUIRED >= GRMUSTACHE_VERSION_5_4
+#define DEPRECATED_IN_GRMUSTACHE_VERSION_5_4_AND_LATER DEPRECATED_ATTRIBUTE
+#else
+#define DEPRECATED_IN_GRMUSTACHE_VERSION_5_4_AND_LATER
+#endif
+
+
+
+
+
+
View
21 src/classes/GRMustacheTemplateRepository.h
@@ -58,11 +58,11 @@
* For instance, a file-based data source may use NSString objects containing
* paths to the templates.
*
- * You should try to choose "human-readable" template IDs. That is because
- * template IDs are embedded in the description of errors that may happen during
- * a template processing, in order to help the library user locate, and fix, the
- * faulting template.
- *
+ * You should try to choose "human-readable" template IDs, because template IDs
+ * are embedded in the description of errors that may happen during a template
+ * processing, in order to help the library user locate, and fix, the faulting
+ * template.
+ *
* Whenever relevant, template and partial hierarchies are supported via the
* _baseTemplateID_ parameter: it contains the template ID of the enclosing
* template, or nil when the data source is asked for a template ID for a
@@ -71,11 +71,14 @@
*
* Not all data sources have to implement hierarchies: they can simply ignore
* this parameter.
- *
- * The returned value can be nil: the library user would then eventually get an
- * NSError of domain GRMustacheErrorDomain and code
+ *
+ * Data sources that implement hierarchies have to implement their own support
+ * for absolute partial paths.
+ *
+ * The return value of this method can be nil: the library user would then
+ * eventually get an NSError of domain GRMustacheErrorDomain and code
* GRMustacheErrorCodeTemplateNotFound.
- *
+ *
* @param templateRepository The GRMustacheTemplateRepository asking for a
* template ID.
* @param name The name of the template or template partial.
View
2  src/classes/GRMustacheVersion.h
@@ -33,7 +33,7 @@
*
* @since v1.0
*/
-#define GRMUSTACHE_MINOR_VERSION 3
+#define GRMUSTACHE_MINOR_VERSION 4
/**
* The patch-level component of GRMustache version
View
4 ...5.0/GRMustacheTemplateRepositoryWithBaseURLTest.m → ...RMustacheTemplateRepositoryWithBaseURL_5_0_Test.m
@@ -23,10 +23,10 @@
#define GRMUSTACHE_VERSION_MAX_ALLOWED GRMUSTACHE_VERSION_5_0
#import "GRMustachePublicAPITest.h"
-@interface GRMustacheTemplateRepositoryWithBaseURLTest : GRMustachePublicAPITest
+@interface GRMustacheTemplateRepositoryWithBaseURL_5_0_Test : GRMustachePublicAPITest
@end
-@implementation GRMustacheTemplateRepositoryWithBaseURLTest
+@implementation GRMustacheTemplateRepositoryWithBaseURL_5_0_Test
- (void)testTemplateRepositoryWithBaseURL
{
View
4 ...0/GRMustacheTemplateRepositoryWithDirectoryTest.m → ...ustacheTemplateRepositoryWithDirectory_5_0_Test.m
@@ -23,10 +23,10 @@
#define GRMUSTACHE_VERSION_MAX_ALLOWED GRMUSTACHE_VERSION_5_0
#import "GRMustachePublicAPITest.h"
-@interface GRMustacheTemplateRepositoryWithDirectoryTest : GRMustachePublicAPITest
+@interface GRMustacheTemplateRepositoryWithDirectory_5_0_Test : GRMustachePublicAPITest
@end
-@implementation GRMustacheTemplateRepositoryWithDirectoryTest
+@implementation GRMustacheTemplateRepositoryWithDirectory_5_0_Test
- (void)testTemplateRepositoryWithDirectory
{
View
0  ...tacheTemplateRepository_future_Test/base.mustache → ....4/GRMustacheTemplateRepositoryTest/base.mustache
File renamed without changes
View
0  ...Repository_future_Test/partials/partial1.mustache → ...TemplateRepositoryTest/partials/partial1.mustache
File renamed without changes
View
0  ...Repository_future_Test/partials/partial2.mustache → ...TemplateRepositoryTest/partials/partial2.mustache
File renamed without changes
View
8 ...stacheTemplateRepositoryWithBaseURL_future_Test.m → ...5.4/GRMustacheTemplateRepositoryWithBaseURLTest.m
@@ -20,17 +20,17 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-#define GRMUSTACHE_VERSION_MAX_ALLOWED GRMUSTACHE_VERSION_5_3
+#define GRMUSTACHE_VERSION_MAX_ALLOWED GRMUSTACHE_VERSION_5_4
#import "GRMustachePublicAPITest.h"
-@interface GRMustacheTemplateRepositoryWithBaseURL_future_Test : GRMustachePublicAPITest
+@interface GRMustacheTemplateRepositoryWithBaseURLTest : GRMustachePublicAPITest
@end
-@implementation GRMustacheTemplateRepositoryWithBaseURL_future_Test
+@implementation GRMustacheTemplateRepositoryWithBaseURLTest
- (void)testAbsolutePartialName
{
- NSURL *URL = [self.testBundle URLForResource:@"GRMustacheTemplateRepository_future_Test" withExtension:nil];
+ NSURL *URL = [self.testBundle URLForResource:@"GRMustacheTemplateRepositoryTest" withExtension:nil];
GRMustacheTemplateRepository *repository = [GRMustacheTemplateRepository templateRepositoryWithBaseURL:URL];
GRMustacheTemplate *template = [repository templateForName:@"base" error:NULL];
NSString *rendering = [template render];
View
8 ...acheTemplateRepositoryWithDirectory_future_Test.m → ...4/GRMustacheTemplateRepositoryWithDirectoryTest.m
@@ -20,17 +20,17 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-#define GRMUSTACHE_VERSION_MAX_ALLOWED GRMUSTACHE_VERSION_5_3
+#define GRMUSTACHE_VERSION_MAX_ALLOWED GRMUSTACHE_VERSION_5_4
#import "GRMustachePublicAPITest.h"
-@interface GRMustacheTemplateRepositoryWithDirectory_future_Test : GRMustachePublicAPITest
+@interface GRMustacheTemplateRepositoryWithDirectoryTest : GRMustachePublicAPITest
@end
-@implementation GRMustacheTemplateRepositoryWithDirectory_future_Test
+@implementation GRMustacheTemplateRepositoryWithDirectoryTest
- (void)testAbsolutePartialName
{
- NSString *directoryPath = [self.testBundle pathForResource:@"GRMustacheTemplateRepository_future_Test" ofType:nil];
+ NSString *directoryPath = [self.testBundle pathForResource:@"GRMustacheTemplateRepositoryTest" ofType:nil];
GRMustacheTemplateRepository *repository = [GRMustacheTemplateRepository templateRepositoryWithDirectory:directoryPath];
GRMustacheTemplate *template = [repository templateForName:@"base" error:NULL];
NSString *rendering = [template render];
Please sign in to comment.
Something went wrong with that request. Please try again.