Skip to content

Commit df3a046

Browse files
committed
Add OGDescriptionOption type
1 parent a18049d commit df3a046

File tree

5 files changed

+17
-9
lines changed

5 files changed

+17
-9
lines changed

Sources/OpenGraph/Graph/Graph.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ extension Graph {
112112
public func archiveJSON(name: String?) {
113113
#if canImport(Darwin)
114114
let options: NSDictionary = [
115-
Graph.descriptionFormat: "graph/dict",
116-
Graph.descriptionIncludeValues: true,
115+
DescriptionOption.format: "graph/dict",
116+
DescriptionOption.includeValues: true,
117117
]
118118
guard let description = Graph.description(self, options: options) as? [String: Any] else {
119119
return

Sources/OpenGraphCxx/include/OpenGraph/OGGraphDescription.h

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,19 @@ OG_EXTERN_C_BEGIN
1616

1717
#if OG_OBJC_FOUNDATION
1818

19+
typedef CFStringRef OGDescriptionOption OG_SWIFT_STRUCT OG_SWIFT_NAME(DescriptionOption);
20+
21+
OG_EXPORT
22+
const OGDescriptionOption OGDescriptionFormat OG_SWIFT_NAME(DescriptionOption.format);
23+
24+
OG_EXPORT
25+
const OGDescriptionOption OGDescriptionIncludeValues OG_SWIFT_NAME(DescriptionOption.includeValues);
26+
1927
OG_EXPORT
20-
const CFStringRef OGDescriptionFormat OG_SWIFT_NAME(OGGraphRef.descriptionFormat);
28+
const OGDescriptionOption OGDescriptionTruncationLimit OG_SWIFT_NAME(DescriptionOption.truncationLimit);
2129

2230
OG_EXPORT
23-
const CFStringRef OGDescriptionIncludeValues OG_SWIFT_NAME(OGGraphRef.descriptionIncludeValues);
31+
const OGDescriptionOption OGDescriptionMaxFrames OG_SWIFT_NAME(DescriptionOption.maxFrames);
2432

2533
static const CFStringRef OGDescriptionFormatDot OG_SWIFT_NAME(OGGraphRef.descriptionFormatDot) = CFSTR("graph/dot");
2634

Sources/OpenGraphShims/Graph+Debug.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import Foundation
1010
extension Graph {
1111
public var dict: [String: Any]? {
1212
let options = [
13-
Graph.descriptionFormat: Graph.descriptionFormatDictionary
13+
DescriptionOption.format: Graph.descriptionFormatDictionary
1414
] as NSDictionary
1515
guard let description = Graph.description(nil, options: options) else {
1616
return nil
@@ -28,7 +28,7 @@ extension Graph {
2828
// - red: is_changed
2929
public var dot: String? {
3030
let options = [
31-
Graph.descriptionFormat: Graph.descriptionFormatDot
31+
DescriptionOption.format: Graph.descriptionFormatDot
3232
] as NSDictionary
3333
guard let description = Graph.description(self, options: options)
3434
else {

Tests/OpenGraphCompatibilityTests/Graph/GraphCompatibilityTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ struct GraphCompatibilityTests {
4343
let description = try #require(Graph.description(
4444
nil,
4545
options: [
46-
Graph.descriptionFormat: Graph.descriptionFormatDictionary
46+
DescriptionOption.format: Graph.descriptionFormatDictionary
4747
] as NSDictionary
4848
))
4949
let dic = description as! Dictionary<String, AnyHashable>
@@ -54,7 +54,7 @@ struct GraphCompatibilityTests {
5454
@Test(.disabled(if: !compatibilityTestEnabled, "Not implemented on OG"))
5555
func graphDescriptionDot() throws {
5656
let options = NSMutableDictionary()
57-
options[Graph.descriptionFormat] = Graph.descriptionFormatDot
57+
options[DescriptionOption.format] = Graph.descriptionFormatDot
5858
#expect(Graph.description(nil, options: options) == nil)
5959
let graph = Graph()
6060
let description = try #require(Graph.description(graph, options: options))

Tests/OpenGraphCompatibilityTests/Graph/GraphDescriptionCompatibilityTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import Testing
88
struct GraphDescriptionCompatibilityTests {
99
@Test
1010
func format() {
11-
#expect(Graph.descriptionFormat as String == "format")
11+
#expect(DescriptionOption.format.rawValue as String == "format")
1212
}
1313
}
1414
#endif

0 commit comments

Comments
 (0)