add caching by default and refactor a bit (#104)

Author: sargunv

src/commonMain/kotlin/dev/sargunv/pokekotlin/client/PokeApi.kt

@@ -1,5 +1,6 @@
 package dev.sargunv.pokekotlin.client
 
+import de.jensklingenberg.ktorfit.Ktorfit.Builder
 import de.jensklingenberg.ktorfit.http.GET
 import de.jensklingenberg.ktorfit.http.Path
 import de.jensklingenberg.ktorfit.http.Query
@@ -54,6 +55,14 @@ import dev.sargunv.pokekotlin.model.SuperContestEffect
 import dev.sargunv.pokekotlin.model.Type
 import dev.sargunv.pokekotlin.model.Version
 import dev.sargunv.pokekotlin.model.VersionGroup
+import dev.sargunv.pokekotlin.util.getDefaultEngine
+import io.ktor.client.HttpClient
+import io.ktor.client.HttpClientConfig
+import io.ktor.client.engine.HttpClientEngine
+import io.ktor.client.plugins.cache.HttpCache
+import io.ktor.client.plugins.cache.storage.CacheStorage
+import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
+import io.ktor.serialization.kotlinx.json.json
 
 interface PokeApi {
 
@@ -544,4 +553,24 @@ interface PokeApi {
   @GET("language/{id}/") suspend fun getLanguage(@Path("id") id: Int): Language
 
   // endregion Utility
+
+  companion object : PokeApi by PokeApi()
 }
+
+fun PokeApi(
+  baseUrl: String = "https://pokeapi.co/api/v2/",
+  engine: HttpClientEngine = getDefaultEngine(),
+  cacheStorage: CacheStorage? = null,
+  configure: HttpClientConfig<*>.() -> Unit = {},
+) =
+  Builder()
+    .baseUrl(baseUrl)
+    .httpClient(
+      HttpClient(engine) {
+        this.configure()
+        this.install(HttpCache) { cacheStorage?.let { privateStorage(it) } }
+        this.install(ContentNegotiation) { json(PokeApiJson) }
+      }
+    )
+    .build()
+    .createPokeApi()

src/commonMain/kotlin/dev/sargunv/pokekotlin/client/PokeApiClient.kt

@@ -1,6 +1,6 @@
 package dev.sargunv.pokekotlin.test
 
-import dev.sargunv.pokekotlin.client.PokeApiClient
+import dev.sargunv.pokekotlin.client.PokeApi
 import kotlin.test.Ignore
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -9,15 +9,10 @@ import kotlinx.coroutines.test.runTest
 @Ignore
 class LiveTest {
 
-  private val liveClient = PokeApiClient()
-
-  @Test fun liveObject() = runTest { assertEquals("sitrus", liveClient.getBerry(10).name) }
+  @Test fun liveObject() = runTest { assertEquals("sitrus", PokeApi.getBerry(10).name) }
 
   @Test
   fun liveList() = runTest {
-    assertEquals(
-      liveClient.getMoveList(0, 50).results[25],
-      liveClient.getMoveList(25, 50).results[0],
-    )
+    assertEquals(PokeApi.getMoveList(0, 50).results[25], PokeApi.getMoveList(25, 50).results[0])
   }
 }

src/commonTest/kotlin/dev/sargunv/pokekotlin/test/LiveTest.kt

@@ -1,7 +1,6 @@
 package dev.sargunv.pokekotlin.test
 
 import dev.sargunv.pokekotlin.client.PokeApi
-import dev.sargunv.pokekotlin.client.PokeApiClient
 import dev.sargunv.pokekotlin.client.PokeApiJson
 import dev.sargunv.pokekotlin.model.ApiResourceList
 import dev.sargunv.pokekotlin.model.NamedApiResourceList
@@ -43,6 +42,4 @@ private val OffsetLimitPlugin =
   }
 
 object StaticPokeApi :
-  PokeApi by (PokeApiClient(baseUrl = "http://localhost:8080/api/v2/") {
-    install(OffsetLimitPlugin)
-  })
+  PokeApi by (PokeApi(baseUrl = "http://localhost:8080/api/v2/") { install(OffsetLimitPlugin) })