Merge branch 'release/1.0.1'

Author: kuler90

OrangeFramework.podspec

@@ -5,7 +5,7 @@
 
 Pod::Spec.new do |s|
   s.name             = "OrangeFramework"
-  s.version          = "1.0.0"
+  s.version          = "1.0.1"
   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.

OrangeFrameworkObjC.podspec

@@ -5,7 +5,7 @@
 
 Pod::Spec.new do |s|
   s.name             = "OrangeFrameworkObjC"
-  s.version          = "1.0.0"
+  s.version          = "1.0.1"
   s.summary          = "Powerful framework aimed at fast and high quality developing mobile apps on Objective-C."
   s.description      = <<-DESC
                        OrangeFramework is a collection of components for fast and high quality developing mobile apps on Objective-C.

Source/Extensions/Foundation/NSError+OFExtension.h

@@ -4,8 +4,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface NSError (OFExtension)
 
-+ (instancetype)of_errorWithDomainObject:(id)domainObject description:(NSString *)description NS_SWIFT_NAME(init(of_domainObject:description:));
-+ (instancetype)of_errorWithDomainObject:(id)domainObject code:(NSInteger)code description:(NSString *)description NS_SWIFT_NAME(init(of_domainObject:code:description:));
++ (instancetype)of_errorWithDomainObject:(id)domainObject description:(NSString *)description NS_SWIFT_UNAVAILABLE("Use swift init instead");
++ (instancetype)of_errorWithDomainObject:(id)domainObject code:(NSInteger)code description:(NSString *)description NS_SWIFT_UNAVAILABLE("Use swift init instead");
 
 @end
 

Source/Extensions/Foundation/NSError+OFExtension.swift

@@ -0,0 +1,9 @@
+import Foundation
+
+public extension NSError {
+  
+  public convenience init<T>(of_domainObject: T, code: Int = 0, description: String) {
+    self.init(domain: String(reflecting: T.self), code: code, userInfo: [NSLocalizedDescriptionKey: description])
+  }
+  
+}

Source/Extensions/Foundation/Warning+OFExtension.h

@@ -0,0 +1,4 @@
+#import <Foundation/Foundation.h>
+
+NS_INLINE void of_warning() __deprecated_msg("___ REMINDER ___");
+void of_warning() {}

Source/Extensions/OFExtensions.h

@@ -7,6 +7,7 @@
 #import "NSDate+OFExtension.h"
 #import "NSError+OFExtension.h"
 #import "NSString+OFExtension.h"
+#import "Warning+OFExtension.h"
 
 // UIKit
 #import "Geometry+OFExtension.h"

Source/Log/Log.swift

@@ -1,38 +1,44 @@
 import Foundation
 
-public typealias LogFlag = OFLogFlag
-public typealias LogHandler = ((lazyFormattedMessage: () -> String, rawMessage: String?, flag: LogFlag, function: String, file: String, line: UInt32) -> Bool)
+public typealias LogLevel = OFLogLevel
+public typealias LogHandler = ((lazyFormattedMessage: () -> String, rawMessage: String?, level: LogLevel, function: String, file: String, line: UInt32) -> Bool)
 
 public class Log {
 
-  /// set which message should be print in console, default handler return true when DEBUG preprocessor symbol defined and false otherwise
+  /// log handler, decide which message should print, by default print all in DEBUG and nothing otherwise
   public class func setHandler(handler: LogHandler?) {
     OFLogSetHandler(handler)
   }
 
   public class func error(value: Any?, _ function: String = __FUNCTION__, _ file: String = __FILE__, _ line: UInt32 = __LINE__) {
-    let message: String? = (value == nil) ? nil : String(reflecting: value!)
-    OFLog(message, .Error, function, file, line)
+    OFLog("\(value)", LogLevel.Error, function, file, line)
   }
 
   public class func warning(value: Any?, _ function: String = __FUNCTION__, _ file: String = __FILE__, _ line: UInt32 = __LINE__) {
-    let message: String? = (value == nil) ? nil : String(reflecting: value!)
-    OFLog(message, .Warning, function, file, line)
+    OFLog("\(value)", LogLevel.Warning, function, file, line)
   }
 
   public class func info(value: Any?, _ function: String = __FUNCTION__, _ file: String = __FILE__, _ line: UInt32 = __LINE__) {
-    let message: String? = (value == nil) ? nil : String(reflecting: value!)
-    OFLog(message, .Info, function, file, line)
+    OFLog("\(value)", LogLevel.Info, function, file, line)
   }
 
   public class func debug(value: Any?, _ function: String = __FUNCTION__, _ file: String = __FILE__, _ line: UInt32 = __LINE__) {
-    let message: String? = (value == nil) ? nil : String(reflecting: value!)
-    OFLog(message, .Debug, function, file, line)
+    OFLog("\(value)", LogLevel.Debug, function, file, line)
   }
 
   public class func verbose(value: Any?, _ function: String = __FUNCTION__, _ file: String = __FILE__, _ line: UInt32 = __LINE__) {
-    let message: String? = (value == nil) ? nil : String(reflecting: value!)
-    OFLog(message, .Verbose, function, file, line)
+    OFLog("\(value)", LogLevel.Verbose, function, file, line)
   }
 
+}
+
+
+extension LogLevel: Comparable {}
+
+public func ==(lhs: LogLevel, rhs: LogLevel) -> Bool {
+  return lhs.rawValue == rhs.rawValue
+}
+
+public func <(lhs: LogLevel, rhs: LogLevel) -> Bool {
+  return lhs.rawValue < rhs.rawValue
 }

Source/Log/OFLog.h

@@ -2,31 +2,31 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-typedef NS_ENUM(NSInteger, OFLogFlag)
+typedef NS_ENUM(NSInteger, OFLogLevel)
 {
-  OFLogFlagError,
-  OFLogFlagWarning,
-  OFLogFlagInfo,
-  OFLogFlagDebug,
-  OFLogFlagVerbose
+  OFLogLevelError,
+  OFLogLevelWarning,
+  OFLogLevelInfo,
+  OFLogLevelDebug,
+  OFLogLevelVerbose
 };
 
 typedef NSString * _Nonnull (^OFLogLazyMessage)(void);
-typedef BOOL (^OFLogHandler)(OFLogLazyMessage lazyFormattedMessage, NSString * _Nullable rawMessage, OFLogFlag flag, NSString *function, NSString *file, unsigned int line);
+typedef BOOL (^OFLogHandler)(OFLogLazyMessage lazyFormattedMessage, NSString * _Nullable rawMessage, OFLogLevel level, NSString *function, NSString *file, unsigned int line);
 
-FOUNDATION_EXPORT void OFLog(NSString * _Nullable message, OFLogFlag flag, NSString *function, NSString *file, unsigned int line);
-FOUNDATION_EXPORT void OFLogSetHandler(OFLogHandler _Nullable handler); // set which message should be print in console, default handler return YES in DEBUG and NO otherwise
+FOUNDATION_EXPORT void OFLog(NSString * _Nullable message, OFLogLevel level, NSString *function, NSString *file, unsigned int line);
+FOUNDATION_EXPORT void OFLogSetHandler(OFLogHandler _Nullable handler); // log handler, decide which message should print, by default print all in DEBUG and nothing otherwise
 
-#define OFLogError(format, ...) OFLog([NSString stringWithFormat:format,##__VA_ARGS__], OFLogFlagError, __func__, __FILE__, __LINE__)
-#define OFLogWarning(format,...) OFLog([NSString stringWithFormat:format,##__VA_ARGS__], OFLogFlagWarning, __func__, __FILE__, __LINE__)
-#define OFLogInfo(format, ...) OFLog([NSString stringWithFormat:format,##__VA_ARGS__], OFLogFlagInfo, __func__, __FILE__, __LINE__)
-#define OFLogDebug(format, ...) OFLog([NSString stringWithFormat:format,##__VA_ARGS__], OFLogFlagDebug, __func__, __FILE__, __LINE__)
-#define OFLogVerbose(format, ...) OFLog([NSString stringWithFormat:format,##__VA_ARGS__], OFLogFlagVerbose, __func__, __FILE__, __LINE__)
+#define OFLogError(format, ...) OFLog([NSString stringWithFormat:format,##__VA_ARGS__], OFLogLevelError, __func__, __FILE__, __LINE__)
+#define OFLogWarning(format,...) OFLog([NSString stringWithFormat:format,##__VA_ARGS__], OFLogLevelWarning, __func__, __FILE__, __LINE__)
+#define OFLogInfo(format, ...) OFLog([NSString stringWithFormat:format,##__VA_ARGS__], OFLogLevelInfo, __func__, __FILE__, __LINE__)
+#define OFLogDebug(format, ...) OFLog([NSString stringWithFormat:format,##__VA_ARGS__], OFLogLevelDebug, __func__, __FILE__, __LINE__)
+#define OFLogVerbose(format, ...) OFLog([NSString stringWithFormat:format,##__VA_ARGS__], OFLogLevelVerbose, __func__, __FILE__, __LINE__)
 
-#define OFLogErrorObject(object) OFLog([object debugDescription], OFLogFlagError, __func__, __FILE__, __LINE__)
-#define OFLogWarningObject(object) OFLog([object debugDescription], OFLogFlagWarning, __func__, __FILE__, __LINE__)
-#define OFLogInfoObject(object) OFLog([object debugDescription], OFLogFlagInfo, __func__, __FILE__, __LINE__)
-#define OFLogDebugObject(object) OFLog([object debugDescription], OFLogFlagDebug, __func__, __FILE__, __LINE__)
-#define OFLogVerboseObject(object) OFLog([object debugDescription], OFLogFlagVerbose, __func__, __FILE__, __LINE__)
+#define OFLogErrorObject(object) OFLog([object description], OFLogLevelError, __func__, __FILE__, __LINE__)
+#define OFLogWarningObject(object) OFLog([object description], OFLogLevelWarning, __func__, __FILE__, __LINE__)
+#define OFLogInfoObject(object) OFLog([object description], OFLogLevelInfo, __func__, __FILE__, __LINE__)
+#define OFLogDebugObject(object) OFLog([object description], OFLogLevelDebug, __func__, __FILE__, __LINE__)
+#define OFLogVerboseObject(object) OFLog([object description], OFLogLevelVerbose, __func__, __FILE__, __LINE__)
 
 NS_ASSUME_NONNULL_END

Source/Log/OFLog.m

@@ -11,37 +11,36 @@ void OFLogSetHandler(OFLogHandler handler) {
   _handler = [handler copy];
 }
 
-void OFLog(NSString * _Nullable message, OFLogFlag flag, NSString *function, NSString *file, unsigned int line) {
+void OFLog(NSString * _Nullable message, OFLogLevel level, NSString *function, NSString *file, unsigned int line) {
   __block NSString *formattedMessage = nil;
   OFLogLazyMessage lazyFormattedMessage = ^NSString * _Nonnull {
     if (!formattedMessage) {
       NSDateFormatter *dateFormatter = [NSDateFormatter new];
       dateFormatter.dateFormat = [NSDateFormatter dateFormatFromTemplate:@"ddMMyyyy HHmmssSSS" options:0 locale:nil];
       NSString *timeString = [dateFormatter stringFromDate:[NSDate date]];
-      NSString *flagString;
-      switch (flag) {
-        case OFLogFlagError:
-          flagString = @"ERROR";
+      NSString *levelString;
+      switch (level) {
+        case OFLogLevelError:
+          levelString = @"ERROR";
           break;
-        case OFLogFlagWarning:
-          flagString = @"WARNING";
+        case OFLogLevelWarning:
+          levelString = @"WARNING";
           break;
-        case OFLogFlagDebug:
-          flagString = @"DEBUG";
+        case OFLogLevelDebug:
+          levelString = @"DEBUG";
           break;
-        case OFLogFlagInfo:
-          flagString = @"INFO";
-          break;
-        case OFLogFlagVerbose:
-          flagString = @"VERBOSE";
+        case OFLogLevelInfo:
+          levelString = @"INFO";
           break;
+        case OFLogLevelVerbose:
+          levelString = @"VERBOSE";
       }
       NSString *filename = [file lastPathComponent];
-      formattedMessage = [NSString stringWithFormat:@"%@ [%@] %@:%d (%@): %@", timeString, flagString, filename, line, function, message];
+      formattedMessage = [NSString stringWithFormat:@"%@ [%@] %@:%d (%@): %@", timeString, levelString, filename, line, function, message];
     }
     return formattedMessage;
   };
-  if ( (!_handler && _defaultHandlerResult) || (_handler && _handler(lazyFormattedMessage, message, flag, function, file, line)) ) {
+  if ( (!_handler && _defaultHandlerResult) || (_handler && _handler(lazyFormattedMessage, message, level, function, file, line)) ) {
     printf("%s\n", [lazyFormattedMessage() UTF8String]);
   }
 }