diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,21 @@ -MIT License - -Copyright (c) 2017-2018 MATSUBARA Nobutada - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +MIT License + +Copyright (c) 2017-2018 MATSUBARA Nobutada + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/Setup.hs b/Setup.hs --- a/Setup.hs +++ b/Setup.hs @@ -1,2 +1,2 @@ -import Distribution.Simple -main = defaultMain +import Distribution.Simple +main = defaultMain diff --git a/chatwork.cabal b/chatwork.cabal --- a/chatwork.cabal +++ b/chatwork.cabal @@ -1,11 +1,11 @@ --- This file has been generated from package.yaml by hpack version 0.20.0. +-- This file has been generated from package.yaml by hpack version 0.28.2. -- -- see: https://github.com/sol/hpack -- --- hash: 8b06a918c9d2665e86057ef770fd95edae20d348e291f1b2368c16abc17a30d8 +-- hash: 1c705d783b7f90d1356a50b515af53b59380ca36754452d5c1b478e7dbdd1f07 name: chatwork -version: 0.1.3.2 +version: 0.1.3.3 synopsis: The ChatWork API in Haskell description: See README at category: Web @@ -38,7 +38,7 @@ , http-client >=0.5.5.0 && <0.6 , http-client-tls >=0.3.3.1 && <0.4 , http-types >=0.9.1 && <0.13 - , req >=1.0.0 && <1.1.0 + , req >=1.0.0 && <1.2.0 , text >=1.2.2.1 && <1.3 exposed-modules: ChatWork @@ -79,7 +79,7 @@ , http-client >=0.5.5.0 && <0.6 , http-client-tls >=0.3.3.1 && <0.4 , http-types >=0.9.1 && <0.13 - , req >=1.0.0 && <1.1.0 + , req >=1.0.0 && <1.2.0 , text >=1.2.2.1 && <1.3 other-modules: Paths_chatwork @@ -104,7 +104,7 @@ , http-client >=0.5.5.0 && <0.6 , http-client-tls >=0.3.3.1 && <0.4 , http-types >=0.9.1 && <0.13 - , req >=1.0.0 && <1.1.0 + , req >=1.0.0 && <1.2.0 , servant-server >=0.9.1.1 && <0.14 , text >=1.2.2.1 && <1.3 , warp >=3.2.11 && <3.3 diff --git a/test/ChatWork/Test/MonadHttpIO.hs b/test/ChatWork/Test/MonadHttpIO.hs --- a/test/ChatWork/Test/MonadHttpIO.hs +++ b/test/ChatWork/Test/MonadHttpIO.hs @@ -1,13 +1,13 @@ -{-# OPTIONS_GHC -fno-warn-orphans #-} - --- | --- This module is that define MonadHttp type class instance of IO. --- if you want other definition, don't import this module. - -module ChatWork.Test.MonadHttpIO where - -import Control.Exception (throwIO) -import Network.HTTP.Req - -instance MonadHttp IO where - handleHttpException = throwIO +{-# OPTIONS_GHC -fno-warn-orphans #-} + +-- | +-- This module is that define MonadHttp type class instance of IO. +-- if you want other definition, don't import this module. + +module ChatWork.Test.MonadHttpIO where + +import Control.Exception (throwIO) +import Network.HTTP.Req + +instance MonadHttp IO where + handleHttpException = throwIO diff --git a/test/Spec.hs b/test/Spec.hs --- a/test/Spec.hs +++ b/test/Spec.hs @@ -1,21 +1,21 @@ -module Main where - -import Test.Hspec - -import qualified ChatWork.Endpoints.ContactsSpec -import qualified ChatWork.Endpoints.IncomingRequestsSpec -import qualified ChatWork.Endpoints.MeSpec -import qualified ChatWork.Endpoints.MySpec -import qualified ChatWork.Endpoints.RoomsSpec -import ChatWork.Test.MockServer (runMockServer) - -main :: IO () -main = hspec spec - -spec :: Spec -spec = around_ runMockServer $ do - describe "ChatWork.Endpoints.Contacts" ChatWork.Endpoints.ContactsSpec.spec - describe "ChatWork.Endpoints.IncomingRequests" ChatWork.Endpoints.IncomingRequestsSpec.spec - describe "ChatWork.Endpoints.Me" ChatWork.Endpoints.MeSpec.spec - describe "ChatWork.Endpoints.My" ChatWork.Endpoints.MySpec.spec - describe "ChatWork.Endpoints.Rooms" ChatWork.Endpoints.RoomsSpec.spec +module Main where + +import Test.Hspec + +import qualified ChatWork.Endpoints.ContactsSpec +import qualified ChatWork.Endpoints.IncomingRequestsSpec +import qualified ChatWork.Endpoints.MeSpec +import qualified ChatWork.Endpoints.MySpec +import qualified ChatWork.Endpoints.RoomsSpec +import ChatWork.Test.MockServer (runMockServer) + +main :: IO () +main = hspec spec + +spec :: Spec +spec = around_ runMockServer $ do + describe "ChatWork.Endpoints.Contacts" ChatWork.Endpoints.ContactsSpec.spec + describe "ChatWork.Endpoints.IncomingRequests" ChatWork.Endpoints.IncomingRequestsSpec.spec + describe "ChatWork.Endpoints.Me" ChatWork.Endpoints.MeSpec.spec + describe "ChatWork.Endpoints.My" ChatWork.Endpoints.MySpec.spec + describe "ChatWork.Endpoints.Rooms" ChatWork.Endpoints.RoomsSpec.spec