Merge pull request #28 from satoshi-takano/swift4

Make it available for Swift 4

Author: satoshi-takano

.swift-version

@@ -1 +1 @@
-3.0
+4.0

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode8
+osx_image: xcode9
 
 xcode_project: OpenGraph.xcodeproj
 xcode_scheme: OpenGraph

OpenGraph.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name        = "OpenGraph"
-  s.version     = "1.0.2"
+  s.version     = "1.0.3"
   s.summary     = "A Swift wrapper for the Open Graph protocol."
   s.homepage    = "https://github.com/satoshi-takano/OpenGraph"
   s.license     = {

OpenGraph.xcodeproj/project.pbxproj

@@ -168,7 +168,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 0820;
+				LastUpgradeCheck = 0900;
 				ORGANIZATIONNAME = "Satoshi Takano";
 				TargetAttributes = {
 					7B24FB141D3B2583005275B0 = {
@@ -278,14 +278,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -331,14 +337,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -372,7 +384,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "Mac Developer";
+				CODE_SIGN_IDENTITY = "";
 				COMBINE_HIDPI_IMAGES = YES;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -393,7 +405,7 @@
 				SKIP_INSTALL = YES;
 				SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				WATCHOS_DEPLOYMENT_TARGET = 2.0;
 			};
@@ -403,7 +415,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "Mac Developer";
+				CODE_SIGN_IDENTITY = "";
 				COMBINE_HIDPI_IMAGES = YES;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -423,7 +435,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				WATCHOS_DEPLOYMENT_TARGET = 2.0;
 			};
@@ -444,7 +456,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "net.cloud-dj.OpenGraphTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -462,7 +474,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "net.cloud-dj.OpenGraphTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};

OpenGraph.xcodeproj/xcshareddata/xcschemes/OpenGraph.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -55,6 +56,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

OpenGraph/OpenGraph.swift

@@ -6,16 +6,13 @@ public struct OpenGraph {
     public static func fetch(url: URL, completion: @escaping (OpenGraph?, Error?) -> Void) {
         let configuration = URLSessionConfiguration.default
         let session = URLSession(configuration: configuration)
-        
         let task = session.dataTask(with: url, completionHandler: { (data, response, error) in
             handleFetchResult(data: data, response: response, error: error, callback: completion)
         })
-        
         task.resume()
     }
 
     public static func fetch(url: URL, headers: [String:String], completion: @escaping (OpenGraph?, Error?) -> Void) {
-        
         var mutableURLRequest = URLRequest(url: url)
         for hkey in headers.keys {
             let value:String! = headers[hkey]
@@ -26,11 +23,9 @@ public struct OpenGraph {
 
         let configuration = URLSessionConfiguration.default
         let session = URLSession(configuration: configuration)
-        
         let task = session.dataTask(with: mutableURLRequest, completionHandler: { (data, response, error) in
             handleFetchResult(data: data, response: response, error: error, callback: completion)
         }) 
-        
         task.resume()
     }
 

OpenGraph/OpenGraphParser.swift

@@ -13,7 +13,7 @@ extension OpenGraphParser {
         )
         let metaTagMatches = metatagRegex.matches(in: htmlString,
                                        options: [],
-                                       range: NSMakeRange(0, htmlString.characters.count))
+                                       range: NSMakeRange(0, htmlString.count))
         if metaTagMatches.isEmpty {
             return [:]
         }
@@ -34,29 +34,24 @@ extension OpenGraphParser {
             var copiedAttributes = attributes
 
             let property = { () -> (name: String, content: String)? in
-                let metaTag = nsString.substring(with: result.rangeAt(0))
-                let nsMetaTag = metaTag as NSString
-                
+                let metaTag = nsString.substring(with: result.range(at: 0))
                 let propertyMatches = propertyRegexp.matches(in: metaTag,
                                                options: [],
-                                               range: NSMakeRange(0, metaTag.characters.count))
-                
+                                               range: NSMakeRange(0, metaTag.count))
                 guard let propertyResult = propertyMatches.first else { return nil }
 
-                
-                let contentMatches = contentRegexp.matches(in: metaTag, options: [], range: NSMakeRange(0, metaTag.characters.count))
-                
+                let contentMatches = contentRegexp.matches(in: metaTag, options: [], range: NSMakeRange(0, metaTag.count))
                 guard let contentResult = contentMatches.first else { return nil }
 
-                let property = nsMetaTag.substring(with: propertyResult.rangeAt(1))
-                let content = nsMetaTag.substring(with: contentResult.rangeAt(1))
+                let nsMetaTag = metaTag as NSString
+                let property = nsMetaTag.substring(with: propertyResult.range(at: 1))
+                let content = nsMetaTag.substring(with: contentResult.range(at: 1))
+                
                 return (name: property, content: content)
             }()
-            
             if let property = property, let metadata = OpenGraphMetadata(rawValue: property.name) {
                 copiedAttributes[metadata] = property.content
             }
-            
             return copiedAttributes
         }
 

README.md

@@ -39,7 +39,7 @@ extension OpenGraph {
 ```
 
 ## Requirements
-- Swift 3.0
+- Xcode 9 / Swift 4.0 or 3.2 (If you use Xcode 8.x, you can use [1.0.2](https://github.com/satoshi-takano/OpenGraph/releases/tag/1.0.2).)
 - iOS 8.0 or later
 - macOS 10.9 or later
 - tvOS 9.0 or later