sugarcube 0.20.11 → 0.20.12

data/Gemfile.lock

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

data/README.md

@@ -67,7 +67,7 @@ Installation
 Examples
 ========
 
- Array
+Array
 -------
 
 ```ruby
@@ -76,7 +76,7 @@ Examples
 [160, 210, 242].uicolor(0.5)  # => UIColor.colorWithRed(0.6274, green:0.8235, blue:0.9490, alpha:0.5)
 ```
 
- Hash => Object
+Hash => Object
 --------
 
 ```ruby
@@ -101,7 +101,7 @@ h.baz          # => NoMethodError
 h.baz = 'baz'  # => NoMethodError
 ```
 
- Fixnum
+Fixnum
 --------
 
 ```ruby
@@ -129,7 +129,7 @@ NSDate.new  # => 2013-01-03 11:42:24 -0700
 # later => NSTimer
 ```
 
- Numeric
+Numeric
 ---------
 
 ```ruby
@@ -156,7 +156,7 @@ distance.miles  # => 0.932056427001953
 10000.string_with_style(:currency)  # => "$10,000.00"
 ```
 
- NSAttributedString
+NSAttributedString
 ---------
 
 ```ruby
@@ -195,7 +195,7 @@ view << (("We just met\n".attrd +
           "so give me SSH access.").uilabel
 ```
 
- NSCoder
+NSCoder
 ---------
 
 Shorthands and hash-like access to the coder/decoder objects.
@@ -245,7 +245,7 @@ string_data.nsstring  # => 'String'
 image_data.nsimage  # => whatever 'an image' was
 ```
 
- NSDate
+NSDate
 --------
 
 `NSDate` objects are converted to `Time` objects automatically by rubymotion.
@@ -490,7 +490,7 @@ NSError.new('Error Message', code: 404)
 NSError.new('Error Message', code: 404, userInfo: { warnings: ['blabla'] })
 ```
 
- NSURL
+NSURL
 -------
 
 ```ruby
@@ -498,7 +498,7 @@ NSError.new('Error Message', code: 404, userInfo: { warnings: ['blabla'] })
 "https://github.com".nsurl.open  # => UIApplication.sharedApplication.openURL(NSURL.URLWithString("https://github.com"))
 ```
 
- NSString
+NSString
 ----------
 
 ```ruby
@@ -543,7 +543,7 @@ NSError.new('Error Message', code: 404, userInfo: { warnings: ['blabla'] })
 "pi".nan? # => NSNumberFormatter.alloc.init.numberFromString("pi").nil?
 ```
 
- NSIndexPath
+NSIndexPath
 -------------
 
 Use the `IndexPath` class to match `NSIndexPath` objects, for instance in a
@@ -559,7 +559,7 @@ end
 [0, 2].nsindexpath.to_a == [0, 2]  # => true
 ```
 
- Symbol
+Symbol
 --------
 
 This is the "big daddy".  Lots of sugar here...
@@ -597,7 +597,7 @@ This is the "big daddy".  Lots of sugar here...
 :blue.uitablecellselectionstyle  # or .uitableviewcellselectionstyle
 ```
 
- UIImage
+UIImage
 ---------
 
 ```ruby
@@ -725,7 +725,7 @@ UIActionSheet.alert 'I mean, is this cool?', buttons: ['Nah', 'With fire!', 'Sur
   success: proc { |pressed| self.proceed if pressed == 'Sure' }
 ```
 
- UIColor
+UIColor
 ---------
 
 Methods to merge or manipulate a color, or to get information about a color.
@@ -749,7 +749,7 @@ image patterns can't easily be inverted or mixed.
 :white.uicolor.mix_with(:black.uicolor, 1)  # => :black
 ```
 
- UIView
+UIView
 --------
 
 ```ruby
@@ -799,22 +799,22 @@ provides it to all its completion handlers).
 view.fade_out
 
 # with a callback
-view.fade_out {
+view.fade_out do
   view.removeFromSuperview
-}
+end
 
 # and the completed argument
-view.fade_out { |completed|
+view.fade_out do |completed|
   view.removeFromSuperview
-}
+end
 
 # fade_out options
 view.fade_out(duration: 0.5,
                  delay: 0,
                options: UIViewAnimationOptionCurveLinear,
-               opacity: 0.5) {
+               opacity: 0.5) do
   view.removeFromSuperview
-}
+end
 
 view.move_to([0, 100])   # move to position 0, 100
 view.delta_to([0, 100])  # move over 0, down 100, from current position
@@ -823,7 +823,10 @@ view.rotate_to Math::PI  # rotate view upside down
 view.rotate 45.degrees  # rotate *an additional* 45 degrees
 view.rotate_to(duration: 0.5, angle: 45.degrees)  # using options
 
-view.slide :left   # slides the entire view one "page" to the left, right, up, or down
+view.slide :left   # slides the entire view left, right, up, or down. The
+                   # default amount is the width of the view being moved, but
+                   # you can override
+view.slide :left, 320
 
 view.shake  # shakes the view.
 # options w/ default values:
@@ -843,19 +846,48 @@ view.shake offset: 0.1, repeat: 2, duration: 0.5, keypath: 'transform.rotation'
 view.tumble  # the view will fall and rotate - a good 'cancel button effect'
 ```
 
+The default behavior on all the animation methods is to animate from "the
+current" position (`UIViewAnimationOptionBeginFromCurrentState`). To disable
+that, you can either assign `options:` to something else, or you can disable
+
+```ruby
+# *just* that option.
+view.slide :left, from_current: false
+```
+
+Other options can be assigned this way, like the curve
+
+```ruby
+view.slide :left, from_current: false, curve: :ease_in  # :ease_in_out, :ease_in, :ease_out, :linear
+```
+
+Allow/disallow user interaction
+
+```ruby
+view.slide :left, allow_interaction: true
+```
+
+Not all options are configurable this way. Refer to `UIViewAnimationOptions` and
+assign them direcly to `options:` if there are options you need that are not
+listed here.
+
+```ruby
+view.slide :left, options: UIViewAnimationOptionAllowAnimatedContent | UIViewAnimationOptionCurveEaseInOut
+```
+
 Using the completed callback you can string animations together for a low-tech
 animation sequence.
 
 ```ruby
-view.slide(:left, 20) {
-  view.slide(:up, 20) {
-    view.slide(:right, 20) {
-      view.slide(:down, 20) {
+view.slide(:left, 20) do
+  view.slide(:up, 20) do
+    view.slide(:right, 20) do
+      view.slide(:down, 20) do
         view.fade_out
-      }
-    }
-  }
-}
+      end
+    end
+  end
+end
 ```
 
 Those be some gnarly callbacks.  You can write this as a chain instead!
@@ -925,7 +957,7 @@ chain.loop(10)  # would loop 10 times
 # if you're impatient
 chain.abort
 # will stop the animation at the end of whatever block it is in, so it could be
-# in a strange position, depending on where in the chain it is.  better to call
+# in a strange position, depending on where in the chain it is.  Better to call
 # `stop`
 ```
 
@@ -971,6 +1003,24 @@ UITableView.plain([[0, 0], [320, 568]])
 UITableView.grouped([[0, 0], [320, 400]])
 ```
 
+###### UITableViewCell
+
+```ruby
+# factory methods, named for the cell style. cell identifier is required.
+UITableViewCell.default('cell_identifier')
+UITableViewCell.value1('cell_identifier')
+UITableViewCell.value2('cell_identifier')
+UITableViewCell.subtitle('cell_identifier')
+
+# you can options for the common settings
+cell = UITableViewCell.default('cell_identifier',
+  accessory: :disclosure,
+  selection: :blue,
+  text: 'text',
+  image: 'icon', # coerced into a UIImage
+  )
+```
+
 ###### UISegmentedControl
 
 ```ruby
@@ -996,7 +1046,7 @@ UIActivityIndicatorView.large
 UIActivityIndicatorView.gray
 ```
 
- UIControl
+UIControl
 -----------
 
 Inspired by [BubbleWrap's][BubbleWrap] `when` method, but I prefer jQuery-style
@@ -1019,7 +1069,7 @@ button.off(:all)
 You can only remove handlers by "type", not by the action.  e.g. If you bind
 three `:touch` events, calling `button.off(:touch)` will remove all three.
 
- UIViewController
+UIViewController
 ------------------
 
 It is nice that *any* `UIViewController` can present a modal, but if you have
@@ -1051,7 +1101,7 @@ re-defined on `UIViewController` for this purpose:
 controller.present_modal(other_controller) { puts "presented" }
 ```
 
- UINavigationController
+UINavigationController
 ------------------------
 
 `push`, `<<` and `pop` instead of `pushViewController` and `popViewController`.
@@ -1073,7 +1123,7 @@ nav_ctlr.pop new_ctlr # => pops to new_ctlr
 nav_ctlr.pop :root  # => pops to root_ctlr, because it's on the bottom
 ```
 
- UITabBarController
+UITabBarController
 ------------------------
 
 I have mixed feelings about adding this extension, but **I** needed it, so maybe
@@ -1091,7 +1141,7 @@ tabbar_ctlr.setViewControllers(controllers, animated: true)
 tabbar_ctlr << new_ctlr
 ```
 
- UITextView
+UITextView
 ------------
 
 Added some `UIControl`-like event binding.  You MUST call the `off` methods,
@@ -1122,21 +1172,23 @@ end
 text_view.off :change, :end, :begin
 ```
 
- UILabel
+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.
+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.
+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
+UIBarButtonItem
 ----------------------
 
 ```ruby
@@ -1227,7 +1279,7 @@ Makes it easy to post a notification to some or all objects.
 "my notification".remove_observer(observer, object)
 ```
 
- NSTimer
+NSTimer
 ---------
 
 ```ruby
@@ -1325,7 +1377,7 @@ test['my'] = 'new'
 NSUserDefaults['test'] = test  # saved
 ```
 
- CoreGraphics
+CoreGraphics
 --------------
 
 ###### Is it `CGMakeRect` or `CGRectMake`?  What arguments does `CGRect.new` take?
@@ -1365,7 +1417,7 @@ f = Rect(p, [w, h])
 f = Rect([x, y], s)
 ```
 
- CoreLocation
+CoreLocation
 --------------
 
 Open up `CLLocationCoordinate2D` to provide handy-dandies
@@ -1387,7 +1439,7 @@ Open up `CLLocationCoordinate2D` to provide handy-dandies
 => 0.00502094626426697
 ```
 
- REPL View adjustments
+REPL View adjustments
 -----------------------
 
 Pixel pushing is an unfortunate but necessary evil.  Well, at least we can make
@@ -1664,7 +1716,7 @@ $sugarcube_items  # => the list of views that was output using `tree`
 ```
 
 
- Pointers
+Pointers
 ----------
 
 These are not UIKit-related, so I reverted to Ruby's preferred `to_foo`
@@ -1680,7 +1732,7 @@ floats[1] = 1.1
 floats[2] = 2.2
 ```
 
- UUID
+UUID
 ------
 
 Quick wrapper for `CFUUIDCreate()` and `CFUUIDCreateString()`.  Identical to the
@@ -1696,7 +1748,7 @@ Quick wrapper for `CFUUIDCreate()` and `CFUUIDCreateString()`.  Identical to the
 # => "0A3A76C6-9738-4458-969E-3B9DF174A3D9"
 ```
 
- Ruby on Rails Ripoffs (RoR-R?)
+Ruby on Rails Ripoffs (RoR-R?)
 ---------------
 
 aka `ActiveSupport`.
@@ -1763,7 +1815,7 @@ view.on_press(1.5)  # duration
 view.on_press(duration: 1.5, taps: 1, fingers: 1)
 ```
 
- Unholy
+Unholy
 --------
 
 These methods are just about as opinionated as they get - even more than the RoR

data/lib/sugarcube/animation_chain.rb

@@ -56,12 +56,12 @@ module SugarCube
       }
       options[:after] = @after_block
 
-      UIView.animate(options) {
+      UIView.animate(options) do
         Thread.current[:sugarcube_chaining] = true
         block.call
         Thread.current[:sugarcube_chaining] = nil
         @block_index += 1
-      }
+      end
       true
     end
 

data/lib/sugarcube/symbol.rb

@@ -52,7 +52,8 @@ class Symbol
     attr :activityindicator_styles
     attr :segmented_styles
     attr :datepicker_modes
-    attr :content_modes
+    attr :uiview_content_modes
+    attr :uiview_animation_curve
 
     attr :tableview_styles
     attr :tableview_rowanimation
@@ -274,7 +275,7 @@ class Symbol
     countdowntimer: UIDatePickerModeCountDownTimer
   }
 
-  @content_modes = {
+  @uiview_content_modes = {
     scale: UIViewContentModeScaleToFill,
     scale_to_fill: UIViewContentModeScaleToFill,
     scaletofill: UIViewContentModeScaleToFill,
@@ -300,6 +301,13 @@ class Symbol
     bottom_right: UIViewContentModeBottomRight,
   }
 
+  @uiview_animation_curve = {
+    ease_in_out: UIViewAnimationCurveEaseInOut,
+    ease_in: UIViewAnimationCurveEaseIn,
+    ease_out: UIViewAnimationCurveEaseOut,
+    linear: UIViewAnimationCurveLinear
+  }
+
   @tableview_styles = {
     plain:   UITableViewStylePlain,
     grouped: UITableViewStyleGrouped,
@@ -581,10 +589,15 @@ class Symbol
   end
 
   def uicontentmode
-    sugarcube_look_in(Symbol.content_modes)
+    sugarcube_look_in(Symbol.uiview_content_modes)
   end
   alias uiviewcontentmode uicontentmode
 
+  def uianimationcurve
+    sugarcube_look_in(Symbol.uiview_animation_curve)
+  end
+  alias uiviewanimationcurve uianimationcurve
+
   def uitablestyle
     sugarcube_look_in(Symbol.tableview_styles)
   end
@@ -600,10 +613,11 @@ class Symbol
   end
   alias uitableviewcellstyle uitablecellstyle
 
-  def uitableviewcellaccessorytype
+  def uitablecellaccessorytype
     sugarcube_look_in(Symbol.tableview_cellaccessorytype)
   end
-  alias uitablecellaccessory uitableviewcellaccessorytype
+  alias uitablecellaccessory uitablecellaccessorytype
+  alias uitableviewcellaccessorytype uitablecellaccessorytype
 
   def uitablecellselectionstyle
     sugarcube_look_in(Symbol.tableview_cellselectionstyle)

data/lib/sugarcube/uitableviewcell.rb

@@ -0,0 +1,84 @@
+# Factory methods for UITableViewCell
+class UITableViewCell
+
+  class << self
+
+    # returns a cell in the default style, with reuse identifier
+    # `cell_identifier`.  Options are passed on to the
+    # `sugarcube_cell_factory` method.
+    def default(cell_identifier, options={})
+      return sugarcube_cell_factory(cell_identifier, :default, options)
+    end
+
+    # returns a cell in the value1 style, with reuse identifier
+    # `cell_identifier`.  Options are passed on to the
+    # `sugarcube_cell_factory` method.
+    def value1(cell_identifier, options={})
+      return sugarcube_cell_factory(cell_identifier, :value1, options)
+    end
+
+    # returns a cell in the value2 style, with reuse identifier
+    # `cell_identifier`.  Options are passed on to the
+    # `sugarcube_cell_factory` method.
+    def value2(cell_identifier, options={})
+      return sugarcube_cell_factory(cell_identifier, :value2, options)
+    end
+
+    # returns a cell in the subtitle style, with reuse identifier
+    # `cell_identifier`.  Options are passed on to the
+    # `sugarcube_cell_factory` method.
+    def subtitle(cell_identifier, options={})
+      return sugarcube_cell_factory(cell_identifier, :subtitle, options)
+    end
+
+private
+
+    # Available options:
+    #   accessory - accessoryType.  Valid values:
+    #      :none, :disclosure, :disclosureindicator, :detail,
+    #      :detaildisclosurebutton, :checkmark
+    #      or any UITableViewCellAccessory constant
+    #   text - textLabel.text content
+    #   detail - detailTextLabel.text content
+    #   selection - selectionStyle
+    def sugarcube_cell_factory(cell_identifier, cell_style, options)
+      cell_style = cell_style.uitablecellstyle if cell_style.is_a?(Symbol)
+      cell = UITableViewCell.alloc.initWithStyle(cell_style, reuseIdentifier: cell_identifier)
+
+      if options[:accessory]
+        accessory = options[:accessory]
+        if accessory.is_a?(Symbol)
+          accessory = accessory.uitablecellaccessorytype
+        end
+        cell.accessoryType = accessory
+      end
+
+      if options[:selection]
+        selection = options[:selection]
+        if selection.is_a?(Symbol)
+          selection = selection.uitablecellselectionstyle
+        end
+        cell.selectionStyle = selection
+      end
+
+      if options[:image]
+        raise "cell type #{cell_style} does not support imageView" unless cell.imageView
+        image = options[:image]
+        cell.imageView.image = image && image.uiimage
+      end
+
+      if options[:text]
+        cell.textLabel.text = options[:text]
+      end
+
+      if options[:detail]
+        raise "cell type #{cell_style} does not support detailTextLabel" unless cell.detailTextLabel
+        cell.detailTextLabel.text = options[:detail]
+      end
+
+      return cell
+    end
+
+  end
+
+end

data/lib/sugarcube/uiview.rb

@@ -51,16 +51,30 @@ class UIView
         after_adjusted = nil
       end
 
+      animation_options = options[:options]
+      unless animation_options
+        curve = options.fetch(:curve, UIViewAnimationOptionCurveEaseInOut)
+        curve = curve.uianimationcurve if curve.is_a?(Symbol)
+
+        from_current = options.fetch(:from_current, true) ? UIViewAnimationOptionBeginFromCurrentState : 0
+        allow_interaction = options.fetch(:allow_interaction, false) ? UIViewAnimationOptionAllowUserInteraction : 0
+
+        animation_options = curve | from_current
+      end
+
       if duration == 0 && delay == 0
         animations.call
         after_adjusted.call(true) if after_adjusted
       else
+        prev_value = Thread.current[:sugarcube_chaining]
+        Thread.current[:sugarcube_chaining] = true
         UIView.animateWithDuration( duration,
                              delay: delay,
-                           options: options[:options] || (UIViewAnimationOptionCurveEaseInOut|UIViewAnimationOptionBeginFromCurrentState),
+                           options: animation_options,
                         animations: animations,
                         completion: after_adjusted
                                   )
+        Thread.current[:sugarcube_chaining] = prev_value
       end
       nil
     end

data/lib/sugarcube/version.rb

@@ -1,3 +1,3 @@
 module SugarCube
-  Version = '0.20.11'
+  Version = '0.20.12'
 end

data/spec/uitableviewcell_spec.rb

@@ -0,0 +1,63 @@
+describe UITableViewCell do
+
+  it 'should create a default cell' do
+    cell = UITableViewCell.default('cell_identifier')
+    UITableViewCell.should === cell
+    cell.reuseIdentifier.should == 'cell_identifier'
+    # there's no way to test for the style :-/
+  end
+
+  it 'should create a value1 cell' do
+    cell = UITableViewCell.value1('cell_identifier')
+    UITableViewCell.should === cell
+    cell.reuseIdentifier.should == 'cell_identifier'
+    # there's no way to test for the style :-/
+  end
+
+  it 'should create a value2 cell' do
+    cell = UITableViewCell.value2('cell_identifier')
+    UITableViewCell.should === cell
+    cell.reuseIdentifier.should == 'cell_identifier'
+    # there's no way to test for the style :-/
+  end
+
+  it 'should create a subtitle cell' do
+    cell = UITableViewCell.subtitle('cell_identifier')
+    UITableViewCell.should === cell
+    cell.reuseIdentifier.should == 'cell_identifier'
+    # there's no way to test for the style :-/
+  end
+
+  it 'should accept options (image)' do
+    cell = UITableViewCell.default('cell_identifier',
+      accessory: :disclosure,
+      selection: :blue,
+      text: 'text',
+      image: 'little_square',
+      )
+    cell.accessoryType.should == UITableViewCellAccessoryDisclosureIndicator
+    cell.selectionStyle.should == UITableViewCellSelectionStyleBlue
+    cell.textLabel.text.should == 'text'
+    cell.imageView.image.should == 'little_square'.uiimage
+  end
+
+  it 'should accept options (detail)' do
+    cell = UITableViewCell.value2('cell_identifier',
+      accessory: :disclosure,
+      selection: :blue,
+      text: 'text',
+      detail: 'detail text',
+      )
+    cell.accessoryType.should == UITableViewCellAccessoryDisclosureIndicator
+    cell.selectionStyle.should == UITableViewCellSelectionStyleBlue
+    cell.textLabel.text.should == 'text'
+    cell.detailTextLabel.text.should == 'detail text'
+  end
+
+end
+
+# accessory
+# selection
+# text
+# image
+# detail

data/spec/uiview_animation_spec.rb

@@ -7,6 +7,10 @@ describe "UIView animation methods" do
     @view.delta_to([1,2]).frame.should == CGRectMake(2,4,3,4)
   end
 
+  it 'should delta_to x:1 y:2' do
+    @view.move_to([2,4]).frame.should == CGRectMake(2,4,3,4)
+  end
+
   it 'should rotate 45 degrees' do
     angle = 45.degrees
     @view.rotate_to(angle)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugarcube
 version: !ruby/object:Gem::Version
-  version: 0.20.11
+  version: 0.20.12
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-21 00:00:00.000000000 Z
+date: 2013-04-22 00:00:00.000000000 Z
 dependencies: []
 description: ! '== Description
 
@@ -119,6 +119,7 @@ files:
 - lib/sugarcube/uipickerview.rb
 - lib/sugarcube/uisegmentedcontrol.rb
 - lib/sugarcube/uitableview.rb
+- lib/sugarcube/uitableviewcell.rb
 - lib/sugarcube/uitextview.rb
 - lib/sugarcube/uiview.rb
 - lib/sugarcube/uiviewcontroller.rb
@@ -167,6 +168,7 @@ files:
 - spec/uiimage_color_at_spec.rb
 - spec/uiimage_scale_spec.rb
 - spec/uilabel_spec.rb
+- spec/uitableviewcell_spec.rb
 - spec/uiview_animation_spec.rb
 - spec/uiview_attr_updates_spec.rb
 - spec/uiview_spec.rb
@@ -232,6 +234,7 @@ test_files:
 - spec/uiimage_color_at_spec.rb
 - spec/uiimage_scale_spec.rb
 - spec/uilabel_spec.rb
+- spec/uitableviewcell_spec.rb
 - spec/uiview_animation_spec.rb
 - spec/uiview_attr_updates_spec.rb
 - spec/uiview_spec.rb