twitter-conduit 0.1.1 → 0.1.1.1

raw patch · 11 files changed

+89/−25 lines, 11 filesbuild-type:Customsetup-changedPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

API changes (from Hackage documentation)

Files

• ChangeLog.md +5/−0
• Setup.hs +45/−2
• Web/Twitter/Conduit/Api.hs +1/−1
• Web/Twitter/Conduit/Cursor.hs +3/−1
• Web/Twitter/Conduit/Lens.hs +3/−0
• Web/Twitter/Conduit/Monad.hs +3/−1
• Web/Twitter/Conduit/Parameters/TH.hs +6/−1
• Web/Twitter/Conduit/Request.hs +2/−0
• Web/Twitter/Conduit/Response.hs +5/−2
• tests/doctests.hs +14/−13
• twitter-conduit.cabal +2/−4

@@ -1,3 +1,8 @@+## 0.1.1.1++* Fix warnings on GHC 7.10+* Fix doctest when twitter-feed package exists+ ## 0.1.1  * Add `sourceWithSearchResult` and `sourceWithSearchResult'`

@@ -1,3 +1,46 @@ #!/usr/bin/env runhaskell-import Distribution.Simple-main = defaultMain++-- This code is mostly borrowed from+-- https://github.com/ekmett/lens/blob/4b032a0047f9ecf687947541211487c9d6244f3e/Setup.lhs++import Data.List (nub)+import Data.Version (showVersion)+import Distribution.Package (PackageName(PackageName), PackageId, InstalledPackageId, packageVersion, packageName)+import Distribution.PackageDescription (PackageDescription(), TestSuite(..))+import Distribution.Simple (defaultMainWithHooks, UserHooks(..), simpleUserHooks)+import Distribution.Simple.Utils (rewriteFile, createDirectoryIfMissingVerbose)+import Distribution.Simple.BuildPaths (autogenModulesDir)+import Distribution.Simple.Setup (BuildFlags(buildVerbosity), fromFlag)+import Distribution.Simple.LocalBuildInfo (withLibLBI, withTestLBI, LocalBuildInfo(), ComponentLocalBuildInfo(componentPackageDeps))+import Distribution.Verbosity (Verbosity)+import System.FilePath ((</>))++main :: IO ()+main = defaultMainWithHooks hooks++hooks :: UserHooks+hooks =+    simpleUserHooks+    { buildHook = \pkg lbi hooks flags -> do+           generateBuildModule (fromFlag (buildVerbosity flags)) pkg lbi+           buildHook simpleUserHooks pkg lbi hooks flags+    }++generateBuildModule :: Verbosity -> PackageDescription -> LocalBuildInfo -> IO ()+generateBuildModule verbosity pkg lbi = do+  let dir = autogenModulesDir lbi+  createDirectoryIfMissingVerbose verbosity True dir+  withLibLBI pkg lbi $ \_ libcfg ->+    withTestLBI pkg lbi $ \suite suitecfg ->+      rewriteFile (dir </> "Build_" ++ testName suite ++ ".hs") $ unlines+        [ "module Build_" ++ testName suite ++ " where"+        , "deps :: [String]"+        , "deps = " ++ show (formatdeps (testDeps libcfg suitecfg))+        ]+  where+    formatdeps = map (formatone . snd)+    formatone p = case packageName p of+      PackageName n -> n ++ "-" ++ showVersion (packageVersion p)++testDeps :: ComponentLocalBuildInfo -> ComponentLocalBuildInfo -> [(InstalledPackageId, PackageId)]+testDeps xs ys = nub $ componentPackageDeps xs ++ componentPackageDeps ys

@@ -419,7 +419,7 @@     ]  data FriendshipsDestroy--- | Returns post data which follows the user specified in the ID parameter.+-- | Returns post data which unfollows the user specified in the ID parameter. -- -- You can perform request by using 'call': --

@@ -11,9 +11,11 @@        , WithCursor (..)        ) where +#if __GLASGOW_HASKELL__ < 710 import Control.Applicative-import Data.Aeson import Data.Monoid+#endif+import Data.Aeson import Data.Text (Text) import Web.Twitter.Types (checkError) 

@@ -1,3 +1,4 @@+{-# LANGUAGE CPP #-} {-# LANGUAGE RankNTypes #-}  module Web.Twitter.Conduit.Lens@@ -26,7 +27,9 @@        , TT.ListsCursorKey        ) where +#if __GLASGOW_HASKELL__ < 710 import Control.Applicative+#endif import Control.Lens import Data.Text (Text) import Network.HTTP.Types (Status, ResponseHeaders)

@@ -69,7 +69,9 @@ runTW :: ( MonadBaseControl IO m          , MonadIO m          ) => TWInfo -> TW (ResourceT m) a -> m a-runTW info st = HTTP.withManager $ \mgr -> runTWManager info mgr st+runTW info st = do+    mgr <- liftIO $ HTTP.newManager HTTP.tlsManagerSettings+    runResourceT $ runTWManager info mgr st  runTWManager :: MonadBaseControl IO m => TWInfo -> HTTP.Manager -> TW (ResourceT m) a -> ResourceT m a runTWManager info mgr st = runReaderT st $ TWEnv info mgr

@@ -1,3 +1,4 @@+{-# LANGUAGE CPP #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE Rank2Types #-} {-# LANGUAGE TemplateHaskell #-}@@ -57,8 +58,12 @@     a <- newName "a"     cName <- newName cNameS     fName <- newName fNameS+#if MIN_VERSION_template_haskell(2, 10, 0)+    let cCxt = cxt [conT ''Parameters `appT` varT a]+#else     let cCxt = cxt [classP ''Parameters [varT a]]-        tySig = sigD fName (appT (appT (conT ''Lens') (varT a)) (appT (conT ''Maybe) typ))+#endif+    let tySig = sigD fName (appT (appT (conT ''Lens') (varT a)) (appT (conT ''Maybe) typ))         valDef = valD (varP fName) (normalB (appE (appE (appE (varE 'wrappedParam) (litE (stringL paramName))) (conE wrap)) (varE unwrap))) []     dec <- classD cCxt cName [PlainTV a] [] [tySig, valDef]     return [dec]

@@ -12,7 +12,9 @@        , paramValueBS        ) where +#if __GLASGOW_HASKELL__ < 710 import Control.Applicative+#endif import Control.Lens import Data.ByteString (ByteString) import qualified Data.ByteString.Char8 as S8

@@ -1,3 +1,4 @@+{-# LANGUAGE CPP #-} {-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE DeriveFoldable #-} {-# LANGUAGE DeriveFunctor #-}@@ -10,13 +11,15 @@        , TwitterErrorMessage (..)        ) where +#if __GLASGOW_HASKELL__ < 710 import Control.Applicative+import Data.Foldable (Foldable)+import Data.Traversable (Traversable)+#endif import Control.Exception import Data.Aeson import Data.Data-import Data.Foldable (Foldable) import qualified Data.Text as T-import Data.Traversable (Traversable) import Network.HTTP.Types (Status, ResponseHeaders, Status, ResponseHeaders)  data Response responseType = Response

@@ -1,19 +1,20 @@ module Main where +import Build_doctests (deps) import Test.DocTest-import System.Directory-import System.FilePath-import Data.List-import Control.Monad-import Control.Applicative  main = do-  -- sources <- findSources "Web"-  doctest $ args -- ++ sources+  let sources =+          [ "Web/Twitter/Conduit.hs"+          ]++  doctest $ args ++ sources   where-    args = [ "-i."-           , "-idist/build/autogen"-           , "-optP-include"-           , "-optPdist/build/autogen/cabal_macros.h"-           , "Web/Twitter/Conduit.hs"-           ]+    args = ( "-i."+           : "-idist/build/autogen"+           : "-optP-include"+           : "-optPdist/build/autogen/cabal_macros.h"+           : "-hide-all-packages"+           : map ("-package=" ++) deps+           )+

@@ -1,5 +1,5 @@ name:              twitter-conduit-version:           0.1.1+version:           0.1.1.1 license:           BSD3 license-file:      LICENSE author:            HATTORI Hiroki, Hideyuki Tanaka, Takahiro HIMURA@@ -8,7 +8,7 @@ category:          Web, Conduit stability:         Experimental cabal-version:     >= 1.8-build-type:        Simple+build-type:        Custom homepage:          https://github.com/himura/twitter-conduit  description:@@ -112,8 +112,6 @@    build-depends:       base-    , filepath-    , directory     , doctest  test-suite spec_main