Revert b0f1671: All functions now take a GithubConfig parameter. So far this is just a container for http-conduit's Manager.

Author: mike-burns

Github/Data.hs

@@ -15,16 +15,9 @@ import System.Locale (defaultTimeLocale)
 import Data.Attoparsec.Number (Number(..))
 import qualified Data.Vector as V
 import qualified Data.HashMap.Lazy as Map
-import Data.Default
-import qualified Network.HTTP.Conduit as HC (def, newManager)
 
 import Github.Data.Definitions
 
-instance Data.Default.Default GithubConfig where
- def = GithubConfig {
- getHttpManager = HC.newManager HC.def
- }
-
 instance FromJSON GithubDate where
  parseJSON (String t) =
  case parseTime defaultTimeLocale "%FT%T%Z" (T.unpack t) of

Github/Data/Definitions.hs

@@ -4,13 +4,9 @@ module Github.Data.Definitions where
 
 import Data.Time
 import Data.Data
-import Network.HTTP.Conduit (HttpException(..), Manager(..))
+import Network.HTTP.Conduit (HttpException(..))
 import qualified Control.Exception as E
 
-data GithubConfig = GithubConfig {
- getHttpManager :: IO Manager
-}
-
 deriving instance Eq Network.HTTP.Conduit.HttpException
 
 -- | Errors have been tagged according to their source, so you can more easily

Github/Gists.hs

@@ -10,12 +10,12 @@ import Github.Private
 
 -- | The list of all public gists created by the user.
 --
--- > gists def "mike-burns"
-gists :: GithubConfig -> String -> IO (Either Error [Gist])
-gists c userName = githubGet c ["users", userName, "gists"]
+-- > gists "mike-burns"
+gists :: String -> IO (Either Error [Gist])
+gists userName = githubGet ["users", userName, "gists"]
 
 -- | A specific gist, given its id.
 --
--- > gist def "225074"
-gist :: GithubConfig -> String -> IO (Either Error Gist)
-gist c gistId = githubGet c ["gists", gistId]
+-- > gist "225074"
+gist :: String -> IO (Either Error Gist)
+gist gistId = githubGet ["gists", gistId]

Github/Gists/Comments.hs

@@ -11,12 +11,12 @@ import Github.Private
 
 -- | All the comments on a Gist, given the Gist ID.
 --
--- > commentsOn def "1174060"
-commentsOn :: GithubConfig -> String -> IO (Either Error [GistComment])
-commentsOn c gistId = githubGet c ["gists", gistId, "comments"]
+-- > commentsOn "1174060"
+commentsOn :: String -> IO (Either Error [GistComment])
+commentsOn gistId = githubGet ["gists", gistId, "comments"]
 
 -- | A specific comment, by the comment ID.
 --
--- > comment def "62449"
-comment :: GithubConfig -> String -> IO (Either Error GistComment)
-comment c commentId = githubGet c ["gists", "comments", commentId]
+-- > comment "62449"
+comment :: String -> IO (Either Error GistComment)
+comment commentId = githubGet ["gists", "comments", commentId]

Github/GitData/Blobs.hs

@@ -10,7 +10,7 @@ import Github.Private
 
 -- | Get a blob by SHA1.
 --
--- > blob def "thoughtbot" "paperclip" "bc5c51d1ece1ee45f94b056a0f5a1674d7e8cba9"
-blob :: GithubConfig -> String -> String -> String -> IO (Either Error Blob)
-blob c user repoName sha =
- githubGet c ["repos", user, repoName, "git", "blobs", sha]
+-- > blob "thoughtbot" "paperclip" "bc5c51d1ece1ee45f94b056a0f5a1674d7e8cba9"
+blob :: String -> String -> String -> IO (Either Error Blob)
+blob user repoName sha =
+ githubGet ["repos", user, repoName, "git", "blobs", sha]

Github/GitData/Commits.hs

@@ -11,6 +11,6 @@ import Github.Private
 -- | A single commit, by SHA1.
 --
 -- > commit "thoughtbot" "paperclip" "bc5c51d1ece1ee45f94b056a0f5a1674d7e8cba9"
-commit :: GithubConfig -> String -> String -> String -> IO (Either Error GitCommit)
-commit c user repoName sha =
- githubGet c ["repos", user, repoName, "git", "commits", sha]
+commit :: String -> String -> String -> IO (Either Error GitCommit)
+commit user repoName sha =
+ githubGet ["repos", user, repoName, "git", "commits", sha]

Github/GitData/References.hs

@@ -13,21 +13,21 @@ import Github.Private
 
 -- | A single reference by the ref name.
 --
--- > reference def "mike-burns" "github" "heads/master"
-reference :: GithubConfig -> String -> String -> String -> IO (Either Error GitReference)
-reference c user repoName ref =
- githubGet c ["repos", user, repoName, "git", "refs", ref]
+-- > reference "mike-burns" "github" "heads/master"
+reference :: String -> String -> String -> IO (Either Error GitReference)
+reference user repoName ref =
+ githubGet ["repos", user, repoName, "git", "refs", ref]
 
 -- | The history of references for a repo.
 --
--- > references def "mike-burns" "github"
-references :: GithubConfig -> String -> String -> IO (Either Error [GitReference])
-references c user repoName =
- githubGet c ["repos", user, repoName, "git", "refs"]
+-- > references "mike-burns" "github"
+references :: String -> String -> IO (Either Error [GitReference])
+references user repoName =
+ githubGet ["repos", user, repoName, "git", "refs"]
 
 -- | Limited references by a namespace.
 --
--- > namespacedReferences def "thoughtbot" "paperclip" "tags"
-namespacedReferences :: GithubConfig -> String -> String -> String -> IO (Either Error [GitReference])
-namespacedReferences c user repoName namespace =
- githubGet c ["repos", user, repoName, "git", "refs", namespace]
+-- > namespacedReferences "thoughtbot" "paperclip" "tags"
+namespacedReferences :: String -> String -> String -> IO (Either Error [GitReference])
+namespacedReferences user repoName namespace =
+ githubGet ["repos", user, repoName, "git", "refs", namespace]

Github/GitData/Trees.hs

@@ -11,15 +11,15 @@ import Github.Private
 
 -- | A tree for a SHA1.
 --
--- > tree def "thoughtbot" "paperclip" "fe114451f7d066d367a1646ca7ac10e689b46844"
-tree :: GithubConfig -> String -> String -> String -> IO (Either Error Tree)
-tree c user repoName sha =
- githubGet c ["repos", user, repoName, "git", "trees", sha]
+-- > tree "thoughtbot" "paperclip" "fe114451f7d066d367a1646ca7ac10e689b46844"
+tree :: String -> String -> String -> IO (Either Error Tree)
+tree user repoName sha =
+ githubGet ["repos", user, repoName, "git", "trees", sha]
 
 -- | A recursively-nested tree for a SHA1.
 --
--- > nestedTree def "thoughtbot" "paperclip" "fe114451f7d066d367a1646ca7ac10e689b46844"
-nestedTree :: GithubConfig -> String -> String -> String -> IO (Either Error Tree)
-nestedTree c user repoName sha =
- githubGetWithQueryString c ["repos", user, repoName, "git", "trees", sha]
-  "recursive=1"
+-- > nestedTree "thoughtbot" "paperclip" "fe114451f7d066d367a1646ca7ac10e689b46844"
+nestedTree :: String -> String -> String -> IO (Either Error Tree)
+nestedTree user repoName sha =
+ githubGetWithQueryString ["repos", user, repoName, "git", "trees", sha]
+ "recursive=1"

Github/Issues.hs

@@ -33,19 +33,18 @@ data IssueLimitation =
 -- | Details on a specific issue, given the repo owner and name, and the issue
 -- number.
 --
--- > issue def "thoughtbot" "paperclip" "462"
-issue :: GithubConfig -> String -> String -> Int -> IO (Either Error Issue)
-issue c user repoName issueNumber =
- githubGet c ["repos", user, repoName, "issues", show issueNumber]
+-- > issue "thoughtbot" "paperclip" "462"
+issue :: String -> String -> Int -> IO (Either Error Issue)
+issue user repoName issueNumber =
+ githubGet ["repos", user, repoName, "issues", show issueNumber]
 
 -- | All issues for a repo (given the repo owner and name), with optional
 -- restrictions as described in the @IssueLimitation@ data type.
 --
--- > issuesForRepo def "thoughtbot" "paperclip" [NoMilestone, OnlyClosed, Mentions "jyurek", Ascending]
-issuesForRepo :: GithubConfig -> String -> String -> [IssueLimitation] -> IO (Either Error [Issue])
-issuesForRepo c user repoName issueLimitations =
+-- > issuesForRepo "thoughtbot" "paperclip" [NoMilestone, OnlyClosed, Mentions "jyurek", Ascending]
+issuesForRepo :: String -> String -> [IssueLimitation] -> IO (Either Error [Issue])
+issuesForRepo user repoName issueLimitations =
  githubGetWithQueryString
- c
  ["repos", user, repoName, "issues"]
  (queryStringFromLimitations issueLimitations)
  where

Github/Issues/Comments.hs

@@ -11,14 +11,14 @@ import Github.Private
 
 -- | A specific comment, by ID.
 --
--- > comment def "thoughtbot" "paperclip" 1468184
-comment :: GithubConfig -> String -> String -> Int -> IO (Either Error IssueComment)
-comment c user repoName commentId =
- githubGet c ["repos", user, repoName, "issues", "comments", show commentId]
+-- > comment "thoughtbot" "paperclip" 1468184
+comment :: String -> String -> Int -> IO (Either Error IssueComment)
+comment user repoName commentId =
+ githubGet ["repos", user, repoName, "issues", "comments", show commentId]
 
 -- | All comments on an issue, by the issue's number.
 --
--- > comments def "thoughtbot" "paperclip" 635
-comments :: GithubConfig -> String -> String -> Int -> IO (Either Error [IssueComment])
-comments c user repoName issueNumber =
- githubGet c ["repos", user, repoName, "issues", show issueNumber, "comments"]
+-- > comments "thoughtbot" "paperclip" 635
+comments :: String -> String -> Int -> IO (Either Error [IssueComment])
+comments user repoName issueNumber =
+ githubGet ["repos", user, repoName, "issues", show issueNumber, "comments"]