Add data attribute to Typhoon resource. Convenience init on block ass…

…embly.
appsquickly · Mar 1, 2013 · 66af9c2 · 66af9c2
1 parent 17578eb
commit 66af9c2
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 12 deletions.
diff --git a/Source/Factory/Block/TyphoonBlockComponentFactory.h b/Source/Factory/Block/TyphoonBlockComponentFactory.h
@@ -19,6 +19,8 @@
 
 @interface TyphoonBlockComponentFactory : TyphoonComponentFactory
 
++ (id)factoryWithAssembly:(TyphoonAssembly*)assembly;
+
 - (id)initWithAssembly:(TyphoonAssembly*)assembly;
 
 @end
diff --git a/Source/Factory/Block/TyphoonBlockComponentFactory.m b/Source/Factory/Block/TyphoonBlockComponentFactory.m
@@ -55,6 +55,11 @@ + (void)initialize
 }
 
 
++ (id)factoryWithAssembly:(TyphoonAssembly*)assembly
+{
+    return [[[self class] alloc] initWithAssembly:assembly];
+}
+
 /* ============================================================ Initializers ============================================================ */
 - (id)initWithAssembly:(TyphoonAssembly*)assembly;
 {

diff --git a/Source/Utils/Resource/TyphoonBundleResource.h b/Source/Utils/Resource/TyphoonBundleResource.h
@@ -19,13 +19,12 @@
 */
 @interface TyphoonBundleResource : NSObject <TyphoonResource>
 {
-    NSString* _stringValue;
+    NSData* _data;
 }
 
 
 
 + (id<TyphoonResource>)withName:(NSString*)name;
 
-- (id)initWithStringValue:(NSString*)stringValue;
 
 @end
diff --git a/Source/Utils/Resource/TyphoonBundleResource.m b/Source/Utils/Resource/TyphoonBundleResource.m
@@ -18,8 +18,6 @@ @implementation TyphoonBundleResource
 /* =========================================================== Class Methods ============================================================ */
 + (id <TyphoonResource>)withName:(NSString*)name
 {
-
-    NSString* contents;
     NSString* filePath;
     NSRange lastDot = [name rangeOfString:@"." options:NSBackwardsSearch];
     if (lastDot.location != NSNotFound)
@@ -37,25 +35,33 @@ @implementation TyphoonBundleResource
     {
         [NSException raise:NSInvalidArgumentException format:@"Resource named '%@' not in bundle.", name];
     }
-    contents = [NSString stringWithContentsOfFile:filePath encoding:NSUTF8StringEncoding error:nil];
-    return [[[self class] alloc] initWithStringValue:contents];
+    return [[[self class] alloc] initWithData:[NSData dataWithContentsOfFile:filePath]];
 }
 
 /* ============================================================ Initializers ============================================================ */
-- (id)initWithStringValue:(NSString*)stringValue
+- (id)initWithData:(NSData*)data
 {
     self = [super init];
     if (self)
     {
-        _stringValue = stringValue;
+        _data = data;
     }
-
     return self;
 }
 
 - (NSString*)asString
 {
-    return _stringValue;
+    return [self asStringWithEncoding:NSUTF8StringEncoding];
+}
+
+- (NSString*)asStringWithEncoding:(NSStringEncoding)encoding
+{
+    return [[NSString alloc] initWithData:_data encoding:encoding];
+}
+
+- (NSData*)data
+{
+    return _data;
 }
 
 

diff --git a/Source/Utils/Resource/TyphoonResource.h b/Source/Utils/Resource/TyphoonResource.h
@@ -21,5 +21,9 @@
 
 - (NSString*)asString;
 
+- (NSString*)asStringWithEncoding:(NSStringEncoding)encoding;
+
+- (NSData*)data;
+
 
 @end
diff --git a/Tests/Factory/TyphoonComponentFactory+InstanceBuilderTests.m b/Tests/Factory/TyphoonComponentFactory+InstanceBuilderTests.m
@@ -10,11 +10,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #import <SenTestingKit/SenTestingKit.h>
-#import <objc/runtime.h>
 #import "Typhoon.h"
 #import "Knight.h"
 #import "CampaignQuest.h"
-#import "TyphoonInitializer.h"
 
 
 @interface ComponentDefinition_InstanceBuilderTests : SenTestCase