sugarcube 0.11.3 → 0.12

data/lib/sugarcube/modal.rb

@@ -1,20 +1,39 @@
 module SugarCube
   module Modal
     module_function
-    def present_modal(view_ctlr, &block)
-      UIApplication.sharedApplication.keyWindow.rootViewController.presentViewController(view_ctlr, animated:true, completion:block)
+    def present_modal(view_ctlr, target=nil, &block)
+      target ||= UIApplication.sharedApplication.keyWindow.rootViewController
+      target.presentViewController(view_ctlr, animated:true, completion:block)
     end
 
-    def present_modal_in_nav(view_ctlr, &block)
+    def present_modal_in_nav(view_ctlr, target=nil, &block)
       ctlr = UINavigationController.alloc.initWithRootViewController(view_ctlr)
       ctlr.modalTransitionStyle = UIModalTransitionStyleCoverVertical
 
-      SugarCube::Modal.present_modal(ctlr, &block)
+      SugarCube::Modal.present_modal(ctlr, target, &block)
       ctlr
     end
 
-    def dismiss_modal(&block)
-      UIApplication.sharedApplication.keyWindow.rootViewController.dismissViewControllerAnimated(true, completion:block)
+    def dismiss_modal(target=nil, &block)
+      target ||= UIApplication.sharedApplication.keyWindow.rootViewController
+      target.dismissViewControllerAnimated(true, completion:block)
     end
   end
 end
+
+
+class UIViewController
+
+  def present_modal(view_ctlr, &block)
+    SugarCube::Modal.present_modal(view_ctlr, self, &block)
+  end
+
+  def present_modal_in_nav(view_ctlr, &block)
+    SugarCube::Modal.present_modal_in_nav(view_ctlr, self, &block)
+  end
+
+  def dismiss_modal(view_ctlr, &block)
+    SugarCube::Modal.dismiss_modal(view_ctlr, self, &block)
+  end
+
+end

data/lib/sugarcube/{array.rb → nsarray.rb}

@@ -1,5 +1,7 @@
-class Array
+class NSArray
 
+  # @param [Symbol] type A pointer type from the list at {http://www.rubymotion.com/developer-center/guides/runtime/ RubyMotion Pointers Reference#_pointers}
+  # @return [Pointer] A pointer to the array, of the specified type
   def to_pointer(type)
     ret = Pointer.new(type, self.length)
     self.each_index do |i|
@@ -8,6 +10,8 @@ class Array
     ret
   end
 
+  # Creates an NSIndexPath object using the items in `self` as the indices
+  # @return [NSIndexPath]
   def nsindexpath
     if self.length == 0
       raise "An index path must have at least one index"
@@ -24,6 +28,8 @@ class Array
     return path
   end
 
+  # Creates an NSIndexSet object using the items in `self` as the indices
+  # @return [NSIndexSet]
   def nsindexset
     if self.length == 0
       raise "An index set must have at least one index"

data/lib/sugarcube/nsdata.rb

@@ -0,0 +1,22 @@
+class NSData
+
+  # converts NSData into an NSString using any encoding, default is UTF8
+  # @return [NSString]
+  def nsstring(encoding=nil)
+    if encoding
+      NSString.stringWithCString(self.bytes, encoding:encoding)
+    else
+      NSString.stringWithUTF8String(self.bytes)
+    end
+  end
+
+  # @return [UIImage]
+  def uiimage(scale=nil)
+    if scale
+      UIImage.imageWithData(self, scale:scale)
+    else
+      UIImage.imageWithData(self)
+    end
+  end
+
+end

data/lib/sugarcube/nsdate.rb

@@ -1,4 +1,27 @@
 class NSDate
+
+  def self.new
+    self.date
+  end
+
+  def string_with_style(style)
+    date_formatter = NSDateFormatter.new
+    if style.is_a? Symbol
+      style = style.nsdatesyle
+    end
+    date_formatter.setDateStyle(style)
+    date_formatter.stringFromDate(self)
+  end
+
+
+  def string_with_format(format)
+    format_template = NSDateFormatter.dateFormatFromTemplate(format, options:0,
+                                                      locale:NSLocale.currentLocale)
+    date_formatter = NSDateFormatter.new
+    date_formatter.setDateFormat(format_template)
+    date_formatter.stringFromDate(self)
+  end
+
   def timezone
     return _calendar_components(NSTimeZoneCalendarUnit).timeZone
   end

data/lib/sugarcube/nserror.rb

@@ -0,0 +1,16 @@
+class NSError
+
+  def self.new(message='Error', options={})
+    domain = options[:domain] || 'Error'
+    code = options[:code] || 0
+    info = {NSLocalizedDescriptionKey => message}
+    if options[:userInfo]
+      info.merge! options[:userInfo]
+    end
+    NSError.alloc.initWithDomain( domain,
+                            code: code,
+                        userInfo: info
+                                )
+  end
+
+end

data/lib/sugarcube/nsstring.rb

@@ -1,40 +1,32 @@
 class NSString
 
+  # @return [NSURL]
   def nsurl
     @url ||= NSURL.alloc.initWithString(self)
   end
 
-  def escape_url
-    CFURLCreateStringByAddingPercentEscapes(
-            nil,
-            self,
-            nil,
-            "!*'();:@&=+$,/?%#[]",
-            CFStringConvertNSStringEncodingToEncoding(NSUTF8StringEncoding)
-            )
-  end
-
-  def unescape_url
-    CFURLCreateStringByReplacingPercentEscapes(
-            nil,
-            self,
-            ""
-            )
+  # @return [NSData] NSData representation encoded using UTF8, or a specified
+  #   encoding
+  def nsdata(encoding=NSUTF8StringEncoding)
+    dataUsingEncoding(encoding)
   end
 
+  # @return [UIImage]
   def uiimage
     UIImage.imageNamed(self)
   end
 
+  # @return [UIImageView]
   def uiimageview
-    (self.uiimage and self.uiimage.uiimageview or UIImageView.alloc.initWithImage(nil))
+    self.uiimage ? self.uiimage.uiimageview : UIImageView.alloc.initWithImage(nil)
   end
 
+  # @return [UIFont]
   def uifont(size=UIFont.systemFontSize)
-    @uifont ||= {}
-    @uifont[size] ||= UIFont.fontWithName(self, size:size)
+    UIFont.fontWithName(self, size:size)
   end
 
+  # @return [UIColor]
   def uicolor(alpha=nil)
     if self[0,1] == '#'
       if self.length == 4
@@ -46,6 +38,24 @@ class NSString
     self.uiimage.uicolor(alpha)
   end
 
+  def escape_url
+    CFURLCreateStringByAddingPercentEscapes(
+            nil,
+            self,
+            nil,
+            "!*'();:@&=+$,/?%#[]",
+            CFStringConvertNSStringEncodingToEncoding(NSUTF8StringEncoding)
+            )
+  end
+
+  def unescape_url
+    CFURLCreateStringByReplacingPercentEscapes(
+            nil,
+            self,
+            ""
+            )
+  end
+
   # This can be called as `"Hello".localized` or `"Hello"._`.  The `str._`
   # syntax is meant to be reminiscent of gettext-style `_(str)`.
   def localized(value=nil, table=nil)

data/lib/sugarcube/nsstring_files.rb

@@ -11,6 +11,12 @@ class NSString
     NSFileManager.defaultManager.fileExistsAtPath(self.document)
   end
 
+  def remove!
+    ptr = Pointer.new(:id)
+    NSFileManager.defaultManager.removeItemAtPath(self.document, error:ptr)
+    ptr[0]
+  end
+
   def resource
     @@sugarcube_resources ||= NSBundle.mainBundle.resourcePath
     return self if self.hasPrefix(@@sugarcube_resources)

data/lib/sugarcube/nsuserdefaults.rb

@@ -8,9 +8,42 @@ class NSUserDefaults
 
     # Sets the value for a given key and save it right away.
     def []=(key, val)
-      self.standardUserDefaults.setObject(val, forKey: key.to_s)
+      self.standardUserDefaults.setObject(val.to_nsuserdefaults, forKey: key.to_s)
       self.standardUserDefaults.synchronize
     end
+
+    def remove(key)
+      self.standardUserDefaults.removeObjectForKey(key)
+      self.standardUserDefaults.synchronize
+    end
+  end
+
+end
+
+
+class Object
+  def to_nsuserdefaults
+    self
   end
+end
+
 
+class NilClass
+  def to_nsuserdefaults
+    false
+  end
+end
+
+
+class NSArray
+  def to_nsuserdefaults
+    self.map { |val| val.to_nsuserdefaults }
+  end
+end
+
+
+class NSDictionary
+  def to_nsuserdefaults
+    self.each_with_object({}) { |(key, val), h| h[key] = val.to_nsuserdefaults }
+  end
 end

data/lib/sugarcube/symbol.rb

@@ -25,6 +25,7 @@ You can extend the defaults by adding entries:
 class Symbol
   class << self
     attr_accessor :devices
+    attr_accessor :device_orientations
     attr_accessor :orientations
     attr_accessor :returnkeys
     attr_accessor :statusbar_styles
@@ -38,25 +39,32 @@ class Symbol
     attr_accessor :baselineadjustments
     attr_accessor :system_fonts
     attr_accessor :font_sizes
+    attr_accessor :date_styles
 
     attr_accessor :buttontypes
-    attr_accessor :bordertypes
-    attr_accessor :controlstates
-    attr_accessor :controlevents
+    attr_accessor :border_types
+    attr_accessor :control_states
+    attr_accessor :control_events
     attr_accessor :activityindicator_styles
     attr_accessor :segmented_styles
     attr_accessor :datepicker_modes
+    attr_accessor :content_modes
 
     attr_accessor :tableview_styles
     attr_accessor :tableview_rowanimation
     attr_accessor :tableview_cellstyles
     attr_accessor :tableview_cellaccessorytype
     attr_accessor :tableview_cellselectionstyle
+    attr_accessor :tableview_cellseparatorstyle
 
     attr_accessor :image_sourcetypes
     attr_accessor :image_capturemode
     attr_accessor :image_cameradevice
     attr_accessor :image_quality
+
+    attr_accessor :ca_timingfunctions
+
+    attr_accessor :gesture_recognizer_states
   end
 
   @devices = {
@@ -64,6 +72,16 @@ class Symbol
     ipad: UIUserInterfaceIdiomPad,
   }
 
+  @device_orientations = {
+    unknown: UIDeviceOrientationUnknown,
+    portrait: UIDeviceOrientationPortrait,
+    upside_down: UIDeviceOrientationPortraitUpsideDown,
+    left: UIDeviceOrientationLandscapeLeft,
+    right: UIDeviceOrientationLandscapeRight,
+    face_up: UIDeviceOrientationFaceUp,
+    face_down: UIDeviceOrientationFaceDown
+  }
+
   @textalignments = {
     left: UITextAlignmentLeft,
     right: UITextAlignmentRight,
@@ -105,7 +123,7 @@ class Symbol
     contact_add: UIButtonTypeContactAdd,
   }
 
-  @bordertypes = {
+  @border_types = {
     none: UITextBorderStyleNone,
     line: UITextBorderStyleLine,
     bezel: UITextBorderStyleBezel,
@@ -113,7 +131,7 @@ class Symbol
     rounded_rect: UITextBorderStyleRoundedRect,
   }
 
-  @controlstates = {
+  @control_states = {
     normal: UIControlStateNormal,
     highlighted: UIControlStateHighlighted,
     disabled: UIControlStateDisabled,
@@ -121,16 +139,18 @@ class Symbol
     application: UIControlStateApplication,
   }
 
-  @controlevents = {
+  @control_events = {
     touch: UIControlEventTouchUpInside,
     touch_up: UIControlEventTouchUpInside,
     touch_down: UIControlEventTouchDown,
-    change:  UIControlEventValueChanged|UIControlEventEditingChanged,
+    touch_start: UIControlEventTouchDown | UIControlEventTouchDragEnter,
+    touch_stop: UIControlEventTouchUpInside | UIControlEventTouchCancel | UIControlEventTouchDragExit,
+    change:  UIControlEventValueChanged | UIControlEventEditingChanged,
     begin: UIControlEventEditingDidBegin,
     end: UIControlEventEditingDidEnd,
     # I'm leaving this for backwards compatibility.  please use 'change' or
     # 'editing_did_change':
-    changed: UIControlEventValueChanged|UIControlEventEditingChanged,
+    changed: UIControlEventValueChanged | UIControlEventEditingChanged,
 
     touch_down_repeat: UIControlEventTouchDownRepeat,
     touch_drag_inside: UIControlEventTouchDragInside,
@@ -171,6 +191,15 @@ class Symbol
     system: :systemFontSize,
   }
 
+  @date_styles = {
+    no: NSDateFormatterNoStyle,
+    none: NSDateFormatterNoStyle,
+    short: NSDateFormatterShortStyle,
+    medium: NSDateFormatterMediumStyle,
+    long: NSDateFormatterLongStyle,
+    full: NSDateFormatterFullStyle,
+  }
+
   @returnkeys = {
     default:       UIReturnKeyDefault,
     return:        UIReturnKeyDefault,
@@ -207,6 +236,28 @@ class Symbol
     countdowntimer: UIDatePickerModeCountDownTimer
   }
 
+  @content_modes = {
+    scale: UIViewContentModeScaleToFill,
+    scale_to_fill: UIViewContentModeScaleToFill,
+    scaletofill: UIViewContentModeScaleToFill,
+    fit: UIViewContentModeScaleAspectFit,
+    scaleaspectfit: UIViewContentModeScaleAspectFit,
+    scale_aspect_fit: UIViewContentModeScaleAspectFit,
+    fill: UIViewContentModeScaleAspectFill,
+    scaleaspectfill: UIViewContentModeScaleAspectFill,
+    scale_aspect_fill: UIViewContentModeScaleAspectFill,
+    redraw: UIViewContentModeRedraw,
+    center: UIViewContentModeCenter,
+    top: UIViewContentModeTop,
+    bottom: UIViewContentModeBottom,
+    left: UIViewContentModeLeft,
+    right: UIViewContentModeRight,
+    topleft: UIViewContentModeTopLeft,
+    topright: UIViewContentModeTopRight,
+    bottomleft: UIViewContentModeBottomLeft,
+    bottomright: UIViewContentModeBottomRight,
+  }
+
   @tableview_styles = {
     plain:   UITableViewStylePlain,
     grouped: UITableViewStyleGrouped,
@@ -245,6 +296,14 @@ class Symbol
     gray: UITableViewCellSelectionStyleGray,
   }
 
+  @tableview_cellseparatorstyle = {
+    none: UITableViewCellSeparatorStyleNone,
+    singleline: UITableViewCellSeparatorStyleSingleLine,
+    single: UITableViewCellSeparatorStyleSingleLine,
+    singlelineetched: UITableViewCellSeparatorStyleSingleLineEtched,
+    etched: UITableViewCellSeparatorStyleSingleLineEtched,
+  }
+
   @statusbar_styles = {
     default:     UIStatusBarStyleDefault,
     black:       UIStatusBarStyleBlackOpaque,
@@ -344,6 +403,28 @@ class Symbol
     i540:       UIImagePickerControllerQualityTypeIFrame960x540,
   }
 
+  @ca_timingfunctions = {
+    linear:            KCAMediaTimingFunctionLinear,
+    easein:            KCAMediaTimingFunctionEaseIn,
+    ease_in:           KCAMediaTimingFunctionEaseIn,
+    easeout:           KCAMediaTimingFunctionEaseOut,
+    ease_out:          KCAMediaTimingFunctionEaseOut,
+    easeinout:         KCAMediaTimingFunctionEaseInEaseOut,
+    ease_in_out:       KCAMediaTimingFunctionEaseInEaseOut,
+    ease_in_ease_out:  KCAMediaTimingFunctionEaseInEaseOut,
+    default:           KCAMediaTimingFunctionDefault,
+  }
+
+  @gesture_recognizer_states = {
+    possible:   UIGestureRecognizerStatePossible,
+    began:      UIGestureRecognizerStateBegan,
+    changed:    UIGestureRecognizerStateChanged,
+    ended:      UIGestureRecognizerStateEnded,
+    cancelled:  UIGestureRecognizerStateCancelled,
+    failed:     UIGestureRecognizerStateFailed,
+    recognized: UIGestureRecognizerStateRecognized,
+  }
+
   private
   def look_in(here)
     return here[self] if here.has_key? self
@@ -355,6 +436,10 @@ class Symbol
     look_in(Symbol.devices)
   end
 
+  def uideviceorientation
+    look_in(Symbol.device_orientations)
+  end
+
   def uitextalignment
     look_in(Symbol.textalignments)
   end
@@ -371,26 +456,28 @@ class Symbol
   alias uibaseline uibaselineadjustment
 
 
-  def uiorientation
+  def uiinterfaceorientation
     look_in(Symbol.orientations)
   end
+  alias uiorientation uiinterfaceorientation
 
   def uibuttontype
     look_in(Symbol.buttontypes)
   end
 
   def uibordertype
-    look_in(Symbol.bordertypes)
+    look_in(Symbol.border_types)
   end
+  alias uiborderstyle uibordertype
 
   def uicontrolstate
-    look_in(Symbol.controlstates)
+    look_in(Symbol.control_states)
   end
   alias uistate uicontrolstate
 
 
   def uicontrolevent
-    look_in(Symbol.controlevents)
+    look_in(Symbol.control_events)
   end
 
   def uireturnkey
@@ -413,35 +500,39 @@ class Symbol
     look_in(Symbol.datepicker_modes)
   end
 
+  def uicontentmode
+    look_in(Symbol.content_modes)
+  end
+  alias uiviewcontentmode uicontentmode
+
   def uitablestyle
     look_in(Symbol.tableview_styles)
   end
   alias uitableviewstyle uitablestyle
 
-
   def uitablerowanimation
     look_in(Symbol.tableview_rowanimation)
   end
   alias uitableviewrowanimation uitablerowanimation
 
-
   def uitablecellstyle
     look_in(Symbol.tableview_cellstyles)
   end
   alias uitableviewcellstyle uitablecellstyle
 
-
   def uitablecellaccessory
     look_in(Symbol.tableview_cellaccessorytype)
   end
   alias uitableviewcellaccessorytype uitablecellaccessory
 
-
   def uitablecellselectionstyle
     look_in(Symbol.tableview_cellselectionstyle)
   end
   alias uitableviewcellselectionstyle uitablecellselectionstyle
 
+  def uitablecellseparatorstyle
+    look_in(Symbol.tableview_cellseparatorstyle)
+  end
 
   def uistatusbarstyle
     look_in(Symbol.statusbar_styles)
@@ -459,10 +550,12 @@ class Symbol
     look_in(Symbol.keyboardtypes)
   end
 
-  def uiautoresize
+  def uiautoresizemask
     look_in(Symbol.autoresizemasks)
   end
   alias uiviewautoresizing uiautoresize
+  alias uiautoresizingmask uiautoresizemask
+  alias uiautoresize uiautoresizemask
 
   def uiimagesource
     look_in(Symbol.image_sourcetypes)
@@ -485,6 +578,16 @@ class Symbol
   end
   alias uiimagequalitytype uiimagequality
 
+  def catimingfunction
+    look_in(Symbol.ca_timingfunctions)
+  end
+  alias catiming catimingfunction
+
+  def uigesturerecognizerstate
+    look_in(Symbol.gesture_recognizer_states)
+  end
+  alias uigesturestate uigesturerecognizerstate
+
   def uifont(size=UIFont.systemFontSize)
     # system fonts
     if Symbol.system_fonts.has_key? self
@@ -508,4 +611,9 @@ class Symbol
     return size.to_f
   end
 
+  def nsdatestyle
+    look_in(Symbol.date_styles)
+  end
+  alias nsdateformatterstyle nsdatestyle
+
 end