Update for Swift 1.2

thoughtbot · Feb 9, 2015 · 5e20d2a · 5e20d2a
1 parent 58ed338
commit 5e20d2a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/Argo/Globals/JSONValue.swift b/Argo/Globals/JSONValue.swift
@@ -31,7 +31,7 @@ public extension JSONValue {
 
   static func mapDecode<A where A: JSONDecodable, A == A.DecodedType>(value: JSONValue) -> [A]? {
     switch value {
-    case let .JSONArray(a): return sequence(a.map { A.decode($0) })
+    case let .JSONArray(a): return sequence(A.decode <^> a)
     default: return .None
     }
   }

diff --git a/Argo/Operators/JSONOperators.swift b/Argo/Operators/JSONOperators.swift
@@ -4,11 +4,7 @@ import Runes
 
 // Pull embedded value from JSON
 public func <|<A where A: JSONDecodable, A == A.DecodedType>(json: JSONValue, keys: [String]) -> A? {
-  if let o = json.find(keys) {
-    return A.decode(o)
-  }
-
-  return .None
+  return json.find(keys) >>- A.decode
 }
 
 // Pull value from JSON

diff --git a/Argo/Protocols/JSONDecodable.swift b/Argo/Protocols/JSONDecodable.swift
@@ -1,4 +1,4 @@
 public protocol JSONDecodable {
   typealias DecodedType = Self
-  class func decode(JSONValue) -> DecodedType?
+  static func decode(JSONValue) -> DecodedType?
 }