Added TyphoonNSColorTypeConverter

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/TyphoonTypeConverterRegistry.m

@@ -19,6 +19,7 @@
 #import "TyphoonNSURLTypeConverter.h"
 #import "TyphoonIntrospectionUtils.h"
 #import "TyphoonNSNumberTypeConverter.h"
+#import "TyphoonNSColorTypeConverter.h"
 
 @interface TyphoonTypeConverterRegistry ()
 
@@ -96,7 +97,7 @@ - (void)registerPlatformConverters
     }
 #else
     {
-
+        [self registerTypeConverter:[[TyphoonClassFromString(@"TyphoonNSColorTypeConverter") alloc] init]];
     }
 #endif
 }

Source/ios/TypeConversion/Converters/TyphoonUIColorTypeConverter.m

@@ -12,6 +12,8 @@
 
 #import "TyphoonUIColorTypeConverter.h"
 
+#import "TyphoonColorConversionUtils.h"
+
 #import <UIKit/UIKit.h>
 
 
@@ -22,66 +24,25 @@ - (id)supportedType
     return @"UIColor";
 }
 
-- (UIColor *)colorFromRed:(NSUInteger)red green:(NSUInteger)green blue:(NSUInteger)blue alpha:(CGFloat)alpha
-{
-    return [UIColor colorWithRed:(CGFloat)(red / 255.0) green:(CGFloat)(green / 255.0) blue:(CGFloat)(blue / 255.0)
-        alpha:alpha];
-}
-
-- (UIColor *)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)];
-}
-
-- (UIColor *)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];
-}
-
 - (id)convert:(NSString *)stringValue
 {
     stringValue = [TyphoonTypeConversionUtils textWithoutTypeFromTextValue:stringValue];
-
-    UIColor *color = nil;
-
+    
+    struct RGBA color;
+    
     if ([stringValue hasPrefix:@"#"] || [stringValue hasPrefix:@"0x"]) {
-        color = [self colorFromHexString:stringValue];
+        color = [TyphoonColorConversionUtils colorFromHexString:stringValue];
     }
     else {
-        color = [self colorFromCssStyleString:stringValue];
+        color = [TyphoonColorConversionUtils colorFromCssStyleString:stringValue];
     }
 
-    return color;
+    return [self colorFromRGBA:color];
+}
+
+- (UIColor *)colorFromRGBA:(struct RGBA)rgba
+{
+    return [UIColor colorWithRed:rgba.red green:rgba.green blue:rgba.blue alpha:rgba.alpha];
 }
 
 @end

Source/osx/TypeConversion/Converters/TyphoonNSColorTypeConverter.h

@@ -0,0 +1,24 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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 "TyphoonTypeConverter.h"
+
+/**
+ * A type converter for NSColor.
+ *
+ * The formats supported are:
+ * Hexadecimal, #RRGGBB or #AARRGGBB
+ * Css-style, rgb(r,g,b) or rgba(r,g,b,a)
+ *
+ */
+@interface TyphoonNSColorTypeConverter : NSObject <TyphoonTypeConverter>
+
+@end

Source/osx/TypeConversion/Converters/TyphoonNSColorTypeConverter.m

@@ -0,0 +1,44 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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 "TyphoonNSColorTypeConverter.h"
+
+#import "TyphoonColorConversionUtils.h"
+
+@implementation TyphoonNSColorTypeConverter
+
+- (id)supportedType
+{
+    return @"NSColor";
+}
+
+- (id)convert:(NSString *)stringValue
+{
+    stringValue = [TyphoonTypeConversionUtils textWithoutTypeFromTextValue:stringValue];
+
+    struct RGBA color;
+
+    if ([stringValue hasPrefix:@"#"] || [stringValue hasPrefix:@"0x"]) {
+        color = [TyphoonColorConversionUtils colorFromHexString:stringValue];
+    }
+    else {
+        color = [TyphoonColorConversionUtils colorFromCssStyleString:stringValue];
+    }
+
+    return [self colorFromRGBA:color];
+}
+
+- (NSColor *)colorFromRGBA:(struct RGBA)rgba
+{
+    return [NSColor colorWithRed:rgba.red green:rgba.green blue:rgba.blue alpha:rgba.alpha];
+}
+
+@end

Tests/OSX/TypeConversion/TyphoonNSColorTypeConverterTests.m

@@ -0,0 +1,76 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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 <XCTest/XCTest.h>
+
+#import "TyphoonTypeConverterRegistry.h"
+#import "TyphoonTypeConverter.h"
+
+@interface TyphoonNSColorTypeConverterTests : XCTestCase
+
+@property(nonatomic, strong, readonly) NSColor *color;
+@property(nonatomic, strong) id <TyphoonTypeConverter> converter;
+
+@end
+
+@implementation TyphoonNSColorTypeConverterTests
+
+- (void)setUp {
+    [super setUp];
+
+    TyphoonTypeConverterRegistry *registry = [[TyphoonTypeConverterRegistry alloc] init];
+    self.converter = [registry converterForType:@"NSColor"];
+}
+
+- (void)tearDown {
+    self.converter = nil;
+
+    [super tearDown];
+}
+
+- (void)assertColor:(NSColor *)color red:(CGFloat)red green:(CGFloat)green blue:(CGFloat)blue alpha:(CGFloat)alpha
+{
+    XCTAssertNotNil(color);
+
+    CGFloat redComponent, greenComponent, blueComponent, alphaComponent;
+    [color getRed:&redComponent green:&greenComponent blue:&blueComponent alpha:&alphaComponent];
+
+    XCTAssertEqual(redComponent, red);
+    XCTAssertEqual(greenComponent, green);
+    XCTAssertEqual(blueComponent, blue);
+    XCTAssertEqual(alphaComponent, alpha);
+}
+
+- (void)test_converts_hex_string
+{
+    NSColor *color = [self.converter convert:@"NSColor(#ffffff)"];
+    [self assertColor:color red:1.0f green:1.0f blue:1.0f alpha:1.0f];
+}
+
+- (void)test_converts_hex_string_with_alpha
+{
+    NSColor *color = [self.converter convert:@"NSColor(#00ffffff)"];
+    [self assertColor:color red:1.0f green:1.0f blue:1.0f alpha:0.0f];
+}
+
+- (void)test_converts_css_style_rgb
+{
+    NSColor *color = [self.converter convert:@"NSColor(255,255,255)"];
+    [self assertColor:color red:1.0f green:1.0f blue:1.0f alpha:1.0f];
+}
+
+- (void)test_converts_css_style_rgba
+{
+    NSColor *color = [self.converter convert:@"NSColor(255,255,255,0.5)"];
+    [self assertColor:color red:1.0f green:1.0f blue:1.0f alpha:0.5f];
+}
+
+@end

Tests/iOS/TypeConversion/TyphoonUIColorConverterTests.m

@@ -26,13 +26,12 @@ - (void)setUp
     [super setUp];
     TyphoonTypeConverterRegistry *registry = [[TyphoonTypeConverterRegistry alloc] init];
     self.converter = [registry converterForType:@"UIColor"];
-
 }
 
 - (void)tearDown
 {
-    [super tearDown];
     self.converter = nil;
+    [super tearDown];
 }
 
 - (void)assertColor:(UIColor *)color red:(CGFloat)red green:(CGFloat)green blue:(CGFloat)blue alpha:(CGFloat)alpha