pbind 0.6.2 → 0.8.2

data/source/PBLiveLoader/PBLLResource.h

@@ -0,0 +1,25 @@
+//
+//  PBLLResource.h
+//  Pbind
+//
+//  Created by galen on 17/7/30.
+//
+
+#import "PBLLOptions.h"
+#include <targetconditionals.h>
+
+#if (PBLIVE_ENABLED)
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+@interface PBLLResource : NSObject
+
+@property (nonatomic, strong, class, readonly) UIImage *logoImage;
+@property (nonatomic, strong, class, readonly) UIImage *copyImage;
+@property (nonatomic, strong, class, readonly) NSString *pbindTitle;
+@property (nonatomic, strong, class, readonly) UIColor *pbindColor;
+
+@end
+
+#endif

data/source/PBLiveLoader/PBLLResource.m

@@ -0,0 +1,208 @@
+//
+//  PBLLResource.m
+//  Pbind
+//
+//  Created by galen on 17/7/30.
+//
+
+#import "PBLLResource.h"
+
+#if (PBLIVE_ENABLED)
+
+#import <Pbind/Pbind.h>
+
+@implementation PBLLResource
+
++ (NSString *)pbindTitle {
+    return @"Pbind";
+}
+
++ (UIColor *)pbindColor {
+    return PBColorMake(@"5D74E9");
+}
+
++ (UIImage *)imageWithWidth:(CGFloat)width height:(CGFloat)height draw:(dispatch_block_t)drawBlock {
+    CGRect imageRect = CGRectMake(0.0, 0.0, width, height);
+    UIGraphicsBeginImageContextWithOptions(imageRect.size, NO, [UIScreen mainScreen].scale);
+    
+    drawBlock();
+    
+    UIImage *image = UIGraphicsGetImageFromCurrentImageContext();
+    UIGraphicsEndImageContext();
+    return image;
+}
+
++ (UIImage *)logoImage {
+    static UIImage *image = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        image = [self imageWithWidth:32.f height:32.f draw:^{
+            //// Color Declarations
+            //// General Declarations
+            CGContextRef context = UIGraphicsGetCurrentContext();
+            
+            //// Color Declarations
+            UIColor* fillColor4 = [UIColor whiteColor];;
+            
+            //// Group
+            {
+                CGContextSaveGState(context);
+                CGContextBeginTransparencyLayer(context, NULL);
+                
+                //// Clip Clip 2
+                UIBezierPath* clip2Path = [UIBezierPath bezierPath];
+                [clip2Path moveToPoint: CGPointMake(16, 32)];
+                [clip2Path addCurveToPoint: CGPointMake(32, 16) controlPoint1: CGPointMake(24.84, 32) controlPoint2: CGPointMake(32, 24.84)];
+                [clip2Path addCurveToPoint: CGPointMake(16, 0) controlPoint1: CGPointMake(32, 7.16) controlPoint2: CGPointMake(24.84, 0)];
+                [clip2Path addCurveToPoint: CGPointMake(0, 16) controlPoint1: CGPointMake(7.16, 0) controlPoint2: CGPointMake(0, 7.16)];
+                [clip2Path addCurveToPoint: CGPointMake(16, 32) controlPoint1: CGPointMake(0, 24.84) controlPoint2: CGPointMake(7.16, 32)];
+                [clip2Path closePath];
+                clip2Path.usesEvenOddFillRule = YES;
+                
+                [clip2Path addClip];
+                
+                
+                //// Group 2
+                {
+                    CGContextSaveGState(context);
+                    CGContextBeginTransparencyLayer(context, NULL);
+                    
+                    //// Clip Clip
+                    UIBezierPath* clipPath = [UIBezierPath bezierPath];
+                    [clipPath moveToPoint: CGPointMake(12.13, 20.25)];
+                    [clipPath addCurveToPoint: CGPointMake(-19.8, 48) controlPoint1: CGPointMake(10.03, 35.91) controlPoint2: CGPointMake(-3.46, 48)];
+                    [clipPath addCurveToPoint: CGPointMake(-52, 16) controlPoint1: CGPointMake(-37.58, 48) controlPoint2: CGPointMake(-52, 33.67)];
+                    [clipPath addCurveToPoint: CGPointMake(-19.8, -16) controlPoint1: CGPointMake(-52, -1.67) controlPoint2: CGPointMake(-37.58, -16)];
+                    [clipPath addCurveToPoint: CGPointMake(12.13, 11.75) controlPoint1: CGPointMake(-3.46, -16) controlPoint2: CGPointMake(10.03, -3.91)];
+                    [clipPath addCurveToPoint: CGPointMake(18.95, 8) controlPoint1: CGPointMake(13.55, 9.5) controlPoint2: CGPointMake(16.07, 8)];
+                    [clipPath addCurveToPoint: CGPointMake(27, 16) controlPoint1: CGPointMake(23.4, 8) controlPoint2: CGPointMake(27, 11.58)];
+                    [clipPath addCurveToPoint: CGPointMake(18.95, 24) controlPoint1: CGPointMake(27, 20.42) controlPoint2: CGPointMake(23.4, 24)];
+                    [clipPath addCurveToPoint: CGPointMake(12.13, 20.25) controlPoint1: CGPointMake(16.07, 24) controlPoint2: CGPointMake(13.55, 22.5)];
+                    [clipPath closePath];
+                    [clipPath moveToPoint: CGPointMake(18.95, 22.5)];
+                    [clipPath addCurveToPoint: CGPointMake(25.49, 16) controlPoint1: CGPointMake(22.56, 22.5) controlPoint2: CGPointMake(25.49, 19.59)];
+                    [clipPath addCurveToPoint: CGPointMake(18.95, 9.5) controlPoint1: CGPointMake(25.49, 12.41) controlPoint2: CGPointMake(22.56, 9.5)];
+                    [clipPath addCurveToPoint: CGPointMake(12.41, 16) controlPoint1: CGPointMake(15.34, 9.5) controlPoint2: CGPointMake(12.41, 12.41)];
+                    [clipPath addCurveToPoint: CGPointMake(18.95, 22.5) controlPoint1: CGPointMake(12.41, 19.59) controlPoint2: CGPointMake(15.34, 22.5)];
+                    [clipPath closePath];
+                    [clipPath moveToPoint: CGPointMake(-19.8, 46.5)];
+                    [clipPath addCurveToPoint: CGPointMake(10.9, 16) controlPoint1: CGPointMake(-2.84, 46.5) controlPoint2: CGPointMake(10.9, 32.84)];
+                    [clipPath addCurveToPoint: CGPointMake(-19.8, -14.5) controlPoint1: CGPointMake(10.9, -0.84) controlPoint2: CGPointMake(-2.84, -14.5)];
+                    [clipPath addCurveToPoint: CGPointMake(-50.49, 16) controlPoint1: CGPointMake(-36.75, -14.5) controlPoint2: CGPointMake(-50.49, -0.84)];
+                    [clipPath addCurveToPoint: CGPointMake(-19.8, 46.5) controlPoint1: CGPointMake(-50.49, 32.84) controlPoint2: CGPointMake(-36.75, 46.5)];
+                    [clipPath closePath];
+                    clipPath.usesEvenOddFillRule = YES;
+                    
+                    [clipPath addClip];
+                    
+                    
+                    //// Rectangle Drawing
+                    UIBezierPath* rectanglePath = [UIBezierPath bezierPathWithRect: CGRectMake(1, 0, 31, 32)];
+                    [fillColor4 setFill];
+                    [rectanglePath fill];
+                    
+                    
+                    CGContextEndTransparencyLayer(context);
+                    CGContextRestoreGState(context);
+                }
+                
+                
+                CGContextEndTransparencyLayer(context);
+                CGContextRestoreGState(context);
+            }
+
+        }];
+    });
+    return image;
+}
+
++ (UIImage *)copyImage {
+    static UIImage *image = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        image = [self imageWithWidth:24.f height:24.f draw:^{
+            //// Color Declarations
+            UIColor* fillColor2 = [UIColor colorWithRed: 0 green: 0 blue: 0 alpha: 1];
+            
+            //// Text-files
+            {
+                //// Bezier Drawing
+                UIBezierPath* bezierPath = [UIBezierPath bezierPath];
+                [bezierPath moveToPoint: CGPointMake(22.1, 3.43)];
+                [bezierPath addLineToPoint: CGPointMake(20.64, 3.43)];
+                [bezierPath addCurveToPoint: CGPointMake(20.55, 3.45) controlPoint1: CGPointMake(20.61, 3.43) controlPoint2: CGPointMake(20.58, 3.44)];
+                [bezierPath addLineToPoint: CGPointMake(20.55, 1.88)];
+                [bezierPath addCurveToPoint: CGPointMake(18.66, 0) controlPoint1: CGPointMake(20.55, 0.84) controlPoint2: CGPointMake(19.7, 0)];
+                [bezierPath addLineToPoint: CGPointMake(5.97, 0)];
+                [bezierPath addCurveToPoint: CGPointMake(4.08, 1.88) controlPoint1: CGPointMake(4.93, 0) controlPoint2: CGPointMake(4.08, 0.84)];
+                [bezierPath addLineToPoint: CGPointMake(4.08, 19.45)];
+                [bezierPath addCurveToPoint: CGPointMake(5.97, 21.33) controlPoint1: CGPointMake(4.08, 20.49) controlPoint2: CGPointMake(4.93, 21.33)];
+                [bezierPath addLineToPoint: CGPointMake(8.2, 21.33)];
+                [bezierPath addLineToPoint: CGPointMake(8.2, 22.18)];
+                [bezierPath addCurveToPoint: CGPointMake(10.02, 24) controlPoint1: CGPointMake(8.2, 23.19) controlPoint2: CGPointMake(9.01, 24)];
+                [bezierPath addLineToPoint: CGPointMake(22.1, 24)];
+                [bezierPath addCurveToPoint: CGPointMake(23.92, 22.18) controlPoint1: CGPointMake(23.1, 24) controlPoint2: CGPointMake(23.92, 23.19)];
+                [bezierPath addLineToPoint: CGPointMake(23.92, 5.24)];
+                [bezierPath addCurveToPoint: CGPointMake(22.1, 3.43) controlPoint1: CGPointMake(23.92, 4.24) controlPoint2: CGPointMake(23.1, 3.43)];
+                [bezierPath closePath];
+                [bezierPath moveToPoint: CGPointMake(4.83, 19.45)];
+                [bezierPath addLineToPoint: CGPointMake(4.83, 1.88)];
+                [bezierPath addCurveToPoint: CGPointMake(5.97, 0.76) controlPoint1: CGPointMake(4.83, 1.27) controlPoint2: CGPointMake(5.34, 0.76)];
+                [bezierPath addLineToPoint: CGPointMake(18.66, 0.76)];
+                [bezierPath addCurveToPoint: CGPointMake(19.8, 1.88) controlPoint1: CGPointMake(19.29, 0.76) controlPoint2: CGPointMake(19.8, 1.27)];
+                [bezierPath addLineToPoint: CGPointMake(19.8, 19.45)];
+                [bezierPath addCurveToPoint: CGPointMake(18.66, 20.57) controlPoint1: CGPointMake(19.8, 20.07) controlPoint2: CGPointMake(19.29, 20.57)];
+                [bezierPath addLineToPoint: CGPointMake(5.97, 20.57)];
+                [bezierPath addCurveToPoint: CGPointMake(4.83, 19.45) controlPoint1: CGPointMake(5.34, 20.57) controlPoint2: CGPointMake(4.83, 20.07)];
+                [bezierPath closePath];
+                [bezierPath moveToPoint: CGPointMake(23.17, 22.18)];
+                [bezierPath addCurveToPoint: CGPointMake(22.1, 23.24) controlPoint1: CGPointMake(23.17, 22.77) controlPoint2: CGPointMake(22.69, 23.24)];
+                [bezierPath addLineToPoint: CGPointMake(10.02, 23.24)];
+                [bezierPath addCurveToPoint: CGPointMake(8.95, 22.18) controlPoint1: CGPointMake(9.43, 23.24) controlPoint2: CGPointMake(8.95, 22.77)];
+                [bezierPath addLineToPoint: CGPointMake(8.95, 21.33)];
+                [bezierPath addLineToPoint: CGPointMake(18.66, 21.33)];
+                [bezierPath addCurveToPoint: CGPointMake(20.55, 19.45) controlPoint1: CGPointMake(19.7, 21.33) controlPoint2: CGPointMake(20.55, 20.49)];
+                [bezierPath addLineToPoint: CGPointMake(20.55, 4.17)];
+                [bezierPath addCurveToPoint: CGPointMake(20.64, 4.19) controlPoint1: CGPointMake(20.58, 4.18) controlPoint2: CGPointMake(20.61, 4.19)];
+                [bezierPath addLineToPoint: CGPointMake(22.1, 4.19)];
+                [bezierPath addCurveToPoint: CGPointMake(23.17, 5.24) controlPoint1: CGPointMake(22.69, 4.19) controlPoint2: CGPointMake(23.17, 4.66)];
+                [bezierPath addLineToPoint: CGPointMake(23.17, 22.18)];
+                [bezierPath closePath];
+                bezierPath.miterLimit = 4;
+                
+                [fillColor2 setFill];
+                [bezierPath fill];
+                
+                
+                //// Rectangle Drawing
+                UIBezierPath* rectanglePath = [UIBezierPath bezierPathWithRoundedRect: CGRectMake(8.25, 4.17, 8.4, 1.05) cornerRadius: 0.53];
+                [fillColor2 setFill];
+                [rectanglePath fill];
+                
+                
+                //// Rectangle 2 Drawing
+                UIBezierPath* rectangle2Path = [UIBezierPath bezierPathWithRoundedRect: CGRectMake(8.25, 7.33, 8.4, 1.05) cornerRadius: 0.52];
+                [fillColor2 setFill];
+                [rectangle2Path fill];
+                
+                
+                //// Rectangle 3 Drawing
+                UIBezierPath* rectangle3Path = [UIBezierPath bezierPathWithRoundedRect: CGRectMake(8.25, 10.48, 8.4, 1.05) cornerRadius: 0.52];
+                [fillColor2 setFill];
+                [rectangle3Path fill];
+                
+                
+                //// Rectangle 4 Drawing
+                UIBezierPath* rectangle4Path = [UIBezierPath bezierPathWithRoundedRect: CGRectMake(8.25, 13.58, 5.2, 1.05) cornerRadius: 0.52];
+                [fillColor2 setFill];
+                [rectangle4Path fill];
+            }
+        }];
+    });
+    
+    return image;
+}
+
+@end
+
+#endif

data/source/PBLiveLoader/PBLiveLoader.m

@@ -102,9 +102,21 @@ static BOOL HasSuffix(NSString *src, NSString *tail)
     NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
     NSString *documentPath = paths.firstObject;
     NSString *tempBundlePath = [documentPath stringByAppendingPathComponent:@".pb_liveload"];
-    if (![[NSFileManager defaultManager] fileExistsAtPath:tempBundlePath]) {
-        [[NSFileManager defaultManager] createDirectoryAtPath:tempBundlePath withIntermediateDirectories:NO attributes:nil error:nil];
+    NSError *error = nil;
+    if ([[NSFileManager defaultManager] fileExistsAtPath:tempBundlePath]) {
+        [[NSFileManager defaultManager] removeItemAtPath:tempBundlePath error:&error];
+        if (error != nil) {
+            NSLog(@"PBLiveLoader: Failed to clear cache.");
+            return;
+        }
+    }
+    
+    [[NSFileManager defaultManager] createDirectoryAtPath:tempBundlePath withIntermediateDirectories:NO attributes:nil error:&error];
+    if (error != nil) {
+        NSLog(@"PBLiveLoader: Failed to initialize cache.");
+        return;
     }
+    
     [self defaultLoader]->tempResourcesPath = tempBundlePath;
     [Pbind addResourcesBundle:[NSBundle bundleWithPath:tempBundlePath]];
 #endif
@@ -160,15 +172,28 @@ static BOOL HasSuffix(NSString *src, NSString *tail)
         if (method != nil && ![method isEqualToString:@"GET"]) {
             action = [action stringByAppendingFormat:@"@%@", [method lowercaseString]];
         }
-        action = [action stringByReplacingOccurrencesOfString:@"/" withString:@"-"];
         if (kIgnoreAPIs != nil && [kIgnoreAPIs containsObject:action]) {
             complection(nil);
             return;
         }
         
-        NSString *jsonName = [NSString stringWithFormat:@"%@/%@.json", [[client class] description], action];
+        action = [action stringByReplacingOccurrencesOfString:@"/" withString:@":"];
+        if (kIgnoreAPIs != nil && [kIgnoreAPIs containsObject:action]) {
+            complection(nil);
+            return;
+        }
+        
+        NSString *clientName = [[client class] alias];
+        if (clientName == nil) {
+            clientName = [[client class] description];
+        }
+        NSString *jsonName = [NSString stringWithFormat:@"%@/%@", clientName, action];
+        if (kIgnoreAPIs != nil && [kIgnoreAPIs containsObject:jsonName]) {
+            complection(nil);
+            return;
+        }
 #if (TARGET_IPHONE_SIMULATOR)
-        NSString *jsonPath = [serverPath stringByAppendingPathComponent:jsonName];
+        NSString *jsonPath = [[serverPath stringByAppendingPathComponent:jsonName] stringByAppendingPathExtension:@"json"];
         if (![[NSFileManager defaultManager] fileExistsAtPath:jsonPath]) {
             NSLog(@"PBLiveLoader: Missing '%@', ignores!", jsonName);
             complection(nil);
@@ -278,7 +303,6 @@ static BOOL HasSuffix(NSString *src, NSString *tail)
 - (void)requestAPI:(NSString *)api complection:(void (^)(PBResponse *))complection {
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
-        [PBLLInspector addToWindow];
         [[PBLLRemoteWatcher globalWatcher] connectDefaultIP];
     });
     
@@ -299,14 +323,26 @@ static BOOL HasSuffix(NSString *src, NSString *tail)
 
 #pragma mark - PBLLRemoteWatcherDelegate
 
+- (void)remoteWatcher:(PBLLRemoteWatcher *)watcher didChangeConnectState:(BOOL)connected {
+    [[PBLLInspector sharedInspector] updateConnectState:connected];
+}
+
 - (void)remoteWatcher:(PBLLRemoteWatcher *)watcher didReceiveResponse:(NSData *)jsonData {
     [[self class] receiveJsonData:jsonData withFile:nil complection:apiComplection];
 }
 
 - (void)remoteWatcher:(PBLLRemoteWatcher *)watcher didUpdateFile:(NSString *)fileName withData:(NSData *)data {
     if (HasSuffix(fileName, @".plist")) {
-        NSString *plist = [tempResourcesPath stringByAppendingPathComponent:fileName];
-        [data writeToFile:plist atomically:NO];
+        NSError *error;
+        NSPropertyListFormat format;
+        NSDictionary *dict = [NSPropertyListSerialization propertyListWithData:data options:NSPropertyListImmutable format:&format error:&error];
+        if (!dict){
+            NSLog(@"PBLiveLoader: Got a invalid plist. (error: %@)", error);
+            return;
+        }
+        
+        NSString *plistPath = [tempResourcesPath stringByAppendingPathComponent:fileName];
+        [data writeToFile:plistPath atomically:NO];
         
         [Pbind reloadViewsOnPlistUpdate:fileName];
     } else if (HasSuffix(fileName, @".json")) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pbind
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.8.2
 platform: ruby
 authors:
 - Galen Lin
@@ -76,8 +76,10 @@ files:
 - lib/pbind/command.rb
 - lib/pbind/command/mock.rb
 - lib/pbind/command/serv.rb
+- lib/pbind/command/view.rb
 - lib/pbind/command/watch.rb
 - lib/pbind/gem_version.rb
+- lib/pbind/minify.rb
 - lib/pbind/user_interface.rb
 - source/PBLiveLoader/NSInputStream+Reader.h
 - source/PBLiveLoader/NSInputStream+Reader.m
@@ -87,9 +89,13 @@ files:
 - source/PBLiveLoader/PBLLInspector.m
 - source/PBLiveLoader/PBLLInspectorController.h
 - source/PBLiveLoader/PBLLInspectorController.m
+- source/PBLiveLoader/PBLLInspectorTipsController.h
+- source/PBLiveLoader/PBLLInspectorTipsController.m
 - source/PBLiveLoader/PBLLOptions.h
 - source/PBLiveLoader/PBLLRemoteWatcher.h
 - source/PBLiveLoader/PBLLRemoteWatcher.m
+- source/PBLiveLoader/PBLLResource.h
+- source/PBLiveLoader/PBLLResource.m
 - source/PBLiveLoader/PBLiveLoader.h
 - source/PBLiveLoader/PBLiveLoader.m
 - source/PBLiveLoader/PBSimulatorEnviroment.h
@@ -114,9 +120,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Pbind xcodeproj helper
 test_files: []
-has_rdoc: