Merge pull request #170 from phadej/diffs

Fix #155. Fix diffs

Author: phadej

Github/Data.hs

@@ -145,7 +145,7 @@ instance FromJSON File where
  <*> o .: "additions"
  <*> o .: "sha"
  <*> o .: "changes"
- <*> o .: "patch"
+ <*> o .:? "patch"
  <*> o .: "filename"
  <*> o .: "deletions"
  parseJSON _ = fail "Could not build a File"

Github/Data/GitData.hs

@@ -3,6 +3,7 @@
 module Github.Data.GitData where
 
 import Github.Data.Definitions
+import Github.Data.Name (Name)
 
 import Control.DeepSeq (NFData (..))
 import Control.DeepSeq.Generics (genericRnf)
@@ -13,7 +14,7 @@ import Data.Vector (Vector)
 import GHC.Generics (Generic)
 
 data Commit = Commit {
- commitSha :: !Text
+ commitSha :: !(Name Commit)
  ,commitParents :: !(Vector Tree)
  ,commitUrl :: !Text
  ,commitGitCommit :: !GitCommit
@@ -26,7 +27,7 @@ data Commit = Commit {
 instance NFData Commit where rnf = genericRnf
 
 data Tree = Tree {
- treeSha :: !Text
+ treeSha :: !(Name Tree)
  ,treeUrl :: !Text
  ,treeGitTrees :: !(Vector GitTree)
 } deriving (Show, Data, Typeable, Eq, Ord, Generic)
@@ -35,7 +36,7 @@ instance NFData Tree where rnf = genericRnf
 
 data GitTree = GitTree {
  gitTreeType :: !Text
- ,gitTreeSha :: !Text
+ ,gitTreeSha :: !(Name GitTree)
  -- Can be empty for submodule
  ,gitTreeUrl :: !(Maybe Text)
  ,gitTreeSize :: !(Maybe Int)
@@ -51,7 +52,7 @@ data GitCommit = GitCommit {
  ,gitCommitCommitter :: !GitUser
  ,gitCommitAuthor :: !GitUser
  ,gitCommitTree :: !Tree
- ,gitCommitSha :: !(Maybe Text)
+ ,gitCommitSha :: !(Maybe (Name GitCommit))
  ,gitCommitParents :: !(Vector Tree)
 } deriving (Show, Data, Typeable, Eq, Ord, Generic)
 
@@ -61,7 +62,7 @@ data Blob = Blob {
  blobUrl :: !Text
  ,blobEncoding :: !Text
  ,blobContent :: !Text
- ,blobSha :: !Text
+ ,blobSha :: !(Name Blob)
  ,blobSize :: !Int
 } deriving (Show, Data, Typeable, Eq, Ord, Generic)
 
@@ -145,7 +146,7 @@ data File = File {
  ,fileAdditions :: !Int
  ,fileSha :: !Text
  ,fileChanges :: !Int
- ,filePatch :: !Text
+ ,filePatch :: !(Maybe Text)
  ,fileFilename :: !Text
  ,fileDeletions :: !Int
 } deriving (Show, Data, Typeable, Eq, Ord, Generic)

spec/Github/CommitsSpec.hs

@@ -3,12 +3,12 @@
 module Github.CommitsSpec where
 
 import Github.Auth (GithubAuth (..))
-import Github.Repos.Commits (commitsFor', commitsForR)
+import Github.Repos.Commits (Commit, mkName, commitSha, commitsFor', commitsForR, diffR)
 import Github.Request (executeRequest)
 
--- import Data.Aeson.Compat (eitherDecodeStrict)
+import Control.Monad (forM_)
 import Data.Either.Compat (isRight)
--- import Data.FileEmbed (embedFile)
+import Data.Proxy  (Proxy (..))
 import System.Environment (lookupEnv)
 import Test.Hspec (Spec, describe, it, pendingWith, shouldSatisfy)
 
@@ -38,3 +38,18 @@ spec = do
  cs <- executeRequest auth $ commitsForR "phadej" "github" (Just 40)
  cs `shouldSatisfy` isRight
  V.length (fromRightS cs) `shouldSatisfy` (< 70)
+
+ describe "diff" $ do
+ it "works" $ withAuth $ \auth -> do
+ cs <- executeRequest auth $ commitsForR "phadej" "github" (Just 30)
+ cs `shouldSatisfy` isRight
+ let commits = take 10 . V.toList . fromRightS $ cs
+ let pairs = zip commits $ drop 1 commits
+ forM_ pairs $ \(a, b) -> do
+ d <- executeRequest auth $ diffR "phadej" "github" (commitSha a) (commitSha b)
+ d `shouldSatisfy` isRight
+
+ it "issue #155" $ withAuth $ \auth -> do
+ let mkCommitName = mkName (Proxy :: Proxy Commit)
+ d <- executeRequest auth $ diffR "nomeata" "codespeed" (mkCommitName "ghc") (mkCommitName "tobami:master")
+ d `shouldSatisfy` isRight