Merge 13c1ba1 into 0e19f28

enumeratum-core/src/main/scala/enumeratum/Enum.scala

@@ -85,6 +85,13 @@ trait Enum[A <: EnumEntry] {
     */
   def withNameOption(name: String): Option[A] = namesToValuesMap.get(name)
 
+  /**
+    * Returns an [[Right[A]]] for a given name, or a [[Left[String]]] if the name does not match any of the values'
+    * .entryName values.
+    */
+  def withNameEither(name: String): Either[String, A] =
+    namesToValuesMap.get(name).toRight(buildNotFoundMessage(name))
+
   /**
     * Tries to get an [[A]] by the supplied name. The name corresponds to the .name
     * of the case objects implementing [[A]], disregarding case
@@ -139,6 +146,27 @@ trait Enum[A <: EnumEntry] {
   def withNameLowercaseOnlyOption(name: String): Option[A] =
     lowerCaseNamesToValuesMap.get(name)
 
+  /**
+    * Returns an [[Right[A]]] for a given name, or a [[Left[String]]] if the name does not match any of the values'
+    * .entryName values, disregarding case.
+    */
+  def withNameInsensitiveEither(name: String): Either[String, A] =
+    lowerCaseNamesToValuesMap.get(name.toLowerCase).toRight(buildNotFoundMessage(name))
+
+  /**
+    * Returns an [[Right[A]]] for a given name, or a [[Left[String]]] if the name does not match any of the values'
+    * .entryName values, disregarding case.
+    */
+  def withNameUppercaseOnlyEither(name: String): Either[String, A] =
+    upperCaseNameValuesToMap.get(name).toRight(buildNotFoundMessage(name))
+
+  /**
+    * Returns an [[Right[A]]] for a given name, or a [[Left[String]]] if the name does not match any of the values'
+    * .entryName values, disregarding case.
+    */
+  def withNameLowercaseOnlyEither(name: String): Either[String, A] =
+    lowerCaseNamesToValuesMap.get(name).toRight(buildNotFoundMessage(name))
+
   /**
     * Returns the index number of the member passed in the values picked up by this enum
     *

enumeratum-core/src/main/scala/enumeratum/values/ValueEnum.scala

@@ -62,6 +62,13 @@ sealed trait ValueEnum[ValueType, EntryType <: ValueEnumEntry[ValueType]] {
     */
   def withValueOpt(i: ValueType): Option[EntryType] = valuesToEntriesMap.get(i)
 
+  /**
+    * Returns an [[Right[EntryType]]] for a given value, or a [[Left[String]]] if the value does not match any of the values'
+    * `.value` values.
+    */
+  def withValueEither(i: ValueType): Either[String, EntryType] =
+    valuesToEntriesMap.get(i).toRight(buildNotFoundMessage(i))
+
   private lazy val existingEntriesString = values.map(_.value).mkString(", ")
 
   private def buildNotFoundMessage(i: ValueType): String = {

enumeratum-core/src/test/scala/enumeratum/EnumSpec.scala

@@ -55,6 +55,21 @@ class EnumSpec extends FunSpec with Matchers {
 
     }
 
+    describe("#withNameEither") {
+
+      it("should return the proper object when passed the proper string") {
+        DummyEnum.withNameEither("Hello") should be(Right(Hello))
+        DummyEnum.withNameEither("GoodBye") should be(Right(GoodBye))
+        DummyEnum.withNameEither("Hi") should be(Right(Hi))
+      }
+
+      it("should return Left otherwise") {
+        DummyEnum.withNameEither("hello") shouldBe Left(
+          "hello is not a member of Enum (Hello, GoodBye, Hi)")
+      }
+
+    }
+
     describe("#withNameInsensitive") {
 
       it("should return the proper object when passed the proper string, disregarding cases") {
@@ -93,14 +108,33 @@ class EnumSpec extends FunSpec with Matchers {
 
     }
 
+    describe("#withNameInsensitiveEither") {
+
+      it("should return the proper object when passed the proper string, disregarding cases") {
+        DummyEnum.withNameInsensitiveEither("Hello") should be(Right(Hello))
+        DummyEnum.withNameInsensitiveEither("hello") should be(Right(Hello))
+        DummyEnum.withNameInsensitiveEither("GoodBye") should be(Right(GoodBye))
+        DummyEnum.withNameInsensitiveEither("goodBye") should be(Right(GoodBye))
+        DummyEnum.withNameInsensitiveEither("gOodbye") should be(Right(GoodBye))
+        DummyEnum.withNameInsensitiveEither("Hi") should be(Right(Hi))
+        DummyEnum.withNameInsensitiveEither("hI") should be(Right(Hi))
+      }
+
+      it("should return Left otherwise") {
+        DummyEnum.withNameInsensitiveEither("bbeeeech") shouldBe Left(
+          "bbeeeech is not a member of Enum (Hello, GoodBye, Hi)")
+      }
+
+    }
+
     describe("#withNameUppercaseOnly") {
       it("should return the proper object when passed the proper string, transforming to upper case first") {
         DummyEnum.withNameUppercaseOnly("HELLO") should be(Hello)
         DummyEnum.withNameUppercaseOnly("GOODBYE") should be(GoodBye)
         DummyEnum.withNameUppercaseOnly("HI") should be(Hi)
       }
 
-      it("should return None for not uppercase but case insensitive values") {
+      it("should throw an error for not uppercase but case insensitive values") {
         intercept[NoSuchElementException] {
           DummyEnum.withNameUppercaseOnly("Hello")
         }
@@ -137,14 +171,36 @@ class EnumSpec extends FunSpec with Matchers {
       }
     }
 
+    describe("#withNameUppercaseOnlyEither") {
+      it("should return the proper object when passed the proper string, transforming to upper case first") {
+        DummyEnum.withNameUppercaseOnlyEither("HELLO") should be(Right(Hello))
+        DummyEnum.withNameUppercaseOnlyEither("GOODBYE") should be(Right(GoodBye))
+        DummyEnum.withNameUppercaseOnlyEither("HI") should be(Right(Hi))
+      }
+
+      it("should return Left for not uppercase but case insensitive values") {
+        DummyEnum.withNameUppercaseOnlyEither("Hello") should be(
+          Left("Hello is not a member of Enum (Hello, GoodBye, Hi)"))
+        DummyEnum.withNameUppercaseOnlyEither("GoodBye") should be(
+          Left("GoodBye is not a member of Enum (Hello, GoodBye, Hi)"))
+        DummyEnum.withNameUppercaseOnlyEither("Hi") should be(
+          Left("Hi is not a member of Enum (Hello, GoodBye, Hi)"))
+      }
+
+      it("should return Left otherwise") {
+        DummyEnum.withNameUppercaseOnlyEither("bbeeeech") should be(
+          Left("bbeeeech is not a member of Enum (Hello, GoodBye, Hi)"))
+      }
+    }
+
     describe("#withNameLowercaseOnly") {
       it("should return the proper object when passed the proper string, transforming to lower case first") {
         DummyEnum.withNameLowercaseOnly("hello") should be(Hello)
         DummyEnum.withNameLowercaseOnly("goodbye") should be(GoodBye)
         DummyEnum.withNameLowercaseOnly("hi") should be(Hi)
       }
 
-      it("should return None for not uppercase but case insensitive values") {
+      it("should throw an error for not lowercase but case insensitive values") {
         intercept[NoSuchElementException] {
           DummyEnum.withNameLowercaseOnly("Hello")
         }
@@ -170,16 +226,38 @@ class EnumSpec extends FunSpec with Matchers {
         DummyEnum.withNameLowercaseOnlyOption("hi").value should be(Hi)
       }
 
-      it("should return None for not uppercase but case insensitive values") {
+      it("should return None for not lowercase but case insensitive values") {
         DummyEnum.withNameLowercaseOnlyOption("Hello") should be(None)
         DummyEnum.withNameLowercaseOnlyOption("GoodBye") should be(None)
         DummyEnum.withNameLowercaseOnlyOption("Hi") should be(None)
       }
 
-      it("should throw an error otherwise") {
+      it("should return None otherwise") {
         DummyEnum.withNameLowercaseOnlyOption("bbeeeech") should be(None)
       }
     }
+
+    describe("#withNameLowercaseOnlyEither") {
+      it("should return the proper object when passed the proper string, transforming to lower case first") {
+        DummyEnum.withNameLowercaseOnlyEither("hello") should be(Right(Hello))
+        DummyEnum.withNameLowercaseOnlyEither("goodbye") should be(Right(GoodBye))
+        DummyEnum.withNameLowercaseOnlyEither("hi") should be(Right(Hi))
+      }
+
+      it("should return Left for not lowercase but case insensitive values") {
+        DummyEnum.withNameLowercaseOnlyEither("Hello") should be(
+          Left("Hello is not a member of Enum (Hello, GoodBye, Hi)"))
+        DummyEnum.withNameLowercaseOnlyEither("GoodBye") should be(
+          Left("GoodBye is not a member of Enum (Hello, GoodBye, Hi)"))
+        DummyEnum.withNameLowercaseOnlyEither("Hi") should be(
+          Left("Hi is not a member of Enum (Hello, GoodBye, Hi)"))
+      }
+
+      it("should return Left otherwise") {
+        DummyEnum.withNameLowercaseOnlyEither("bbeeeech") should be(
+          Left("bbeeeech is not a member of Enum (Hello, GoodBye, Hi)"))
+      }
+    }
   }
 
   describe("when a sealed trait is wrapped in another object") {

enumeratum-core/src/test/scala/enumeratum/values/ValueEnumHelpers.scala

@@ -71,6 +71,23 @@ trait ValueEnumHelpers { this: FunSpec with Matchers =>
 
       }
 
+      describe("withValueEither") {
+
+        it("should return Right(entry) that match the value") {
+          enum.values.foreach { entry =>
+            enum.withValueEither(entry.value) shouldBe Right(entry)
+          }
+        }
+
+        it("should return Left when given values that do not map to any entries") {
+          invalidValues.foreach { invalid =>
+            enum.withValueEither(invalid) shouldBe Left(
+              s"$invalid is not a member of ValueEnum (${enum.values.map(_.value).mkString(", ")})")
+          }
+        }
+
+      }
+
       describe("in") {
 
         it("should return false if given an empty list") {