Merge branch 'release/1.0.0'

.gitignore

@@ -16,6 +16,7 @@ DerivedData/
 *.perspectivev3
 !default.perspectivev3
 xcuserdata/
+xcshareddata/
 
 ## Other
 *.moved-aside

.travis.yml

@@ -1,5 +1,11 @@
 language: objective-c
 osx_image: xcode7.2
-xcode_sdk:
-xcode_project: Glide.xcodeproj
-xcode_scheme: Glide
+before_install:
+    - brew update
+    - brew outdated xctool || brew upgrade xctool
+    - sudo easy_install cpp-coveralls
+    - brew install tree
+script:
+    - xctool -project Glide.xcodeproj -scheme Glide build test -sdk macosx10.11 GCC_GENERATE_TEST_COVERAGE_FILES=YES GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES
+after_success:
+    - coveralls

Glide.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name         = 'Glide'
-    s.version      = '0.1.0'
+    s.version      = '1.0.0'
     s.summary      = 'Glide client for iOS & Mac OS X'
     s.author = {
         'Axel Etcheverry' => 'axel@etcheverry.biz'

Glide.xcodeproj/project.pbxproj

@@ -42,7 +42,9 @@
 		3C5D9C551C625EAF00A2BD5B /* GlideClient+Encode.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C5D9C531C625EAF00A2BD5B /* GlideClient+Encode.h */; };
 		3C5D9C561C625EAF00A2BD5B /* GlideClient+Encode.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C5D9C541C625EAF00A2BD5B /* GlideClient+Encode.m */; };
 		3C5D9C571C625EAF00A2BD5B /* GlideClient+Encode.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C5D9C541C625EAF00A2BD5B /* GlideClient+Encode.m */; };
-		3CE1A83A1C6BA03F0090086C /* LICENSE.md in Sources */ = {isa = PBXBuildFile; fileRef = 3CE1A8391C6BA03F0090086C /* LICENSE.md */; };
+		3C772E6B1C6CFD000012332A /* GlideUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C772E691C6CFD000012332A /* GlideUtils.h */; };
+		3C772E6C1C6CFD000012332A /* GlideUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C772E6A1C6CFD000012332A /* GlideUtils.m */; };
+		3C772E6E1C6CFDCF0012332A /* GlideUtilsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C772E6D1C6CFDCF0012332A /* GlideUtilsTests.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -84,6 +86,9 @@
 		3C5D9C4F1C625D2300A2BD5B /* GlideClient+Border.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GlideClient+Border.m"; sourceTree = "<group>"; };
 		3C5D9C531C625EAF00A2BD5B /* GlideClient+Encode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GlideClient+Encode.h"; sourceTree = "<group>"; };
 		3C5D9C541C625EAF00A2BD5B /* GlideClient+Encode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GlideClient+Encode.m"; sourceTree = "<group>"; };
+		3C772E691C6CFD000012332A /* GlideUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GlideUtils.h; sourceTree = "<group>"; };
+		3C772E6A1C6CFD000012332A /* GlideUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GlideUtils.m; sourceTree = "<group>"; };
+		3C772E6D1C6CFDCF0012332A /* GlideUtilsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GlideUtilsTests.m; sourceTree = "<group>"; };
 		3CE1A8371C6B9E4C0090086C /* .travis.yml */ = {isa = PBXFileReference; lastKnownFileType = text; path = .travis.yml; sourceTree = "<group>"; };
 		3CE1A8381C6BA0190090086C /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
 		3CE1A8391C6BA03F0090086C /* LICENSE.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = LICENSE.md; sourceTree = "<group>"; };
@@ -158,6 +163,8 @@
 				3C5D9C4F1C625D2300A2BD5B /* GlideClient+Border.m */,
 				3C5D9C531C625EAF00A2BD5B /* GlideClient+Encode.h */,
 				3C5D9C541C625EAF00A2BD5B /* GlideClient+Encode.m */,
+				3C772E691C6CFD000012332A /* GlideUtils.h */,
+				3C772E6A1C6CFD000012332A /* GlideUtils.m */,
 			);
 			path = Glide;
 			sourceTree = "<group>";
@@ -167,6 +174,7 @@
 			children = (
 				3C5D9C0D1C6125DC00A2BD5B /* GlideTests.m */,
 				3C5D9C0F1C6125DC00A2BD5B /* Info.plist */,
+				3C772E6D1C6CFDCF0012332A /* GlideUtilsTests.m */,
 			);
 			path = GlideTests;
 			sourceTree = "<group>";
@@ -179,6 +187,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				3C5D9C281C6214E000A2BD5B /* GlideClient+Orientation.h in Headers */,
+				3C772E6B1C6CFD000012332A /* GlideUtils.h in Headers */,
 				3C5D9C501C625D2300A2BD5B /* GlideClient+Border.h in Headers */,
 				3C5D9C371C624B3900A2BD5B /* GlideClient+PixelDensity.h in Headers */,
 				3C5D9C411C62506600A2BD5B /* GlideClient+Effects.h in Headers */,
@@ -293,8 +302,8 @@
 				3C5D9C331C62305D00A2BD5B /* GlideClient+Size.m in Sources */,
 				3C5D9C2E1C621C6F00A2BD5B /* GlideClient+Crop.m in Sources */,
 				3C5D9C471C62575F00A2BD5B /* GlideClient+Watermarks.m in Sources */,
-				3CE1A83A1C6BA03F0090086C /* LICENSE.md in Sources */,
 				3C5D9C3D1C624C9500A2BD5B /* GlideClient+Adjustments.m in Sources */,
+				3C772E6C1C6CFD000012332A /* GlideUtils.m in Sources */,
 				3C5D9C421C62506600A2BD5B /* GlideClient+Effects.m in Sources */,
 				3C5D9C4C1C625CA500A2BD5B /* GlideClient+Background.m in Sources */,
 				3C5D9C1B1C61269E00A2BD5B /* GlideClient.m in Sources */,
@@ -313,6 +322,7 @@
 				3C5D9C2F1C621C6F00A2BD5B /* GlideClient+Crop.m in Sources */,
 				3C5D9C481C62575F00A2BD5B /* GlideClient+Watermarks.m in Sources */,
 				3C5D9C3E1C624C9500A2BD5B /* GlideClient+Adjustments.m in Sources */,
+				3C772E6E1C6CFDCF0012332A /* GlideUtilsTests.m in Sources */,
 				3C5D9C431C62506600A2BD5B /* GlideClient+Effects.m in Sources */,
 				3C5D9C4D1C625CA500A2BD5B /* GlideClient+Background.m in Sources */,
 				3C5D9C0E1C6125DC00A2BD5B /* GlideTests.m in Sources */,
@@ -370,6 +380,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -411,6 +422,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
@@ -429,9 +441,10 @@
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_VERSION = A;
-				INFOPLIST_FILE = Glide/Info.plist;
+				INFOPLIST_FILE = "$(SRCROOT)/Glide/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.etcheverry.Glide;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -447,9 +460,10 @@
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_VERSION = A;
-				INFOPLIST_FILE = Glide/Info.plist;
+				INFOPLIST_FILE = "$(SRCROOT)/Glide/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.etcheverry.Glide;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;

Glide.xcodeproj/xcshareddata/xcbaselines/3C5D9C071C6125DC00A2BD5B.xcbaseline/Info.plist

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>runDestinationsByUUID</key>
+	<dict>
+		<key>03174D1C-7D38-4458-BA17-016D5759E28D</key>
+		<dict>
+			<key>localComputer</key>
+			<dict>
+				<key>busSpeedInMHz</key>
+				<integer>4294</integer>
+				<key>cpuCount</key>
+				<integer>1</integer>
+				<key>cpuKind</key>
+				<string>Intel Core i5</string>
+				<key>cpuSpeedInMHz</key>
+				<integer>2400</integer>
+				<key>logicalCPUCoresPerPackage</key>
+				<integer>4</integer>
+				<key>modelCode</key>
+				<string>MacBookPro6,2</string>
+				<key>physicalCPUCoresPerPackage</key>
+				<integer>2</integer>
+				<key>platformIdentifier</key>
+				<string>com.apple.platform.macosx</string>
+			</dict>
+			<key>targetArchitecture</key>
+			<string>x86_64</string>
+		</dict>
+	</dict>
+</dict>
+</plist>

Glide/GlideClient+Background.h

@@ -10,6 +10,6 @@
 
 @interface GlideClient (Background)
 
-- (void) setBackground:(NSString*)color;
+- (void) setBackground:(nonnull NSString*)color;
 
 @end

Glide/GlideClient+Background.m

@@ -10,7 +10,7 @@
 
 @implementation GlideClient (Background)
 
-- (void) setBackground:(NSString*)color {
+- (void) setBackground:(nonnull NSString*)color {
     [self.queries setObject:color forKey:@"bg"];
 }
 

Glide/GlideClient+Border.h

@@ -16,6 +16,6 @@ typedef NS_ENUM(NSInteger, GlideBorderType) {
 
 @interface GlideClient (Border)
 
-- (void) setBorderWithWidth:(NSUInteger)width color:(NSString*)color andType:(GlideBorderType)type;
+- (void) setBorderWithWidth:(NSUInteger)width color:(nonnull NSString*)color andType:(GlideBorderType)type;
 
 @end

Glide/GlideClient+Border.m

@@ -10,7 +10,7 @@
 
 @implementation GlideClient (Border)
 
-- (void) setBorderWithWidth:(NSUInteger)width color:(NSString*)color andType:(GlideBorderType)type {
+- (void) setBorderWithWidth:(NSUInteger)width color:(nonnull NSString*)color andType:(GlideBorderType)type {
     NSString* method = @"";
 
     switch (type) {

Glide/GlideClient+Crop.h

@@ -17,6 +17,9 @@
  \param y The y of image
  \return void
  */
-- (void) setCropWithWidth:(NSUInteger)width height:(NSUInteger)height x:(NSUInteger)x y:(NSUInteger)y;
+- (void) setCropWithWidth:(NSUInteger)width
+                   height:(NSUInteger)height
+                        x:(NSUInteger)x
+                        y:(NSUInteger)y;
 
 @end

Glide/GlideClient+Size.h

@@ -33,7 +33,7 @@ typedef NS_ENUM(NSInteger, GlideFitType) {
 
 - (void) setHeight:(NSUInteger)height;
 
-- (void) setFit:(NSString*)fit;
+- (void) setFit:(nonnull NSString*)fit;
 
 - (void) setFitWithPosition:(GlideFitType)type;
 

Glide/GlideClient+Size.m

@@ -24,7 +24,7 @@ - (void) setHeight:(NSUInteger)height {
     [self.queries setObject:[NSString stringWithFormat:@"%lu", (unsigned long)height] forKey:@"h"];
 }
 
-- (void) setFit:(NSString*)fit {
+- (void) setFit:(nonnull NSString*)fit {
     [self.queries setObject:fit forKey:@"fit"];
 }
 

Glide/GlideClient+Watermarks.h

@@ -30,7 +30,7 @@ typedef NS_ENUM(NSInteger, GlideMarkPosType) {
 
 @interface GlideClient (Watermarks)
 
-- (void) setMarkPath:(NSString*)path;
+- (void) setMarkPath:(nonnull NSString*)path;
 
 - (void) setMarkWidth:(NSUInteger)width;
 

Glide/GlideClient+Watermarks.m

@@ -10,7 +10,7 @@
 
 @implementation GlideClient (Watermarks)
 
-- (void) setMarkPath:(NSString*)path {
+- (void) setMarkPath:(nonnull NSString*)path {
     [self.queries setObject:path forKey:@"mark"];
 }
 

Glide/GlideClient.h

@@ -7,14 +7,14 @@
 //
 
 #import <Foundation/Foundation.h>
-
+#import "GlideUtils.h"
 
 @interface GlideClient : NSObject
 
 #pragma mark - Properties
 
 @property (nullable, nonatomic) NSURL *url;
-
+@property (nullable, nonatomic, copy) NSString *signature;
 @property (nullable, nonatomic, copy) NSString *scheme;
 @property (nullable, nonatomic, copy) NSString *host;
 @property (nullable, nonatomic, copy) NSNumber *port;
@@ -23,14 +23,21 @@
 @property (nullable, nonatomic, copy) NSString *path;
 @property (nullable, nonatomic) NSMutableDictionary *queries;
 
+
 #pragma mark - Initializers
 
 - (nonnull instancetype)initWithString:(nonnull NSString *)URLString;
 
+- (nonnull instancetype)initWithBase:(nonnull NSString *)BaseString;
+
 #pragma mark - URL Building
 
 - (nullable NSURL *)absoluteURL;
 
 - (nullable NSString*)absoluteString;
 
+- (nullable NSString*)absoluteStringFromPath:(nonnull NSString *)path;
+
+- (nullable NSString *)queryString;
+
 @end