sugarcube 0.16.5 → 0.16.9

data/README.md

@@ -693,7 +693,12 @@ shake offset: 8,   # move 8 px left, and 8 px right
 # vigorous nodding - modifying transform.translation.y:
 view.shake offset: 20, repeat: 10, duration: 5, keypath: 'transform.translation.y'
 # an adorable wiggle - modifying transform.rotation:
-superview.shake offset: 0.1, repeat: 2, duration: 0.5, keypath: 'transform.rotation'
+view.shake offset: 0.1, repeat: 2, duration: 0.5, keypath: 'transform.rotation'
+
+# this was pulled off warrenm's AHAlertView project.  I thought the effect was
+# awesome, and deserved more attention!
+# https://github.com/warrenm/AHAlertView
+view.tumble  # the view will fall and rotate - a good 'cancel button effect'
 ```
 
 Using the completed callback you can string animations together for a low-tech

data/app/app_delegate.rb

@@ -1,4 +1,26 @@
 include SugarCube::CoreGraphics
 
 class AppDelegate
+  def application(application, didFinishLaunchingWithOptions:launchOptions)
+    return true if RUBYMOTION_ENV == 'test'
+
+    @window = UIWindow.alloc.initWithFrame(UIScreen.mainScreen.bounds)
+    ctlr = MyController.new
+    @window.rootViewController = ctlr
+    @window.makeKeyAndVisible
+  end
+end
+
+
+class MyController < UIViewController
+
+  def loadView
+    super.tap do
+      @label = 'Hi!'.uilabel
+      @label.center = self.view.center
+      @label.textColor = :white.uicolor
+      self.view << @label
+    end
+  end
+
 end

data/lib/sugarcube/core_graphics.rb

@@ -97,9 +97,14 @@ module SugarCube
         x_or_origin = SugarCube::CoreGraphics::Point(x_or_origin) unless x_or_origin.is_a? CGPoint
         x = x_or_origin.x
         y = x_or_origin.y
-        y_or_size = SugarCube::CoreGraphics::Size(y_or_size) unless y_or_size.is_a? CGSize
-        w = y_or_size.width
-        h = y_or_size.height
+        if y_or_size.is_a?(CGPoint)
+          w = y_or_size.x - x
+          h = y_or_size.y - y
+        else
+          y_or_size = SugarCube::CoreGraphics::Size(y_or_size)
+          w = y_or_size.width
+          h = y_or_size.height
+        end
       # three args
       elsif h.nil?
         if x_or_origin.is_a? Numeric

data/lib/sugarcube/nsstring.rb

@@ -38,6 +38,19 @@ class NSString
     self.uiimage.uicolor(alpha)
   end
 
+  # @param font [UIFont] Optional, defaults to UIFont.systemFontOfSize(UIFont.systemFontSize)
+  # @return [UILabel]
+  def uilabel(font=nil)
+    font ||= :system.uifont(:label.uifontsize)
+    size = self.sizeWithFont(font)
+    UILabel.alloc.initWithFrame([[0, 0], size]).tap { |label|
+      label.text = self
+      label.font = font
+      # why isn't this just the default!?
+      label.backgroundColor = :clear.uicolor
+    }
+  end
+
   def escape_url
     CFURLCreateStringByAddingPercentEscapes(
             nil,

data/lib/sugarcube/symbol.rb

@@ -670,9 +670,9 @@ class Symbol
   end
 
   def uifontsize
-    size = look_in(Symbol.system_fonts)
+    size = look_in(Symbol.font_sizes)
     if size.is_a? Symbol
-      return UIFont.send(Symbol.font_sizes[self])
+      return UIFont.send(size)
     end
     return size.to_f
   end

data/lib/sugarcube/uiview.rb

@@ -115,7 +115,7 @@ class UIView
       options = { opacity: options }
     end
 
-    options[:after] ||= after
+    options[:after] = after
 
     animate(options) {
       self.layer.opacity = options[:opacity]
@@ -169,7 +169,7 @@ class UIView
       options = { duration: options }
     end
 
-    options[:after] ||= after
+    options[:after] = after
 
     animate(options) {
       f = self.frame
@@ -192,7 +192,7 @@ class UIView
       options = { angle: options }
     end
 
-    options[:after] ||= after
+    options[:after] = after
 
     animate(options) {
       self.transform = CGAffineTransformMakeRotation(options[:angle])
@@ -223,6 +223,12 @@ class UIView
     self
   end
 
+  # Vibrates the target. You can trick this thing out to do other effects, like:
+  # @example
+  #   # wiggle
+  #   view.shake(offset: 0.1, repeat: 2, duration: 0.5, keypath: 'transform.rotation')
+  #   # slow nodding
+  #   view.shake(offset: 20, repeat: 10, duration: 5, keypath: 'transform.translation.y')
   def shake(options={})
     if options.is_a? Numeric
       duration = options
@@ -253,6 +259,46 @@ class UIView
     self
   end
 
+  # Moves the view off screen while slowly rotating it.
+  #
+  # Based on https://github.com/warrenm/AHAlertView/blob/master/AHAlertView/AHAlertView.m
+  def tumble(options={}, &after)
+    if options.is_a? Numeric
+      default_duration = options
+      options = {}
+    else
+      default_duration = 0.3
+    end
+
+    options[:duration] ||= default_duration
+    options[:options] ||= UIViewAnimationOptionCurveEaseIn
+    reset_transform = self.transform
+    reset_after = ->(finished) {
+      self.transform = reset_transform
+    }
+
+    if after
+      options[:after] = ->(finished) {
+        reset_after.call(finished)
+
+        if after.arity == 0
+          after.call
+        else
+          after.call(finished)
+        end
+      }
+    else
+      options[:after] = reset_after
+    end
+
+    self.animate(options) {
+       offset = CGPoint.new(0, self.superview.bounds.size.height * 1.5)
+       offset = CGPointApplyAffineTransform(offset, self.transform)
+       self.transform = CGAffineTransformConcat(self.transform, CGAffineTransformMakeRotation(-Math::PI/4))
+       self.center = CGPointMake(self.center.x + offset.x, self.center.y + offset.y)
+    }
+  end
+
   # Easily take a snapshot of a UIView
   def uiimage
     scale = UIScreen.mainScreen.scale

data/lib/sugarcube/version.rb

@@ -1,3 +1,3 @@
 module SugarCube
-  Version = '0.16.5'
+  Version = '0.16.9'
 end

data/spec/core_graphics_spec.rb

@@ -135,7 +135,7 @@ describe "SugarCube::CoreGraphics" do
       CGRectEqualToRect(r, CGRect.new([array[0], array[1]], [array[2], array[3]])).should == true
     end
 
-    it 'should accept 2 arguments (CGPoint, CGSize)' do
+    it 'should accept 2 arguments: (CGPoint, CGSize)' do
       args = [CGPoint.new(1, 2), CGSize.new(3, 4)]
       r = Rect(*args)
       r.origin.x.should == 1
@@ -145,14 +145,14 @@ describe "SugarCube::CoreGraphics" do
       CGRectEqualToRect(r, CGRect.new(args[0], args[1])).should == true
     end
 
-    it 'should accept 2 arguments: (CGPoint, CGSize)' do
-      args = [CGPoint.new(1, 2), CGSize.new(3, 4)]
+    it 'should accept 2 arguments: (CGPoint, CGPoint)' do
+      args = [CGPoint.new(1, 2), CGPoint.new(3, 4)]
       r = Rect(*args)
       r.origin.x.should == 1
       r.origin.y.should == 2
-      r.size.width.should == 3
-      r.size.height.should == 4
-      CGRectEqualToRect(r, CGRect.new(args[0], args[1])).should == true
+      r.size.width.should == 2
+      r.size.height.should == 2
+      CGRectEqualToRect(r, CGRect.new(args[0], [2, 2])).should == true
     end
 
     it 'should accept 3 arguments: ([x, y], w, h)' do

data/spec/nsstring_spec.rb

@@ -48,6 +48,26 @@ describe "NSString" do
     ((color.blue * 2).round / 2.0).should == 0.5
   end
 
+  it "should have a #uilabel method" do
+    str = 'test'
+    str_size = str.sizeWithFont(UIFont.systemFontOfSize(UIFont.labelFontSize))
+    label = str.uilabel
+    label.size.width == str_size.width
+    label.size.height == str_size.height
+    label.backgroundColor == UIColor.clearColor
+  end
+
+  it "should have a #uilabel(font) method" do
+    str = 'test'
+    font =  UIFont.boldSystemFontOfSize(20)
+    str_size = str.sizeWithFont(font)
+    label = str.uilabel(font)
+    label.font.should == font
+    label.size.width == str_size.width
+    label.size.height == str_size.height
+    label.backgroundColor == UIColor.clearColor
+  end
+
   it "should have a #escape_url method" do
     ' '.escape_url.should == '%20'
     '?<>&=;%'.escape_url.should == '%3F%3C%3E%26%3D%3B%25'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugarcube
 version: !ruby/object:Gem::Version
-  version: 0.16.5
+  version: 0.16.9
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-08 00:00:00.000000000 Z
+date: 2013-02-12 00:00:00.000000000 Z
 dependencies: []
 description: ! '== Description