Merge pull request #11 from jocelyn/improved_sept_2014

Fixed various issue with parsing string (such as \t and related),
    Implemented escaping of slash '/' only in case of '</' to avoid potential issue with javascript and </script>
    Many feature renaming to match Eiffel style and naming convention, kept previous feature as obsolete.
    Restructured the library to make easy extraction of "converter" classes if needed in the future.
    Marked converters classes as obsolete.
    Updated part of the code to use new feature names.
    Updated license and copyright.
    Updated classes with bottom indexing notes related to copyright and license.

Author: jocelyn

.gitattributes

@@ -7,3 +7,4 @@
 *.ecf text
 *.bat text
 *.json text
+*.txt text

.gitignore

@@ -1,2 +1,2 @@
 *.swp
-EIFGENs
+EIFGENs/

History.txt

@@ -1,4 +1,4 @@
-History file for EJSON
+History file for EJSON
 ======================
 
 team: ""
@@ -23,4 +23,4 @@ implementation.
 
 *Added converters and factory classes 
 
-*Added new top level directories; library, test, build and example
+*Added new top level directories; library, test, build and example

License.txt

@@ -1,20 +1,21 @@
-Copyright (c)  2010 Javier Velilla and others, http://ejson.origo.ethz.ch
+Copyright (c)  2010-2014 Javier Velilla and others,
+https://github.com/eiffelhub/json .
 
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions: 
+furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software. 
+all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.

library/kernel/converters/json_arrayed_list_converter.e renamed to library/converter/json_arrayed_list_converter.e

@@ -8,6 +8,9 @@ note
 class
 	JSON_ARRAYED_LIST_CONVERTER
 
+obsolete
+	"This JSON converter design has issues [Sept/2014]."
+
 inherit
 
 	JSON_LIST_CONVERTER
@@ -29,4 +32,7 @@ feature {NONE} -- Factory
 			create Result.make (nb)
 		end
 
+note
+	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
 end -- class JSON_ARRAYED_LIST_CONVERTER

library/kernel/converters/json_converter.e renamed to library/converter/json_converter.e

@@ -8,6 +8,9 @@ note
 deferred class
 	JSON_CONVERTER
 
+obsolete
+	"This JSON converter design has issues [Sept/2014]."
+
 inherit
 
 	SHARED_EJSON
@@ -35,4 +38,7 @@ feature -- Conversion
 invariant
 	has_eiffel_object: object /= Void -- An empty object must be created at creation time!
 
+note
+	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
 end

library/kernel/converters/json_hash_table_converter.e renamed to library/converter/json_hash_table_converter.e

@@ -8,6 +8,9 @@ note
 class
 	JSON_HASH_TABLE_CONVERTER
 
+obsolete
+	"This JSON converter design has issues [Sept/2014]."
+
 inherit
 
 	JSON_CONVERTER
@@ -52,31 +55,34 @@ feature -- Conversion
 
 	to_json (o: like object): detachable JSON_OBJECT
 		local
-			c: HASH_TABLE_ITERATION_CURSOR [ANY, HASHABLE]
 			js: JSON_STRING
 			failed: BOOLEAN
 		do
 			create Result.make
-			from
-				c := o.new_cursor
-			until
-				c.after
+			across
+				o as c
 			loop
 				if attached {JSON_STRING} json.value (c.key) as l_key then
 					js := l_key
 				else
-					create js.make_json (c.key.out)
+					if attached {READABLE_STRING_GENERAL} c.key as s_key then
+						create js.make_from_string_general (s_key)
+					else
+						create js.make_from_string (c.key.out)
+					end
 				end
 				if attached json.value (c.item) as jv then
 					Result.put (jv, js)
 				else
 					failed := True
 				end
-				c.forth
 			end
 			if failed then
 				Result := Void
 			end
 		end
 
+note
+	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
 end -- class JSON_HASH_TABLE_CONVERTER

library/kernel/converters/json_linked_list_converter.e renamed to library/converter/json_linked_list_converter.e

@@ -8,6 +8,9 @@ note
 class
 	JSON_LINKED_LIST_CONVERTER
 
+obsolete
+	"This JSON converter design has issues [Sept/2014]."
+
 inherit
 
 	JSON_LIST_CONVERTER
@@ -29,4 +32,7 @@ feature {NONE} -- Factory
 			create Result.make
 		end
 
+note
+	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
 end -- class JSON_LINKED_LIST_CONVERTER

library/kernel/converters/json_list_converter.e renamed to library/converter/json_list_converter.e

@@ -8,6 +8,9 @@ note
 deferred class
 	JSON_LIST_CONVERTER
 
+obsolete
+	"This JSON converter design has issues [Sept/2014]."
+
 inherit
 
 	JSON_CONVERTER
@@ -51,17 +54,15 @@ feature -- Conversion
 	to_json (o: like object): detachable JSON_ARRAY
 		local
 			c: ITERATION_CURSOR [detachable ANY]
-			jv: detachable JSON_VALUE
 			failed: BOOLEAN
 		do
-			create Result.make_array
+			create Result.make (o.count)
 			from
 				c := o.new_cursor
 			until
 				c.after
 			loop
-				jv := json.value (c.item)
-				if jv /= Void then
+				if attached json.value (c.item) as jv then
 					Result.add (jv)
 				else
 					failed := True
@@ -73,4 +74,7 @@ feature -- Conversion
 			end
 		end
 
+note
+	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
 end -- class JSON_ARRAYED_LIST_CONVERTER

library/kernel/ejson.e renamed to library/converter/support/ejson.e

@@ -8,6 +8,9 @@ note
 class
 	EJSON
 
+obsolete
+	"This JSON converter design has issues [Sept/2014]."
+
 inherit
 
 	EXCEPTIONS
@@ -27,7 +30,7 @@ feature -- Access
 			if an_object = Void then
 				create {JSON_NULL} Result
 			elseif attached {BOOLEAN} an_object as b then
-				create {JSON_BOOLEAN} Result.make_boolean (b)
+				create {JSON_BOOLEAN} Result.make (b)
 			elseif attached {INTEGER_8} an_object as i8 then
 				create {JSON_NUMBER} Result.make_integer (i8)
 			elseif attached {INTEGER_16} an_object as i16 then
@@ -49,7 +52,7 @@ feature -- Access
 			elseif attached {REAL_64} an_object as r64 then
 				create {JSON_NUMBER} Result.make_real (r64)
 			elseif attached {ARRAY [detachable ANY]} an_object as a then
-				create ja.make_array
+				create ja.make (a.count)
 				from
 					i := a.lower
 				until
@@ -66,13 +69,13 @@ feature -- Access
 				end
 				Result := ja
 			elseif attached {CHARACTER_8} an_object as c8 then
-				create {JSON_STRING} Result.make_json (c8.out)
+				create {JSON_STRING} Result.make_from_string (c8.out)
 			elseif attached {CHARACTER_32} an_object as c32 then
-				create {JSON_STRING} Result.make_json (c32.out)
+				create {JSON_STRING} Result.make_from_string_32 (create {STRING_32}.make_filled (c32, 1))
 			elseif attached {STRING_8} an_object as s8 then
-				create {JSON_STRING} Result.make_json (s8)
+				create {JSON_STRING} Result.make_from_string (s8)
 			elseif attached {STRING_32} an_object as s32 then
-				create {JSON_STRING} Result.make_json_from_string_32 (s32)
+				create {JSON_STRING} Result.make_from_string_32 (s32)
 			end
 			if Result = Void then
 					-- Now check the converters
@@ -162,12 +165,10 @@ feature -- Access
 			-- "eJSON exception" if unable to convert value.
 		require
 			json_not_void: json /= Void
-		local
-			jv: detachable JSON_VALUE
 		do
 			json_parser.set_representation (json)
-			jv := json_parser.parse
-			if jv /= Void then
+			json_parser.parse_content
+			if json_parser.is_valid and then attached json_parser.parsed_json_value as jv then
 				Result := object (jv, base_class)
 			end
 		end
@@ -192,8 +193,8 @@ feature -- Access
 			js_key, js_value: JSON_STRING
 		do
 			create Result.make
-			create js_key.make_json ("$ref")
-			create js_value.make_json (s)
+			create js_key.make_from_string ("$ref")
+			create js_value.make_from_string (s)
 			Result.put (js_value, js_key)
 		end
 
@@ -207,7 +208,7 @@ feature -- Access
 		local
 			c: ITERATION_CURSOR [STRING]
 		do
-			create Result.make_array
+			create Result.make (l.count)
 			from
 				c := l.new_cursor
 			until
@@ -264,7 +265,10 @@ feature {NONE} -- Implementation (JSON parser)
 
 	json_parser: JSON_PARSER
 		once
-			create Result.make_parser ("")
+			create Result.make_with_string ("{}")
 		end
 
+note
+	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
 end -- class EJSON