Merge pull request #281 from RafalSumislawski/issue/203-missing-isclass-check

Partially fix #203

Author: zarthross

Diff for: swagger/src/main/scala/org/http4s/rho/swagger/TypeBuilder.scala

@@ -136,17 +136,21 @@ object TypeBuilder {
     }
 
   private[this] def isObjectEnum(sym: Symbol): Boolean =
-    sym.asClass.isSealed && sym.asClass.knownDirectSubclasses.forall { symbol =>
+    sym.isClass && sym.asClass.isSealed && sym.asClass.knownDirectSubclasses.forall { symbol =>
       symbol.isModuleClass && symbol.asClass.isCaseClass
     }
 
   private def modelToSwagger(tpe: Type, sfs: SwaggerFormats): Option[ModelImpl] =
     try {
       val TypeRef(_, sym: Symbol, tpeArgs: List[Type]) = tpe
+      val constructor = tpe.member(termNames.CONSTRUCTOR)
+      val typeSignature = if(constructor.owner == tpe.termSymbol) {
+        constructor.typeSignature
+      } else {
+        constructor.typeSignatureIn(tpe)
+      }
       val props: Map[String, Property] =
-        tpe
-          .member(termNames.CONSTRUCTOR)
-          .typeSignature
+        typeSignature
           .paramLists
           .flatten
           .map(paramSymToProp(sym, tpeArgs, sfs))

Diff for: swagger/src/test/scala/org/http4s/rho/swagger/TypeBuilderSpec.scala

@@ -9,6 +9,7 @@ import fs2.Stream
 import org.http4s.rho.swagger.models.AbstractProperty
 import org.specs2.execute.Result
 import org.specs2.mutable.Specification
+import shapeless.{:+:, CNil}
 
 import scala.reflect.runtime.universe.{TypeTag, typeOf, typeTag}
 
@@ -52,6 +53,13 @@ package object model {
   sealed trait LowerLevelSealedTrait extends TopLevelSealedTrait
   case class Value2() extends LowerLevelSealedTrait
   case class Value3() extends LowerLevelSealedTrait
+
+  trait Outer[T]{
+    case class Inner(t: T)
+  }
+  object OuterInt extends Outer[Int]
+
+  type ShapelessIntOrString = Int :+: String :+: CNil
 }
 
 class TypeBuilderSpec extends Specification {
@@ -401,6 +409,22 @@ class TypeBuilderSpec extends Specification {
       modelOf[FooEither] must not(throwA[StackOverflowError])
       modelOf[FooEither].size must_== 1
     }
+
+    "Build a model for a class using type parameters of an outer class" in {
+      val ms = modelOf[OuterInt.Inner]
+      ms.size must_== 1
+      val m = ms.head
+      val t = m.properties.get("t")
+      t should not be empty
+      t.get.`type` must_== "integer"
+      t.get.format must beSome("int32")
+    }
+
+    "Build a model for shapless coproduct (:+:)" in {
+      val ms = modelOf[ShapelessIntOrString]
+      ms.size must_!== 0
+      // It won't be a fully correct model.
+    }
   }
 
   "DataType" should {