Add basic support to Position Pattern

Igor.xcodeproj/project.pbxproj

@@ -37,6 +37,15 @@
 		2DCE893715193E8900B975EE /* DEChainParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 2DCE893515193E8900B975EE /* DEChainParser.m */; };
 		2DCE893B15193F6100B975EE /* DEInstanceParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DCE893915193F6100B975EE /* DEInstanceParser.h */; };
 		2DCE893C15193F6100B975EE /* DEInstanceParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 2DCE893A15193F6100B975EE /* DEInstanceParser.m */; };
+		54AC483717BB1E7B007B0BB4 /* DEPositionParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 54AC483517BB1E7B007B0BB4 /* DEPositionParser.h */; };
+		54AC483817BB1E7B007B0BB4 /* DEPositionParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 54AC483617BB1E7B007B0BB4 /* DEPositionParser.m */; };
+		54AC483B17BB1FE1007B0BB4 /* DEPositionMatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 54AC483917BB1FE1007B0BB4 /* DEPositionMatcher.h */; };
+		54AC483C17BB1FE1007B0BB4 /* DEPositionMatcher.m in Sources */ = {isa = PBXBuildFile; fileRef = 54AC483A17BB1FE1007B0BB4 /* DEPositionMatcher.m */; };
+		54AC483E17BB32B9007B0BB4 /* PositionMatcherTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 54AC483D17BB32B9007B0BB4 /* PositionMatcherTests.m */; };
+		54AC484017BB37A4007B0BB4 /* PositionPatternTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 54AC483F17BB37A4007B0BB4 /* PositionPatternTests.m */; };
+		54C9DBFD17BB227E00902BF2 /* PositionParserTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C9DBFB17BB227E00902BF2 /* PositionParserTests.m */; };
+		54C9DBFE17BB239D00902BF2 /* DEPositionParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 54AC483617BB1E7B007B0BB4 /* DEPositionParser.m */; };
+		54C9DBFF17BB23A200902BF2 /* DEPositionMatcher.m in Sources */ = {isa = PBXBuildFile; fileRef = 54AC483A17BB1FE1007B0BB4 /* DEPositionMatcher.m */; };
 		E621659DB794A5D612DCD443 /* DEQueryScanner.m in Sources */ = {isa = PBXBuildFile; fileRef = E621659DB794A5D612DCD442 /* DEQueryScanner.m */; };
 		E621659DB794A5D612DCD445 /* DEQueryScanner.h in Headers */ = {isa = PBXBuildFile; fileRef = E621659DB794A5D612DCD444 /* DEQueryScanner.h */; };
 		E621659DB794A5D612DCD449 /* DEChainMatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = E621659DB794A5D612DCD448 /* DEChainMatcher.h */; };
@@ -165,6 +174,13 @@
 		2DCE893915193F6100B975EE /* DEInstanceParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DEInstanceParser.h; sourceTree = "<group>"; };
 		2DCE893A15193F6100B975EE /* DEInstanceParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DEInstanceParser.m; sourceTree = "<group>"; };
 		2DCF9766147ED3FD003B0F38 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
+		54AC483517BB1E7B007B0BB4 /* DEPositionParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DEPositionParser.h; sourceTree = "<group>"; };
+		54AC483617BB1E7B007B0BB4 /* DEPositionParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DEPositionParser.m; sourceTree = "<group>"; };
+		54AC483917BB1FE1007B0BB4 /* DEPositionMatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DEPositionMatcher.h; sourceTree = "<group>"; };
+		54AC483A17BB1FE1007B0BB4 /* DEPositionMatcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DEPositionMatcher.m; sourceTree = "<group>"; };
+		54AC483D17BB32B9007B0BB4 /* PositionMatcherTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PositionMatcherTests.m; sourceTree = "<group>"; };
+		54AC483F17BB37A4007B0BB4 /* PositionPatternTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PositionPatternTests.m; sourceTree = "<group>"; };
+		54C9DBFB17BB227E00902BF2 /* PositionParserTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PositionParserTests.m; sourceTree = "<group>"; };
 		E621659DB794A5D612DCD425 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		E621659DB794A5D612DCD437 /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; };
 		E621659DB794A5D612DCD439 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
@@ -333,6 +349,7 @@
 				2D695CCA147CD1D200AF4115 /* ClassPatternTests.m */,
 				E621659DB794A5D612DCD500 /* ChildPatternTests.m */,
 				E621659DB794A5D612DCD490 /* BranchPatternTests.m */,
+				54AC483F17BB37A4007B0BB4 /* PositionPatternTests.m */,
 			);
 			path = acceptance;
 			sourceTree = "<group>";
@@ -378,6 +395,7 @@
 				E621659DB794A5D612DCD4AB /* DescendantCombinatorTests.m */,
 				E621659DB794A5D612DCD4DD /* ChildCombinatorTests.m */,
 				E621659DB794A5D612DCD474 /* BranchMatcherTests.m */,
+				54AC483D17BB32B9007B0BB4 /* PositionMatcherTests.m */,
 			);
 			path = matchers;
 			sourceTree = "<group>";
@@ -392,6 +410,7 @@
 				E621659DB794A5D612DCD504 /* CombinatorParserTests.m */,
 				E621659DB794A5D612DCD46C /* ClassParserTests.m */,
 				E621659DB794A5D612DCD4B5 /* ChainParserTests.m */,
+				54C9DBFB17BB227E00902BF2 /* PositionParserTests.m */,
 			);
 			path = parser;
 			sourceTree = "<group>";
@@ -436,6 +455,8 @@
 				E621659DB794A5D612DCD448 /* DEChainMatcher.h */,
 				E621659DB794A5D612DCD478 /* DEBranchMatcher.m */,
 				E621659DB794A5D612DCD47A /* DEBranchMatcher.h */,
+				54AC483A17BB1FE1007B0BB4 /* DEPositionMatcher.m */,
+				54AC483917BB1FE1007B0BB4 /* DEPositionMatcher.h */,
 			);
 			path = matchers;
 			sourceTree = "<group>";
@@ -464,6 +485,8 @@
 				2DCE893415193E8900B975EE /* DEChainParser.h */,
 				E621659DB794A5D612DCD499 /* DEBranchParser.m */,
 				E621659DB794A5D612DCD49B /* DEBranchParser.h */,
+				54AC483617BB1E7B007B0BB4 /* DEPositionParser.m */,
+				54AC483517BB1E7B007B0BB4 /* DEPositionParser.h */,
 			);
 			path = parser;
 			sourceTree = "<group>";
@@ -484,6 +507,7 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				54AC483717BB1E7B007B0BB4 /* DEPositionParser.h in Headers */,
 				2D9649E2147DA21400C40219 /* Igor-Prefix.pch in Headers */,
 				2D496EA51486A513007E1FDE /* DEPredicateMatcher.h in Headers */,
 				2DCE893615193E8900B975EE /* DEChainParser.h in Headers */,
@@ -508,6 +532,7 @@
 				E621659DB794A5D612DCD4EC /* DEKindOfClassMatcher.h in Headers */,
 				E621659DB794A5D612DCD4ED /* DEMatcher.h in Headers */,
 				E621659DB794A5D612DCD4EE /* DEMemberOfClassMatcher.h in Headers */,
+				54AC483B17BB1FE1007B0BB4 /* DEPositionMatcher.h in Headers */,
 				E621659DB794A5D612DCD4EF /* DEIgor.h in Headers */,
 				E621659DB794A5D612DCD4F7 /* DEIdentifierMatcher.h in Headers */,
 				E621659DB794A5D612DCD4FB /* DEIdentifierParser.h in Headers */,
@@ -604,6 +629,7 @@
 				2D695CDA147CD1D200AF4115 /* KindOfClassMatcherTests.m in Sources */,
 				2D695CDB147CD1D200AF4115 /* MemberOfClassMatcherTests.m in Sources */,
 				2D695CDD147CD1D200AF4115 /* PredicateParserTests.m in Sources */,
+				54AC483E17BB32B9007B0BB4 /* PositionMatcherTests.m in Sources */,
 				2D695CDE147CD1D200AF4115 /* PredicatePatternTests.m in Sources */,
 				2D3E1F3F1509B98200D62300 /* DescendantPatternTests.m in Sources */,
 				2D99DB351517E9C900244226 /* SubjectMarkerTests.m in Sources */,
@@ -655,6 +681,10 @@
 				E621659DB794A5D612DCD53A /* DEQueryScanner.m in Sources */,
 				E621659DB794A5D612DCD53B /* DEIgor.m in Sources */,
 				E621659DB794A5D612DCD53C /* DECombinatorParser.m in Sources */,
+				54C9DBFD17BB227E00902BF2 /* PositionParserTests.m in Sources */,
+				54C9DBFE17BB239D00902BF2 /* DEPositionParser.m in Sources */,
+				54C9DBFF17BB23A200902BF2 /* DEPositionMatcher.m in Sources */,
+				54AC484017BB37A4007B0BB4 /* PositionPatternTests.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -670,9 +700,11 @@
 				2D695CB7147CD1BA00AF4115 /* DEKindOfClassMatcher.m in Sources */,
 				2D695CBA147CD1BA00AF4115 /* DEMemberOfClassMatcher.m in Sources */,
 				2D695CC4147CD1BA00AF4115 /* DEPredicateParser.m in Sources */,
+				54AC483C17BB1FE1007B0BB4 /* DEPositionMatcher.m in Sources */,
 				2D496EA61486A513007E1FDE /* DEPredicateMatcher.m in Sources */,
 				2DCE893715193E8900B975EE /* DEChainParser.m in Sources */,
 				2DCE893C15193F6100B975EE /* DEInstanceParser.m in Sources */,
+				54AC483817BB1E7B007B0BB4 /* DEPositionParser.m in Sources */,
 				E621659DB794A5D612DCD443 /* DEQueryScanner.m in Sources */,
 				E621659DB794A5D612DCD45F /* DEUniversalMatcher.m in Sources */,
 				E621659DB794A5D612DCD479 /* DEBranchMatcher.m in Sources */,

Igor.xcodeproj/project.xcworkspace/xcshareddata/Igor.xccheckout

@@ -0,0 +1,41 @@
+<?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>IDESourceControlProjectFavoriteDictionaryKey</key>
+	<false/>
+	<key>IDESourceControlProjectIdentifier</key>
+	<string>774B6FC9-4E79-4024-BFE0-29F379B370EC</string>
+	<key>IDESourceControlProjectName</key>
+	<string>Igor</string>
+	<key>IDESourceControlProjectOriginsDictionary</key>
+	<dict>
+		<key>B3806047-E9A6-404E-91F7-D509622D3412</key>
+		<string>ssh://github.com/siuying/igor.git</string>
+	</dict>
+	<key>IDESourceControlProjectPath</key>
+	<string>Igor.xcodeproj/project.xcworkspace</string>
+	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
+	<dict>
+		<key>B3806047-E9A6-404E-91F7-D509622D3412</key>
+		<string>../..</string>
+	</dict>
+	<key>IDESourceControlProjectURL</key>
+	<string>ssh://github.com/siuying/igor.git</string>
+	<key>IDESourceControlProjectVersion</key>
+	<integer>110</integer>
+	<key>IDESourceControlProjectWCCIdentifier</key>
+	<string>B3806047-E9A6-404E-91F7-D509622D3412</string>
+	<key>IDESourceControlProjectWCConfigurations</key>
+	<array>
+		<dict>
+			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+			<string>public.vcs.git</string>
+			<key>IDESourceControlWCCIdentifierKey</key>
+			<string>B3806047-E9A6-404E-91F7-D509622D3412</string>
+			<key>IDESourceControlWCCName</key>
+			<string>igor</string>
+		</dict>
+	</array>
+</dict>
+</plist>

Igor.xcodeproj/xcshareddata/xcschemes/Igor.xcscheme

@@ -14,7 +14,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "E621659DB794A5D612DCD41D"
-               BuildableName = "libIgor-0.5.0.a"
+               BuildableName = "Igor"
                BlueprintName = "Igor"
                ReferencedContainer = "container:Igor.xcodeproj">
             </BuildableReference>

igor/engine/DEIgor.m

@@ -7,6 +7,7 @@
 #import "DEPredicateParser.h"
 #import "DEBranchParser.h"
 #import "DEIdentifierParser.h"
+#import "DEPositionParser.h"
 #import "DEDescendantCombinator.h"
 #import "DEMatcher.h"
 
@@ -15,13 +16,13 @@ @implementation DEIgor {
 }
 
 - (NSArray *)findViewsThatMatchMatcher:(id <DEMatcher>)matcher inTree:(UIView *)tree {
-    NSMutableSet *matchingViews = [NSMutableSet set];
+    NSMutableArray *matchingViews = [NSMutableArray array];
     NSMutableArray *allViews = [NSMutableArray arrayWithObject:tree];
     [allViews addObjectsFromArray:[[DEDescendantCombinator new] relativesOfView:tree]];
     for (UIView *view in allViews) {
         if ([matcher matchesView:view]) [matchingViews addObject:view];
     }
-    return [matchingViews allObjects];
+    return [[NSOrderedSet orderedSetWithArray:matchingViews] array];
 }
 
 - (NSArray *)findViewsThatMatchQuery:(NSString *)query inTree:(UIView *)tree {
@@ -35,7 +36,8 @@ + (DEIgor *)igor {
     id <DEPatternParser> classParser = [DEClassParser new];
     id <DEPatternParser> predicateParser = [DEPredicateParser new];
     id <DEPatternParser> identifierParser = [DEIdentifierParser new];
-    NSArray *simpleParsers = [NSArray arrayWithObjects:identifierParser, predicateParser, nil];
+    id <DEPatternParser> positionParser = [DEPositionParser new];
+    NSArray *simpleParsers = [NSArray arrayWithObjects:identifierParser, predicateParser, positionParser, nil];
     id <DEPatternParser> instanceParser = [DEInstanceParser parserWithClassParser:classParser simpleParsers:simpleParsers];
 
     id <DECombinatorParser> combinatorParser = [DECombinatorParser new];

igor/matchers/DEPositionMatcher.h

@@ -0,0 +1,14 @@
+#import "DEChainMatcher.h"
+#import "DEMatcher.h"
+
+@interface DEPositionMatcher : NSObject <DEChainMatcher>
+
+@property (nonatomic, copy) NSString* position;
+
+- (instancetype)initWithPosition:(NSString *)position;
+
+- (BOOL)matchesView:(UIView *)view;
+
++ (DEPositionMatcher *)matcherForPosition:(NSString*)position;
+
+@end

igor/matchers/DEPositionMatcher.m

@@ -0,0 +1,76 @@
+//
+//  DEPositionMatcher.m
+//  Igor
+//
+//  Created by Chong Francis on 13年8月14日.
+//
+//
+
+#import "DEPositionMatcher.h"
+
+@interface DEPositionMatcher()
+@end
+
+@implementation DEPositionMatcher
+
+- (NSString *)description {
+    return [NSString stringWithFormat:@":%@", self.position];
+}
+
+- (instancetype)initWithPosition:(NSString *)position {
+    self = [super init];
+    if (self) {
+        _position = [position copy];
+    }
+    return self;
+}
+
+- (BOOL)matchesView:(UIView *)view {
+    if ([self.position isEqualToString:@"root"] && [self isRootView:view]) {
+        return YES;
+    }
+
+    if ([self.position isEqualToString:@"empty"] && [self isEmptyView:view]) {
+        return YES;
+    }
+
+    if ([self.position isEqualToString:@"first-child"] && [self isFirstChild:view]) {
+        return YES;
+    }
+
+    if ([self.position isEqualToString:@"last-child"] && [self isLastChild:view]) {
+        return YES;
+    }
+
+    if ([self.position isEqualToString:@"only-child"] && [self isOnlyChild:view]) {
+        return YES;
+    }
+
+    return NO;
+}
+
+- (BOOL) isRootView:(UIView *)view {
+    return view.superview == [UIApplication sharedApplication].keyWindow;
+}
+
+- (BOOL) isEmptyView:(UIView *)view {
+    return [view.subviews count] == 0;
+}
+
+- (BOOL) isFirstChild:(UIView *)view {
+    return view.superview && view.superview.subviews[0] == view;
+}
+
+- (BOOL) isLastChild:(UIView *)view {
+    return view.superview && [view.superview.subviews lastObject] == view;
+}
+
+- (BOOL) isOnlyChild:(UIView *)view {
+    return view.superview && view.superview.subviews.count == 1;
+}
+
++ (DEPositionMatcher *)matcherForPosition:(NSString*)position {
+    return [[DEPositionMatcher alloc] initWithPosition:position];
+}
+
+@end

igor/parser/DEIgorParserException.h

@@ -1,4 +1,4 @@
-@interface DEIgorParserException
+@interface DEIgorParserException : NSException
 
 + (NSException *)exceptionWithReason:(NSString *)reason scanner:(NSScanner *)scanner;
 

igor/parser/DEPositionParser.h

@@ -0,0 +1,5 @@
+#import <Foundation/Foundation.h>
+#import "DEPatternParser.h"
+
+@interface DEPositionParser : NSObject <DEPatternParser>
+@end

igor/parser/DEPositionParser.m

@@ -0,0 +1,33 @@
+#import "DEPositionParser.h"
+#import "DEQueryScanner.h"
+#import "DEUniversalMatcher.h"
+#import "DEPositionMatcher.h"
+
+static NSSet* _positionPatterns;
+
+@implementation DEPositionParser
+
++(void) initialize {
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        _positionPatterns = [NSSet setWithArray:@[@"empty", @"first-child", @"last-child", @"only-child"]];
+    });
+}
+
+- (id <DEMatcher>)parseMatcherFromScanner:(id <DEQueryScanner>)scanner {
+    if (![scanner skipString:@":"]) {
+        return nil;
+    }
+
+    NSString *expression;
+
+    if (![scanner scanPositionPatternIntoString:&expression])
+        [scanner failBecause:@"Expected a position pattern after the :"];
+
+    if (![_positionPatterns containsObject:expression])
+        [scanner failBecause:[NSString stringWithFormat:@"Expected to be one of valid position pattern %@, get: %@", [_positionPatterns allObjects], [scanner description]]];
+
+    return [DEPositionMatcher matcherForPosition:expression];
+}
+
+@end

igor/parser/DEQueryScanner.h

@@ -6,6 +6,8 @@
 
 - (BOOL)scanNameIntoString:(NSString **)destination;
 
+- (BOOL)scanPositionPatternIntoString:(NSString **)destination;
+
 - (BOOL)scanUpToString:(NSString *)string intoString:(NSString **)destination;
 
 - (BOOL)skipString:(NSString *)string;

igor/parser/DEQueryScanner.m

@@ -34,6 +34,12 @@ - (BOOL)scanNameIntoString:(NSString **)destination {
     return [self.scanner scanCharactersFromSet:nameCharacterSet intoString:destination];
 }
 
+- (BOOL)scanPositionPatternIntoString:(NSString **)destination {
+    NSMutableCharacterSet *positionCharacterSet = [NSMutableCharacterSet alphanumericCharacterSet];
+    [positionCharacterSet addCharactersInString:@"-"];
+    return [self.scanner scanCharactersFromSet:positionCharacterSet intoString:destination];
+}
+
 + (id <DEQueryScanner>)scannerWithString:(NSString *)queryString {
     return [[self alloc] initWithString:queryString];
 }

test/acceptance/ClassPatternTests.m

@@ -81,4 +81,21 @@ - (void)testKindOfClassPattern {
     assertThat(matchingViews, isNot(hasItem(viewOfUnrelatedClass)));
 }
 
+- (void)testMatchedSubviewsOrder {
+    NSString *query = @"UIButton";
+
+    UIView *root = [ViewFactory viewWithName:@"root"];
+    UIButton *b1 = [ViewFactory button];
+    UIButton *b2 = [ViewFactory button];
+    UIButton *b3 = [ViewFactory button];
+
+    [root addSubview:b1];
+    [root addSubview:b2];
+    [root addSubview:b3];
+
+    NSArray *matchingViews = [igor findViewsThatMatchQuery:query inTree:root];
+    assertThat(matchingViews, containsInAnyOrder(b1, b2, b3, nil));
+    assertThat(matchingViews, equalTo(@[b1, b2, b3]));
+}
+
 @end