Use to translate attrs to types

Author: emhoracek

spec/Main.hs

@@ -341,7 +341,7 @@ queryTests =
         ["/wp/v2/posts"]
       "<wpPosts offset=1 limit=1></wpPosts>" `shouldQueryTo`
         ["/wp/v2/posts?offset=1"]
-      "<wpPosts offset=0& limit=1></wpPosts>" `shouldQueryTo`
+      "<wpPosts offset=0 limit=1></wpPosts>" `shouldQueryTo`
         ["/wp/v2/posts?offset=0"]
       "<wpPosts limit=10 page=1></wpPosts>" `shouldQueryTo`
         ["/wp/v2/posts?page=1"]

src/Web/Offset/Splices.hs

@@ -346,30 +346,23 @@ parseQueryNode attrs =
                 , qnum     = perpage
                 , qoffset  = readLookup "offset" attrs
                 , qpage    = readLookup "page" attrs
-                , qorder   = toWPOrdering $ lookup "order" attrs
+                , qorder   = readLookup "order" attrs
                 , qorderby = lookup "orderby" attrs
                 , qsearch  = lookup "search" attrs
                 , qbefore  = readLookup "before" attrs
                 , qafter   = readLookup "after" attrs
-                , qstatus  = toWPStatus $ lookup "status" attrs
+                , qstatus  = readLookup "status" attrs
                 , qsticky  = readLookup "sticky" attrs
                 , quser    = lookup "user" attrs
                 , qtaxes   = filterTaxonomies attrs }
-  where readLookup n attrs = readSafe =<< lookup n attrs
+  where -- `toTitle` allows us to use the standard Read instance to, e.g.,
+        -- translate the text "asc" to the type constructor `Asc`
+        readLookup n attrs = (readSafe . T.toTitle) =<< lookup n attrs
         perpage =
           case readLookup "per-page" attrs of
             Just n -> Just n
             Nothing -> readLookup "num" attrs
 
-toWPOrdering :: Maybe Text -> Maybe WPOrdering
-toWPOrdering (Just "asc") = Just Asc
-toWPOrdering (Just "desc") = Just Desc
-toWPOrdering _ = Nothing
-
-toWPStatus :: Maybe Text -> Maybe WPPostStatus
-toWPStatus (Just status) = readSafe (T.toTitle status)
-toWPStatus _ = Nothing
-
 listOfFilters = ["limit"
                 , "num"
                 , "offset"

src/Web/Offset/Types.hs

@@ -254,7 +254,7 @@ data WPQuery = WPPostsQuery{ qlimit   :: Maybe Int
                            , qtaxes   :: [TaxSpecList]
                            } deriving (Show)
 
-data WPOrdering = Asc | Desc deriving (Eq, Show, Ord)
+data WPOrdering = Asc | Desc deriving (Eq, Show, Read, Ord)
 
 data WPPostStatus = Publish | Future | Draft | Pending | Private deriving (Eq, Show, Read, Ord)