Merge branch 'master' of github.com:mightybyte/servant-reflex

.gitmodules

@@ -1,9 +1,6 @@
 [submodule "deps/reflex-dom-contrib"]
 	path = deps/reflex-dom-contrib
 	url = git@github.com:reflex-frp/reflex-dom-contrib.git
-[submodule "deps/try-reflex"]
-	path = deps/try-reflex
-	url = git@github.com:ryantrinkle/try-reflex.git
 [submodule "deps/servant"]
 	path = deps/servant
 	url = https://github.com/haskell-servant/servant.git
@@ -16,3 +13,6 @@
 [submodule "deps/reflex"]
 	path = deps/reflex
 	url = https://github.com/ryantrinkle/reflex
+[submodule "deps/reflex-platform"]
+	path = deps/reflex-platform
+	url = https://github.com/reflex-frp/reflex-platform.git

build.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-deps/try-reflex/work-on ./overrides.nix ./. --run "cabal configure --ghcjs ; cabal build"
+deps/reflex-platform/work-on ./overrides.nix ./. --run "cabal configure --ghcjs ; cabal build"

deps/reflex-platform

@@ -0,0 +1 @@
+Subproject commit 3106fa5bee6f737d8f7edf71f3ca190e0549539d

deps/try-reflex

@@ -1 +0,0 @@
-Subproject commit 3b823c7e1ab7dd998c28e5d63daf4c233bbf6f18

exec/API.hs

@@ -15,3 +15,28 @@ type API = "getunit" :> Get '[JSON] ()
       :<|> "double" :> ReqBody '[JSON] Double
                     :> Post '[JSON] Double
       :<|> Raw
+
+type GET = Get '[JSON] ()
+
+-- Imported the comprehensive API example for testing.
+-- https://github.com/haskell-servant/servant/blob/master/servant/src/Servant/API/Internal/Test/ComprehensiveAPI.hs
+type ComprehensiveAPI =
+  GET :<|>
+  Get '[JSON] Int :<|>
+  Capture "foo" Int :> GET :<|>
+  Header "foo" Int :> GET :<|>
+  HttpVersion :> GET :<|>
+  IsSecure :> GET :<|>
+  QueryParam "foo" Int :> GET :<|>
+  QueryParams "foo" Int :> GET :<|>
+  QueryFlag "foo" :> GET :<|>
+-- Raw :<|>
+  RemoteHost :> GET :<|>
+  ReqBody '[JSON] Int :> GET :<|>
+  Get '[JSON] (Headers '[Header "foo" Int] ()) :<|>
+  "foo" :> GET :<|>
+  Vault :> GET :<|>
+  Verb 'POST 204 '[JSON] () :<|>
+  Verb 'POST 204 '[JSON] Int
+-- This one isn't in scope
+--  :<|> WithNamedContext "foo" '[] GET

overrides.nix

@@ -1,11 +1,10 @@
-{ try-reflex, ... }:
+{ reflex-platform, ... }:
 let 
   pkgs = import <nixpkgs> {};
-  try-reflex = import deps/try-reflex {};
-in try-reflex.ghcjs.override {
+  reflex-platform = import deps/reflex-platform {};
+in reflex-platform.ghcjs.override {
   overrides = self: super: {
-    self.lens = pkgs.haskell.lib.dontCheck (self.lens);
     reflex-dom-contrib = pkgs.haskell.lib.dontCheck (self.callPackage deps/reflex-dom-contrib {});
-    servant = self.callPackage (try-reflex.cabal2nixResult deps/servant/servant) {};
+    servant = self.callPackage (reflex-platform.cabal2nixResult deps/servant/servant) {};
   };
 }

shell.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-deps/try-reflex/work-on ./overrides.nix ./.
+deps/reflex-platform/work-on ./overrides.nix ./.

testserver/Main.hs

@@ -65,7 +65,7 @@ test = serve testApi server
 initApp :: SnapletInit App App
 initApp = makeSnaplet "myapp" "example" Nothing $ do
   addRoutes [("", applicationToSnap test)
---             ,("", serveDirectory "static")
+            ,("", serveDirectory "static")
             ]
   return App