Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Prepare 3.0.0

  • Loading branch information...
commit ad484845f59bbe9cf22a5c02cc2c160cb06db681 1 parent a480fa3
@groue authored
Showing with 128 additions and 127 deletions.
  1. +3 −3 src/GRMustache.xcodeproj/project.pbxproj
  2. +50 −49 src/bin/buildGRMustacheAvailabilityMacros
  3. +2 −2 src/classes/GRMustache.h
  4. +15 −15 src/classes/GRMustacheAvailabilityMacros.h
  5. +2 −2 src/classes/GRMustacheError.h
  6. +2 −2 src/classes/GRMustacheHelper.h
  7. +2 −2 src/classes/GRMustacheInvocation.h
  8. +3 −3 src/classes/GRMustacheSection.h
  9. +14 −14 src/classes/GRMustacheTemplate.h
  10. +4 −4 src/classes/GRMustacheTemplateDelegate.h
  11. +17 −17 src/classes/GRMustacheTemplateRepository.h
  12. +1 −1  src/classes/GRMustacheVersion.h
  13. +1 −1  src/tests/Public/{v2.0 → v3.0}/GRBooleanTest.h
  14. 0  src/tests/Public/{v2.0 → v3.0}/GRBooleanTest.m
  15. +1 −1  src/tests/Public/{v2.0 → v3.0}/GRMustacheHelperTest.h
  16. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheHelperTest.m
  17. +1 −1  src/tests/Public/{v2.0 → v3.0}/GRMustacheParsingErrorsTest.h
  18. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheParsingErrorsTest.m
  19. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheSuites/comments.json
  20. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheSuites/compound_keys.json
  21. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheSuites/delimiters.json
  22. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheSuites/encodings.json
  23. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheSuites/general.json
  24. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheSuites/implicit_iterator.json
  25. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheSuites/inverted_sections.json
  26. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheSuites/partials.json
  27. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheSuites/sections.json
  28. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheSuites/variables.json
  29. +1 −1  src/tests/Public/{v2.0 → v3.0}/GRMustacheSuitesTest.h
  30. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheSuitesTest.m
  31. +1 −1  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateDelegateTest.h
  32. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateDelegateTest.m
  33. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateDelegateTest.mustache
  34. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateDelegateTest_wrapper.mustache
  35. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateFromMethodsTest
  36. +1 −1  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateFromMethodsTest.h
  37. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateFromMethodsTest.json
  38. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateFromMethodsTest.m
  39. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateFromMethodsTest.mustache
  40. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateFromMethodsTest_parserError.mustache
  41. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateFromMethodsTest_parserErrorWrapper.mustache
  42. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateFromMethodsTest_tokenizerError.mustache
  43. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateFromMethodsTest_tokenizerErrorWrapper.mustache
  44. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRenderMethodsTest
  45. +1 −1  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRenderMethodsTest.h
  46. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRenderMethodsTest.json
  47. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRenderMethodsTest.m
  48. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRenderMethodsTest.mustache
  49. +1 −1  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryDataSourceTest.h
  50. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryDataSourceTest.m
  51. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryTest_ISOLatin1/dir/dir/file1
  52. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryTest_ISOLatin1/dir/dir/file1.mustache
  53. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryTest_ISOLatin1/dir/dir/file1.txt
  54. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryTest_ISOLatin1/dir/dir/file2
  55. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryTest_ISOLatin1/dir/dir/file2.mustache
  56. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryTest_ISOLatin1/dir/dir/file2.txt
  57. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryTest_ISOLatin1/dir/file1
  58. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryTest_ISOLatin1/dir/file1.mustache
  59. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryTest_ISOLatin1/dir/file1.txt
  60. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryTest_ISOLatin1/dir/file2
  61. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryTest_ISOLatin1/dir/file2.mustache
  62. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryTest_ISOLatin1/dir/file2.txt
  63. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryTest_ISOLatin1/file1
  64. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryTest_ISOLatin1/file1.mustache
  65. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryTest_ISOLatin1/file1.txt
  66. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryTest_ISOLatin1/file2
  67. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryTest_ISOLatin1/file2.mustache
  68. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryTest_ISOLatin1/file2.txt
  69. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryTest_UTF8/dir/dir/file1
  70. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryTest_UTF8/dir/dir/file1.mustache
  71. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryTest_UTF8/dir/dir/file1.txt
  72. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryTest_UTF8/dir/dir/file2
  73. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryTest_UTF8/dir/dir/file2.mustache
  74. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryTest_UTF8/dir/dir/file2.txt
  75. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryTest_UTF8/dir/file1
  76. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryTest_UTF8/dir/file1.mustache
  77. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryTest_UTF8/dir/file1.txt
  78. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryTest_UTF8/dir/file2
  79. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryTest_UTF8/dir/file2.mustache
  80. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryTest_UTF8/dir/file2.txt
  81. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryTest_UTF8/file1
  82. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryTest_UTF8/file1.mustache
  83. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryTest_UTF8/file1.txt
  84. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryTest_UTF8/file2
  85. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryTest_UTF8/file2.mustache
  86. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryTest_UTF8/file2.txt
  87. +1 −1  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryWithBaseURLTest.h
  88. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryWithBaseURLTest.m
  89. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryWithBundleTest
  90. +1 −1  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryWithBundleTest.h
  91. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryWithBundleTest.m
  92. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryWithBundleTest.mustache
  93. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryWithBundleTest.text
  94. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryWithBundleTest_partial
  95. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryWithBundleTest_partial.mustache
  96. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryWithBundleTest_partial.text
  97. +1 −1  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryWithDirectoryTest.h
  98. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryWithDirectoryTest.m
  99. +1 −1  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryWithPartialsDictionaryTest.h
  100. 0  src/tests/Public/{v2.0 → v3.0}/GRMustacheTemplateRepositoryWithPartialsDictionaryTest.m
  101. +1 −1  src/tests/Public/{v2.0 → v3.0}/GRSpecificationSuitesTest.h
  102. 0  src/tests/Public/{v2.0 → v3.0}/GRSpecificationSuitesTest.m
View
6 src/GRMustache.xcodeproj/project.pbxproj
@@ -723,12 +723,12 @@
children = (
56DEC3B1152638E20031E8DC /* GRMustachePublicAPITest.h */,
56DEC3B2152638E20031E8DC /* GRMustachePublicAPITest.m */,
- 56DEC3BD152639420031E8DC /* v2.0 */,
+ 56DEC3BD152639420031E8DC /* v3.0 */,
);
path = Public;
sourceTree = "<group>";
};
- 56DEC3BD152639420031E8DC /* v2.0 */ = {
+ 56DEC3BD152639420031E8DC /* v3.0 */ = {
isa = PBXGroup;
children = (
560CE88D1526EEF4004F935E /* GRBooleanTest.h */,
@@ -744,7 +744,7 @@
5682B49B1528487700ADD123 /* GRMustacheTemplateRepositoryTest */,
5682B47F1528399100ADD123 /* mustache/spec */,
);
- path = v2.0;
+ path = v3.0;
sourceTree = "<group>";
};
56DEC3C215263AC80031E8DC /* JSONKit */ = {
View
99 src/bin/buildGRMustacheAvailabilityMacros
@@ -1,5 +1,6 @@
#!/usr/bin/env ruby
+MAJOR_VERSION = 3
MAX_MINOR_VERSION = 0
puts <<-LICENSE
@@ -40,7 +41,7 @@ puts <<-VERSIONS
VERSIONS
(MAX_MINOR_VERSION+1).times do |minor_version|
- puts "#define GRMUSTACHE_VERSION_2_#{"%-2d"%minor_version} 2#{"%02d"%minor_version}0"
+ puts "#define GRMUSTACHE_VERSION_#{MAJOR_VERSION}_#{"%-2d"%minor_version} #{MAJOR_VERSION}#{"%02d"%minor_version}0"
end
puts #----------
@@ -52,10 +53,10 @@ puts #----------
puts <<-GRMUSTACHE_VERSION_MAX_ALLOWED
/*
- * If max GRMustacheVersion not specified, assume 2.#{MAX_MINOR_VERSION}
+ * If max GRMustacheVersion not specified, assume #{MAJOR_VERSION}.#{MAX_MINOR_VERSION}
*/
#ifndef GRMUSTACHE_VERSION_MAX_ALLOWED
-#define GRMUSTACHE_VERSION_MAX_ALLOWED GRMUSTACHE_VERSION_2_#{MAX_MINOR_VERSION}
+#define GRMUSTACHE_VERSION_MAX_ALLOWED GRMUSTACHE_VERSION_#{MAJOR_VERSION}_#{MAX_MINOR_VERSION}
#endif
GRMUSTACHE_VERSION_MAX_ALLOWED
@@ -79,8 +80,8 @@ puts <<-ERROR_ON_BAD_VALUES
#if GRMUSTACHE_VERSION_MAX_ALLOWED < GRMUSTACHE_VERSION_MIN_REQUIRED
#error GRMUSTACHE_VERSION_MAX_ALLOWED must be >= GRMUSTACHE_VERSION_MIN_REQUIRED
#endif
-#if GRMUSTACHE_VERSION_MIN_REQUIRED < GRMUSTACHE_VERSION_2_0
-#error GRMUSTACHE_VERSION_MIN_REQUIRED must be >= GRMUSTACHE_VERSION_2_0
+#if GRMUSTACHE_VERSION_MIN_REQUIRED < GRMUSTACHE_VERSION_#{MAJOR_VERSION}_0
+#error GRMUSTACHE_VERSION_MIN_REQUIRED must be >= GRMUSTACHE_VERSION_#{MAJOR_VERSION}_0
#endif
ERROR_ON_BAD_VALUES
@@ -91,29 +92,29 @@ puts #----------
puts #----------
puts #----------
-puts <<-GRMUSTACHE_VERSION_2_0
+puts <<-GRMUSTACHE_VERSION_X_0
/*
- * AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER
+ * AVAILABLE_GRMUSTACHE_VERSION_#{MAJOR_VERSION}_0_AND_LATER
*
- * Used on declarations introduced in GRMustache 2.0
+ * Used on declarations introduced in GRMustache #{MAJOR_VERSION}.0
*/
-#define AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER
+#define AVAILABLE_GRMUSTACHE_VERSION_#{MAJOR_VERSION}_0_AND_LATER
/*
- * AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER_BUT_DEPRECATED
+ * AVAILABLE_GRMUSTACHE_VERSION_#{MAJOR_VERSION}_0_AND_LATER_BUT_DEPRECATED
*
- * Used on declarations introduced in GRMustache 2.0,
- * and deprecated in GRMustache 2.0
+ * Used on declarations introduced in GRMustache #{MAJOR_VERSION}.0,
+ * and deprecated in GRMustache #{MAJOR_VERSION}.0
*/
-#define AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER_BUT_DEPRECATED DEPRECATED_ATTRIBUTE
+#define AVAILABLE_GRMUSTACHE_VERSION_#{MAJOR_VERSION}_0_AND_LATER_BUT_DEPRECATED DEPRECATED_ATTRIBUTE
/*
- * DEPRECATED_IN_GRMUSTACHE_VERSION_2_0_AND_LATER
+ * DEPRECATED_IN_GRMUSTACHE_VERSION_#{MAJOR_VERSION}_0_AND_LATER
*
- * Used on types deprecated in GRMustache 2.0
+ * Used on types deprecated in GRMustache #{MAJOR_VERSION}.0
*/
-#define DEPRECATED_IN_GRMUSTACHE_VERSION_2_0_AND_LATER DEPRECATED_ATTRIBUTE
-GRMUSTACHE_VERSION_2_0
+#define DEPRECATED_IN_GRMUSTACHE_VERSION_#{MAJOR_VERSION}_0_AND_LATER DEPRECATED_ATTRIBUTE
+GRMUSTACHE_VERSION_X_0
puts #----------
puts #----------
@@ -124,71 +125,71 @@ puts #----------
(1..MAX_MINOR_VERSION).each do |minor_version|
- puts <<-AVAILABLE_GRMUSTACHE_VERSION_2_x_AND_LATER
+ puts <<-AVAILABLE_GRMUSTACHE_VERSION_X_x_AND_LATER
/*
- * AVAILABLE_GRMUSTACHE_VERSION_2_#{minor_version}_AND_LATER
+ * AVAILABLE_GRMUSTACHE_VERSION_#{MAJOR_VERSION}_#{minor_version}_AND_LATER
*
- * Used on declarations introduced in GRMustache 2.#{minor_version}
+ * Used on declarations introduced in GRMustache #{MAJOR_VERSION}.#{minor_version}
*/
-#if GRMUSTACHE_VERSION_MAX_ALLOWED < GRMUSTACHE_VERSION_2_#{minor_version}
-#define AVAILABLE_GRMUSTACHE_VERSION_2_#{minor_version}_AND_LATER UNAVAILABLE_ATTRIBUTE
-#elif GRMUSTACHE_VERSION_MIN_REQUIRED < GRMUSTACHE_VERSION_2_#{minor_version}
-#define AVAILABLE_GRMUSTACHE_VERSION_2_#{minor_version}_AND_LATER WEAK_IMPORT_ATTRIBUTE
+#if GRMUSTACHE_VERSION_MAX_ALLOWED < GRMUSTACHE_VERSION_#{MAJOR_VERSION}_#{minor_version}
+#define AVAILABLE_GRMUSTACHE_VERSION_#{MAJOR_VERSION}_#{minor_version}_AND_LATER UNAVAILABLE_ATTRIBUTE
+#elif GRMUSTACHE_VERSION_MIN_REQUIRED < GRMUSTACHE_VERSION_#{MAJOR_VERSION}_#{minor_version}
+#define AVAILABLE_GRMUSTACHE_VERSION_#{MAJOR_VERSION}_#{minor_version}_AND_LATER WEAK_IMPORT_ATTRIBUTE
#else
-#define AVAILABLE_GRMUSTACHE_VERSION_2_#{minor_version}_AND_LATER
+#define AVAILABLE_GRMUSTACHE_VERSION_#{MAJOR_VERSION}_#{minor_version}_AND_LATER
#endif
-AVAILABLE_GRMUSTACHE_VERSION_2_x_AND_LATER
+AVAILABLE_GRMUSTACHE_VERSION_X_x_AND_LATER
puts #----------
- puts <<-AVAILABLE_GRMUSTACHE_VERSION_2_x_AND_LATER_BUT_DEPRECATED
+ puts <<-AVAILABLE_GRMUSTACHE_VERSION_X_x_AND_LATER_BUT_DEPRECATED
/*
- * AVAILABLE_GRMUSTACHE_VERSION_2_#{minor_version}_AND_LATER_BUT_DEPRECATED
+ * AVAILABLE_GRMUSTACHE_VERSION_#{MAJOR_VERSION}_#{minor_version}_AND_LATER_BUT_DEPRECATED
*
- * Used on declarations introduced in GRMustache 2.#{minor_version},
- * and deprecated in GRMustache 2.#{minor_version}
+ * Used on declarations introduced in GRMustache #{MAJOR_VERSION}.#{minor_version},
+ * and deprecated in GRMustache #{MAJOR_VERSION}.#{minor_version}
*/
-#if GRMUSTACHE_VERSION_MIN_REQUIRED >= GRMUSTACHE_VERSION_2_#{minor_version}
-#define AVAILABLE_GRMUSTACHE_VERSION_2_#{minor_version}_AND_LATER_BUT_DEPRECATED DEPRECATED_ATTRIBUTE
+#if GRMUSTACHE_VERSION_MIN_REQUIRED >= GRMUSTACHE_VERSION_#{MAJOR_VERSION}_#{minor_version}
+#define AVAILABLE_GRMUSTACHE_VERSION_#{MAJOR_VERSION}_#{minor_version}_AND_LATER_BUT_DEPRECATED DEPRECATED_ATTRIBUTE
#else
-#define AVAILABLE_GRMUSTACHE_VERSION_2_#{minor_version}_AND_LATER_BUT_DEPRECATED AVAILABLE_GRMUSTACHE_VERSION_2_#{minor_version}_AND_LATER
+#define AVAILABLE_GRMUSTACHE_VERSION_#{MAJOR_VERSION}_#{minor_version}_AND_LATER_BUT_DEPRECATED AVAILABLE_GRMUSTACHE_VERSION_#{MAJOR_VERSION}_#{minor_version}_AND_LATER
#endif
-AVAILABLE_GRMUSTACHE_VERSION_2_x_AND_LATER_BUT_DEPRECATED
+AVAILABLE_GRMUSTACHE_VERSION_X_x_AND_LATER_BUT_DEPRECATED
puts #----------
(0...minor_version).each do |previous_minor_version|
- puts <<-AVAILABLE_GRMUSTACHE_VERSION_2_y_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_2_x
+ puts <<-AVAILABLE_GRMUSTACHE_VERSION_X_y_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_X_x
/*
- * AVAILABLE_GRMUSTACHE_VERSION_2_#{previous_minor_version}_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_2_#{minor_version}
+ * AVAILABLE_GRMUSTACHE_VERSION_#{MAJOR_VERSION}_#{previous_minor_version}_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_#{MAJOR_VERSION}_#{minor_version}
*
- * Used on declarations introduced in GRMustache 2.#{previous_minor_version},
- * but later deprecated in GRMustache 2.#{minor_version}
+ * Used on declarations introduced in GRMustache #{MAJOR_VERSION}.#{previous_minor_version},
+ * but later deprecated in GRMustache #{MAJOR_VERSION}.#{minor_version}
*/
-#if GRMUSTACHE_VERSION_MIN_REQUIRED >= GRMUSTACHE_VERSION_2_#{minor_version}
-#define AVAILABLE_GRMUSTACHE_VERSION_2_#{previous_minor_version}_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_2_#{minor_version} DEPRECATED_ATTRIBUTE
+#if GRMUSTACHE_VERSION_MIN_REQUIRED >= GRMUSTACHE_VERSION_#{MAJOR_VERSION}_#{minor_version}
+#define AVAILABLE_GRMUSTACHE_VERSION_#{MAJOR_VERSION}_#{previous_minor_version}_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_#{MAJOR_VERSION}_#{minor_version} DEPRECATED_ATTRIBUTE
#else
-#define AVAILABLE_GRMUSTACHE_VERSION_2_#{previous_minor_version}_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_2_#{minor_version} AVAILABLE_GRMUSTACHE_VERSION_2_#{previous_minor_version}_AND_LATER
+#define AVAILABLE_GRMUSTACHE_VERSION_#{MAJOR_VERSION}_#{previous_minor_version}_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_#{MAJOR_VERSION}_#{minor_version} AVAILABLE_GRMUSTACHE_VERSION_#{MAJOR_VERSION}_#{previous_minor_version}_AND_LATER
#endif
-AVAILABLE_GRMUSTACHE_VERSION_2_y_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_2_x
+AVAILABLE_GRMUSTACHE_VERSION_X_y_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_X_x
puts #----------
end
- puts <<-DEPRECATED_IN_GRMUSTACHE_VERSION_2_x_AND_LATER
+ puts <<-DEPRECATED_IN_GRMUSTACHE_VERSION_X_x_AND_LATER
/*
- * DEPRECATED_IN_GRMUSTACHE_VERSION_2_#{minor_version}_AND_LATER
+ * DEPRECATED_IN_GRMUSTACHE_VERSION_#{MAJOR_VERSION}_#{minor_version}_AND_LATER
*
- * Used on types deprecated in GRMustache 2.#{minor_version}
+ * Used on types deprecated in GRMustache #{MAJOR_VERSION}.#{minor_version}
*/
-#if GRMUSTACHE_VERSION_MIN_REQUIRED >= GRMUSTACHE_VERSION_2_#{minor_version}
-#define DEPRECATED_IN_GRMUSTACHE_VERSION_2_#{minor_version}_AND_LATER DEPRECATED_ATTRIBUTE
+#if GRMUSTACHE_VERSION_MIN_REQUIRED >= GRMUSTACHE_VERSION_#{MAJOR_VERSION}_#{minor_version}
+#define DEPRECATED_IN_GRMUSTACHE_VERSION_#{MAJOR_VERSION}_#{minor_version}_AND_LATER DEPRECATED_ATTRIBUTE
#else
-#define DEPRECATED_IN_GRMUSTACHE_VERSION_2_#{minor_version}_AND_LATER
+#define DEPRECATED_IN_GRMUSTACHE_VERSION_#{MAJOR_VERSION}_#{minor_version}_AND_LATER
#endif
-DEPRECATED_IN_GRMUSTACHE_VERSION_2_x_AND_LATER
+DEPRECATED_IN_GRMUSTACHE_VERSION_X_x_AND_LATER
puts #----------
puts #----------
View
4 src/classes/GRMustache.h
@@ -52,7 +52,7 @@ typedef struct {
@return The version of GRMustache as a GRMustacheVersion struct.
@since v1.0
*/
-+ (GRMustacheVersion)version AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER;
++ (GRMustacheVersion)version AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER;
//////////////////////////////////////////////////////////////////////////////////////////
/// @name Preventing NSUndefinedKeyException when using GRMustache in Development configuration
@@ -75,7 +75,7 @@ typedef struct {
@since v1.7
*/
-+ (void)preventNSUndefinedKeyExceptionAttack AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER;
++ (void)preventNSUndefinedKeyExceptionAttack AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER;
@end
View
30 src/classes/GRMustacheAvailabilityMacros.h
@@ -28,7 +28,7 @@
/*
* Set up standard GRMustache versions
*/
-#define GRMUSTACHE_VERSION_2_0 2000
+#define GRMUSTACHE_VERSION_3_0 3000
@@ -36,10 +36,10 @@
/*
- * If max GRMustacheVersion not specified, assume 2.0
+ * If max GRMustacheVersion not specified, assume 3.0
*/
#ifndef GRMUSTACHE_VERSION_MAX_ALLOWED
-#define GRMUSTACHE_VERSION_MAX_ALLOWED GRMUSTACHE_VERSION_2_0
+#define GRMUSTACHE_VERSION_MAX_ALLOWED GRMUSTACHE_VERSION_3_0
#endif
/*
@@ -55,8 +55,8 @@
#if GRMUSTACHE_VERSION_MAX_ALLOWED < GRMUSTACHE_VERSION_MIN_REQUIRED
#error GRMUSTACHE_VERSION_MAX_ALLOWED must be >= GRMUSTACHE_VERSION_MIN_REQUIRED
#endif
-#if GRMUSTACHE_VERSION_MIN_REQUIRED < GRMUSTACHE_VERSION_2_0
-#error GRMUSTACHE_VERSION_MIN_REQUIRED must be >= GRMUSTACHE_VERSION_2_0
+#if GRMUSTACHE_VERSION_MIN_REQUIRED < GRMUSTACHE_VERSION_3_0
+#error GRMUSTACHE_VERSION_MIN_REQUIRED must be >= GRMUSTACHE_VERSION_3_0
#endif
@@ -65,26 +65,26 @@
/*
- * AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER
+ * AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER
*
- * Used on declarations introduced in GRMustache 2.0
+ * Used on declarations introduced in GRMustache 3.0
*/
-#define AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER
+#define AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER
/*
- * AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER_BUT_DEPRECATED
+ * AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER_BUT_DEPRECATED
*
- * Used on declarations introduced in GRMustache 2.0,
- * and deprecated in GRMustache 2.0
+ * Used on declarations introduced in GRMustache 3.0,
+ * and deprecated in GRMustache 3.0
*/
-#define AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER_BUT_DEPRECATED DEPRECATED_ATTRIBUTE
+#define AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER_BUT_DEPRECATED DEPRECATED_ATTRIBUTE
/*
- * DEPRECATED_IN_GRMUSTACHE_VERSION_2_0_AND_LATER
+ * DEPRECATED_IN_GRMUSTACHE_VERSION_3_0_AND_LATER
*
- * Used on types deprecated in GRMustache 2.0
+ * Used on types deprecated in GRMustache 3.0
*/
-#define DEPRECATED_IN_GRMUSTACHE_VERSION_2_0_AND_LATER DEPRECATED_ATTRIBUTE
+#define DEPRECATED_IN_GRMUSTACHE_VERSION_3_0_AND_LATER DEPRECATED_ATTRIBUTE
View
4 src/classes/GRMustacheError.h
@@ -29,7 +29,7 @@
@since v1.0
*/
-extern NSString* const GRMustacheErrorDomain AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER;
+extern NSString* const GRMustacheErrorDomain AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER;
/**
The codes of a GRMustache-generated NSError
@@ -50,6 +50,6 @@ typedef enum {
@since v1.0
*/
GRMustacheErrorCodeTemplateNotFound,
-} GRMustacheErrorCode AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER;
+} GRMustacheErrorCode AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER;
View
4 src/classes/GRMustacheHelper.h
@@ -31,7 +31,7 @@
@protocol GRMustacheHelper<NSObject>
@required
-- (NSString *)renderSection:(GRMustacheSection *)section AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER;
+- (NSString *)renderSection:(GRMustacheSection *)section AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER;
@end
@@ -41,7 +41,7 @@
#if NS_BLOCKS_AVAILABLE
@interface GRMustacheHelper: NSObject<GRMustacheHelper>
-+ (id)helperWithBlock:(NSString *(^)(GRMustacheSection* section))block AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER;
++ (id)helperWithBlock:(NSString *(^)(GRMustacheSection* section))block AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER;
@end
#endif /* if NS_BLOCKS_AVAILABLE */
View
4 src/classes/GRMustacheInvocation.h
@@ -28,6 +28,6 @@
id _returnValue;
id _token;
}
-@property (nonatomic, readonly) NSString *key AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER;
-@property (nonatomic, retain) id returnValue AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER;
+@property (nonatomic, readonly) NSString *key AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER;
+@property (nonatomic, retain) id returnValue AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER;
@end
View
6 src/classes/GRMustacheSection.h
@@ -47,7 +47,7 @@
@since v2.0
*/
-@property (nonatomic, readonly) id renderingContext AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER;
+@property (nonatomic, readonly) id renderingContext AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER;
@@ -61,7 +61,7 @@
@since v2.0
*/
-@property (nonatomic, readonly) NSString *innerTemplateString AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER;
+@property (nonatomic, readonly) NSString *innerTemplateString AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER;
//////////////////////////////////////////////////////////////////////////////////////////
@@ -75,6 +75,6 @@
@since v2.0
*/
-- (NSString *)render AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER;
+- (NSString *)render AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER;
@end
View
28 src/classes/GRMustacheTemplate.h
@@ -36,7 +36,7 @@
id<GRMustacheTemplateDelegate> _delegate;
}
-@property (nonatomic, assign) id<GRMustacheTemplateDelegate> delegate AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER;
+@property (nonatomic, assign) id<GRMustacheTemplateDelegate> delegate AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER;
//////////////////////////////////////////////////////////////////////////////////////////
@@ -54,7 +54,7 @@
@see [GRMustache defaultTemplateOptions]
@since v1.11
*/
-+ (id)templateFromString:(NSString *)templateString error:(NSError **)outError AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER;
++ (id)templateFromString:(NSString *)templateString error:(NSError **)outError AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER;
/**
Renders a context object from a template string.
@@ -66,7 +66,7 @@
@since v1.0
*/
-+ (NSString *)renderObject:(id)object fromString:(NSString *)templateString error:(NSError **)outError AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER;
++ (NSString *)renderObject:(id)object fromString:(NSString *)templateString error:(NSError **)outError AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER;
//////////////////////////////////////////////////////////////////////////////////////////
@@ -84,7 +84,7 @@
@since v1.11
*/
-+ (id)templateFromContentsOfFile:(NSString *)path error:(NSError **)outError AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER;
++ (id)templateFromContentsOfFile:(NSString *)path error:(NSError **)outError AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER;
#if !TARGET_OS_IPHONE || __IPHONE_OS_VERSION_MAX_ALLOWED >= 40000
@@ -99,7 +99,7 @@
@since v1.11
*/
-+ (id)templateFromContentsOfURL:(NSURL *)url error:(NSError **)outError AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER;
++ (id)templateFromContentsOfURL:(NSURL *)url error:(NSError **)outError AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER;
#endif /* if !TARGET_OS_IPHONE || __IPHONE_OS_VERSION_MAX_ALLOWED >= 40000 */
@@ -115,7 +115,7 @@
@since v1.4
*/
-+ (NSString *)renderObject:(id)object fromContentsOfFile:(NSString *)path error:(NSError **)outError AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER;
++ (NSString *)renderObject:(id)object fromContentsOfFile:(NSString *)path error:(NSError **)outError AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER;
#if !TARGET_OS_IPHONE || __IPHONE_OS_VERSION_MAX_ALLOWED >= 40000
@@ -132,7 +132,7 @@
@since v1.0
*/
-+ (NSString *)renderObject:(id)object fromContentsOfURL:(NSURL *)url error:(NSError **)outError AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER;
++ (NSString *)renderObject:(id)object fromContentsOfURL:(NSURL *)url error:(NSError **)outError AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER;
#endif /* if !TARGET_OS_IPHONE || __IPHONE_OS_VERSION_MAX_ALLOWED >= 40000 */
@@ -155,7 +155,7 @@
@since v1.11
*/
-+ (id)templateFromResource:(NSString *)name bundle:(NSBundle *)bundle error:(NSError **)outError AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER;
++ (id)templateFromResource:(NSString *)name bundle:(NSBundle *)bundle error:(NSError **)outError AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER;
/**
Parses a bundle resource template, and returns a compiled template.
@@ -172,7 +172,7 @@
@since v1.11
*/
-+ (id)templateFromResource:(NSString *)name withExtension:(NSString *)ext bundle:(NSBundle *)bundle error:(NSError **)outError AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER;
++ (id)templateFromResource:(NSString *)name withExtension:(NSString *)ext bundle:(NSBundle *)bundle error:(NSError **)outError AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER;
/**
@@ -190,7 +190,7 @@
@since v1.0
*/
-+ (NSString *)renderObject:(id)object fromResource:(NSString *)name bundle:(NSBundle *)bundle error:(NSError **)outError AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER;
++ (NSString *)renderObject:(id)object fromResource:(NSString *)name bundle:(NSBundle *)bundle error:(NSError **)outError AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER;
/**
Renders a context object from a bundle resource template.
@@ -208,7 +208,7 @@
@since v1.0
*/
-+ (NSString *)renderObject:(id)object fromResource:(NSString *)name withExtension:(NSString *)ext bundle:(NSBundle *)bundle error:(NSError **)outError AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER;
++ (NSString *)renderObject:(id)object fromResource:(NSString *)name withExtension:(NSString *)ext bundle:(NSBundle *)bundle error:(NSError **)outError AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER;
//////////////////////////////////////////////////////////////////////////////////////////
@@ -223,7 +223,7 @@
@since v1.0
*/
-- (NSString *)renderObject:(id)object AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER;
+- (NSString *)renderObject:(id)object AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER;
/**
Renders a template with context objects.
@@ -233,7 +233,7 @@
@since v1.5
*/
-- (NSString *)renderObjects:(id)object, ... __attribute__ ((sentinel)) AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER;
+- (NSString *)renderObjects:(id)object, ... __attribute__ ((sentinel)) AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER;
/**
Renders a template without any context object for interpreting Mustache tags.
@@ -242,6 +242,6 @@
@since v1.0
*/
-- (NSString *)render AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER;
+- (NSString *)render AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER;
@end
View
8 src/classes/GRMustacheTemplateDelegate.h
@@ -28,8 +28,8 @@
@protocol GRMustacheTemplateDelegate<NSObject>
@optional
-- (void)templateWillRender:(GRMustacheTemplate *)template AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER;
-- (void)templateDidRender:(GRMustacheTemplate *)template AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER;
-- (void)template:(GRMustacheTemplate *)template willRenderReturnValueOfInvocation:(GRMustacheInvocation *)invocation AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER;
-- (void)template:(GRMustacheTemplate *)template didRenderReturnValueOfInvocation:(GRMustacheInvocation *)invocation AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER;
+- (void)templateWillRender:(GRMustacheTemplate *)template AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER;
+- (void)templateDidRender:(GRMustacheTemplate *)template AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER;
+- (void)template:(GRMustacheTemplate *)template willRenderReturnValueOfInvocation:(GRMustacheInvocation *)invocation AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER;
+- (void)template:(GRMustacheTemplate *)template didRenderReturnValueOfInvocation:(GRMustacheInvocation *)invocation AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER;
@end
View
34 src/classes/GRMustacheTemplateRepository.h
@@ -29,8 +29,8 @@
@protocol GRMustacheTemplateRepositoryDataSource <NSObject>
@required
-- (id)templateRepository:(GRMustacheTemplateRepository *)templateRepository templateIDForName:(NSString *)name relativeToTemplateID:(id)templateID AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER;
-- (NSString *)templateRepository:(GRMustacheTemplateRepository *)templateRepository templateStringForTemplateID:(id)templateID error:(NSError **)outError AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER;
+- (id)templateRepository:(GRMustacheTemplateRepository *)templateRepository templateIDForName:(NSString *)name relativeToTemplateID:(id)templateID AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER;
+- (NSString *)templateRepository:(GRMustacheTemplateRepository *)templateRepository templateStringForTemplateID:(id)templateID error:(NSError **)outError AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER;
@end
@interface GRMustacheTemplateRepository : NSObject {
@@ -39,27 +39,27 @@
NSMutableDictionary *_templateForTemplateID;
id _currentlyParsedTemplateID;
}
-@property (nonatomic, assign) id<GRMustacheTemplateRepositoryDataSource> dataSource AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER;
+@property (nonatomic, assign) id<GRMustacheTemplateRepositoryDataSource> dataSource AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER;
#if !TARGET_OS_IPHONE || __IPHONE_OS_VERSION_MAX_ALLOWED >= 40000
-+ (id)templateRepositoryWithBaseURL:(NSURL *)URL AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER;
-+ (id)templateRepositoryWithBaseURL:(NSURL *)URL templateExtension:(NSString *)ext AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER;
-+ (id)templateRepositoryWithBaseURL:(NSURL *)URL templateExtension:(NSString *)ext AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER;
-+ (id)templateRepositoryWithBaseURL:(NSURL *)URL templateExtension:(NSString *)ext encoding:(NSStringEncoding)encoding AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER;
++ (id)templateRepositoryWithBaseURL:(NSURL *)URL AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER;
++ (id)templateRepositoryWithBaseURL:(NSURL *)URL templateExtension:(NSString *)ext AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER;
++ (id)templateRepositoryWithBaseURL:(NSURL *)URL templateExtension:(NSString *)ext AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER;
++ (id)templateRepositoryWithBaseURL:(NSURL *)URL templateExtension:(NSString *)ext encoding:(NSStringEncoding)encoding AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER;
#endif /* if !TARGET_OS_IPHONE || __IPHONE_OS_VERSION_MAX_ALLOWED >= 40000 */
-+ (id)templateRepositoryWithDirectory:(NSString *)path AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER;
-+ (id)templateRepositoryWithDirectory:(NSString *)path templateExtension:(NSString *)ext AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER;
-+ (id)templateRepositoryWithDirectory:(NSString *)path templateExtension:(NSString *)ext encoding:(NSStringEncoding)encoding AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER;
++ (id)templateRepositoryWithDirectory:(NSString *)path AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER;
++ (id)templateRepositoryWithDirectory:(NSString *)path templateExtension:(NSString *)ext AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER;
++ (id)templateRepositoryWithDirectory:(NSString *)path templateExtension:(NSString *)ext encoding:(NSStringEncoding)encoding AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER;
-+ (id)templateRepositoryWithBundle:(NSBundle *)bundle AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER;
-+ (id)templateRepositoryWithBundle:(NSBundle *)bundle templateExtension:(NSString *)ext AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER;
-+ (id)templateRepositoryWithBundle:(NSBundle *)bundle templateExtension:(NSString *)ext encoding:(NSStringEncoding)encoding AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER;
++ (id)templateRepositoryWithBundle:(NSBundle *)bundle AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER;
++ (id)templateRepositoryWithBundle:(NSBundle *)bundle templateExtension:(NSString *)ext AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER;
++ (id)templateRepositoryWithBundle:(NSBundle *)bundle templateExtension:(NSString *)ext encoding:(NSStringEncoding)encoding AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER;
-+ (id)templateRepositoryWithPartialsDictionary:(NSDictionary *)partialsDictionary AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER;
++ (id)templateRepositoryWithPartialsDictionary:(NSDictionary *)partialsDictionary AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER;
-+ (id)templateRepository AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER;
++ (id)templateRepository AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER;
-- (GRMustacheTemplate *)templateForName:(NSString *)name error:(NSError **)outError AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER;
-- (GRMustacheTemplate *)templateFromString:(NSString *)templateString error:(NSError **)outError AVAILABLE_GRMUSTACHE_VERSION_2_0_AND_LATER;
+- (GRMustacheTemplate *)templateForName:(NSString *)name error:(NSError **)outError AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER;
+- (GRMustacheTemplate *)templateFromString:(NSString *)templateString error:(NSError **)outError AVAILABLE_GRMUSTACHE_VERSION_3_0_AND_LATER;
@end
View
2  src/classes/GRMustacheVersion.h
@@ -26,7 +26,7 @@
@since v1.0
*/
-#define GRMUSTACHE_MAJOR_VERSION 2
+#define GRMUSTACHE_MAJOR_VERSION 3
/**
The minor component of GRMustache version
View
2  src/tests/Public/v2.0/GRBooleanTest.h → src/tests/Public/v3.0/GRBooleanTest.h
@@ -20,7 +20,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-#define GRMUSTACHE_VERSION_MAX_ALLOWED GRMUSTACHE_VERSION_2_0
+#define GRMUSTACHE_VERSION_MAX_ALLOWED GRMUSTACHE_VERSION_3_0
#import "GRMustachePublicAPITest.h"
@interface GRBooleanTest : GRMustachePublicAPITest
View
0  src/tests/Public/v2.0/GRBooleanTest.m → src/tests/Public/v3.0/GRBooleanTest.m
File renamed without changes
View
2  src/tests/Public/v2.0/GRMustacheHelperTest.h → src/tests/Public/v3.0/GRMustacheHelperTest.h
@@ -20,7 +20,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-#define GRMUSTACHE_VERSION_MAX_ALLOWED GRMUSTACHE_VERSION_2_0
+#define GRMUSTACHE_VERSION_MAX_ALLOWED GRMUSTACHE_VERSION_3_0
#import "GRMustachePublicAPITest.h"
@interface GRMustacheHelperTest : GRMustachePublicAPITest
View
0  src/tests/Public/v2.0/GRMustacheHelperTest.m → src/tests/Public/v3.0/GRMustacheHelperTest.m
File renamed without changes
View
2  ...Public/v2.0/GRMustacheParsingErrorsTest.h → ...Public/v3.0/GRMustacheParsingErrorsTest.h
@@ -20,7 +20,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-#define GRMUSTACHE_VERSION_MAX_ALLOWED GRMUSTACHE_VERSION_2_0
+#define GRMUSTACHE_VERSION_MAX_ALLOWED GRMUSTACHE_VERSION_3_0
#import "GRMustachePublicAPITest.h"
@interface GRMustacheParsingErrorsTest : GRMustachePublicAPITest
View
0  ...Public/v2.0/GRMustacheParsingErrorsTest.m → ...Public/v3.0/GRMustacheParsingErrorsTest.m
File renamed without changes
View
0  ...ublic/v2.0/GRMustacheSuites/comments.json → ...ublic/v3.0/GRMustacheSuites/comments.json
File renamed without changes
View
0  .../v2.0/GRMustacheSuites/compound_keys.json → .../v3.0/GRMustacheSuites/compound_keys.json
File renamed without changes
View
0  ...lic/v2.0/GRMustacheSuites/delimiters.json → ...lic/v3.0/GRMustacheSuites/delimiters.json
File renamed without changes
View
0  ...blic/v2.0/GRMustacheSuites/encodings.json → ...blic/v3.0/GRMustacheSuites/encodings.json
File renamed without changes
View
0  ...Public/v2.0/GRMustacheSuites/general.json → ...Public/v3.0/GRMustacheSuites/general.json
File renamed without changes
View
0  ...0/GRMustacheSuites/implicit_iterator.json → ...0/GRMustacheSuites/implicit_iterator.json
File renamed without changes
View
0  ...0/GRMustacheSuites/inverted_sections.json → ...0/GRMustacheSuites/inverted_sections.json
File renamed without changes
View
0  ...ublic/v2.0/GRMustacheSuites/partials.json → ...ublic/v3.0/GRMustacheSuites/partials.json
File renamed without changes
View
0  ...ublic/v2.0/GRMustacheSuites/sections.json → ...ublic/v3.0/GRMustacheSuites/sections.json
File renamed without changes
View
0  ...blic/v2.0/GRMustacheSuites/variables.json → ...blic/v3.0/GRMustacheSuites/variables.json
File renamed without changes
View
2  src/tests/Public/v2.0/GRMustacheSuitesTest.h → src/tests/Public/v3.0/GRMustacheSuitesTest.h
@@ -20,7 +20,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-#define GRMUSTACHE_VERSION_MAX_ALLOWED GRMUSTACHE_VERSION_2_0
+#define GRMUSTACHE_VERSION_MAX_ALLOWED GRMUSTACHE_VERSION_3_0
#import "GRMustachePublicAPITest.h"
@interface GRMustacheSuitesTest : GRMustachePublicAPITest
View
0  src/tests/Public/v2.0/GRMustacheSuitesTest.m → src/tests/Public/v3.0/GRMustacheSuitesTest.m
File renamed without changes
View
2  ...lic/v2.0/GRMustacheTemplateDelegateTest.h → ...lic/v3.0/GRMustacheTemplateDelegateTest.h
@@ -20,7 +20,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-#define GRMUSTACHE_VERSION_MAX_ALLOWED GRMUSTACHE_VERSION_2_0
+#define GRMUSTACHE_VERSION_MAX_ALLOWED GRMUSTACHE_VERSION_3_0
#import "GRMustachePublicAPITest.h"
@interface GRMustacheTemplateDelegateTest : GRMustachePublicAPITest
View
0  ...lic/v2.0/GRMustacheTemplateDelegateTest.m → ...lic/v3.0/GRMustacheTemplateDelegateTest.m
File renamed without changes
View
0  ...0/GRMustacheTemplateDelegateTest.mustache → ...0/GRMustacheTemplateDelegateTest.mustache
File renamed without changes
View
0  ...acheTemplateDelegateTest_wrapper.mustache → ...acheTemplateDelegateTest_wrapper.mustache
File renamed without changes
View
0  ...ic/v2.0/GRMustacheTemplateFromMethodsTest → ...ic/v3.0/GRMustacheTemplateFromMethodsTest
File renamed without changes
View
2  .../v2.0/GRMustacheTemplateFromMethodsTest.h → .../v3.0/GRMustacheTemplateFromMethodsTest.h
@@ -20,7 +20,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-#define GRMUSTACHE_VERSION_MAX_ALLOWED GRMUSTACHE_VERSION_2_0
+#define GRMUSTACHE_VERSION_MAX_ALLOWED GRMUSTACHE_VERSION_3_0
#import "GRMustachePublicAPITest.h"
@interface GRMustacheTemplateFromMethodsTest : GRMustachePublicAPITest
View
0  ....0/GRMustacheTemplateFromMethodsTest.json → ....0/GRMustacheTemplateFromMethodsTest.json
File renamed without changes
View
0  .../v2.0/GRMustacheTemplateFromMethodsTest.m → .../v3.0/GRMustacheTemplateFromMethodsTest.m
File renamed without changes
View
0  ...RMustacheTemplateFromMethodsTest.mustache → ...RMustacheTemplateFromMethodsTest.mustache
File renamed without changes
View
0  ...plateFromMethodsTest_parserError.mustache → ...plateFromMethodsTest_parserError.mustache
File renamed without changes
View
0  ...omMethodsTest_parserErrorWrapper.mustache → ...omMethodsTest_parserErrorWrapper.mustache
File renamed without changes
View
0  ...teFromMethodsTest_tokenizerError.mustache → ...teFromMethodsTest_tokenizerError.mustache
File renamed without changes
View
0  ...ethodsTest_tokenizerErrorWrapper.mustache → ...ethodsTest_tokenizerErrorWrapper.mustache
File renamed without changes
View
0  .../v2.0/GRMustacheTemplateRenderMethodsTest → .../v3.0/GRMustacheTemplateRenderMethodsTest
File renamed without changes
View
2  ...2.0/GRMustacheTemplateRenderMethodsTest.h → ...3.0/GRMustacheTemplateRenderMethodsTest.h
@@ -20,7 +20,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-#define GRMUSTACHE_VERSION_MAX_ALLOWED GRMUSTACHE_VERSION_2_0
+#define GRMUSTACHE_VERSION_MAX_ALLOWED GRMUSTACHE_VERSION_3_0
#import "GRMustachePublicAPITest.h"
@interface GRMustacheTemplateRenderMethodsTest : GRMustachePublicAPITest
View
0  .../GRMustacheTemplateRenderMethodsTest.json → .../GRMustacheTemplateRenderMethodsTest.json
File renamed without changes
View
0  ...2.0/GRMustacheTemplateRenderMethodsTest.m → ...3.0/GRMustacheTemplateRenderMethodsTest.m
File renamed without changes
View
0  ...ustacheTemplateRenderMethodsTest.mustache → ...ustacheTemplateRenderMethodsTest.mustache
File renamed without changes
View
2  ...ustacheTemplateRepositoryDataSourceTest.h → ...ustacheTemplateRepositoryDataSourceTest.h
@@ -20,7 +20,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-#define GRMUSTACHE_VERSION_MAX_ALLOWED GRMUSTACHE_VERSION_2_0
+#define GRMUSTACHE_VERSION_MAX_ALLOWED GRMUSTACHE_VERSION_3_0
#import "GRMustachePublicAPITest.h"
@interface GRMustacheTemplateRepositoryDataSourceTest : GRMustachePublicAPITest
View
0  ...ustacheTemplateRepositoryDataSourceTest.m → ...ustacheTemplateRepositoryDataSourceTest.m
File renamed without changes
View
0  ...ateRepositoryTest_ISOLatin1/dir/dir/file1 → ...ateRepositoryTest_ISOLatin1/dir/dir/file1
File renamed without changes
View
0  ...toryTest_ISOLatin1/dir/dir/file1.mustache → ...toryTest_ISOLatin1/dir/dir/file1.mustache
File renamed without changes
View
0  ...epositoryTest_ISOLatin1/dir/dir/file1.txt → ...epositoryTest_ISOLatin1/dir/dir/file1.txt
File renamed without changes
View
0  ...ateRepositoryTest_ISOLatin1/dir/dir/file2 → ...ateRepositoryTest_ISOLatin1/dir/dir/file2
File renamed without changes
View
0  ...toryTest_ISOLatin1/dir/dir/file2.mustache → ...toryTest_ISOLatin1/dir/dir/file2.mustache
File renamed without changes
View
0  ...epositoryTest_ISOLatin1/dir/dir/file2.txt → ...epositoryTest_ISOLatin1/dir/dir/file2.txt
File renamed without changes
View
0  ...emplateRepositoryTest_ISOLatin1/dir/file1 → ...emplateRepositoryTest_ISOLatin1/dir/file1
File renamed without changes
View
0  ...positoryTest_ISOLatin1/dir/file1.mustache → ...positoryTest_ISOLatin1/dir/file1.mustache
File renamed without changes
View
0  ...ateRepositoryTest_ISOLatin1/dir/file1.txt → ...ateRepositoryTest_ISOLatin1/dir/file1.txt
File renamed without changes
View
0  ...emplateRepositoryTest_ISOLatin1/dir/file2 → ...emplateRepositoryTest_ISOLatin1/dir/file2
File renamed without changes
View
0  ...positoryTest_ISOLatin1/dir/file2.mustache → ...positoryTest_ISOLatin1/dir/file2.mustache
File renamed without changes
View
0  ...ateRepositoryTest_ISOLatin1/dir/file2.txt → ...ateRepositoryTest_ISOLatin1/dir/file2.txt
File renamed without changes
View
0  ...cheTemplateRepositoryTest_ISOLatin1/file1 → ...cheTemplateRepositoryTest_ISOLatin1/file1
File renamed without changes
View
0  ...teRepositoryTest_ISOLatin1/file1.mustache → ...teRepositoryTest_ISOLatin1/file1.mustache
File renamed without changes
View
0  ...emplateRepositoryTest_ISOLatin1/file1.txt → ...emplateRepositoryTest_ISOLatin1/file1.txt
File renamed without changes
View
0  ...cheTemplateRepositoryTest_ISOLatin1/file2 → ...cheTemplateRepositoryTest_ISOLatin1/file2
File renamed without changes
View
0  ...teRepositoryTest_ISOLatin1/file2.mustache → ...teRepositoryTest_ISOLatin1/file2.mustache
File renamed without changes
View
0  ...emplateRepositoryTest_ISOLatin1/file2.txt → ...emplateRepositoryTest_ISOLatin1/file2.txt
File renamed without changes
View
0  ...TemplateRepositoryTest_UTF8/dir/dir/file1 → ...TemplateRepositoryTest_UTF8/dir/dir/file1
File renamed without changes
View
0  ...epositoryTest_UTF8/dir/dir/file1.mustache → ...epositoryTest_UTF8/dir/dir/file1.mustache
File renamed without changes
View
0  ...lateRepositoryTest_UTF8/dir/dir/file1.txt → ...lateRepositoryTest_UTF8/dir/dir/file1.txt
File renamed without changes
View
0  ...TemplateRepositoryTest_UTF8/dir/dir/file2 → ...TemplateRepositoryTest_UTF8/dir/dir/file2
File renamed without changes
View
0  ...epositoryTest_UTF8/dir/dir/file2.mustache → ...epositoryTest_UTF8/dir/dir/file2.mustache
File renamed without changes
View
0  ...lateRepositoryTest_UTF8/dir/dir/file2.txt → ...lateRepositoryTest_UTF8/dir/dir/file2.txt
File renamed without changes
View
0  ...acheTemplateRepositoryTest_UTF8/dir/file1 → ...acheTemplateRepositoryTest_UTF8/dir/file1
File renamed without changes
View
0  ...ateRepositoryTest_UTF8/dir/file1.mustache → ...ateRepositoryTest_UTF8/dir/file1.mustache
File renamed without changes
View
0  ...TemplateRepositoryTest_UTF8/dir/file1.txt → ...TemplateRepositoryTest_UTF8/dir/file1.txt
File renamed without changes
View
0  ...acheTemplateRepositoryTest_UTF8/dir/file2 → ...acheTemplateRepositoryTest_UTF8/dir/file2
File renamed without changes
View
0  ...ateRepositoryTest_UTF8/dir/file2.mustache → ...ateRepositoryTest_UTF8/dir/file2.mustache
File renamed without changes
View
0  ...TemplateRepositoryTest_UTF8/dir/file2.txt → ...TemplateRepositoryTest_UTF8/dir/file2.txt
File renamed without changes
View
0  ...MustacheTemplateRepositoryTest_UTF8/file1 → ...MustacheTemplateRepositoryTest_UTF8/file1
File renamed without changes
View
0  ...emplateRepositoryTest_UTF8/file1.mustache → ...emplateRepositoryTest_UTF8/file1.mustache
File renamed without changes
View
0  ...acheTemplateRepositoryTest_UTF8/file1.txt → ...acheTemplateRepositoryTest_UTF8/file1.txt
File renamed without changes
View
0  ...MustacheTemplateRepositoryTest_UTF8/file2 → ...MustacheTemplateRepositoryTest_UTF8/file2
File renamed without changes
View
0  ...emplateRepositoryTest_UTF8/file2.mustache → ...emplateRepositoryTest_UTF8/file2.mustache
File renamed without changes
View
0  ...acheTemplateRepositoryTest_UTF8/file2.txt → ...acheTemplateRepositoryTest_UTF8/file2.txt
File renamed without changes
View
2  ...stacheTemplateRepositoryWithBaseURLTest.h → ...stacheTemplateRepositoryWithBaseURLTest.h
@@ -20,7 +20,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-#define GRMUSTACHE_VERSION_MAX_ALLOWED GRMUSTACHE_VERSION_2_0
+#define GRMUSTACHE_VERSION_MAX_ALLOWED GRMUSTACHE_VERSION_3_0
#import "GRMustachePublicAPITest.h"
@interface GRMustacheTemplateRepositoryWithBaseURLTest : GRMustachePublicAPITest
View
0  ...stacheTemplateRepositoryWithBaseURLTest.m → ...stacheTemplateRepositoryWithBaseURLTest.m
File renamed without changes
View
0  ...RMustacheTemplateRepositoryWithBundleTest → ...RMustacheTemplateRepositoryWithBundleTest
File renamed without changes
View
2  ...ustacheTemplateRepositoryWithBundleTest.h → ...ustacheTemplateRepositoryWithBundleTest.h
@@ -20,7 +20,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-#define GRMUSTACHE_VERSION_MAX_ALLOWED GRMUSTACHE_VERSION_2_0
+#define GRMUSTACHE_VERSION_MAX_ALLOWED GRMUSTACHE_VERSION_3_0
#import "GRMustachePublicAPITest.h"
@interface GRMustacheTemplateRepositoryWithBundleTest : GRMustachePublicAPITest
View
0  ...ustacheTemplateRepositoryWithBundleTest.m → ...ustacheTemplateRepositoryWithBundleTest.m
File renamed without changes
View
0  ...TemplateRepositoryWithBundleTest.mustache → ...TemplateRepositoryWithBundleTest.mustache
File renamed without changes
View
0  ...acheTemplateRepositoryWithBundleTest.text → ...acheTemplateRepositoryWithBundleTest.text
File renamed without changes
View
0  ...eTemplateRepositoryWithBundleTest_partial → ...eTemplateRepositoryWithBundleTest_partial
File renamed without changes
View
0  ...RepositoryWithBundleTest_partial.mustache → ...RepositoryWithBundleTest_partial.mustache
File renamed without changes
View
0  ...lateRepositoryWithBundleTest_partial.text → ...lateRepositoryWithBundleTest_partial.text
File renamed without changes
View
2  ...acheTemplateRepositoryWithDirectoryTest.h → ...acheTemplateRepositoryWithDirectoryTest.h
@@ -20,7 +20,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-#define GRMUSTACHE_VERSION_MAX_ALLOWED GRMUSTACHE_VERSION_2_0
+#define GRMUSTACHE_VERSION_MAX_ALLOWED GRMUSTACHE_VERSION_3_0
#import "GRMustachePublicAPITest.h"
@interface GRMustacheTemplateRepositoryWithDirectoryTest : GRMustachePublicAPITest
View
0  ...acheTemplateRepositoryWithDirectoryTest.m → ...acheTemplateRepositoryWithDirectoryTest.m
File renamed without changes
View
2  ...ateRepositoryWithPartialsDictionaryTest.h → ...ateRepositoryWithPartialsDictionaryTest.h
@@ -20,7 +20,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-#define GRMUSTACHE_VERSION_MAX_ALLOWED GRMUSTACHE_VERSION_2_0
+#define GRMUSTACHE_VERSION_MAX_ALLOWED GRMUSTACHE_VERSION_3_0
#import "GRMustachePublicAPITest.h"
@interface GRMustacheTemplateRepositoryWithPartialsDictionaryTest : GRMustachePublicAPITest
View
0  ...ateRepositoryWithPartialsDictionaryTest.m → ...ateRepositoryWithPartialsDictionaryTest.m
File renamed without changes
View
2  ...s/Public/v2.0/GRSpecificationSuitesTest.h → ...s/Public/v3.0/GRSpecificationSuitesTest.h
@@ -20,7 +20,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-#define GRMUSTACHE_VERSION_MAX_ALLOWED GRMUSTACHE_VERSION_2_0
+#define GRMUSTACHE_VERSION_MAX_ALLOWED GRMUSTACHE_VERSION_3_0
#import "GRMustachePublicAPITest.h"
@interface GRSpecificationSuitesTest : GRMustachePublicAPITest
View
0  ...s/Public/v2.0/GRSpecificationSuitesTest.m → ...s/Public/v3.0/GRSpecificationSuitesTest.m
File renamed without changes
Please sign in to comment.
Something went wrong with that request. Please try again.