Added to_json feature to EG_PADDING.

jvelilla · jvelilla · commit 67cde839b09d · 2020-08-25T10:06:20.000-03:00
Updated EG_CELL_FORMAT, all features are detachable, updated to_json feature.
diff --git a/sheets/src/json/eg_sheets_json.e b/sheets/src/json/eg_sheets_json.e
@@ -140,6 +140,9 @@ feature {NONE} -- JSON To Eiffel
 
 	cell_format (a_json: JSON_OBJECT): EG_CELL_FORMAT
 			-- Create an object `EG_CELL_FORMAT` from a json representation `a_json`
+		local
+			l_vl: EG_VERTICAL_ALIGN
+			l_ws: EG_WRAP_STRATEGY
 		do
 			create Result
 
@@ -150,25 +153,29 @@ feature {NONE} -- JSON To Eiffel
 				Result.set_padding (padding (l_padding))
 			end
 			if attached string_value_from_json (a_json, "verticalAlignment") as l_alignment then
+				create l_vl
 				if l_alignment.is_case_insensitive_equal ("BOTTOM") then
-					Result.vertical_alignment.set_bottom
+					l_vl.set_bottom
 				elseif l_alignment.is_case_insensitive_equal ("MIDDLE") then
-					Result.vertical_alignment.set_middle
+					l_vl.set_middle
 				elseif l_alignment.is_case_insensitive_equal ("TOP") then
-					Result.vertical_alignment.set_top
+					l_vl.set_top
 				end
+				Result.set_vertical_alignment (l_vl)
 			end
 			if attached string_value_from_json (a_json, "wrapStrategy") as l_wrap_strategy then
+				create l_ws
 				if l_wrap_strategy.is_case_insensitive_equal ("OVERFLOW_CELL") then
-					Result.wrap_strategy.set_overflow_cell
+					l_ws.set_overflow_cell
 				end
 				if l_wrap_strategy.is_case_insensitive_equal ("LEGACY_WRAP") then
-					Result.wrap_strategy.set_legacy_wrap
+					l_ws.set_legacy_wrap
 				elseif l_wrap_strategy.is_case_insensitive_equal ("CLIP") then
-					Result.wrap_strategy.set_clip
+					l_ws.set_clip
 				elseif l_wrap_strategy.is_case_insensitive_equal ("WRAP") then
-					Result.wrap_strategy.set_wrap
+					l_ws.set_wrap
 				end
+				Result.set_wrap_strategy (l_ws)
 			end
 			if attached {JSON_OBJECT} json_value (a_json, "textFormat") as l_text_format then
 				Result.set_text_format (text_format (l_text_format))
diff --git a/sheets/src/objects/eg_cell_format.e b/sheets/src/objects/eg_cell_format.e
@@ -38,55 +38,37 @@ note
 class
 	EG_CELL_FORMAT
 
-inherit
-
-	ANY
-		redefine
-			default_create
-		end
-
-feature {NONE} -- Initialization
-
-	default_create
-		do
-			create background_color
-			create background_color_style
-			create padding
-			create vertical_alignment
-			create text_format
-			create wrap_strategy
-		end
 
 feature -- Access
 
 	number_format: detachable EG_NUMBER_FORMAT
 			-- A format describing how number values should be represented to the user.
 
-	background_color: EG_COLOR
+	background_color: detachable EG_COLOR
 			-- The background color of the cell.
 
-	background_color_style: EG_COLOR_STYLE
+	background_color_style: detachable EG_COLOR_STYLE
 			-- The background color of the cell. If backgroundColor is also set, this field takes precedence.
 
 	borders: detachable EG_BORDERS
 			-- The borders of the cell.
 
-	padding: EG_PADDING
+	padding: detachable EG_PADDING
 			-- The padding of the cell.
 
 	horizontal_alignment: detachable EG_HORIZONTAL_ALIGN
 			-- The horizontal alignment of the value in the cell.
 
-	vertical_alignment: EG_VERTICAL_ALIGN
+	vertical_alignment: detachable EG_VERTICAL_ALIGN
 			-- The vertical alignment of the value in the cell. 						
 
-	wrap_strategy: EG_WRAP_STRATEGY
+	wrap_strategy: detachable EG_WRAP_STRATEGY
 			-- The wrap strategy for the value in the cell.
 
 	text_direction: detachable EG_TEXT_DIRECTION
 			-- The direction of the text in the cell.
 
-	text_format: EG_TEXT_FORMAT
+	text_format: detachable EG_TEXT_FORMAT
 			-- The format of the text in the cell (unless overridden by a format run).
 
 	hyperlink_display_type: detachable EG_HYPERLINK_DISPLAY_TYPE
@@ -97,64 +79,100 @@ feature -- Access
 
 feature -- Change Element
 
-	set_number_format (a_format: EG_NUMBER_FORMAT)
+	set_number_format (a_format: like number_format)
+			-- Set `number_format` with `a_format`
 		do
 			number_format := a_format
+		ensure
+			number_format_set: number_format = a_format
 		end
 
-	set_background_color (a_bg_color: EG_COLOR)
+	set_background_color (a_bg_color: like background_color)
+			-- Set `background_color` with `a_bg_color`
 		do
 			background_color := a_bg_color
+		ensure
+			background_color_set: background_color = a_bg_color
 		end
 
-	set_background_color_style (a_bg_color_style: EG_COLOR_STYLE)
+	set_background_color_style (a_bg_color_style: like background_color_style)
+			-- Set `background_color_style` with `a_bg_colot_style`.
 		do
 			background_color_style := a_bg_color_style
+		ensure
+			background_color_style_set: background_color_style = a_bg_color_style
 		end
 
-	set_borders (a_borders: EG_BORDERS)
+	set_borders (a_borders: like borders)
+			-- Set `borders` with `a_borders`.
 		do
 			borders := a_borders
+		ensure
+			borders_set: borders = a_borders
 		end
 
-	set_padding (a_padding: EG_PADDING)
-		do
+	set_padding (a_padding: like padding)
+			-- Set `padding` with `a_padding`.
+ 		do
 			padding := a_padding
+		ensure
+			padding_set: padding = a_padding
 		end
 
-	set_horizontal_alignment (ha: EG_HORIZONTAL_ALIGN)
+	set_horizontal_alignment (ha: like horizontal_alignment)
+			-- Set `horizontal_aligment` with `ha`.
 		do
 			horizontal_alignment := ha
+		ensure
+			horizontal_alignment_set: horizontal_alignment = ha
 		end
 
-	set_vertical_alignment (a_val: EG_VERTICAL_ALIGN)
+	set_vertical_alignment (a_val: like vertical_alignment)
+			-- Set `vertical_aligment` with `a_val`.
 		do
 			vertical_alignment := a_val
+		ensure
+			vertical_alignment_set: vertical_alignment = a_val
 		end
 
-	set_wrap_strategy (a_val: EG_WRAP_STRATEGY)
+	set_wrap_strategy (a_val: like wrap_strategy)
+			-- Set `wrap_strategy` with `a_val`.
 		do
 			wrap_strategy := a_val
+		ensure
+			wrap_strategy_set: wrap_strategy = a_val
 		end
 
-	set_text_direction (a_val: EG_TEXT_DIRECTION)
+	set_text_direction (a_val: like text_direction)
+			-- Set `text_direction` with `a_val`
 		do
 			text_direction := a_val
+		ensure
+			text_direction_set: text_direction = a_val
 		end
 
-	set_text_format (a_val: EG_TEXT_FORMAT)
+	set_text_format (a_val: like text_format)
+			-- Set `text_format` with `a_val`.
 		do
 			text_format := a_val
+		ensure
+			text_format_set: text_format = a_val
 		end
 
-	set_hyperlink_display_type (a_val: EG_HYPERLINK_DISPLAY_TYPE)
+	set_hyperlink_display_type (a_val: like hyperlink_display_type)
+			-- Set `hyperlink_display_type` with `a_val`
 		do
 			hyperlink_display_type := a_val
+		ensure
+			hyperlink_display_type_set: hyperlink_display_type = a_val
 		end
 
-	set_text_rotation (a_val: EG_TEXT_ROTATION)
+	set_text_rotation (a_val: like text_rotation)
+			-- Set `text_rotation` with `a_val`
 		do
 			text_rotation := a_val
+		ensure
+			text_rotation_set: text_rotation = a_val
 		end
 
 feature -- Eiffel to JSON
@@ -191,12 +209,21 @@ feature -- Eiffel to JSON
 
 		do
 			create Result.make_empty
-				-- TODO
 			if attached number_format as l_number_format then
 				Result.put (l_number_format.to_json, "numberFormat")
 			end
-			Result.put (background_color.to_json, "backgroundColor")
-			Result.put (background_color_style.to_json, "backgroundColorStyle")
+			if attached background_color as l_bg then
+				Result.put (l_bg.to_json, "backgroundColor")
+			end
+			if attached background_color_style as l_bgs then
+				Result.put (l_bgs.to_json, "backgroundColorStyle")
+			end
+			if attached borders as lb then
+				Result.put (lb.to_json, "borders")
+			end
+			if attached padding as l_padding then
+				Result.put (l_padding.to_json, "padding")
+			end
 
 		end
 end
diff --git a/sheets/src/objects/eg_padding.e b/sheets/src/objects/eg_padding.e
@@ -12,6 +12,7 @@ note
 	]"
 	date: "$Date$"
 	revision: "$Revision$"
+	EIS: "name=Padding", "src=https://developers.google.com/sheets/api/reference/rest/v4/spreadsheets/cells#padding", "protocol=uri"
 
 class
 	EG_PADDING
@@ -34,23 +35,46 @@ feature -- Access
 feature -- Change Element
 
 	set_top (a_top: like top)
+			-- Set `top` with `a_top`.
 		do
 			top := a_top
+		ensure
+			top_set: top = a_top
 		end
 
 	set_right (a_right: like right)
+			-- Set `right` with `a_right`.
 		do
 			right := a_right
+		ensure
+			right_set: right = a_right
 		end
 
 	set_bottom (a_bottom: like bottom)
+			-- Set `bottom` with `a_bottom`.
 		do
 			bottom := a_bottom
+		ensure
+			bottom_set: bottom = a_bottom
 		end
 
 	set_left (a_left: like left)
+			-- Set `left`  with `a_left`.
 		do
 			left := a_left
+		ensure
+			left_set: left = a_left
 		end
 
+feature -- Eiffel to JSON
+
+	to_json: JSON_OBJECT
+			-- Json representation of current.
+		do
+			create Result.make_empty
+			Result.put (create {JSON_NUMBER}.make_integer (top), "top")
+			Result.put (create {JSON_NUMBER}.make_integer (right), "right")
+			Result.put (create {JSON_NUMBER}.make_integer (bottom), "bottom")
+			Result.put (create {JSON_NUMBER}.make_integer (left), "left")
+		end
 end
