urlpath 6.0.4 → 7.0.0

raw patch · 3 files changed

+28/−26 lines, 3 filessetup-changed

Files

• Setup.hs +2/−0
• src/Data/Url.hs +25/−25
• urlpath.cabal +1/−1

@@ -0,0 +1,2 @@+import Distribution.Simple+main = defaultMain

@@ -274,20 +274,20 @@ -- ** Absolute Urls  newtype AbsoluteUrlT m a = AbsoluteUrlT-  { runAbsoluteUrlT :: URIAuth -> m a+  { runAbsoluteUrlT :: (Location Abs File -> URI) -> m a   } deriving Functor  type AbsoluteUrl = AbsoluteUrlT Identity  instance ( Applicative m          ) => MonadUrl Abs File (AbsoluteUrlT m) where-  pathUrl x   = AbsoluteUrlT (\h -> pure $ mkUriPath h x)-  locUrl x    = AbsoluteUrlT (\h -> pure $ mkUriLoc h x)+  pathUrl x   = AbsoluteUrlT (\f -> pure (f (fromPath x)))+  locUrl x    = AbsoluteUrlT (\f -> pure (f x)) -instance ( Applicative m-         ) => MonadUrl Abs Dir (AbsoluteUrlT m) where-  pathUrl x   = AbsoluteUrlT (\h -> pure $ mkUriPath h x)-  locUrl x    = AbsoluteUrlT (\h -> pure $ mkUriLoc h x)+-- instance ( Applicative m+--          ) => MonadUrl Abs Dir (AbsoluteUrlT m) where+--   pathUrl x   = AbsoluteUrlT (\f -> pure $ f x)+--   locUrl x    = AbsoluteUrlT (\f -> pure $ f x)  instance Applicative m => Applicative (AbsoluteUrlT m) where   pure x = AbsoluteUrlT $ const (pure x)@@ -402,13 +402,13 @@   embed f x = AbsoluteUrlT $ \r ->     runAbsoluteUrlT (f (runAbsoluteUrlT x r)) r -mkUriPath :: URIAuth -> Path base type' -> URI-mkUriPath auth path = URI (Strict.Just "https")-                     True-                     auth-                     (V.fromList $ fmap T.pack $ splitOn "/" $ dropWhile (== '/') $ toFilePath path)-                     V.empty-                     Strict.Nothing+-- mkUriPath :: URIAuth -> Path base type' -> URI+-- mkUriPath auth path = URI (Strict.Just "https")+--                      True+--                      auth+--                      (V.fromList $ fmap T.pack $ splitOn "/" $ dropWhile (== '/') $ toFilePath path)+--                      V.empty+--                      Strict.Nothing  mkUriPathEmpty :: Path base type' -> URI mkUriPathEmpty path = URI Strict.Nothing@@ -418,17 +418,17 @@                      V.empty                      Strict.Nothing -mkUriLoc :: URIAuth -> Location base type' -> URI-mkUriLoc auth loc = URI (Strict.Just "https")-                   True-                   auth-                   (V.fromList $ fmap T.pack $ splitOn "/" $ dropWhile (== '/') $ show loc)-                   ( V.fromList $ map (\(l,r) ->-                       (T.pack l) Strict.:!:-                            (maybe Strict.Nothing (Strict.Just . T.pack) r))-                       (getQuery loc)-                   )-                   (maybe Strict.Nothing (Strict.Just . T.pack) (getFragment loc))+-- mkUriLoc :: URIAuth -> Location base type' -> URI+-- mkUriLoc auth loc = URI (Strict.Just "https")+--                    True+--                    auth+--                    (V.fromList $ fmap T.pack $ splitOn "/" $ dropWhile (== '/') $ show loc)+--                    ( V.fromList $ map (\(l,r) ->+--                        (T.pack l) Strict.:!:+--                             (maybe Strict.Nothing (Strict.Just . T.pack) r))+--                        (getQuery loc)+--                    )+--                    (maybe Strict.Nothing (Strict.Just . T.pack) (getFragment loc))  mkUriLocEmpty :: Location base type' -> URI mkUriLocEmpty loc = URI Strict.Nothing

@@ -1,5 +1,5 @@ Name:                   urlpath-Version:                6.0.4+Version:                7.0.0 Author:                 Athan Clark <athan.clark@gmail.com> Maintainer:             Athan Clark <athan.clark@gmail.com> License:                MIT