Permalink
Browse files

v1.7.3

  • Loading branch information...
1 parent 6c88f6a commit 8059b386ac332b3afd7b38bd96d4a1b7d12b2872 @groue committed Sep 17, 2011
@@ -40,5 +40,5 @@
@since v1.0.0
*/
-#define GRMUSTACHE_PATCH_VERSION 2
+#define GRMUSTACHE_PATCH_VERSION 3
View
@@ -1,6 +1,10 @@
GRMustache Release Notes
========================
+## v1.7.3
+
+One no longer needs to add `-all_load` to the "Other Linker Flags" target option tu use GRMustache static libraries.
+
## v1.7.2
- Fixed [issue #6](https://github.com/groue/GRMustache/issues/6)
View
@@ -22,20 +22,83 @@
#import <Foundation/Foundation.h>
+/**
+ A C struct that hold GRMustache version information
+
+ @since v1.0.0
+ */
+typedef struct {
+ int major; /**< The major component of the version. */
+ int minor; /**< The minor component of the version. */
+ int patch; /**< The patch-level component of the version. */
+} GRMustacheVersion;
+
+
/**
The GRMustache class provides with global-level information and configuration
of the GRMustache library.
@since v1.0.0
*/
@interface GRMustache: NSObject
+
+//////////////////////////////////////////////////////////////////////////////////////////
+/// @name Getting the GRMustache version
+//////////////////////////////////////////////////////////////////////////////////////////
+
+/**
+ @returns the version of GRMustache as a GRMustacheVersion.
+
+ @since v1.0.0
+ */
++ (GRMustacheVersion)version;
+
+//////////////////////////////////////////////////////////////////////////////////////////
+/// @name Handling of boolean properties
+//////////////////////////////////////////////////////////////////////////////////////////
+
+/**
+ A Boolean value that determines whether GRMustache renders templates in strict
+ boolean mode.
+
+ @returns YES if GRMustache renders templates in strict boolean mode,
+ NO otherwise. The default value is NO.
+
+ In strict boolean mode, properties of context objects that are declared as BOOL
+ are interpreted as numbers, and can not be used for controlling Mustache
+ boolean sections.
+
+ In non-strict boolean mode, all properties declared as signed char (including
+ those declared as BOOL), are interpreted as booleans, and can be used for
+ controlling Mustache boolean sections.
+
+ @see GRMustache#setStrictBooleanMode:
+ @see GRYes
+ @see GRNo
+ @since v1.0.0
+ */
++ (BOOL)strictBooleanMode;
+
+/**
+ Sets the strict boolean mode of GMustache.
+
+ @param aBool YES if GRMustache should render templates in strict boolean mode,
+ NO otherwise.
+
+ @see GRMustache#strictBooleanMode
+ @since v1.0.0
+ */
++ (void)setStrictBooleanMode:(BOOL)aBool;
+
++ (void)preventNSUndefinedKeyExceptionAttack;
+
@end
-#import "GRMustacheVersion.h"
-#import "GRMustacheConfiguration.h"
-#import "GRBoolean.h"
-#import "GRMustacheError.h"
-#import "GRMustacheRendering.h"
+#import "GRMustacheSection.h"
+#import "GRMustacheTemplate.h"
+#import "GRMustacheTemplateLoader.h"
#import "GRMustacheContext.h"
#import "GRMustacheLambda.h"
-#import "GRMustacheTemplateLoader.h"
-#import "GRMustacheTemplate.h"
+#import "GRBoolean.h"
+#import "GRMustacheEnvironment.h"
+#import "GRMustacheError.h"
+#import "GRMustacheVersion.h"
@@ -1,69 +0,0 @@
-// The MIT License
-//
-// Copyright (c) 2010 Gwendal Roué
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-/**
- The GRMustache class provides with global-level information and configuration
- of the GRMustache library.
- @since v1.0.0
- */
-@interface GRMustache(Configuration)
-
-//////////////////////////////////////////////////////////////////////////////////////////
-/// @name Handling of boolean properties
-//////////////////////////////////////////////////////////////////////////////////////////
-
-/**
- A Boolean value that determines whether GRMustache renders templates in strict
- boolean mode.
-
- @returns YES if GRMustache renders templates in strict boolean mode,
- NO otherwise. The default value is NO.
-
- In strict boolean mode, properties of context objects that are declared as BOOL
- are interpreted as numbers, and can not be used for controlling Mustache
- boolean sections.
-
- In non-strict boolean mode, all properties declared as signed char (including
- those declared as BOOL), are interpreted as booleans, and can be used for
- controlling Mustache boolean sections.
-
- @see GRMustache#setStrictBooleanMode:
- @see GRYes
- @see GRNo
- @since v1.0.0
- */
-+ (BOOL)strictBooleanMode;
-
-/**
- Sets the strict boolean mode of GMustache.
-
- @param aBool YES if GRMustache should render templates in strict boolean mode,
- NO otherwise.
-
- @see GRMustache#strictBooleanMode
- @since v1.0.0
- */
-+ (void)setStrictBooleanMode:(BOOL)aBool;
-
-+ (void)preventNSUndefinedKeyExceptionAttack;
-
-@end
@@ -20,6 +20,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
+#import <Foundation/Foundation.h>
+
@interface GRMustacheContext: NSObject {
@private
@@ -20,9 +20,9 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
+#import <Foundation/Foundation.h>
#import "GRMustacheEnvironment.h"
-#import "GRMustacheSection.h"
-
+@class GRMustacheSection;
@class GRMustacheContext;
#if GRMUSTACHE_BLOCKS_AVAILABLE
@@ -1,167 +0,0 @@
-// The MIT License
-//
-// Copyright (c) 2010 Gwendal Roué
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#import "GRMustacheEnvironment.h"
-#import "GRMustacheTemplate.h"
-#import "GRMustacheSection.h"
-
-
-@interface GRMustacheSection(Rendering)
-
-/**
- Renders a template with a context object.
-
- @returns A string containing the rendered template
- @param object A context object used for interpreting Mustache tags
-
- @since v1.3.0
- */
-- (NSString *)renderObject:(id)object;
-
-/**
- Renders a template with context objects.
-
- @returns A string containing the rendered template
- @param object, ... A comma-separated list of objects used for interpreting Mustache tags, ending with nil
-
- @since v1.5.0
- */
-- (NSString *)renderObjects:(id)object, ...;
-@end
-
-@interface GRMustacheTemplate(Rendering)
-
-//////////////////////////////////////////////////////////////////////////////////////////
-/// @name Rendering
-//////////////////////////////////////////////////////////////////////////////////////////
-
-/**
- Renders a context object from a template string.
-
- @returns A string containing the rendered template
- @param object A context object used for interpreting Mustache tags
- @param templateString The template string
- @param outError If there is an error loading or parsing template and partials, upon return contains an NSError object that describes the problem.
-
- @since v1.0.0
- */
-+ (NSString *)renderObject:(id)object fromString:(NSString *)templateString error:(NSError **)outError;
-
-#if !TARGET_OS_IPHONE || GRMUSTACHE_IPHONE_OS_VERSION_MAX_ALLOWED >= 40000
-/**
- Renders a context object from a file template.
-
- @returns A string containing the rendered template
- @param object A context object used for interpreting Mustache tags
- @param url The URL of the template
- @param outError If there is an error loading or parsing template and partials, upon return
- contains an NSError object that describes the problem.
-
- The template at url must be encoded in UTF8. See the GRMustacheTemplateLoader class for more encoding options.
-
- @since v1.0.0
- */
-+ (NSString *)renderObject:(id)object fromContentsOfURL:(NSURL *)url error:(NSError **)outError;
-#endif
-
-/**
- Renders a context object from a file template.
-
- @returns A string containing the rendered template
- @param object A context object used for interpreting Mustache tags
- @param path The path of the template
- @param outError If there is an error loading or parsing template and partials, upon return
- contains an NSError object that describes the problem.
-
- The template at path must be encoded in UTF8. See the GRMustacheTemplateLoader class for more encoding options.
-
- @since v1.4.0
- */
-+ (NSString *)renderObject:(id)object fromContentsOfFile:(NSString *)path error:(NSError **)outError;
-
-/**
- Renders a context object from a bundle resource template.
-
- @returns A string containing the rendered template
- @param object A context object used for interpreting Mustache tags
- @param name The name of a bundle resource of extension "mustache"
- @param bundle The bundle where to look for the template resource
- @param outError If there is an error loading or parsing template and partials, upon return
- contains an NSError object that describes the problem.
-
- If you provide nil as a bundle, the resource will be looked in the main bundle.
-
- The template resource must be encoded in UTF8. See the GRMustacheTemplateLoader class for more encoding options.
-
- @since v1.0.0
- */
-+ (NSString *)renderObject:(id)object fromResource:(NSString *)name bundle:(NSBundle *)bundle error:(NSError **)outError;
-
-/**
- Renders a context object from a bundle resource template.
-
- @returns A string containing the rendered template
- @param object A context object used for interpreting Mustache tags
- @param name The name of a bundle resource
- @param ext The extension of the bundle resource
- @param bundle The bundle where to look for the template resource.
- @param outError If there is an error loading or parsing template and partials, upon return
- contains an NSError object that describes the problem.
-
- If you provide nil as a bundle, the resource will be looked in the main bundle.
-
- The template resource must be encoded in UTF8. See the GRMustacheTemplateLoader class for more encoding options.
-
- @since v1.0.0
- */
-+ (NSString *)renderObject:(id)object fromResource:(NSString *)name withExtension:(NSString *)ext bundle:(NSBundle *)bundle error:(NSError **)outError;
-
-/**
- Renders a template with a context object.
-
- @returns A string containing the rendered template
- @param object A context object used for interpreting Mustache tags
-
- @since v1.0.0
- */
-- (NSString *)renderObject:(id)object;
-
-/**
- Renders a template with context objects.
-
- @returns A string containing the rendered template
- @param object, ... A comma-separated list of objects used for interpreting Mustache tags, ending with nil
-
- @since v1.5.0
- */
-- (NSString *)renderObjects:(id)object, ...;
-
-/**
- Renders a template without any context object for interpreting Mustache tags.
-
- @returns A string containing the rendered template
-
- @since v1.0.0
- */
-- (NSString *)render;
-
-@end
@@ -32,4 +32,25 @@
NSArray *elems;
}
@property (nonatomic, readonly) NSString *templateString;
+
+/**
+ Renders a template with a context object.
+
+ @returns A string containing the rendered template
+ @param object A context object used for interpreting Mustache tags
+
+ @since v1.3.0
+ */
+- (NSString *)renderObject:(id)object;
+
+/**
+ Renders a template with context objects.
+
+ @returns A string containing the rendered template
+ @param object, ... A comma-separated list of objects used for interpreting Mustache tags, ending with nil
+
+ @since v1.5.0
+ */
+- (NSString *)renderObjects:(id)object, ...;
+
@end
Oops, something went wrong.

0 comments on commit 8059b38

Please sign in to comment.