Merge branch 'pg_dev' of github.com:EiffelWebFramework/EGSuite into pg_dev

Author: phgachoud

.gitignore

@@ -4,4 +4,7 @@ EIFGENs
 
 system.log
 token.access
+
 sheets/test/eiftmp*
+credentials.json
+

sheets/Readme.md

@@ -1,5 +1,4 @@
-# Eiffel API for Google Sheets API
-
+Eiffel API for Google Sheets API
 https://developers.google.com/sheets/api/reference/rest
 
 
@@ -11,4 +10,4 @@ To begin, obtain OAuth 2.0 client credentials from the [Browser Quickstart](http
   - EG_SHEETS_API -- It's the low level interface that sends and receives HTTP messages..
   - EG_SHEETS_JSON -- it's the implementation where we map from the HTTP messages encoded in JSON format to the Eiffel side. (and vice versa).
 
-Then in the object cluster we have the Eiffel objects representing the API domain.
+Then in the object cluster we have the Eiffel objects representing the API domain.

sheets/src/eg_sheets_api.e

@@ -5,7 +5,6 @@ note
 
 class
 	EG_SHEETS_API
-
 inherit
 	LOGGABLE
 
@@ -16,7 +15,6 @@ feature {NONE} -- Initialization
 
 	make (a_access_token: READABLE_STRING_32)
 		do
-			default_create
 				-- Using a code verifier
 			access_token := a_access_token
 			enable_version_4
@@ -46,6 +44,7 @@ feature -- Access
 	version: STRING_8
 			-- Google Sheets version
 
+feature -- Spreedsheets
 	spreadsheet_id: detachable STRING
 
 
@@ -61,7 +60,6 @@ feature -- Spreedsheets Operations
 				attached last_response as l_response and then
 				attached l_response.body as l_body
 			then
-				parse_last_response
 				Result := l_body
 			end
 		end
@@ -195,7 +193,6 @@ feature -- Parameters Factory
 			end
 		end
 
-
 feature -- Error Report
 
 	parse_last_response

sheets/src/json/eg_sheets_json.e

@@ -40,25 +40,234 @@ feature -- Post
 		note
 			EIS:"name=create.spreedsheets", "src=https://developers.google.com/sheets/api/reference/rest/v4/spreadsheets/create", "protocol=uri"
 		do
-			create Result.make ("", "")
+			create Result
 			if attached eg_sheets_api.create_spreedsheet  as s then
 				if attached parsed_json (s) as j then
+					Result := eg_spreadsheet (Void, j)
 				else
 					-- set error
 				end
 			end
 		end
 
+feature -- Error
+
+	last_error: detachable STRING
+			-- Last error message.
+			-- maybe we can create an specific EG_ERROR.
 
 feature -- Implementation Factory
 
 	eg_spreadsheet (a_spreadsheet: detachable like eg_spreadsheet; a_json: JSON_VALUE): EG_SPREEDSHEET
 			--
 		do
-			create Result.make ("", "")
+			if a_spreadsheet /= Void then
+				Result := a_spreadsheet
+			else
+				create Result
+			end
+			if attached string_value_from_json (a_json, "spreadsheetId") as l_id then
+				Result.set_id (l_id)
+			end
+			if attached string_value_from_json (a_json, "spreadsheetUrl") as l_url then
+				Result.set_url (l_url)
+			end
+			Result.set_protperty (eg_spreadsheet_properties (a_json))
+			if attached {JSON_ARRAY} json_value (a_json, "sheets") as l_sheets then
+				across l_sheets as ic loop
+				end
+			end
+			if attached {JSON_ARRAY} json_value (a_json, "namedRanges") as l_named_ranges then
+			end
+			if attached {JSON_ARRAY} json_value (a_json, "developerMetadata") as l_developer_metadata then
+				-- TODO
+			end
+
+
+		end
+
+feature {NONE} -- JSON To Eiffel
+
+	eg_spreadsheet_properties (a_json: JSON_VALUE): EG_SPREADSHEET_PROPERTIES
+			--
+		local
+			l_cell_format: EG_CELL_FORMAT
+		do
+			create Result
+			if attached {JSON_OBJECT} json_value (a_json, "properties") as l_properties then
+				if attached string_value_from_json (l_properties, "title") as l_title then
+					Result.set_title (l_title)
+				end
+				if attached string_value_from_json (l_properties, "locale") as l_locale then
+					Result.set_locale (l_locale)
+				end
+				if attached string_value_from_json (l_properties, "autoRecalc") as l_auto_recalc then
+					if l_auto_recalc.is_case_insensitive_equal ("ON_CHANGE") then
+						Result.auto_recalc.set_on_change
+					elseif l_auto_recalc.is_case_insensitive_equal ("MINUTE") then
+						Result.auto_recalc.set_minute
+					elseif l_auto_recalc.is_case_insensitive_equal ("HOUR") then
+						Result.auto_recalc.set_hour
+					end
+				end
+				if attached string_value_from_json (l_properties, "timeZone") as l_time_zone then
+					Result.set_time_zone (l_time_zone)
+				end
+				if attached {JSON_OBJECT} json_value (l_properties, "defaultFormat") as l_default_format then
+				end
+			end
 		end
 
 
+	default_format (a_json: JSON_OBJECT): EG_CELL_FORMAT
+		do
+			create Result
+
+			if attached {JSON_OBJECT} json_value (a_json, "backgroundColor") as l_background_color then
+				Result.set_background_color (eg_color (l_background_color))
+			end
+			if attached {JSON_OBJECT} json_value (a_json, "padding") as l_padding then
+				Result.set_padding (padding (l_padding))
+			end
+			if attached string_value_from_json (a_json, "verticalAlignment") as l_alignment then
+				if l_alignment.is_case_insensitive_equal ("BOTTOM")  then
+					Result.vertical_alignment.set_bottom
+				elseif l_alignment.is_case_insensitive_equal ("MIDDLE")  then
+					Result.vertical_alignment.set_middle
+				elseif l_alignment.is_case_insensitive_equal ("TOP")  then
+					Result.vertical_alignment.set_top
+				end
+			end
+			if attached string_value_from_json (a_json, "wrapStrategy") as l_wrap_strategy then
+				if l_wrap_strategy.is_case_insensitive_equal ("OVERFLOW_CELL")  then
+					Result.wrap_strategy.set_overflow_cell
+				end
+				if l_wrap_strategy.is_case_insensitive_equal ("LEGACY_WRAP")  then
+					Result.wrap_strategy.set_legacy_wrap
+				elseif l_wrap_strategy.is_case_insensitive_equal ("CLIP")  then
+					Result.wrap_strategy.set_clip
+				elseif l_wrap_strategy.is_case_insensitive_equal ("WRAP")  then
+					Result.wrap_strategy.set_wrap
+				end
+			end
+			if attached {JSON_OBJECT} json_value (a_json, "textFormat") as l_text_format then
+				Result.set_text_format (text_format (l_text_format))
+			end
+			if attached {JSON_OBJECT} json_value (a_json, "backgroundColorStyle") as l_background_color_style then
+				Result.set_background_color_style (eg_color_style (l_background_color_style))
+			end
+		end
+
+	eg_color (a_json: JSON_OBJECT): EG_COLOR
+		do
+			create Result
+			if attached integer_value_from_json (a_json, "red") as l_val then
+				Result.set_red (l_val)
+			elseif attached real_value_from_json (a_json, "red") as l_val then
+				Result.set_red (l_val)
+			end
+			if attached integer_value_from_json (a_json, "green") as l_val then
+				Result.set_green (l_val)
+			elseif attached real_value_from_json (a_json, "green") as l_val then
+				Result.set_green (l_val)
+			end
+			if attached integer_value_from_json (a_json, "blue") as l_val then
+				Result.set_blue (l_val)
+			elseif attached real_value_from_json (a_json, "blue") as l_val then
+				Result.set_blue (l_val)
+			end
+			if attached integer_value_from_json (a_json, "alpha") as l_val then
+				Result.set_alpha (l_val)
+			elseif attached real_value_from_json (a_json, "alpha") as l_val then
+				Result.set_alpha (l_val)
+			end
+		end
+
+	padding (a_json: JSON_OBJECT): EG_PADDING
+		do
+			create Result
+			if attached integer_value_from_json (a_json, "top") as l_val then
+				Result.set_top (l_val)
+			end
+			if attached integer_value_from_json (a_json, "right") as l_val then
+				Result.set_right (l_val)
+			end
+			if attached integer_value_from_json (a_json, "bottom") as l_val then
+				Result.set_bottom (l_val)
+			end
+			if attached integer_value_from_json (a_json, "left") as l_val then
+				Result.set_left (l_val)
+			end
+		end
+
+	text_format (a_json: JSON_OBJECT): EG_TEXT_FORMAT
+		do
+			create Result
+			if attached {JSON_OBJECT} json_value (a_json, "foregroundColor") as l_foreground_color then
+				Result.set_foreground_color (eg_color (l_foreground_color))
+			end
+			if attached {JSON_OBJECT} json_value (a_json, "foregroundColorStyle") as l_foreground_color_style then
+				Result.set_foreground_color_style (eg_color_style (l_foreground_color_style))
+			end
+			if attached string_value_from_json (a_json, "fontFamily") as l_font_family then
+				Result.set_font_family (l_font_family)
+			end
+			if attached integer_value_from_json (a_json, "fontSize") as l_font_size then
+				Result.set_font_size (l_font_size)
+			end
+			if attached boolean_value_from_json (a_json, "bold") as l_bold then
+				Result.set_bold (l_bold)
+			end
+			if attached boolean_value_from_json (a_json, "italic") as l_italic then
+				Result.set_italic (l_italic)
+			end
+			if attached boolean_value_from_json (a_json, "strikethrough") as l_strikethrough then
+				Result.set_strikethrough (l_strikethrough)
+			end
+			if attached boolean_value_from_json (a_json, "underline") as l_underline then
+				Result.set_strikethrough (l_underline)
+			end
+		end
+
+	eg_color_style (a_json: JSON_OBJECT): EG_COLOR_STYLE
+		local
+			l_tc: EG_THEME_COLOR
+		do
+			create Result
+			if attached {JSON_OBJECT} json_value (a_json, "rgbColor") as l_rgbcolor then
+				Result.set_rgb (eg_color (l_rgbcolor))
+			elseif
+				attached string_value_from_json (a_json, "themeColor") as l_theme_color
+			then
+				create l_tc
+				if l_theme_color.is_case_insensitive_equal ("TEXT")  then
+					l_tc.set_text
+				elseif l_theme_color.is_case_insensitive_equal ("BACKGROUND")  then
+					l_tc.set_background
+				elseif l_theme_color.is_case_insensitive_equal ("ACCENT1")  then
+					l_tc.set_accent1
+				elseif l_theme_color.is_case_insensitive_equal ("ACCENT2")  then
+					l_tc.set_accent2
+				elseif l_theme_color.is_case_insensitive_equal ("ACCENT3")  then
+					l_tc.set_accent3
+				elseif l_theme_color.is_case_insensitive_equal ("ACCENT4")  then
+					l_tc.set_accent4
+				elseif l_theme_color.is_case_insensitive_equal ("ACCENT5")  then
+					l_tc.set_accent5
+				elseif l_theme_color.is_case_insensitive_equal ("ACCENT6")  then
+					l_tc.set_accent6
+				elseif l_theme_color.is_case_insensitive_equal ("LINK")  then
+					l_tc.set_link
+				end
+				Result.set_theme_color (l_tc)
+			end
+		end
+
+	eg_sheets (a_json: JSON_VALUE): EG_SHEET
+		do
+			create Result
+		end
+
 
 feature {NONE} -- Implementation
 

sheets/src/objects/eg_banded_range.e

@@ -0,0 +1,9 @@
+note
+	description: "A banded (alternating colors) range in a sheet."
+	date: "$Date$"
+	revision: "$Revision$"
+	EIS: "name=Banded Range", "src=https://developers.google.com/sheets/api/reference/rest/v4/spreadsheets/sheets#bandedrange", "protocol=uri"
+class
+	EG_BANDED_RANGE
+
+end

sheets/src/objects/eg_basic_filter.e

@@ -0,0 +1,31 @@
+note
+	description: "[
+		The default filter associated with a sheet.
+	
+		JSON representation
+		{
+		  "range": {
+		    object (GridRange)
+		  },
+		  "sortSpecs": [
+		    {
+		      object (SortSpec)
+		    }
+		  ],
+		  "criteria": {
+		    string: {
+		      object(FilterCriteria)
+		    },
+		    ...
+		  }
+		}
+
+	]"
+	author: ""
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	EG_BASIC_FILTER
+
+end

sheets/src/objects/eg_border.e

@@ -0,0 +1,10 @@
+note
+	description: "Summary description for {EG_BORDER}."
+	author: ""
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	EG_BORDER
+
+end