Merge branch 'linux-scanner'

Author: Alexis Aubry Radanovic

.travis.yml

@@ -1,8 +1,15 @@
-language: objective-c
+os:
+  - linux
+  - osx
+
+language: generic
+sudo: required
+dist: trusty
 osx_image: xcode8
+
+install:
+  - if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/02090c7ede5a637b76e6df1710e83cd0bbe7dcdf/swiftenv-install.sh)"; fi
+
 script:
-    - xcodebuild build -project HTMLString.xcodeproj -scheme HTMLString -destination "platform=macOS,arch=x86_64"
-    - xcodebuild build -project HTMLString.xcodeproj -scheme HTMLString -destination "platform=iOS Simulator,name=iPhone 7 Plus"
-    - xcodebuild build -project HTMLString.xcodeproj -scheme HTMLString -destination "platform=watchOS Simulator,name=Apple Watch Series 2 - 42mm"
-    - xcodebuild build -project HTMLString.xcodeproj -scheme HTMLString -destination "platform=tvOS Simulator,name=Apple TV 1080p"
-    - xcodebuild test -project HTMLString.xcodeproj -scheme HTMLString -destination "platform=macOS,arch=x86_64"
+  - swift build
+  - swift test

CHANGELOG.md

@@ -0,0 +1,10 @@
+# 1.0.2
+
+## Fixed
+
+- `unescapingFromHTML` : An API difference between Darwin and Open-Source Foundation in `Scanner` caused compilation to fail on Linux.
+
+## Improvements
+
+- Tests on Linux and macOS
+- Minor changes in README and Podspec

HTMLString.podspec

@@ -1,11 +1,11 @@
 Pod::Spec.new do |s|
 
   s.name         = "HTMLString"
-  s.version      = "1.0.1"
-  s.summary      = "Deal with Strings that contains HTML in Swift"
+  s.version      = "1.0.2"
+  s.summary      = "Convert Strings that contains HTML in Swift"
 
   s.description  = <<-DESC
-`HTMLString` is a micro-library written in Swift that enables your app to deal with Strings that contain HTML. It supports ASCII and Unicode Escaping, Unescaping. You can use it with 2125 named escape sequences (`&amp;`) as well as with decimal (`&#128;`) and hexadecimal (`&#x1F643;`) sequences.
+HTMLString is a micro-library written in Swift that enables your app to convert Strings that contain HTML. It supports ASCII and Unicode escaping, as well as unescaping. You can use it with 2125 named escape sequences (`&amp;`) as well as with decimal (`&#128;`) and hexadecimal (`&#x1F643;`) sequences.
 DESC
 
   s.homepage     = "https://github.com/alexaubry/HTMLString"
@@ -22,6 +22,5 @@ DESC
 
   s.source       = { :git => "https://github.com/alexaubry/HTMLString.git", :tag => "#{s.version}" }
   s.source_files  = "Sources"
-  s.framework  = "Foundation"
 
 end

README.md

@@ -1,8 +1,11 @@
 # `import HTMLString`
 
-![Build Status](https://travis-ci.org/alexaubry/HTMLString.svg?branch=master) ![Swift 3.0](https://img.shields.io/badge/Swift-3.0-Orange.svg) ![CocoaPods](https://img.shields.io/cocoapods/v/HTMLString.svg?maxAge=86400") ![The MIT License](https://img.shields.io/cocoapods/l/HTMLString.svg?maxAge=86400")
+![Swift 3.0](https://img.shields.io/badge/Swift-3.0-Orange.svg)
+![The MIT License](https://img.shields.io/cocoapods/l/HTMLString.svg)
+[![Build Status](https://travis-ci.org/alexaubry/HTMLString.svg?branch=master)](https://travis-ci.org/alexaubry/HTMLString)
+![CocoaPods](https://img.shields.io/cocoapods/v/HTMLString.svg?maxAge=86400") 
 
-`HTMLString` is a micro-library written in Swift that enables your app to deal with Strings that contain HTML.
+`HTMLString` is a micro-library written in Swift that enables your app to convert Strings that contain HTML.
 
 ## Features
 
@@ -25,7 +28,7 @@
 Add this line to your `Podfile`:
 
 ~~~
-pod 'HTMLString' '~> 1.0.1'
+pod 'HTMLString' '~> 1.0.2'
 ~~~
 
 ### Swift Package Manager
@@ -50,7 +53,7 @@ This library adds three properties to String instances :
 ### Escaping
 
 ~~~swift
-import HTMLString 
+import HTMLString
 
 let emoji = "My favorite emoji is 🙃"
 let escapedEmoji = emoji.escapingForASCIIHTML // "My favorite emoji is 🙃"

Sources/HTMLString.swift

@@ -130,12 +130,25 @@ public extension String {
                 if isHexadecimal {
 
                     let scanner = Scanner(string: sequence)
+
+                    #if os(OSX) || os(iOS) || os(watchOS) || os(tvOS)
 
                     guard scanner.scanHexInt32(&value) && value > 0 else {
                         searchRange = escapeRange.upperBound ..< finalString.endIndex
                         continue
                     }
 
+                    #else 
+
+		    guard let _value = scanner.scanHexInt() else {
+                        searchRange = escapeRange.upperBound ..< finalString.endIndex
+                        continue
+                    }
+
+                    value = _value
+
+                    #endif
+
                 } else {
 
                     guard let _value = UInt32(sequence) else {