Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-yesod-form for openSUSE:Factory checked in at 2021-04-26 16:39:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-yesod-form (Old) and /work/SRC/openSUSE:Factory/.ghc-yesod-form.new.12324 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-yesod-form" Mon Apr 26 16:39:39 2021 rev:4 rq:888415 version:1.7.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-yesod-form/ghc-yesod-form.changes 2020-12-22 11:49:42.362019618 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-yesod-form.new.12324/ghc-yesod-form.changes 2021-04-26 16:40:37.462174108 +0200 @@ -1,0 +2,8 @@ +Thu Apr 15 10:26:35 UTC 2021 - psim...@suse.com + +- Update yesod-form to version 1.7.0. + ## 1.7.0 + + * Extended `OptionList` by `OptionListGrouped` and implemented grouped select fields (`<select>` with `<optgroup>`) [#1722](https://github.com/yesodweb/yesod/pull/1722) + +------------------------------------------------------------------- Old: ---- yesod-form-1.6.7.tar.gz New: ---- yesod-form-1.7.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-yesod-form.spec ++++++ --- /var/tmp/diff_new_pack.ceBUvr/_old 2021-04-26 16:40:37.922174863 +0200 +++ /var/tmp/diff_new_pack.ceBUvr/_new 2021-04-26 16:40:37.926174869 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-yesod-form # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %global pkg_name yesod-form %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.6.7 +Version: 1.7.0 Release: 0 Summary: Form handling support for Yesod Web Framework License: MIT @@ -40,7 +40,6 @@ BuildRequires: ghc-persistent-devel BuildRequires: ghc-resourcet-devel BuildRequires: ghc-rpm-macros -BuildRequires: ghc-semigroups-devel BuildRequires: ghc-shakespeare-devel BuildRequires: ghc-text-devel BuildRequires: ghc-time-devel ++++++ yesod-form-1.6.7.tar.gz -> yesod-form-1.7.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yesod-form-1.6.7/ChangeLog.md new/yesod-form-1.7.0/ChangeLog.md --- old/yesod-form-1.6.7/ChangeLog.md 2019-09-10 10:24:59.000000000 +0200 +++ new/yesod-form-1.7.0/ChangeLog.md 2021-04-15 07:58:44.000000000 +0200 @@ -1,5 +1,9 @@ # ChangeLog for yesod-form +## 1.7.0 + +* Extended `OptionList` by `OptionListGrouped` and implemented grouped select fields (`<select>` with `<optgroup>`) [#1722](https://github.com/yesodweb/yesod/pull/1722) + ## 1.6.7 * Added equivalent version of `mreqMsg` for `areq` and `wreq` correspondingly [#1628](https://github.com/yesodweb/yesod/pull/1628) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yesod-form-1.6.7/README.md new/yesod-form-1.7.0/README.md --- old/yesod-form-1.6.7/README.md 2019-07-18 13:55:12.000000000 +0200 +++ new/yesod-form-1.7.0/README.md 2021-04-15 07:58:44.000000000 +0200 @@ -3,7 +3,7 @@ Form handling for Yesod, in the same style as formlets. See [the forms chapter](http://www.yesodweb.com/book/forms) of the Yesod book. -This package provies a set of basic form inputs such as text, number, time, +This package provides a set of basic form inputs such as text, number, time, checkbox, select, textarea, and etc. via `Yesod.Form.Fields` module. Also, there is `Yesod.Form.Nic` module providing richtext field using Nic editor. However, this module is grandfathered now and Nic editor is not actively diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yesod-form-1.6.7/Yesod/Form/Fields.hs new/yesod-form-1.7.0/Yesod/Form/Fields.hs --- old/yesod-form-1.6.7/Yesod/Form/Fields.hs 2019-07-18 13:55:12.000000000 +0200 +++ new/yesod-form-1.7.0/Yesod/Form/Fields.hs 2021-04-15 07:58:44.000000000 +0200 @@ -3,6 +3,7 @@ {-# LANGUAGE TypeFamilies #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-} +{-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE CPP #-} -- | Field functions allow you to easily create and validate forms, cleanly handling the uncertainty of parsing user input. @@ -45,6 +46,7 @@ , selectFieldHelper , selectField , selectFieldList + , selectFieldListGrouped , radioField , radioFieldList , checkboxesField @@ -54,9 +56,11 @@ , Option (..) , OptionList (..) , mkOptionList + , mkOptionListGrouped , optionsPersist , optionsPersistKey , optionsPairs + , optionsPairsGrouped , optionsEnum ) where @@ -80,7 +84,7 @@ import Database.Persist (Entity (..), SqlType (SqlString), PersistEntity, PersistQuery, PersistEntityBackend) #endif import Text.HTML.SanitizeXSS (sanitizeBalance) -import Control.Monad (when, unless) +import Control.Monad (when, unless, forM_) import Data.Either (partitionEithers) import Data.Maybe (listToMaybe, fromMaybe) @@ -172,7 +176,7 @@ -- -- Add the @time@ package and import the "Data.Time.LocalTime" module to use this function. -- --- Since 1.4.2 +-- @since 1.4.2 timeFieldTypeTime :: Monad m => RenderMessage (HandlerSite m) FormMessage => Field m TimeOfDay timeFieldTypeTime = timeFieldOfType "time" @@ -182,7 +186,7 @@ -- -- Add the @time@ package and import the "Data.Time.LocalTime" module to use this function. -- --- Since 1.4.2 +-- @since 1.4.2 timeFieldTypeText :: Monad m => RenderMessage (HandlerSite m) FormMessage => Field m TimeOfDay timeFieldTypeText = timeFieldOfType "text" @@ -362,7 +366,7 @@ -- | Creates an input with @type="email"@ with the <http://w3c.github.io/html/sec-forms.html#the-multiple-attribute multiple> attribute; browsers might implement this as taking a comma separated list of emails. Each email address is validated as described in 'emailField'. -- --- Since 1.3.7 +-- @since 1.3.7 multiEmailField :: Monad m => RenderMessage (HandlerSite m) FormMessage => Field m [Text] multiEmailField = Field { fieldParse = parseHelper $ @@ -427,7 +431,15 @@ -> Field (HandlerFor site) a selectFieldList = selectField . optionsPairs --- | Creates a @\<select>@ tag for selecting one option. Example usage: +-- | Creates a @\<select>@ tag with @\<optgroup>@s for selecting one option. +-- +-- @since 1.7.0 +selectFieldListGrouped :: (Eq a, RenderMessage site FormMessage, RenderMessage site msg) + => [(msg, [(msg, a)])] + -> Field (HandlerFor site) a +selectFieldListGrouped = selectField . optionsPairsGrouped + +-- | Creates a @\<select>@ tag with optional @\<optgroup>@s for selecting one option. Example usage: -- -- > areq (selectField $ optionsPairs [(MsgValue1, "value1"),(MsgValue2, "value2")]) "Which value?" Nothing selectField :: (Eq a, RenderMessage site FormMessage) @@ -446,6 +458,9 @@ $newline never <option value=#{value} :isSel:selected>#{text} |]) -- inside + (Just $ \label -> [whamlet| +<optgroup label=#{label}> +|]) -- group label -- | Creates a @\<select>@ tag for selecting multiple options. multiSelectFieldList :: (Eq a, RenderMessage site msg) @@ -531,6 +546,7 @@ <input id=#{theId}-#{value} type=radio name=#{name} value=#{value} :isSel:checked *{attrs}> \#{text} |]) + Nothing -- | Creates a group of radio buttons to answer the question given in the message. Radio buttons are used to allow differentiating between an empty response (@Nothing@) and a no response (@Just False@). Consider using the simpler 'checkBoxField' if you don't need to make this distinction. -- @@ -598,15 +614,31 @@ showVal = either (\_ -> False) -- | A structure holding a list of options. Typically you can use a convenience function like 'mkOptionList' or 'optionsPairs' instead of creating this directly. -data OptionList a = OptionList +-- +-- Extended by 'OptionListGrouped' in 1.7.0. +data OptionList a + = OptionList { olOptions :: [Option a] , olReadExternal :: Text -> Maybe a -- ^ A function mapping from the form's value ('optionExternalValue') to the selected Haskell value ('optionInternalValue'). } + | OptionListGrouped + { olOptionsGrouped :: [(Text, [Option a])] + , olReadExternalGrouped :: Text -> Maybe a -- ^ A function mapping from the form's value ('optionExternalValue') to the selected Haskell value ('optionInternalValue'). + } + +-- | Convert grouped 'OptionList' to a normal one. +-- +-- @since 1.7.0 +flattenOptionList :: OptionList a -> OptionList a +flattenOptionList (OptionListGrouped os re) = OptionList (concatMap snd os) re +flattenOptionList ol = ol --- | Since 1.4.6 +-- | @since 1.4.6 instance Functor OptionList where - fmap f (OptionList options readExternal) = + fmap f (OptionList options readExternal) = OptionList ((fmap.fmap) f options) (fmap f . readExternal) + fmap f (OptionListGrouped options readExternal) = + OptionListGrouped (map (\(g, os) -> (g, (fmap.fmap) f os)) options) (fmap f . readExternal) -- | Creates an 'OptionList', using a 'Map' to implement the 'olReadExternal' function. mkOptionList :: [Option a] -> OptionList a @@ -615,13 +647,22 @@ , olReadExternal = flip Map.lookup $ Map.fromList $ map (optionExternalValue &&& optionInternalValue) os } +-- | Creates an 'OptionList', using a 'Map' to implement the 'olReadExternalGrouped' function. +-- +-- @since 1.7.0 +mkOptionListGrouped :: [(Text, [Option a])] -> OptionList a +mkOptionListGrouped os = OptionListGrouped + { olOptionsGrouped = os + , olReadExternalGrouped = flip Map.lookup $ Map.fromList $ map (optionExternalValue &&& optionInternalValue) $ concatMap snd os + } + data Option a = Option { optionDisplay :: Text -- ^ The user-facing label. , optionInternalValue :: a -- ^ The Haskell value being selected. , optionExternalValue :: Text -- ^ The representation of this value stored in the form. } --- | Since 1.4.6 +-- | @since 1.4.6 instance Functor Option where fmap f (Option display internal external) = Option display (f internal) external @@ -637,6 +678,30 @@ } return $ mkOptionList (zipWith mkOption [1 :: Int ..] opts) +-- | Creates an 'OptionList' from a list of (display-value, internal value) pairs. +-- +-- @since 1.7.0 +optionsPairsGrouped + :: forall m msg a. (MonadHandler m, RenderMessage (HandlerSite m) msg) + => [(msg, [(msg, a)])] -> m (OptionList a) +optionsPairsGrouped opts = do + mr <- getMessageRender + let mkOption (external, (display, internal)) = + Option { optionDisplay = mr display + , optionInternalValue = internal + , optionExternalValue = pack $ show external + } + opts' = enumerateSublists opts :: [(msg, [(Int, (msg, a))])] + opts'' = map (\(x, ys) -> (mr x, map mkOption ys)) opts' + return $ mkOptionListGrouped opts'' + +-- | Helper to enumerate sublists with one consecutive index. +enumerateSublists :: forall a b. [(a, [b])] -> [(a, [(Int, b)])] +enumerateSublists xss = + let yss :: [(Int, (a, [b]))] + yss = snd $ foldl (\(i, res) xs -> (i + (length.snd) xs, res ++ [(i, xs)])) (1, []) xss + in map (\(i, (x, ys)) -> (x, zip [i :: Int ..] ys)) yss + -- | Creates an 'OptionList' from an 'Enum', using its 'Show' instance for the user-facing value. optionsEnum :: (MonadHandler m, Show a, Enum a, Bounded a) => m (OptionList a) optionsEnum = optionsPairs $ map (\x -> (pack $ show x, x)) [minBound..maxBound] @@ -692,7 +757,7 @@ -- | An alternative to 'optionsPersist' which returns just the 'Key' instead of -- the entire 'Entity'. -- --- Since 1.3.2 +-- @since 1.3.2 #if MIN_VERSION_persistent(2,5,0) optionsPersistKey :: (YesodPersist site @@ -731,7 +796,7 @@ }) pairs -- | --- A helper function for constucting 'selectField's. You may want to use this when you define your custom 'selectField's or 'radioField's. +-- A helper function for constucting 'selectField's with optional option groups. You may want to use this when you define your custom 'selectField's or 'radioField's. -- -- @since 1.6.2 selectFieldHelper @@ -739,23 +804,26 @@ => (Text -> Text -> [(Text, Text)] -> WidgetFor site () -> WidgetFor site ()) -- ^ Outermost part of the field -> (Text -> Text -> Bool -> WidgetFor site ()) -- ^ An option for None if the field is optional -> (Text -> Text -> [(Text, Text)] -> Text -> Bool -> Text -> WidgetFor site ()) -- ^ Other options + -> (Maybe (Text -> WidgetFor site ())) -- ^ Group headers placed inbetween options -> HandlerFor site (OptionList a) -> Field (HandlerFor site) a -selectFieldHelper outside onOpt inside opts' = Field +selectFieldHelper outside onOpt inside grpHdr opts' = Field { fieldParse = \x _ -> do - opts <- opts' + opts <- fmap flattenOptionList opts' return $ selectParser opts x , fieldView = \theId name attrs val isReq -> do - opts <- fmap olOptions $ handlerToWidget opts' outside theId name attrs $ do - unless isReq $ onOpt theId name $ not $ render opts val `elem` map optionExternalValue opts - flip mapM_ opts $ \opt -> inside - theId - name - ((if isReq then (("required", "required"):) else id) attrs) - (optionExternalValue opt) - ((render opts val) == optionExternalValue opt) - (optionDisplay opt) + optsFlat <- fmap (olOptions.flattenOptionList) $ handlerToWidget opts' + unless isReq $ onOpt theId name $ render optsFlat val `notElem` map optionExternalValue optsFlat + opts'' <- handlerToWidget opts' + case opts'' of + OptionList{} -> constructOptions theId name attrs val isReq optsFlat + OptionListGrouped{olOptionsGrouped=grps} -> do + forM_ grps $ \(grp, opts) -> do + case grpHdr of + Just hdr -> hdr grp + Nothing -> return () + constructOptions theId name attrs val isReq opts , fieldEnctype = UrlEncoded } where @@ -768,6 +836,14 @@ x -> case olReadExternal opts x of Nothing -> Left $ SomeMessage $ MsgInvalidEntry x Just y -> Right $ Just y + constructOptions theId name attrs val isReq opts = + forM_ opts $ \opt -> inside + theId + name + ((if isReq then (("required", "required"):) else id) attrs) + (optionExternalValue opt) + (render opts val == optionExternalValue opt) + (optionDisplay opt) -- | Creates an input with @type="file"@. fileField :: Monad m @@ -864,7 +940,7 @@ then "-0." `T.append` (T.drop 2 t1) else t1 - where t1 = T.dropWhile ((==) ' ') t0 + where t1 = T.dropWhile (==' ') t0 -- $optionsOverview -- These functions create inputs where one or more options can be selected from a list. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yesod-form-1.6.7/yesod-form.cabal new/yesod-form-1.7.0/yesod-form.cabal --- old/yesod-form-1.6.7/yesod-form.cabal 2019-09-10 10:24:59.000000000 +0200 +++ new/yesod-form-1.7.0/yesod-form.cabal 2021-04-15 08:15:39.000000000 +0200 @@ -1,5 +1,6 @@ +cabal-version: >= 1.10 name: yesod-form -version: 1.6.7 +version: 1.7.0 license: MIT license-file: LICENSE author: Michael Snoyman <mich...@snoyman.com> @@ -7,7 +8,6 @@ synopsis: Form handling support for Yesod Web Framework category: Web, Yesod stability: Stable -cabal-version: >= 1.8 build-type: Simple homepage: http://www.yesodweb.com/ description: API docs and the README are available at <http://www.stackage.org/package/yesod-form>. Third-party packages which you can find useful: <http://hackage.haskell.org/package/yesod-form-richtext yesod-form-richtext> - richtext form fields (currntly it provides only Summernote support). @@ -19,7 +19,8 @@ default: True library - build-depends: base >= 4 && < 5 + default-language: Haskell2010 + build-depends: base >= 4.10 && < 5 , aeson , attoparsec >= 0.10 , blaze-builder >= 0.2.1.4 @@ -32,7 +33,6 @@ , email-validate >= 1.0 , persistent , resourcet - , semigroups , shakespeare >= 2.0 , text >= 0.9 , time >= 1.1.4 @@ -71,6 +71,7 @@ ghc-options: -Wall test-suite test + default-language: Haskell2010 type: exitcode-stdio-1.0 main-is: main.hs hs-source-dirs: test
