sugarcube 0.18.17 → 0.18.18

data/README.md

@@ -820,10 +820,10 @@ Chains can also be written like this:
 
 ```ruby
 chain = UIView.animation_chain
-chain << proc { view.slide(:left, 20, chain: true) }
-chain << proc { view.slide(:up, 20, chain: true) }
-chain << proc { view.slide(:right, 20, chain: true) }
-chain << proc { view.slide(:down, 20, chain: true) }
+chain << proc { view.slide(:left, 20) }
+chain << proc { view.slide(:up, 20) }
+chain << proc { view.slide(:right, 20) }
+chain << proc { view.slide(:down, 20) }
 chain << proc { view.fade_out }
 chain.start
 ```
@@ -1038,39 +1038,64 @@ text_view.off :change, :end, :begin
 ----------------------
 
 ```ruby
+# Get an instance containing the specified system item.
 UIBarButtonItem.done {
   self.dismissViewControllerAnimated true, completion:nil
 }
 # =>
-UIBarButtonitem.alloc.initWithBarButtonSystemItem(:done.uibarbuttonitem, target:self, action:"action:")
+UIBarButtonItem.alloc.initWithBarButtonSystemItem(:done.uibarbuttonitem, target:self, action:"action:")
+# with 'action' defined as:
+def action(sender)
+  self.dismissViewControllerAnimated true, completion:nil
+end
+
+# the method names are 1::1 with the uibarbuttonitem constants in symbol.rb
+UIBarButtonItem.cancel(&action)           => UIBarButtonItem.alloc.initWithBarButtonSystemItem(:cancel.uibarbuttonitem, target:self, action:"action:")
+UIBarButtonItem.edit(&action)             => UIBarButtonItem.alloc.initWithBarButtonSystemItem(:edit.uibarbuttonitem, target:self, action:"action:")
+UIBarButtonItem.save(&action)             => UIBarButtonItem.alloc.initWithBarButtonSystemItem(:save.uibarbuttonitem, target:self, action:"action:")
+  .
+  .
+  .
+UIBarButtonItem.pagecurl(&action)         => UIBarButtonItem.alloc.initWithBarButtonSystemItem(:pagecurl.uibarbuttonitem, target:self, action:"action:")
+
+# Get an instance containing the specified title.
+UIBarButtonItem.titled('Close') {
+  self.dismissViewControllerAnimated true, completion:nil
+}
+# =>
+UIBarButtonItem.alloc.initWithTitle('Close', style: :bordered.uibarbuttonstyle, target:self, action:"action:")
+
+def action:sender
+  self.dismissViewControllerAnimated true, completion:nil
+end
+
+# You can also specify a style.
+UIBarButtonItem.titled('Close', :plain.uibarbuttonstyle) {
+  self.dismissViewControllerAnimated true, completion:nil
+}
+
+
+# Get an instance containing the specified image.
+UIBarButtonItem.imaged('close'.uiimage) {
+  self.dismissViewControllerAnimated true, completion:nil
+}
+# =>
+UIBarButtonItem.alloc.initWithImage('Close'.uiimage, style: :bordered.uibarbuttonstyle, target:self, action:"action:")
 def action:sender
   self.dismissViewControllerAnimated true, completion:nil
 end
 
-UIBarButtonitem.done(&action)             => UIBarButtonitem.alloc.initWithBarButtonSystemItem(:done.uibarbuttonitem, target:self, action:"action:")
-UIBarButtonitem.cancel(&action)           => UIBarButtonitem.alloc.initWithBarButtonSystemItem(:cancel.uibarbuttonitem, target:self, action:"action:")
-UIBarButtonitem.edit(&action)             => UIBarButtonitem.alloc.initWithBarButtonSystemItem(:edit.uibarbuttonitem, target:self, action:"action:")
-UIBarButtonitem.save(&action)             => UIBarButtonitem.alloc.initWithBarButtonSystemItem(:save.uibarbuttonitem, target:self, action:"action:")
-UIBarButtonitem.add(&action)              => UIBarButtonitem.alloc.initWithBarButtonSystemItem(:add.uibarbuttonitem, target:self, action:"action:")
-UIBarButtonitem.flexiblespace(&action)    => UIBarButtonitem.alloc.initWithBarButtonSystemItem(:flexiblespace.uibarbuttonitem, target:self, action:"action:")
-UIBarButtonitem.fixedspace(&action)       => UIBarButtonitem.alloc.initWithBarButtonSystemItem(:fixedspace.uibarbuttonitem, target:self, action:"action:")
-UIBarButtonitem.compose(&action)          => UIBarButtonitem.alloc.initWithBarButtonSystemItem(:compose.uibarbuttonitem, target:self, action:"action:")
-UIBarButtonitem.reply(&action)            => UIBarButtonitem.alloc.initWithBarButtonSystemItem(:reply.uibarbuttonitem, target:self, action:"action:")
-UIBarButtonitem.action(&action)           => UIBarButtonitem.alloc.initWithBarButtonSystemItem(:action.uibarbuttonitem, target:self, action:"action:")
-UIBarButtonitem.organize(&action)         => UIBarButtonitem.alloc.initWithBarButtonSystemItem(:organize.uibarbuttonitem, target:self, action:"action:")
-UIBarButtonitem.bookmarks(&action)        => UIBarButtonitem.alloc.initWithBarButtonSystemItem(:bookmarks.uibarbuttonitem, target:self, action:"action:")
-UIBarButtonitem.search(&action)           => UIBarButtonitem.alloc.initWithBarButtonSystemItem(:search.uibarbuttonitem, target:self, action:"action:")
-UIBarButtonitem.refresh(&action)          => UIBarButtonitem.alloc.initWithBarButtonSystemItem(:refresh.uibarbuttonitem, target:self, action:"action:")
-UIBarButtonitem.stop(&action)             => UIBarButtonitem.alloc.initWithBarButtonSystemItem(:stop.uibarbuttonitem, target:self, action:"action:")
-UIBarButtonitem.camera(&action)           => UIBarButtonitem.alloc.initWithBarButtonSystemItem(:camera.uibarbuttonitem, target:self, action:"action:")
-UIBarButtonitem.trash(&action)            => UIBarButtonitem.alloc.initWithBarButtonSystemItem(:trash.uibarbuttonitem, target:self, action:"action:")
-UIBarButtonitem.play(&action)             => UIBarButtonitem.alloc.initWithBarButtonSystemItem(:play.uibarbuttonitem, target:self, action:"action:")
-UIBarButtonitem.pause(&action)            => UIBarButtonitem.alloc.initWithBarButtonSystemItem(:pause.uibarbuttonitem, target:self, action:"action:")
-UIBarButtonitem.rewind(&action)           => UIBarButtonitem.alloc.initWithBarButtonSystemItem(:rewind.uibarbuttonitem, target:self, action:"action:")
-UIBarButtonitem.fastforward(&action)      => UIBarButtonitem.alloc.initWithBarButtonSystemItem(:fastforward.uibarbuttonitem, target:self, action:"action:")
-UIBarButtonitem.undo(&action)             => UIBarButtonitem.alloc.initWithBarButtonSystemItem(:undo.uibarbuttonitem, target:self, action:"action:")
-UIBarButtonitem.redo(&action)             => UIBarButtonitem.alloc.initWithBarButtonSystemItem(:redo.uibarbuttonitem, target:self, action:"action:")
-UIBarButtonitem.pagecurl(&action)         => UIBarButtonitem.alloc.initWithBarButtonSystemItem(:pagecurl.uibarbuttonitem, target:self, action:"action:")
+# You can also specify a style.
+UIBarButtonItem.imaged('close'.uiimage, :plain.uibarbuttonstyle) {
+  self.dismissViewControllerAnimated true, completion:nil
+}
+
+# Get an instance containing the specified array which contains a portrate image and a landscape iamge.
+UIBarButtonItem.imaged(['portrate'.uiimage, 'landscape'.uiimage) {
+  self.dismissViewControllerAnimated true, completion:nil
+}
+# =>
+UIBarButtonItem.alloc.initWithImage('portrate'.uiimage, landscapeImagePhone:'landscape'.uiimage, style: :bordered.uibarbuttonstyle, target:self, action:"action:")
 ```
 
 NSNotificationCenter

data/lib/sugarcube/date_parser.rb

@@ -0,0 +1,67 @@
+module SugarCube
+  module DateParser
+    # Parse a date string: E.g.:
+    #
+    # SugarCube::DateParser.parse_date "There is a date in here tomorrow at 9:00 AM"
+    #
+    # => 2013-02-20 09:00:00 -0800
+    def self.parse_date(date_string)
+      detect(date_string).first.date
+    end
+
+    # Parse time zone from date
+    #
+    # SugarCube::DateParser.parse_date "There is a date in here tomorrow at 9:00 AM EDT"
+    #
+    # Caveat: This is implemented per Apple documentation. I've never really
+    #         seen it work.
+    def self.parse_time_zone(date_string)
+      detect(date_string).first.timeZone
+    end
+
+    # Parse a date string: E.g.:
+    #
+    # SugarCube::DateParser.parse_date "You have a meeting from 9:00 AM to 3:00 PM"
+    #
+    # => 21600.0
+    #
+    # Divide by 3600.0 to get number of hours duration.
+    def self.parse_duration(date_string)
+      detect(date_string).first.duration
+    end
+
+    # Parse a date into a raw match array for further processing
+    def self.match(date_string)
+      detect(date_string)
+    end
+
+    private
+    def self.detect(date_string)
+      error = Pointer.new(:object)
+      detector = NSDataDetector.dataDetectorWithTypes(NSTextCheckingTypeDate, error:error)
+      matches = detector.matchesInString(date_string, options:0, range:NSMakeRange(0, date_string.length))
+    end
+  end
+end
+
+class String
+  # Use NSDataDetector to parse a string containing a date
+  # or duration. These can be of the form:
+  #
+  # "tomorrow at 7:30 PM"
+  # "11.23.2013"
+  # "from 7:30 to 10:00 AM"
+  #
+  # etc.
+  def to_date
+    SugarCube::DateParser.parse_date(self)
+  end
+  
+  def to_timezone
+    SugarCube::DateParser.parse_timezone(self)
+  end
+  
+  def to_duration
+    SugarCube::DateParser.parse_duration(self)
+  end
+end

data/lib/sugarcube/uibarbuttonitem.rb

@@ -97,6 +97,14 @@ class UIBarButtonItem
     def pagecurl(&action)
       sugarcube_barbuttonitem :pagecurl.uibarbuttonitem, action
     end
+
+    def titled(title, style = :bordered.uibarbuttonstyle, &action)
+      sugarcube_barbuttonitem_with_title(title, style, action)
+    end
+  
+    def imaged(image, style = :bordered.uibarbuttonstyle, &action)
+      sugarcube_barbuttonitem_with_image(image, style, action)
+    end
   
   end
 
@@ -116,6 +124,23 @@ private
     b
   end
 
+  def self.sugarcube_barbuttonitem_with_title(title, style, action)
+    b = UIBarButtonItem.alloc.initWithTitle title, style:style, target:nil, action:nil
+    b.set_target_and_action b, action
+    b
+  end
+
+  def self.sugarcube_barbuttonitem_with_image(image, style, action)
+    case image
+    when Array
+      b = UIBarButtonItem.alloc.initWithImage image.first, landscapeImagePhone:image.last, style:style, target:nil, action:nil
+    else
+      b = UIBarButtonItem.alloc.initWithImage image, style:style, target:nil, action:nil
+    end
+    b.set_target_and_action b, action
+    b
+  end
+
   def sugarcube_handle_action(sender)
     handler = @sugarcube_action
     if handler.arity == 0

data/lib/sugarcube/uiview.rb

@@ -157,7 +157,7 @@ class UIView
     options[:after] = after
 
     animate(options) {
-      self.layer.opacity = options[:opacity]
+      self.alpha = options[:opacity]
     }
   end
 
@@ -192,11 +192,11 @@ class UIView
       options = { duration: options }
     end
 
-    original_opacity = self.layer.opacity
+    original_opacity = self.alpha
 
     after_remove = proc {
       removeFromSuperview
-      self.layer.opacity = original_opacity
+      self.alpha = original_opacity
       after.call if after
     }
 

data/lib/sugarcube/version.rb

@@ -1,3 +1,3 @@
 module SugarCube
-  Version = '0.18.17'
+  Version = '0.18.18'
 end

data/spec/date_parser_spec.rb

@@ -0,0 +1,26 @@
+describe "Base Methods" do
+  it "parses a relative natural language string, returning a date" do
+    today = Time.now
+    t = SugarCube::DateParser.parse_date("tomorrow at 7:30 PM")
+    t.should.is_a Time
+    t.hour.should == 19
+    t.min.should == 30
+    t.sec.should == 0
+    (t.day - today.day).should == 1
+  end
+  
+  it "parses a specific natural language string, returning a date" do
+    t = SugarCube::DateParser.parse_date("6/18/13 at 7:30 AM")
+    t.month.should == 6
+    t.day.should == 18
+    t.year.should == 2013
+    t.hour.should == 7
+    t.min.should == 30
+  end
+end
+
+describe "String Extensions" do
+  it "parses a date the same as the base method" do
+    "tomorrow at 7:30 PM".to_date.should == SugarCube::DateParser.parse_date("tomorrow at 7:30 PM")
+  end
+end

data/spec/uibarbuttonitem_spec.rb

@@ -1,5 +1,6 @@
 describe UIBarButtonItem do
 
+  # with system item
   it 'should be :done' do
     b = UIBarButtonItem.done {
       @result = :done
@@ -192,4 +193,47 @@ describe UIBarButtonItem do
     @result.should == :pagecurl
   end
   
+  # with title
+  it 'should be :titled' do
+    b = UIBarButtonItem.titled('title') {
+      @result = :titled
+    }
+    b.target.send b.action, b
+    @result.should == :titled
+  end
+  
+  it 'should be :titled_with_style' do
+    b = UIBarButtonItem.titled('title', :plain.uibarbuttonstyle) {
+      @result = :titled_with_style
+    }
+    b.target.send b.action, b
+    @result.should == :titled_with_style
+  end
+  
+  it 'should be :imaged' do
+    b = UIBarButtonItem.imaged('little_square'.uiimage) {
+      @result = :imaged
+    }
+    b.target.send b.action, b
+    @result.should == :imaged
+  end
+  
+  it 'should be :imaged_with_style' do
+    b = UIBarButtonItem.imaged('little_square'.uiimage, :plain.uibarbuttonstyle) {
+      @result = :imaged_with_style
+    }
+    b.target.send b.action, b
+    @result.should == :imaged_with_style
+  end
+
+  it 'should be :imaged_with_images' do
+    b = UIBarButtonItem.imaged(['little_square'.uiimage, 'little_square'.uiimage]) {
+      @result = :imaged_with_images
+    }
+    b.target.send b.action, b
+    @result.should == :imaged_with_images
+  end
+  
+  
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugarcube
 version: !ruby/object:Gem::Version
-  version: 0.18.17
+  version: 0.18.18
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-27 00:00:00.000000000 Z
+date: 2013-03-07 00:00:00.000000000 Z
 dependencies: []
 description: ! '== Description
 
@@ -64,6 +64,7 @@ files:
 - lib/sugarcube/calayer.rb
 - lib/sugarcube/core_graphics.rb
 - lib/sugarcube/core_location.rb
+- lib/sugarcube/date_parser.rb
 - lib/sugarcube/exceptions.rb
 - lib/sugarcube/fixnum.rb
 - lib/sugarcube/modal.rb
@@ -127,6 +128,7 @@ files:
 - spec/calayer_spec.rb
 - spec/core_graphics_spec.rb
 - spec/core_location_spec.rb
+- spec/date_parser_spec.rb
 - spec/fixnum_spec.rb
 - spec/notification_spec.rb
 - spec/nsarray_spec.rb
@@ -173,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Extensions for Ruby to make Rubymotion development more enjoyable, and hopefully
@@ -185,6 +187,7 @@ test_files:
 - spec/calayer_spec.rb
 - spec/core_graphics_spec.rb
 - spec/core_location_spec.rb
+- spec/date_parser_spec.rb
 - spec/fixnum_spec.rb
 - spec/notification_spec.rb
 - spec/nsarray_spec.rb
@@ -210,4 +213,3 @@ test_files:
 - spec/uiview_attr_updates_spec.rb
 - spec/uiview_spec.rb
 - spec/unholy_spec.rb
-has_rdoc: