sugarcube 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c97e80c9fbc0c25b20886461e3e5aa41d48df97
-  data.tar.gz: c380e00cb3e5ebf62e8a22a362382013c8f3a08c
+  metadata.gz: 741a9f9b789c05eb8ad6b99f579ae571401faf73
+  data.tar.gz: abc4c71c5bbf61b4efc1ba21fb5b62496714ed67
 SHA512:
-  metadata.gz: e0f45b6a1954c134c693dbaca76453223c5c3be81ca9567072a06078d55da35f29beaa4361ee04e4de02f73b4eb3a92f87c92daf3a19eb2b24b33c9941469016
-  data.tar.gz: cc81fb3b7dbf13739cec164203069062afc2d196c381e14edefe2ecc8fe18053a1bd60723861005bf155c9efa221612ff3bebcefee813e60e4b5f11cbedc1e5a
+  metadata.gz: 40fb96d9a125f15272b70cd1872d305bfdcf187cb8cec9e58f37f1bdff5478c51e81b93e0b768585760f7f8f500c4a981ced8553eb502fda0d4592d5bfe7f517
+  data.tar.gz: 8b20303cf731e9e64596c6595a43de7f8e9cdafbf53440122c4ec6a7455ec9188af5f257e9af72bc5f44872fc31a0f6cae2ec87c4311157cabc5e5c60784ac81

data/Gemfile.lock

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

data/README.md

@@ -873,6 +873,13 @@ view.slide :left, 100
 view.rotate_to 180.degrees
 view.shake  # great for showing invalid form elements
 view.tumble  # great way to dismiss an alert-like-view
+# tumbles in the other direction (towards the right side instead of left)
+view.tumble(side: :right)
+
+# the complement to 'tumble' is 'tumble_in' - the view starts above the window
+# and drops in with the same kind of animation as 'tumble'.  Before you call
+# this method, set the view.frame to the *destination* location.
+view.tumble_in(side: :right)
 ```
 
 These helpers all delegate to the `UIView.animate` method, which accepts all the

data/lib/sugarcube-animations/uiview.rb

@@ -423,8 +423,23 @@ class UIView
     if options.is_a? Numeric
       default_duration = options
       options = more_options
+      side = options[:side] || :left
+    elsif options.is_a? Symbol
+      side = options
+      options = more_options
+      default_duration = 0.3
     else
       default_duration = 0.3
+      side = options[:side] || :left
+    end
+
+    case side
+      when :left
+        angle = -Math::PI/4
+      when :right
+        angle = Math::PI/4
+      else
+        raise "Unknown direction #{side.inspect}"
     end
 
     options[:duration] ||= default_duration
@@ -454,7 +469,7 @@ class UIView
       height = window.frame.size.height - top
       offset = CGPoint.new(0, height * 1.5)
       offset = CGPointApplyAffineTransform(offset, self.transform)
-      self.transform = CGAffineTransformConcat(self.transform, CGAffineTransformMakeRotation(-Math::PI/4))
+      self.transform = CGAffineTransformConcat(self.transform, CGAffineTransformMakeRotation(angle))
       self.center = CGPointMake(self.center.x + offset.x, self.center.y + offset.y)
     end
   end
@@ -462,12 +477,27 @@ class UIView
   # Moves the view on screen while slowly rotating it.
   #
   # Based on https://github.com/warrenm/AHAlertView/blob/master/AHAlertView/AHAlertView.m
-  def tumble_in(options={}, &after)
+  def tumble_in(options={}, more_options={}, &after)
     if options.is_a? Numeric
       default_duration = options
-      options = {}
+      options = more_options
+      side = options[:side] || :left
+    elsif options.is_a? Symbol
+      side = options
+      options = more_options
+      default_duration = 0.3
     else
       default_duration = 0.3
+      side = options[:side] || :left
+    end
+
+    case side
+      when :left
+        angle = -Math::PI/4
+      when :right
+        angle = Math::PI/4
+      else
+        raise "Unknown direction #{side.inspect}"
     end
 
     reset_transform = self.transform
@@ -482,7 +512,7 @@ class UIView
     height = window.frame.size.height - top
     offset = CGPoint.new(0, height * -1.5)
     offset = CGPointApplyAffineTransform(offset, self.transform)
-    self.transform = CGAffineTransformConcat(self.transform, CGAffineTransformMakeRotation(Math::PI/4))
+    self.transform = CGAffineTransformConcat(self.transform, CGAffineTransformMakeRotation(angle))
     self.center = CGPointMake(self.center.x + offset.x, self.center.y + offset.y)
 
     self.animate(options) do

data/lib/sugarcube/version.rb

@@ -1,3 +1,3 @@
 module SugarCube
-  Version = '1.5.3'
+  Version = '1.5.4'
 end

data/spec/symbol_constants_spec.rb

@@ -192,6 +192,21 @@ describe "Symbol - constants" do
       :done.uibarbuttonstyle.should == UIBarButtonItemStyleDone
     end
 
+    it 'should support `uitabbarsystemitem`' do
+      :more.uitabbarsystemitem.should == UITabBarSystemItemMore
+      :favorites.uitabbarsystemitem.should == UITabBarSystemItemFavorites
+      :featured.uitabbarsystemitem.should == UITabBarSystemItemFeatured
+      :top_rated.uitabbarsystemitem.should == UITabBarSystemItemTopRated
+      :recents.uitabbarsystemitem.should == UITabBarSystemItemRecents
+      :contacts.uitabbarsystemitem.should == UITabBarSystemItemContacts
+      :history.uitabbarsystemitem.should == UITabBarSystemItemHistory
+      :bookmarks.uitabbarsystemitem.should == UITabBarSystemItemBookmarks
+      :search.uitabbarsystemitem.should == UITabBarSystemItemSearch
+      :downloads.uitabbarsystemitem.should == UITabBarSystemItemDownloads
+      :most_recent.uitabbarsystemitem.should == UITabBarSystemItemMostRecent
+      :most_viewed.uitabbarsystemitem.should == UITabBarSystemItemMostViewed
+    end
+
     it 'should support `uibuttontype`' do
       :custom.uibuttontype.should == UIButtonTypeCustom
       :rounded.uibuttontype.should == UIButtonTypeRoundedRect

data/spec/uiview_animation_tumble_spec.rb

@@ -0,0 +1,140 @@
+describe "UIView animation methods" do
+  # the 'tumble' animation requires an app window to be present
+  tests UIViewController
+
+  before do
+    @view = UIView.alloc.initWithFrame([[1,2],[3,4]])
+    controller.view.addSubview(@view)
+  end
+
+  it 'should have a tumble animation' do
+    @done = false
+    @view.tumble
+    @view.center.y.should > UIScreen.mainScreen.bounds.size.height
+  end
+
+  it 'should have a tumble_in animation' do
+    @done = false
+    @view.tumble_in
+    @view.frame.origin.y.should == 2
+  end
+
+  it 'should have a tumble animation with duration' do
+    @done = false
+    @view.tumble(0.4) do |finished|
+      @done = finished ? :done : :unfinished
+    end
+    @view.center.y.should > UIScreen.mainScreen.bounds.size.height
+    wait 0.3 do
+      @done.should == false
+      wait 0.3 do
+        @done.should == :done
+      end
+    end
+  end
+
+  it 'should have a tumble_in animation with duration' do
+    @done = false
+    @view.tumble_in(0.4) do |finished|
+      @done = finished ? :done : :unfinished
+    end
+    @view.frame.origin.y.should == 2
+    wait 0.3 do
+      @done.should == false
+      wait 0.3 do
+        @done.should == :done
+      end
+    end
+  end
+
+  it 'should have a tumble animation with side as parameter' do
+    -> do
+      @view.tumble(:left)
+    end.should.not.raise
+  end
+
+  it 'should have a tumble_in animation with side as parameter' do
+    -> do
+      @view.tumble_in(:left)
+    end.should.not.raise
+  end
+
+  it 'should have a tumble animation with duration as option' do
+    @done = false
+    @view.tumble(duration: 0.4) do
+      @done = :done
+    end
+    @view.center.y.should > UIScreen.mainScreen.bounds.size.height
+    wait 0.3 do
+      @done.should == false
+      wait 0.2 do
+        @done.should == :done
+      end
+    end
+  end
+
+  it 'should have a tumble_in animation with duration as option' do
+    @done = false
+    @view.tumble_in(duration: 0.4) do
+      @done = :done
+    end
+    @view.frame.origin.y.should == 2
+    wait 0.3 do
+      @done.should == false
+      wait 0.2 do
+        @done.should == :done
+      end
+    end
+  end
+
+  it 'should have a tumble animation with side as option' do
+    @view.tumble(side: :left)
+    @view.center.y.should > UIScreen.mainScreen.bounds.size.height
+  end
+
+  it 'should have a tumble_in animation with side as option' do
+    @view.tumble_in(side: :left)
+    @view.frame.origin.y.should == 2
+  end
+
+  it 'should have a tumble animation with invalid side option raising exception' do
+    -> do
+      @view.tumble(side: :this_is_silly)
+    end.should.raise
+  end
+
+  it 'should have a tumble_in animation with invalid side option raising exception' do
+    -> do
+      @view.tumble_in(side: :this_is_silly)
+    end.should.raise
+  end
+
+  it 'should have a tumble animation with duration and options' do
+    @done = false
+    @view.tumble(0.4, options: UIViewAnimationOptionCurveEaseIn | UIViewAnimationOptionBeginFromCurrentState) do
+      @done = :done
+    end
+    @view.center.y.should > UIScreen.mainScreen.bounds.size.height
+    wait 0.3 do
+      @done.should == false
+      wait 0.2 do
+        @done.should == :done
+      end
+    end
+  end
+
+  it 'should have a tumble_in animation with duration and options' do
+    @done = false
+    @view.tumble_in(0.4, options: UIViewAnimationOptionCurveEaseIn | UIViewAnimationOptionBeginFromCurrentState) do
+      @done = :done
+    end
+    @view.frame.origin.y.should == 2
+    wait 0.3 do
+      @done.should == false
+      wait 0.2 do
+        @done.should == :done
+      end
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugarcube
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - Colin T.A. Gray
@@ -241,6 +241,7 @@ files:
 - spec/uitabbaritem_spec.rb
 - spec/uitableviewcell_spec.rb
 - spec/uiview_animation_spec.rb
+- spec/uiview_animation_tumble_spec.rb
 - spec/uiview_attr_updates_spec.rb
 - spec/uiview_spec.rb
 - spec/uiviewcontroller_spec.rb
@@ -319,6 +320,7 @@ test_files:
 - spec/uitabbaritem_spec.rb
 - spec/uitableviewcell_spec.rb
 - spec/uiview_animation_spec.rb
+- spec/uiview_animation_tumble_spec.rb
 - spec/uiview_attr_updates_spec.rb
 - spec/uiview_spec.rb
 - spec/uiviewcontroller_spec.rb