0.8.1

mhuusko5 · May 29, 2019 · ad3e308 · ad3e308
1 parent 5925907
commit ad3e308
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 111 deletions.
diff --git a/Babel.podspec b/Babel.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'Babel'
-  s.version = '0.8.0'
+  s.version = '0.8.1'
   s.summary = 'JSON! *Pure Swift*, failure driven, inferred *but unambiguous*, with powerful *but optional* operators.'
 
   s.license = { :type => 'MIT', :file => 'LICENSE' }

diff --git a/Sources/Decodable.swift b/Sources/Decodable.swift
@@ -79,29 +79,31 @@ public extension Value {
         return try T.decode(self)
     }
 
-    func decode<T: Decodable>(type: T.Type = T.self, ignoreFailure: Bool = false) throws -> T? {
-        do {
-            return try T.decode(self)
-        } catch let error {
-            if ignoreFailure { return nil }
-            else { throw error }
-        }
-    }
-
     func decode<T: Decodable>(type: T.Type = T.self, ignoreFailures: Bool = false) throws -> [T] {
         return try asArray().decode(ignoreFailures: ignoreFailures)
     }
 
     func decode<K: Decodable, V: Decodable>(
-        keyType: K.Type = K.self,
-        valueType: V.Type = V.self,
+        keyType: K.Type = K.self, valueType: V.Type = V.self,
         ignoreFailures: Bool = false
     ) throws -> [K: V] {
 
         return try asDictionary().decode(ignoreFailures: ignoreFailures)
     }
 }
 
+extension Array: Decodable where Element: Decodable {
+    public static func _decode(_ value: Value) throws -> Array {
+        return try value.asArray().decode()
+    }
+}
+
+extension Dictionary: Decodable where Key: Decodable, Value: Decodable {
+    public static func _decode(_ value: Babel.Value) throws -> Dictionary {
+        return try value.asDictionary().decode()
+    }
+}
+
 extension Bool: Decodable {
     public static func _decode(_ value: Value) throws -> Bool { return try value.asBool() }
 }

diff --git a/Sources/Operators.swift b/Sources/Operators.swift
@@ -12,14 +12,6 @@ public func =><T: Decodable>(lhs: Value, rhs: Int) throws -> T {
     return try (lhs => rhs).decode()
 }
 
-public func =><T: Decodable>(lhs: Value, rhs: Int) throws -> [T] {
-    return try (lhs => rhs).decode()
-}
-
-public func =><K: Decodable, V: Decodable>(lhs: Value, rhs: Int) throws -> [K: V] {
-    return try (lhs => rhs).decode()
-}
-
 // MARK: Nil Chaining
 
 public func =>(lhs: Value?, rhs: Int) throws -> Value? {
@@ -30,14 +22,6 @@ public func =><T: Decodable>(lhs: Value?, rhs: Int) throws -> T? {
     return try (lhs => rhs)?.decode()
 }
 
-public func =><T: Decodable>(lhs: Value?, rhs: Int) throws -> [T]? {
-    return try (lhs => rhs)?.decode()
-}
-
-public func =><K: Decodable, V: Decodable>(lhs: Value?, rhs: Int) throws -> [K: V]? {
-    return try (lhs => rhs)?.decode()
-}
-
 // MARK: - Array (Accept Null) -
 
 public func =>?(lhs: Value, rhs: Int) throws -> Value? {
@@ -48,14 +32,6 @@ public func =>?<T: Decodable>(lhs: Value, rhs: Int) throws -> T? {
     return try (lhs =>? rhs)?.decode()
 }
 
-public func =>?<T: Decodable>(lhs: Value, rhs: Int) throws -> [T]? {
-    return try (lhs =>? rhs)?.decode()
-}
-
-public func =>?<K: Decodable, V: Decodable>(lhs: Value, rhs: Int) throws -> [K: V]? {
-    return try (lhs =>? rhs)?.decode()
-}
-
 // MARK: Nil Chaining
 
 public func =>?(lhs: Value?, rhs: Int) throws -> Value? {
@@ -66,14 +42,6 @@ public func =>?<T: Decodable>(lhs: Value?, rhs: Int) throws -> T? {
     return try (lhs =>? rhs)?.decode()
 }
 
-public func =>?<T: Decodable>(lhs: Value?, rhs: Int) throws -> [T]? {
-    return try (lhs =>? rhs)?.decode()
-}
-
-public func =>?<K: Decodable, V: Decodable>(lhs: Value?, rhs: Int) throws -> [K: V]? {
-    return try (lhs =>? rhs)?.decode()
-}
-
 // MARK: - Array (Accept Out of Bounds or Null) -
 
 public func =>??(lhs: Value, rhs: Int) throws -> Value? {
@@ -84,14 +52,6 @@ public func =>??<T: Decodable>(lhs: Value, rhs: Int) throws -> T? {
     return try (lhs =>?? rhs)?.decode()
 }
 
-public func =>??<T: Decodable>(lhs: Value, rhs: Int) throws -> [T]? {
-    return try (lhs =>?? rhs)?.decode()
-}
-
-public func =>??<K: Decodable, V: Decodable>(lhs: Value, rhs: Int) throws -> [K: V]? {
-    return try (lhs =>?? rhs)?.decode()
-}
-
 // MARK: Nil Chaining
 
 public func =>??(lhs: Value?, rhs: Int) throws -> Value? {
@@ -102,14 +62,6 @@ public func =>??<T: Decodable>(lhs: Value?, rhs: Int) throws -> T? {
     return try (lhs =>?? rhs)?.decode()
 }
 
-public func =>??<T: Decodable>(lhs: Value?, rhs: Int) throws -> [T]? {
-    return try (lhs =>?? rhs)?.decode()
-}
-
-public func =>??<K: Decodable, V: Decodable>(lhs: Value?, rhs: Int) throws -> [K: V]? {
-    return try (lhs =>?? rhs)?.decode()
-}
-
 // MARK: - Dictionary -
 
 public func =>(lhs: Value, rhs: String) throws -> Value {
@@ -120,14 +72,6 @@ public func =><T: Decodable>(lhs: Value, rhs: String) throws -> T {
     return try (lhs => rhs).decode()
 }
 
-public func =><T: Decodable>(lhs: Value, rhs: String) throws -> [T] {
-    return try (lhs => rhs).decode()
-}
-
-public func =><K: Decodable, V: Decodable>(lhs: Value, rhs: String) throws -> [K: V] {
-    return try (lhs => rhs).decode()
-}
-
 // MARK: Nil Chaining
 
 public func =>(lhs: Value?, rhs: String) throws -> Value? {
@@ -138,14 +82,6 @@ public func =><T: Decodable>(lhs: Value?, rhs: String) throws -> T? {
     return try (lhs => rhs)?.decode()
 }
 
-public func =><T: Decodable>(lhs: Value?, rhs: String) throws -> [T]? {
-    return try (lhs => rhs)?.decode()
-}
-
-public func =><K: Decodable, V: Decodable>(lhs: Value?, rhs: String) throws -> [K: V]? {
-    return try (lhs => rhs)?.decode()
-}
-
 // MARK: - Dictionary (Accept Null) -
 
 public func =>?(lhs: Value, rhs: String) throws -> Value? {
@@ -156,14 +92,6 @@ public func =>?<T: Decodable>(lhs: Value, rhs: String) throws -> T? {
     return try (lhs =>? rhs)?.decode()
 }
 
-public func =>?<T: Decodable>(lhs: Value, rhs: String) throws -> [T]? {
-    return try (lhs =>? rhs)?.decode()
-}
-
-public func =>?<K: Decodable, V: Decodable>(lhs: Value, rhs: String) throws -> [K: V]? {
-    return try (lhs =>? rhs)?.decode()
-}
-
 // MARK: Nil Chaining
 
 public func =>?(lhs: Value?, rhs: String) throws -> Value? {
@@ -174,14 +102,6 @@ public func =>?<T: Decodable>(lhs: Value?, rhs: String) throws -> T? {
     return try (lhs =>? rhs)?.decode()
 }
 
-public func =>?<T: Decodable>(lhs: Value?, rhs: String) throws -> [T]? {
-    return try (lhs =>? rhs)?.decode()
-}
-
-public func =>?<K: Decodable, V: Decodable>(lhs: Value?, rhs: String) throws -> [K: V]? {
-    return try (lhs =>? rhs)?.decode()
-}
-
 // MARK: - Dictionary (Accept Missing Key or Null) -
 
 public func =>??(lhs: Value, rhs: String) throws -> Value? {
@@ -192,14 +112,6 @@ public func =>??<T: Decodable>(lhs: Value, rhs: String) throws -> T? {
     return try (lhs =>?? rhs)?.decode()
 }
 
-public func =>??<T: Decodable>(lhs: Value, rhs: String) throws -> [T]? {
-    return try (lhs =>?? rhs)?.decode()
-}
-
-public func =>??<K: Decodable, V: Decodable>(lhs: Value, rhs: String) throws -> [K: V]? {
-    return try (lhs =>?? rhs)?.decode()
-}
-
 // MARK: Nil Chaining
 
 public func =>??(lhs: Value?, rhs: String) throws -> Value? {
@@ -209,11 +121,3 @@ public func =>??(lhs: Value?, rhs: String) throws -> Value? {
 public func =>??<T: Decodable>(lhs: Value?, rhs: String) throws -> T? {
     return try (lhs =>?? rhs)?.decode()
 }
-
-public func =>??<T: Decodable>(lhs: Value?, rhs: String) throws -> [T]? {
-    return try (lhs =>?? rhs)?.decode()
-}
-
-public func =>??<K: Decodable, V: Decodable>(lhs: Value?, rhs: String) throws -> [K: V]? {
-    return try (lhs =>?? rhs)?.decode()
-}
diff --git a/Xcode/Babel.playground/Contents.swift b/Xcode/Babel.playground/Contents.swift
@@ -117,7 +117,7 @@ public struct YouTubeResponse: Decodable {
         case .functionExplicit:
             return try YouTubeResponse(
                 apiVersion: value.asDictionary().valueFor("apiVersion").asDouble(),
-                data: value.asDictionary().maybeValueFor("data", nilOnNull: true, throwOnMissing: true)?.decode(type: YouTubeData.self, ignoreFailure: false)
+                data: value.asDictionary().maybeValueFor("data", nilOnNull: true, throwOnMissing: true)?.decode(type: YouTubeData.self)
             )
 
         case .unwrappingAndChecking:
@@ -165,7 +165,7 @@ public struct YouTubeData: Decodable {
         case .functionExplicit:
             return try YouTubeData(
                 totalItems: value.asDictionary().valueFor("totalItems").asInt(),
-                firstItem: value.asDictionary().valueFor("items").asArray().maybeValueAt(0, nilOnNull: true, throwOnMissing: false)?.decode(type: YouTubeDataItem.self, ignoreFailure: false),
+                firstItem: value.asDictionary().valueFor("items").asArray().maybeValueAt(0, nilOnNull: true, throwOnMissing: false)?.decode(type: YouTubeDataItem.self),
                 items: value.asDictionary().valueFor("items").asArray().decode(type: YouTubeDataItem.self, ignoreFailures: false)
             )
 

diff --git a/Xcode/Info.plist b/Xcode/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.8.0</string>
+	<string>0.8.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>