Skip to content

Commit

Permalink
Rename VTAcknowledgementsParser to VTParser
Browse files Browse the repository at this point in the history
  • Loading branch information
vtourraine committed Feb 4, 2021
1 parent e69d67f commit 03ef12c
Show file tree
Hide file tree
Showing 13 changed files with 162 additions and 161 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
- Update `UIViewController` subclasses initializers nullability annotations to match UIKit methods
- Update deployment target to iOS 9
- Refactor localization to dedicated class
- Rename `VTAcknowledgementsParser` to `VTParser`
- Remove deprecated `VTAcknowledgementsViewController` initializers (`initWithAcknowledgementsPlistPath:`, `initWithAcknowledgementsFileNamed:`)
- Remove legacy CocoaPods format support

Expand Down
2 changes: 1 addition & 1 deletion Classes/VTAcknowledgementsViewController.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#import <UIKit/UIKit.h>
#endif

#import <VTAcknowledgementsParser.h>
#import <VTParser.h>
#import <VTAcknowledgement.h>

NS_ASSUME_NONNULL_BEGIN
Expand Down
2 changes: 1 addition & 1 deletion Classes/VTAcknowledgementsViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ - (instancetype)initWithFileNamed:(nonnull NSString *)acknowledgementsFileName {
}

- (void)loadFromAcknowledgementsPlistPath:(NSString *)acknowledgementsPlistPath {
VTAcknowledgementsParser *parser = [[VTAcknowledgementsParser alloc] initWithAcknowledgementsPlistPath:acknowledgementsPlistPath];
VTParser *parser = [[VTParser alloc] initWithAcknowledgementsPlistPath:acknowledgementsPlistPath];

if ([parser.header isEqualToString:VTDefaultHeaderText]) {
self.headerText = nil;
Expand Down
6 changes: 3 additions & 3 deletions Classes/VTAcknowledgementsParser.h → Classes/VTParser.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// VTAcknowledgementsParser.h
// VTParser.h
//
// Copyright (c) 2013-2021 Vincent Tourraine (http://www.vtourraine.net)
//
Expand Down Expand Up @@ -33,9 +33,9 @@ NS_ASSUME_NONNULL_BEGIN


/**
`VTAcknowledgementsParser` is a subclass of `NSObject` that parses a CocoaPods acknowledgements plist file.
`VTParser` is a subclass of `NSObject` that parses a CocoaPods acknowledgements plist file.
*/
@interface VTAcknowledgementsParser : NSObject
@interface VTParser : NSObject

/// The header parsed from the plist file.
@property (readonly, copy, nullable) NSString *header;
Expand Down
12 changes: 6 additions & 6 deletions Classes/VTAcknowledgementsParser.m → Classes/VTParser.m
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// VTAcknowledgementsParser.m
// VTParser.m
//
// Copyright (c) 2013-2021 Vincent Tourraine (http://www.vtourraine.net)
//
Expand All @@ -21,11 +21,11 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.

#import "VTAcknowledgementsParser.h"
#import "VTParser.h"
#import "VTAcknowledgement.h"


@interface VTAcknowledgementsParser ()
@interface VTParser ()

@property (nonatomic, copy, readwrite, nullable) NSString *header;
@property (nonatomic, copy, readwrite, nullable) NSString *footer;
Expand All @@ -36,7 +36,7 @@ - (instancetype)init NS_UNAVAILABLE;
@end


@implementation VTAcknowledgementsParser
@implementation VTParser

- (instancetype)init {
@throw nil;
Expand All @@ -62,7 +62,7 @@ - (nonnull instancetype)initWithAcknowledgementsPlistPath:(nonnull NSString *)ac

NSMutableArray <VTAcknowledgement *> *acknowledgements = [NSMutableArray array];
for (NSDictionary *preferenceSpecifier in preferenceSpecifiers) {
VTAcknowledgement *acknowledgement = [VTAcknowledgementsParser acknowledgementFromPreferenceSpecifier:preferenceSpecifier];
VTAcknowledgement *acknowledgement = [VTParser acknowledgementFromPreferenceSpecifier:preferenceSpecifier];
[acknowledgements addObject:acknowledgement];
}

Expand All @@ -76,7 +76,7 @@ - (nonnull instancetype)initWithAcknowledgementsPlistPath:(nonnull NSString *)ac

+ (nonnull VTAcknowledgement *)acknowledgementFromPreferenceSpecifier:(nonnull NSDictionary *)preferenceSpecifier {
NSString *title = preferenceSpecifier[@"Title"];
NSString *text = [VTAcknowledgementsParser stringByFilteringOutPrematureLineBreaksFromString:preferenceSpecifier[@"FooterText"]];
NSString *text = [VTParser stringByFilteringOutPrematureLineBreaksFromString:preferenceSpecifier[@"FooterText"]];
NSString *license = preferenceSpecifier[@"License"];
return [[VTAcknowledgement alloc] initWithTitle:title text:text license:license];
}
Expand Down

This file was deleted.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

248 changes: 124 additions & 124 deletions Tests/Pods/Pods.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// VTAcknowledgementsParserTests.m
// VTParserTests.m
//
// Copyright (c) 2013-2021 Vincent Tourraine (http://www.vtourraine.net)
//
Expand All @@ -24,23 +24,23 @@
@import Foundation;
@import XCTest;

#import <VTAcknowledgementsParser.h>
#import <VTParser.h>
#import <VTAcknowledgement.h>

@interface VTAcknowledgementsParserTests : XCTestCase
@interface VTParserTests : XCTestCase

@end


@implementation VTAcknowledgementsParserTests
@implementation VTParserTests

- (void)testDoesNotSupportDefaultInitialization {
XCTAssertThrows([VTAcknowledgementsParser new]);
XCTAssertThrows([VTParser new]);
}

- (void)testBasicParsing {
NSString *path = [[NSBundle mainBundle] pathForResource:@"Pods-acknowledgements" ofType:@"plist"];
VTAcknowledgementsParser *parser = [[VTAcknowledgementsParser alloc] initWithAcknowledgementsPlistPath:path];
VTParser *parser = [[VTParser alloc] initWithAcknowledgementsPlistPath:path];

XCTAssertEqualObjects(parser.header, @"This application makes use of the following third party libraries:");
XCTAssertEqualObjects(parser.footer, @"Generated by CocoaPods - http://cocoapods.org");
Expand All @@ -53,7 +53,7 @@ - (void)testBasicParsing {
}

- (void)testParsingFailure {
VTAcknowledgementsParser *parser = [[VTAcknowledgementsParser alloc] initWithAcknowledgementsPlistPath:@""];
VTParser *parser = [[VTParser alloc] initWithAcknowledgementsPlistPath:@""];

XCTAssertNil(parser.header);
XCTAssertNil(parser.footer);
Expand All @@ -63,7 +63,7 @@ - (void)testParsingFailure {
- (void)testFilterLineBreaks {
NSBundle *bundle = [NSBundle bundleForClass:self.class];
NSString *path = [bundle pathForResource:@"Pods-acknowledgements-LineBreakFilterTesting" ofType:@"plist"];
VTAcknowledgementsParser *parser = [[VTAcknowledgementsParser alloc] initWithAcknowledgementsPlistPath:path];
VTParser *parser = [[VTParser alloc] initWithAcknowledgementsPlistPath:path];

XCTAssertEqual(parser.acknowledgements.count, 5);

Expand Down
8 changes: 4 additions & 4 deletions Tests/VTAck Tests.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

/* Begin PBXBuildFile section */
146BC0EE1C11E98D008D3C23 /* VTAcknowledgementTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 146BC0ED1C11E98C008D3C23 /* VTAcknowledgementTests.m */; };
148FE7801C10483600228898 /* VTAcknowledgementsParserTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 148FE77F1C10483600228898 /* VTAcknowledgementsParserTests.m */; };
148FE7801C10483600228898 /* VTParserTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 148FE77F1C10483600228898 /* VTParserTests.m */; };
1F6CD01B1A9BB139002D28DC /* VTAcknowledgementViewControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1F6CD01A1A9BB139002D28DC /* VTAcknowledgementViewControllerTests.m */; };
1FDD9DA81A9A766D000BAFF0 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1FDD9DA51A9A766D000BAFF0 /* Main.storyboard */; };
1FDD9DAD1A9A7674000BAFF0 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FDD9DAA1A9A7674000BAFF0 /* AppDelegate.m */; };
Expand Down Expand Up @@ -49,7 +49,7 @@

/* Begin PBXFileReference section */
146BC0ED1C11E98C008D3C23 /* VTAcknowledgementTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VTAcknowledgementTests.m; path = Tests/VTAcknowledgementTests.m; sourceTree = SOURCE_ROOT; };
148FE77F1C10483600228898 /* VTAcknowledgementsParserTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VTAcknowledgementsParserTests.m; path = Tests/VTAcknowledgementsParserTests.m; sourceTree = SOURCE_ROOT; };
148FE77F1C10483600228898 /* VTParserTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VTParserTests.m; path = Tests/VTParserTests.m; sourceTree = SOURCE_ROOT; };
1BB90C392D46F6E768450F07 /* Pods-VTAck App.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-VTAck App.debug.xcconfig"; path = "Pods/Target Support Files/Pods-VTAck App/Pods-VTAck App.debug.xcconfig"; sourceTree = "<group>"; };
1F6CD01A1A9BB139002D28DC /* VTAcknowledgementViewControllerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VTAcknowledgementViewControllerTests.m; path = Tests/VTAcknowledgementViewControllerTests.m; sourceTree = SOURCE_ROOT; };
1FDD9D7A1A9A757B000BAFF0 /* VTAck App.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "VTAck App.app"; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -187,7 +187,7 @@
isa = PBXGroup;
children = (
146BC0ED1C11E98C008D3C23 /* VTAcknowledgementTests.m */,
148FE77F1C10483600228898 /* VTAcknowledgementsParserTests.m */,
148FE77F1C10483600228898 /* VTParserTests.m */,
1FDD9DB91A9A7B9A000BAFF0 /* VTAcknowledgementsViewControllerTests.m */,
1F6CD01A1A9BB139002D28DC /* VTAcknowledgementViewControllerTests.m */,
D7527F3D25CBEE6300378FB8 /* VTLocalizationTests.m */,
Expand Down Expand Up @@ -522,7 +522,7 @@
1FDD9DBA1A9A7B9A000BAFF0 /* VTAcknowledgementsViewControllerTests.m in Sources */,
D7527F3E25CBEE6300378FB8 /* VTLocalizationTests.m in Sources */,
1F6CD01B1A9BB139002D28DC /* VTAcknowledgementViewControllerTests.m in Sources */,
148FE7801C10483600228898 /* VTAcknowledgementsParserTests.m in Sources */,
148FE7801C10483600228898 /* VTParserTests.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
24 changes: 12 additions & 12 deletions VTAcknowledgementsViewController.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@
/* Begin PBXBuildFile section */
148FE7C51C10804700228898 /* VTAcknowledgement.h in Headers */ = {isa = PBXBuildFile; fileRef = 148FE7BD1C10804700228898 /* VTAcknowledgement.h */; settings = {ATTRIBUTES = (Public, ); }; };
148FE7C61C10804700228898 /* VTAcknowledgement.m in Sources */ = {isa = PBXBuildFile; fileRef = 148FE7BE1C10804700228898 /* VTAcknowledgement.m */; };
148FE7C71C10804700228898 /* VTAcknowledgementsParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 148FE7BF1C10804700228898 /* VTAcknowledgementsParser.h */; settings = {ATTRIBUTES = (Public, ); }; };
148FE7C81C10804700228898 /* VTAcknowledgementsParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 148FE7C01C10804700228898 /* VTAcknowledgementsParser.m */; };
148FE7C71C10804700228898 /* VTParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 148FE7BF1C10804700228898 /* VTParser.h */; settings = {ATTRIBUTES = (Public, ); }; };
148FE7C81C10804700228898 /* VTParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 148FE7C01C10804700228898 /* VTParser.m */; };
148FE7C91C10804700228898 /* VTAcknowledgementsViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 148FE7C11C10804700228898 /* VTAcknowledgementsViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
148FE7CA1C10804700228898 /* VTAcknowledgementsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 148FE7C21C10804700228898 /* VTAcknowledgementsViewController.m */; };
148FE7CB1C10804700228898 /* VTAcknowledgementViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 148FE7C31C10804700228898 /* VTAcknowledgementViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
148FE7CC1C10804700228898 /* VTAcknowledgementViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 148FE7C41C10804700228898 /* VTAcknowledgementViewController.m */; };
148FE7CE1C10805E00228898 /* VTAcknowledgementsViewController.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 148FE7CD1C10805E00228898 /* VTAcknowledgementsViewController.bundle */; };
5DE842771CEC6E8500799BDC /* VTAcknowledgement.h in Headers */ = {isa = PBXBuildFile; fileRef = 148FE7BD1C10804700228898 /* VTAcknowledgement.h */; settings = {ATTRIBUTES = (Public, ); }; };
5DE842781CEC6E8500799BDC /* VTAcknowledgement.m in Sources */ = {isa = PBXBuildFile; fileRef = 148FE7BE1C10804700228898 /* VTAcknowledgement.m */; };
5DE842791CEC6E8500799BDC /* VTAcknowledgementsParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 148FE7BF1C10804700228898 /* VTAcknowledgementsParser.h */; settings = {ATTRIBUTES = (Public, ); }; };
5DE8427A1CEC6E8500799BDC /* VTAcknowledgementsParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 148FE7C01C10804700228898 /* VTAcknowledgementsParser.m */; };
5DE842791CEC6E8500799BDC /* VTParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 148FE7BF1C10804700228898 /* VTParser.h */; settings = {ATTRIBUTES = (Public, ); }; };
5DE8427A1CEC6E8500799BDC /* VTParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 148FE7C01C10804700228898 /* VTParser.m */; };
5DE8427B1CEC6E8500799BDC /* VTAcknowledgementsViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 148FE7C11C10804700228898 /* VTAcknowledgementsViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
5DE8427C1CEC6E8500799BDC /* VTAcknowledgementsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 148FE7C21C10804700228898 /* VTAcknowledgementsViewController.m */; };
5DE8427D1CEC6E8500799BDC /* VTAcknowledgementViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 148FE7C31C10804700228898 /* VTAcknowledgementViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
Expand All @@ -36,8 +36,8 @@
148FE7A41C107F8600228898 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
148FE7BD1C10804700228898 /* VTAcknowledgement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VTAcknowledgement.h; path = Classes/VTAcknowledgement.h; sourceTree = SOURCE_ROOT; };
148FE7BE1C10804700228898 /* VTAcknowledgement.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VTAcknowledgement.m; path = Classes/VTAcknowledgement.m; sourceTree = SOURCE_ROOT; };
148FE7BF1C10804700228898 /* VTAcknowledgementsParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VTAcknowledgementsParser.h; path = Classes/VTAcknowledgementsParser.h; sourceTree = SOURCE_ROOT; };
148FE7C01C10804700228898 /* VTAcknowledgementsParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VTAcknowledgementsParser.m; path = Classes/VTAcknowledgementsParser.m; sourceTree = SOURCE_ROOT; };
148FE7BF1C10804700228898 /* VTParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VTParser.h; path = Classes/VTParser.h; sourceTree = SOURCE_ROOT; };
148FE7C01C10804700228898 /* VTParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VTParser.m; path = Classes/VTParser.m; sourceTree = SOURCE_ROOT; };
148FE7C11C10804700228898 /* VTAcknowledgementsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VTAcknowledgementsViewController.h; path = Classes/VTAcknowledgementsViewController.h; sourceTree = SOURCE_ROOT; };
148FE7C21C10804700228898 /* VTAcknowledgementsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VTAcknowledgementsViewController.m; path = Classes/VTAcknowledgementsViewController.m; sourceTree = SOURCE_ROOT; };
148FE7C31C10804700228898 /* VTAcknowledgementViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VTAcknowledgementViewController.h; path = Classes/VTAcknowledgementViewController.h; sourceTree = SOURCE_ROOT; };
Expand Down Expand Up @@ -98,8 +98,8 @@
children = (
148FE7BD1C10804700228898 /* VTAcknowledgement.h */,
148FE7BE1C10804700228898 /* VTAcknowledgement.m */,
148FE7BF1C10804700228898 /* VTAcknowledgementsParser.h */,
148FE7C01C10804700228898 /* VTAcknowledgementsParser.m */,
148FE7BF1C10804700228898 /* VTParser.h */,
148FE7C01C10804700228898 /* VTParser.m */,
148FE7C11C10804700228898 /* VTAcknowledgementsViewController.h */,
148FE7C21C10804700228898 /* VTAcknowledgementsViewController.m */,
148FE7C31C10804700228898 /* VTAcknowledgementViewController.h */,
Expand All @@ -122,7 +122,7 @@
148FE7CB1C10804700228898 /* VTAcknowledgementViewController.h in Headers */,
148FE7C91C10804700228898 /* VTAcknowledgementsViewController.h in Headers */,
D7527F2B25CBEC0000378FB8 /* VTLocalization.h in Headers */,
148FE7C71C10804700228898 /* VTAcknowledgementsParser.h in Headers */,
148FE7C71C10804700228898 /* VTParser.h in Headers */,
148FE7C51C10804700228898 /* VTAcknowledgement.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -134,7 +134,7 @@
5DE8427B1CEC6E8500799BDC /* VTAcknowledgementsViewController.h in Headers */,
5DE8427D1CEC6E8500799BDC /* VTAcknowledgementViewController.h in Headers */,
D7527F2C25CBEC0000378FB8 /* VTLocalization.h in Headers */,
5DE842791CEC6E8500799BDC /* VTAcknowledgementsParser.h in Headers */,
5DE842791CEC6E8500799BDC /* VTParser.h in Headers */,
5DE842771CEC6E8500799BDC /* VTAcknowledgement.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -241,7 +241,7 @@
148FE7C61C10804700228898 /* VTAcknowledgement.m in Sources */,
148FE7CA1C10804700228898 /* VTAcknowledgementsViewController.m in Sources */,
D7527F2D25CBEC0000378FB8 /* VTLocalization.m in Sources */,
148FE7C81C10804700228898 /* VTAcknowledgementsParser.m in Sources */,
148FE7C81C10804700228898 /* VTParser.m in Sources */,
148FE7CC1C10804700228898 /* VTAcknowledgementViewController.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -253,7 +253,7 @@
5DE842781CEC6E8500799BDC /* VTAcknowledgement.m in Sources */,
5DE8427C1CEC6E8500799BDC /* VTAcknowledgementsViewController.m in Sources */,
D7527F2E25CBEC0000378FB8 /* VTLocalization.m in Sources */,
5DE8427A1CEC6E8500799BDC /* VTAcknowledgementsParser.m in Sources */,
5DE8427A1CEC6E8500799BDC /* VTParser.m in Sources */,
5DE8427E1CEC6E8500799BDC /* VTAcknowledgementViewController.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down

0 comments on commit 03ef12c

Please sign in to comment.