sugarcube 0.11.3 → 0.12

data/lib/sugarcube/adjust.rb

@@ -1,3 +1,7 @@
+$sugarcube_view = nil
+$sugarcube_items = nil
+$sugarcube_restore = nil
+
 module SugarCube
   module Adjust
     module_function
@@ -14,17 +18,18 @@ module SugarCube
 
     def adjust(view=nil, format=nil)
       SugarCube::Adjust::repl_format(format.to_sym) if format
-      @@sugarcube_view ||= nil  #  this looks like a NOOP, but ||= also checks whether the variable exists.  aka: errors happen if we don't do this.
-      return @@sugarcube_view if not view
+      return $sugarcube_view if not view
 
       if view.is_a? Fixnum
-        @@sugarcube_items ||= SugarCube::Adjust::build_tree(UIApplication.sharedApplication.keyWindow, :subviews)
-        view = @@sugarcube_items[view]
+        $sugarcube_items ||= SugarCube::Adjust::build_tree(UIApplication.sharedApplication.keyWindow, :subviews)
+        view = $sugarcube_items[view]
       end
 
+      # a/adjust will return this object
+      $sugarcube_view = view
+
       if view.is_a?(UIView)
-        @@sugarcube_view = view
-        @@sugarcube_restore = {
+        $sugarcube_restore = {
           frame: SugarCube::Adjust.frame,
           shadow: SugarCube::Adjust.shadow,
         }
@@ -40,15 +45,14 @@ module SugarCube
 
     ##|  FRAME
     def frame f=nil
-      @@sugarcube_view ||= nil
-      raise "no view has been assigned to SugarCube::Adjust::adjust" unless @@sugarcube_view
+      raise "no view has been assigned to SugarCube::Adjust::adjust" unless $sugarcube_view
 
-      return SugarCube::CoreGraphics::Rect(@@sugarcube_view.frame) if not f
+      return SugarCube::CoreGraphics::Rect($sugarcube_view.frame) if not f
 
-      @@sugarcube_view.frame = f
+      $sugarcube_view.frame = f
       puts format_frame(f)
 
-      @@sugarcube_view
+      $sugarcube_view
     end
     alias f frame
 
@@ -59,15 +63,14 @@ module SugarCube
     alias l left
 
     def right val=1
-      @@sugarcube_view ||= nil
-      raise "no view has been assigned to SugarCube::Adjust::adjust" unless @@sugarcube_view
+      raise "no view has been assigned to SugarCube::Adjust::adjust" unless $sugarcube_view
 
-      f = @@sugarcube_view.frame
+      f = $sugarcube_view.frame
       f.origin.x += val
-      @@sugarcube_view.frame = f
+      $sugarcube_view.frame = f
       puts format_frame(f)
 
-      @@sugarcube_view
+      $sugarcube_view
     end
     alias r right
 
@@ -77,23 +80,21 @@ module SugarCube
     alias u up
 
     def down val=1
-      @@sugarcube_view ||= nil
-      raise "no view has been assigned to SugarCube::Adjust::adjust" unless @@sugarcube_view
+      raise "no view has been assigned to SugarCube::Adjust::adjust" unless $sugarcube_view
 
-      f = @@sugarcube_view.frame
+      f = $sugarcube_view.frame
       f.origin.y += val
-      @@sugarcube_view.frame = f
+      $sugarcube_view.frame = f
       puts format_frame(f)
 
-      @@sugarcube_view
+      $sugarcube_view
     end
     alias d down
 
     def origin x=nil, y=nil
-      @@sugarcube_view ||= nil
-      raise "no view has been assigned to SugarCube::Adjust::adjust" unless @@sugarcube_view
+      raise "no view has been assigned to SugarCube::Adjust::adjust" unless $sugarcube_view
 
-      f = @@sugarcube_view.frame
+      f = $sugarcube_view.frame
       return SugarCube::CoreGraphics::Point(f.origin) if not x
 
       if y
@@ -102,10 +103,10 @@ module SugarCube
       else
         f.origin = x
       end
-      @@sugarcube_view.frame = f
+      $sugarcube_view.frame = f
       puts format_frame(f)
 
-      @@sugarcube_view
+      $sugarcube_view
     end
     alias o origin
 
@@ -116,15 +117,14 @@ module SugarCube
     alias n thinner
 
     def wider val=1
-      @@sugarcube_view ||= nil
-      raise "no view has been assigned to SugarCube::Adjust::adjust" unless @@sugarcube_view
+      raise "no view has been assigned to SugarCube::Adjust::adjust" unless $sugarcube_view
 
-      f = @@sugarcube_view.frame
+      f = $sugarcube_view.frame
       f.size.width += val
-      @@sugarcube_view.frame = f
+      $sugarcube_view.frame = f
       puts format_frame(f)
 
-      @@sugarcube_view
+      $sugarcube_view
     end
     alias w wider
 
@@ -134,23 +134,21 @@ module SugarCube
     alias s shorter
 
     def taller val=1
-      @@sugarcube_view ||= nil
-      raise "no view has been assigned to SugarCube::Adjust::adjust" unless @@sugarcube_view
+      raise "no view has been assigned to SugarCube::Adjust::adjust" unless $sugarcube_view
 
-      f = @@sugarcube_view.frame
+      f = $sugarcube_view.frame
       f.size.height += val
-      @@sugarcube_view.frame = f
+      $sugarcube_view.frame = f
       puts format_frame(f)
 
-      @@sugarcube_view
+      $sugarcube_view
     end
     alias t taller
 
     def size w=nil, h=nil
-      @@sugarcube_view ||= nil
-      raise "no view has been assigned to SugarCube::Adjust::adjust" unless @@sugarcube_view
+      raise "no view has been assigned to SugarCube::Adjust::adjust" unless $sugarcube_view
 
-      f = @@sugarcube_view.frame
+      f = $sugarcube_view.frame
       return SugarCube::CoreGraphics::Size(f.size) if not w
 
       if h
@@ -159,16 +157,15 @@ module SugarCube
       else
         f.size = w
       end
-      @@sugarcube_view.frame = f
+      $sugarcube_view.frame = f
       puts format_frame(f)
 
-      @@sugarcube_view
+      $sugarcube_view
     end
     alias z size
 
     def center(*args)
-      @@sugarcube_view ||= nil
-      raise "no view has been assigned to SugarCube::Adjust::adjust" unless @@sugarcube_view
+      raise "no view has been assigned to SugarCube::Adjust::adjust" unless $sugarcube_view
 
       element = nil
       total = nil
@@ -192,7 +189,7 @@ module SugarCube
       element = 1 unless element
       total = 1 unless total
 
-      view = @@sugarcube_view
+      view = $sugarcube_view
 
       left = view.origin.x
       top = view.origin.y
@@ -214,8 +211,7 @@ module SugarCube
 
     ##|  SHADOW
     def shadow shadow=nil
-      @@sugarcube_view ||= nil
-      raise "no view has been assigned to SugarCube::Adjust::adjust" unless @@sugarcube_view
+      raise "no view has been assigned to SugarCube::Adjust::adjust" unless $sugarcube_view
 
       if shadow
         {
@@ -229,19 +225,19 @@ module SugarCube
             if key == :color and [Symbol, Fixnum, NSString, UIImage, UIColor].any?{|klass| value.is_a? klass}
               value = value.uicolor.CGColor
             end
-            @@sugarcube_view.layer.send(msg, value)
-            @@sugarcube_view.layer.masksToBounds = false
-            @@sugarcube_view.layer.shouldRasterize = true
+            $sugarcube_view.layer.send(msg, value)
+            $sugarcube_view.layer.masksToBounds = false
+            $sugarcube_view.layer.shouldRasterize = true
           end
         }
-        @@sugarcube_view
+        $sugarcube_view
       else
         {
-          opacity: @@sugarcube_view.layer.shadowOpacity,
-          radius: @@sugarcube_view.layer.shadowRadius,
-          offset: @@sugarcube_view.layer.shadowOffset,
-          color: @@sugarcube_view.layer.shadowColor,
-          path: @@sugarcube_view.layer.shadowPath,
+          opacity: $sugarcube_view.layer.shadowOpacity,
+          radius: $sugarcube_view.layer.shadowRadius,
+          offset: $sugarcube_view.layer.shadowOffset,
+          color: $sugarcube_view.layer.shadowColor,
+          path: $sugarcube_view.layer.shadowPath,
         }
       end
     end
@@ -276,16 +272,18 @@ module SugarCube
                       end
                       ret
                     }
+        elsif item.is_a? CALayer
+          selector = :sublayers
         else
           raise "Unable to determine a SugarCube::Adjust::tree selector for #{item.class.name}"
         end
       end
 
-      @@sugarcube_items = SugarCube::Adjust::build_tree(item, selector)
+      $sugarcube_items = SugarCube::Adjust::build_tree(item, selector)
       if self.respond_to? :draw_tree
-        total = draw_tree(item, selector)
+        draw_tree(item, selector)
       else
-        total = SugarCube::Adjust::draw_tree(item, selector)
+        SugarCube::Adjust::draw_tree(item, selector)
       end
       puts ''
 
@@ -317,7 +315,7 @@ module SugarCube
         tab = ''
       end
 
-      if self == item
+      if self == item || $sugarcube_view == item
         print "\033[1m"
       end
       if item.is_a? UIView
@@ -325,7 +323,7 @@ module SugarCube
       else
         puts item.to_s
       end
-      if self == item
+      if self == item || $sugarcube_view == item
         print "\033[0m"
       end
 
@@ -334,9 +332,15 @@ module SugarCube
       else
         items = item.send(selector)
       end
+      items ||= []
+
       items.each_with_index { |subview, index|
         items_index += 1
-        items_index = SugarCube::Adjust::draw_tree(subview, selector, tab, index == items.length - 1, items_index)
+        if self.respond_to? :draw_tree
+          items_index = draw_tree(subview, selector, tab, index == items.length - 1, items_index)
+        else
+          items_index = SugarCube::Adjust::draw_tree(subview, selector, tab, index == items.length - 1, items_index)
+        end
       }
 
       return items_index
@@ -348,6 +352,8 @@ module SugarCube
       else
         items = item.send(selector)
       end
+      items ||= []
+
       ret = [item]
       items.each_with_index { |subview, index|
         ret.concat SugarCube::Adjust::build_tree(subview, selector)
@@ -361,10 +367,9 @@ module SugarCube
 
     ##|  RESTORE
     def restore
-      @@sugarcube_view ||= nil
-      raise 'no view has been assigned to SugarCube::Adjust::adjust' unless @@sugarcube_view
+      raise 'no view has been assigned to SugarCube::Adjust::adjust' unless $sugarcube_view
 
-      @@sugarcube_restore.each do |msg, value|
+      $sugarcube_restore.each do |msg, value|
         SugarCube::Adjust.send(msg, value)
       end
     end

data/lib/sugarcube/calayer.rb

@@ -0,0 +1,8 @@
+class CALayer
+
+  def << (layer)
+    self.addSublayer layer
+    return self
+  end
+
+end

data/lib/sugarcube/core_graphics.rb

@@ -1,426 +1,49 @@
-module SugarCube
-  # Extensions to make CGRect a "real class"
-  module CGRectExtensions
-    module ClassMethods
-      def empty
-        SugarCube::CoreGraphics::Rect(CGRectZero)
-      end
-
-      def null
-        SugarCube::CoreGraphics::Rect(CGRectNull)
-      end
-
-      def infinite
-        SugarCube::CoreGraphics::Rect([0, 0], CGSize.infinite)
-      end
-
-      def from_hash(hash)
-        ret = Pointer.new(CGRect.type)
-        if CGRectMakeWithDictionaryRepresentation(hash, ret)
-          ret[0]
-        else
-          nil
-        end
-      end
-
-      def from_s(s)
-        CGRectFromString(s)
-      end
-    end
-
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
-
-    def empty?
-      CGRectIsEmpty(self)
-    end
-
-    def infinite?
-      self.size.infinite?
-    end
-
-    def null?
-      CGRectIsNull(self)
-    end
-
-    def left
-      return CGRectGetMinX(self)
-    end
-
-    def right
-      return CGRectGetMaxX(self)
-    end
-
-    def width
-      return CGRectGetWidth(self)
-    end
-
-    def top
-      return CGRectGetMinY(self)
-    end
-
-    def bottom
-      return CGRectGetMaxY(self)
-    end
-
-    def height
-      return CGRectGetHeight(self)
-    end
-
-    def center
-      return SugarCube::CoreGraphics::Point(CGRectGetMidX(self), CGRectGetMidY(self))
-    end
-
-    def to_s
-      NSStringFromCGRect(self)
-    end
-
-    def inspect
-      "#{self.class.name}([#{self.origin.x}, #{self.origin.y}],{#{self.size.width} × #{self.size.height}})"
-    end
-
-    def to_hash
-      CGRectCreateDictionaryRepresentation(self)
-    end
-
-    # # returns an intersection of self and rect, or moves the Rect using Point,
-    # or increases the size using Size
-    def +(rect)
-      case rect
-      when SugarCube::CoreGraphics::Rect, CGRect
-        SugarCube::CoreGraphics::Rect(CGRectUnion(self, rect))
-      when SugarCube::CoreGraphics::Point, CGPoint
-        SugarCube::CoreGraphics::Rect(CGRectOffset(self, rect.x, rect.y))
-      when SugarCube::CoreGraphics::Offset, UIOffset
-        SugarCube::CoreGraphics::Rect(CGRectOffset(self, rect.horizontal, rect.vertical))
-      when SugarCube::CoreGraphics::Size, CGSize
-        SugarCube::CoreGraphics::Rect(CGRectInset(self, - rect.width, - rect.height))
-      when SugarCube::CoreGraphics::EdgeInsets, UIEdgeInsets
-        SugarCube::CoreGraphics::Rect(UIEdgeInsetsInsetRect(self, rect))
-      else
-        super
-      end
-    end
-
-    def intersection(rect)
-      SugarCube::CoreGraphics::Rect(CGRectIntersection(self, rect))
-    end
-
-    def intersects?(rect_or_point)
-      case rect_or_point
-      when SugarCube::CoreGraphics::Point, CGPoint
-        CGRectContainsPoint(self, rect_or_point)
-      when Array, CGRect
-        CGRectIntersectsRect(self, rect_or_point)
-      else
-        super
-      end
-    end
-
-    def contains?(rect_or_point)
-      case rect_or_point
-      when SugarCube::CoreGraphics::Point, CGPoint
-        CGRectContainsPoint(self, rect_or_point)
-      when Array, CGRect
-        CGRectContainsRect(self, rect_or_point)
-      else
-        super
-      end
-    end
-
-    def ==(rect)
-      CGRectEqualToRect(self, rect)
-    end
-
-  end
-
-  # Extensions to make CGPoint a "real class"
-  module CGPointExtensions
-    module ClassMethods
-      def from_hash(hash)
-        ret = Pointer.new(CGPoint.type)
-        if CGPointMakeWithDictionaryRepresentation(hash, ret)
-          ret[0]
-        else
-          nil
-        end
-      end
-
-      def from_s(s)
-        CGPointFromString(s)
-      end
-    end
-
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
-
-    def intersects?(rect)
-      CGRectContainsPoint(rect, self)
-    end
-
-    def ==(point)
-      CGPointEqualToPoint(self, point)
-    end
-
-    def to_s
-      NSStringFromCGPoint(self)
-    end
-
-    def inspect
-      "#{self.class.name}(#{self.x}, #{self.y})"
-    end
-
-    def to_hash
-      CGPointCreateDictionaryRepresentation(self)
-    end
-
-  end
-
-  # Extensions to make CGSize a "real class"
-  module CGSizeExtensions
-    module ClassMethods
-      def infinite
-        infinity = CGRect.null[0][0]
-        SugarCube::CoreGraphics::Size(infinity, infinity)
-      end
-
-      def from_hash(hash)
-        ret = Pointer.new(CGSize.type)
-        if CGSizeMakeWithDictionaryRepresentation(hash, ret)
-          ret[0]
-        else
-          nil
-        end
-      end
-
-      def from_s(s)
-        CGSizeFromString(s)
-      end
-    end
-
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
-
-    def infinite?
-      infinity = CGRect.null[0][0]
-      self.width == infinity or self.height == infinity
-    end
-
-    def ==(size)
-      CGSizeEqualToSize(self, size)
-    end
-
-    def to_s
-      NSStringFromCGSize(self)
-    end
-
-    def inspect
-      "#{self.class.name}(#{self.width} × #{self.height})"
-    end
-
-    def to_hash
-      CGSizeCreateDictionaryRepresentation(self)
-    end
-
-  end
-end
-
-
-class CGRect
-  include SugarCube::CGRectExtensions
-end
-
-
-class CGPoint
-  include SugarCube::CGPointExtensions
-end
-
-
-class CGSize
-  include SugarCube::CGSizeExtensions
-end
-
-
 module SugarCube
   module CoreGraphics
-    PI  = 3.141592654
-    PHI = 1.618033989
-    E   = 2.718281828
-
-    class Rect < Array
-      include SugarCube::CGRectExtensions
-
-      def initialize args
-        if args.length == 4
-          super [Point.new([args[0], args[1]]), Size.new([args[2], args[3]])]
-        else
-          unless args[0].is_a? Point
-            args[0] = SugarCube::CoreGraphics::Point(args[0])
-          end
-          unless args[1].is_a? Size
-            args[1] = SugarCube::CoreGraphics::Size(args[1])
-          end
-          super [args[0], args[1]]
-        end
-      end
-
-      def origin
-        return self[0]
-      end
-
-      def origin= val
-        self[0] = SugarCube::CoreGraphics::Point(val)
-      end
-
-      def size
-        return self[1]
-      end
-
-      def size= val
-        self[1] = SugarCube::CoreGraphics::Size(val)
-      end
-    end
-
-
-    class Point < Array
-      include SugarCube::CGPointExtensions
-
-      def x
-        return self[0]
-      end
-
-      def x= val
-        self[0] = val
-      end
-
-      def y
-        return self[1]
-      end
-
-      def y= val
-        self[1] = val
-      end
-
-      # adds a vector to this point, or creates a Rect by adding a size
-      def +(point)
-        case point
-        when SugarCube::CoreGraphics::Point, CGPoint
-          x = self.x + point.x
-          y = self.y + point.y
-          Point[x, y]
-        when SugarCube::CoreGraphics::Size, CGSize
-          Rect[self, point]
-        else
-          super
-        end
-      end
-    end
-
-
-    class Size < Array
-      include SugarCube::CGSizeExtensions
-
-      def width
-        return self[0]
-      end
-
-      def width= val
-        self[0] = val
-      end
-
-      def height
-        return self[1]
-      end
-
-      def height= val
-        self[1] = val
-      end
+    module_function
 
-      # adds the sizes
-      def +(size)
-        case size
-        when Size, CGSize
-          width = self.width + size.width
-          height = self.height + size.height
-          Size[width, height]
-        when Point, CGPoint
-          Rect[size, self]
+    # Accepts 1 or 2 arguments
+    # 1 argument should be a CGPoint, CGSize, Array[Numeric, Numeric] or UIOffset
+    # 2 arguments should be Numeric, Numeric
+    def Point(x_or_origin, y=nil)
+      unless y
+        case x_or_origin
+        when CGPoint
+          x = x_or_origin.x
+          y = x_or_origin.y
+        when CGSize
+          x = x_or_origin.width
+          y = x_or_origin.height
+        when UIOffset
+          x = x_or_origin.horizontal
+          y = x_or_origin.vertical
+        when Array
+          x = x_or_origin[0]
+          y = x_or_origin[1]
         else
-          super
+          raise RuntimeError.new("Invalid argument sent to Point(#{x_or_origin.inspect})")
         end
+      else
+        x = x_or_origin
       end
-
-    end
-
-
-    class EdgeInsets < Array
-
-      def top
-        return self[0]
-      end
-
-      def top= val
-        self[0] = val
-      end
-
-      def left
-        return self[1]
-      end
-
-      def left= val
-        self[1] = val
-      end
-
-      def bottom
-        return self[2]
-      end
-
-      def bottom= val
-        self[2] = val
-      end
-
-      def right
-        return self[3]
-      end
-
-      def right= val
-        self[3] = val
-      end
-
-    end
-
-
-    class Offset < Array
-
-      def horizontal
-        return self[0]
-      end
-
-      def horizontal= val
-        self[0] = val
-      end
-
-      def vertical
-        return self[1]
-      end
-
-      def vertical= val
-        self[1] = val
-      end
-
+      return CGPoint.new(x, y)
     end
 
-    module_function
-
+    # Accepts 1 or 2 arguments
+    # 1 argument should be a CGPoint, CGSize, Array[Numeric, Numeric] or UIOffset
+    # 2 arguments should be Numeric, Numeric
     def Size(w_or_size, h=nil)
-      if not h
+      unless h
         case w_or_size
         when CGSize
           w = w_or_size.width
           h = w_or_size.height
+        when CGPoint
+          w = w_or_size.x
+          h = w_or_size.y
+        when UIOffset
+          w = w_or_size.horizontal
+          h = w_or_size.vertical
         when Array
           w = w_or_size[0]
           h = w_or_size[1]
@@ -430,33 +53,17 @@ module SugarCube
       else
         w = w_or_size
       end
-      return Size.new([w, h])
-    end
-
-    def Point(x_or_origin, y=nil)
-      if not y
-        case x_or_origin
-        when CGPoint
-          x = x_or_origin.x
-          y = x_or_origin.y
-        when Array
-          x = x_or_origin[0]
-          y = x_or_origin[1]
-        else
-          raise RuntimeError.new("Invalid argument sent to Point(#{x_or_origin.inspect})")
-        end
-      else
-        x = x_or_origin
-      end
-      return Point.new([x, y])
+      return CGSize.new(w, h)
     end
 
     # Accepts 1, 2 or 4 arguments.
-    # 1 argument should be an Array[4], Rect, or CGRect
-    # 2 arguments should be a Point/CGPoint and a Size/CGSize,
+    # 1 argument should be an Array[Numeric*4], Array[[Numeric*2],[Numeric*2]], CGRect, UIView or CALayar
+    # 2 arguments should be a CGPoint and a CGSize,
+    # 3 arguments should be either Numeric, Numeric, Size or Point, Numeric, Numeric
     # 4 should be x, y, w, h
     def Rect(x_or_origin, y_or_size=nil, w=nil, h=nil)
-      if not y_or_size
+      # one arg
+      if y_or_size.nil? and w.nil? and h.nil?
         case x_or_origin
         when CGRect
           x = x_or_origin.origin.x
@@ -468,11 +75,6 @@ module SugarCube
           y = x_or_origin.frame.origin.y
           w = x_or_origin.frame.size.width
           h = x_or_origin.frame.size.height
-        when Rect
-          x = x_or_origin[0][0]
-          y = x_or_origin[0][1]
-          w = x_or_origin[1][0]
-          h = x_or_origin[1][1]
         when Array
           if x_or_origin.length == 2
             x = x_or_origin[0][0]
@@ -490,69 +92,115 @@ module SugarCube
         else
           raise RuntimeError.new("Invalid argument sent to Rect(#{x_or_origin.inspect})")
         end
-      elsif not w and not h
-        x_or_origin = SugarCube::CoreGraphics::Point(x_or_origin) unless x_or_origin.is_a? SugarCube::CoreGraphics::Point
+      # two args
+      elsif w.nil? and h.nil?
+        x_or_origin = SugarCube::CoreGraphics::Point(x_or_origin) unless x_or_origin.is_a? CGPoint
         x = x_or_origin.x
         y = x_or_origin.y
-        y_or_size = SugarCube::CoreGraphics::Size(y_or_size) unless y_or_size.is_a? SugarCube::CoreGraphics::Size
+        y_or_size = SugarCube::CoreGraphics::Size(y_or_size) unless y_or_size.is_a? CGSize
         w = y_or_size.width
         h = y_or_size.height
+      # three args
+      elsif h.nil?
+        if x_or_origin.is_a? Numeric
+          # x_or_origin: x, y_or_size: y, w: size
+          point = SugarCube::CoreGraphics::Point(x_or_origin, y_or_size)
+          size = w
+          return SugarCube::CoreGraphics::Rect(point, size)
+        elsif w.is_a? Numeric
+          # x_or_origin: point, y_or_size: w, w: h
+          point = x_or_origin
+          size = SugarCube::CoreGraphics::Size(y_or_size, w)
+          return SugarCube::CoreGraphics::Rect(point, size)
+        else
+          raise RuntimeError.new("Invalid arguments sent to Rect(#{x_or_origin.inspect}, #{y_or_size.inspect}, #{w.inspect})")
+        end
       else
         x = x_or_origin
         y = y_or_size
       end
-      return Rect.new([[x, y], [w, h]])
+      return CGRect.new([x, y], [w, h])
     end
 
-    # Accepts 1 or 4 arguments.
-    # 1 argument should be an Array[4] or UIEdgeInset,
+    # Accepts 1..4 arguments.
+    # 1 argument should be an Array[Numeric * 1..4], UIEdgeInset, or Numeric
+    # 2 arguments should be top/bottom, left/right
+    # 3 arguments should be top, left/right, bottom
     # 4 should be top, left, bottom, right
     def EdgeInsets(top_or_inset, left=nil, bottom=nil, right=nil)
-      unless left or bottom or right
+      if left.nil? and bottom.nil? and right.nil?
         case top_or_inset
         when UIEdgeInsets
-          top = top.top
-          left = top.left
-          bottom = top.bottom
-          right = top.right
+          top = top_or_inset.top
+          left = top_or_inset.left
+          bottom = top_or_inset.bottom
+          right = top_or_inset.right
+        when CGRect
+          # converting a rect to insets is hard to visualize,
+          # but it goes something like this:
+          # +-----------.....----------+
+          # | origin |y   | top inset  |
+          # |--------+    V            |
+          # |    x    ..........       |
+          # .         .        .       .
+          # .-------->.        . right .
+          # . left    .        . inset .
+          # . inset   .        .<------.
+          # .         .        .       .
+          # |         ..........   w   |
+          # |             ^     +------|
+          # | bottom inset|    h| size |
+          # +-----------.....----------+
+          left = top_or_inset.origin.x
+          top = top_or_inset.origin.y
+          right = top_or_inset.size.width
+          bottom = top_or_inset.size.height
         when Array
-          top = top_or_inset[0]
-          left = top_or_inset[1]
-          bottom = top_or_inset[2]
-          right = top_or_inset[3]
+          # okay, in this ONE case, I use the splat operator.
+          return SugarCube::CoreGraphics::EdgeInsets(*top_or_inset)
         when Numeric
           top = left = bottom = right = top_or_inset
         else
           raise RuntimeError.new("Invalid argument sent to EdgeInsets(#{top_or_inset.inspect})")
         end
+      elsif bottom.nil? and right.nil?
+        return SugarCube::CoreGraphics::EdgeInsets(top_or_inset, left, top_or_inset, left)
+      elsif right.nil?
+        return SugarCube::CoreGraphics::EdgeInsets(top_or_inset, left, bottom, left)
       else
         top = top_or_inset
       end
-      return EdgeInsets.new([top, left, bottom, right])
+      return UIEdgeInsets.new(top, left, bottom, right)
     end
 
     # Accepts 1 or 2 arguments.
-    # 1 argument should be an Array[2] or UIOffset,
+    # 1 argument should be an Array[2], UIOffset, CGPoint, CGSize, or Numeric
     # 2 should be horizontal, vertical
     def Offset(horizontal_or_offset, vertical=nil)
-      if not vertical
+      unless vertical
         case horizontal_or_offset
         when UIOffset
           horizontal = horizontal_or_offset.horizontal
           vertical = horizontal_or_offset.vertical
+        when CGPoint
+          horizontal = horizontal_or_offset.x
+          vertical = horizontal_or_offset.y
+        when CGSize
+          horizontal = horizontal_or_offset.width
+          vertical = horizontal_or_offset.height
         when Array
           horizontal = horizontal_or_offset[0]
           vertical = horizontal_or_offset[1]
-        when Fixnum
-          horizontal_or_offset =
-          vertical = horizontal_or_offset[0]
+        when Numeric
+          horizontal = horizontal_or_offset
+          vertical = horizontal_or_offset
         else
           raise RuntimeError.new("Invalid argument sent to Offset(#{horizontal_or_offset.inspect})")
         end
       else
         horizontal = horizontal_or_offset
       end
-      return Offset.new([horizontal, vertical])
+      return UIOffset.new(horizontal, vertical)
     end
 
   end