sugarcube 0.18.21 → 0.19.0

data/README.md

@@ -240,7 +240,7 @@ recurring events)
 `start_of_day` and `end_of_day` methods help
    you here.  They are akin to `floor` and `ceil`; if you consider the time to
    be the "floating" component, and the date to be the nearest "integer".
-4. Formatting is made easier with `NSDate#string_with_style(NSDateStyleConstant or Symbol)`
+4. Formatting is made easier with `NSDate#string_with_style(NSDateStyleConstant or Symbol for date, time)`
    and `NSDate#string_with_format(format_string)`.  See
    <http://www.unicode.org/reports/tr35/tr35-25.html#Date_Format_Patterns> for
    the formatters, they take getting used to, coming from `strftime`, but they
@@ -302,13 +302,23 @@ recurring events)
 => [9, 19, 6]
 (main)> now.datetime_array
 => [2012, 9, 13, 9, 19, 6]
+```
+
+Use `NSDate#string_with_style` to generate date and/or time strings.
 
+```ruby
 (main)> now.string_with_style
 => "January 29, 2013"
 (main)> now.string_with_style(NSDateFormatterShortStyle)
 => "1/29/13"
 (main)> now.string_with_style(:short)
 => "1/29/13"
+(main)> now.string_with_style(NSDateFormatterMediumStyle, NSDateFormatterShortStyle)
+=> "Jan 29, 2013, 9:19 AM"
+(main)> now.string_with_style(:short, :medium)
+=> "1/29/13, 9:19:06 AM"
+(main)> now.string_with_style(:none, :long)
+=> "9:19:06 AM GMT+01:00"
 ```
 
 It is easy to add seconds to the date using the time-related methods added to
@@ -491,6 +501,9 @@ NSError.new('Error Message', code: 404, userInfo: { warnings: ['blabla'] })
 
 # NSURL
 "https://github.com".nsurl  # => NSURL.URLWithString("https://github.com")
+
+# check if string is not a number
+"pi".nan? # => NSNumberFormatter.alloc.init.numberFromString("pi").nil?
 ```
 
  NSIndexPath
@@ -671,6 +684,30 @@ UIActionSheet.alert 'I mean, is this cool?', buttons: ['Nah', 'With fire!', 'Sur
   success: proc { |pressed| self.proceed if pressed == 'Sure' }
 ```
 
+ UIColor
+---------
+
+Methods to merge or manipulate a color, or to get information about a color.
+Works best on RGB colors, but HSB will work well, too.  `UIColor`s based on
+image patterns can't easily be inverted or mixed.
+
+```ruby
+:red.uicolor.invert # => UIColor.cyanColor
+:blue.uicolor.invert # => UIColor.yellowColor
+:green.uicolor.invert # => UIColor.magentaColor
+:red.uicolor + :blue.uicolor # => UIColor.purpleColor
+:red.uicolor + :green.uicolor # => :olive.uicolor
+# (I didn't know that until I tried it in the REPL, but it was pretty cool to
+# see the UIColor#to_s method match that mixture to olive!)
+
+# a more generic color mixing method (`+` delegates to this method):
+:white.uicolor.mix_with(:black.uicolor, 0)  # => :white
+:white.uicolor.mix_with(:black.uicolor, 0.25)  # => 0x404040.uicolor
+:white.uicolor.mix_with(:black.uicolor, 0.5)  # => :gray, same as :white + :black
+:white.uicolor.mix_with(:black.uicolor, 0.75)  # => 0xbfbfbf.uicolor
+:white.uicolor.mix_with(:black.uicolor, 1)  # => :black
+```
+
  UIView
 --------
 
@@ -684,6 +721,10 @@ self.view.hide  # => self.hidden = true
 
 # convert to UIImage.  retina-ready.
 my_view.uiimage
+# that will use the `bounds` property to size the image.  but if you want a
+# screen shot of the contents of a scroll view, pass in `true` or `:all` to this
+# method.
+my_scroll_view.uiimage(:all)
 ```
 
 When defining a UIView subclass, you often have attributes that affect your
@@ -973,16 +1014,22 @@ controller.present_modal(other_controller) { puts "presented" }
 ------------------------
 
 `push`, `<<` and `pop` instead of `pushViewController` and `popViewController`.
-`!` and `!(view)` instead of `popToRootViewController` and `popToViewController`
 
 animated is `true` for all these.
 
+`pop` accepts an argument: either a view controller to pop to, or the symbol
+`:root` which does what you might expect
+
 ```ruby
-nav_ctlr.push(new_ctlr)
+nav_ctlr << root_ctlr
+# or nav_ctlr.push(root_ctlr)
 nav_ctlr << new_ctlr
-nav_ctlr.pop
-nav_ctlr.!
-nav_ctlr.!(another_view_ctlr)
+# ... imagine we push on a ton of controllers ...
+nav_ctlr << another_ctlr
+nav_ctlr << last_ctlr
+nav_ctlr.pop # => pops to another_ctlr, because it's next on the stack
+nav_ctlr.pop new_ctlr # => pops to new_ctlr
+nav_ctlr.pop :root  # => pops to root_ctlr, because it's on the bottom
 ```
 
  UITabBarController

data/lib/sugarcube/nsdate.rb

@@ -9,12 +9,12 @@ class NSDate
     return calendar.dateFromComponents(date_components)
   end
 
-  def string_with_style(style=NSDateFormatterMediumStyle)
+  def string_with_style(date_style=NSDateFormatterMediumStyle,time_style=NSDateFormatterNoStyle)
     date_formatter = NSDateFormatter.new
-    if style.is_a? Symbol
-      style = style.nsdatestyle
-    end
-    date_formatter.setDateStyle(style)
+    date_style = date_style.nsdatestyle if date_style.is_a? Symbol
+    time_style = time_style.nsdatestyle if time_style.is_a? Symbol
+    date_formatter.setDateStyle(date_style)
+    date_formatter.setTimeStyle(time_style)
     date_formatter.stringFromDate(self)
   end
 

data/lib/sugarcube/nsstring.rb

@@ -71,6 +71,12 @@ class NSString
             )
   end
 
+  # @return boolean
+  def nan?
+    number_formatter = NSNumberFormatter.new
+    number = number_formatter.numberFromString(self)
+    number.nil?
+  end
   # This can be called as `"Hello".localized` or `"Hello"._`.  The `str._`
   # syntax is meant to be reminiscent of gettext-style `_(str)`.
   def localized(value=nil, table=nil)

data/lib/sugarcube/symbol.rb

@@ -24,54 +24,54 @@ You can extend the defaults by adding entries:
 =end
 class Symbol
   class << self
-    attr_accessor :devices
-    attr_accessor :device_orientations
-    attr_accessor :interface_orientations
-    attr_accessor :interface_masks
-    attr_accessor :orientations
-    attr_accessor :returnkeys
-    attr_accessor :statusbar_styles
-    attr_accessor :barmetrics
-    attr_accessor :barbuttonitems
-    attr_accessor :barbuttonstyles
-    attr_accessor :keyboardtypes
-    attr_accessor :autoresizemasks
-
-    attr_accessor :textalignments
-    attr_accessor :linebreakmodes
-    attr_accessor :baselineadjustments
-    attr_accessor :system_fonts
-    attr_accessor :font_sizes
-    attr_accessor :date_styles
-    attr_accessor :number_styles
-
-    attr_accessor :buttontypes
-    attr_accessor :border_types
-    attr_accessor :control_states
-    attr_accessor :control_events
-    attr_accessor :activityindicator_styles
-    attr_accessor :segmented_styles
-    attr_accessor :datepicker_modes
-    attr_accessor :content_modes
-
-    attr_accessor :tableview_styles
-    attr_accessor :tableview_rowanimation
-    attr_accessor :tableview_cellstyles
-    attr_accessor :tableview_cellaccessorytype
-    attr_accessor :tableview_cellselectionstyle
-    attr_accessor :tableview_cellseparatorstyle
-
-    attr_accessor :image_sourcetypes
-    attr_accessor :image_capturemode
-    attr_accessor :image_cameradevice
-    attr_accessor :image_quality
-
-    attr_accessor :ca_timingfunctions
-
-    attr_accessor :cg_linecapstyles
-    attr_accessor :cg_linejoinstyles
-
-    attr_accessor :gesture_recognizer_states
+    attr :devices
+    attr :device_orientations
+    attr :interface_orientations
+    attr :interface_masks
+    attr :orientations
+    attr :returnkeys
+    attr :statusbar_styles
+    attr :barmetrics
+    attr :barbuttonitems
+    attr :barbuttonstyles
+    attr :keyboardtypes
+    attr :autoresizemasks
+
+    attr :textalignments
+    attr :linebreakmodes
+    attr :baselineadjustments
+    attr :system_fonts
+    attr :font_sizes
+    attr :date_styles
+    attr :number_styles
+
+    attr :buttontypes
+    attr :border_types
+    attr :control_states
+    attr :control_events
+    attr :activityindicator_styles
+    attr :segmented_styles
+    attr :datepicker_modes
+    attr :content_modes
+
+    attr :tableview_styles
+    attr :tableview_rowanimation
+    attr :tableview_cellstyles
+    attr :tableview_cellaccessorytype
+    attr :tableview_cellselectionstyle
+    attr :tableview_cellseparatorstyle
+
+    attr :image_sourcetypes
+    attr :image_capturemode
+    attr :image_cameradevice
+    attr :image_quality
+
+    attr :ca_timingfunctions
+
+    attr :cg_linecapstyles
+    attr :cg_linejoinstyles
+
+    attr :gesture_recognizer_states
   end
 
   @devices = {

data/lib/sugarcube/symbol/symbol_uicolor.rb

@@ -52,6 +52,7 @@ class Symbol
     aqua:                 0x00ffff,
     aquamarine:           0x7fffd4,
     azure:                0xf0ffff,
+    babygray:             0x576077,
     beige:                0xf5f5dc,
     bisque:               0xffe4c4,
     blanchedalmond:       0xffebcd,
@@ -60,6 +61,7 @@ class Symbol
     cadetblue:            0x5f9ea0,
     chartreuse:           0x7fff00,
     chocolate:            0xd2691e,
+    colingray:            0x526691,
     coral:                0xff7f50,
     cornflowerblue:       0x6495ed,
     cornsilk:             0xfff8dc,
@@ -168,6 +170,7 @@ class Symbol
     teal:                 0x008080,
     thistle:              0xd8bfd8,
     tomato:               0xff6347,
+    torygray:             0x5c5a5d,
     turquoise:            0x40e0d0,
     violet:               0xee82ee,
     wheat:                0xf5deb3,

data/lib/sugarcube/uicolor.rb

@@ -14,12 +14,45 @@ class UIColor
 
   # blends two colors by averaging the RGB and alpha components.
   # @example
-  # :white.uicolor + :black.uicolor == :gray.uicolor
+  #     :white.uicolor + :black.uicolor == :gray.uicolor
   def +(color)
-    r = (self.red + color.red) / 2
-    g = (self.green + color.green) / 2
-    b = (self.blue + color.blue) / 2
-    a = (self.alpha + color.alpha) / 2
+    mix_with(color, 0.5)
+  end
+
+  # a more generic color mixing method.  mixes two colors, but a second
+  # parameter determines how much of each.  0.5 means equal parts, 0.0 means use
+  # all of the first, and 1.0 means use all of the second
+  def mix_with(color, amount)
+    # make amount between 0 and 1
+    amount = [[0, amount].max, 1].min
+    # start with precise amounts: 0, 0.5, and 1.
+    if amount == 0
+      self
+    elsif amount == 1
+      color
+    elsif amount == 0.5
+      r = (self.red + color.red) / 2
+      g = (self.green + color.green) / 2
+      b = (self.blue + color.blue) / 2
+      a = (self.alpha + color.alpha) / 2
+      UIColor.colorWithRed(r, green:g, blue:b, alpha:a)
+    else
+      r = (color.red - self.red) * amount + self.red
+      g = (color.green - self.green) * amount + self.green
+      b = (color.blue - self.blue) * amount + self.blue
+      a = (color.alpha - self.alpha) * amount + self.alpha
+      UIColor.colorWithRed(r, green:g, blue:b, alpha:a)
+    end
+  end
+
+  # inverts the RGB channel.  keeps the alpha channel unchanged
+  # @example
+  #   :white.uicolor.invert == :black.uicolor
+  def invert
+    r = 1.0 - self.red
+    g = 1.0 - self.green
+    b = 1.0 - self.blue
+    a = self.alpha
     UIColor.colorWithRed(r, green:g, blue:b, alpha:a)
   end
 

data/lib/sugarcube/uiview.rb

@@ -358,13 +358,39 @@ class UIView
     }
   end
 
-  # Easily take a snapshot of a UIView
-  def uiimage
+  # Easily take a snapshot of a `UIView`.
+  #
+  # Calling `uiimage` with no arguments will return the image based on the
+  # `bounds` of the image.  In the case of container views (notably
+  # `UIScrollView` and its children) this does not include the entire contents,
+  # which is something you probably want.
+  #
+  # If you pass a truthy value to this method, it will use the `contentSize` of
+  # the view instead of the `bounds`, and it will draw all the child views, not
+  # just those that are visible in the viewport.
+  #
+  # It is guaranteed that `true` and `:all` will always have this behavior.  In
+  # the future, if this argument becomes something that accepts multiple values,
+  # those two are sacred.
+ def uiimage(use_content_size=false)
     scale = UIScreen.mainScreen.scale
-    UIGraphicsBeginImageContextWithOptions(bounds.size, false, scale)
-    layer.renderInContext(UIGraphicsGetCurrentContext())
-    image = UIGraphicsGetImageFromCurrentImageContext()
-    UIGraphicsEndImageContext()
+    if use_content_size
+      UIGraphicsBeginImageContextWithOptions(contentSize, false, scale)
+      context = UIGraphicsGetCurrentContext()
+      subviews.each do |subview|
+        CGContextSaveGState(context)
+        CGContextTranslateCTM(context, subview.frame.origin.x, subview.frame.origin.y)
+        subview.layer.renderInContext(context)
+        CGContextRestoreGState(context)
+      end
+      image = UIGraphicsGetImageFromCurrentImageContext()
+      UIGraphicsEndImageContext()
+    else
+      UIGraphicsBeginImageContextWithOptions(bounds.size, false, scale)
+      layer.renderInContext(UIGraphicsGetCurrentContext())
+      image = UIGraphicsGetImageFromCurrentImageContext()
+      UIGraphicsEndImageContext()
+    end
     return image
   end
 

data/lib/sugarcube/uiviewcontroller.rb

@@ -23,7 +23,9 @@ class UINavigationController
   end
 
   def pop(to_view=nil)
-    if to_view
+    if to_view == :root
+      self.popToRootViewControllerAnimated(true)
+    elsif to_view
       self.popToViewController(to_view, animated: true)
     else
       self.popViewControllerAnimated(true)
@@ -36,7 +38,10 @@ end
 class UITabBarController
 
   def push(view_controller)
-    view_controllers = [] + self.viewControllers
+    view_controllers = []
+    if self.viewControllers
+      view_controllers += self.viewControllers
+    end
     view_controllers << view_controller
     self.setViewControllers(view_controllers, animated: true)
     self

data/lib/sugarcube/version.rb

@@ -1,3 +1,3 @@
 module SugarCube
-  Version = '0.18.21'
+  Version = '0.19.0'
 end

data/spec/nsattributedstring_spec.rb

@@ -26,6 +26,12 @@ describe 'NSAttributeString' do
       subject.attributesAtIndex(0, effectiveRange:nil).should == {'NSUnderline' => NSUnderlineStyleSingle}
     end
 
+    it 'should be chainable' do
+      subject = 'test'.bold.underline
+      NSAttributedString.should === subject
+      subject.attributesAtIndex(0, effectiveRange:nil).should == {'NSFont' => :bold.uifont, 'NSUnderline' => NSUnderlineStyleSingle}
+    end
+
   end
 
   describe "should support all attribute names" do

data/spec/nsdate_spec.rb

@@ -11,16 +11,22 @@ describe "NSDate" do
     @date = NSDate.from_components(year: 2013, month: 1, day: 2, hour:12, minute: 15, second: 30)
   end
 
-  it "should have an NSDate#string_with_style(style) method that accepts symbols" do
+  it "should have an NSDate#string_with_style(date_style, time_style) method that accepts symbols" do
     @date.string_with_style(:medium).should == 'Jan 2, 2013'
+    @date.string_with_style(:medium, :none).should == 'Jan 2, 2013'
+    @date.string_with_style(:short, :medium).should == '1/2/13, 12:15:30 PM'
+    @date.string_with_style(:none, :short).should == '12:15 PM'
   end
 
-  it "should have an NSDate#string_with_style(style) method that has default" do
+  it "should have an NSDate#string_with_style(date_style, time_style) method that has default" do
     @date.string_with_style.should == 'Jan 2, 2013'
   end
 
-  it "should have an NSDate#string_with_style(style) method that accepts NSDateStyle constants" do
-    @date.string_with_style(NSDateFormatterShortStyle).should == '1/2/13'
+  it "should have an NSDate#string_with_style(date_style, time_style) method that accepts NSDateStyle constants" do
+    @date.string_with_style(NSDateFormatterMediumStyle).should == 'Jan 2, 2013'
+    @date.string_with_style(NSDateFormatterMediumStyle, NSDateFormatterNoStyle).should == 'Jan 2, 2013'
+    @date.string_with_style(NSDateFormatterShortStyle, NSDateFormatterMediumStyle).should == '1/2/13, 12:15:30 PM'
+    @date.string_with_style(NSDateFormatterNoStyle, NSDateFormatterShortStyle).should == '12:15 PM'
   end
 
   it "should have an NSDate#string_with_format method (1)" do

data/spec/nsstring_spec.rb

@@ -93,4 +93,9 @@ describe "NSString" do
     'hello'._.should == 'howdy'
   end
 
+  it "should have a #nan? method" do
+    "pi".nan?.should.equal true
+    "3.12159".nan?.should.equal false
+  end
+
 end

data/spec/uicolor_spec.rb

@@ -15,4 +15,43 @@ describe 'UIColor' do
     new_color.blue.should == 0.5
   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
+
+    :white.uicolor.invert.red.should == 0
+    :white.uicolor.invert.green.should == 0
+    :white.uicolor.invert.blue.should == 0
+
+    :black.uicolor.invert.red.should == 1
+    :black.uicolor.invert.green.should == 1
+    :black.uicolor.invert.blue.should == 1
+  end
+
+  it "should have a #mix_with method" do
+    white = :white.uicolor
+    black = :black.uicolor
+    gray = :gray.uicolor
+    white.mix_with(black, 0).red.should == 1
+    white.mix_with(black, 0).green.should == 1
+    white.mix_with(black, 0).blue.should == 1
+
+    white.mix_with(black, 1).red.should == 0
+    white.mix_with(black, 1).green.should == 0
+    white.mix_with(black, 1).blue.should == 0
+
+    white.mix_with(black, 0.5).red.should == 0.5
+    white.mix_with(black, 0.5).green.should == 0.5
+    white.mix_with(black, 0.5).blue.should == 0.5
+
+    white.mix_with(black, 0.25).red.should == 0.75
+    white.mix_with(black, 0.25).green.should == 0.75
+    white.mix_with(black, 0.25).blue.should == 0.75
+
+    white.mix_with(black, 0.75).red.should == 0.25
+    white.mix_with(black, 0.75).green.should == 0.25
+    white.mix_with(black, 0.75).blue.should == 0.25
+  end
+
 end

data/spec/uiview_spec.rb

@@ -8,4 +8,24 @@ describe "UIView" do
     image.scale.should == UIScreen.mainScreen.scale
   end
 
+  it "should convert a UIScrollView to a UIImage" do
+    test = UIScrollView.alloc.initWithFrame([[0, 0], [10, 10]])
+    test.contentSize = [20, 20]
+
+    image = test.uiimage
+    image.class.should == UIImage
+    CGSizeEqualToSize(image.size, [10, 10]).should == true
+    image.scale.should == UIScreen.mainScreen.scale
+
+    image = test.uiimage(:all)
+    image.class.should == UIImage
+    CGSizeEqualToSize(image.size, [20, 20]).should == true
+    image.scale.should == UIScreen.mainScreen.scale
+
+    image = test.uiimage(true)
+    image.class.should == UIImage
+    CGSizeEqualToSize(image.size, [20, 20]).should == true
+    image.scale.should == UIScreen.mainScreen.scale
+  end
+
 end

data/spec/uiviewcontroller_spec.rb

@@ -0,0 +1,87 @@
+describe 'UIViewController' do
+
+  it 'should have `push` method' do
+    controller = UIViewController.new
+    controller.push UIViewController.new
+    controller.childViewControllers.length.should == 1
+    controller.push UIViewController.new
+    controller.childViewControllers.length.should == 2
+  end
+
+  it 'should have `<<` method' do
+    controller = UIViewController.new
+    controller << UIViewController.new
+    controller.childViewControllers.length.should == 1
+    controller << UIViewController.new
+    controller.childViewControllers.length.should == 2
+  end
+
+end
+
+
+describe 'UINavigationViewController' do
+
+  before do
+    @root_controller = UIViewController.new
+    second_controller = UIViewController.new
+    @target_controller = UIViewController.new
+    fourth_controller = UIViewController.new
+    @nav_controller = UINavigationController.alloc.initWithRootViewController(@root_controller)
+    @nav_controller.pushViewController(second_controller, animated: false)
+    @nav_controller.pushViewController(@target_controller, animated: false)
+    @nav_controller.pushViewController(fourth_controller, animated: false)
+  end
+
+  it 'should have `push` method' do
+    test_controller = UIViewController.new
+    length = @nav_controller.viewControllers.length
+    @nav_controller.push(test_controller)
+    @nav_controller.viewControllers.length.should == length + 1
+  end
+
+  it 'should have `<<` method' do
+    test_controller = UIViewController.new
+    length = @nav_controller.viewControllers.length
+    @nav_controller << test_controller
+    @nav_controller.viewControllers.length.should == length + 1
+  end
+
+  it 'should have `pop()` method' do
+    length = @nav_controller.viewControllers.length
+    @nav_controller.pop
+    @nav_controller.viewControllers.length.should == length - 1
+  end
+
+  it 'should have `pop(:root)` method' do
+    @nav_controller.pop :root
+    @nav_controller.viewControllers.length.should == 1
+    @nav_controller.visibleViewController.should == @root_controller
+  end
+
+  it 'should have `pop(@target_controller)` method' do
+    @nav_controller.pop @target_controller
+    @nav_controller.visibleViewController.should == @target_controller
+  end
+
+end
+
+
+describe 'UITabBarController' do
+
+  it 'should have `push` method' do
+    controller = UITabBarController.new
+    controller.push UIViewController.new
+    controller.viewControllers.length.should == 1
+    controller.push UIViewController.new
+    controller.viewControllers.length.should == 2
+  end
+
+  it 'should have `<<` method' do
+    controller = UITabBarController.new
+    controller << UIViewController.new
+    controller.viewControllers.length.should == 1
+    controller << UIViewController.new
+    controller.viewControllers.length.should == 2
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugarcube
 version: !ruby/object:Gem::Version
-  version: 0.18.21
+  version: 0.19.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-11 00:00:00.000000000 Z
+date: 2013-03-17 00:00:00.000000000 Z
 dependencies: []
 description: ! '== Description
 
@@ -153,6 +153,7 @@ files:
 - spec/uiview_animation_spec.rb
 - spec/uiview_attr_updates_spec.rb
 - spec/uiview_spec.rb
+- spec/uiviewcontroller_spec.rb
 - spec/unholy_spec.rb
 - sugarcube.gemspec
 homepage: https://github.com/rubymotion/sugarcube
@@ -212,5 +213,6 @@ test_files:
 - spec/uiview_animation_spec.rb
 - spec/uiview_attr_updates_spec.rb
 - spec/uiview_spec.rb
+- spec/uiviewcontroller_spec.rb
 - spec/unholy_spec.rb
 has_rdoc: