sugarcube 0.18.11 → 0.18.12

data/README.md

@@ -774,20 +774,29 @@ view.slide(:left, 20) {
 }
 ```
 
-But isn't that ugly!  Use an animation chain!
+Those be some gnarly callbacks.  You can write this as a chain, but we need to
+tell the `slide` method to go ahead and run immediately (don't use an
+animation).  When you create an animation chain, the block you pass to each
+iteration is the block that gets passed to `UIView##animateWithDuration(...)`.
+If you try and run animations *within* that block they will not get queued up
+properly.
+
+The easiest way to handle this:
+
+1) don't use SugarCube animation methods, e.g. assign the frame manually (yeah, right!)
+2) use the `duration: 0` option, which runs the animation without setting calling
+   `animateWithDuration()`.
+3) For clarity (and some future-proofing, in case any of this rigamarole changes
+   in the future), you can use `chain: true`.
 
 ```ruby
 UIView.animation_chain {
-  view.slide(:left, 20)
-}.and_then {
-  view.slide(:up, 20)
-}.and_then {
-  view.slide(:right, 20)
+  view.slide(:left, duration:0)
 }.and_then {
-  view.slide(:down, 20)
+  view.slide(:up, chain:true)  # sets duration:0, delay:0
 }.and_then {
-  view.fade_out
-}.start
+  view.fade_out  # in case you were wondering, the very LAST animation CAN be
+}.start          # called normally.
 ```
 
 Chains can also be written like this:
@@ -986,7 +995,7 @@ text_view.on :editing_did_end do
 end
 
 # later... like in `viewWillDisappear`.  I'll use the alternative aliases here
-text_view.off :change, :end, :begin  
+text_view.off :change, :end, :begin
 ```
 
  UIBarButtonItem

data/app/app_delegate.rb

@@ -1,5 +1,7 @@
+include SugarCube::Adjust
 include SugarCube::CoreGraphics
 
+
 class AppDelegate
   def application(application, didFinishLaunchingWithOptions:launchOptions)
     return true if RUBYMOTION_ENV == 'test'

data/lib/sugarcube/uiview.rb

@@ -30,6 +30,15 @@ class UIView
         duration = options[:duration] || 0.3
       end
 
+      delay = options[:delay] || 0
+
+      # chain: true is used inside animation_chain blocks to prevent some weird
+      # animation errors (nested animations do not delay/queue as you'd expect)
+      if options[:chain]
+        duration = 0
+        delay = 0
+      end
+
       after_animations = options[:after]
       if after_animations
         if after_animations.arity == 0
@@ -41,7 +50,6 @@ class UIView
         after_adjusted = nil
       end
 
-      delay = options[:delay] || 0
       if duration == 0 && delay == 0
         animations.call
         after_adjusted.call(true) if after_adjusted
@@ -229,12 +237,14 @@ class UIView
     }
   end
 
-  def slide(direction, options={}, &after)
+  def slide(direction, options={}, more_options=nil, &after)
     if options.is_a? Numeric
-      options = {size: options}
+      size = options
+      options = more_options || {}
+    else
+      size = options[:size]
     end
 
-    size = options[:size]
     case direction
     when :left
       size ||= self.bounds.size.width

data/lib/sugarcube/version.rb

@@ -1,3 +1,3 @@
 module SugarCube
-  Version = '0.18.11'
+  Version = '0.18.12'
 end

data/spec/uiview_animation_chain_spec.rb

@@ -11,18 +11,29 @@ describe "SugarCube::AnimationChain" do
     @variable_b = nil
     UIView.animation_chain(duration:0.1){
       @variable_a = 'a'
+      f = controller.view.frame
+      f.origin.x -= 20
+      controller.view.frame = f
     }.and_then(duration: 0.1){
       @variable_b = 'b'
+      f = controller.view.frame
+      f.origin.x += 20
+      controller.view.frame = f
     }.start
+
     SugarCube::AnimationChain.chains.length.should == 1
 
-    wait 0.15 {
+    wait 0.05 {
       @variable_a.should == 'a'
       @variable_b.should == nil
+      SugarCube::AnimationChain.chains.length.should == 1
     }
-    wait 0.3 {
+    wait 0.15 {
       @variable_a.should == 'a'
       @variable_b.should == 'b'
+      SugarCube::AnimationChain.chains.length.should == 1
+    }
+    wait 0.25 {
       SugarCube::AnimationChain.chains.length.should == 0
     }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugarcube
 version: !ruby/object:Gem::Version
-  version: 0.18.11
+  version: 0.18.12
   prerelease: 
 platform: ruby
 authors: