Merge remote-tracking branch 'bor9brest/extensions' into develop, fix podspec, fix color extension

Author: kuler90

Example/Podfile.lock

@@ -4,12 +4,12 @@ PODS:
     - OrangeFramework/Dependency (= 0.1.0)
     - OrangeFramework/Extensions (= 0.1.0)
     - OrangeFramework/Log (= 0.1.0)
-    - OrangeFramework/Segue (= 0.1.0)
+    - OrangeFramework/Segues (= 0.1.0)
     - OrangeFramework/SystemInfo (= 0.1.0)
   - OrangeFramework/Dependency (0.1.0)
   - OrangeFramework/Extensions (0.1.0)
   - OrangeFramework/Log (0.1.0)
-  - OrangeFramework/Segue (0.1.0)
+  - OrangeFramework/Segues (0.1.0)
   - OrangeFramework/SystemInfo (0.1.0)
   - Quick (0.8.0)
 
@@ -24,7 +24,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Nimble: 4c353d43735b38b545cbb4cb91504588eb5de926
-  OrangeFramework: eefc467b5f89a9ddf78c220ac219030e9b57d0e5
+  OrangeFramework: 70e205c80d395612b596617ea661f06e10f9bf6a
   Quick: 563d0f6ec5f72e394645adb377708639b7dd38ab
 
 COCOAPODS: 0.39.0

Example/Specs/OFExtensionSpec.m

@@ -5,15 +5,128 @@
 QuickSpecBegin(OFExtensionSpec)
 
 describe(@"NSBlockOperation+AsyncBlock", ^{
-  
-})
+  context(@"when use serial queue", ^{
+    it(@"run async operation in series", ^{
+      __block NSString  *testString = @"";
+      NSOperationQueue *testOperationQueue = [[NSOperationQueue alloc]init];
+      testOperationQueue.maxConcurrentOperationCount = 1;
+      [testOperationQueue  addOperationWithAsyncBlock:^(OFAsyncBlockFinish  _Nonnull finish) {
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+          testString = [testString stringByAppendingString:@"1"];
+          finish();
+        });
+      }];
+      [testOperationQueue  addOperationWithAsyncBlock:^(OFAsyncBlockFinish  _Nonnull finish) {
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+          testString = [testString stringByAppendingString:@"2"];
+          finish();
+        });
+      }];
+      [testOperationQueue  addOperationWithAsyncBlock:^(OFAsyncBlockFinish  _Nonnull finish) {
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+          testString = [testString stringByAppendingString:@"3"];
+          finish();
+        });
+      }];
+      expect(testString).toEventually(equal(@"123"));
+    });
+  });
+  context(@"when use parallel queue", ^{
+    it(@"run async operation in parallel", ^{
+      __block NSString  *testString = @"";
+      NSOperationQueue *testOperationQueue = [[NSOperationQueue alloc]init];
+      testOperationQueue.maxConcurrentOperationCount = 3;
+      [testOperationQueue  addOperationWithAsyncBlock:^(OFAsyncBlockFinish  _Nonnull finish) {
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+          testString = [testString stringByAppendingString:@"1"];
+          finish();
+        });
+      }];
+      [testOperationQueue  addOperationWithAsyncBlock:^(OFAsyncBlockFinish  _Nonnull finish) {
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+          testString = [testString stringByAppendingString:@"2"];
+          finish();
+        });
+      }];
+      [testOperationQueue  addOperationWithAsyncBlock:^(OFAsyncBlockFinish  _Nonnull finish) {
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+          testString = [testString stringByAppendingString:@"3"];
+          finish();
+        });
+      }];
+      expect(testString).toEventually(equal(@"132"));
+    });
+  });
+});
 
 describe(@"NSString+Regex", ^{
-  
-})
+  context(@"when the string contains regex pattern", ^{
+    NSString *testString = @"This is test string.";
+    it(@"match regex", ^{
+      NSString *testRegex = @".*";
+      expect(@([testString matchRegex:testRegex])).to(beTrue());
+    });
+    
+    it(@"has first match of regex", ^{
+      NSString *testRegex = @"is";
+      expect([testString firstMatchOfRegex:testRegex]).toNot(beNil());
+    });
+    
+    it(@"has all matches of regex", ^{
+      NSString *testRegex = @"is";
+      NSInteger resultCount = 2;
+      expect(@([testString allMatchesOfRegex:testRegex].count)).to(equal(@(resultCount)));
+    });
+    
+    it(@"has match email", ^{
+      NSString *testEmail = @"test@mail.com";
+      expect(@([testEmail matchEmailString])).to(beTrue());
+    });
+  });
+  context(@"when the string NOT contains regex pattern", ^{
+    NSString *testString = @"This is test string.";
+    it(@"not match regex", ^{
+      NSString *testRegex = @"This";
+      expect(@([testString matchRegex:testRegex])).toNot(beTrue());
+    });
+    it(@"has not first match of regex", ^{
+      NSString *testRegex = @"testing";
+      expect([testString firstMatchOfRegex:testRegex]).to(beNil());
+    });
+    
+    it(@"has not all matches of regex", ^{
+      NSString *testRegex = @"testing";
+      expect([testString firstMatchOfRegex:testRegex]).to(beNil());
+    });
+    
+    it(@"has not match email", ^{
+      NSString *testEmail = @"testmail.com";
+      expect(@([testEmail matchEmailString])).toNot(beTrue());
+    });
+  });
+});
 
 describe(@"UIColor+HexString", ^{
-  
-})
+  context(@"when valid hex string", ^{
+    it(@"create color", ^{
+      NSString *testStringColor = @"#e74c3c";
+      CGFloat testR = 231/256.0f, testG = 76/256.0f, testB = 60/256.0f;
+      UIColor *testColor = [UIColor colorWithHexString:testStringColor];
+      CGFloat r, g, b;
+      [testColor getRed:&r green:&g blue:&b alpha:NULL];
+      expect(@(r)).to(equal(@(testR)));
+      expect(@(g)).to(equal(@(testG)));
+      expect(@(b)).to(equal(@(testB)));
+    });
+    context(@"when NOT valid hex string", ^{
+      it(@"create NIL color", ^{
+        NSString *testStringColor = @"888e74c3c";
+        expect([UIColor colorWithHexString:testStringColor]).to(beNil());
+      });
+    });
+    
+  });
+});
 
 QuickSpecEnd
+

OrangeFramework.podspec

@@ -6,7 +6,7 @@
 Pod::Spec.new do |s|
   s.name             = "OrangeFramework"
   s.version          = "0.1.0"
-  s.summary          = "Powerful framework aimed at fast and high quality developing mobile apps on Objective-C and Swift.
+  s.summary          = "Powerful framework aimed at fast and high quality developing mobile apps on Objective-C and Swift."
   s.description      = <<-DESC
                        OrangeFramework is a collection of components for fast and high quality developing mobile apps on Objective-C and Swift.
                        It includes a light-weight iOC container (used for dependency injection), flexible logger, powerful extensions and simple system info getter.

OrangeFramework/Extensions/UIKit/UIColor+OFExtension.h

@@ -7,8 +7,8 @@ NS_ASSUME_NONNULL_BEGIN
 + (instancetype)colorWith8BitRed:(NSUInteger)red green:(NSUInteger)green blue:(NSUInteger)blue NS_SWIFT_UNAVAILABLE("Use swift init instead");
 + (instancetype)colorWith8BitRed:(NSUInteger)red green:(NSUInteger)green blue:(NSUInteger)blue alpha:(CGFloat)alpha NS_SWIFT_UNAVAILABLE("Use swift init instead");
 
-+ (instancetype)colorWithHexString:(NSString *)hexString;
-+ (instancetype)colorWithHexString:(NSString *)hexString alpha:(CGFloat)alpha;
++ (nullable instancetype)colorWithHexString:(NSString *)hexString;
++ (nullable instancetype)colorWithHexString:(NSString *)hexString alpha:(CGFloat)alpha;
 
 @end
 

OrangeFramework/Extensions/UIKit/UIColor+OFExtension.m

@@ -15,11 +15,15 @@ + (instancetype)colorWithHexString:(NSString *)hexString {
 }
 
 + (instancetype)colorWithHexString:(NSString *)hexString alpha:(CGFloat)alpha {
-  unsigned rgbValue = 0;
-  NSScanner *scanner = [NSScanner scannerWithString:hexString];
-  [scanner setCharactersToBeSkipped:[NSCharacterSet characterSetWithCharactersInString:@"#"]];
-  [scanner scanHexInt:&rgbValue];
-  return [self colorWith8BitRed:(rgbValue & 0xFF0000) >> 16 green:(rgbValue & 0xFF00) >> 8 blue:rgbValue & 0xFF alpha:alpha];
+  NSString *cleanedHexString = [hexString stringByReplacingOccurrencesOfString:@"#" withString:@""];
+  if (cleanedHexString.length == 6) {
+    NSScanner *scanner = [NSScanner scannerWithString:cleanedHexString];
+    unsigned rgbValue = 0;
+    if ([scanner scanHexInt:&rgbValue]) {
+      return [self colorWith8BitRed:(rgbValue & 0xFF0000) >> 16 green:(rgbValue & 0xFF00) >> 8 blue:rgbValue & 0xFF alpha:alpha];
+    }
+  }
+  return nil;
 }
 
 @end