lib/vedeu/geometries/geometry.rb in vedeu-0.7.4 vs lib/vedeu/geometries/geometry.rb in vedeu-0.8.0
- old
+ new
@@ -106,17 +106,17 @@
# @return [Hash<Symbol => Boolean|Fixnum|String|Symbol|
# Vedeu::Geometries::Repository]
def attributes
{
- client: @client,
+ client: client,
height: height,
- horizontal_alignment: @horizontal_alignment,
- maximised: @maximised,
- name: @name,
- repository: @repository,
- vertical_alignment: @vertical_alignment,
+ horizontal_alignment: horizontal_alignment,
+ maximised: maximised,
+ name: name,
+ repository: repository,
+ vertical_alignment: vertical_alignment,
width: width,
x: x,
xn: xn,
y: y,
yn: yn,
@@ -187,19 +187,19 @@
private
# @return [Vedeu::Geometries::Area]
def area
- @area = Vedeu::Geometries::Area.from_attributes(area_attributes)
+ Vedeu::Geometries::Area.from_attributes(area_attributes)
end
# @return [Hash<Symbol => Boolean|Fixnum>]
def area_attributes
{
- horizontal_alignment: @horizontal_alignment,
- maximised: @maximised,
+ horizontal_alignment: horizontal_alignment,
+ maximised: maximised,
name: name,
- vertical_alignment: @vertical_alignment,
+ vertical_alignment: vertical_alignment,
x: @x.is_a?(Proc) ? @x.call : @x,
xn: @xn.is_a?(Proc) ? @xn.call : @xn,
x_xn: @width.is_a?(Proc) ? @width.call : @width,
y: @y.is_a?(Proc) ? @y.call : @y,
yn: @yn.is_a?(Proc) ? @yn.call : @yn,