Merge remote-tracking branch 'begriffs/v3' into v3

postgrest.cabal

@@ -30,7 +30,7 @@ executable postgrest
   main-is:             PostgREST/Main.hs
   default-extensions:  OverloadedStrings, ScopedTypeVariables, QuasiQuotes
   default-language:    Haskell2010
-  build-depends:       base >=4.6 && <5
+  build-depends:       base >= 4.8 && < 5
                      , postgrest
                      , hasql >= 0.7.3 && < 0.8
                      , hasql-backend >= 0.4.1 && < 0.5
@@ -62,6 +62,18 @@ executable postgrest
                      , errors
                      , bifunctors
   hs-source-dirs:      src
+  other-modules:       Paths_postgrest
+                     , PostgREST.App
+                     , PostgREST.Auth
+                     , PostgREST.Config
+                     , PostgREST.Error
+                     , PostgREST.Middleware
+                     , PostgREST.Parsers
+                     , PostgREST.PgQuery
+                     , PostgREST.PgStructure
+                     , PostgREST.QueryBuilder
+                     , PostgREST.RangeQuery
+                     , PostgREST.Types
 
 library
   if flag(ci)
@@ -116,16 +128,16 @@ library
 
   Other-Modules:       Paths_postgrest
   Exposed-Modules:     PostgREST.App
-                     , PostgREST.Types
-                     , PostgREST.Parsers
-                     , PostgREST.QueryBuilder
                      , PostgREST.Auth
                      , PostgREST.Config
                      , PostgREST.Error
                      , PostgREST.Middleware
+                     , PostgREST.Parsers
                      , PostgREST.PgQuery
                      , PostgREST.PgStructure
+                     , PostgREST.QueryBuilder
                      , PostgREST.RangeQuery
+                     , PostgREST.Types
   hs-source-dirs:      src
 
 Test-Suite spec
@@ -138,21 +150,29 @@ Test-Suite spec
   else
     ghc-options:       -Wall -W -O2
   Main-Is:             Main.hs
-  Other-Modules:       PostgREST.App
+  Other-Modules:       Feature.AuthSpec
-                     , PostgREST.Types
+                     , Feature.CorsSpec
-                     , PostgREST.Parsers
+                     , Feature.DeleteSpec
-                     , PostgREST.QueryBuilder
+                     , Feature.InsertSpec
+                     , Feature.QuerySpec
+                     , Feature.RangeSpec
+                     , Feature.StructureSpec
+                     , Paths_postgrest
+                     , PostgREST.App
                      , PostgREST.Auth
                      , PostgREST.Config
                      , PostgREST.Error
                      , PostgREST.Middleware
+                     , PostgREST.Parsers
                      , PostgREST.PgQuery
                      , PostgREST.PgStructure
+                     , PostgREST.QueryBuilder
                      , PostgREST.RangeQuery
+                     , PostgREST.Types
                      , Spec
                      , SpecHelper
-                     , Paths_postgrest
+                     , TestTypes
-  Build-Depends:       base, hspec == 2.1.*, QuickCheck
+  Build-Depends:       base, hspec == 2.2.*, QuickCheck
                      , hspec-wai, hspec-wai-json
                      , hasql, hasql-backend
                      , hasql-postgres

src/PostgREST/App.hs

@@ -399,7 +399,7 @@ convertJson v = (,) <$> (header <$> normalized) <*> (vals <$> normalized)
     normalized = groupByKey =<< normalizeValue v
 
     vals :: [(Text, [Value])] -> [[Value]]
-    vals a = transpose $ map snd a
+    vals = transpose . map snd
 
     header :: [(Text, [Value])] -> [Text]
     header = map fst

src/PostgREST/Auth.hs

@@ -18,9 +18,6 @@ module PostgREST.Auth (
   , tokenJWT
   ) where
 
---line needed for ghc 7.8
---import           Data.Functor            ((<$>))
-
 import           Data.Aeson              (Value (..), Object)
 import           Data.Aeson.Types        (emptyObject, emptyArray)
 import           Data.Vector             as V (null, head)

src/PostgREST/Middleware.hs

@@ -3,9 +3,6 @@
 
 module PostgREST.Middleware where
 
--- needed for ghc 7.8
--- import           Data.Functor ((<$>))
-
 import           Data.Maybe                    (fromMaybe, isNothing)
 import           Data.Monoid
 import           Data.Text

src/PostgREST/Parsers.hs

@@ -4,13 +4,9 @@ module PostgREST.Parsers
 where
 
 import           Control.Applicative hiding ((<$>))
---lines needed for ghc 7.8
+import           Control.Monad                 (join)
--- import           Data.Functor ((<$>))
+import           Data.List                     (delete, find)
--- import           Data.Traversable (traverse)
+import           Data.Maybe
-
---import           Control.Monad                 (join)
---import           Data.List                     (delete, find)
---import           Data.Maybe
 import           Data.Monoid
 import           Data.String.Conversions       (cs)
 import           Data.Text                     (Text)