git.iko.soy/gogol
on develop help sign in
Correcting naming of resource/method aliases
95f53aeBrendan Hay
gen/src/Gen/Types/Id.hs+5−5
compare with develop
unifiedsplit
@@ -72,16 +72,16 @@ import Language.Haskell.Exts.Pretty (prettyPrint)
72import Language.Haskell.Exts.Syntax (Name)
72import Language.Haskell.Exts.Syntax (Name)
73
73
74aname :: Text -> Name
74aname :: Text -> Name
75−aname = name . Text.unpack . mappend "API" . upperHead . Text.replace "." ""
75+aname = name . Text.unpack . (<> "API") . upperHead . Text.replace "." ""
76
76
77mname :: Text -> Global -> (Name, Global, Text)
77mname :: Text -> Global -> (Name, Global, Text)
78mname abrv (Global g) =
78mname abrv (Global g) =
79− ( name (Text.unpack (mconcat n) <> "API") -- Action service type alias.
79+ ( aname (mconcat n) -- Action service type alias.
80− , Global (n <> ["'"]) -- Action data type.
80+ , Global (n <> ["'"]) -- Action data type.
81− , Text.intercalate "." ns -- Action namespace.
81+ , Text.intercalate "." ns -- Action namespace.
82 )
82 )
83 where
83 where
84− n = drop 1 ns
84+ n = drop 1 (map (upperHead . upperAcronym) ns)
85
85
86 ns | CI.mk e == CI.mk x = e:xs
86 ns | CI.mk e == CI.mk x = e:xs
87 | otherwise = x:xs
87 | otherwise = x:xs