Skip to content

JP - Allows to specify Conn and Read Timeouts #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 11, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,28 @@

package org.scalaexercises.evaluator

import cats.free.Free
import org.scalaexercises.evaluator.EvaluatorResponses.EvaluationResponse
import org.scalaexercises.evaluator.free.algebra.{EvaluatorOp, EvaluatorOps}

class EvaluatorAPI(url: String, authKey: String)(
implicit O: EvaluatorOps[EvaluatorOp]) {
import scala.concurrent.duration.Duration

def evaluates(resolvers: List[String] = Nil,
dependencies: List[Dependency] = Nil,
code: String) =
O.evaluates(url, authKey, resolvers, dependencies, code)
class EvaluatorAPI(
url: String,
authKey: String,
connTimeout: Duration,
readTimeout: Duration)(implicit O: EvaluatorOps[EvaluatorOp]) {

def evaluates(
resolvers: List[String] = Nil,
dependencies: List[Dependency] = Nil,
code: String): Free[EvaluatorOp, EvaluationResponse[EvalResponse]] =
O.evaluates(
url,
authKey,
connTimeout,
readTimeout,
resolvers,
dependencies,
code)
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,18 @@ package org.scalaexercises.evaluator

import cats.data.XorT
import cats.{MonadError, ~>}
import org.scalaexercises.evaluator.EvaluatorResponses.{EvaluationException, EvaluationResponse, EvaluationResult, EvalIO}
import org.scalaexercises.evaluator.EvaluatorResponses.{EvalIO, EvaluationException, EvaluationResponse, EvaluationResult}
import org.scalaexercises.evaluator.free.algebra.EvaluatorOp

class EvaluatorClient(url: String, authKey: String) {
import scala.concurrent.duration._
import scala.concurrent.duration.Duration

lazy val api = new EvaluatorAPI(url, authKey)
class EvaluatorClient(url: String,
authKey: String,
connTimeout: Duration = 1.second,
readTimeout: Duration = 10.seconds) {

lazy val api = new EvaluatorAPI(url, authKey, connTimeout, readTimeout)

}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import org.scalaexercises.evaluator.http.HttpClient
import io.circe.generic.auto._
import io.circe.syntax._

import scala.concurrent.duration.Duration

class Evaluator {

import Decoders._
Expand All @@ -19,6 +21,8 @@ class Evaluator {

def eval(url: String,
authKey: String,
connTimeout: Duration,
readTimeout: Duration,
resolvers: List[String] = Nil,
dependencies: List[Dependency] = Nil,
code: String): EvaluationResponse[EvalResponse] =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,14 @@ import cats.free.{Free, Inject}
import org.scalaexercises.evaluator.{Dependency, EvalResponse}
import org.scalaexercises.evaluator.EvaluatorResponses.EvaluationResponse

import scala.concurrent.duration._
import scala.concurrent.duration.Duration

sealed trait EvaluatorOp[A]
final case class Evaluates(url: String,
authKey: String,
connTimeout: Duration = 1.second,
readTimeout: Duration = 10.seconds,
resolvers: List[String] = Nil,
dependencies: List[Dependency] = Nil,
code: String)
Expand All @@ -22,12 +27,21 @@ class EvaluatorOps[F[_]](implicit I: Inject[EvaluatorOp, F]) {
def evaluates(
url: String,
authKey: String,
connTimeout: Duration = 1.second,
readTimeout: Duration = 10.seconds,
resolvers: List[String] = Nil,
dependencies: List[Dependency] = Nil,
code: String
): Free[F, EvaluationResponse[EvalResponse]] =
Free.inject[EvaluatorOp, F](
Evaluates(url, authKey, resolvers, dependencies, code))
Evaluates(
url,
authKey,
connTimeout,
readTimeout,
resolvers,
dependencies,
code))

}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,24 @@ trait Interpreter {
val evaluator = new Evaluator()

def apply[A](fa: EvaluatorOp[A]): M[A] = fa match {
case Evaluates(url, authKey, resolvers, dependencies, code) ⇒
case Evaluates(
url,
authKey,
connTimeout,
readTimeout,
resolvers,
dependencies,
code) ⇒
A.pureEval(
Eval.later(
evaluator.eval(url, authKey, resolvers, dependencies, code)))
evaluator.eval(
url,
authKey,
connTimeout,
readTimeout,
resolvers,
dependencies,
code)))
}

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ import io.circe.Decoder
import org.scalaexercises.evaluator.EvaluatorResponses
import org.scalaexercises.evaluator.EvaluatorResponses.EvaluationResponse

import scala.concurrent.duration._
import scala.concurrent.duration.Duration

object HttpClient {

val authHeaderName = "x-scala-eval-api-token"
Expand All @@ -23,11 +26,17 @@ class HttpClient {
url: String,
secretKey: String,
method: String = "post",
connTimeout: Duration = 1.second,
readTimeout: Duration = 10.seconds,
headers: Headers = Map.empty,
data: String
)(implicit D: Decoder[A]): EvaluationResponse[A] =
EvaluatorResponses.toEntity(
HttpRequestBuilder(url = url, httpVerb = method)
HttpRequestBuilder(
url = url,
httpVerb = method,
connTimeout = connTimeout,
readTimeout = readTimeout)
.withHeaders(headers + (authHeaderName -> secretKey))
.withBody(data)
.run)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,15 @@ package org.scalaexercises.evaluator.http

import org.scalaexercises.evaluator.http.HttpClient._

import scalaj.http.Http
import scala.concurrent.duration.Duration
import scalaj.http.{Http, HttpOptions}

case class HttpRequestBuilder(
url: String,
httpVerb: String,
connTimeout: Duration,
readTimeout: Duration,
followRedirects: Boolean = true,
headers: Headers = Map.empty[String, String],
body: Option[String] = None
) {
Expand All @@ -25,7 +29,11 @@ case class HttpRequestBuilder(

body
.fold(request)(
request.postData(_).header("content-type", "application/json"))
request
.postData(_)
.option(HttpOptions.connTimeout(connTimeout.toMillis.toInt))
.option(HttpOptions.readTimeout(readTimeout.toMillis.toInt))
.header("content-type", "application/json"))
.asString
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@ import cats.std.future._
import cats.{Eval, MonadError}
import org.scalaexercises.evaluator.free.interpreters.Interpreter

object implicits
extends Interpreter
with EvalInstances
with FutureInstances
object implicits extends Interpreter with EvalInstances with FutureInstances

trait EvalInstances {

Expand Down
2 changes: 1 addition & 1 deletion project/EvaluatorBuild.scala
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ object EvaluatorBuild extends AutoPlugin {


private[this] def baseSettings = Seq(
version := "0.0.1-SNAPSHOT",
version := "0.0.2-SNAPSHOT",
organization := "org.scala-exercises",
scalaVersion := "2.11.8",
scalafmtConfig in ThisBuild := Some(file(".scalafmt")),
Expand Down