sugarcube 1.5.9 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 095bfec455df3479380c6c660fc39317b97129a8
-  data.tar.gz: 14ec967daf20d6b0ea2090abd8098cab5c8c67d7
+  metadata.gz: 1e1417a3329f05a87872dd59e8472640896a337c
+  data.tar.gz: 0e5f00b2c3c673b4ba29f3661ffd3bc5c27f1f58
 SHA512:
-  metadata.gz: 718f2a93953af262d767e716c69ac2f824a639c9a5835590666b023082573fb0a4df6a2f02cbfe30055db44f573b7af79734fae1b6ef5ac8b7e37d14e799cc96
-  data.tar.gz: 65c9bab6c3b42c9de6c2ec3b977a5a685b7787080591e2883b1d754278bd228654ca73c8056d5f51c252eab2eaafda99e56c0667ed19b9586af6b9ab2d3e2f09
+  metadata.gz: 47cbe203746a7c8cee85d0382542e72175fab5e8e9d61230b2decff908cb2a34abda874df732bdd770edcfcb02fe67778b4aea5ce70a5f248f8c96f6d317e2a9
+  data.tar.gz: 9d5506c2fb6b8dfe7b3ec64538c8cdee291e77be03305d017010222e1515305d2d1bad5a44289574c7fd6fb94ba0182ecd0bf001c4e1d91854a875dee4b3d4a0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sugarcube (1.5.9)
+    sugarcube (1.6.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/sugarcube-animations/caanimation.rb

@@ -2,27 +2,49 @@ class CAAnimation
 
   class << self
 
-    def basic(target, key_path, options={}, &block)
+    private def _sugarcube_apply_animation_options(animation, options)
+      animation.duration = options[:duration] if options.key?(:duration)
+      animation.delegate = options[:delegate] if options.key?(:delegate)
+      animation.speed = options[:speed] if options.key?(:speed)
+      animation.repeatCount = options[:repeat] if options.key?(:repeat)
+      animation.repeatCount = options[:repeat_count] if options.key?(:repeat_count)
+      animation.repeatDuration = options[:repeat_duration] if options.key?(:repeat_duration)
+      animation.removedOnCompletion = options.fetch(:remove, true)
+    end
+
+    # If you pass a block, that block will be called at the end of the
+    # animation.
+    def basic(key_path, options={}, &block)
       animation = CABasicAnimation.animationWithKeyPath(key_path)
-      animation.duration = options[:duration] if options[:duration]
-      animation.delegate = options[:delegate] if options[:delegate]
+      _sugarcube_apply_animation_options(animation, options)
 
       if options.key?(:from) || options.key?(:to) || options.key?(:by)
-        add_animation = options.fetch(:add, true)
+        animation.fromValue = options[:from] if options.key?(:from)
+        animation.toValue = options[:to] if options.key?(:to)
+        animation.byValue = options[:by] if options.key?(:by)
+      end
 
-        animation.fromValue = options[:from] if options[:from]
-        animation.toValue = options[:to] if options[:to]
-        animation.byValue = options[:by] if options[:by]
-      else
-        add_animation = options.fetch(:add, false)
+      return animation
+    end
+
+    def keyframe(key_path, options={}, &block)
+      timing_function = options.fetch(:timing, KCAMediaTimingFunctionDefault)
+      if timing_function.is_a?(NSString)
+        timing_function = CAMediaTimingFunction.functionWithName(timing_function)
       end
+      fill_mode = options.fetch(:fill_mode, KCAFillModeForwards)
+
+      animation = CAKeyframeAnimation.animationWithKeyPath(key_path)
+      _sugarcube_apply_animation_options(animation, options)
+      animation.timingFunction = timing_function
+      animation.fillMode = fill_mode
 
-      if add_animation
-        target.addAnimation(animation, forKey:key_path)
-        target.send("#{key_path}=", options[:to])
+      if options.key?(:values)
+        animation.values = options[:values]
+      elsif options.key?(:path)
+        animation.path = options[:path]
       end
 
-      block.call(animation) if block
       return animation
     end
 

data/lib/sugarcube-animations/calayer.rb

@@ -1,7 +1,44 @@
 class CALayer
 
   def basic_animation(key_path, options={})
-    CAAnimation.basic(self, key_path, options)
+    animation = CAAnimation.basic(key_path, options)
+
+    should_add = options.fetch(:add, true)
+    if should_add
+      if should_add.is_a?(NSString)
+        name = should_add
+      else
+        name = key_path
+      end
+
+      self.addAnimation(animation, forKey: name)
+    end
+
+    if options.key?(:to)
+      self.setValue(options[:to], forKeyPath: key_path)
+    end
+
+    return animation
+  end
+
+  def keyframe_animation(key_path, options={})
+    animation = CAAnimation.keyframe(key_path, options)
+
+    should_add = options.fetch(:add, true)
+    if should_add
+      if should_add.is_a?(NSString)
+        name = should_add
+      else
+        name = key_path
+      end
+      self.addAnimation(animation, forKey: name)
+    end
+
+    if options.key?(:values)
+      self.setValue(options[:values].last, forKeyPath: key_path)
+    end
+
+    return animation
   end
 
 end

data/lib/sugarcube-animations/uiview.rb

@@ -2,6 +2,22 @@ class UIView
 
   class << self
 
+    # This is an internal helper method to determine the animation options.
+    def sugarcube_animation_options(options)
+      animation_options = options[:options]
+      animation_options = animation_options.uianimationoption if animation_options.respond_to?(:uianimationoption)
+      unless animation_options
+        curve = options.fetch(:curve, UIViewAnimationOptionCurveEaseInOut)
+        curve = curve.uianimationoption if curve.respond_to?(:uianimationoption)
+
+        from_current = options.fetch(:from_current, true) ? UIViewAnimationOptionBeginFromCurrentState : 0
+        allow_interaction = options.fetch(:allow_interaction, false) ? UIViewAnimationOptionAllowUserInteraction : 0
+
+        animation_options = curve | from_current | allow_interaction
+      end
+      return animation_options
+    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.
@@ -10,10 +26,10 @@ class UIView
     # @option options [Float] :damping Enables the "spring" animation.  Value of 1.0 is a stiff spring.
     # @option options [Float] :velocity Used in a spring animation to set the initial velocity
     # @option options [Proc]  :after A block that is executed when the animation is complete, useful for chaining (though the `animation_chain` method is better!)
-    # @option options [Fixnum] :options The options parameter that is passed to the UIView.animateWithDuration(...) method.  You can also use the more verbose options `:curve`, `:from_current`, and `:allow_interaction`
-    # @option options [Fixnum] :curve The animation curve option. default: UIViewAnimationOptionCurveEaseIn
-    # @option options [Boolean] :from_current Whether or not to have animations start from their current position (aka UIViewAnimationOptionBeginFromCurrentState)
-    # @option options [Boolean] :allow_interaction aka UIViewAnimationOptionAllowUserInteraction
+    # @option options [Fixnum,Symbol] :options The options parameter that is passed to the UIView.animateWithDuration(...) method.  You can also use the more intuitive options `:curve`, `:from_current`, and `:allow_interaction`. `uianimationcurve` symbols (e.g. :ease_in_out) are converted to Fixnum.
+    # @option options [Fixnum,Symbol] :curve The animation curve option. `uianimationcurve` symbols (e.g. :ease_in_out) are converted to Fixnum. default: UIViewAnimationOptionCurveEaseInOut
+    # @option options [Boolean] :from_current Whether or not to have animations start from their current position. default: true (aka UIViewAnimationOptionBeginFromCurrentState)
+    # @option options [Boolean] :allow_interaction default: false (aka UIViewAnimationOptionAllowUserInteraction)
     def animate(options={}, more_options={}, &animations)
       raise "animation block is required" unless animations
 
@@ -48,16 +64,7 @@ class UIView
         after_adjusted = nil
       end
 
-      animation_options = options[:options]
-      unless animation_options
-        curve = options.fetch(:curve, UIViewAnimationOptionCurveEaseInOut)
-        curve = curve.uianimationcurve if curve.is_a?(Symbol)
-
-        from_current = options.fetch(:from_current, true) ? UIViewAnimationOptionBeginFromCurrentState : 0
-        allow_interaction = options.fetch(:allow_interaction, false) ? UIViewAnimationOptionAllowUserInteraction : 0
-
-        animation_options = curve | from_current
-      end
+      animation_options = sugarcube_animation_options(options)
 
       if duration == 0 && delay == 0
         animations.call
@@ -443,7 +450,10 @@ class UIView
     end
 
     options[:duration] ||= default_duration
-    options[:options] ||= UIViewAnimationOptionCurveEaseIn|UIViewAnimationOptionBeginFromCurrentState
+    unless options.key?(:options) || options.key?(:curve)
+      options[:options] = UIView.sugarcube_animation_options(curve: UIViewAnimationOptionCurveEaseIn)
+    end
+
     reset_transform = self.transform
     reset_after = ->(finished) do
       self.transform = reset_transform
@@ -504,7 +514,9 @@ class UIView
     reset_center = self.center
 
     options[:duration] ||= default_duration
-    options[:options] ||= UIViewAnimationOptionCurveEaseOut
+    unless options.key?(:options) || options.key?(:curve)
+      options[:options] = UIView.sugarcube_animation_options(curve: UIViewAnimationOptionCurveEaseOut)
+    end
     options[:after] = after
 
     window = UIApplication.sharedApplication.windows[0]

data/lib/sugarcube-color/fixnum.rb

@@ -6,7 +6,7 @@ class Fixnum
   #     UIColor.colorWithRed(1.0, green:1.0, blue: 1.0, alpha:1.0)
   #     UIColor.colorWithRed(1.0, green:1.0, blue: 1.0, alpha:0.33)
   def uicolor(alpha=nil)
-    alpha = 1.0 if alpha.nil?
+    alpha ||= 1.0
 
     red = ((self & 0xFF0000) >> 16).to_f / 255.0
     green = ((self & 0xFF00) >> 8).to_f / 255.0
@@ -15,4 +15,8 @@ class Fixnum
     UIColor.colorWithRed(red, green:green, blue:blue, alpha:alpha.to_f)
   end
 
+  def cgcolor(alpha=nil)
+    self.uicolor(alpha).CGColor
+  end
+
 end

data/lib/sugarcube-color/nsarray.rb

@@ -1,14 +1,20 @@
 class NSArray
 
   # [160, 210, 242].uicolor => 0xA0D2F2.uicolor
-  def uicolor(alpha=1.0)
+  # [160, 210, 242, 0.5].uicolor => 0xA0D2F2.uicolor(0.5)
+  def uicolor(alpha=nil)
     red = self[0] / 255.0
     green = self[1] / 255.0
     blue = self[2] / 255.0
     if self[3]
       alpha = self[3]
     end
-    UIColor.colorWithRed(red, green:green, blue:blue, alpha:alpha.to_f)
+    alpha ||= 1.0
+    UIColor.colorWithRed(red, green: green, blue: blue, alpha: alpha.to_f)
+  end
+
+  def cgcolor(alpha=nil)
+    self.uicolor(alpha).CGColor
   end
 
 end

data/lib/sugarcube-color/nsstring.rb

@@ -13,4 +13,8 @@ class NSString
     img && img.uicolor(alpha)
   end
 
+  def cgcolor(alpha=nil)
+    self.uicolor(alpha).CGColor
+  end
+
 end

data/lib/sugarcube-color/symbol.rb

@@ -29,6 +29,10 @@ class Symbol
     color
   end
 
+  def cgcolor(alpha=nil)
+    self.uicolor(alpha).CGColor
+  end
+
   @uicolors__deprecated = {
     darkgray: :dark_gray,
     lightgray: :light_gray,

data/lib/sugarcube-color/uicolor.rb

@@ -8,8 +8,12 @@ class UIColor
     end
   end
 
-  def cgcolor
-    self.CGColor
+  def cgcolor(alpha=nil)
+    if alpha
+      self.uicolor(alpha).CGColor
+    else
+      self.CGColor
+    end
   end
 
   # blends two colors by averaging the RGB and alpha components.

data/lib/sugarcube-color/uiimage.rb

@@ -3,11 +3,15 @@ class UIImage
   # @return [UIColor]
   def uicolor(alpha=nil)
     color = UIColor.colorWithPatternImage(self)
-    if not alpha.nil?
+    if alpha
       color = color.colorWithAlphaComponent(alpha.to_f)
     end
 
     color
   end
 
+  def cgcolor(alpha=nil)
+    self.uicolor(alpha).CGColor
+  end
+
 end

data/lib/sugarcube-constants/symbol.rb

@@ -149,6 +149,11 @@ class Symbol
   end
   alias uiviewanimationcurve uianimationcurve
 
+  def uianimationoption
+    SugarCube.look_in(self, Symbol.uianimationoption)
+  end
+  alias uiviewanimationoption uianimationoption
+
   def uitablestyle
     SugarCube.look_in(self, Symbol.uitablestyle)
   end
@@ -271,6 +276,7 @@ class Symbol
     attr :uicontentmode
     attr :uicontentmode__deprecated
     attr :uianimationcurve
+    attr :uianimationoption
 
     attr :uitablestyle
     attr :uitablerowanimation
@@ -657,6 +663,35 @@ class Symbol
     linear:      UIViewAnimationCurveLinear
   }
 
+  @uianimationoption = {
+    layout_subviews:             UIViewAnimationOptionLayoutSubviews,
+    allow_user_interaction:      UIViewAnimationOptionAllowUserInteraction,
+    begin_from_current_state:    UIViewAnimationOptionBeginFromCurrentState,
+    repeat:                      UIViewAnimationOptionRepeat,
+    autoreverse:                 UIViewAnimationOptionAutoreverse,
+    override_inherited_duration: UIViewAnimationOptionOverrideInheritedDuration,
+    override_inherited_curve:    UIViewAnimationOptionOverrideInheritedCurve,
+    allow_animated_content:      UIViewAnimationOptionAllowAnimatedContent,
+    show_hide_transition_views:  UIViewAnimationOptionShowHideTransitionViews,
+    override_inherited_options:  UIViewAnimationOptionOverrideInheritedOptions,
+    curve_ease_in_out:           UIViewAnimationOptionCurveEaseInOut,
+    ease_in_out:                 UIViewAnimationOptionCurveEaseInOut,
+    curve_ease_in:               UIViewAnimationOptionCurveEaseIn,
+    ease_in:                     UIViewAnimationOptionCurveEaseIn,
+    curve_ease_out:              UIViewAnimationOptionCurveEaseOut,
+    ease_out:                    UIViewAnimationOptionCurveEaseOut,
+    curve_linear:                UIViewAnimationOptionCurveLinear,
+    linear:                      UIViewAnimationOptionCurveLinear,
+    transition_none:             UIViewAnimationOptionTransitionNone,
+    transition_flip_from_left:   UIViewAnimationOptionTransitionFlipFromLeft,
+    transition_flip_from_right:  UIViewAnimationOptionTransitionFlipFromRight,
+    transition_curl_up:          UIViewAnimationOptionTransitionCurlUp,
+    transition_curl_down:        UIViewAnimationOptionTransitionCurlDown,
+    transition_cross_dissolve:   UIViewAnimationOptionTransitionCrossDissolve,
+    transition_flip_from_top:    UIViewAnimationOptionTransitionFlipFromTop,
+    transition_flip_from_bottom: UIViewAnimationOptionTransitionFlipFromBottom,
+  }
+
   @uitablestyle = {
     plain:   UITableViewStylePlain,
     grouped: UITableViewStyleGrouped,

data/lib/sugarcube-factories/uiactionsheet.rb

@@ -17,7 +17,7 @@ class UIActionSheet
   #     # use one handler for all buttons
   #     UIActionSheet.alert("title", buttons: [...]) { |button| }
   def self.alert(title, options={}, &block)
-    if title.is_a?(Hash)
+    if title.is_a?(NSDictionary)
       options = title
       title = options[:title]
     end
@@ -49,9 +49,14 @@ class UIActionSheet
       raise 'If you only have one button, use a :success handler, not :cancel or :destructive'
     end
 
+    # the button titles, mapped to how UIActionSheet orders them.  These are
+    # passed to the success handler.
+    buttons_mapped = {}
+
     # cancelButtonTitle:destructiveButtonTitle:otherButtonTitles:
     # uses localized buttons in the actual alert
-    if buttons.is_a?(Hash)
+    if buttons.is_a?(NSDictionary)
+      button_titles = buttons.keys
       if buttons.key?(:cancel)
         args << (buttons[:cancel] && buttons[:cancel].localized)
       else
@@ -64,19 +69,11 @@ class UIActionSheet
       end
       args.concat(buttons.select { |k, m| k != :cancel && k != :destructive }.map { |k, m| m && m.localized })
     else
+      button_titles = buttons
       args.concat(buttons.map { |m| m && m.localized })
     end
     args << nil  # otherButtonTitles:..., nil
 
-    # the button titles, mapped to how UIActionSheet orders them.  These are
-    # passed to the success handler.
-    buttons_mapped = {}
-    if buttons.is_a?(Hash)
-      button_titles = buttons.keys
-    else
-      button_titles = buttons
-    end
-
     if args[2] && args[3]  # cancel && destructive buttons
       buttons_mapped[0] = button_titles[1]                   # destructiveIndex == 0, button == 1
       buttons_mapped[button_titles.length - 1] = button_titles[0]  # cancelIndex == last, button == 0

data/lib/sugarcube-factories/uialertview.rb

@@ -19,7 +19,7 @@ class UIAlertView
   #       success: proc{ |pressed| puts "pressed: #{pressed.inspect}" },
   #       )  # pressed will be :ok or :no_way
   def self.alert(title, options={}, more_options={}, &block)
-    if title.is_a?(Hash)
+    if title.is_a?(NSDictionary)
       options = title
       title = options[:title]
       message = options[:message]
@@ -59,22 +59,13 @@ class UIAlertView
       elsif options[:success]
         buttons << "OK"
       end
-    elsif buttons.is_a?(Hash)
-
     elsif buttons.length == 1 && options[:cancel]
       raise "If you only have one button, use a :success handler, not :cancel (and definitely not BOTH)"
     end
 
-    # the button titles.  These are passed to the success handler.
-    if buttons.is_a?(Hash)
-      button_titles = buttons.keys
-    else
-      button_titles = buttons
-    end
-    delegate.buttons = button_titles
-
     # uses localized buttons in the actual alert
-    if buttons.is_a?(Hash)
+    if buttons.is_a?(NSDictionary)
+      button_titles = buttons.keys
       if buttons.key?(:cancel)
         args << (buttons[:cancel] && buttons[:cancel].localized)
       else
@@ -82,8 +73,10 @@ class UIAlertView
       end
       args.concat(buttons.select { |k, m| k != :cancel }.map { |k, m| m && m.localized })
     else
+      button_titles = buttons
       args.concat(buttons.map { |m| m && m.localized })
     end
+    delegate.buttons = button_titles
     args << nil  # otherButtonTitles:..., nil
 
     alert = self.alloc

data/lib/sugarcube-nsdate/nsdate.rb

@@ -51,15 +51,19 @@ class NSDate
   # and
   # <http://www.unicode.org/reports/tr35/tr35-19.html#Date_Field_Symbol_Table>
   # for more information about date format strings.
-  def string_with_format(format)
+  def string_with_format(format, options={})
+    locale = options[:locale] || NSLocale.currentLocale
+    timezone = options[:timezone] || NSTimeZone.defaultTimeZone
+    
     if format.is_a?(Symbol)
       formatters = SugarCubeFormats[format]
       raise "No format found for #{format.inspect}" unless formatters
+      locale = NSLocale.localeWithLocaleIdentifier "en_US"
       retval = ''
       formatters.each do |formatter|
         case formatter
         when Symbol
-          retval << string_with_format(formatter.to_s)
+          retval << string_with_format(formatter.to_s, locale:locale, timezone:timezone)
         when String
           retval << formatter
         end
@@ -67,9 +71,10 @@ class NSDate
       return retval
     else
       format_template = NSDateFormatter.dateFormatFromTemplate(format, options:0,
-                                                        locale:NSLocale.currentLocale)
+                                                        locale:locale)
       date_formatter = NSDateFormatter.new
       date_formatter.setDateFormat(format_template)
+      date_formatter.setTimeZone(timezone)
       return date_formatter.stringFromDate(self)
     end
   end

data/lib/sugarcube/version.rb

@@ -1,3 +1,3 @@
 module SugarCube
-  Version = '1.5.9'
+  Version = '1.6.0'
 end

data/spec/caanimation_spec.rb

@@ -0,0 +1,73 @@
+describe CAAnimation do
+
+  describe "should have `basic` animation" do
+
+    it "should accept keypath" do
+      animation = CAAnimation.basic('opacity')
+      animation.keyPath.should == 'opacity'
+    end
+
+    it "should assign :to value" do
+      animation = CAAnimation.basic('opacity', to: 0)
+      animation.toValue.should == 0
+    end
+
+    it "should assign :from value" do
+      animation = CAAnimation.basic('opacity', from: 1)
+      animation.fromValue.should == 1
+    end
+
+    it "should assign :by value" do
+      animation = CAAnimation.basic('opacity', by: -1)
+      animation.byValue.should == -1
+    end
+
+  end
+
+  describe "should have `keyframe` animation" do
+
+    it "should accept keypath" do
+      animation = CAAnimation.keyframe('opacity')
+      animation.keyPath.should == 'opacity'
+    end
+
+    it "should assign :values" do
+      animation = CAAnimation.keyframe('opacity', values: [0, 0.5, 1])
+      animation.values.should == [0, 0.5, 1]
+    end
+
+    it "should assign :timing value" do
+      animation = CAAnimation.keyframe('opacity', timing: KCAMediaTimingFunctionLinear)
+      animation.timingFunction.should == CAMediaTimingFunction.functionWithName(KCAMediaTimingFunctionLinear)
+    end
+
+  end
+
+  describe "should have `CALayer#basic_animation` helper" do
+
+    it 'should create and add an animation' do
+      layer = CALayer.layer
+      animation = layer.basic_animation('opacity', to: 1, add: 'spec')
+      layer.animationForKey('spec').should.not == nil
+      # cannot compare animations because addAnimation creates a copy of the CAAnimation
+      # don't do this:
+      #     layer.animationForKey('spec').should == animation
+      layer.animationForKey('spec').keyPath.should == 'opacity'
+      layer.animationForKey('spec').toValue.should == 1
+    end
+
+  end
+
+  describe "should have `CALayer#keyframe_animation` helper" do
+
+    it 'should create and add an animation' do
+      layer = CALayer.layer
+      animation = layer.keyframe_animation('opacity', values: [0, 1], add: 'spec')
+      layer.animationForKey('spec').should.not == nil
+      layer.animationForKey('spec').keyPath.should == 'opacity'
+      layer.animationForKey('spec').values.should == [0, 1]
+    end
+
+  end
+
+end

data/spec/calayer_spec.rb

@@ -1,4 +1,4 @@
-describe "CALayer" do
+describe CALayer do
 
   it "should support <<" do
     layer = CALayer.layer

data/spec/color_spec.rb

@@ -1,9 +1,15 @@
-describe 'UIColor' do
+describe UIColor do
 
   it "should have a #uicolor method" do
     UIColor.redColor.uicolor.should == UIColor.redColor
   end
 
+  it "should have a #cgcolor method" do
+    -> do
+      UIColor.redColor.cgcolor.should == UIColor.redColor.CGColor
+    end.should.not.raise
+  end
+
   it "should have a #uicolor(alpha) method" do
     UIColor.redColor.uicolor(0.5).alpha.should == 0.5
   end
@@ -76,23 +82,23 @@ describe 'UIColor' do
   end
 
   it "should have a #invert method" do
-    :red.uicolor.invert.should == UIColor.cyanColor
-    :green.uicolor.invert.should == UIColor.magentaColor
-    :blue.uicolor.invert.should == UIColor.yellowColor
+    UIColor.redColor.invert.should == UIColor.cyanColor
+    UIColor.greenColor.invert.should == UIColor.magentaColor
+    UIColor.blueColor.invert.should == UIColor.yellowColor
 
-    :white.uicolor.invert.red.should == 0
-    :white.uicolor.invert.green.should == 0
-    :white.uicolor.invert.blue.should == 0
+    UIColor.whiteColor.invert.red.should == 0
+    UIColor.whiteColor.invert.green.should == 0
+    UIColor.whiteColor.invert.blue.should == 0
 
-    :black.uicolor.invert.red.should == 1
-    :black.uicolor.invert.green.should == 1
-    :black.uicolor.invert.blue.should == 1
+    UIColor.blackColor.invert.red.should == 1
+    UIColor.blackColor.invert.green.should == 1
+    UIColor.blackColor.invert.blue.should == 1
   end
 
   it "should have a #mix_with method" do
-    white = :white.uicolor
-    black = :black.uicolor
-    gray = :gray.uicolor
+    white = UIColor.whiteColor
+    black = UIColor.blackColor
+    gray = UIColor.grayColor
     white.mix_with(black, 0).red.should == 1
     white.mix_with(black, 0).green.should == 1
     white.mix_with(black, 0).blue.should == 1
@@ -115,3 +121,117 @@ describe 'UIColor' do
   end
 
 end
+
+
+describe 'Fixnum UIColor extensions' do
+  it "should have a 0xffffff#uicolor method" do
+    color = 0xffffff.uicolor
+    color.red.should == 1
+    color.green.should == 1
+    color.blue.should == 1
+    color.alpha.should == 1
+  end
+
+  it "should have a 0xffffff#cgcolor method" do
+    -> do
+      0xffffff.cgcolor.should.not == nil
+    end.should.not.raise
+  end
+
+  it "should have a 0x000000#uicolor(0.5) method" do
+    color = 0.uicolor(0.5)
+    color.red.should == 0
+    color.green.should == 0
+    color.blue.should == 0
+    color.alpha.should == 0.5
+  end
+end
+
+
+describe 'NSArray UIColor extensions' do
+  it "should have a [255, 255, 255]#uicolor method" do
+    color = [255, 255, 255].uicolor
+    color.red.should == 1
+    color.green.should == 1
+    color.blue.should == 1
+    color.alpha.should == 1
+  end
+
+  it "should have a [255, 255, 255]#cgcolor method" do
+    -> do
+      [255, 255, 255].cgcolor.should.not == nil
+    end.should.not.raise
+  end
+
+  it "should have a [0, 0, 0]#uicolor(0.5) method" do
+    color = [0, 0, 0].uicolor(0.5)
+    color.red.should == 0
+    color.green.should == 0
+    color.blue.should == 0
+    color.alpha.should == 0.5
+  end
+end
+
+
+describe 'NSString UIColor extensions' do
+  it "should have '#ffffff'.uicolor method" do
+    color = '#ffffff'.uicolor
+    color.should.be.kind_of(UIColor)
+    color.red.should == 1.0
+    color.green.should == 1.0
+    color.blue.should == 1.0
+
+    color = '#808080'.uicolor
+    color.should.be.kind_of(UIColor)
+    ((color.red * 2).round / 2.0).should == 0.5
+    ((color.green * 2).round / 2.0).should == 0.5
+    ((color.blue * 2).round / 2.0).should == 0.5
+  end
+
+  it "should have '#ffffff'.cgcolor method" do
+    -> do
+      '#ffffff'.cgcolor.should.not == nil
+    end.should.not.raise
+  end
+
+  it "should have '#000000'.uicolor(0.5) method" do
+    color = '#000000'.uicolor(0.5)
+    color.should.be.kind_of(UIColor)
+    color.red.should == 0
+    color.green.should == 0
+    color.blue.should == 0
+    color.alpha.should == 0.5
+  end
+
+  it "that supports image names" do
+    'little_square'.uicolor.should == 'little_square'.uiimage.uicolor
+  end
+
+  it "that supports non-existant image names" do
+    'this is not my beautiful house!'.uicolor.should == nil
+  end
+end
+
+
+describe 'UIImage UIColor extensions' do
+  it 'should support #uicolor' do
+    color = UIImage.imageNamed('little_square').uicolor
+    color.should.be.kind_of(UIColor)
+  end
+
+  it 'should support #cgcolor' do
+    -> do
+      UIImage.imageNamed('little_square').cgcolor
+    end.should.not.raise
+  end
+
+  it 'should support #uicolor(0.5)' do
+    -> do
+      UIImage.imageNamed('little_square').uicolor(0.5)
+      # unfortunately, this doesn't work:
+      # image.alpha.should == 0.5  # alpha returns 0 because this is not an RGB or HSB color
+    end.should.not.raise
+  end
+end
+
+

data/spec/fixnum_spec.rb

@@ -1,21 +1,5 @@
 describe "Fixnum" do
 
-  it "should have a 0xffffff#uicolor method" do
-    color = 0xffffff.uicolor
-    color.red.should == 1
-    color.green.should == 1
-    color.blue.should == 1
-    color.alpha.should == 1
-  end
-
-  it "should have a 0x000000#uicolor(0.5) method" do
-    color = 0.uicolor(0.5)
-    color.red.should == 0
-    color.green.should == 0
-    color.blue.should == 0
-    color.alpha.should == 0.5
-  end
-
   it "should have a #nth method" do
     {
       0    => 'th',

data/spec/nsarray_spec.rb

@@ -27,22 +27,6 @@ describe "NSArray" do
     set.containsIndex(4).should == false
   end
 
-  it "should have a [255,255,255]#uicolor method" do
-    color = [255,255,255].uicolor
-    color.red.should == 1
-    color.green.should == 1
-    color.blue.should == 1
-    color.alpha.should == 1
-  end
-
-  it "should have a [0, 0, 0]#uicolor(0.5) method" do
-    color = [0, 0, 0].uicolor(0.5)
-    color.red.should == 0
-    color.green.should == 0
-    color.blue.should == 0
-    color.alpha.should == 0.5
-  end
-  
   it "should have a method #nsset" do
     set = [0,1,0].nsset
     set.count.should == 2

data/spec/nsdate_spec.rb

@@ -101,6 +101,19 @@ describe "NSDate" do
     @date.string_with_format(:iso8601).should == '2013-01-02 12:15:30.000'
   end
 
+  it "should have an NSDate#string_with_format method (:iso8601) and timezone" do
+    date = @date + @date.utc_offset
+    date.string_with_format(:iso8601, timezone:"UTC".nstimezone).should == '2013-01-02 12:15:30.000'
+  end
+
+  it "should have an NSDate#string_with_format method (:ymd)" do
+    @date.string_with_format(:ymd).should == '2013-01-02'
+  end
+
+  it "should have an NSDate#string_with_format method (:hms)" do
+    @date.string_with_format(:hms).should == '12:15:30.000'
+  end
+
   it "should have an NSDate#timezone method" do
     String.should === @date.timezone.name
   end

data/spec/nsstring_spec.rb

@@ -34,30 +34,6 @@ describe "NSString" do
     font.pointSize.should == UIFont.systemFontSize
   end
 
-  describe "should have a #uicolor method" do
-    it "that supports hex" do
-      color = '#ffffff'.uicolor
-      UIColor.should === color
-      color.red.should == 1.0
-      color.green.should == 1.0
-      color.blue.should == 1.0
-
-      color = '#808080'.uicolor
-      UIColor.should === color
-      ((color.red * 2).round / 2.0).should == 0.5
-      ((color.green * 2).round / 2.0).should == 0.5
-      ((color.blue * 2).round / 2.0).should == 0.5
-    end
-
-    it "that supports image names" do
-      'little_square'.uicolor.should == 'little_square'.uiimage.uicolor
-    end
-
-    it "that supports non-existant image names" do
-      'this is not my beautiful house!'.uicolor.should == nil
-    end
-  end
-
   it "should have a #uilabel method" do
     str = 'test'
     str_size = str.sizeWithFont(UIFont.systemFontOfSize(UIFont.labelFontSize))

data/spec/pipes_spec.rb

@@ -10,27 +10,27 @@ describe "Pipes" do
     end
 
     it "should coerce into UIImage" do
-      (@image | UIImage).should.is_a(UIImage)
+      (@image | UIImage).should.be.kind_of(UIImage)
     end
 
     it "should coerce into UIView" do
-      (@image | UIView).should.is_a(UIView)
+      (@image | UIView).should.be.kind_of(UIView)
     end
 
     it "should coerce into UIImageView" do
-      (@image | UIImageView).should.is_a(UIImageView)
+      (@image | UIImageView).should.be.kind_of(UIImageView)
     end
 
     it "should coerce into CIImage" do
-      (@image | CIImage).should.is_a(CIImage)
+      (@image | CIImage).should.be.kind_of(CIImage)
     end
 
     it "should coerce into UIColor" do
-      (@image | UIColor).should.is_a(UIColor)
+      (@image | UIColor).should.be.kind_of(UIColor)
     end
 
     it "should coerce into NSData" do
-      (@image | NSData).should.is_a(NSData)
+      (@image | NSData).should.be.kind_of(NSData)
     end
 
     it "should not support arbitrary coercions" do
@@ -41,13 +41,13 @@ describe "Pipes" do
 
     it "should apply CIFilter" do
       filter = CIFilter.gaussian_blur
-      (@image | filter).should.is_a(CIImage)
+      (@image | filter).should.be.kind_of(CIImage)
     end
 
     it "should apply multiple CIFilters" do
       filter1 = CIFilter.gaussian_blur(1)
       filter2 = CIFilter.gaussian_blur(2)
-      (@image | filter1 | filter2).should.is_a(CIImage)
+      (@image | filter1 | filter2).should.be.kind_of(CIImage)
     end
 
   end
@@ -58,7 +58,7 @@ describe "Pipes" do
     end
 
     it "should coerce into UIImage" do
-      (@view | UIImage).should.is_a(UIImage)
+      (@view | UIImage).should.be.kind_of(UIImage)
     end
 
     it "should not support arbitrary coercions" do
@@ -75,19 +75,19 @@ describe "Pipes" do
     end
 
     it "should coerce into UIImage" do
-      (@image | UIImage).should.is_a(UIImage)
+      (@image | UIImage).should.be.kind_of(UIImage)
     end
 
     it "should coerce into UIView" do
-      (@image | UIView).should.is_a(UIView)
+      (@image | UIView).should.be.kind_of(UIView)
     end
 
     it "should coerce into UIImageView" do
-      (@image | UIImageView).should.is_a(UIImageView)
+      (@image | UIImageView).should.be.kind_of(UIImageView)
     end
 
     it "should coerce into CIImage" do
-      (@image | CIImage).should.is_a(CIImage)
+      (@image | CIImage).should.be.kind_of(CIImage)
     end
 
     it "should not support arbitrary coercions" do
@@ -98,13 +98,13 @@ describe "Pipes" do
 
     it "should apply CIFilter" do
       filter = CIFilter.gaussian_blur
-      (@image | filter).should.is_a(CIImage)
+      (@image | filter).should.be.kind_of(CIImage)
     end
 
     it "should apply multiple CIFilters" do
       filter1 = CIFilter.gaussian_blur(1)
       filter2 = CIFilter.gaussian_blur(2)
-      (@image | filter1 | filter2).should.is_a(CIImage)
+      (@image | filter1 | filter2).should.be.kind_of(CIImage)
     end
 
   end

data/spec/symbol_constants_spec.rb

@@ -310,6 +310,35 @@ describe "Symbol - constants" do
       :linear.uianimationcurve.should == UIViewAnimationCurveLinear
     end
 
+    it 'should support `uianimationoption`' do
+      :layout_subviews.uianimationoption.should == UIViewAnimationOptionLayoutSubviews
+      :allow_user_interaction.uianimationoption.should == UIViewAnimationOptionAllowUserInteraction
+      :begin_from_current_state.uianimationoption.should == UIViewAnimationOptionBeginFromCurrentState
+      :repeat.uianimationoption.should == UIViewAnimationOptionRepeat
+      :autoreverse.uianimationoption.should == UIViewAnimationOptionAutoreverse
+      :override_inherited_duration.uianimationoption.should == UIViewAnimationOptionOverrideInheritedDuration
+      :override_inherited_curve.uianimationoption.should == UIViewAnimationOptionOverrideInheritedCurve
+      :allow_animated_content.uianimationoption.should == UIViewAnimationOptionAllowAnimatedContent
+      :show_hide_transition_views.uianimationoption.should == UIViewAnimationOptionShowHideTransitionViews
+      :override_inherited_options.uianimationoption.should == UIViewAnimationOptionOverrideInheritedOptions
+      :curve_ease_in_out.uianimationoption.should == UIViewAnimationOptionCurveEaseInOut
+      :ease_in_out.uianimationoption.should == UIViewAnimationOptionCurveEaseInOut
+      :curve_ease_in.uianimationoption.should == UIViewAnimationOptionCurveEaseIn
+      :ease_in.uianimationoption.should == UIViewAnimationOptionCurveEaseIn
+      :curve_ease_out.uianimationoption.should == UIViewAnimationOptionCurveEaseOut
+      :ease_out.uianimationoption.should == UIViewAnimationOptionCurveEaseOut
+      :curve_linear.uianimationoption.should == UIViewAnimationOptionCurveLinear
+      :linear.uianimationoption.should == UIViewAnimationOptionCurveLinear
+      :transition_none.uianimationoption.should == UIViewAnimationOptionTransitionNone
+      :transition_flip_from_left.uianimationoption.should == UIViewAnimationOptionTransitionFlipFromLeft
+      :transition_flip_from_right.uianimationoption.should == UIViewAnimationOptionTransitionFlipFromRight
+      :transition_curl_up.uianimationoption.should == UIViewAnimationOptionTransitionCurlUp
+      :transition_curl_down.uianimationoption.should == UIViewAnimationOptionTransitionCurlDown
+      :transition_cross_dissolve.uianimationoption.should == UIViewAnimationOptionTransitionCrossDissolve
+      :transition_flip_from_top.uianimationoption.should == UIViewAnimationOptionTransitionFlipFromTop
+      :transition_flip_from_bottom.uianimationoption.should == UIViewAnimationOptionTransitionFlipFromBottom
+    end
+
     it 'should support `uitablestyle`' do
       :plain.uitablestyle.should == UITableViewStylePlain
       :grouped.uitablestyle.should == UITableViewStyleGrouped

data/spec/symbol_uicolor_spec.rb

@@ -14,6 +14,12 @@ describe "Symbol uicolor" do
       :black.uicolor.should.be.kind_of(UIColor)
     end
 
+    it 'should have cgcolor method' do
+      -> do
+        :black.cgcolor.should.not == nil
+      end.should.not.raise
+    end
+
     it 'should have blue color' do
       @colors[:blue].should == :blueColor
       :blue.uicolor.should.be.kind_of(UIColor)

data/spec/uiview_animation_spec.rb

@@ -109,4 +109,35 @@ describe "UIView animation methods" do
     @after_called.should == true
   end
 
+  it 'should have sugarcube_animation_options helper' do
+    UIView.sugarcube_animation_options({}).should == (UIViewAnimationOptionCurveEaseInOut | UIViewAnimationOptionBeginFromCurrentState)
+  end
+
+  it 'should handle accept :options' do
+    UIView.sugarcube_animation_options(options: UIViewAnimationOptionCurveLinear).should == UIViewAnimationOptionCurveLinear
+    UIView.sugarcube_animation_options(options: UIViewAnimationOptionCurveLinear | UIViewAnimationOptionCurveEaseInOut).should == UIViewAnimationOptionCurveLinear | UIViewAnimationOptionCurveEaseInOut
+  end
+
+  it 'should accept :curve' do
+    opts = UIView.sugarcube_animation_options(curve: UIViewAnimationOptionCurveLinear)
+    (opts & UIViewAnimationOptionCurveLinear).should == UIViewAnimationOptionCurveLinear
+
+    opts = UIView.sugarcube_animation_options(curve: :linear)
+    (opts & UIViewAnimationOptionCurveLinear).should == UIViewAnimationOptionCurveLinear
+  end
+
+  it 'should accept :from_current' do
+    opts = UIView.sugarcube_animation_options(from_current: true)
+    (opts & UIViewAnimationOptionBeginFromCurrentState).should == UIViewAnimationOptionBeginFromCurrentState
+    opts = UIView.sugarcube_animation_options(from_current: false)
+    (opts & UIViewAnimationOptionBeginFromCurrentState).should == 0
+  end
+
+  it 'should accept :allow_interaction' do
+    opts = UIView.sugarcube_animation_options(allow_interaction: true)
+    (opts & UIViewAnimationOptionAllowUserInteraction).should == UIViewAnimationOptionAllowUserInteraction
+    opts = UIView.sugarcube_animation_options(allow_interaction: false)
+    (opts & UIViewAnimationOptionAllowUserInteraction).should == 0
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugarcube
 version: !ruby/object:Gem::Version
-  version: 1.5.9
+  version: 1.6.0
 platform: ruby
 authors:
 - Colin T.A. Gray
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-18 00:00:00.000000000 Z
+date: 2014-04-23 00:00:00.000000000 Z
 dependencies: []
 description: |
   == Description
@@ -145,7 +145,7 @@ files:
 - lib/sugarcube-pointer.rb
 - lib/sugarcube-pointer/nsarray.rb
 - lib/sugarcube-repl.rb
-- lib/sugarcube-repl/object.rb
+- lib/sugarcube-repl/kernel.rb
 - lib/sugarcube-resources.rb
 - lib/sugarcube-timer.rb
 - lib/sugarcube-timer/timer.rb
@@ -198,6 +198,7 @@ files:
 - spec/568_spec.rb
 - spec/animation_chain_spec.rb
 - spec/anonymous_spec.rb
+- spec/caanimation_spec.rb
 - spec/calayer_spec.rb
 - spec/color_components_spec.rb
 - spec/color_other_representations_spec.rb
@@ -268,7 +269,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Extensions for Ruby to make Rubymotion development more enjoyable, and hopefully
@@ -277,6 +278,7 @@ test_files:
 - spec/568_spec.rb
 - spec/animation_chain_spec.rb
 - spec/anonymous_spec.rb
+- spec/caanimation_spec.rb
 - spec/calayer_spec.rb
 - spec/color_components_spec.rb
 - spec/color_other_representations_spec.rb