add BsonDocOps class so document can be specified with String keys

Database/MongoDB/BSON.hs

@@ -84,17 +84,27 @@ instance Typeable BsonValue where
 -- It can be constructed either from a 'Map' (eg @'BsonDoc' myMap@) or
 -- from a associative list (eg @'toBsonDoc' myAL@).
 newtype BsonDoc = BsonDoc {
-      fromBsonDoc :: Map.Map L8.ByteString BsonValue
+      bdFromBsonDoc :: Map.Map L8.ByteString BsonValue
     }
     deriving (Eq, Ord, Show)
 
--- | Construct a 'BsonDoc' out of an associative list.
+class BsonDocOps a where
-toBsonDoc :: [(L8.ByteString, BsonValue)] -> BsonDoc
+    -- | Construct a BsonDoc from an associative list
-toBsonDoc = BsonDoc . Map.fromList
+    toBsonDoc :: [(a, BsonValue)] -> BsonDoc
+    -- | Unwrap BsonDoc to be a Map
+    fromBsonDoc :: BsonDoc -> Map.Map a BsonValue
+    -- | Return the BsonValue for given key, if any.
+    lookup :: a -> BsonDoc -> Maybe BsonValue
 
--- | Return the BsonValue for given key, if any.
+instance BsonDocOps L8.ByteString where
-lookup :: L8.ByteString -> BsonDoc -> Maybe BsonValue
+    toBsonDoc = BsonDoc . Map.fromList
-lookup k = Map.lookup k . fromBsonDoc
+    fromBsonDoc = bdFromBsonDoc
+    lookup k = Map.lookup k . fromBsonDoc
+
+instance BsonDocOps String where
+    toBsonDoc = BsonDoc . Map.mapKeys L8.fromString .Map.fromList
+    fromBsonDoc = Map.mapKeys L8.toString . bdFromBsonDoc
+    lookup k = Map.lookup (L8.fromString k) . fromBsonDoc
 
 data DataType =
     Data_min_key        | -- -1