Allow template to access non-object array values

Author: emhoracek

spec/Common.hs

@@ -218,6 +218,13 @@ fauxRequester _ "/false" [] =
   toWPResp $ enc [boolFieldFalse]
 fauxRequester _ "/true" [] =
   toWPResp $ enc [boolFieldTrue]
+fauxRequester _ "/object_array" [] =
+  toWPResp $ enc $
+    object ["some_array" .=
+      [ object ["object_key" .= ("object value 1" :: Text)]
+      , object ["object_key" .= ("object value 2" :: Text)]]]
+fauxRequester _ "/number_array" [] = toWPResp $ enc $ object ["some_array" .= [1 :: Int, 2 :: Int, 3 :: Int]]
+fauxRequester _ "/string_array" [] =  toWPResp $ enc $ object ["some_array" .= ["a" :: Text, "b" :: Text, "c" :: Text]]
 fauxRequester _ "/many-pages" [] =
   return $ Right $ WPResponse [(CI.mk "X-WP-TotalPages", "478")] (enc [article1])
 fauxRequester mRecord rqPath rqParams = do

spec/Main.hs

@@ -168,6 +168,18 @@ larcenyFillTests = do
       "<wpCustom endpoint=\"true\"><wpNotThere><wpPerson><wpName /></wpPerson></wpNotThere></wpCustom>"
         `shouldRender` ""
 
+    it "should render arrays of objects correctly" $
+      "<wpCustom endpoint=\"object_array\"><wpSomeArray><wpObjectKey /></wpSomeArray></wpCustom>"
+        `shouldRender` "object value 1 object value 2"
+
+    it "should render arrays of strings correctly" $
+      "<wpCustom endpoint=\"string_array\"><wpSomeArray>The letter <wpArrayItem /></wpSomeArray></wpCustom>"
+        `shouldRender` "The letter a The letter b The letter c"
+
+    it "should render arrays of numbers correctly" $
+      "<wpCustom endpoint=\"number_array\"><wpSomeArray>The number <wpArrayItem /></wpSomeArray></wpCustom>"
+        `shouldRender` "The number 1 The number 2 The number 3"
+
 
   describe "<wpCustomDate>" $ do
     it "should parse a date field with the format string it's given" $

src/Web/Offset/Splices.hs

@@ -102,7 +102,7 @@ jsonToFill (Object o) =
                      (M.keys o)
 jsonToFill (Array v) =
   Fill $ \attrs (path, tpl) lib ->
-           V.foldr mappend "" <$> V.mapM (\e -> unFill (jsonToFill e) attrs (path, tpl) lib) v
+           V.foldr mappend "" <$> V.mapM (\e -> unFill (jsonToFillArrayItem e) attrs (path, tpl) lib) v
 jsonToFill (String s) = rawTextFill s
 jsonToFill (Number n) = case floatingOrInteger n of
                           Left r -> rawTextFill $ tshow (r :: Double)
@@ -111,6 +111,18 @@ jsonToFill (Bool True) = rawTextFill $ tshow True
 jsonToFill (Bool False) = rawTextFill "<!-- JSON field found, but value is false. -->"
 jsonToFill (Null) = rawTextFill "<!-- JSON field found, but value is null. -->"
 
+jsonToFillArrayItem :: Value -> Fill s
+jsonToFillArrayItem o@(Object _) = jsonToFill o
+jsonToFillArrayItem a@(Array _) = jsonToFill a
+jsonToFillArrayItem (String s) = fillChildrenWith $ subs [("wpArrayItem", rawTextFill s)]
+jsonToFillArrayItem (Number n) =
+  case floatingOrInteger n of
+    Left r -> fillChildrenWith $ subs [("wpArrayItem", textFill $ tshow (r :: Double))]
+    Right i -> fillChildrenWith $ subs [("wpArrayItem", textFill $ tshow (i :: Integer))]
+jsonToFillArrayItem b@(Bool True) = jsonToFill b
+jsonToFillArrayItem b@(Bool False) = jsonToFill b
+jsonToFillArrayItem n@(Null) = jsonToFill n
+
 wpCustomAggregateFill :: Wordpress b -> Fill s
 wpCustomAggregateFill wp =
   useAttrs (a "endpoint") (customAggregateFill wp)