Merge pull request appsquickly#442 from appsquickly/type-converters-fix

Removed the singletone TyphoonTypeConverterRegistry

Source/Definition/Injections/TyphoonInjectionByObjectFromString.m

@@ -48,26 +48,27 @@ - (BOOL)isEqualToCustom:(TyphoonInjectionByObjectFromString *)injection
 - (void)valueToInjectWithContext:(TyphoonInjectionContext *)context completion:(TyphoonInjectionValueBlock)result
 {
     TyphoonTypeDescriptor *type = context.destinationType;
+    TyphoonComponentFactory *factory = context.factory;
 
     id value = nil;
 
     if (type.isPrimitive) {
-        TyphoonPrimitiveTypeConverter *converter = [[TyphoonTypeConverterRegistry shared] primitiveTypeConverter];
+        TyphoonPrimitiveTypeConverter *converter = [factory.typeConverterRegistry primitiveTypeConverter];
         value = [converter valueFromText:self.textValue withType:type];
     }
     else {
-        value = [self convertText:self.textValue];
+        value = [self convertText:self.textValue withTypeConverterRegistry:factory.typeConverterRegistry];
     }
 
     result(value);
 }
 
-- (id)convertText:(NSString *)text
+- (id)convertText:(NSString *)text withTypeConverterRegistry:(TyphoonTypeConverterRegistry *)typeConverterRegistry
 {
     id result = text;
-    NSString *typeString = [TyphoonTypeConverterRegistry typeFromTextValue:text];
+    NSString *typeString = [TyphoonTypeConversionUtils typeFromTextValue:text];
     if (typeString) {
-        id <TyphoonTypeConverter> converter = [[TyphoonTypeConverterRegistry shared] converterForType:typeString];
+        id <TyphoonTypeConverter> converter = [typeConverterRegistry converterForType:typeString];
         if (converter) {
             result = [converter convert:text];
         }

Source/Factory/TyphoonComponentFactory.h

@@ -18,6 +18,7 @@
 @class TyphoonDefinition;
 @class TyphoonCallStack;
 @class TyphoonRuntimeArguments;
+@class TyphoonTypeConverterRegistry;
 
 /**
 *
@@ -102,6 +103,7 @@ Attach a TyphoonComponentFactoryPostProcessor to this component factory.
     id <TyphoonComponentsPool> _weakSingletons;
 
     TyphoonCallStack *_stack;
+    TyphoonTypeConverterRegistry *_typeConverterRegistry;
     NSMutableArray *_definitionPostProcessors;
     NSMutableArray *_instancePostProcessors;
     BOOL _isLoading;
@@ -172,6 +174,8 @@ Attach a TyphoonComponentFactoryPostProcessor to this component factory.
 
 - (NSArray *)registry;
 
+- (TyphoonTypeConverterRegistry *)typeConverterRegistry;
+
 - (void)enumerateDefinitions:(void(^)(TyphoonDefinition *definition, NSUInteger index, TyphoonDefinition **definitionToReplace, BOOL *stop))block;
 
 

Source/Factory/TyphoonComponentFactory.m

@@ -25,6 +25,7 @@
 #import "TyphoonWeakComponentsPool.h"
 #import "TyphoonFactoryAutoInjectionPostProcessor.h"
 #import "TyphoonStackElement.h"
+#import "TyphoonTypeConverterRegistry.h"
 
 @interface TyphoonDefinition (TyphoonComponentFactory)
 
@@ -75,6 +76,7 @@ - (id)init
         _weakSingletons = [TyphoonWeakComponentsPool new];
         _objectGraphSharedInstances = (id<TyphoonComponentsPool>)[[NSMutableDictionary alloc] init];
         _stack = [TyphoonCallStack stack];
+        _typeConverterRegistry = [[TyphoonTypeConverterRegistry alloc] init];
         _definitionPostProcessors = [[NSMutableArray alloc] init];
         _instancePostProcessors = [[NSMutableArray alloc] init];
         [self attachPostProcessor:[TyphoonParentReferenceHydratingPostProcessor new]];
@@ -210,6 +212,10 @@ - (void)makeDefault
     }
 }
 
+- (TyphoonTypeConverterRegistry *)typeConverterRegistry {
+    return _typeConverterRegistry;
+}
+
 - (NSArray *)registry
 {
     [self loadIfNeeded];

Source/Factory/TyphoonDefinitionRegisterer.m

@@ -99,7 +99,7 @@ - (void)registerInfrastructureComponentFromDefinition
         [_componentFactory addInstancePostProcessor:infrastructureComponent];
     }
     else if ([_definition.type conformsToProtocol:@protocol(TyphoonTypeConverter)]) {
-        [[TyphoonTypeConverterRegistry shared] registerTypeConverter:infrastructureComponent];
+        [_componentFactory.typeConverterRegistry registerTypeConverter:infrastructureComponent];
     }
 }
 

Source/TypeConversion/Converters/TyphoonNSNumberTypeConverter.m

@@ -22,7 +22,7 @@ - (id)supportedType
 
 - (id)convert:(NSString *)stringValue
 {
-    stringValue = [TyphoonTypeConverterRegistry textWithoutTypeFromTextValue:stringValue];
+    stringValue = [TyphoonTypeConversionUtils textWithoutTypeFromTextValue:stringValue];
 
     NSNumberFormatter *f = [[NSNumberFormatter alloc] init];
     [f setNumberStyle:NSNumberFormatterDecimalStyle];

Source/TypeConversion/Converters/TyphoonNSURLTypeConverter.m

@@ -22,7 +22,7 @@ - (id)supportedType
 
 - (id)convert:(NSString *)stringValue
 {
-    stringValue = [TyphoonTypeConverterRegistry textWithoutTypeFromTextValue:stringValue];
+    stringValue = [TyphoonTypeConversionUtils textWithoutTypeFromTextValue:stringValue];
     __autoreleasing NSURL *url = [NSURL URLWithString:stringValue];
     return url;
 }

Source/TypeConversion/Converters/TyphoonPassThroughTypeConverter.m

@@ -42,7 +42,7 @@ - (id)supportedType
 
 - (id)convert:(NSString *)stringValue
 {
-    stringValue = [TyphoonTypeConverterRegistry textWithoutTypeFromTextValue:stringValue];
+    stringValue = [TyphoonTypeConversionUtils textWithoutTypeFromTextValue:stringValue];
 
     if (_isMutable) {
         return [NSMutableString stringWithString:stringValue];

Source/TypeConversion/Converters/TyphoonPrimitiveTypeConverter.h

@@ -13,6 +13,7 @@
 #import <Foundation/Foundation.h>
 #import "TyphoonTypeConverter.h"
 
+@class TyphoonTypeDescriptor;
 
 @interface TyphoonPrimitiveTypeConverter : NSObject
 

Source/TypeConversion/Helpers/TyphoonColorConversionUtils.h

@@ -0,0 +1,27 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  TYPHOON FRAMEWORK
+//  Copyright 2015, Typhoon Framework 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>
+
+struct RGBA
+{
+    CGFloat red;
+    CGFloat green;
+    CGFloat blue;
+    CGFloat alpha;
+} rgba;
+
+@interface TyphoonColorConversionUtils : NSObject
+
++ (struct RGBA)colorFromHexString:(NSString *)hexString;
++ (struct RGBA)colorFromCssStyleString:(NSString *)cssString;
+
+@end

Source/TypeConversion/Helpers/TyphoonColorConversionUtils.m

@@ -0,0 +1,64 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  TYPHOON FRAMEWORK
+//  Copyright 2015, Typhoon Framework 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 "TyphoonColorConversionUtils.h"
+
+@implementation TyphoonColorConversionUtils
+
++ (struct RGBA)colorFromHexString:(NSString *)hexString {
+    hexString =
+    [[hexString stringByReplacingOccurrencesOfString:@"#" withString:@""] stringByReplacingOccurrencesOfString:@"0x" withString:@""];
+
+    unsigned int red, green, blue, alpha;
+    if ([hexString length] == 6) {
+        sscanf([hexString UTF8String], "%02X%02X%02X", &red, &green, &blue);
+        alpha = 255;
+    }
+    else if ([hexString length] == 8) {
+        sscanf([hexString UTF8String], "%02X%02X%02X%02X", &alpha, &red, &green, &blue);
+    }
+    else {
+        [NSException raise:NSInvalidArgumentException format:@"%@ requires a six or eight digit hex string.",
+         NSStringFromClass([self class])];
+    }
+    return [self colorFromRed:red green:green blue:blue alpha:(CGFloat)(alpha / 255.0)];
+}
+
++ (struct RGBA)colorFromCssStyleString:(NSString *)cssString {
+    NSArray *colorComponents = [cssString componentsSeparatedByString:@","];
+
+    unsigned int red, green, blue;
+    float alpha;
+    if ([colorComponents count] == 3) {
+        sscanf([cssString UTF8String], "%d,%d,%d", &red, &green, &blue);
+        alpha = 1.0;
+    }
+    else if ([colorComponents count] == 4) {
+        sscanf([cssString UTF8String], "%d,%d,%d,%f", &red, &green, &blue, &alpha);
+    }
+    else {
+        [NSException raise:NSInvalidArgumentException format:@"%@ requires css style format UIColor(r,g,b) or UIColor(r,g,b,a).",
+         NSStringFromClass([self class])];
+    }
+    return [self colorFromRed:red green:green blue:blue alpha:alpha];
+}
+
++ (struct RGBA)colorFromRed:(NSUInteger)red green:(NSUInteger)green blue:(NSUInteger)blue alpha:(CGFloat)alpha
+{
+    struct RGBA color;
+    color.red = (CGFloat)red / 255.0;
+    color.green = (CGFloat)green / 255.0;
+    color.blue = (CGFloat)blue / 255.0;
+    color.alpha = (CGFloat)alpha;
+    return color;
+}
+
+@end

Source/TypeConversion/TyphoonTypeConversionUtils.h

@@ -0,0 +1,29 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  TYPHOON FRAMEWORK
+//  Copyright 2015, Typhoon Framework 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>
+
+/**
+ * A collection of helper methods for type conversion purposes
+ */
+@interface TyphoonTypeConversionUtils : NSObject
+
+/**
+ * Returns the type from the text, e.g. NSURL for NSURL(http://typhoonframework.org)
+ */
++ (NSString *)typeFromTextValue:(NSString *)textValue;
+
+/**
+ * Returns the type from the text, e.g. http://typhoonframework.org for NSURL(http://typhoonframework.org)
+ */
++ (NSString *)textWithoutTypeFromTextValue:(NSString *)textValue;
+
+@end

Source/TypeConversion/TyphoonTypeConversionUtils.m

@@ -0,0 +1,45 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  TYPHOON FRAMEWORK
+//  Copyright 2015, Typhoon Framework 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 "TyphoonTypeConversionUtils.h"
+
+@implementation TyphoonTypeConversionUtils
+
++ (NSString *)typeFromTextValue:(NSString *)textValue
+{
+    NSString *type = nil;
+
+    NSRange openBraceRange = [textValue rangeOfString:@"("];
+    BOOL hasBraces = [textValue hasSuffix:@")"] && openBraceRange.location != NSNotFound;
+    if (hasBraces) {
+        type = [textValue substringToIndex:openBraceRange.location];
+    }
+
+    return type;
+}
+
++ (NSString *)textWithoutTypeFromTextValue:(NSString *)textValue
+{
+    NSString *result = textValue;
+
+    NSRange openBraceRange = [textValue rangeOfString:@"("];
+    BOOL hasBraces = [textValue hasSuffix:@")"] && openBraceRange.location != NSNotFound;
+
+    if (hasBraces) {
+        NSRange range = NSMakeRange(openBraceRange.location + openBraceRange.length, 0);
+        range.length = [textValue length] - range.location - 1;
+        result = [textValue substringWithRange:range];
+    }
+
+    return result;
+}
+
+@end

Source/TypeConversion/TyphoonTypeConverter.h

@@ -12,7 +12,7 @@
 
 #import <Foundation/Foundation.h>
 #import "TyphoonTypeConverterRegistry.h"
-
+#import "TyphoonTypeConversionUtils.h"
 
 /**
 * Declares a contract for converting configuration arguments to their required runtime type.

Source/TypeConversion/TyphoonTypeConverterRegistry.h

@@ -13,27 +13,12 @@
 #import <Foundation/Foundation.h>
 
 @protocol TyphoonTypeConverter;
-@class TyphoonTypeDescriptor;
 @class TyphoonPrimitiveTypeConverter;
 
-
 /**
 * Registry of type converters, with special treatment for primitives.
 */
 @interface TyphoonTypeConverterRegistry : NSObject
-{
-    TyphoonPrimitiveTypeConverter *_primitiveTypeConverter;
-    NSMutableDictionary *_typeConverters;
-}
-
-/**
-* Returns the shard/default registry instance used by the container.
-*/
-+ (TyphoonTypeConverterRegistry *)shared;
-
-
-+ (NSString *)typeFromTextValue:(NSString *)textValue;
-+ (NSString *)textWithoutTypeFromTextValue:(NSString *)textValue;
 
 /**
  * Returns the type converter for the given type string. Usually type is class of object you want to convert.