sugarcube 0.19.0 → 0.19.2

data/README.md

@@ -1081,6 +1081,20 @@ end
 text_view.off :change, :end, :begin
 ```
 
+ UILabel
+----------
+
+ Added simple `fit_to_size` function to the label, which will start at the supplied font size 
+ and then squeeze down until all the text fits.  This way you can assure any dynamic text will completely display
+ in a given label frame.  
+
+ The font size changes instead of the frame size.
+ ```ruby
+ #this will try to make the containing text fit at font size 40, but squeeze as needed.
+@label.fit_to_size(40) 
+puts @label.font.pointSize # => Will be 40 or less depending on the font type and label frame.
+ ```
+
  UIBarButtonItem
 ----------------------
 

data/app/uicontrol_controller.rb

@@ -0,0 +1,49 @@
+class UIControlController < UIViewController
+  attr :button1
+  attr :button2
+  attr :touched
+  attr :touched_count
+  attr :event
+  attr :touched_1
+  attr :touched_2
+
+  def reset
+    @touched = nil
+    @touched_count = 0
+    @event = nil
+    @touched_1 = false
+    @touched_2 = false
+  end
+
+  def loadView
+    super.tap do
+      @button1 = UIButton.rounded
+      @button1.setTitle('one', forState: :normal.uicontrolstate)
+      @button1.sizeToFit
+      @button1.center = self.view.center
+      self.view << @button1
+
+      @button2 = UIButton.rounded
+      @button2.setTitle('two', forState: :normal.uicontrolstate)
+      @button2.sizeToFit
+      @button2.center = [@button1.center.x, @button1.center.y + 30]
+      @button1.center = [@button1.center.x, @button1.center.y - 30]
+      self.view << @button2
+
+      @button1.on :touch { |sender,event|
+        @touched_1 = true
+        @touched = sender
+        @touched_count += 1
+      }
+
+      @button2.on :touch { |sender,event|
+        @touched_2 = true
+        @touched = sender
+        @touched_count += 1
+      }
+
+      reset
+    end
+  end
+
+end

data/lib/sugarcube/nsdate.rb

@@ -1,4 +1,10 @@
 class NSDate
+  # these formatters are used in `string_with_format`.  Symbols are convertd to
+  # a string using string_with_format's templating, and strings are concatenated
+  # as-is
+  SugarCubeFormats = {
+    iso8601: [:yyyy, '-', :MM, '-', :dd, ' ', :HH, ':', :mm, ':', :ss, '.', :SSS]
+  }
 
   def self.from_components(components)
     date_components = NSDateComponents.new
@@ -18,12 +24,35 @@ class NSDate
     date_formatter.stringFromDate(self)
   end
 
+  # Pass in a format string or a Symbol.  The Symbol must exist in
+  # NSDate::SugarCubeFormats.
+  #
+  # See
+  # <https://developer.apple.com/library/mac/#documentation/Cocoa/Conceptual/DataFormatting/Articles/dfDateFormatting10_4.html#//apple_ref/doc/uid/TP40002369-SW1>
+  # and
+  # <http://www.unicode.org/reports/tr35/tr35-19.html#Date_Format_Patterns>
+  # for more information about date format strings.
   def string_with_format(format)
-    format_template = NSDateFormatter.dateFormatFromTemplate(format, options:0,
-                                                      locale:NSLocale.currentLocale)
-    date_formatter = NSDateFormatter.new
-    date_formatter.setDateFormat(format_template)
-    date_formatter.stringFromDate(self)
+    if format.is_a?(Symbol)
+      formatters = SugarCubeFormats[format]
+      raise "No format found for #{format.inspect}" unless formatters
+      retval = ''
+      formatters.each do |formatter|
+        case formatter
+        when Symbol
+          retval << string_with_format(formatter.to_s)
+        when String
+          retval << formatter
+        end
+      end
+      return retval
+    else
+      format_template = NSDateFormatter.dateFormatFromTemplate(format, options:0,
+                                                        locale:NSLocale.currentLocale)
+      date_formatter = NSDateFormatter.new
+      date_formatter.setDateFormat(format_template)
+      return date_formatter.stringFromDate(self)
+    end
   end
 
   def upto(last_date, delta={days: 1}, &block)

data/lib/sugarcube/symbol/symbol_uicolor.rb

@@ -47,6 +47,22 @@ class Symbol
   }
 
   @css_colors = {
+    # for css_name to pick up on these colors, they need to be defined here
+    black:     0x000000,
+    blue:      0x0000ff,
+    brown:     0x996633,
+    cyan:      0x00ffff,
+    darkgray:  0x555555,
+    gray:      0x808080,
+    green:     0x00ff00,
+    lightgray: 0xaaaaaa,
+    magenta:   0xff00ff,
+    orange:    0xff8000,
+    purple:    0x800080,
+    red:       0xff0000,
+    yellow:    0xffff00,
+    white:     0xffffff,
+
     aliceblue:            0xf0f8ff,
     antiquewhite:         0xfaebd7,
     aqua:                 0x00ffff,
@@ -176,22 +192,6 @@ class Symbol
     wheat:                0xf5deb3,
     whitesmoke:           0xf5f5f5,
     yellowgreen:          0x9acd32,
-
-    # for to_s to pick up on these colors, they need to be defined here
-    black:     0x000000,
-    blue:      0x0000ff,
-    brown:     0x996633,
-    cyan:      0x00ffff,
-    darkgray:  0x555555,
-    gray:      0x808080,
-    green:     0x00ff00,
-    lightgray: 0xaaaaaa,
-    magenta:   0xff00ff,
-    orange:    0xff8000,
-    purple:    0x800080,
-    red:       0xff0000,
-    yellow:    0xffff00,
-    white:     0xffffff,
   }
 
 end

data/lib/sugarcube/to_s/uicolor.rb

@@ -1,34 +1,11 @@
 class UIColor
+
   def to_s
-    system_color = nil
-    Symbol.uicolors.each_pair do |color, method|
-      if UIColor.send(method) == self
-        if self.alpha && self.alpha < 1
-          system_color = "UIColor.#{method}(#{alpha})"
-        else
-          system_color = "UIColor.#{method}"
-        end
-        break
-      end
-    end
+    system_color = system_name
     return system_color if system_color
 
-    if self.red && self.green && self.blue
-      red = (self.red * 255).round << 16
-      green = (self.green * 255).round << 8
-      blue = (self.blue * 255).round
-      my_color = red + green + blue
-
-      inside = my_color.to_s(16)
-      inside = '0x' + '0' * (6 - inside.length) + inside
-
-      Symbol.css_colors.each_pair do |color, hex|
-        if hex == my_color
-          inside = color.inspect
-          break
-        end
-      end
-
+    inside = self.css_name || self.hex
+    if inside
       if self.alpha < 1
         return "UIColor.color(#{inside}, #{alpha})"
       else
@@ -38,4 +15,18 @@ class UIColor
       super
     end
   end
+
+  def inspect
+    alpha_s = ((alpha || 1) < 1 ? "(#{alpha})" : '')
+    if system_name
+      return "UIColor.#{system_name}#{alpha_s}"
+    elsif hex
+      return "'#{hex}'.uicolor#{alpha_s}"
+    elsif css_name
+      return ":#{css_name}.uicolor#{alpha_s}"
+    else
+      super
+    end
+  end
+
 end

data/lib/sugarcube/uicolor.rb

@@ -72,15 +72,61 @@ class UIColor
     _sugarcube_colors && _sugarcube_colors[:alpha]
   end
 
+  # returns the components OR'd together, as 32 bit RGB integer.
+  def to_i
+    if self.red && self.green && self.blue
+      red = (self.red * 255).round << 16
+      green = (self.green * 255).round << 8
+      blue = (self.blue * 255).round
+      return red + green + blue
+    else
+      return nil
+    end
+  end
+
+  # returns the components as an array of 32 bit RGB values
+  def to_a
+    if self.red && self.green && self.blue
+      red = (self.red * 255).round
+      green = (self.green * 255).round
+      blue = (self.blue * 255).round
+      return [red, green, blue]
+    else
+      return nil
+    end
+  end
+
+  def hex
+    my_color = self.to_i
+    if my_color
+      return '#' + my_color.to_s(16).rjust(6, '0')
+    else
+      nil
+    end
+  end
+
   # returns the closest css name
   def css_name
-    found = Symbol.css_colors.map { |key, val| [key, _sugarcube_color_compare(self, val.uicolor)] }.inject{|c1,c2| c1[1] < c2[1] ? c1 : c2 }
-    threshold = 0.03
-    if found[1] > 0.03
-      nil
-    else
-      found[0]
+    my_color = self.to_i
+    css_name = nil
+    Symbol.css_colors.each_pair do |color, hex|
+      if hex == my_color
+        css_name = color
+        break
+      end
+    end
+    return css_name
+  end
+
+  def system_name
+    system_color = nil
+    Symbol.uicolors.each_pair do |color, method|
+      if UIColor.send(method) == self
+        system_color = method
+        break
+      end
     end
+    return system_color.to_s
   end
 
 private

data/lib/sugarcube/uicontrol.rb

@@ -1,12 +1,6 @@
+# Additions to UIControl to support jQuery-style `on` and `off` methods.
 class UIControl
 
-  # event blocks need to be retained, and the addTarget method explicitly does
-  # *not* retain `target`.  This makes sure that callbacks are retained by
-  # pushing the block onto a stack.
-  def sugarcube_callbacks
-    @sugarcube_callbacks ||= Hash.new { |hash, key| hash[key] = [] }
-  end
-
   # Add event handlers to UIControls.  See symbol.rb for the uicontrolevent
   # constant aliases.
   #
@@ -14,12 +8,17 @@ class UIControl
   #   button = UIButton.alloc.initWithFrame([0, 0, 10, 10])
   #   button.on(:touch) { my_code }
   #   button.on(:touchupoutside, :touchcancel) { my_code }
+  #   # up to two arguments can be passed in
+  #   button.on(:touch) { |sender,touch_event| my_code }
   def on(*events, &block)
+    handler = SugarCube::UIControlCallbackHelper.new
+    handler.callback = block
+
     events.each do |event|
       event = event.uicontrolevent unless event.is_a? Fixnum
 
-      sugarcube_callbacks[event].push block
-      addTarget(block, action: :call, forControlEvents:event)
+      sugarcube_callbacks[event].push(handler)
+      addTarget(handler, action:'call:event:', forControlEvents:event)
     end
 
     self
@@ -40,12 +39,38 @@ class UIControl
     events.each do |event|
       event = event.uicontrolevent unless event.is_a? Fixnum
 
-      sugarcube_callbacks[event].each do |block|
-        self.removeTarget(block, action: :call, forControlEvents:event)
+      sugarcube_callbacks[event].each do |handler|
+        self.removeTarget(handler, action:'call:event:', forControlEvents:event)
       end
       sugarcube_callbacks.delete(event)
     end
     self
   end
 
+# private
+  # event blocks need to be retained, and the addTarget method explicitly does
+  # *not* retain `target`.  This makes sure that callbacks are retained by
+  # pushing the block onto a stack.
+  def sugarcube_callbacks
+    @sugarcube_callbacks ||= Hash.new { |hash, key| hash[key] = [] }
+  end
+
+end
+
+
+module SugarCube
+  class UIControlCallbackHelper
+    attr_accessor :callback
+
+    def call(sender, event:event)
+      case callback.arity
+      when 0
+        callback.call
+      when 1
+        callback.call(sender)
+      else
+        callback.call(sender, event)
+      end
+    end
+  end
 end

data/lib/sugarcube/uilabel.rb

@@ -0,0 +1,22 @@
+class UILabel
+	
+  # forces the given text to fit inside the label's frame starting at a given font size 
+  def fit_to_size(max_size)
+    #enforce word wrap
+    self.lineBreakMode = UILineBreakModeWordWrap
+    
+    dynamic_font = self.font.fontWithSize(max_size + 2)
+    constraintSize = CGSizeMake(self.frame.size.width, 10000)
+
+    # does it fit yet?
+    begin
+      dynamic_font = dynamic_font.fontWithSize(dynamic_font.pointSize - 2)
+      current_size = self.text.sizeWithFont(dynamic_font, constrainedToSize:constraintSize, lineBreakMode:UILineBreakModeWordWrap)
+    end while self.frame.size.height <= current_size.height
+
+    #now set to font size we have settled on
+    self.font = dynamic_font
+
+  end
+
+end

data/lib/sugarcube/uiview.rb

@@ -10,11 +10,11 @@ class UIView
     def attr_updates(*attrs)
       attr_accessor(*attrs)
       attrs.each do |attr|
-        define_method(attr.setter) { |value|
-          if instance_variable_get(attr.ivar) != value
+        define_method("#{attr}=") { |value|
+          if instance_variable_get("@#{attr}") != value
             setNeedsDisplay
           end
-          instance_variable_set(attr.ivar, value)
+          instance_variable_set("@#{attr}", value)
         }
       end
     end

data/lib/sugarcube/version.rb

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

data/runtests

@@ -1 +1 @@
-rake spec && rake spec retina=3.5 && rake spec retina=4
+rake spec && rake spec retina=3.5 && rake spec retina=4 output=tap

data/spec/nsdate_spec.rb

@@ -37,6 +37,10 @@ describe "NSDate" do
     @date.string_with_format("yyyyMMMMd HH:mm:ss").should == 'January 2, 2013, 12:15:30'
   end
 
+  it "should have an NSDate#string_with_format method (:iso8601)" do
+    @date.string_with_format(:iso8601).should == '2013-01-02 12:15:30.000'
+  end
+
   it "should have an NSDate#timezone method" do
     String.should === @date.timezone.name
   end

data/spec/uicolor_other_representations_spec.rb

@@ -0,0 +1,46 @@
+describe 'UIColor (CSS)' do
+
+  it "should have a #to_i method" do
+    UIColor.whiteColor.to_i.should == 16777215
+    UIColor.blackColor.to_i.should == 0
+  end
+
+  it "should have a #to_a method" do
+    UIColor.whiteColor.to_a.should == [255, 255, 255]
+    UIColor.blackColor.to_a.should == [0, 0, 0]
+  end
+
+  it "should have a #hex method" do
+    UIColor.whiteColor.hex.should == '#ffffff'
+    UIColor.blackColor.hex.should == '#000000'
+  end
+
+  it "should have a #system_name method" do
+    UIColor.whiteColor.system_name.should == 'whiteColor'
+    UIColor.blackColor.system_name.should == 'blackColor'
+  end
+
+  it "should return css color names" do
+    corrections = {
+      aqua: :cyan,
+      lime: :green,
+      fuchsia: :magenta,
+    }
+    Symbol.css_colors.each do |name, val|
+      name = corrections[name] || name
+
+      color = val.uicolor
+      color.css_name.should == name
+    end
+  end
+
+  it "should return UIColor objects" do
+    Symbol.uicolors.each do |name, method|
+      name.uicolor.should == UIColor.send(method)
+    end
+    Symbol.css_colors.each do |name, val|
+      name.uicolor.is_a?(UIColor).should == true
+    end
+  end
+
+end

data/spec/uicontrol_spec.rb

@@ -0,0 +1,36 @@
+describe 'UIControl' do
+  tests UIControlController
+
+  before do
+    controller.reset
+  end
+
+  it 'should have two buttons' do
+    UIButton.should === controller.button1
+    UIButton.should === controller.button2
+  end
+
+  it 'button1 should respond to touches' do
+    controller.button1.sendActionsForControlEvents(:touch.uicontrolevent)
+    controller.touched.should == controller.button1
+    controller.touched_1.should == true
+    controller.touched_count.should == 1
+  end
+
+  it 'button2 should respond to touches' do
+    controller.button2.sendActionsForControlEvents(:touch.uicontrolevent)
+    controller.touched.should == controller.button2
+    controller.touched_2.should == true
+    controller.touched_count.should == 1
+  end
+
+  it 'should be able to share handlers with arity 1 (sender)' do
+    controller.button1.sendActionsForControlEvents(:touch.uicontrolevent)
+    controller.button2.sendActionsForControlEvents(:touch.uicontrolevent)
+    controller.touched.should == controller.button2
+    controller.touched_1.should == true
+    controller.touched_2.should == true
+    controller.touched_count.should == 2
+  end
+
+end

data/spec/uilabel_spec.rb

@@ -0,0 +1,12 @@
+describe "UILabel" do
+
+	it 'should have a #fit_to_size method' do
+		@label = UILabel.alloc.initWithFrame([[10, 10], [200, 40]])
+		@label.text = "Timeo Danaos et dona ferentes" * 10
+		@label.numberOfLines = 0
+		@label.fit_to_size(40)
+
+		@label.font.pointSize.should < 40
+		@label.font.pointSize.should > 0
+	end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugarcube
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.19.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-17 00:00:00.000000000 Z
+date: 2013-03-19 00:00:00.000000000 Z
 dependencies: []
 description: ! '== Description
 
@@ -49,6 +49,7 @@ files:
 - Rakefile
 - app/animation_chain_controller.rb
 - app/app_delegate.rb
+- app/uicontrol_controller.rb
 - lib/sugarcube-568.rb
 - lib/sugarcube-568/uiimage.rb
 - lib/sugarcube-attributedstring.rb
@@ -104,6 +105,7 @@ files:
 - lib/sugarcube/uicontrol.rb
 - lib/sugarcube/uifont.rb
 - lib/sugarcube/uiimage.rb
+- lib/sugarcube/uilabel.rb
 - lib/sugarcube/uipickerview.rb
 - lib/sugarcube/uisegmentedcontrol.rb
 - lib/sugarcube/uitableview.rb
@@ -146,10 +148,12 @@ files:
 - spec/timer_spec.rb
 - spec/uibarbuttonitem_spec.rb
 - spec/uicolor_components_spec.rb
-- spec/uicolor_css_spec.rb
+- spec/uicolor_other_representations_spec.rb
 - spec/uicolor_spec.rb
+- spec/uicontrol_spec.rb
 - spec/uiimage_color_at_spec.rb
 - spec/uiimage_scale_spec.rb
+- spec/uilabel_spec.rb
 - spec/uiview_animation_spec.rb
 - spec/uiview_attr_updates_spec.rb
 - spec/uiview_spec.rb
@@ -206,10 +210,12 @@ test_files:
 - spec/timer_spec.rb
 - spec/uibarbuttonitem_spec.rb
 - spec/uicolor_components_spec.rb
-- spec/uicolor_css_spec.rb
+- spec/uicolor_other_representations_spec.rb
 - spec/uicolor_spec.rb
+- spec/uicontrol_spec.rb
 - spec/uiimage_color_at_spec.rb
 - spec/uiimage_scale_spec.rb
+- spec/uilabel_spec.rb
 - spec/uiview_animation_spec.rb
 - spec/uiview_attr_updates_spec.rb
 - spec/uiview_spec.rb

data/spec/uicolor_css_spec.rb

@@ -1,23 +0,0 @@
-describe 'UIColor (CSS)' do
-
-  it "should return css color names" do
-    except_for = [:aqua, :fuchsia, :lime, :black, :blue, :brown, :cyan, :darkgray, :gray, :green, :lightgray, :magenta, :orange, :purple, :red, :yellow, :white]
-    Symbol.css_colors.each do |name, val|
-      next if except_for.include? name
-
-      color = val.uicolor
-      color.css_name.should == name
-      color.to_s.should == "UIColor.color(#{name.inspect})"
-    end
-  end
-
-  it "should return UIColor objects" do
-    Symbol.uicolors.each do |name, method|
-      name.uicolor.should == UIColor.send(method)
-    end
-    Symbol.css_colors.each do |name, val|
-      name.uicolor.is_a?(UIColor).should == true
-    end
-  end
-
-end