yesod-ip 0.2 → 0.3

raw patch · 3 files changed

+17/−3 lines, 3 filesdep ~ip

Dependency ranges changed: ip

Files

• src/Database/Persist/Net/PostgreSQL.hs +14/−1
• src/Yesod/Form/Net.hs +1/−0
• yesod-ip.cabal +2/−2

@@ -6,7 +6,6 @@ --   * 'IPv4': @inet@ --   * 'Mac': @macaddr@ --   ---   This module is not yet complete. module Database.Persist.Net.PostgreSQL    () where @@ -21,6 +20,8 @@ import qualified Data.Text as Text import qualified Net.IPv4.Text as IPv4Text import qualified Net.IPv4.ByteString.Char8 as IPv4ByteString+import qualified Net.Mac.Text as MacText+import qualified Net.Mac.ByteString.Char8 as MacByteString  instance PersistField IPv4 where   toPersistValue = toPersistValue . IPv4Text.encode@@ -32,5 +33,17 @@  instance PersistFieldSql IPv4 where   sqlType _ = SqlOther (Text.pack "inet")++instance PersistField Mac where+  toPersistValue = toPersistValue . MacText.encode+  fromPersistValue v = case v of+    PersistDbSpecific s -> case MacByteString.decode s of+      Just x -> Right x+      Nothing -> Left (Text.pack "PersistValue MAC: Invalid format")+    _ -> Left (Text.pack "PersistValue MAC: Not a PersistDbSpecific")++instance PersistFieldSql Mac where+  sqlType _ = SqlOther (Text.pack "macaddr")+  

@@ -4,6 +4,7 @@   ( ipv4Field   , macField   , NetFormMessage(..)+  , englishNetFormMessage   ) where  import Yesod.Core

@@ -1,5 +1,5 @@ name:                yesod-ip-version:             0.2+version:             0.3 synopsis:            Code for using the ip package with yesod description:         Please see README.md homepage:            https://github.com/andrewthad/yesod-ip#readme@@ -25,7 +25,7 @@     , yesod-core     , yesod-form     , persistent-    , ip == 0.5+    , ip   >= 0.6.0 && < 0.7.0   default-language:    Haskell2010  source-repository head