minor enhancement for map keys detecting

Author: tminglei

src/main/scala/com/github/tminglei/bind/FrameworkUtils.scala

@@ -193,16 +193,16 @@ object FrameworkUtils {
   // Computes the available indexes for the given key in this set of data.
   def indexes(name: String, data: Map[String, String]): Seq[Int] = {
     logger.debug(s"get indexes for $name")
-
+    // matches: 'prefix[index]...'
     val KeyPattern = ("^" + Pattern.quote(name) + """\[(\d+)\].*$""").r
     data.toSeq.collect { case (KeyPattern(index), _) => index.toInt }.sorted.distinct
   }
 
   // Computes the available keys for the given prefix in this set of data.
   def keys(prefix: String, data: Map[String, String]): Seq[String] = {
     logger.debug(s"get keys for $prefix")
-
-    val KeyPattern = ("^" + Pattern.quote(prefix) + """\.("?[^."]+"?).*$""").r
+    // matches: 'prefix.xxx...' | 'prefix."xxx.t"...'
+    val KeyPattern = ("^" + Pattern.quote(prefix) + """\.("[^"]+"|[^.]+).*$""").r
     data.toSeq.collect { case (KeyPattern(key), _) => key }.distinct
   }
 

src/main/scala/com/github/tminglei/bind/Mappings.scala

@@ -154,14 +154,16 @@ trait Mappings {
         logger.debug(s"map - converting $name")
         Map.empty ++ keys(name, data).map { key =>
           val keyName = if (isEmptyStr(name)) key else name + "." + key
-          (keyBinding.convert(key, Map(key -> key)), valueBinding.convert(keyName, data))
+          val unquotedKey = key.replaceAll("^\"?([^\"]+)\"?$", "$1")
+          (keyBinding.convert(key, Map(key -> unquotedKey)), valueBinding.convert(keyName, data))
         }
       },
       moreValidate = (name, data, messages, theOptions) => {
         logger.debug(s"map - validating $name")
         keys(name, data).map { key =>
           val keyName = if (isEmptyStr(name)) key else name + "." + key
-          keyBinding.validate(key, Map(key -> key), messages, theOptions).map {
+          val unquotedKey = key.replaceAll("^\"?([^\"]+)\"?$", "$1")
+          keyBinding.validate(key, Map(key -> unquotedKey), messages, theOptions).map {
             case (name, err) => (name, err)
           } ++ valueBinding.validate(keyName, data, messages, theOptions)
         }.flatten

src/test/scala/com/github/tminglei/bind/GeneralMappingsSpec.scala

@@ -240,7 +240,7 @@ class GeneralMappingsSpec extends FunSpec with ShouldMatchers with Constraints {
           case Nil => {
             base.validate("map.aa", validData, messages, Options.apply()) should be (Nil)
             base.validate("map.\"b-1\"", validData, messages, Options.apply()) should be (Nil)
-            map.convert("map", validData) should be (Map("aa" -> 122345, "\"b-1\"" -> 754))
+            map.convert("map", validData) should be (Map("aa" -> 122345, "b-1" -> 754))
           }
           case err => err should be (Nil)
         }
@@ -260,7 +260,7 @@ class GeneralMappingsSpec extends FunSpec with ShouldMatchers with Constraints {
           case Nil => {
             base.validate("map.aa", emptyData, messages, Options.apply()) should be (Nil)
             base.validate("map.\"b-1\"", emptyData, messages, Options.apply()) should be (Nil)
-            map.convert("map", emptyData) should be (Map("aa" -> 0, "\"b-1\"" -> 133))
+            map.convert("map", emptyData) should be (Map("aa" -> 0, "b-1" -> 133))
           }
           case err => err should be (Nil)
         }