Apply feedback to code.

pc3b3r · Apr 4, 2015 · 4575ab4 · 4575ab4
1 parent 11aeee7
commit 4575ab4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/framework/src/main/scala/skinny/controller/feature/EnvFeature.scala b/framework/src/main/scala/skinny/controller/feature/EnvFeature.scala
@@ -9,13 +9,14 @@ import org.scalatra.ScalatraBase
 trait EnvFeature extends ScalatraBase {
 
   /**
-   * Env string value from "skinny.env", "org.scalatra.environment" or default value "development".
+   * Env string value from "skinny.env" or "org.scalatra.environment".
    *
    * @return env string such as "production"
    */
-  // Skinny is unified lower case. Therefore, convert to lower case.
-  def skinnyEnv: Option[String] = SkinnyEnv.get().orElse(Option(environment.toLowerCase))
-
+  def skinnyEnv: Option[String] = SkinnyEnv.get().orElse {
+    // convert upper cased "org.scalatra.environment" (e.g. DEVELOPMENT) to skinny's style here
+    Option(environment).map(_.toLowerCase(java.util.Locale.ENGLISH))
+  }
   /**
    * Predicates current env is "development" or "dev".
    *

diff --git a/framework/src/test/scala/skinny/controller/feature/EnvFeatureSpec.scala b/framework/src/test/scala/skinny/controller/feature/EnvFeatureSpec.scala
@@ -16,9 +16,9 @@ class EnvFeatureSpec extends FlatSpec with Matchers {
     }
   }
 
-  it should "Scalatra default value should be converted to lower case" in {
+  it should "convert the default value of Scalatra's environment to lower cased one" in {
     class Controller extends SkinnyApiController {
-      skinnyEnv should equal(Option("development"))
+      skinnyEnv should equal(Some("development"))
     }
   }