json-api 0.1.0.0 → 0.1.0.1
raw patch · 9 files changed
+66/−80 lines, 9 files
Files
- README.md +1/−1
- example/example.cabal +11/−26
- json-api.cabal +23/−22
- src/Network/JSONApi/Error.hs +1/−1
- src/Network/JSONApi/Link.hs +6/−6
- src/Network/JSONApi/Meta.hs +5/−5
- src/Network/JSONApi/ResourceObject.hs +6/−6
- test/Network/JSONApi/ResourceObjectSpec.hs +7/−7
- test/TestHelpers.hs +6/−6
README.md view
@@ -10,4 +10,4 @@ #### Example usage -There is an [example project](example) illustrating how the library can be used.+There is an [example project](https://github.com/toddmohney/json-api/example) illustrating how the library can be used.
example/example.cabal view
@@ -26,16 +26,17 @@ Users.Actions.Index Users.Actions.Show - build-depends: base >= 4.7 && < 5- , aeson- , containers- , data-default- , json-api- , servant-server- , text- , url- , wai- , warp+ build-depends: base >= 4.7 && < 5+ , aeson >= 0.11.2.0 && < 0.11.3.0+ , containers >= 0.5.6.2 && < 0.5.7.1+ , data-default >= 0.5.3 && < 5.6.0+ , json-api+ , servant-server >= 0.7.1 && < 0.8.0+ , text >= 1.2.2.1 && < 1.2.3.0+ , url >= 2.1.3 && < 2.2.0+ , wai >= 3.2.1.1 && < 3.2.2.0+ , warp+ default-language: Haskell2010 default-extensions:@@ -47,9 +48,6 @@ -fwarn-unused-matches -fwarn-unused-binds -fwarn-unused-imports- -threaded- -rtsopts- -with-rtsopts=-N executable example-exe hs-source-dirs: app@@ -58,16 +56,3 @@ build-depends: base , example default-language: Haskell2010--test-suite example-test- type: exitcode-stdio-1.0- hs-source-dirs: test- main-is: Spec.hs- build-depends: base- , example- ghc-options: -threaded -rtsopts -with-rtsopts=-N- default-language: Haskell2010--source-repository head- type: git- location: https://github.com/toddmohney/example
json-api.cabal view
@@ -1,6 +1,7 @@ name: json-api-version: 0.1.0.0+version: 0.1.0.1 homepage: https://github.com/toddmohney/json-api+bug-reports: https://github.com/toddmohney/json-api/issues license: MIT license-file: LICENSE author: Todd Mohney@@ -32,15 +33,15 @@ location: https://github.com/toddmohney/json-api.git library- build-depends: aeson >= 0.11.2.0 && < 0.11.3.0- , base >= 4.7 && < 5.0- , containers >= 0.5.6.2 && < 0.5.7.1- , data-default >= 0.5.3 && < 5.6.0- , lens-aeson >= 1.0.0.5 && < 1.0.1.0- , swagger2 >= 2.0.2 && < 2.1.0- , text >= 1.2.2.1 && < 1.2.3.0- , unordered-containers >= 0.2.7.1 && < 0.2.8.0- , url >= 2.1.3 && < 2.2.0+ build-depends: aeson >= 0.11.2.0 && < 0.11.3.0+ , base >= 4.7 && < 5.0+ , containers >= 0.5.6.2 && < 0.5.7.1+ , data-default >= 0.5.3 && < 5.6.0+ , lens-aeson >= 1.0.0.5 && < 1.0.1.0+ , swagger2 >= 2.0.2 && < 2.1.0+ , text >= 1.2.2.1 && < 1.2.3.0+ , unordered-containers >= 0.2.7.1 && < 0.2.8.0+ , url >= 2.1.3 && < 2.2.0 default-language: Haskell2010 @@ -68,18 +69,18 @@ hs-source-dirs: src test-suite json-api-test- build-depends: aeson >= 0.11.2.0 && < 0.11.3.0- , aeson-pretty >= 0.7.2 && < 0.8.0- , base >= 4.7 && < 5.0- , bytestring >= 0.10.6.0 && < 0.10.7.0- , containers >= 0.5.6.2 && < 0.5.7.1- , data-default >= 0.5.3 && < 5.6.0- , hspec >= 2.2.3 && < 2.3.0- , json-api- , lens >= 4.13 && < 5.0- , lens-aeson >= 1.0.0.5 && < 1.0.1.0- , text >= 1.2.2.1 && < 1.2.3.0- , url >= 2.1.3 && < 2.2.0+ build-depends: aeson >= 0.11.2.0 && < 0.11.3.0+ , aeson-pretty >= 0.7.2 && < 0.8.0+ , base >= 4.7 && < 5.0+ , bytestring >= 0.10.6.0 && < 0.10.7.0+ , containers >= 0.5.6.2 && < 0.5.7.1+ , data-default >= 0.5.3 && < 5.6.0+ , hspec >= 2.2.3 && < 2.3.0+ , json-api+ , lens >= 4.13 && < 5.0+ , lens-aeson >= 1.0.0.5 && < 1.0.1.0+ , text >= 1.2.2.1 && < 1.2.3.0+ , url >= 2.1.3 && < 2.2.0 default-language: Haskell2010
src/Network/JSONApi/Error.hs view
@@ -14,7 +14,7 @@ import Data.Default import Data.Swagger (ToSchema) import Data.Text-import GHC.Generics+import GHC.Generics (Generic) import Network.JSONApi.Link (Links) import Network.JSONApi.Meta import Prelude hiding (id)
src/Network/JSONApi/Link.hs view
@@ -10,13 +10,13 @@ , toLinks ) where -import Data.Aeson (ToJSON, FromJSON)-import Data.Map (Map)+import Data.Aeson (ToJSON, FromJSON)+import Data.Map (Map) import qualified Data.Map as Map-import Data.Swagger (ToSchema)-import Data.Text (Text, pack)-import GHC.Generics-import Network.URL (URL, exportURL)+import Data.Swagger (ToSchema)+import Data.Text (Text, pack)+import GHC.Generics (Generic)+import Network.URL (URL, exportURL) {- | Type representing a JSON-API link object.
src/Network/JSONApi/Meta.hs view
@@ -5,11 +5,11 @@ -} module Network.JSONApi.Meta where -import Data.Aeson (ToJSON, FromJSON)-import Data.Map (Map)-import Data.Swagger (ToSchema)-import Data.Text (Text)-import GHC.Generics+import Data.Aeson (ToJSON, FromJSON)+import Data.Map (Map)+import Data.Swagger (ToSchema)+import Data.Text (Text)+import GHC.Generics (Generic) {- | Type representing a JSON-API meta object.
src/Network/JSONApi/ResourceObject.hs view
@@ -9,13 +9,13 @@ , ResourceType (..) ) where -import Data.Aeson (ToJSON, FromJSON, (.=), (.:), (.:?))+import Data.Aeson (ToJSON, FromJSON, (.=), (.:), (.:?)) import qualified Data.Aeson as AE-import Data.Swagger (ToSchema)-import Data.Text (Text)-import GHC.Generics-import Network.JSONApi.Link (Links)-import Network.JSONApi.Meta (Meta)+import Data.Swagger (ToSchema)+import Data.Text (Text)+import GHC.Generics (Generic)+import Network.JSONApi.Link (Links)+import Network.JSONApi.Meta (Meta) {- | Type representing a JSON-API resource object.
test/Network/JSONApi/ResourceObjectSpec.hs view
@@ -3,13 +3,13 @@ import qualified Data.Aeson as AE import qualified Data.ByteString.Lazy.Char8 as BS import qualified Data.Map as Map-import Data.Maybe (isJust, fromJust)-import Data.Text (Text, pack)-import GHC.Generics-import Network.JSONApi.Document-import Network.URL (URL, importURL)-import TestHelpers (prettyEncode)-import Test.Hspec+import Data.Maybe (isJust, fromJust)+import Data.Text (Text, pack)+import GHC.Generics (Generic)+import Network.JSONApi.Document+import Network.URL (URL, importURL)+import TestHelpers (prettyEncode)+import Test.Hspec data TestObject = TestObject { myId :: Int
test/TestHelpers.hs view
@@ -3,13 +3,13 @@ import qualified Data.Aeson as AE import qualified Data.Aeson.Encode.Pretty as AE import qualified Data.ByteString.Lazy.Char8 as BS-import Data.Maybe (fromJust)+import Data.Maybe (fromJust) import qualified Data.Map as Map-import Data.Monoid ((<>))-import Data.Text (Text, pack)-import GHC.Generics-import Network.JSONApi.Document-import Network.URL (URL, importURL)+import Data.Monoid ((<>))+import Data.Text (Text, pack)+import GHC.Generics (Generic)+import Network.JSONApi.Document+import Network.URL (URL, importURL) prettyEncode :: AE.ToJSON a => a -> BS.ByteString prettyEncode = AE.encodePretty' prettyConfig