Merge pull request #60 from stuartbreckenridge/main

RSParser as a swift package

Package.swift

@@ -0,0 +1,44 @@
+// swift-tools-version:5.3
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "RSParser",
+    platforms: [.macOS(SupportedPlatform.MacOSVersion.v10_15), .iOS(SupportedPlatform.IOSVersion.v13)],
+    products: [
+        // Products define the executables and libraries a package produces, and make them visible to other packages.
+        .library(
+            name: "RSParser",
+            type: .dynamic,
+            targets: ["RSParser"]),
+        .library(
+            name: "RSParserObjC",
+            type: .dynamic,
+            targets: ["RSParserObjC"]),
+    ],
+    dependencies: [
+        // Dependencies declare other packages that this package depends on.
+        // .package(url: /* package url */, from: "1.0.0"),
+    ],
+    targets: [
+        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
+        // Targets can depend on other targets in this package, and on products in packages this package depends on.
+        .target(
+            name: "RSParser",
+            dependencies: ["RSParserObjC"],
+            path: "Sources/Swift"),
+        .target(
+            name: "RSParserObjC",
+            dependencies: [],
+            path: "Sources/ObjC",
+            cSettings: [
+                .headerSearchPath("include")
+             ]),
+        .testTarget(
+            name: "RSParserTests",
+            dependencies: ["RSParser"],
+            exclude: ["RSDateParserTests.m", "Info.plist"],
+            resources: [.copy("Resources")]),
+    ]
+)

Sources/Utilities/NSData+RSParser.m → Sources/ObjC/NSData+RSParser.m

@@ -6,7 +6,10 @@
 //  Copyright © 2017 Ranchero Software, LLC. All rights reserved.
 //
 
-#import <RSParser/NSData+RSParser.h>
+#import "NSData+RSParser.h"
+
+
+
 
 /* TODO: find real-world cases where the isProbably* cases fail when they should succeed, and add them to tests.*/
 

Sources/Utilities/NSString+RSParser.m → Sources/ObjC/NSString+RSParser.m

@@ -6,8 +6,10 @@
 //  Copyright © 2015 Ranchero Software, LLC. All rights reserved.
 //
 
+#import "NSString+RSParser.h"
 #import <CommonCrypto/CommonDigest.h>
-#import <RSParser/NSString+RSParser.h>
+
+
 
 
 @interface NSScanner (RSParser)

Sources/Feeds/XML/RSAtomParser.m → Sources/ObjC/RSAtomParser.m

@@ -6,16 +6,18 @@
 //  Copyright (c) 2015 Ranchero Software LLC. All rights reserved.
 //
 
+
+#import "RSAtomParser.h"
+#import "RSSAXParser.h"
+#import "RSParsedFeed.h"
+#import "RSParsedArticle.h"
+#import "NSString+RSParser.h"
+#import "RSDateParser.h"
+#import "ParserData.h"
+#import "RSParsedEnclosure.h"
+#import "RSParsedAuthor.h"
+
 #import <libxml/xmlstring.h>
-#import <RSParser/RSAtomParser.h>
-#import <RSParser/RSSAXParser.h>
-#import <RSParser/RSParsedFeed.h>
-#import <RSParser/RSParsedArticle.h>
-#import <RSParser/NSString+RSParser.h>
-#import <RSParser/RSDateParser.h>
-#import <RSParser/ParserData.h>
-#import <RSParser/RSParsedEnclosure.h>
-#import <RSParser/RSParsedAuthor.h>
 
 @interface RSAtomParser () <RSSAXParserDelegate>
 

Sources/Utilities/RSDateParser.m → Sources/ObjC/RSDateParser.m

@@ -6,8 +6,10 @@
 //  Copyright (c) 2015 Ranchero Software, LLC. All rights reserved.
 //
 
+
+#import "RSDateParser.h"
 #import <time.h>
-#import <RSParser/RSDateParser.h>
+
 
 typedef struct {
 	const char *abbreviation;

Sources/HTML/RSHTMLLinkParser.m → Sources/ObjC/RSHTMLLinkParser.m

@@ -6,12 +6,15 @@
 //  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
+
+#import "RSHTMLLinkParser.h"
+#import "RSSAXHTMLParser.h"
+#import "RSSAXParser.h"
+#import "RSParserInternal.h"
+#import "ParserData.h"
+
 #import <libxml/xmlstring.h>
-#import <RSParser/RSHTMLLinkParser.h>
-#import <RSParser/RSSAXHTMLParser.h>
-#import <RSParser/RSSAXParser.h>
-#import <RSParser/RSParserInternal.h>
-#import <RSParser/ParserData.h>
+
 
 
 @interface RSHTMLLinkParser() <RSSAXHTMLParserDelegate>

Sources/HTML/RSHTMLMetadata.m → Sources/ObjC/RSHTMLMetadata.m

@@ -6,9 +6,11 @@
 //  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
-#import <RSParser/RSHTMLMetadata.h>
-#import <RSParser/RSParserInternal.h>
-#import <RSParser/RSHTMLTag.h>
+#import "RSHTMLMetadata.h"
+#import "RSParserInternal.h"
+#import "RSHTMLTag.h"
+
+
 
 static NSString *urlStringFromDictionary(NSDictionary *d);
 static NSString *absoluteURLStringWithRelativeURLString(NSString *relativeURLString, NSString *baseURLString);

Sources/HTML/RSHTMLMetadataParser.m → Sources/ObjC/RSHTMLMetadataParser.m

@@ -6,14 +6,17 @@
 //  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
+#import "RSHTMLMetadataParser.h"
+#import "RSHTMLMetadata.h"
+#import "RSSAXHTMLParser.h"
+#import "RSSAXHTMLParser.h"
+#import "RSSAXParser.h"
+#import "RSParserInternal.h"
+#import "ParserData.h"
+#import "RSHTMLTag.h"
+
 #import <libxml/xmlstring.h>
-#import <RSParser/RSHTMLMetadataParser.h>
-#import <RSParser/RSHTMLMetadata.h>
-#import <RSParser/RSSAXHTMLParser.h>
-#import <RSParser/RSSAXParser.h>
-#import <RSParser/RSParserInternal.h>
-#import <RSParser/ParserData.h>
-#import <RSParser/RSHTMLTag.h>
+
 
 @interface RSHTMLMetadataParser () <RSSAXHTMLParserDelegate>
 

Sources/OPML/RSOPMLAttributes.m → Sources/ObjC/RSOPMLAttributes.m

@@ -6,8 +6,10 @@
 //  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
-#import <RSParser/RSOPMLAttributes.h>
-#import <RSParser/RSParserInternal.h>
+#import "RSOPMLAttributes.h"
+#import "RSParserInternal.h"
+
+
 
 
 NSString *OPMLTextKey = @"text";

Sources/OPML/RSOPMLDocument.h → Sources/ObjC/RSOPMLDocument.h

@@ -7,7 +7,10 @@
 //
 
 @import Foundation;
-#import <RSParser/RSOPMLItem.h>
+
+#import "RSOPMLItem.h"
+
+
 
 
 @interface RSOPMLDocument : RSOPMLItem

Sources/OPML/RSOPMLDocument.m → Sources/ObjC/RSOPMLDocument.m

@@ -6,7 +6,8 @@
 //  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
-#import <RSParser/RSOPMLDocument.h>
+
+#import "RSOPMLDocument.h"
 
 @implementation RSOPMLDocument
 

Sources/OPML/RSOPMLError.m → Sources/ObjC/RSOPMLError.m

@@ -6,7 +6,7 @@
 //  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
-#import <RSParser/RSOPMLError.h>
+#import "RSOPMLError.h"
 
 NSString *RSOPMLErrorDomain = @"com.ranchero.OPML";
 

Sources/OPML/RSOPMLFeedSpecifier.m → Sources/ObjC/RSOPMLFeedSpecifier.m

@@ -6,8 +6,9 @@
 //  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
-#import <RSParser/RSOPMLFeedSpecifier.h>
-#import <RSParser/RSParserInternal.h>
+#import "RSOPMLFeedSpecifier.h"
+#import "RSParserInternal.h"
+
 
 
 @implementation RSOPMLFeedSpecifier

Sources/OPML/RSOPMLItem.m → Sources/ObjC/RSOPMLItem.m

@@ -6,10 +6,11 @@
 //  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
-#import <RSParser/RSOPMLItem.h>
-#import <RSParser/RSOPMLAttributes.h>
-#import <RSParser/RSOPMLFeedSpecifier.h>
-#import <RSParser/RSParserInternal.h>
+#import "RSOPMLItem.h"
+#import "RSOPMLAttributes.h"
+#import "RSOPMLFeedSpecifier.h"
+#import "RSParserInternal.h"
+
 
 
 @interface RSOPMLItem ()

Sources/OPML/RSOPMLParser.m → Sources/ObjC/RSOPMLParser.m

@@ -7,13 +7,16 @@
 //
 
 #import "RSOPMLParser.h"
+#import "RSSAXParser.h"
+#import "RSOPMLItem.h"
+#import "RSOPMLDocument.h"
+#import "RSOPMLAttributes.h"
+#import "RSOPMLError.h"
+#import "RSOPMLParser.h"
+#import "ParserData.h"
+
 #import <libxml/xmlstring.h>
-#import <RSParser/RSSAXParser.h>
-#import <RSParser/RSOPMLItem.h>
-#import <RSParser/RSOPMLDocument.h>
-#import <RSParser/RSOPMLAttributes.h>
-#import <RSParser/RSOPMLError.h>
-#import <RSParser/ParserData.h>
+
 
 
 @interface RSOPMLParser () <RSSAXParserDelegate>

Sources/Feeds/XML/RSParsedArticle.m → Sources/ObjC/RSParsedArticle.m

@@ -6,11 +6,14 @@
 //  Copyright (c) 2014 Ranchero Software LLC. All rights reserved.
 //
 
-#import <RSParser/RSParsedArticle.h>
-#import <RSParser/RSParserInternal.h>
-#import <RSParser/NSString+RSParser.h>
-#import <RSParser/RSParsedAuthor.h>
-#import <RSParser/RSParsedEnclosure.h>
+
+#import "RSParsedArticle.h"
+#import "RSParserInternal.h"
+#import "NSString+RSParser.h"
+#import "RSParsedAuthor.h"
+#import "RSParsedEnclosure.h"
+
+
 
 @implementation RSParsedArticle
 

Sources/Feeds/XML/RSParsedAuthor.m → Sources/ObjC/RSParsedAuthor.m

@@ -6,7 +6,8 @@
 //  Copyright © 2017 Ranchero Software, LLC. All rights reserved.
 //
 
-#import <RSParser/NSString+RSParser.h>
+#import "NSString+RSParser.h"
+
 #import "RSParsedAuthor.h"
 
 @implementation RSParsedAuthor

Sources/Feeds/XML/RSParsedFeed.m → Sources/ObjC/RSParsedFeed.m

@@ -6,7 +6,9 @@
 //  Copyright © 2015 Ranchero Software, LLC. All rights reserved.
 //
 
-#import <RSParser/RSParsedFeed.h>
+#import "RSParsedFeed.h"
+
+
 
 @implementation RSParsedFeed
 

Sources/Utilities/RSParserInternal.m → Sources/ObjC/RSParserInternal.m

@@ -6,8 +6,9 @@
 //  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
+
+#import "RSParserInternal.h"
 #import <CommonCrypto/CommonDigest.h>
-#import <RSParser/RSParserInternal.h>
 
 
 static BOOL RSParserIsNil(id obj) {

Sources/Feeds/XML/RSRSSParser.m → Sources/ObjC/RSRSSParser.m

@@ -6,17 +6,21 @@
 //  Copyright (c) 2015 Ranchero Software LLC. All rights reserved.
 //
 
+#import "RSRSSParser.h"
+#import "RSSAXParser.h"
+#import "RSParsedFeed.h"
+#import "RSParsedArticle.h"
+#import "RSParserInternal.h"
+#import "NSString+RSParser.h"
+#import "RSDateParser.h"
+#import "ParserData.h"
+#import "RSParsedEnclosure.h"
+#import "RSParsedAuthor.h"
+
+
+
 #import <libxml/xmlstring.h>
-#import <RSParser/RSRSSParser.h>
-#import <RSParser/RSSAXParser.h>
-#import <RSParser/RSParsedFeed.h>
-#import <RSParser/RSParsedArticle.h>
-#import <RSParser/RSParserInternal.h>
-#import <RSParser/NSString+RSParser.h>
-#import <RSParser/RSDateParser.h>
-#import <RSParser/ParserData.h>
-#import <RSParser/RSParsedEnclosure.h>
-#import <RSParser/RSParsedAuthor.h>
+
 
 @interface RSRSSParser () <RSSAXParserDelegate>