sugarcube 2.8.2 → 2.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64d971eb3d120c7952f35581299baa11b8f05040
-  data.tar.gz: 1cd8be72a4aefac254d0b29d0250a942a7318297
+  metadata.gz: 3a0e6febb6aacdab99ba33a9b6c0cd0b454b12da
+  data.tar.gz: 0c9dbcb46e81cb7ba3f85e695c0940b7bd19cc9b
 SHA512:
-  metadata.gz: a7fde608a38bfe81d70cdc61298af9feca8bf9f369f2d950746dbf123132cd2eb6baabf24834998269c56f6fd64963f4efc5fa796a60eb2bd8a18b5a90cc63a0
-  data.tar.gz: c1b0618b2e4be3d733b0f0436fc708383fa8ed0e4d2a632fbade2a16f31cd335c76c8a082921ba573fa555409131a251e5da5e9fc399eab300efabe978a78442
+  metadata.gz: a7f0cee0a51409f9e4c48fe257bb89577e5e2ee651862b7fe1e218a69fed9183524fd1191180988cf9d5ff99bf9936b82d26103aafbb3ce62344c1b66e77762e
+  data.tar.gz: fabd1cf378ee275c5358e4ee23e4a09e1e6c3ca749deafa9e46953e29e6f0d0fe539f2e38e5bea754879e1ad311e58c41473d85fdcfa1bae0e772da8eaff8000

data/README.md

@@ -1,8 +1,6 @@
 SugarCube
 =========
 
-Some sugar for your [cocoa](http://rubymotion.com), or your [tea][sweettea].
-
 [![Build Status](https://travis-ci.org/rubymotion/sugarcube.svg?branch=master)](https://travis-ci.org/rubymotion/sugarcube)
 [![Version](https://badge.fury.io/rb/sugarcube.svg)](https://rubygems.org/gems/sugarcube)
 
@@ -38,8 +36,8 @@ Cocoa-wrappage.
 SugarCube started out as a [Fusionbox][] project (see the
 [announcement][fusionbox announcement]), but as its popularity increased, the
 decision was made to offer it to the rubymotion community, in the spirit of
-open-source and collaboration.  It is a great complement to [teacup][],
-especially when paired with [sweettea][]!
+open-source and collaboration.  It is a great complement to [MotionKit][],
+especially when paired with [SweetKit][]!
 
 Documentation
 =============
@@ -82,20 +80,34 @@ written so that it does *not* pollute any classes by default.  So if all you do
 is `require "sugarcube"`, you are NOT going to get much mileage!
 
 In the installation code above, I show the example of using `:require => 'sugarcube-all'`
-to include *all* of SugarCube's extensions.  Usually you will require the
-packages you need from your Rakefile:
+to include *all* of SugarCube's extensions.  You can, alternatively require just
+the packages you need:
+
+###### Gemfile
+```ruby
+gem 'sugarcube', :require => [
+  'sugarcube-uikit',
+  'sugarcube-events',
+  'sugarcube-gestures',
+  'sugarcube-568',
+  'sugarcube-attributedstring',
+]
+```
+
+Or, from your Rakefile:
 
 ```ruby
 $:.unshift('/Library/RubyMotion/lib')
 require 'motion/project/template/ios'
+
 require 'bundler'
 Bundler.require
-require './lib/sugarcube-uikit'
-require './lib/sugarcube-events'
-require './lib/sugarcube-gestures'
-require './lib/sugarcube-568'
-require './lib/sugarcube-attributedstring'
-# ...
+
+require 'sugarcube-uikit'
+require 'sugarcube-events'
+require 'sugarcube-gestures'
+require 'sugarcube-568'
+require 'sugarcube-attributedstring'
 ```
 
 You can require the packages in piecemeal like this, or you can require a group
@@ -406,6 +418,9 @@ view.on_press(duration: 1.5, taps: 1, fingers: 1)
 # this version is only fired when the long-press begins; this is *probably* more
 # useful to you:
 view.on_press_begin do ... end
+
+# or, when the gesture ends:
+view.on_press_ended do ... end
 ```
 
 Notifications
@@ -1168,6 +1183,17 @@ distance = 2.miles  # => 3218.688, that's how many meters are in 2 miles
 1500.in_miles  # converts meters to miles => 0.932056427001953
 ```
 
+### Time
+
+By now you have probably "gotten it" and are hooked on these number helpers.
+Heads up, though, some of these conflict with MotionSupport's definition.
+
+```ruby
+1.second * 5.per_second = 5
+1.day * 3.per_hour = 72
+1.year.in_minutes = 525960.0
+```
+
 ### Sizes
 
 Similar conversion methods for hard disk sizes.  Uses the "mebi-byte" concepts,
@@ -1321,17 +1347,29 @@ Shorthands and hash-like access to the coder/decoder objects.
 ```ruby
 # hash access is the handiest
 coder['key'] = self.value
-self.value = decoder['key']
+@value = decoder['key']
+
+if decoder.key?('key')
+  value = decoder['key']
+end
 
 # but if you want to store booleans and such (in their C form,
 # which will take up less space):
 coder.set('sugarcube_is_neat', toBool: self.sugarcube_is_neat?)
-self.sugarcube_is_neat = decoder.bool('sugarcube_is_neat')
+@sugarcube_is_neat = decoder.bool('sugarcube_is_neat')
 
 coder.set('number_of_things', toInt:self.number_of_things)
-self.number_of_things = decoder.int('number_of_things')
+@number_of_things = decoder.int('number_of_things')
+
+# Archiving and unarchiving is straightforward
+# archiving uses NSKeyedArchiver
+NSCoder.archive(root_object)  # returns NSData
+NSCoder.archive(root_object, to_file: 'foo'.document_path)  # returns success boolean
+# unarchiving uses NSKeyedUnarchiver
+NSCoder.unarchive(data)
+NSCoder.unarchive('foo'.document_path)
 
-# the entire list:
+# the entire list of encode/decode helpers:
 coder.set(key, toBool:value)
 coder.set(key, toDouble:value)
 coder.set(key, toFloat:value)
@@ -1720,8 +1758,8 @@ Contributions
 If you want to see new features, please fork, commit, and pull-request! :smiley:
 
 [BubbleWrap]: https://github.com/rubymotion/BubbleWrap
-[sweettea]: https://github.com/colinta/sweettea
-[teacup]: https://github.com/rubymotion/teacup
+[SweetKit]: https://github.com/motion-kit/sweet-kit
+[MotionKit]: https://github.com/motion-kit/motion-kit
 [nsnulldammit]: https://github.com/colinta/nsnulldammit
 [geomotion]: https://github.com/clayallsopp/geomotion
 

data/lib/all/sugarcube-numbers/time.rb

@@ -10,6 +10,7 @@ class Numeric
   def in_milliseconds
     self * 1000
   end
+  alias per_millisecond in_milliseconds
 
   def seconds
     self
@@ -21,6 +22,7 @@ class Numeric
   def in_seconds
     self
   end
+  alias per_second in_seconds
 
   def minutes
     self * 60
@@ -32,6 +34,7 @@ class Numeric
   def in_minutes
     self / 1.minute.to_f
   end
+  alias per_minute in_minutes
 
   def hours
     self * 3600
@@ -41,6 +44,7 @@ class Numeric
   def in_hours
     self / 1.hour.to_f
   end
+  alias per_hour in_hours
 
   def days
     self.hours * 24
@@ -50,6 +54,7 @@ class Numeric
   def in_days
     self / 1.day.to_f
   end
+  alias per_day in_days
 
   def weeks
     self.days * 7
@@ -59,23 +64,28 @@ class Numeric
   def in_weeks
     self / 1.week.to_f
   end
+  alias per_week in_weeks
 
+  # INACCURATE and COULD CHANGE in the future.
   def months
-    self.days * 30
+    self.days * 30.416
   end
   alias month months
 
   def in_months
     self / 1.month.to_f
   end
+  alias per_month in_months
 
+  # INACCURATE and COULD CHANGE in the future.
   def years
-    self.days * 365
+    self.days * 365.25
   end
   alias year years
 
   def in_years
     self / 1.year.to_f
   end
+  alias per_year in_years
 
 end

data/lib/cocoa/sugarcube-animations/caanimation.rb

@@ -3,13 +3,28 @@ class CAAnimation
   class << self
 
     private def _sugarcube_apply_animation_options(animation, options)
+      if options.key?(:delay)
+        animation.beginTime = CACurrentMediaTime() + options[:delay]
+      end
       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)
+      if options[:repeat] == true
+        animation.repeatCount = Float::MAX
+      elsif options.key?(:repeat)
+        animation.repeatCount = options[:repeat]
+      elsif options.key?(:repeat_count)
+        animation.repeatCount = options[:repeat_count]
+      end
       animation.repeatDuration = options[:repeat_duration] if options.key?(:repeat_duration)
       animation.removedOnCompletion = options.fetch(:remove, true)
+      if options.key?(:timing)
+        timing_function = options[:timing]
+        if timing_function.is_a?(NSString)
+          timing_function = CAMediaTimingFunction.functionWithName(timing_function)
+        end
+        animation.timingFunction = timing_function
+      end
     end
 
     # If you pass a block, that block will be called at the end of the
@@ -29,14 +44,10 @@ class CAAnimation
 
     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 options.key?(:values)
@@ -54,4 +65,43 @@ class CAAnimation
 
   end
 
+  def completion(&completion)
+    if completion
+      unless self.delegate.is_a?(SugarCubeAnimationDelegate)
+        delegate = SugarCubeAnimationDelegate.new
+        self.delegate = delegate
+      end
+      self.delegate.completion = completion.weak!
+    elsif self.delegate.is_a?(SugarCubeAnimationDelegate)
+      return self.delegate.completion
+    end
+  end
+
+  def start(&start)
+    if start
+      unless self.delegate.is_a?(SugarCubeAnimationDelegate)
+        delegate = SugarCubeAnimationDelegate.new
+        self.delegate = delegate
+      end
+      self.delegate.start = start.weak!
+    elsif self.delegate.is_a?(SugarCubeAnimationDelegate)
+      return self.delegate.start
+    end
+  end
+
+end
+
+
+class SugarCubeAnimationDelegate
+  attr_accessor :start
+  attr_accessor :completion
+
+  def animationDidStart
+    @start && @start.call
+  end
+
+  def animationDidStop(anim, finished: finished)
+    @completion && @completion.call(finished)
+  end
+
 end

data/lib/cocoa/sugarcube-nscoder/nscoder.rb

@@ -1,74 +1,101 @@
+# Hash-like access for NSCoder.  Converts the `key` argument to a String,
+# because Symbols can mess things up.
 class NSCoder
 
   def [] key
-    return self.decodeObjectForKey key
+    self.decodeObjectForKey(key.to_s)
   end
 
   def []= key, value
-    return self.encodeObject(value, forKey:key)
+    self.encodeObject(value, forKey: key.to_s)
+  end
+
+  def key?(key)
+    self.containsValueForKey(key.to_s)
   end
 
   def bool(key)
-    return self.decodeBoolForKey(key)
+    self.decodeBoolForKey(key.to_s)
   end
 
   def double(key)
-    return self.decodeDoubleForKey(key)
+    self.decodeDoubleForKey(key.to_s)
   end
 
   def float(key)
-    return self.decodeFloatForKey(key)
+    self.decodeFloatForKey(key.to_s)
   end
 
   def int(key)
-    return self.decodeIntegerForKey(key)
+    self.decodeIntegerForKey(key.to_s)
   end
 
   def point(key)
-    return CGPointFromString(self.decodeObjectForKey(key))
+    CGPointFromString(self.decodeObjectForKey(key.to_s))
   end
 
   def rect(key)
-    return CGRectFromString(self.decodeObjectForKey(key))
+    CGRectFromString(self.decodeObjectForKey(key.to_s))
   end
 
   def size(key)
-    return CGSizeFromString(self.decodeObjectForKey(key))
+    CGSizeFromString(self.decodeObjectForKey(key.to_s))
+  end
+
+  def set(key, toBool: value)
+    self.encodeBool(value, forKey: key.to_s)
+    self
   end
 
-  def set(key, toBool:value)
-    self.encodeBool(value, forKey:key)
-    return self
+  def set(key, toDouble: value)
+    self.encodeDouble(value, forKey: key.to_s)
+    self
   end
 
-  def set(key, toDouble:value)
-    self.encodeDouble(value, forKey:key)
-    return self
+  def set(key, toFloat: value)
+    self.encodeFloat(value, forKey: key.to_s)
+    self
   end
 
-  def set(key, toFloat:value)
-    self.encodeFloat(value, forKey:key)
-    return self
+  def set(key, toInt: value)
+    self.encodeInteger(value, forKey: key.to_s)
+    self
   end
 
-  def set(key, toInt:value)
-    self.encodeInteger(value, forKey:key)
-    return self
+  def set(key, toPoint: value)
+    self.encodeObject(NSStringFromCGPoint(value), forKey: key.to_s)
+    self
   end
 
-  def set(key, toPoint:value)
-    self.encodeObject(NSStringFromCGPoint(value), forKey:key)
-    return self
+  def set(key, toRect: value)
+    self.encodeObject(NSStringFromCGRect(value), forKey: key.to_s)
+    self
+  end
+
+  def set(key, toSize: value)
+    self.encodeObject(NSStringFromCGSize(value), forKey: key.to_s)
+    self
+  end
+
+end
+
+
+class NSCoder
+
+  def self.archive(root)
+    NSKeyedArchiver.archivedDataWithRootObject(root)
   end
 
-  def set(key, toRect:value)
-    self.encodeObject(NSStringFromCGRect(value), forKey:key)
-    return self
+  def self.archive(root, to_file: file)
+    NSKeyedArchiver.archivedRootObject(root, toFile: file)
   end
 
-  def set(key, toSize:value)
-    self.encodeObject(NSStringFromCGSize(value), forKey:key)
-    return self
+  def self.unarchive(data_or_file)
+    if data_or_file.is_a?(NSData)
+      NSKeyedUnarchiver.unarchiveObjectWithData(data_or_file)
+    else
+      NSKeyedUnarchiver.unarchiveObjectWithFile(data_or_file)
+    end
   end
 
 end

data/lib/cocoa/sugarcube-repl/kernel.rb

@@ -18,11 +18,11 @@ module Kernel
   end
   alias coll collapse
 
-  def tree(*args)
+  def tree(*args, &sel_blk)
     if self.nil?
       super
     else
-      SugarCube::Repl.tree(*args)
+      SugarCube::Repl.tree(*args, &sel_blk)
     end
   end
 

data/lib/cocoa/sugarcube-repl/repl.rb

@@ -223,8 +223,18 @@ module SugarCube
     end
     alias c center
 
+    def set_default(item)
+      @sugarcube_default_item = item
+    end
+
+    def clear_default
+      @sugarcube_default_item = nil
+    end
+
     def get_tree_item(item)
-      if item.nil? || item.is_a?(Fixnum)
+      if item.nil? && @sugarcube_default_item
+        @sugarcube_default_item
+      elsif item.nil? || item.is_a?(Fixnum)
         window(item)
       else
         item
@@ -255,6 +265,14 @@ module SugarCube
           selector = get_tree_selector(item)
         end
 
+        if !selector && @sugarcube_tree_selectors
+          klass = item.class
+          while klass && !selector
+            selector = @sugarcube_tree_selectors[klass]
+            klass = klass.superclass
+          end
+        end
+
         unless selector
           raise "Unable to determine a SugarCube::Repl::tree selector for #{item.class.to_s}"
         end
@@ -274,6 +292,11 @@ module SugarCube
       return item
     end
 
+    def register_tree_selector(klass, selector=nil, &sel_blk)
+      @sugarcube_tree_selectors ||= {}
+      @sugarcube_tree_selectors[klass] = selector || sel_blk
+    end
+
     # Draws the tree items
     def draw_tree(item, selector, tab=nil, is_last=true, items_index=0)
       space = ' '

data/lib/cocoa/sugarcube-spritekit/sknode.rb

@@ -4,8 +4,20 @@ class SKNode
     addChild(node)
   end
 
+  def run_action(action, &completion)
+    runAction(action, completion: completion)
+  end
+
+  def [](key)
+    userData[key]
+  end
+
+  def []=(key, value)
+    userData[key] = value
+  end
+
   def to_s
-    "#<#{self.class}:0x#{self.object_id.to_s(16)} position=#{position.inspect}>"
+    "#<#{self.class}:0x#{self.object_id.to_s(16)} position=#{position.inspect} name=#{name.inspect}>"
   end
 
 end

data/lib/cocoa/sugarcube-to_s/calayer.rb

@@ -0,0 +1,21 @@
+class CALayer
+
+  def sugarcube_to_s(options={})
+    if options[:inner].is_a? Hash
+      inner = ''
+      options[:inner].each do |key, value|
+        inner += ', ' if inner.length > 0
+        inner += "#{key}: #{value.inspect}"
+      end
+    else
+      inner = options[:inner]
+    end
+
+    "#{self.class.to_s}(##{self.object_id.to_s(16)}, [[#{frame.origin.x}, #{frame.origin.y}], [#{frame.size.width}, #{frame.size.height}]])"
+  end
+
+  def to_s
+    sugarcube_to_s
+  end
+
+end

data/lib/ios/sugarcube-animations/animation_chain.rb

@@ -53,7 +53,7 @@ module SugarCube
             AnimationChain.stop_chain(self)
           end
         end
-      }
+      }.weak!
       options[:after] = @after_block
 
       UIView.animate(options) do

data/lib/ios/sugarcube-gestures/gestures.rb

@@ -115,9 +115,9 @@ class UIView
   end
 
   # @yield [recognizer] Handles the gesture event, and passes the recognizer instance to the block.
-  # @overload on_tap(taps)
-  #   @param taps [Fixnum] Number of taps
-  # @overload on_tap(options)
+  # @overload on_pan(fingers)
+  #   @param taps [Fixnum] Number of fingers
+  # @overload on_pan(options)
   #   @option options [Fixnum] :min_fingers Minimum number of fingers for gesture to be recognized
   #   @option options [Fixnum] :max_fingers Maximum number of fingers for gesture to be recognized
   #   @option options [Fixnum] :fingers If min_fingers or max_fingers is not assigned, this will be the default.
@@ -149,7 +149,7 @@ class UIView
   # @yield [recognizer] Handles the gesture event, and passes the recognizer instance to the block.
   # @overload on_press(duration)
   #   @param duration [Fixnum] How long in seconds before gesture is recognized
-  # @overload on_tap(options)
+  # @overload on_press(options)
   #   @option options [Fixnum] :duration How long in seconds before gesture is recognized
   #   @option options [Fixnum] :taps Number of taps before gesture is recognized
   #   @option options [Fixnum] :fingers Number of fingers before gesture is recognized
@@ -157,12 +157,14 @@ class UIView
     duration = nil
     taps = nil
     fingers = nil
+    distance = nil
 
     if duration_or_options
       if duration_or_options.is_a? Hash
         duration = duration_or_options[:duration] || duration
         taps = duration_or_options[:taps] || taps
         fingers = duration_or_options[:fingers] || fingers
+        distance = duration_or_options[:distance] || distance
       else
         duration = duration_or_options
       end
@@ -172,6 +174,7 @@ class UIView
     recognizer.minimumPressDuration = duration if duration
     recognizer.numberOfTapsRequired = taps if taps
     recognizer.numberOfTouchesRequired = fingers if fingers
+    recognizer.allowableMovement = distance if distance
     sugarcube_add_gesture(proc, recognizer)
   end
 
@@ -179,24 +182,51 @@ class UIView
     duration = nil
     taps = nil
     fingers = nil
+    distance = nil
 
     if duration_or_options
       if duration_or_options.is_a? Hash
         duration = duration_or_options[:duration] || duration
         taps = duration_or_options[:taps] || taps
         fingers = duration_or_options[:fingers] || fingers
+        distance = duration_or_options[:distance] || distance
       else
         duration = duration_or_options
       end
     end
 
-    recognizer = UILongPressGestureRecognizer.alloc.initWithTarget(self, action:'sugarcube_handle_gesture_long_press_on_begin:')
+    recognizer = UILongPressGestureRecognizer.alloc.initWithTarget(self, action:'sugarcube_handle_gesture_on_begin:')
     recognizer.minimumPressDuration = duration if duration
     recognizer.numberOfTapsRequired = taps if taps
     recognizer.numberOfTouchesRequired = fingers if fingers
+    recognizer.allowableMovement = distance if distance
     sugarcube_add_gesture(proc, recognizer)
   end
 
+  def on_press_ended(duration_or_options=nil, &proc)
+    duration = nil
+    taps = nil
+    fingers = nil
+    distance = nil
+
+    if duration_or_options
+      if duration_or_options.is_a? Hash
+        duration = duration_or_options[:duration] || duration
+        taps = duration_or_options[:taps] || taps
+        fingers = duration_or_options[:fingers] || fingers
+        distance = duration_or_options[:distance] || distance
+      else
+        duration = duration_or_options
+      end
+    end
+
+    recognizer = UILongPressGestureRecognizer.alloc.initWithTarget(self, action:'sugarcube_handle_gesture_on_ended:')
+    recognizer.minimumPressDuration = duration if duration
+    recognizer.numberOfTapsRequired = taps if taps
+    recognizer.numberOfTouchesRequired = fingers if fingers
+    recognizer.allowableMovement = distance if distance
+    sugarcube_add_gesture(proc, recognizer)
+  end
 
 private
   def sugarcube_handle_gesture(recognizer)
@@ -207,8 +237,20 @@ private
       handler.call(recognizer)
     end
   end
-  def sugarcube_handle_gesture_long_press_on_begin(recognizer)
-    if recognizer.state==UIGestureRecognizerStateBegan
+
+  def sugarcube_handle_gesture_on_begin(recognizer)
+    if recognizer.state == UIGestureRecognizerStateBegan
+      handler = @sugarcube_recognizers[recognizer]
+      if handler.arity == 0
+        handler.call
+      else
+        handler.call(recognizer)
+      end
+    end
+  end
+
+  def sugarcube_handle_gesture_on_ended(recognizer)
+    if recognizer.state == UIGestureRecognizerStateEnded
       handler = @sugarcube_recognizers[recognizer]
       if handler.arity == 0
         handler.call

data/lib/version.rb

@@ -1,3 +1,3 @@
 module SugarCube
-  Version = '2.8.2'
+  Version = '2.9.1'
 end

data/spec/{ios → cocoa}/nscoder_spec.rb

@@ -60,8 +60,8 @@ describe "NSCoder" do
   end
 
   it "is nscoding compliant" do
-    data = NSKeyedArchiver.archivedDataWithRootObject(@subject)
-    test = NSKeyedUnarchiver.unarchiveObjectWithData(data)
+    data = NSCoder.archive(@subject)
+    test = NSCoder.unarchive(data)
     test.object.class.should == CoderHelper
     test.bool.should == @subject.bool
     test.double.should == @subject.double

data/spec/{ios/timer_spec.rb → cocoa/numeric_time_spec.rb}

@@ -1,4 +1,4 @@
-describe "Numeric Timer methods" do
+describe 'Numeric - Time methods' do
 
   it "should have a #millisecond(s) method" do
     0.milliseconds.should == 0
@@ -13,6 +13,12 @@ describe "Numeric Timer methods" do
     2000.milliseconds.in_milliseconds.should == 2000
   end
 
+  it "should have an #per_millisecond method" do
+    0.milliseconds.per_millisecond.should == 0
+    500.millisecond.per_millisecond.should == 500
+    2000.milliseconds.per_millisecond.should == 2000
+  end
+
   it "should have a #second(s) method" do
     0.seconds.should == 0
     1.second.should == 1
@@ -25,6 +31,12 @@ describe "Numeric Timer methods" do
     2.seconds.in_seconds.should == 2
   end
 
+  it "should have an #per_second method" do
+    0.seconds.per_second.should == 0
+    1.second.per_second.should == 1
+    2.seconds.per_second.should == 2
+  end
+
   it "should have a #minute(s) method" do
     0.minutes.should == 0
     1.minute.should == 60.seconds
@@ -37,6 +49,12 @@ describe "Numeric Timer methods" do
     2.minutes.in_minutes.should == 2
   end
 
+  it "should have an #per_minute method" do
+    0.minutes.per_minute.should == 0
+    1.minute.per_minute.should == 1
+    2.minutes.per_minute.should == 2
+  end
+
   it "should have a #hour(s) method" do
     0.hours.should == 0
     1.hour.should == 60.minutes
@@ -49,6 +67,12 @@ describe "Numeric Timer methods" do
     2.hours.in_hours.should == 2
   end
 
+  it "should have an #per_hour method" do
+    0.hours.per_hour.should == 0
+    1.hour.per_hour.should == 1
+    2.hours.per_hour.should == 2
+  end
+
   it "should have a #day(s) method" do
     0.days.should == 0
     1.day.should == 24.hours
@@ -61,6 +85,12 @@ describe "Numeric Timer methods" do
     2.days.in_days.should == 2
   end
 
+  it "should have an #per_day method" do
+    0.days.per_day.should == 0
+    1.day.per_day.should == 1
+    2.days.per_day.should == 2
+  end
+
   it "should have a #week(s) method" do
     0.weeks.should == 0
     1.week.should == 7.days
@@ -73,10 +103,16 @@ describe "Numeric Timer methods" do
     2.weeks.in_weeks.should == 2
   end
 
+  it "should have an #per_week method" do
+    0.weeks.per_week.should == 0
+    1.week.per_week.should == 1
+    2.weeks.per_week.should == 2
+  end
+
   it "should have a #month(s) method" do
     0.months.should == 0
-    1.month.should == 30.days
-    2.months.should == 60.days
+    1.month.should == 30.416.days
+    2.months.should == 60.832.days
   end
 
   it "should have an #in_months method" do
@@ -85,10 +121,16 @@ describe "Numeric Timer methods" do
     2.months.in_months.should == 2
   end
 
+  it "should have an #per_month method" do
+    0.months.per_month.should == 0
+    1.month.per_month.should == 1
+    2.months.per_month.should == 2
+  end
+
   it "should have a #year(s) method" do
     0.years.should == 0
-    1.year.should == 365.days
-    2.years.should == 730.days
+    1.year.should == 365.25.days
+    2.years.should == 730.5.days
   end
 
   it "should have an #in_years method" do
@@ -97,52 +139,10 @@ describe "Numeric Timer methods" do
     2.years.in_years.should == 2
   end
 
-  describe "Numeric" do
-    it "should have a #later method" do
-      @later = nil
-      0.9.seconds.later do
-        @later = true
-      end
-      wait 1 {
-        @later.should == true
-      }
-    end
-
-    it "should have a #every method" do
-      @every = 0
-      @stop_me = 480.milliseconds.every do
-        @every += 1
-      end
-      wait 1 {
-        @every.should == 2
-        @stop_me.invalidate
-      }
-    end
-  end
-
-  describe "NSTimer" do
-
-    it "should have a #later method" do
-      @later = nil
-      NSTimer.after(0.9.seconds) do
-        @later = true
-      end
-      wait 1 {
-        @later.should == true
-      }
-    end
-
-    it "should have a #every method" do
-      @every = 0
-      @stop_me = NSTimer.every(480.milliseconds) do
-        @every += 1
-      end
-      wait 1 {
-        @every.should == 2
-        @stop_me.invalidate
-      }
-    end
-
+  it "should have an #per_year method" do
+    0.years.per_year.should == 0
+    1.year.per_year.should == 1
+    2.years.per_year.should == 2
   end
 
 end

data/spec/cocoa/timer_spec.rb

@@ -0,0 +1,51 @@
+describe "Numeric Timer methods" do
+
+  describe "Numeric" do
+    it "should have a #later method" do
+      @later = nil
+      0.9.seconds.later do
+        @later = true
+      end
+      wait 1 {
+        @later.should == true
+      }
+    end
+
+    it "should have a #every method" do
+      @every = 0
+      @stop_me = 480.milliseconds.every do
+        @every += 1
+      end
+      wait 1 {
+        @every.should == 2
+        @stop_me.invalidate
+      }
+    end
+  end
+
+  describe "NSTimer" do
+
+    it "should have a #later method" do
+      @later = nil
+      NSTimer.after(0.9.seconds) do
+        @later = true
+      end
+      wait 1 {
+        @later.should == true
+      }
+    end
+
+    it "should have a #every method" do
+      @every = 0
+      @stop_me = NSTimer.every(480.milliseconds) do
+        @every += 1
+      end
+      wait 1 {
+        @every.should == 2
+        @stop_me.invalidate
+      }
+    end
+
+  end
+
+end

data/spec/ios/animation_chain_spec.rb

@@ -24,6 +24,20 @@ describe "SugarCube::AnimationChain" do
     end
   end
 
+  it "should not leak memory" do
+    chain = UIView.animation_chain(duration:0.01){
+      f = controller.view.frame
+      f.origin.x -= 20
+      controller.view.frame = f
+    }.start 
+
+    wait 0.1 do
+      weak = WeakRef.new(chain)
+      chain = nil
+      weak.weakref_alive?.should == false
+    end
+  end
+
   it "should support chains" do
     SugarCube::AnimationChain.chains.length.should == 0
     @variable_a = nil

data/spec/ios/gestures_spec.rb

@@ -0,0 +1,142 @@
+describe 'Gestures' do
+  before do
+    @view = UIView.alloc.initWithFrame([[0, 0], [10, 10]])
+  end
+
+  after do
+    @view.off_gestures
+  end
+
+  describe 'on_tap' do
+    it 'should work' do
+      gesture = @view.on_tap do |gesture|
+      end
+      gesture.should.be.kind_of(UITapGestureRecognizer)
+      @view.gestureRecognizers.should.include?(gesture)
+    end
+
+    it 'should work with options' do
+      gesture = @view.on_tap(taps: 2, fingers: 2) do |gesture|
+      end
+      gesture.should.be.kind_of(UITapGestureRecognizer)
+      gesture.numberOfTapsRequired.should == 2
+      gesture.numberOfTouchesRequired.should == 2
+      @view.gestureRecognizers.should.include?(gesture)
+    end
+  end
+
+  describe 'on_pinch' do
+    it 'should work' do
+      gesture = @view.on_pinch do |gesture|
+      end
+      gesture.should.be.kind_of(UIPinchGestureRecognizer)
+      @view.gestureRecognizers.should.include?(gesture)
+    end
+  end
+
+  describe 'on_rotate' do
+    it 'should work' do
+      gesture = @view.on_rotate do |gesture|
+      end
+      gesture.should.be.kind_of(UIRotationGestureRecognizer)
+      @view.gestureRecognizers.should.include?(gesture)
+    end
+  end
+
+  describe 'on_swipe' do
+    it 'should work' do
+      gesture = @view.on_swipe do |gesture|
+      end
+      gesture.should.be.kind_of(UISwipeGestureRecognizer)
+      @view.gestureRecognizers.should.include?(gesture)
+    end
+
+    it 'should work with options' do
+      gesture = @view.on_swipe(direction: :left, fingers: 2) do |gesture|
+      end
+      gesture.should.be.kind_of(UISwipeGestureRecognizer)
+      gesture.direction.should == UISwipeGestureRecognizerDirectionLeft
+      gesture.numberOfTouchesRequired.should == 2
+      @view.gestureRecognizers.should.include?(gesture)
+    end
+  end
+
+  describe 'on_pan' do
+    it 'should work' do
+      gesture = @view.on_pan do |gesture|
+      end
+      gesture.should.be.kind_of(UIPanGestureRecognizer)
+      @view.gestureRecognizers.should.include?(gesture)
+    end
+
+    it 'should work with options' do
+      gesture = @view.on_pan(min_fingers: 2, max_fingers: 2) do |gesture|
+      end
+      gesture.should.be.kind_of(UIPanGestureRecognizer)
+      gesture.maximumNumberOfTouches.should == 2
+      gesture.minimumNumberOfTouches.should == 2
+      @view.gestureRecognizers.should.include?(gesture)
+    end
+  end
+
+  describe 'on_press' do
+    it 'should work' do
+      gesture = @view.on_press do |gesture|
+      end
+      gesture.should.be.kind_of(UILongPressGestureRecognizer)
+      @view.gestureRecognizers.should.include?(gesture)
+    end
+
+    it 'should work with options' do
+      gesture = @view.on_press(duration: 1, taps: 2, fingers: 2, distance: 4) do |gesture|
+      end
+      gesture.should.be.kind_of(UILongPressGestureRecognizer)
+      gesture.minimumPressDuration.should == 1
+      gesture.numberOfTapsRequired.should == 2
+      gesture.numberOfTouchesRequired.should == 2
+      gesture.allowableMovement.should == 4
+      @view.gestureRecognizers.should.include?(gesture)
+    end
+  end
+
+  describe 'on_press_begin' do
+    it 'should work' do
+      gesture = @view.on_press_begin do |gesture|
+      end
+      gesture.should.be.kind_of(UILongPressGestureRecognizer)
+      @view.gestureRecognizers.should.include?(gesture)
+    end
+
+    it 'should work with options' do
+      gesture = @view.on_press_begin(duration: 1, taps: 2, fingers: 2, distance: 4) do |gesture|
+      end
+      gesture.should.be.kind_of(UILongPressGestureRecognizer)
+      gesture.minimumPressDuration.should == 1
+      gesture.numberOfTapsRequired.should == 2
+      gesture.numberOfTouchesRequired.should == 2
+      gesture.allowableMovement.should == 4
+      @view.gestureRecognizers.should.include?(gesture)
+    end
+  end
+
+  describe 'on_press_ended' do
+    it 'should work' do
+      gesture = @view.on_press_ended do |gesture|
+      end
+      gesture.should.be.kind_of(UILongPressGestureRecognizer)
+      @view.gestureRecognizers.should.include?(gesture)
+    end
+
+    it 'should work with options' do
+      gesture = @view.on_press_ended(duration: 1, taps: 2, fingers: 2, distance: 4) do |gesture|
+      end
+      gesture.should.be.kind_of(UILongPressGestureRecognizer)
+      gesture.minimumPressDuration.should == 1
+      gesture.numberOfTapsRequired.should == 2
+      gesture.numberOfTouchesRequired.should == 2
+      gesture.allowableMovement.should == 4
+      @view.gestureRecognizers.should.include?(gesture)
+    end
+  end
+
+end

data/spec/ios/uiview_animation_tumble_spec.rb

@@ -1,4 +1,4 @@
-describe "UIView animation methods" do
+describe "UIView tumble animation" do
   # the 'tumble' animation requires an app window to be present
   tests UIViewController
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugarcube
 version: !ruby/object:Gem::Version
-  version: 2.8.2
+  version: 2.9.1
 platform: ruby
 authors:
 - Colin T.A. Gray
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2014-10-29 00:00:00.000000000 Z
 dependencies: []
 description: |
   == Description
@@ -82,6 +82,7 @@ files:
 - lib/cocoa/sugarcube-repl/repl.rb
 - lib/cocoa/sugarcube-spritekit/sknode.rb
 - lib/cocoa/sugarcube-timer/timer.rb
+- lib/cocoa/sugarcube-to_s/calayer.rb
 - lib/cocoa/sugarcube-to_s/nserror.rb
 - lib/cocoa/sugarcube-to_s/nsindexpath.rb
 - lib/cocoa/sugarcube-to_s/nslayoutconstraint.rb
@@ -211,8 +212,11 @@ files:
 - spec/cocoa/caanimation_spec.rb
 - spec/cocoa/calayer_spec.rb
 - spec/cocoa/nsarray_files_spec.rb
+- spec/cocoa/nscoder_spec.rb
 - spec/cocoa/nsdata_files_spec.rb
 - spec/cocoa/nsdictionary_files_spec.rb
+- spec/cocoa/numeric_time_spec.rb
+- spec/cocoa/timer_spec.rb
 - spec/ios/568_spec.rb
 - spec/ios/animation_chain_spec.rb
 - spec/ios/color_components_spec.rb
@@ -224,6 +228,7 @@ files:
 - spec/ios/factories_spec.rb
 - spec/ios/fixnum_spec.rb
 - spec/ios/frameable_spec.rb
+- spec/ios/gestures_spec.rb
 - spec/ios/image_cifilters_spec.rb
 - spec/ios/image_color_at_spec.rb
 - spec/ios/image_scale_spec.rb
@@ -231,7 +236,6 @@ files:
 - spec/ios/notification_spec.rb
 - spec/ios/nsarray_spec.rb
 - spec/ios/nsattributedstring_spec.rb
-- spec/ios/nscoder_spec.rb
 - spec/ios/nsdata_spec.rb
 - spec/ios/nsdate_delta_spec.rb
 - spec/ios/nsdate_spec.rb
@@ -247,7 +251,6 @@ files:
 - spec/ios/symbol_constants_spec.rb
 - spec/ios/symbol_uicolor_spec.rb
 - spec/ios/symbol_uifont_spec.rb
-- spec/ios/timer_spec.rb
 - spec/ios/uiactionsheet_spec.rb
 - spec/ios/uialertcontroller_spec.rb
 - spec/ios/uialertview_spec.rb
@@ -302,8 +305,11 @@ test_files:
 - spec/cocoa/caanimation_spec.rb
 - spec/cocoa/calayer_spec.rb
 - spec/cocoa/nsarray_files_spec.rb
+- spec/cocoa/nscoder_spec.rb
 - spec/cocoa/nsdata_files_spec.rb
 - spec/cocoa/nsdictionary_files_spec.rb
+- spec/cocoa/numeric_time_spec.rb
+- spec/cocoa/timer_spec.rb
 - spec/ios/568_spec.rb
 - spec/ios/animation_chain_spec.rb
 - spec/ios/color_components_spec.rb
@@ -315,6 +321,7 @@ test_files:
 - spec/ios/factories_spec.rb
 - spec/ios/fixnum_spec.rb
 - spec/ios/frameable_spec.rb
+- spec/ios/gestures_spec.rb
 - spec/ios/image_cifilters_spec.rb
 - spec/ios/image_color_at_spec.rb
 - spec/ios/image_scale_spec.rb
@@ -322,7 +329,6 @@ test_files:
 - spec/ios/notification_spec.rb
 - spec/ios/nsarray_spec.rb
 - spec/ios/nsattributedstring_spec.rb
-- spec/ios/nscoder_spec.rb
 - spec/ios/nsdata_spec.rb
 - spec/ios/nsdate_delta_spec.rb
 - spec/ios/nsdate_spec.rb
@@ -338,7 +344,6 @@ test_files:
 - spec/ios/symbol_constants_spec.rb
 - spec/ios/symbol_uicolor_spec.rb
 - spec/ios/symbol_uifont_spec.rb
-- spec/ios/timer_spec.rb
 - spec/ios/uiactionsheet_spec.rb
 - spec/ios/uialertcontroller_spec.rb
 - spec/ios/uialertview_spec.rb