[Updated to make formlets support optional. Improvements and fixes to Demo.hs
Jeremy Shaw <jeremy@seereason.com>**20091027163001
 Ignore-this: b8dab72b3d771f3cfc3ede235f7b0f01
] hunk ./Happstack/Facebook/Common.hs 29
-import HSP (HSPT,XML,XMLMetaData,evalHSPT,renderXML)
+import HSP (XML,XMLMetaData)
hunk ./Happstack/Facebook/Feed.hs 2
-
hunk ./debian/changelog 1
+haskell-happstack-facebook (0.9) unstable; urgency=low
+
+  * Make formlets module optional
+
+ -- Jeremy Shaw <jeremy@seereason.com>  Tue, 27 Oct 2009 10:56:34 -0500
+
hunk ./debian/control 11
-               libghc6-extra-prof (>= 1.27),
-               libghc6-extra-doc (>= 1.27),
hunk ./debian/rules 2
+DEB_SETUP_GHC6_CONFIGURE_ARGS += -f formlets
+
hunk ./examples/ConnectDemo.hs 5
-import Control.Applicative
-import Control.Monad
-import Happstack.Server
-import Happstack.Facebook.Common
-import Happstack.Facebook.Connect
-import Happstack.Facebook.FacebookT
-import Happstack.Facebook.XdReceiver
+import Control.Applicative ((<$>))
+import Control.Monad (msum)
+import Happstack.Server (FilterMonad, Response, ServerPart, nullConf, simpleHTTP, toResponse)
+import Happstack.Facebook.Common (FacebookConfig(apiKey), HasFacebookConfig(askFacebookConfig), HasUser(askUser), FbXML(FbXML), User(uid))
+import Happstack.Facebook.Connect (withFacebookConnect, withSessionSP)
+import Happstack.Facebook.XdReceiver (fbInit, fbFeatureLoader, xdReceiverPart)
hunk ./examples/Demo.hs 20
-import Happstack.Facebook.Common (HasUser(askUser), HasSessionKey, HasFacebookConfig(askFacebookConfig), FbXML(FbXML), FacebookConfig(apiKey), HasFacebookData, User(uid), callMethod)
+import Happstack.Facebook.Common (HasUser(askUser), HasSessionKey, HasFacebookConfig(askFacebookConfig), FbXML(FbXML), FacebookConfig(apiKey, connectURL), HasFacebookData, User(uid), callMethod)
hunk ./examples/Demo.hs 24
-import Happstack.Server (ServerMonad, ServerPartT, Response, dir, nullConf, simpleHTTP, toResponse)
+import Happstack.Server (ServerMonad, ServerPartT, Response, Conf(port), dir, nullConf, simpleHTTP, toResponse)
hunk ./examples/Demo.hs 28
-import HacketeriaConfig (facebookConfig)
+import FacebookConfig (facebookConfig)
hunk ./examples/Demo.hs 30
+import Network.URI
hunk ./examples/Demo.hs 164
-       simpleHTTP nullConf impl 
+       simpleHTTP nullConf { port = maybe 80 (read . drop 1 . uriPort) $ uriAuthority (connectURL facebookConfig) } impl 
hunk ./examples/Demo.hs 168
-    msum [ dir "fbconnect" $ -- FIXME: should come from config
-           msum [ xdReceiverPart
-                , toResponse . FbXML <$> withFacebookConnect facebookConfig (msum [ dir "members" $ withSessionSP members
-                                                                                  , homepage
-                                                                                  ])
-                ]
-         , dir "application" $
-               msum [
-                    ]
+    msum [ withFacebookConnect facebookConfig 
+                          (msum [ xdReceiverPart
+                                , dir "members" $ withSessionSP (toResponse . FbXML <$> members)
+                                , toResponse . FbXML <$> homepage
+                                ])
hunk ./examples/Demo.hs 184
-            Nothing -> [ <fb:login-button onlogin="window.location.reload();"></fb:login-button> ]
-            (Just u) -> [ <fb:profile-pic uid=(show $ uid u) facebook="true"/>
+            Nothing -> [ <p>You are not yet connected.</p>
+                       , <fb:login-button onlogin="window.location.reload();"></fb:login-button> 
+                       ]
+            (Just u) -> [ <p>You are Connected!</p>
+                        , <fb:profile-pic uid=(show $ uid u) facebook="true"/>
hunk ./examples/Demo.hs 191
-                        , <fb:login-button onlogin="window.location.reload();"></fb:login-button>
+                        , <p>Visit the <a href="/members">members area</a>.</p>
hunk ./examples/Demo.hs 207
-          
hunk ./examples/Demo.hs 212
+                <p>This demo page is pretty wacky. Sorry about that.</p>
+                <p>Here are ten of your friends.</p>
hunk ./examples/Demo.hs 218
+                 <p>Are you friendly with your friend?</p>
hunk ./examples/Demo.hs 220
-                 <p>App Users</p>
-                 <% show appUsers %>
-                 <p>Lists</p>
+                 <p>Here are some of your friends who also use this app</p>
+                 <p><% show appUsers  %></p>
+                 <p>Here are your friend lists</p>
hunk ./examples/FacebookConfig.hs 1
-module FacebookConfig (facebookConfig) where
+module FacebookConfig {-# WARNING "This demo requires that you provide your own facebook connect configuration information. http://www.facebook.com/developers/?ref=sb" #-} (facebookConfig) where
hunk ./happstack-facebook.cabal 2
-Version:          0.8
+Version:          0.9
hunk ./happstack-facebook.cabal 18
+Flag formlets
+    Description: Include formlets support. Disabled for now because it requires a forked version of formlets.
+    Default: False
+
hunk ./happstack-facebook.cabal 23
-  Build-Depends:    base, hsp >= 0.4.4, harp >= 0.4, Extra >= 1.27, happstack-ixset, happstack-data, happstack-util, mtl, random, happstack-state, html, happstack-server, hsx >= 0.4.4, applicative-extras >= 0.1.3, utf8-string, bytestring, RJson, old-time, network, HTTP >= 4000, time, containers, happstack, formlets, formlets-hsp, json, URLT >= 0.10, happstack-extra, filepath
+  Build-Depends:    base, hsp >= 0.4.4, harp >= 0.4, happstack-ixset, happstack-data, happstack-util, mtl, random, happstack-state, html, happstack-server, hsx >= 0.4.4, applicative-extras >= 0.1.3, utf8-string, bytestring, RJson, old-time, network, HTTP >= 4000, time, containers, happstack, json, URLT >= 0.10, filepath
hunk ./happstack-facebook.cabal 43
-                        Happstack.Facebook.Formlets
hunk ./happstack-facebook.cabal 44
+  if flag(formlets)
+     Exposed-Modules:   Happstack.Facebook.Formlets
+     Build-Depends: happstack-extra, formlets, formlets-hsp
+