cura 0.0.1 → 0.0.2

data/lib/cura/component/base.rb

@@ -10,13 +10,11 @@ end
 
 module Cura
   module Component
-    
     # The base class for all components.
     #
     # All components use a box model similar to CSS.
     # Margins, borders, paddings, then content.
     class Base
-      
       include Attributes::HasInitialize
       include Attributes::HasAttributes
       include Attributes::HasDimensions
@@ -25,7 +23,7 @@ module Cura
       include Attributes::HasColors
       include Attributes::HasOffsets
       include Attributes::HasRelativeCoordinates
-      
+
       # Get the cursor for this application.
       # TODO: Delegate something like: def_delegate(:cursor) { application }
       #
@@ -33,7 +31,7 @@ module Cura
       def cursor
         application.cursor
       end
-      
+
       # Get the pencil for this application.
       # TODO: Delegate
       #
@@ -41,30 +39,30 @@ module Cura
       def pencil
         application.pencil
       end
-      
+
       # Get the application of this object.
       #
       # @return [Application]
       def application
         return nil if parent.nil?
-        
+
         parent.application
       end
-      
+
       # Focus on this component.
       #
       # @return [Component]
       def focus
         application.dispatcher.target = self
       end
-      
+
       # Check whether this component is focused.
       #
       # @return [Boolean]
       def focused?
         application.dispatcher.target == self
       end
-      
+
       # Determine if the given absolute coordinates are within the bounds of this component.
       #
       # @param [#to_h] options
@@ -73,83 +71,83 @@ module Cura
       # @return [Boolean]
       def contains_coordinates?(options={})
         options = options.to_h
-        
+
         (absolute_x..absolute_x + width).include?(options[:x].to_i) && (absolute_y..absolute_y + width).include?(options[:y].to_i)
       end
-      
+
       # Get the foreground color of this object.
       #
       # @return [Color]
       def foreground
         get_or_inherit_color(:foreground, Color.black)
       end
-      
+
       # Get the background color of this object.
       #
       # @return [Color]
       def background
         get_or_inherit_color(:background, Color.white)
       end
-      
+
       # Instance inspection.
       #
       # @return [String]
       def inspect
         "#<#{self.class}:0x#{__id__.to_s(16)} x=#{x} y=#{y} absolute_x=#{absolute_x} absolute_y=#{absolute_y} w=#{width} h=#{height} parent=#{@parent.class}:0x#{@parent.__id__.to_s(16)}>"
       end
-      
+
       # Update this component.
       #
       # @return [Component]
       def update
         self
       end
-      
+
       # Draw this component.
       #
       # @return [Component]
       def draw
         draw_background
         draw_border
-        
+
         self
       end
-      
+
       protected
-      
+
       # Draw a point.
       def draw_point(x, y, color=Cura::Color.black)
         x = absolute_x + @offsets.left + x
         y = absolute_y + @offsets.top + y
-        
+
         pencil.draw_point(x, y, color)
       end
-      
+
       # Draw a rectangle.
       # TODO: filled argument
       def draw_rectangle(x, y, width, height, color=Cura::Color.black)
         x = absolute_x + @offsets.left + x
         y = absolute_y + @offsets.top + y
-        
+
         pencil.draw_rectangle(x, y, width, height, color)
       end
-      
+
       # Draw a single character.
       def draw_character(x, y, character, foreground=Cura::Color.black, background=Cura::Color.white, bold=false, underline=false)
         x = absolute_x + @offsets.left + x
         y = absolute_y + @offsets.top + y
-        
+
         pencil.draw_character(x, y, character, foreground, background, bold, underline)
       end
-      
+
       # Draw text.
       def draw_text(x, y, text, foreground=Cura::Color.black, background=Cura::Color.white, bold=false, underline=false)
         x = absolute_x + @offsets.left + x
         y = absolute_y + @offsets.top + y
-        
+
         pencil.draw_text(x, y, text, foreground, background, bold, underline)
       end
-      
+
       # Draw the background of this component.
       def draw_background
         x      = absolute_x + @margin.left + @border.left
@@ -157,24 +155,22 @@ module Cura
         width  = self.width + @padding.width
         height = self.height + @padding.height
         color  = background
-        
+
         pencil.draw_rectangle(x, y, width, height, color)
       end
-      
+
       # Draw the border of this component.
       def draw_border # TODO
       end
-      
+
       def get_or_inherit_color(name, default)
         value = instance_variable_get("@#{name}")
-        
+
         return value unless value == :inherit
         return default unless respond_to?(:parent) && parent.respond_to?(name)
-        
+
         parent.send(name)
       end
-      
     end
-    
   end
 end

data/lib/cura/component/button.rb

@@ -1,57 +1,51 @@
-if Kernel.respond_to?(:require)
-  require "cura/component/label"
-end
+require "cura/component/label" if Kernel.respond_to?(:require)
 
 module Cura
   module Component
-    
     # A button component.
     class Button < Label
-      
       on_event(:key_down) do |event|
         click if event.target == self && event.name == :enter
       end
-      
+
       on_event(:mouse_button) do |event|
         click if event.target == self && event.up? && contains_coordinates?(x: event.x, y: event.y)
       end
-      
+
       # @method focused_background
       # Get the focused background color of this object.
       #
       # @return [Color]
-      
+
       # @method focused_background=(value)
       # Set the focused background color of this object.
       #
       # @param [Color] value
       # @return [Color]
-      
+
       attribute(:focused_background) { |value| validate_color_attribute(value) }
-      
+
       def initialize(attributes={})
         @focusable = true
         @foreground = Cura::Color.black
         @background = Cura::Color.white
         @focused_background = Color.new(78, 78, 78)
-        
+
         super
       end
-      
+
       def background
         focused? ? @focused_background : get_or_inherit_color(:background, Color.black)
       end
-      
+
       # Click this button.
       #
       # @return [Button]
       def click
         application.dispatch_event(:click, target: self)
-        
+
         self
       end
-      
     end
-    
   end
 end

data/lib/cura/component/group.rb

@@ -5,73 +5,69 @@ end
 
 module Cura
   module Component
-    
     # A component with children.
     # When children are added, their parent will be set to this group.
     class Group < Base
-      
       include Attributes::HasChildren
-      
+
       # Get the width of this group.
       #
       # @return [Integer]
       def width
         return @width unless @width == :auto
         return 0 if children.empty?
-        
+
         children.collect { |child| child.x + child.width + child.offsets.width }.max
       end
-      
+
       # Get the height of this group.
       #
       # @return [Integer]
       def height
         return @height unless @height == :auto
         return 0 if children.empty?
-        
+
         children.collect { |child| child.y + child.height + child.offsets.height }.max
       end
-      
+
       # Add a child to this group and set it's parent to this Group.
       #
       # @param [Component] component
       # @return [Component]
       def add_child(component)
         component = super
-        
+
         component.parent = self
-        
+
         component
       end
-      
+
       # Remove a child from this object's children at the given index and set it's parent to nil.
       #
       # @param [Integer] index
       # @return [Component]
       def delete_child_at(index)
         component = super
-        
+
         component.parent = nil
-        
+
         component
       end
-      
+
       # Update all children.
       def update
         super
-        
+
         update_children
       end
-      
+
       # Draw all children relative to this location.
       # TODO: If the dimensions of this group of this group are less than the computed dimensions, the drawing will be clipped.
       def draw
         super
-        
+
         draw_children
       end
-      
     end
-    
   end
 end

data/lib/cura/component/label.rb

@@ -5,12 +5,10 @@ end
 
 module Cura
   module Component
-    
     # A component displaying text.
     class Label < Base
-      
       include Attributes::HasAttributes
-      
+
       # Note that you can pass the following:
       #   alignment: { horizontal: true, vertical: true }
       # instead of:
@@ -21,94 +19,94 @@ module Cura
         @bold = false
         @underline = false
         @text = ""
-        
+
         super
       end
-      
+
       # TODO: #text_foreground, #text_background (? Maybe a separate Text component, like in )
-      
+
       # Get the width of this label.
       #
       # @return [Integer]
       def width
         return text_width if @width == :auto
-        
+
         @width
       end
-      
+
       # Get the height of this label.
       #
       # @return [Integer]
       def height
         return text_height if @height == :auto
-        
+
         @height
       end
-      
+
       # @method text
       # Get the text of this label.
       #
       # @return [String]
-      
+
       # @method text=(value)
       # Set the text of this label.
       #
       # @param [#to_s] value
       # @return [String]
       attribute(:text) { |value| value.to_s }
-      
+
       # Get the lines of this label.
       #
       # @return [<String>]
       def lines
         @text.split("\n") # NOTE: Would use String#lines but it's output doesn't think a trailing newline character constitutes a line unless it is followed by another character. #split also removes the newline characters.
       end
-      
+
       # Get the width of the text of this label.
       #
       # @return [Integer]
       def text_width
         return 0 if @text.empty?
-        
+
         lines.collect(&:length).sort.last
       end
-      
+
       # Get the height of the text of this label.
       #
       # @return [Integer]
       def text_height
         value = lines.length
-        
+
         value == 0 ? 1 : value
       end
-      
+
       # @method bold?
       # Get whether the text is bold.
       #
       # @return [Boolean]
-      
+
       # @method bold=(value)
       # Set whether the text is bold.
       #
       # @return [Boolean]
       attribute(:bold, query: true)
-      
+
       # @method underline?
       # Get whether the text is underlined.
       #
       # @return [Boolean]
-      
+
       # @method underlined=(value)
       # Set whether the text is underlined.
       #
       # @return [Boolean]
       attribute(:underline, query: true)
-      
+
       # @method horizontal_alignment
       # Get the horizontal alignment of this label.
       #
       # @return [Symbol]
-      
+
       # @method horizontal_alignment=(value)
       # Set the horizontal alignment of this label.
       # Must be :left, :center, or :right.
@@ -116,13 +114,13 @@ module Cura
       # @param [#to_sym] value
       # @return [Symbol]
       attribute(:horizontal_alignment) { |value| convert_horizontal_alignment_attribute(value) }
-      
+
       # @method vertical_alignment
       # Get the vertical alignment of this label.
       # Will be :left, :center, or :right.
       #
       # @return [Symbol]
-      
+
       # @method vertical_alignment=(value)
       # Set the vertical alignment of this label.
       # Must be :left, :center, or :right.
@@ -130,48 +128,48 @@ module Cura
       # @param [#to_sym] value
       # @return [Symbol]
       attribute(:vertical_alignment) { |value| convert_vertical_alignment_attribute(value) }
-      
+
       def draw
         super
-        
+
         draw_text unless text.empty?
       end
-      
+
       protected
-      
+
       # Helper method for subclasses
       def text_to_draw
         @text
       end
-      
+
       # Helper method for subclasses
       def character_to_draw(character)
         character
       end
-      
+
       # TODO: Should use instance vars
       def draw_text
-        x_offset = x_offset_start = x_offset_from_alignment# + @offsets.left
-        y_offset = y_offset_from_alignment# + @offsets.top
+        x_offset = x_offset_start = x_offset_from_alignment # + @offsets.left
+        y_offset = y_offset_from_alignment # + @offsets.top
         absolute_x = self.absolute_x
         absolute_y = self.absolute_y
-        
+
         text_to_draw.each_char do |character|
           if character == "\n" # TODO: If multiline? Also check if outside the bounds of the drawing area
             x_offset = x_offset_start
-            
+
             y_offset += 1
           else
             unless x_offset > width || y_offset > height
               character = character_to_draw(character)
               draw_character(x_offset, y_offset, character, foreground, background, @bold, @underline)
             end
-            
+
             x_offset += 1
           end
         end
       end
-      
+
       def x_offset_from_alignment
         case horizontal_alignment
           when :left   then 0
@@ -179,7 +177,7 @@ module Cura
           when :right  then (text_width - width).abs
         end
       end
-      
+
       def y_offset_from_alignment
         case vertical_alignment
           when :top    then 0
@@ -187,38 +185,36 @@ module Cura
           when :bottom then (text_height - height).abs
         end
       end
-      
+
       protected
-      
+
       # TODO: Just use a #alignment attribute and have a Cura::Alignment object?
       def convert_attributes(attributes={})
         attributes = super
-        
+
         if attributes.key?(:alignment)
           alignment_attributes = attributes.delete(:alignment).to_h
-          
+
           attributes[:horizontal_alignment] = alignment_attributes[:horizontal] if alignment_attributes.key?(:horizontal)
           attributes[:vertical_alignment] = alignment_attributes[:vertical] if alignment_attributes.key?(:vertical)
         end
-        
+
         attributes
       end
-      
+
       def convert_horizontal_alignment_attribute(value)
         value = value.to_sym
         raise ArgumentError, "must be :left, :center, or :right" unless [:left, :center, :right].include?(value)
-        
+
         value
       end
-      
+
       def convert_vertical_alignment_attribute(value)
         value = value.to_sym
         raise ArgumentError, "must be :top, :center, or :bottom" unless [:top, :center, :bottom].include?(value)
-        
+
         value
       end
-      
     end
-    
   end
 end