mirrors/EWF
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into concurrent_httpd

Browse Source 
- Updated JSON parser library
 - Removed obsolete calls on json parser library.
This commit is contained in:
Jocelyn FIAT
2015-04-08 16:16:04 +02:00
parent cf549e8f62 881625a0f6
commit 3b375e12ca
81 changed files with 3970 additions and 2939 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
draft/library/server/wsf_js_widget/examples/demo/autocompletion/contact_autocompletion.e
View File

@@ -29,23 +29,27 @@ feature -- Implementation
local
o: JSON_OBJECT
do
create Result.make_array
create Result.make_empty
across
list as c
loop
if attached {STRING} c.item.item (1) as value and attached {STRING} c.item.item (3) as img and attached {STRING} c.item.item (2) as company then
if
attached c.item.value as value and
attached c.item.img as img and
attached c.item.company as company
then
if value.as_lower.has_substring (input.as_lower) then
create o.make
o.put (create {JSON_STRING}.make_json (img), "img")
o.put (create {JSON_STRING}.make_json (value), "value")
o.put (create {JSON_STRING}.make_json (company), "company")
o.put (create {JSON_STRING}.make_from_string (img), "img")
o.put (create {JSON_STRING}.make_from_string (value), "value")
o.put (create {JSON_STRING}.make_from_string (company), "company")
Result.add (o)
end
end
end
end
list: ITERABLE [TUPLE [STRING, STRING]]
list: ITERABLE [TUPLE [value: STRING; company: STRING; img: STRING]]
-- List of contacts
end

6
draft/library/server/wsf_js_widget/examples/demo/autocompletion/flag_autocompletion.e
View File

@@ -132,7 +132,7 @@ feature -- Implementation
["ZM", {STRING_32} "Zambia"], ["ZW", {STRING_32} "Zimbabwe"]
>>
create Result.make_array
create Result.make_empty
across
list as c
loop
@@ -142,8 +142,8 @@ feature -- Implementation
then
if second.as_lower.has_substring (input.as_lower) then
create o.make
o.put (create {JSON_STRING}.make_json (first.as_lower), "flag")
o.put (create {JSON_STRING}.make_json_from_string_32 (second), "value")
o.put (create {JSON_STRING}.make_from_string (first.as_lower), "flag")
o.put (create {JSON_STRING}.make_from_string_32 (second), "value")
Result.add (o)
end
end

10
draft/library/server/wsf_js_widget/examples/demo/autocompletion/google_autocompletion.e
View File

@@ -43,11 +43,13 @@ feature -- Implementation
if attached sess.get ("/complete/search?client=chrome", ctx) as resp and then not resp.error_occurred then
l_json := resp.body
end
create Result.make_array
create Result.make_empty
if l_json /= Void and then not l_json.is_empty then
create json_parser.make_parser (l_json)
create json_parser.make_with_string (l_json)
json_parser.parse_content
if
attached {JSON_ARRAY} json_parser.parse_json as data and then
json_parser.is_valid and then
attached {JSON_ARRAY} json_parser.parsed_json_value as data and then
data.valid_index (2) and then
attached {JSON_ARRAY} data.i_th (2) as list
then
@@ -56,7 +58,7 @@ feature -- Implementation
loop
if attached {JSON_STRING} list.i_th (c.item) as row then
create o.make
o.put (create {JSON_STRING}.make_with_escaped_json (row.item), "value")
o.put (create {JSON_STRING}.make_from_escaped_json_string (row.item), "value")
Result.add (o)
end
end

8
draft/library/server/wsf_js_widget/examples/demo/googlenews/google_news_datasource.e
View File

@@ -72,8 +72,12 @@ feature -- Access
end
end
if l_json /= Void and then not l_json.is_empty then
create json_parser.make_parser (l_json)
if attached {JSON_OBJECT} json_parser.parse_json as sp then
create json_parser.make_with_string (l_json)
json_parser.parse_content
if
json_parser.is_valid and then
attached {JSON_OBJECT} json_parser.parsed_json_value as sp
then
if
attached {JSON_OBJECT} sp.item ("responseData") as responsedata and then
attached {JSON_ARRAY} responsedata.item ("results") as results

2
draft/library/server/wsf_js_widget/examples/demo/progress/increasing_progresssource.e
View File

@@ -17,7 +17,7 @@ feature {NONE} -- Initialization
control: detachable WSF_PROGRESS_CONTROL
make ()
make
do
end

4
draft/library/server/wsf_js_widget/kernel/autocompletion/wsf_simple_autocompletion.e
View File

@@ -35,7 +35,7 @@ feature -- Implementation
l_lowered_input: READABLE_STRING_GENERAL
l_lowered_item: READABLE_STRING_GENERAL
do
create Result.make_array
create Result.make_empty
l_lowered_input := a_input.as_lower
across
list as c
@@ -50,7 +50,7 @@ feature -- Implementation
end
;note
copyright: "2011-2014, Yassin Hassan, Severin Munger, Jocelyn Fiat, Eiffel Software and others"
copyright: "2011-2015, Yassin Hassan, Severin Munger, Jocelyn Fiat, Eiffel Software and others"
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
source: "[
Eiffel Software

4
draft/library/server/wsf_js_widget/kernel/grid/wsf_pagination_control.e
View File

@@ -43,7 +43,7 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- State management
update
-- Send new renederd control to client on update
do
state_changes.replace (create {JSON_STRING}.make_json_from_string_32 (render), "_html")
state_changes.replace (create {JSON_STRING}.make_from_string_32 (render), "_html")
end
feature --Event handling
@@ -100,7 +100,7 @@ feature -- Properties
datasource: WSF_PAGABLE_DATASOURCE [G]
;note
copyright: "2011-2014, Yassin Hassan, Severin Munger, Jocelyn Fiat, Eiffel Software and others"
copyright: "2011-2015, Yassin Hassan, Severin Munger, Jocelyn Fiat, Eiffel Software and others"
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
source: "[
Eiffel Software

4
draft/library/server/wsf_js_widget/kernel/grid/wsf_repeater_control.e
View File

@@ -39,7 +39,7 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- State management
update
-- Send new rendered control to client on update
do
state_changes.replace (create {JSON_STRING}.make_json_from_string_32 (render_body), "_body")
state_changes.replace (create {JSON_STRING}.make_from_string_32 (render_body), "_body")
state_changes.replace (datasource.state, "datasource")
end
@@ -100,7 +100,7 @@ feature -- Access
pagination_control: detachable WSF_PAGINATION_CONTROL [G]
;note
copyright: "2011-2014, Yassin Hassan, Severin Munger, Jocelyn Fiat, Eiffel Software and others"
copyright: "2011-2015, Yassin Hassan, Severin Munger, Jocelyn Fiat, Eiffel Software and others"
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
source: "[
Eiffel Software

4
draft/library/server/wsf_js_widget/kernel/input/wsf_input_control.e
View File

@@ -100,7 +100,7 @@ feature -- Change
do
if not t.same_string (text) then
text := t
state_changes.replace (create {JSON_STRING}.make_json_from_string_32 (t), "text")
state_changes.replace (create {JSON_STRING}.make_from_string_32 (t), "text")
end
ensure
text_same_string_as_t: text.same_string (t)
@@ -160,7 +160,7 @@ feature -- Properties
-- Procedure to be execued on change
;note
copyright: "2011-2014, Yassin Hassan, Severin Munger, Jocelyn Fiat, Eiffel Software and others"
copyright: "2011-2015, Yassin Hassan, Severin Munger, Jocelyn Fiat, Eiffel Software and others"
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
source: "[
Eiffel Software

12
draft/library/server/wsf_js_widget/kernel/navlist/wsf_navlist_item_control.e
View File

@@ -65,7 +65,7 @@ feature -- Change
else
remove_class ("active")
end
state_changes.replace (create {JSON_BOOLEAN}.make_boolean (a), "active")
state_changes.replace (create {JSON_BOOLEAN}.make (a), "active")
end
ensure
active_set: active = a
@@ -77,4 +77,14 @@ feature -- Properties
active: BOOLEAN
-- The active state of this item
;note
copyright: "2011-2015, Yassin Hassan, Severin Munger, Jocelyn Fiat, Eiffel Software and others"
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
source: "[
Eiffel Software
5949 Hollister Ave., Goleta, CA 93117 USA
Telephone 805-685-1006, Fax 805-685-6869
Website http://www.eiffel.com
Customer support http://support.eiffel.com
]"
end

6
draft/library/server/wsf_js_widget/kernel/webcontrol/wsf_control.e
View File

@@ -28,7 +28,7 @@ feature {NONE} -- Initialization
make_stateless_control (a_tag_name)
create control_name_prefix.make_empty
create state_changes.make
create actions.make_array
create actions.make_empty
ensure
state_changes_attached: attached state_changes
end
@@ -110,7 +110,7 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- State management
end
if actions.count > 0 then
if states.item ("actions") = Void then
states.put (create {JSON_ARRAY}.make_array, "actions")
states.put (create {JSON_ARRAY}.make_empty, "actions")
end
if attached {JSON_ARRAY} states.item ("actions") as action_list then
across
@@ -223,7 +223,7 @@ feature -- Properties
-- control state and therefore could have the same name (Stateless multi controls do not add a hierarchy level)
;note
copyright: "2011-2014, Yassin Hassan, Severin Munger, Jocelyn Fiat, Eiffel Software and others"
copyright: "2011-2015, Yassin Hassan, Severin Munger, Jocelyn Fiat, Eiffel Software and others"
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
source: "[
Eiffel Software

4
draft/library/server/wsf_js_widget/kernel/webcontrol/wsf_dynamic_multi_control.e
View File

@@ -29,7 +29,7 @@ feature {NONE} -- Initialization
-- Initialize with specified tag
do
Precursor (tag)
create items.make_array
create items.make_empty
create pending_removes.make (1)
ensure then
tag_set: tag_name.same_string (tag)
@@ -194,7 +194,7 @@ invariant
all_items_exist: items.count = controls.count
note
copyright: "2011-2014, Yassin Hassan, Severin Munger, Jocelyn Fiat, Eiffel Software and others"
copyright: "2011-2015, Yassin Hassan, Severin Munger, Jocelyn Fiat, Eiffel Software and others"
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
source: "[
Eiffel Software

6
draft/library/server/wsf_js_widget/kernel/webcontrol/wsf_form_element_control.e
View File

@@ -148,7 +148,7 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- State management
validator_description: JSON_ARRAY
do
create Result.make
create validator_description.make_array
create validator_description.make_empty
across
validators as v
loop
@@ -209,7 +209,7 @@ feature -- Validation
-- Set the error message that will be displayed upon failure of client side validation
do
error := e
state_changes.replace (create {JSON_STRING}.make_json_from_string_32 (e), "error")
state_changes.replace (create {JSON_STRING}.make_from_string_32 (e), "error")
ensure
error_set: error.same_string (e)
end
@@ -257,7 +257,7 @@ feature -- Properties
-- The bootstrap column span of the label of this form element control
;note
copyright: "2011-2014, Yassin Hassan, Severin Munger, Jocelyn Fiat, Eiffel Software and others"
copyright: "2011-2015, Yassin Hassan, Severin Munger, Jocelyn Fiat, Eiffel Software and others"
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
source: "[
Eiffel Software

18
draft/library/server/wsf_js_widget/kernel/webcontrol/wsf_page_control.e
View File

@@ -83,14 +83,22 @@ feature -- Implementation
if not event.same_string_general ("uploadfile") then
create states.make_empty
request.read_input_data_into (states)
create json_parser.make_parser (states)
if attached {JSON_OBJECT} json_parser.parse_json as sp then
create json_parser.make_with_string (states)
json_parser.parse_content
if
json_parser.is_valid and then
attached {JSON_OBJECT} json_parser.parsed_json_value as sp
then
set_state (sp)
end
else
if attached request.form_parameter ("state") as statedata then
create json_parser.make_parser (statedata.as_string.value)
if attached {JSON_OBJECT} json_parser.parse_json as sp then
create json_parser.make_with_string (statedata.as_string.value)
json_parser.parse_content
if
json_parser.is_valid and then
attached {JSON_OBJECT} json_parser.parsed_json_value as sp
then
set_state (sp)
end
end
@@ -259,7 +267,7 @@ feature {NONE} -- Root control
-- List containing the additional javascipt files
;note
copyright: "2011-2014, Yassin Hassan, Severin Munger, Jocelyn Fiat, Eiffel Software and others"
copyright: "2011-2015, Yassin Hassan, Severin Munger, Jocelyn Fiat, Eiffel Software and others"
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
source: "[
Eiffel Software

9
draft/src/gewf/src/gewf.e
View File

@@ -51,7 +51,7 @@ feature -- Access
if attached {JSON_OBJECT} j as jo then
l_keys := k.split ('.')
l_keys.start
create js.make_json_from_string_32 (l_keys.item.as_readable_string_32)
create js.make_from_string_general (l_keys.item)
v := jo.item (js)
l_keys.remove
if l_keys.count > 0 then
@@ -93,8 +93,9 @@ feature -- Access
f.close
end
create p.make_parser (s)
json := p.parse
create p.make_with_string (s)
p.parse_content
json := p.parsed_json_value
if attached config ("gewf.template_dir") as d then
setup.set_template_dir_from_string (d)
end
@@ -159,7 +160,7 @@ invariant
-- invariant_clause: True
note
copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
copyright: "2011-2015, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
source: "[
Eiffel Software