sugarcube 0.2.3 → 0.2.5

data/README.md

@@ -1,14 +1,14 @@
 sugarcube
 =========
 
-Some sugar for your cocoa, or your tea.
+Some sugar for your cocoa, or your [tea][sweettea].
 
 About
 -----
 
 CocoaTouch/iOS is a *verbose* framework.  These extensions hope to make
 development in rubymotion more enjoyable by tacking "UI" methods onto the base
-classes (String, Fixnum, Float).  With sugarcube, you can create a color from an
+classes (String, Fixnum, Numeric).  With sugarcube, you can create a color from an
 integer or symbol, or create a UIFont or UIImage from a string.
 
 Some UI classes are opened up as well, like adding the '<<' operator to a UIView
@@ -52,19 +52,19 @@ Examples
 # create a UIColor from a hex value
 0xffffff.uicolor # => UIColor.colorWithRed(1.0, green:1.0, blue:1.0, alpha:1.0)
 0xffffff.uicolor(0.5) # => UIColor.colorWithRed(1.0, green:1.0, blue:1.0, alpha:0.5)
-
-# create a percentage
-100.percent # => 1.00
-55.percent # => 0.55
 ```
 
- Float
--------
+ Numeric
+---------
 
 ```ruby
 # create a percentage
 100.0.percent # => 1.00
 55.0.percent # => 0.55
+
+1.3.seconds.later do
+  @someview.fade_out
+end
 ```
 
  NSURL
@@ -129,6 +129,7 @@ This is the "big daddy".  Lots of sugar here...
 :small.uifontsize # => UIFont.smallSystemFontSize
 :small.uifont  # => UIFont.systemFontOfSize(:small.uifontsize)
 :bold.uifont(:small)  # UIFont.boldSystemFontOfSize(:small.uifontsize)
+:large.uiactivityindicatorstyle  # :large, :white, :gray
 ```
 
  UIImage
@@ -144,6 +145,8 @@ image.uicolor # => UIColor.colorWithPatternImage(image)
 
 ```ruby
 self.view << subview  # => self.view.addSubview(subview)
+self.view.show  # => self.hidden = false
+self.view.hide  # => self.hidden = true
 ```
 
  UIControl
@@ -169,6 +172,22 @@ button.off(:all)
 You can only remove handlers by "type", not by the action.  e.g. If you bind
 three `:touch` events, calling `button.off(:touch)` will remove all three.
 
+ UINavigationController
+------------------------
+
+`push`/`<<` and `pop` instead of `pushViewController` and `popViewController`.
+`!` and `!(view)` instead of `popToRootViewController` and `popToViewController`
+
+animated is `true` for all these.
+
+```ruby
+nav_ctlr.push(new_ctlr)
+nav_ctlr << new_ctlr
+nav_ctlr.pop
+nav_ctlr.!
+nav_ctlr.!(another_view_ctlr)
+```
+
  NSNotificationCenter
 ----------------------
 
@@ -179,12 +198,25 @@ Makes it easy to post a notification to some or all objects.
 "my notification".post_notification  # => NSNotificationCenter.defaultCenter.postNotificationName("my notification", object:nil)
 "my notification".post_notification(obj)  # => NSNotificationCenter.defaultCenter.postNotificationName("my notification", object:obj)
 "my notification".post_notification(obj, user: 'dict')  # => NSNotificationCenter.defaultCenter.postNotificationName("my notification", object:obj, userInfo:{user: 'dict'})
+```
+
+ NSTimer
+---------
+
+```ruby
+1.second.later do
+  @view.shake
+end
 ```
 
  NSUserDefaults
 ----------------
 
 ```ruby
+'key'.set_default(['any', 'objects'])  # => NSUserDefaults.standardUserDefaults.setObject(['any', 'objects'], forKey: :key)
+'key'.get_default  # => NSUserDefaults.standardUserDefaults.objectForKey(:key)
+
+# symbols are converted to strings, so theses are equivalent
 :key.set_default(['any', 'objects'])  # => NSUserDefaults.standardUserDefaults.setObject(['any', 'objects'], forKey: :key)
 :key.get_default  # => NSUserDefaults.standardUserDefaults.objectForKey(:key)
 ```
@@ -255,8 +287,23 @@ view.fade_out(0.5, delay: 0,
                   opacity: 0.5) { |view|
   view.removeFromSuperview
 }
+
 view.move_to([0, 100])  # move to position 0, 100
 view.delta_to([0, 100])  # move over 0, down 100, from current position
+
+view.slide :left   # slides the entire view one "page" to the left, right, up, or down
+
+view.shake  # shakes the view.
+# options w/ default values:
+shake offset: 8,   # move 8 px left, and 8 px right
+      repeat: 3,   # three times
+    duration: 0.3, # for a total of 0.3 seconds
+     keypath: 'transform.translate.x'
+
+# vigorous nodding - modifying transform.translation.y:
+view.shake offset: 20, repeat: 10, duration: 5, keypath: 'transform.translation.y'
+# an adorable wiggle - modifying transform.rotation:
+superview.shake offset: 0.1, repeat: 2, duration: 0.5, keypath: 'transform.rotation'
 ```
 
  REPL View adjustments
@@ -284,7 +331,8 @@ Assume I ran `include SugarCube::Adjust` in these examples.
 > taller 1
 > shorter 1
 > size 100, 10  # set size to width:100, height: 10
-> restore  # original frame is saved when you call adjust
+> shadow(opacity: 0.5, offset: [0, 0], color: :black, radius: 1) # and path, which is a CGPath object.
+> restore  # original frame and shadow is saved when you call `adjust`
 ```
 
 ```ruby
@@ -300,7 +348,15 @@ Assume I ran `include SugarCube::Adjust` in these examples.
 > t          # taller
 > s          # shorter
 > z 100, 10  # size, also accepts an array (or Size() object)
-> r          # restore
+> # you can also query your view.  You will get nice-looking
+> # SugarCube::CoreGraphics objects
+> f   # frame
+[[0, 0], [320, 480]]
+> o   # origin
+[0, 0]
+> z   # size
+[320, 480]
+> h   # shadow - this returns an array identical to what you can pass to `shadow`
 
 # if you forget what view you are adjusting, run `adjust` again
 > a
@@ -308,3 +364,4 @@ Assume I ran `include SugarCube::Adjust` in these examples.
 ```
 
 [BubbleWrap]: https://github.com/rubymotion/BubbleWrap
+[sweettea]: https://github.com/colinta/sweettea/README.md

data/lib/sugarcube.rb

@@ -1,10 +1,23 @@
 unless defined?(Motion::Project::Config)
-  raise "sugarcube must be required within a RubyMotion project Rakefile."
+  raise "The sugarcube gem must be required within a RubyMotion project Rakefile."
 end
 
 
 Motion::Project::App.setup do |app|
+  # scans app.files until it finds app/ (the default)
+  # if found, it inserts just before those files, otherwise it will insert to
+  # the end of the list
+  insert_point = 0
+  app.files.each_index do |index|
+    file = app.files[index]
+    if file =~ /^(?:\.\/)?app\//
+      # found app/, so stop looking
+      break
+    end
+    insert_point = index + 1
+  end
+
   Dir.glob(File.join(File.dirname(__FILE__), 'sugarcube/**/*.rb')).reverse.each do |file|
-    app.files.unshift(file)
+    app.files.insert(insert_point, file)
   end
 end

data/lib/sugarcube/adjust.rb

@@ -7,11 +7,26 @@ module SugarCube
       return @@sugarcube_view if not view
 
       @@sugarcube_view = view
-      @@sugarcube_restore = view.frame
+      @@sugarcube_restore = {
+        frame: SugarCube::Adjust.frame,
+        shadow: SugarCube::Adjust.shadow,
+      }
+
       view
     end
     alias :a :adjust
 
+    ##|  FRAME
+    def frame f=nil
+      @@sugarcube_view ||= nil
+      raise "no view has been assigned to SugarCube::Adjust::adjust" unless @@sugarcube_view
+
+      return SugarCube::CoreGraphics::Rect(@@sugarcube_view.frame) if not f
+
+      @@sugarcube_view.frame = f
+    end
+    alias :f :frame
+
     ##|  ORIGIN
     def left val=1
       SugarCube::right -val
@@ -19,6 +34,9 @@ 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
+
       f = @@sugarcube_view.frame
       f.origin.x += val
       @@sugarcube_view.frame = f
@@ -31,6 +49,9 @@ 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
+
       f = @@sugarcube_view.frame
       f.origin.y += val
       @@sugarcube_view.frame = f
@@ -38,6 +59,9 @@ module SugarCube
     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
+
       f = @@sugarcube_view.frame
       return SugarCube::CoreGraphics::Point(f.origin) if not x
 
@@ -58,6 +82,9 @@ 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
+
       f = @@sugarcube_view.frame
       f.size.width += val
       @@sugarcube_view.frame = f
@@ -70,6 +97,9 @@ 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
+
       f = @@sugarcube_view.frame
       f.size.height += val
       @@sugarcube_view.frame = f
@@ -77,6 +107,9 @@ module SugarCube
     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
+
       f = @@sugarcube_view.frame
       return SugarCube::CoreGraphics::Size(f.size) if not w
 
@@ -90,11 +123,50 @@ module SugarCube
     end
     alias :z :size
 
+    ##|  SHADOW
+    def shadow shadow=nil
+      @@sugarcube_view ||= nil
+      raise "no view has been assigned to SugarCube::Adjust::adjust" unless @@sugarcube_view
+
+      if shadow
+        {
+          opacity: :'shadowOpacity=',
+          radius: :'shadowRadius=',
+          offset: :'shadowOffset=',
+          color: :'shadowColor=',
+          path: :'shadowPath=',
+        }.each { |key, msg|
+          if value = shadow[key]
+            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
+          end
+        }
+        @@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,
+        }
+      end
+    end
+    alias :h :shadow
+
     ##|  RESTORE
     def restore
-      @@sugarcube_view.frame = @@sugarcube_restore
+      @@sugarcube_view ||= nil
+      raise "no view has been assigned to SugarCube::Adjust::adjust" unless @@sugarcube_view
+
+      @@sugarcube_restore.each do |msg, value|
+        SugarCube::Adjust.send(msg, value)
+      end
     end
-    alias :r :restore
 
   end
 end

data/lib/sugarcube/core_graphics.rb

@@ -31,6 +31,29 @@ class CGRectArray < Array
     self[1] = SugarCube::CoreGraphics::Size(val)
   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 CGRectArray
+      x1 = self.origin.x < rect.origin.x ? self.origin.x : rect.origin.x
+      y1 = self.origin.y < rect.origin.y ? self.origin.y : rect.origin.y
+      x2 = self.origin.x + self.size.width > rect.origin.x + rect.size.width ? self.origin.x + self.size.width : rect.origin.x + rect.size.width
+      y2 = self.origin.y + self.size.height > rect.origin.y + rect.size.height ? self.origin.y + self.size.height : rect.origin.y + rect.size.height
+      SugarCube::CoreGraphics::Rect(x1, y1, x2-x1, y2-y1)
+    when CGPointArray
+      x = self.origin.x + rect.x
+      y = self.origin.y + rect.y
+      SugarCube::CoreGraphics::Rect([[x, y], self.size])
+    when CGSizeArray
+      w = self.size.width + rect.width
+      h = self.size.height + rect.height
+      SugarCube::CoreGraphics::Rect([self.origin, [w, h]])
+    else
+      super
+    end
+  end
+
 end
 
 
@@ -52,6 +75,20 @@ class CGPointArray < Array
     self[1] = val
   end
 
+  # adds a vector to this point, or creates a Rect by adding a size
+  def +(point)
+    case point
+    when CGPointArray
+      x = self.x + point.x
+      y = self.y + point.y
+      CGPointArray[x, y]
+    when CGSizeArray
+      CGRectArray[self, point]
+    else
+      super
+    end
+  end
+
 end
 
 class CGSizeArray < Array
@@ -72,19 +109,91 @@ class CGSizeArray < Array
     self[1] = val
   end
 
+  # adds the sizes
+  def +(size)
+    case size
+    when CGSizeArray
+      width = self.width + size.width
+      height = self.height + size.height
+      CGSizeArray[width, height]
+    when CGPointArray
+      CGRectArray[size, self]
+    else
+      super
+    end
+  end
+
 end
 
 
+class UIEdgeInsetsArray < 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 UIOffsetArray < 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
+
+end
+
 module SugarCube
   module CoreGraphics
     module_function
 
     def Size(w_or_size, h=nil)
       if not h
-        if CGSize === w_or_size
+        case w_or_size
+        when CGSize
           w = w_or_size.width
           h = w_or_size.height
-        elsif Array === w_or_size
+        when Array
           w = w_or_size[0]
           h = w_or_size[1]
         else
@@ -98,10 +207,11 @@ module SugarCube
 
     def Point(x_or_origin, y=nil)
       if not y
-        if CGPoint === x_or_origin
+        case x_or_origin
+        when CGPoint
           x = x_or_origin.x
           y = x_or_origin.y
-        elsif Array === x_or_origin
+        when Array
           x = x_or_origin[0]
           y = x_or_origin[1]
         else
@@ -113,31 +223,45 @@ module SugarCube
       return CGPointArray.new([x, y])
     end
 
-    # Accepts 2 or 4 arguments.  2 arguments should be a point and a size,
+    # Accepts 1, 2 or 4 arguments.
+    # 1 argument should be an Array[4], CGRectArray, or CGRect
+    # 2 arguments should be a Point/CGPoint and a Size/CGSize,
     # 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
-        if CGRectArray === x_or_origin
-          x = x_or_origin[0][0]
-          y = x_or_origin[0][1]
-          w = x_or_origin[1][0]
-          h = x_or_origin[1][1]
-        elsif CGRect === x_or_origin
+        case x_or_origin
+        when CGRect
           x = x_or_origin.origin.x
           y = x_or_origin.origin.y
           w = x_or_origin.size.width
           h = x_or_origin.size.height
-        elsif Array === x_or_origin
-          x = x_or_origin[0]
-          y = x_or_origin[1]
-          w = x_or_origin[2]
-          h = x_or_origin[3]
+        when CGRectArray
+          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]
+            y = x_or_origin[0][1]
+            w = x_or_origin[1][0]
+            h = x_or_origin[1][1]
+          elsif
+            x = x_or_origin[0]
+            y = x_or_origin[1]
+            w = x_or_origin[2]
+            h = x_or_origin[3]
+          else
+            raise RuntimeError.new("Invalid argument sent to Rect(#{x_or_origin.inspect})")
+          end
         else
           raise RuntimeError.new("Invalid argument sent to Rect(#{x_or_origin.inspect})")
         end
       elsif not w and not h
+        x_or_origin = Point(x_or_origin) unless x_or_origin.is_a? CGPointArray
         x = x_or_origin.x
         y = x_or_origin.y
+        y_or_size = Size(y_or_size) unless y_or_size.is_a? CGSizeArray
         w = y_or_size.width
         h = y_or_size.height
       else
@@ -147,5 +271,56 @@ module SugarCube
       return CGRectArray.new([[x, y], [w, h]])
     end
 
+    # Accepts 1 or 4 arguments.
+    # 1 argument should be an Array[4] or UIEdgeInset,
+    # 4 should be top, left, bottom, right
+    def EdgeInsets(top_or_inset, left=nil, bottom=nil, right=nil)
+      unless left or bottom or right
+        case top_or_inset
+        when UIEdgeInsets
+          top = top.top
+          left = top.left
+          bottom = top.bottom
+          right = top.right
+        when Array
+          top = top_or_inset[0]
+          left = top_or_inset[1]
+          bottom = top_or_inset[2]
+          right = top_or_inset[3]
+        when Numeric
+          top = left = bottom = right = top_or_inset
+        else
+          raise RuntimeError.new("Invalid argument sent to EdgeInsets(#{top_or_inset.inspect})")
+        end
+      else
+        top = top_or_inset
+      end
+      return UIEdgeInsetsArray.new([top, left, bottom, right])
+    end
+
+    # Accepts 1 or 2 arguments.
+    # 1 argument should be an Array[2] or UIOffset,
+    # 2 should be horizontal, vertical
+    def Offset(horizontal_or_offset, vertical=nil)
+      if not vertical
+        case horizontal_or_offset
+        when UIOffset
+          horizontal = horizontal_or_offset.horizontal
+          vertical = horizontal_or_offset.vertical
+        when Array
+          horizontal = horizontal_or_offset[0]
+          vertical = horizontal_or_offset[1]
+        when Fixnum
+          horizontal_or_offset =
+          vertical = horizontal_or_offset[0]
+        else
+          raise RuntimeError.new("Invalid argument sent to Offset(#{horizontal_or_offset.inspect})")
+        end
+      else
+        horizontal = horizontal_or_offset
+      end
+      return UIOffsetArray.new([horizontal, vertical])
+    end
+
   end
 end

data/lib/sugarcube/defaults.rb

@@ -1,5 +1,22 @@
 class Symbol
 
+  def get_default
+    to_s.get_default
+  end
+
+  def set_default val
+    to_s.set_default val
+  end
+
+  def remove_default
+    to_s.remove_default
+  end
+
+end
+
+
+class String
+
   def get_default
     NSUserDefaults.standardUserDefaults.objectForKey(self)
   end

data/lib/sugarcube/document.rb

@@ -1,5 +1,3 @@
-
-
 class NSString
 
   def document

data/lib/sugarcube/fixnum.rb

@@ -1,5 +1,3 @@
-
-
 class Fixnum
 
   #     0xffffff.uicolor
@@ -17,8 +15,4 @@ class Fixnum
     UIColor.colorWithRed(red, green:green, blue:blue, alpha:alpha.to_f)
   end
 
-  def percent
-    self.to_f.percent
-  end
-
 end

data/lib/sugarcube/nsstring.rb

@@ -8,6 +8,10 @@ class NSString
     @uiimage = UIImage.imageNamed(self)
   end
 
+  def uiimageview
+    @uiimageview ||= (self.uiimage and self.uiimage.uiimageview or UIImageView.alloc.initWithImage(nil))
+  end
+
   def uifont(size=UIFont.systemFontSize)
     @uifont = UIFont.fontWithName(self, size:size)
   end

data/lib/sugarcube/numeric.rb

@@ -0,0 +1,26 @@
+class Numeric
+
+  def percent
+    self / 100.0
+  end
+
+  def seconds
+    self
+  end
+  alias :second :seconds
+
+  def minutes
+    self * 60
+  end
+  alias :minute :minutes
+
+  def hours
+    self * 3600
+  end
+  alias :hour :hours
+
+  def later(user_info=nil, &fire)
+    NSTimer.scheduledTimerWithTimeInterval(self.to_f, target: fire, selector: 'call:', userInfo: user_info, repeats: false)
+  end
+
+end

data/lib/sugarcube/symbol.rb

@@ -34,6 +34,12 @@ class Symbol
     attr_accessor :system_fonts
     attr_accessor :font_sizes
     attr_accessor :returnkeys
+    attr_accessor :activityindicator_styles
+    attr_accessor :tableview_styles
+    attr_accessor :statusbar_styles
+    attr_accessor :barmetrics
+    attr_accessor :barbuttomitems
+    attr_accessor :keyboardtypes
   end
 
   @devices = {
@@ -137,10 +143,71 @@ class Symbol
     emergencycall: UIReturnKeyEmergencyCall,
   }
 
+  @activityindicator_styles = {
+    large:      UIActivityIndicatorViewStyleWhiteLarge,
+    whitelarge: UIActivityIndicatorViewStyleWhiteLarge,
+    white:      UIActivityIndicatorViewStyleWhite,
+    gray:       UIActivityIndicatorViewStyleGray,
+  }
+
+  @tableview_styles = {
+    plain:   UITableViewStylePlain,
+    grouped: UITableViewStyleGrouped,
+  }
+
+  @statusbar_styles = {
+    default:   UIStatusBarStyleDefault,
+    black:     UIStatusBarStyleBlackOpaque,
+    translucent: UIStatusBarStyleBlackTranslucent,
+  }
+
+  @barmetrics = {
+    default:   UIBarMetricsDefault,
+    landscape: UIBarMetricsLandscapePhone,
+  }
+
+  @barbuttomitems = {
+    done:          UIBarButtonSystemItemDone,
+    cancel:        UIBarButtonSystemItemCancel,
+    edit:          UIBarButtonSystemItemEdit,
+    save:          UIBarButtonSystemItemSave,
+    add:           UIBarButtonSystemItemAdd,
+    flexiblespace: UIBarButtonSystemItemFlexibleSpace,
+    fixedspace:    UIBarButtonSystemItemFixedSpace,
+    compose:       UIBarButtonSystemItemCompose,
+    reply:         UIBarButtonSystemItemReply,
+    action:        UIBarButtonSystemItemAction,
+    organize:      UIBarButtonSystemItemOrganize,
+    bookmarks:     UIBarButtonSystemItemBookmarks,
+    search:        UIBarButtonSystemItemSearch,
+    refresh:       UIBarButtonSystemItemRefresh,
+    stop:          UIBarButtonSystemItemStop,
+    camera:        UIBarButtonSystemItemCamera,
+    trash:         UIBarButtonSystemItemTrash,
+    play:          UIBarButtonSystemItemPlay,
+    pause:         UIBarButtonSystemItemPause,
+    rewind:        UIBarButtonSystemItemRewind,
+    fastforward:   UIBarButtonSystemItemFastForward,
+    undo:          UIBarButtonSystemItemUndo,
+    redo:          UIBarButtonSystemItemRedo,
+    pagecurl:      UIBarButtonSystemItemPageCurl,
+  }
+
+  @keyboardtypes = {
+    default:               UIKeyboardTypeDefault,
+    asciicapable:          UIKeyboardTypeASCIICapable,
+    numbersandpunctuation: UIKeyboardTypeNumbersAndPunctuation,
+    url:                   UIKeyboardTypeURL,
+    numberpad:             UIKeyboardTypeNumberPad,
+    phonepad:              UIKeyboardTypePhonePad,
+    namephonepad:          UIKeyboardTypeNamePhonePad,
+    emailaddress:          UIKeyboardTypeEmailAddress,
+  }
+
   private
   def look_in(here)
     return here[self] if here.has_key? self
-    raise SugarNotFoundException.new(self)
+    raise SugarNotFoundException.new(self.inspect)
   end
 
   public
@@ -171,6 +238,7 @@ class Symbol
   def uicontrolstate
     look_in(Symbol.controlstates)
   end
+  alias :uistate :uicontrolstate
 
   def uicontrolevent
     look_in(Symbol.controlevents)
@@ -180,18 +248,45 @@ class Symbol
     look_in(Symbol.returnkeys)
   end
 
+  def uiactivityindicatorstyle
+    look_in(Symbol.activityindicator_styles)
+  end
+  alias :uiactivityindicatorviewstyle :uiactivityindicatorstyle
+
+  def uitablestyle
+    look_in(Symbol.tableview_styles)
+  end
+  alias :uitableviewstyle :uitablestyle
+
+  def uistatusbarstyle
+    look_in(Symbol.statusbar_styles)
+  end
+
+  def uibarmetrics
+    look_in(Symbol.barmetrics)
+  end
+
+  def uibarbuttonitem
+    look_in(Symbol.barbuttomitems)
+  end
+
+  def uikeyboardtype
+    look_in(Symbol.keyboardtypes)
+  end
+
   def uifont(size=UIFont.systemFontSize)
     # system fonts
-    begin
+    if Symbol.system_fonts.has_key? self
       font = look_in(Symbol.system_fonts)
       if Symbol === size
         size = Symbol.font_sizes.fetch(size).uifontsize
       end
-      return UIFont.send(font, size)
-    rescue SugarNotFoundException
+      font = UIFont.send(font, size)
+    else
       size = look_in(font_sizes).uifontsize
-      return UIFont.systemFontOfSize(size)
+      font = UIFont.systemFontOfSize(size)
     end
+    font
   end
 
   def uifontsize
@@ -202,8 +297,4 @@ class Symbol
     return size.to_f
   end
 
-  def to_teacup_stylesheet
-    Teacup::Stylesheet[self]
-  end
-
 end

data/lib/sugarcube/symbol/symbol_uicolor.rb

@@ -5,14 +5,14 @@ class Symbol
   end
 
   def uicolor(alpha=nil)
-    begin
+    if Symbol.uicolors.has_key? self
       # iOS colors
       color = UIColor.send(look_in(Symbol.uicolors))
 
       if not alpha.nil?
         color = color.colorWithAlphaComponent(alpha.to_f)
       end
-    rescue SugarNotFoundException
+    else
       # css colors
       color = look_in(Symbol.css_colors).uicolor(alpha)
     end

data/lib/sugarcube/uicontrol.rb

@@ -1,5 +1,3 @@
-
-
 class UIControl
 
   # event blocks need to be retained, and the addTarget method explicitly does

data/lib/sugarcube/uiimage.rb

@@ -1,5 +1,3 @@
-
-
 class UIImage
   def uiimage ; self ; end
 
@@ -13,4 +11,9 @@ class UIImage
     color
   end
 
+  def uiimageview
+    @uiimageview = UIImageView.alloc.initWithImage(self)
+  end
+
+
 end

data/lib/sugarcube/uiview.rb

@@ -1,5 +1,3 @@
-
-
 class UIView
 
   def <<(view)
@@ -12,7 +10,39 @@ class UIView
                         "#{self.superview ? ' child of ' + self.superview.class.name : ''}"
   end
 
-  def fade_out(duration=0.3, options={}, &after)
+  def show
+    self.hidden = false
+    self
+  end
+
+  def hide
+    self.hidden = true
+    self
+  end
+
+  def _after_proc(after)
+    after ? proc  { |finished|
+                    if after.arity == 0
+                      after.call
+                    else
+                      after.call(finished)
+                    end
+                  } : nil
+  end
+
+  # If options is a Numeric, it is used as the duration.  Otherwise, duration
+  # is an option, and defaults to 0.3.  All the transition methods work this
+  # way.
+  def fade_out(options={}, &after)
+    if options.is_a? Numeric
+      duration = options
+      options = {}
+    else
+      duration = options[:duration] || 0.3
+    end
+
+    after = _after_proc(after)
+
     UIView.animateWithDuration(duration,
                          delay: options[:delay] || 0,
                        options: options[:options] || UIViewAnimationOptionCurveLinear,
@@ -20,35 +50,92 @@ class UIView
                                   self.layer.opacity = options[:opacity] || 0
                                 }, completion:after
                               )
+    self
   end
 
-  def move_to(position, duration=0.3, options={}, &after)
+  def fade_in(options={}, &after)
+    if options.is_a? Numeric
+      duration = options
+      options = {}
+    else
+      duration = options[:duration] || 0.3
+    end
+
+    options[:opacity] = 1.0
+    fade_out(options, &after)
+  end
+
+  def move_to(position, options={}, &after)
+    if options.is_a? Numeric
+      duration = options
+      options = {}
+    else
+      duration = options[:duration] || 0.3
+    end
+
+    after = _after_proc(after)
+
     UIView.animateWithDuration(duration,
                          delay: options[:delay] || 0,
                        options: options[:options] || UIViewAnimationOptionCurveLinear,
                     animations: proc{
                                   f = self.frame
-                                  f.origin = position
-                                  self.frame = position
+                                  f.origin = SugarCube::CoreGraphics::Point(position)
+                                  self.frame = f
                                 }, completion:after
                               )
+    self
   end
 
-  def delta_to(delta, duration=0.3, options={}, &after)
+  def delta_to(delta, options={}, &after)
     f = self.frame
-    delta = Point(delta)
-    position = Point(f.origin)
-    position.x += delta.x
-    position.y += delta.y
-    UIView.animateWithDuration(duration,
-                         delay: options[:delay] || 0,
-                       options: options[:options] || UIViewAnimationOptionCurveLinear,
-                    animations: proc{
-                                  f = self.frame
-                                  f.origin = position
-                                  self.frame = position
-                                }, completion:after
-                              )
+    delta = SugarCube::CoreGraphics::Point(delta)
+    position = SugarCube::CoreGraphics::Point(f.origin)
+    move_to(position + delta, options, &after)
+    self
+  end
+
+  def slide(direction, options={}, &after)
+    size = UIScreen.mainScreen.bounds.size
+    case direction
+    when :left
+      delta_to([-size.width, 0], options, &after)
+    when :right
+      delta_to([+size.width, 0], options, &after)
+    when :up
+      delta_to([0, -size.height], options, &after)
+    when :down
+      delta_to([0, +size.height], options, &after)
+    else
+      raise "Unknown direction #{direction.inspect}"
+    end
+    self
+  end
+
+  def shake(options={})
+    if options.is_a? Numeric
+      duration = options
+      options = {}
+    else
+      duration = options[:duration] || 0.3
+    end
+
+    offset = options[:offset] || 8
+    repeat = options[:repeat] || 3
+    duration /= repeat
+    keypath = options[:keypath] || 'transform.translation.x'
+
+    origin = 0
+    left = -offset
+    right = +offset
+
+    animation = CAKeyframeAnimation.animationWithKeyPath(keypath)
+    animation.duration = duration
+    animation.repeatCount = repeat
+    animation.values = [origin, left, right, origin]
+    animation.keyTimes = [0, 0.25, 0.75, 1.0]
+    self.layer.addAnimation(animation, forKey:'shake')
+    self
   end
 
 end

data/lib/sugarcube/uiviewcontroller.rb

@@ -0,0 +1,27 @@
+class UINavigationController
+
+  def push(view_controller)
+    self.pushViewController(view_controller, animated: true)
+    self
+  end
+
+  def <<(view_controller)
+    self.pushViewController(view_controller, animated: true)
+    self
+  end
+
+  def pop(to_view=nil)
+    return self.!(to_view) if to_view
+
+    self.popViewControllerAnimated(true)
+  end
+
+  def !(to_view=nil)
+    if to_view
+      self.popToViewController(to_view, animated: true)
+    else
+      self.popToRootViewControllerAnimated(true)
+    end
+  end
+
+end

data/lib/sugarcube/version.rb

@@ -1,3 +1,3 @@
 module SugarCube
-  Version = '0.2.3'
+  Version = '0.2.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugarcube
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-14 00:00:00.000000000 Z
+date: 2012-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70314746913920 !ruby/object:Gem::Requirement
+  requirement: &70269784397300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70314746913920
+  version_requirements: *70269784397300
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70314746929400 !ruby/object:Gem::Requirement
+  requirement: &70269784412820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +33,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70314746929400
+  version_requirements: *70269784412820
 description: ! 'CocoaTouch/iOS is a *verbose* framework.  These extensions hope to
   make
 
@@ -70,10 +70,10 @@ files:
 - lib/sugarcube/document.rb
 - lib/sugarcube/exceptions.rb
 - lib/sugarcube/fixnum.rb
-- lib/sugarcube/float.rb
 - lib/sugarcube/notifications.rb
 - lib/sugarcube/nsstring.rb
 - lib/sugarcube/nsurl.rb
+- lib/sugarcube/numeric.rb
 - lib/sugarcube/symbol.rb
 - lib/sugarcube/symbol/symbol_uicolor.rb
 - lib/sugarcube/uicolor.rb
@@ -81,6 +81,7 @@ files:
 - lib/sugarcube/uifont.rb
 - lib/sugarcube/uiimage.rb
 - lib/sugarcube/uiview.rb
+- lib/sugarcube/uiviewcontroller.rb
 - lib/sugarcube/version.rb
 - sugarcube.gemspec
 homepage: https://github.com/fusionbox/sugarcube

data/lib/sugarcube/float.rb

@@ -1,9 +0,0 @@
-
-
-class Float
-
-  def percent
-    self / 100.0
-  end
-
-end