Swift 5.1 (#22)

* Use single-quote strings in podspec

* Update Podfile

* Update example project

* Update library

* Add changelog entry

Author: BasThomas

Analysis.podspec

@@ -1,22 +1,22 @@
 Pod::Spec.new do |s|
-  s.name             = "Analysis"
-  s.version          = "0.4.0"
-  s.summary          = "Analyse your strings."
+  s.name             = 'Analysis'
+  s.version          = '0.5.0'
+  s.summary          = 'Analyse your strings.'
 
   s.description      = <<-DESC
 Analysis analyses strings, checking word count, sentence count, frequency of words and more.
                        DESC
 
-  s.homepage         = "https://github.com/BasThomas/Analysis"
-  s.license          = { :type => "MIT", :file => "LICENSE" }
-  s.author           = { "Bas Broek" => "bas@basbroek.nl" }
-  s.source           = { :git => "https://github.com/BasThomas/Analysis.git", :tag => s.version }
-  s.social_media_url = "https://twitter.com/basthomas"
+  s.homepage         = 'https://github.com/BasThomas/Analysis'
+  s.license          = { :type => 'MIT', :file => 'LICENSE' }
+  s.author           = { 'Bas Broek' => 'bas@basbroek.nl' }
+  s.source           = { :git => 'https://github.com/BasThomas/Analysis.git', :tag => s.version }
+  s.social_media_url = 'https://twitter.com/basthomas'
 
-  s.ios.deployment_target = "8.0"
-  s.swift_version         = "5.0"
+  s.ios.deployment_target = '8.0'
+  s.swift_version         = '5.1'
 
-  s.source_files = "Analysis/Classes/**/*"
+  s.source_files = 'Analysis/Classes/**/*'
 
-  s.frameworks = "Foundation"
+  s.frameworks = 'Foundation'
 end

Analysis/Classes/Analysis.swift

@@ -34,7 +34,8 @@ public struct Analysis: Hashable {
     sentences = input
       .replacingOccurrences(of: "! ", with: "!\n")
       .replacingOccurrences(of: ". ", with: ".\n")
-      .replacingOccurrences(of: "? ", with: "?\n").lines
+      .replacingOccurrences(of: "? ", with: "?\n")
+      .lines
       .filter { !$0.trimmingCharacters(in: .whitespaces).isEmpty }
     words = input
       .split(separator: " ")
@@ -44,7 +45,7 @@ public struct Analysis: Hashable {
 
   /// Returns the sentence count of the `input`.
   public func sentenceCount() -> Int {
-    return sentences.count
+    sentences.count
   }
 
   /// Returns the word count of the `input`.
@@ -62,7 +63,7 @@ public struct Analysis: Hashable {
 
   /// Returns the total amount of syllables of the `input`.
   public func syllableCount() -> Int {
-    return words
+    words
       .map { $0.syllables }
       .reduce(0, +)
   }
@@ -105,7 +106,7 @@ public struct Analysis: Hashable {
   /// - Returns: A `Dictionary` containing the words and their
   /// occurence.
   public func wordOccurrences(caseSensitive: Bool = false) -> [String: Int] {
-    return _wordOccurrences(caseSensitive: caseSensitive)
+    _wordOccurrences(caseSensitive: caseSensitive)
   }
 
   /// Returns the character occurrences of the `input`.
@@ -117,7 +118,7 @@ public struct Analysis: Hashable {
   /// - Returns: A `Dictionary` containing the characters and their
   /// occurence.
   public func characterOccurences(caseSensitive: Bool = false) -> [Character: Int] {
-    return _characterOccurences(caseSensitive: caseSensitive)
+    _characterOccurences(caseSensitive: caseSensitive)
   }
 
   /// Returns the amount of occurrences of the specified word.
@@ -169,7 +170,10 @@ public struct Analysis: Hashable {
     of word: String,
     caseSensitive: Bool = false
   ) -> Percentage {
-    return Double(occurrences(of: word, caseSensitive: caseSensitive)) / Double(wordCount()) * 100.0
+    Double(occurrences(
+      of: word,
+      caseSensitive: caseSensitive
+    )) / Double(wordCount()) * 100.0
   }
 
   /// Returns the frequency of the specified `Character`.
@@ -187,7 +191,12 @@ public struct Analysis: Hashable {
     caseSensitive: Bool = false,
     includingSpaces: Bool = true
   ) -> Percentage {
-    return Double(occurrences(of: character, caseSensitive: caseSensitive)) / Double(characterCount(includingSpaces: includingSpaces)) * 100.0
+    Double(occurrences(
+      of: character,
+      caseSensitive: caseSensitive
+    )) / Double(characterCount(
+      includingSpaces: includingSpaces
+    )) * 100.0
   }
 
   /// Returns the average characters of the specified `LengthOption`.
@@ -209,49 +218,49 @@ public struct Analysis: Hashable {
 
   /// Returns the average words per sentence.
   public var averageWordsPerSentence: Double {
-    return Double(wordCount()) / Double(sentenceCount())
+    Double(wordCount()) / Double(sentenceCount())
   }
 
   private var _wordsPerSentences: Double {
-    return Double(wordCount()) / Double(sentenceCount())
+    Double(wordCount()) / Double(sentenceCount())
   }
 
   private var _syllablesPerWords: Double {
-    return Double(syllableCount()) / Double(wordCount())
+    Double(syllableCount()) / Double(wordCount())
   }
 
   /// Returns the Flesch reading ease score.
   ///
   /// - Note: https://en.wikipedia.org/wiki/Flesch–Kincaid_readability_tests#Flesch_reading_ease
   public func fleschReadingEase() -> Percentage {
-    return 206.835 - 1.015 * _wordsPerSentences - 84.6 * _syllablesPerWords
+    206.835 - 1.015 * _wordsPerSentences - 84.6 * _syllablesPerWords
   }
 
   /// Returns the Flesch-Kincaid grade level.
   ///
   /// - Note: https://en.wikipedia.org/wiki/Flesch–Kincaid_readability_tests#Flesch.E2.80.93Kincaid_grade_level
   public func fleschKincaidGradeLevel() -> Grade {
-    return 0.39 * _wordsPerSentences + 11.8 * _syllablesPerWords - 15.59
+    0.39 * _wordsPerSentences + 11.8 * _syllablesPerWords - 15.59
   }
 }
 
 extension Analysis: Comparable {
 
   public static func <(lhs: Analysis, rhs: Analysis) -> Bool {
-    return lhs.input < rhs.input
+    lhs.input < rhs.input
   }
 }
 
 extension Analysis: CustomStringConvertible, CustomDebugStringConvertible {
 
   /// A textual representation of this instance.
   public var description: String {
-    return "Analysis(\"\(input)\")"
+    "Analysis(\"\(input)\")"
   }
 
   /// A representation of the string that is suitable for debugging.
   public var debugDescription: String {
-    return dump(description)
+    dump(description)
   }
 }
 

Changelog.md

@@ -1,5 +1,9 @@
 # next
 
+# [0.5.0](https://github.com/BasThomas/Analysis/releases/tag/0.4.0)
+
+- Updated to Swift 5.1.
+
 # [0.4.0](https://github.com/BasThomas/Analysis/releases/tag/0.4.0)
 
 - **Breaking**: Nested `LengthOption` under the `Analysis` namespace. If it is accessed without type inference,

Example/Analysis/AppDelegate.swift

@@ -13,7 +13,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
   var window: UIWindow?
 
-  func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
-    return true
+  func application(
+    _ application: UIApplication,
+    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
+  ) -> Bool {
+    true
   }
 }

Example/Analysis/UIViewController+Safari.swift

@@ -11,17 +11,30 @@ import SafariServices
 
 extension UIViewController: SFSafariViewControllerDelegate {
 
-  func open(url: URL, inSafariViewController safariViewController: Bool = true, reader: Bool = false) {
-    if !safariViewController {
+  func open(
+    url: URL,
+    inSafariViewController safariViewController: Bool = true,
+    reader: Bool = false,
+    application: UIApplication = .shared
+  ) {
+    func openSafari(with url: URL) {
       if #available(iOS 10.0, *) {
-        UIApplication.shared.open(url)
+        application.open(url)
       } else {
-        UIApplication.shared.openURL(url)
+        application.openURL(url)
       }
+    }
+    if safariViewController == false {
+      openSafari(with: url)
     } else if #available(iOS 9.0, *) {
-      let safariViewController = SFSafariViewController(url: url, entersReaderIfAvailable: reader)
+      let safariViewController = SFSafariViewController(
+        url: url,
+        entersReaderIfAvailable: reader
+      )
       safariViewController.delegate = self
       present(safariViewController, animated: true)
+    } else {
+      openSafari(with: url)
     }
   }
 

Example/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - Analysis (0.4.0)
+  - Analysis (0.5.0)
 
 DEPENDENCIES:
   - Analysis (from `../`)
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  Analysis: faa09d680f722f4111f2f4dc69492cfc228f0ee4
+  Analysis: 7198ca0acc133fe99510f82fe241e65b77de2fbb
 
 PODFILE CHECKSUM: d91e06da3cd073207837737c6c65ef37d1dfd49f