Merge pull request #4 from jvelilla/master

CJ Browser update

Add delete support.
Add missing Accept header.
Setup a bigger timeout.

Author: jocelyn

src/cj_client_proxy.e

@@ -59,4 +59,10 @@ feature -- Execution
 			Result := client.update_with_template (a_path, tpl, adapted_context (ctx))
 		end
 
+
+	delete (a_path: READABLE_STRING_GENERAL; ctx: detachable HTTP_CLIENT_REQUEST_CONTEXT): CJ_CLIENT_RESPONSE
+		do
+			Result := client.delete (a_path, adapted_context (ctx))
+		end
+
 end

src/cj_template_tool.e

@@ -43,10 +43,12 @@ feature -- Change
 			v: EV_VERTICAL_BOX
 			hb: EV_HORIZONTAL_BOX
 			lab: EV_LABEL
-			tf: EV_TEXT_FIELD
+--			tf: EV_TEXT_FIELD
+			tf: EV_TEXT
 			tf_passwd: EV_PASSWORD_FIELD
 			but: EV_BUTTON
-			table: HASH_TABLE [EV_TEXT_FIELD, STRING_32]
+			but_delete: detachable EV_BUTTON
+			table: HASH_TABLE [EV_TEXT_COMPONENT, STRING_32]
 			is_creation: BOOLEAN
 			is_password: BOOLEAN
 		do
@@ -110,15 +112,23 @@ feature -- Change
 			else
 				create but.make_with_text ("Update")
 				but.select_actions.extend (agent on_post (coll, tpl, table, False))
+				create but_delete.make_with_text ("Delete")
+				but_delete.select_actions.extend (agent on_delete (coll, tpl, table))
+
 			end
 
 			v.extend (create {EV_CELL})
 			v.extend (but)
+			if but_delete /= Void then
+				v.extend (but_delete)
+				v.disable_item_expand (but_delete)
+
+			end
 			v.disable_item_expand (but)
 			-- FIXME
 		end
 
-	on_post (coll: CJ_COLLECTION; tpl: CJ_TEMPLATE; table: HASH_TABLE [EV_TEXT_FIELD, STRING_32]; is_creation: BOOLEAN)
+	on_post (coll: CJ_COLLECTION; tpl: CJ_TEMPLATE; table: HASH_TABLE [EV_TEXT_COMPONENT, STRING_32]; is_creation: BOOLEAN)
 		local
 			ctx: HTTP_CLIENT_REQUEST_CONTEXT
 			l_href: STRING_8
@@ -147,6 +157,33 @@ feature -- Change
 --			dlg.focus_out_actions.extend (agent dlg.destroy_and_exit_if_last)
 		end
 
+	on_delete (coll: CJ_COLLECTION; tpl: CJ_TEMPLATE; table: HASH_TABLE [EV_TEXT_COMPONENT, STRING_32])
+		local
+			ctx: HTTP_CLIENT_REQUEST_CONTEXT
+			l_href: STRING_8
+			dlg: EV_INFORMATION_DIALOG
+			resp: CJ_CLIENT_RESPONSE
+		do
+			create ctx.make
+			across
+				tpl.data as c
+			loop
+				if attached table.item (c.item.name) as tf then
+					c.item.set_value (tf.text)
+				end
+			end
+			if attached coll.items as l_items and then attached l_items.first as first_item then
+				l_href := first_item.href
+				resp := cj_client.delete(l_href, Void )
+			else
+				l_href := coll.href
+				resp := cj_client.delete (l_href, Void)
+			end
+			create dlg.make_with_text ("Result")
+			dlg.set_text (resp.http_response)
+			dlg.show
+		end
+
 invariant
 	widget_attached: widget /= Void
 

src/kernel/cj_client.e

@@ -16,6 +16,7 @@ feature {NONE} -- Initialization
 			-- Initialize `Current'.
 		do
 			create {LIBCURL_HTTP_CLIENT_SESSION} client.make (a_service) --"http://jfiat.dyndns.org:8190")
+			client.set_timeout (25)
 		end
 
 feature -- Access		
@@ -71,6 +72,7 @@ feature -- Access
 			if l_ctx = Void then
 				create l_ctx.make
 			end
+			l_ctx.add_header ("Accept", "application/vnd.collection+json")
 			l_ctx.add_header ("Content-Type", "application/vnd.collection+json")
 
 			if attached cj_template_to_json (tpl) as j then
@@ -112,6 +114,8 @@ feature -- Access
 				create l_ctx.make
 			end
 			l_ctx.add_header ("Content-Type", "application/vnd.collection+json")
+			l_ctx.add_header ("Accept", "application/vnd.collection+json")
+				
 
 			if attached cj_template_to_json (tpl) as j then
 				d := "{ %"template%": " + j.representation + " }"
@@ -151,6 +155,8 @@ feature -- Access
 				create l_ctx.make
 			end
 			l_ctx.add_header ("Content-Type", "application/vnd.collection+json")
+			l_ctx.add_header ("Accept", "application/vnd.collection+json")
+
 
 			if attached q.data as q_data then
 				across
@@ -185,6 +191,41 @@ feature -- Access
 		end
 
 
+	delete (a_path: READABLE_STRING_GENERAL; ctx: detachable HTTP_CLIENT_REQUEST_CONTEXT): CJ_CLIENT_RESPONSE
+		local
+			l_http_response: STRING_8
+			j_body: like json
+			l_formatted_body: detachable STRING_8
+			col: detachable CJ_COLLECTION
+			l_ctx: detachable HTTP_CLIENT_REQUEST_CONTEXT
+			l_url: STRING_8
+		do
+			create l_http_response.make_empty
+			l_ctx := ctx
+			if l_ctx = Void then
+				create l_ctx.make
+			end
+			l_ctx.add_header ("Accept", "application/vnd.collection+json")
+			l_url := a_path.to_string_8
+			if attached client.delete (l_url, l_ctx) as g_response then
+				l_url := g_response.url
+				l_http_response.append ("Status: " + g_response.status.out + "%N")
+				l_http_response.append (g_response.raw_header)
+				if attached g_response.body as l_body then
+					l_http_response.append ("%N%N")
+					l_http_response.append (l_body)
+					if attached json (l_body) as j then
+						j_body := j
+						col := cj_collection (j)
+					end
+				else
+					l_formatted_body := Void
+				end
+			end
+			create Result.make (l_url, l_http_response, j_body, col)
+		end
+
+
 feature {NONE} -- Implementation
 
 	shared_ejson: SHARED_EJSON