Merge branch 'review' of https://github.com/jocelyn/CJ

Conflicts:
	library/converter/cj_link_json_converter.e

Author: jvelilla

library/EIFGENs/cj/COMP/S1/E1

@@ -1,57 +1,83 @@
 note
 	description: "[
-				The Collection Object contains all the records in the representations. This is a required object.
-				Should have a version property. The value MUST be set to 1.0, if there is no version property present
-				set it to 1.0.
+				The Collection Object contains all the records in the representations. 
+				This is a required object.
+				Should have a version property.:
+					- value MUST be set to 1.0, 
+					- if there is no version property present, set it to 1.0.
 				Should have an href property, it should contain a valid URI
 	]"
-	author: ""
 	date: "$Date$"
 	revision: "$Revision$"
 	example: "[
 		{
 			"collection":
 			{
-			 "version":1.0,
-			 "href":URI,
+			 "version": 1.0,
+			 "href": URI,
 			 "links": [ARRAY],
 			 "items": [ARRAY],
-			 "queries":[ARRAY],
-			 "template":{OBJECT},
-			 "error":{OBJECT}
+			 "queries": [ARRAY],
+			 "template": {OBJECT},
+			 "error": {OBJECT}
 			}
 		}
 	]"
+	EIS: "name=Collection+JSON - Hypermedia Type", "protocol=URI", "src=http://www.amundsen.com/media-types/collection/", "tag=homepage, specification"
 
 class
 	CJ_COLLECTION
 
 create
-	make
+	make_empty,
+	make_with_href,
+	make_with_version,
+	make_with_href_and_version
 
 feature {NONE} -- Initialization
 
-	make
+	make_empty
 		do
-			version := ""
-			href := ""
+			make_with_version (default_version)
+		end
+
+	make_with_href (a_href: like href)
+		require
+			valid_href: not a_href.is_empty
+		do
+			make_with_href_and_version (a_href, default_version)
+		end
+
+	make_with_href_and_version (a_href: like href; a_version: like version)
+		require
+			valid_version: not a_version.is_empty
+		do
+			version := a_version
+			href := a_href
+		end
+
+	make_with_version (a_version: like version)
+		require
+			valid_version: not a_version.is_empty
+		do
+			make_with_href_and_version (create {like href}.make_empty, a_version)
 		end
 
 feature -- Access
 
 	version: STRING
-			-- The value should be set to 1.0
+			-- The value should be set to `default_version' i.e: "1.0"
 
 	href: STRING
 			-- Must contain a valid URI
 
-	links: detachable LINKED_LIST [CJ_LINK]
+	links: detachable ARRAYED_LIST [CJ_LINK]
 			-- may have a links array
 
-	items: detachable LINKED_LIST [CJ_ITEM]
+	items: detachable ARRAYED_LIST [CJ_ITEM]
 			-- may have an items array
 
-	queries: detachable LINKED_LIST [CJ_QUERY]
+	queries: detachable ARRAYED_LIST [CJ_QUERY]
 			-- may have a queries array
 
 	template: detachable CJ_TEMPLATE
@@ -82,7 +108,7 @@ feature -- Element Change
 		do
 			l_links := links
 			if l_links = Void then
-				create l_links.make
+				create l_links.make (1)
 				links := l_links
 			end
 			l_links.force (a_link)
@@ -94,7 +120,7 @@ feature -- Element Change
 		do
 			l_items := items
 			if l_items = Void then
-				create l_items.make
+				create l_items.make (1)
 				items := l_items
 			end
 			l_items.force (a_item)
@@ -106,7 +132,7 @@ feature -- Element Change
 		do
 			l_queries := queries
 			if l_queries = Void then
-				create l_queries.make
+				create l_queries.make (1)
 				queries := l_queries
 			end
 			l_queries.force (a_query)
@@ -122,4 +148,11 @@ feature -- Element Change
 			error := an_error
 		end
 
+feature -- Constants
+
+	default_version: STRING = "1.0"
+
+note
+	copyright: "2011-2012, Javier Velilla, Jocelyn Fiat and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 end

library/cj_collection.e

@@ -0,0 +1,31 @@
+note
+	description: "Summary description for {CJ_COLLECTION_FACTORY}."
+	author: ""
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	CJ_COLLECTION_FACTORY
+
+inherit
+	SHARED_EJSON
+
+feature -- Access
+
+	collection (js: STRING): detachable CJ_COLLECTION
+		local
+			l_classname: STRING
+		do
+			l_classname := ({detachable CJ_COLLECTION}).name
+			if l_classname.item (1) = '!' then
+				l_classname := l_classname.substring (2, l_classname.count)
+			end
+			if attached {like collection} json.object_from_json (js, l_classname) as obj then
+				Result := obj
+			end
+		end
+
+note
+	copyright: "2011-2012, Javier Velilla, Jocelyn Fiat and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+end

library/cj_collection_factory.e

@@ -1,13 +1,17 @@
 note
-	description: "Data objects may have three possible properties, name(REQUIRED), value(OPTIONAL), prompt(OPTIONAL)"
-	author: ""
+	description: "[
+				Data objects may have three possible properties:
+					- name   (REQUIRED)
+					- value  (OPTIONAL)
+					- prompt (OPTIONAL)
+			]"
 	date: "$Date$"
 	revision: "$Revision$"
 	example: "[
 		{
-		  "prompt" : STRING,
-		  "name" : STRING,
-		  "value" : VALUE
+		  "prompt" : STRING_32,
+		  "name" : STRING_32,
+		  "value" : STRING_32
 		  
 		}
 	]"
@@ -16,46 +20,57 @@ class
 	CJ_DATA
 
 create
-	make
+	make,
+	make_with_name
 
 feature {NONE} -- Initialization
 
 	make
 		do
-			name := ""
+			make_with_name (create {like name}.make_empty)
+		end
+
+	make_with_name (a_name: like name)
+		do
+			name := a_name
 		end
 
 feature -- Access
 
-	name: STRING
+	name: STRING_32
 
-	prompt: detachable STRING
+	prompt: detachable STRING_32
 
-	value: detachable STRING
+	value: detachable STRING_32
 			-- this propertie May contain
 			-- one of the following data types, STRING, NUMBER, Boolean(true,false), null
 
 feature -- Element Change
 
-	set_name (a_name: STRING)
+	set_name (a_name: like name)
+			-- Set `name' to `a_name'.
 		do
 			name := a_name
 		ensure
 			name_set: name ~ a_name
 		end
 
-	set_prompt (a_prompt: STRING)
+	set_prompt (a_prompt: like prompt)
+			-- Set `prompt' to `a_prompt'.	
 		do
 			prompt := a_prompt
 		ensure
 			prompt_set: prompt ~ a_prompt
 		end
 
-	set_value (a_value: STRING)
+	set_value (a_value: like value)
 		do
 			value := a_value
 		ensure
 			value_set: value ~ a_value
 		end
 
+note
+	copyright: "2011-2012, Javier Velilla, Jocelyn Fiat and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 end

library/cj_data.e

@@ -1,60 +1,75 @@
 note
 	description: "[
 		The Error object, contains aditional information on the latest error reported by the SERVER.
-		It's an optional object, if it exist, there is only one object of this type. 
+		It's an optional object, if it exist, there is only one object of this type.
 	]"
 	author: ""
 	date: "$Date$"
 	revision: "$Revision$"
-	example :"[
+	example: "[
 		{
-		 "error":
-		 {
+		  "error": {
 		 	"title" : STRING,
 		 	"code"  : STRING,
 		 	"message" : STRING
-		 }
+		  }
 		}
 	]"
 
 class
 	CJ_ERROR
+
 create
-	make
+	make,
+	make_empty
 
 feature {NONE} -- Initialization
-	make
+
+	make_empty
 		do
-			title := ""
-			code := ""
-			message := ""
+			make ("", "", "")
+		end
 
+	make (a_title: like title; a_code: like code; a_message: like message)
+		do
+			title := a_title
+			code := a_code
+			message := a_message
 		end
 
 feature -- Access
-	title : STRING
-	code  : STRING
-	message : STRING
+
+	title: STRING_32
+
+	code: STRING_32
+
+	message: STRING_32
 
 feature -- Element Change
-	set_title (a_title : STRING)
+
+	set_title (a_title: like title)
 		do
 			title := a_title
 		ensure
-			title_set : title ~ a_title
+			title_set: title ~ a_title
 		end
 
-	set_code (a_code : STRING)
+	set_code (a_code: like code)
 		do
 			code := a_code
 		ensure
-			code_set : code ~ a_code
+			code_set: code ~ a_code
 		end
 
-	set_message (a_message : STRING)
+	set_message (a_message: like message)
 		do
 			message := a_message
 		ensure
-			message_set : message ~ a_message
+			message_set: message ~ a_message
 		end
+
+note
+	copyright: "2011-2012, Javier Velilla, Jocelyn Fiat and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+
 end