diff --git a/Evergreen.xcodeproj/project.pbxproj b/Evergreen.xcodeproj/project.pbxproj index b15176cf8..bb2c7ad50 100644 --- a/Evergreen.xcodeproj/project.pbxproj +++ b/Evergreen.xcodeproj/project.pbxproj @@ -134,6 +134,8 @@ 84FB9A301EDCD6C4003D53B9 /* Sparkle.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 84FB9A2D1EDCD6B8003D53B9 /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 84FF69B11FC3793300DC198E /* FaviconURLFinder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84FF69B01FC3793300DC198E /* FaviconURLFinder.swift */; }; D553738B20186C20006D8857 /* Article+Scriptability.swift in Sources */ = {isa = PBXBuildFile; fileRef = D553737C20186C1F006D8857 /* Article+Scriptability.swift */; }; + D55373AF2018797C006D8857 /* testTitleOfArticlesWhose.applescript in Sources */ = {isa = PBXBuildFile; fileRef = D55373A02018797B006D8857 /* testTitleOfArticlesWhose.applescript */; }; + D55373B020187A05006D8857 /* testTitleOfArticlesWhose.applescript in CopyFiles */ = {isa = PBXBuildFile; fileRef = D55373A02018797B006D8857 /* testTitleOfArticlesWhose.applescript */; }; D5558FD32002245C0066386B /* ScriptingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5558FD22002245C0066386B /* ScriptingTests.swift */; }; D5558FD5200225680066386B /* NSAppleEventDescriptor+UserRecordFields.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5558FD4200225680066386B /* NSAppleEventDescriptor+UserRecordFields.swift */; }; D5558FD9200228D30066386B /* AppleEventUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5558FD7200228B80066386B /* AppleEventUtils.swift */; }; @@ -455,6 +457,7 @@ D5A2679D201313A200A8D3C0 /* testNameOfAuthors.applescript in CopyFiles */, D5F4EDE920075C6700B9E363 /* testNameAndUrlOfEveryFeed.applescript in CopyFiles */, D5F4EDEA20075C6700B9E363 /* testNameOfEveryFolder.applescript in CopyFiles */, + D55373B020187A05006D8857 /* testTitleOfArticlesWhose.applescript in CopyFiles */, D5907CA2200232AD005947E5 /* testGenericScript.applescript in CopyFiles */, D5907CA3200232AF005947E5 /* testGetURL.applescript in CopyFiles */, ); @@ -587,6 +590,7 @@ 84FB9A2D1EDCD6B8003D53B9 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = Frameworks/Vendor/Sparkle.framework; sourceTree = SOURCE_ROOT; }; 84FF69B01FC3793300DC198E /* FaviconURLFinder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FaviconURLFinder.swift; sourceTree = ""; }; D553737C20186C1F006D8857 /* Article+Scriptability.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Article+Scriptability.swift"; sourceTree = ""; }; + D55373A02018797B006D8857 /* testTitleOfArticlesWhose.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; path = testTitleOfArticlesWhose.applescript; sourceTree = ""; }; D5558FD1200223F60066386B /* testGetURL.applescript */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.applescript; path = testGetURL.applescript; sourceTree = ""; }; D5558FD22002245C0066386B /* ScriptingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ScriptingTests.swift; path = EvergreenTests/ScriptingTests/ScriptingTests.swift; sourceTree = SOURCE_ROOT; }; D5558FD4200225680066386B /* NSAppleEventDescriptor+UserRecordFields.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = "NSAppleEventDescriptor+UserRecordFields.swift"; path = "AppleEvents/NSAppleEventDescriptor+UserRecordFields.swift"; sourceTree = SOURCE_ROOT; }; @@ -1159,6 +1163,7 @@ D5F4EDE720075C1800B9E363 /* testNameAndUrlOfEveryFeed.applescript */, D5A2679B201312F900A8D3C0 /* testNameOfAuthors.applescript */, D5F4EDD720075C1300B9E363 /* testNameOfEveryFolder.applescript */, + D55373A02018797B006D8857 /* testTitleOfArticlesWhose.applescript */, ); path = scripts; sourceTree = ""; @@ -1676,6 +1681,7 @@ files = ( D5558FD5200225680066386B /* NSAppleEventDescriptor+UserRecordFields.swift in Sources */, D5558FD9200228D30066386B /* AppleEventUtils.swift in Sources */, + D55373AF2018797C006D8857 /* testTitleOfArticlesWhose.applescript in Sources */, D5907CA1200232A1005947E5 /* testGetURL.applescript in Sources */, D5A267C120131B8300A8D3C0 /* testFeedOPML.applescript in Sources */, D5A2679C201312F900A8D3C0 /* testNameOfAuthors.applescript in Sources */, diff --git a/Evergreen/Resources/Evergreen.sdef b/Evergreen/Resources/Evergreen.sdef index 6f320a5df..fa47941f6 100644 --- a/Evergreen/Resources/Evergreen.sdef +++ b/Evergreen/Resources/Evergreen.sdef @@ -166,7 +166,7 @@ - + diff --git a/Evergreen/Scriptability/Article+Scriptability.swift b/Evergreen/Scriptability/Article+Scriptability.swift index 91b889385..d1b7aa977 100644 --- a/Evergreen/Scriptability/Article+Scriptability.swift +++ b/Evergreen/Scriptability/Article+Scriptability.swift @@ -11,7 +11,7 @@ import Account import Data @objc(ScriptableArticle) -class ScriptableArticle: NSObject, UniqueIdScriptingObject { +class ScriptableArticle: NSObject, UniqueIdScriptingObject, ScriptingObjectContainer { let article:Article let container:ScriptingObjectContainer @@ -41,7 +41,13 @@ class ScriptableArticle: NSObject, UniqueIdScriptingObject { var scriptingUniqueId:Any { return article.uniqueID } + + // MARK: --- ScriptingObjectContainer protocol --- + var scriptingClassDescription: NSScriptClassDescription { + return self.classDescription as! NSScriptClassDescription + } + // MARK: --- Scriptable properties --- @objc(url) @@ -108,4 +114,11 @@ class ScriptableArticle: NSObject, UniqueIdScriptingObject { var imageURL:String { return article.imageURL ?? "" } + + @objc(authors) + var authors:NSArray { + let articleAuthors = article.authors ?? [] + return articleAuthors.map { ScriptableAuthor($0, container:self) } as NSArray + } + } diff --git a/EvergreenTests/ScriptingTests/ScriptingTests.swift b/EvergreenTests/ScriptingTests/ScriptingTests.swift index 06fb60520..3b2c2767f 100644 --- a/EvergreenTests/ScriptingTests/ScriptingTests.swift +++ b/EvergreenTests/ScriptingTests/ScriptingTests.swift @@ -94,8 +94,12 @@ class ScriptingTests: XCTestCase { _ = doIndividualScript(filename: "testNameOfAuthors") } - func testNameOfAuthorsScript() { + func testFeedOPML() { _ = doIndividualScript(filename: "testFeedOPML") } + func testTitleOfArticlesWhoseScript() { + _ = doIndividualScript(filename: "testTitleOfArticlesWhose") + } + } diff --git a/EvergreenTests/ScriptingTests/scripts/testTitleOfArticlesWhose.applescript b/EvergreenTests/ScriptingTests/scripts/testTitleOfArticlesWhose.applescript new file mode 100644 index 000000000..3ad5cca94 --- /dev/null +++ b/EvergreenTests/ScriptingTests/scripts/testTitleOfArticlesWhose.applescript @@ -0,0 +1,10 @@ +-- this script just tests that no error was generated from the script +try + tell application "Evergreen" + title of every article of feed "Six Colors" where read is true + end tell +on error message + return {test_result:false, script_result:message} +end try + +return {test_result:true}