Rename category linker. Add type converter.

appsquickly · Nov 29, 2013 · 9d22ede · 9d22ede
1 parent 53d4311
commit 9d22ede
Show file tree

Hide file tree

Showing 11 changed files with 3,566 additions and 13,185 deletions.
diff --git a/Source/Component/TyphoonDefinition+Infrastructure.m b/Source/Component/TyphoonDefinition+Infrastructure.m
@@ -11,7 +11,7 @@
 
 
 #import "TyphoonLinkerCategoryBugFix.h"
-TYPHOON_FIX_CATEGORY_BUG(TyphoonDefinition_Infrastructure)
+TYPHOON_LINK_CATEGORY(TyphoonDefinition_Infrastructure)
 
 #import "TyphoonDefinition+Infrastructure.h"
 #import "TyphoonPropertyPlaceholderConfigurer.h"

diff --git a/Source/Factory/InstanceBuilder/TyphoonComponentFactory+InstanceBuilder.m b/Source/Factory/InstanceBuilder/TyphoonComponentFactory+InstanceBuilder.m
@@ -11,7 +11,7 @@
 
 
 #import "TyphoonLinkerCategoryBugFix.h"
-TYPHOON_FIX_CATEGORY_BUG(TyphoonComponentFactory_InstanceBuilder)
+TYPHOON_LINK_CATEGORY(TyphoonComponentFactory_InstanceBuilder)
 
 #import <objc/message.h>
 #import "TyphoonComponentFactory+InstanceBuilder.h"

diff --git a/Source/Factory/InstanceBuilder/TyphoonDefinition+InstanceBuilder.m b/Source/Factory/InstanceBuilder/TyphoonDefinition+InstanceBuilder.m
@@ -10,7 +10,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #import "TyphoonLinkerCategoryBugFix.h"
-TYPHOON_FIX_CATEGORY_BUG(TyphoonDefinition_InstanceBuilder)
+TYPHOON_LINK_CATEGORY(TyphoonDefinition_InstanceBuilder)
 
 #import "TyphoonDefinition+InstanceBuilder.h"
 #import "TyphoonPropertyInjectedWithStringRepresentation.h"

diff --git a/Source/Factory/InstanceBuilder/TyphoonInitializer+InstanceBuilder.m b/Source/Factory/InstanceBuilder/TyphoonInitializer+InstanceBuilder.m
@@ -12,7 +12,7 @@
 
 
 #import "TyphoonLinkerCategoryBugFix.h"
-TYPHOON_FIX_CATEGORY_BUG(TyphoonInitializer_InstanceBuilder)
+TYPHOON_LINK_CATEGORY(TyphoonInitializer_InstanceBuilder)
 
 #import "TyphoonInitializer+InstanceBuilder.h"
 #import "TyphoonParameterInjectedWithStringRepresentation.h"

diff --git a/Source/Factory/Xml/TyphoonRXMLElement+XmlComponentFactory.m b/Source/Factory/Xml/TyphoonRXMLElement+XmlComponentFactory.m
@@ -12,7 +12,7 @@
 
 
 #import "TyphoonLinkerCategoryBugFix.h"
-TYPHOON_FIX_CATEGORY_BUG(TyphoonRXMLElement_XmlComponentFactory)
+TYPHOON_LINK_CATEGORY(TyphoonRXMLElement_XmlComponentFactory)
 
 #import "TyphoonRXMLElement+XmlComponentFactory.h"
 #import "TyphoonInjectedProperty.h"

diff --git a/Source/Utils/NSObject+TyphoonIntrospectionUtils.m b/Source/Utils/NSObject+TyphoonIntrospectionUtils.m
@@ -13,7 +13,7 @@
 
 
 #import "TyphoonLinkerCategoryBugFix.h"
-TYPHOON_FIX_CATEGORY_BUG(NSObject_TyphoonIntrospectionUtils)
+TYPHOON_LINK_CATEGORY(NSObject_TyphoonIntrospectionUtils)
 
 #import <objc/runtime.h>
 #import "TyphoonTypeDescriptor.h"

diff --git a/Source/Utils/TyphoonLinkerCategoryBugFix.h b/Source/Utils/TyphoonLinkerCategoryBugFix.h
@@ -18,8 +18,8 @@
  Shamelessly borrowed from Three20 and RestKit
  */
 
-#define TYPHOON_FIX_CATEGORY_BUG(name) \
-@interface TYPHOON_FIX_CATEGORY_BUG_##name : NSObject \
+#define TYPHOON_LINK_CATEGORY(name) \
+@interface TYPHOON_LINK_CATEGORY_##name : NSObject \
 @end \
-@implementation TYPHOON_FIX_CATEGORY_BUG_##name \
+@implementation TYPHOON_LINK_CATEGORY_##name \
 @end
diff --git a/Source/ios/Converters/TyphoonBundledImageTypeConverter.h b/Source/ios/Converters/TyphoonBundledImageTypeConverter.h
@@ -0,0 +1,17 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  TYPHOON FRAMEWORK
+//  Copyright 2013, Jasper Blues & Contributors
+//  All Rights Reserved.
+//
+//  NOTICE: The authors permit you to use, modify, and distribute this file
+//  in accordance with the terms of the license agreement accompanying it.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#import <Foundation/Foundation.h>
+#import "TyphoonTypeConverter.h"
+
+
+@interface TyphoonBundledImageTypeConverter : NSObject<TyphoonTypeConverter>
+@end
diff --git a/Source/ios/Converters/TyphoonBundledImageTypeConverter.m b/Source/ios/Converters/TyphoonBundledImageTypeConverter.m
@@ -0,0 +1,26 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  TYPHOON FRAMEWORK
+//  Copyright 2013, Jasper Blues & Contributors
+//  All Rights Reserved.
+//
+//  NOTICE: The authors permit you to use, modify, and distribute this file
+//  in accordance with the terms of the license agreement accompanying it.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+
+#import "TyphoonBundledImageTypeConverter.h"
+#import <UIKit/UIKit.h>
+
+
+@implementation TyphoonBundledImageTypeConverter
+
+
+- (id)convert:(NSString*)stringValue
+{
+    return [UIImage imageNamed:stringValue];
+}
+
+
+@end