Merge pull request #33 from yoavst/master

Non android support

fuel/build.gradle

@@ -1,47 +1,16 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
+apply plugin: 'kotlin'
 
 repositories {
-
     jcenter()
-
-}
-
-android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
-
-    defaultConfig {
-        minSdkVersion 9
-        targetSdkVersion 23
-        versionCode 1
-        versionName "0.57"
-    }
-
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-        test.java.srcDirs += 'src/test/kotlin'
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-        }
-    }
-
-    lintOptions {
-        abortOnError false
-    }
-
 }
 
 dependencies {
-
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
     testCompile "junit:junit:$junit_version"
     testCompile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
     testCompile "org.robolectric:robolectric:$robolectric_version"
+    testCompile "com.google.android:android:4.1.1.4"
 }
 
 buildscript {
@@ -61,5 +30,10 @@ buildscript {
     }
 }
 
+sourceSets {
+    main.java.srcDirs += 'src/main/kotlin'
+    test.java.srcDirs += 'src/test/kotlin'
+}
+
 //apply from: '../gradle/install.gradle'
 //apply from: '../gradle/bintray.gradle'

fuel/src/main/kotlin/fuel/core/Deserializable.kt

@@ -36,23 +36,23 @@ public interface ResponseDeserializable<out T : Any> : Deserializable<T> {
 
 }
 
-internal fun <T: Any, U : Deserializable<T>> Request.response(deserializable: U, handler: (Request, Response, Either<FuelError, T>) -> Unit) {
+fun <T: Any, U : Deserializable<T>> Request.response(deserializable: U, handler: (Request, Response, Either<FuelError, T>) -> Unit) {
     response(deserializable, { request, response, value ->
         handler(this@response, response, Either.Right(value))
     }, { request, response, error ->
         handler(this@response, response, Either.Left(error))
     })
 }
 
-internal fun <T: Any, U : Deserializable<T>> Request.response(deserializable: U, handler: Handler<T>) {
+fun <T: Any, U : Deserializable<T>> Request.response(deserializable: U, handler: Handler<T>) {
     response(deserializable, { request, response, value ->
         handler.success(request, response, value)
     }, { request, response, error ->
         handler.failure(request, response, error)
     })
 }
 
-internal fun <T: Any, U : Deserializable<T>> Request.response(deserializable: U,
+private fun <T: Any, U : Deserializable<T>> Request.response(deserializable: U,
                                                         success: (Request, Response, T) -> Unit,
                                                         failure: (Request, Response, FuelError) -> Unit) {
     taskRequest.apply {

fuel/src/main/kotlin/fuel/core/Either.kt

@@ -10,14 +10,22 @@ sealed public class Either<out L, out R> {
     public operator abstract fun component1(): L?
     public operator abstract fun component2(): R?
 
-    public fun fold(fl: (L) -> Unit, fr: (R) -> Unit) {
+    public inline fun fold(fl: (L) -> Unit, fr: (R) -> Unit) {
         return when (this) {
             is Left<L, R> -> fl(this.left)
             is Right<L, R> -> fr(this.right)
             else -> throw UnsupportedOperationException()
         }
     }
 
+    public inline fun left(fl: (L) -> Unit) {
+        if (this is Left<L, R>) fl(this.left)
+    }
+
+    public inline fun right(fr: (R) -> Unit) {
+        if (this is Right<L, R>) fr(this.right)
+    }
+
     public fun swap(): Either<R, L> {
         return when (this) {
             is Left<L, R> -> Right(this.left)

fuel/src/main/kotlin/fuel/core/Encoding.kt

@@ -1,8 +1,8 @@
 package fuel.core
 
-import android.net.Uri
 import fuel.Fuel
 import fuel.util.toHexString
+import java.net.URI
 import java.net.URL
 import java.net.URLEncoder
 import kotlin.properties.Delegates
@@ -58,7 +58,7 @@ public class Encoding : Fuel.RequestConvertible {
     override val request by lazy { encoder(httpMethod, urlString, parameters) }
 
     private fun createUrl(path: String): URL {
-        val pathUri = Uri.parse(path)
+        val pathUri = URI(path)
         //give precedence to local path
         if (baseUrlString == null || pathUri.scheme != null) return URL(path)
 

fuel/src/main/kotlin/fuel/core/Manager.kt

@@ -2,7 +2,7 @@ package fuel.core
 
 import fuel.Fuel
 import fuel.toolbox.HttpClient
-import fuel.util.AndroidMainThreadExecutor
+import fuel.util.DefaultExecutor
 import fuel.util.readWriteLazy
 import java.util.concurrent.Executor
 import java.util.concurrent.ExecutorService
@@ -31,7 +31,7 @@ public class Manager {
     }
 
     //callback executor
-    public var callbackExecutor: Executor by readWriteLazy { AndroidMainThreadExecutor() }
+    public var callbackExecutor: Executor by readWriteLazy { DefaultExecutor() }
 
     companion object {
 

fuel/src/main/kotlin/fuel/core/Request.kt

@@ -1,10 +1,6 @@
 package fuel.core
 
-import android.util.Base64
-import fuel.util.copyTo
-import fuel.util.readWriteLazy
-import fuel.util.toHexString
-import org.json.JSONObject
+import fuel.util.*
 import java.io.*
 import java.net.URL
 import java.net.URLConnection
@@ -73,15 +69,6 @@ public class Request {
                 }
             }
         }
-
-        public fun jsonDeserializer(): Deserializable<JSONObject> {
-            return object : Deserializable<JSONObject> {
-                override fun deserialize(response: Response): JSONObject {
-                    return JSONObject(String(response.data))
-                }
-            }
-        }
-
     }
 
     //interfaces
@@ -181,16 +168,10 @@ public class Request {
 
     public fun responseString(handler: Handler<String>): Unit = response(Request.stringDeserializer(), handler)
 
-    //jsonObject
-    public fun responseJson(handler: (Request, Response, Either<FuelError, JSONObject>) -> Unit): Unit =
-            response(Request.jsonDeserializer(), handler)
-
-    public fun responseJson(handler: Handler<JSONObject>): Unit = response(Request.jsonDeserializer(), handler)
-
     //object
-    public fun <T: Any> responseObject(deserializer: ResponseDeserializable<T>, handler: (Request, Response, Either<FuelError, T>) -> Unit): Unit = response(deserializer, handler)
+    public fun <T : Any> responseObject(deserializer: ResponseDeserializable<T>, handler: (Request, Response, Either<FuelError, T>) -> Unit): Unit = response(deserializer, handler)
 
-    public fun <T: Any> responseObject(deserializer: ResponseDeserializable<T>, handler: Handler<T>): Unit = response(deserializer, handler)
+    public fun <T : Any> responseObject(deserializer: ResponseDeserializable<T>, handler: Handler<T>): Unit = response(deserializer, handler)
 
     public fun cUrlString(): String {
         val elements = arrayListOf("$ curl -i")