Add pretty print to XML output. Simplified POST method to add a subscription.

Author: kafecho

README.txt

@@ -19,25 +19,39 @@ Configuring scala-push:
 scala-push runs a simple REST admin interface which does not yet have a GUI.
 
 To add a subscription, do a POST:
-curl -v -X POST -H 'Content-type: text/xml' -d '<feed feedURL=[your feed URL]"/>' http://[host]:[port]/admin/
+curl -d "feedURL=[your feed URL]" http://[host]:[port]/admin/
+Example: curl -d "feedURL=http://www.google.com/reader/public/atom/user%2F05268996354213702508%2Fstate%2Fcom.google%2Fbroadcast" http://localhost:8080/admin/
 
 To list the subscriptions, do a GET:
 curl http://[host]:[port]/admin/
+Example: curl http://localhost:8080/admin/
 
 Example output:
 <feeds>
-		<feed feedURL="http://www.google.com/reader/public/atom/user%2F05268996354213702508%2Fstate%2Fcom.google%2Fbroadcast" topicURL="http://www.google.com/reader/public/atom/user%2F05268996354213702508%2Fstate%2Fcom.google%2Fbroadcast" hubURL="http://pubsubhubbub.appspot.com/" id="429658526">
-		</feed>
+	<feed>
+		<id>-702581410</id>
+		<feedURL>http://www.google.com/reader/public/atom/user/05268996354213702508/state/com.google/broadcast</feedURL>
+		<topicURL>http://www.google.com/reader/public/atom/user/05268996354213702508/state/com.google/broadcast</topicURL>
+		<hubURL>http://pubsubhubbub.appspot.com/</hubURL>
+	</feed>
 </feeds>
+
 Make a note of the field called id.
 
-To delete a subscription, do a DELETE to url curl -x DELETE http://[host]:[port]/admin/[id] where id is the feed id.
+To delete a subscription, do a DELETE: curl -X DELETE http://[host]:[port]/admin/[id] where id is the feed id.
+Example: curl -X DELETE http://localhost:8080/admin/-702581410
 
 As content is pushed to the subscriber, it will be displayed on the console.
+Here is an example below: 
+
+Fri Nov 27 15:51:43 GMT 2009 --- Update from: Guillaume's shared items in Google Reader
+Topic URL: http://www.google.com/reader/public/atom/user%2F05268996354213702508%2Fstate%2Fcom.google%2Fbroadcast
+
+10 NoSQL Systems Reviewed (published Mon Nov 09 16:04:02 GMT 2009)
+http://feedproxy.google.com/~r/HighScalability/~3/8arewmYgZ7k/10-nosql-systems-reviewed.html
 
 Feeds to subscribe to:
 ----------------------
 The following feeds are PuSH enabled and good candidates for testing:
 -Google Alert feeds
--Shared Google Reader items
-
+-Shared Google Reader items: the subscriber receives a notification as soon as you share an item.

src/main/scala/org/kafecho/push/Push.scala

@@ -41,7 +41,7 @@ object Constants{
 class Subscription(val feedURL : String, val topicURL : String, val hubURL : String){
   val id : Int = feedURL.hashCode
   override def toString = "Feed URL: " + feedURL + ", topic URL: " + topicURL + ", Hub URL: " + hubURL +"." 
-  def toXML = <feed id={id.toString} feedURL={feedURL} topicURL={topicURL} hubURL={hubURL} />
+  def toXML = <feed><id>{id.toString}</id><feedURL>{feedURL}</feedURL><topicURL>{topicURL}</topicURL><hubURL>{hubURL}</hubURL></feed>
 }
 
 /*
@@ -54,10 +54,9 @@ class Subscriber(val hostname:String, val port : Int) extends Logging{
   val pushRoute		= "push"
   val adminRoute 	= "admin"
   val callbackURL   = "http://" + hostname + ":" + port + "/" + pushRoute 
-  val pushRestlet 		= new PuSHRestlet(this)
-  val adminRestlet 		= new AdminRestlet(this)
-  val configFile	    = "feeds.xml"
-
+  val pushRestlet 	= new PuSHRestlet(this)
+  val adminRestlet 	= new AdminRestlet(this)
+  val configFile	= "feeds.xml"
   var pendingSubscriptions : Set[Subscription] = Set()
   var activeSubscriptions : Set[Subscription] = Set()
 
@@ -77,7 +76,7 @@ class Subscriber(val hostname:String, val port : Int) extends Logging{
   def loadConfig{
     try{
     	val config = XML.loadFile(configFile)
-    	(config\"feed").foreach{t => subUnsub( ( t \"@feedURL").text,true) }
+    	(config\"feed").foreach{t => subUnsub( t \ "feedURL" text ,true) }
     }catch{
       case ex: FileNotFoundException => 
     }

src/main/scala/org/kafecho/push/Restlets.scala

@@ -11,7 +11,7 @@ import org.restlet.{Client,Component,Restlet};
 import org.restlet.data._
 import java.text.SimpleDateFormat
 
-import scala.xml.XML
+import scala.xml.{XML,PrettyPrinter}
 import scala.xml.Elem
 
 /*
@@ -25,20 +25,28 @@ object RFC3339 extends SimpleDateFormat("yyyy-MM-dd'T'h:m:ss")
  * This restlet mixes in the traits corresponding to the HTTP methods it supports and the dispatch logic is handled by each of the trait.
  */
 class AdminRestlet (val subscriber : Subscriber ) extends Default with Logging with POST with GET with DELETE{
+    val xmlPrinter 	= new PrettyPrinter(100,2)
+
 	def doPOST(request : Request, response : Response){
 		val id = request.getAttributes.get("ID")
 		if (id != null){
 		  response.setStatus(Status.CLIENT_ERROR_METHOD_NOT_ALLOWED)
 		  return
 		}
-		if (request.getEntity.getMediaType != MediaType.TEXT_XML){
-		  response.setStatus(Status.CLIENT_ERROR_NOT_ACCEPTABLE,"Please provide some XML.")
+		
+		if (request.getEntity.getMediaType != MediaType.APPLICATION_WWW_FORM){
+		  log.error("Invalid MIME type: " + request.getEntity.getMediaType)
+		  response.setStatus(Status.CLIENT_ERROR_METHOD_NOT_ALLOWED)
 		  return
 		}
-		
-		val xml = XML.loadString(request.getEntity.getText)
-		subscriber.subUnsub(xml \ "@feedURL" text , true)
-	}
+		val form = request.getEntityAsForm
+		val feedURL = form.getFirstValue("feedURL")
+		if (feedURL != null){
+			subscriber.subUnsub(feedURL , true)
+			response.setEntity("Creating subscription for feed: " + feedURL,MediaType.TEXT_PLAIN)
+			response.setStatus(Status.SUCCESS_ACCEPTED)
+		}
+}
 
 	def doDELETE(request : Request, response : Response){
 		val id = request.getAttributes.get("ID")
@@ -48,7 +56,8 @@ class AdminRestlet (val subscriber : Subscriber ) extends Default with Logging w
 		  found match{
 		    case Some(subscription) =>
 		    	subscriber.subUnsub(subscription.feedURL,subscription.topicURL,subscription.hubURL,false)
-		    	response.setStatus(Status.SUCCESS_OK,"Created a new subscription for feed: " + subscription.feedURL)
+       			response.setEntity("Removing subscription for feed: " +  subscription.feedURL, MediaType.TEXT_PLAIN)
+       			response.setStatus(Status.SUCCESS_ACCEPTED)
 		    case None => response.setStatus(Status.CLIENT_ERROR_NOT_FOUND)	
 		  }
 		}
@@ -58,7 +67,7 @@ class AdminRestlet (val subscriber : Subscriber ) extends Default with Logging w
 		if (id != null){
 		  val found = subscriber.activeSubscriptions.find( _.id.toString == id)
 		  found match{
-		    case Some(subscription) => response.setEntity(subscription.toXML.toString, MediaType.TEXT_XML)
+		    case Some(subscription) => response.setEntity(xmlPrinter.format(subscription.toXML), MediaType.TEXT_XML)
 		    case None => response.setStatus(Status.CLIENT_ERROR_NOT_FOUND)	
 		  }
 		}