sugarcube 1.5.0 → 1.5.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6716fc5629e9a81b77ea3b82a3ad2b17ca33bef3
+  data.tar.gz: 8a3117abdb7192610107153219896869399ae9d7
+SHA512:
+  metadata.gz: 64dd9520c3f692e884870bb9071271e1e4886f2e685b90c1cab63b984735af6857d783c224d9474180f18280e84fa9c3df5b27bb8c8c05158fabe62af088da5a
+  data.tar.gz: 8bc745f50a2b2f29a87f6b7c7caadfe8a854cf79ec971095f01baa81c0de05c8529dd68145863336b238509f8079727746b44c425608348d4e348ece8efc2e56

data/.travis.yml

@@ -1,3 +1,5 @@
 language: objective-c
-before_install: rvm use ruby-1.9.3-p392
-before_script: sudo chown -R travis ~/Library/RubyMotion
+before_install:
+    - (ruby --version)
+    - mkdir -p ~/Library/RubyMotion/build
+    - sudo motion update

data/Gemfile.lock

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

data/README.md

@@ -814,6 +814,32 @@ toolbar.items = [
 ]
 ```
 
+###### UITabBarItem
+
+Easy to create system or custom `UITabBarItem`s.
+
+```ruby
+UITabBarItem.titled('My Title')
+# with optional :image and :selected_image options:
+UITabBarItem.titled('My Title', image: 'my_icon', selected_image: 'my_icon_selected')
+# also supports :tag and :badge
+UITabBarItem.titled('My Title', tag: MY_TABBAR_ITEM, badge: '+1')
+
+# system items:
+UITabBarItem.more
+UITabBarItem.favorites
+
+# Most of the UITabBarItem init methods accept the UIView#tag, and so there is
+# support for that in the UITabBarItem factory methods.  Defaults to 0.  The
+# :badge option is supported here as well
+UITabBarItem.featured(tag: MY_TABBAR_ITEM, badge: 10)
+
+# All of the UITabBarSystemItem helpers delegate to the 'UITabBarItem.system'
+# method, which you can call direcly as well.  It accepts :tag and :badge
+# options.
+UITabBarItem.system(:top_rated, tag: MY_ITEM_TAG, badge: 'hi')
+```
+
 ###### NSError
 ```ruby
 # usually, NSError.new doesn't work, because the only initializer for NSError
@@ -1231,8 +1257,9 @@ index_path.to_a  # => [1, 2, ...]
 ```ruby
 'https://github.com'.nsurl
 '/path/to/file'.fileurl
-'https://google.com/search?q=' + 'search terms'.escape_url
-'%20'.unescape_url
+'https://google.com/search?q=' + 'search terms'.escape_url  # => "..?q=search%20terms"
+'%20'.unescape_url  #=> " "
+'nô àccénts!'.remove_accents  # => "no accents!"
 ```
 
 ###### NSURL

data/lib/sugarcube/version.rb

@@ -1,3 +1,3 @@
 module SugarCube
-  Version = '1.5.0'
+  Version = '1.5.1'
 end

data/lib/sugarcube-animations/uiview.rb

@@ -365,6 +365,8 @@ class UIView
     right = origin + offset
 
     animation = CAKeyframeAnimation.animationWithKeyPath(keypath)
+    # sometimes, because of conflicts with CATiming (or something to that
+    # effect), calling 'duration=' results in a compiler or runtime error.
     animation.send(:'setDuration:', duration)
     animation.repeatCount = repeat
     animation.values = [origin, left, right, origin]

data/lib/sugarcube-attributedstring/nsattributedstring.rb

@@ -42,7 +42,7 @@ end
 
 class NSAttributedString
 
-  def dummy
+  def sugarcube_nsattributedstring_dummy_method
     # make sure NSAttributedString constants get compiled
     foo = NSFontAttributeName
     foo = NSParagraphStyleAttributeName
@@ -146,12 +146,16 @@ class NSAttributedString
     retval
   end
 
-  def nsattributedstring
-    self
+  def nsattributedstring(attributes=nil)
+    if attributes.nil?
+      self
+    else
+      self.with_attributes(attributes)
+    end
   end
 
-  def attrd
-    self.nsattributedstring
+  def attrd(attributes=nil)
+    self.nsattributedstring(attributes=nil)
   end
 
   def +(attributedstring)

data/lib/sugarcube-constants/symbol.rb

@@ -95,6 +95,11 @@ class Symbol
     SugarCube.look_in(self, Symbol.uibarbuttonstyle)
   end
 
+  def uitabbarsystemitem
+    SugarCube.look_in(self, Symbol.uitabbarsystemitem)
+  end
+  alias uitabbaritem uitabbarsystemitem
+
   def uibuttontype
     SugarCube.look_in(self, Symbol.uibuttontype)
   end
@@ -240,6 +245,7 @@ class Symbol
     attr :uibarbuttonitem
     attr :uibarbuttonitem__deprecated
     attr :uibarbuttonstyle
+    attr :uitabbarsystemitem
 
     attr :uibuttontype
     attr :uicontrolstate
@@ -499,6 +505,21 @@ class Symbol
     done:     UIBarButtonItemStyleDone
   }
 
+  @uitabbarsystemitem = {
+    more:        UITabBarSystemItemMore,
+    favorites:   UITabBarSystemItemFavorites,
+    featured:    UITabBarSystemItemFeatured,
+    top_rated:   UITabBarSystemItemTopRated,
+    recents:     UITabBarSystemItemRecents,
+    contacts:    UITabBarSystemItemContacts,
+    history:     UITabBarSystemItemHistory,
+    bookmarks:   UITabBarSystemItemBookmarks,
+    search:      UITabBarSystemItemSearch,
+    downloads:   UITabBarSystemItemDownloads,
+    most_recent: UITabBarSystemItemMostRecent,
+    most_viewed: UITabBarSystemItemMostViewed,
+  }
+
   @uibuttontype = {
     custom:            UIButtonTypeCustom,
     rounded:           UIButtonTypeRoundedRect,

data/lib/sugarcube-factories/uibarbuttonitem.rb

@@ -4,122 +4,126 @@ class UIBarButtonItem
   class << self
 
     def done(&action)
-      sugarcube_barbuttonitem(:done, action)
+      sugarcube_barbuttonitem(UIBarButtonSystemItemDone, action)
     end
 
     def cancel(&action)
-      sugarcube_barbuttonitem(:cancel, action)
+      sugarcube_barbuttonitem(UIBarButtonSystemItemCancel, action)
     end
 
     def edit(&action)
-      sugarcube_barbuttonitem(:edit, action)
+      sugarcube_barbuttonitem(UIBarButtonSystemItemEdit, action)
     end
 
     def save(&action)
-      sugarcube_barbuttonitem(:save, action)
+      sugarcube_barbuttonitem(UIBarButtonSystemItemSave, action)
     end
 
     def add(&action)
-      sugarcube_barbuttonitem(:add, action)
+      sugarcube_barbuttonitem(UIBarButtonSystemItemAdd, action)
     end
 
+    # deprecated
     def flexiblespace(&action)
-      sugarcube_barbuttonitem(:flexiblespace, action)
+      sugarcube_barbuttonitem(UIBarButtonSystemItemFlexibleSpace, action)
     end
 
     def flexible_space(&action)
-      sugarcube_barbuttonitem(:flexible_space, action)
+      sugarcube_barbuttonitem(UIBarButtonSystemItemFlexibleSpace, action)
     end
 
+    # deprecated
     def fixedspace(&action)
-      sugarcube_barbuttonitem(:fixedspace, action)
+      sugarcube_barbuttonitem(UIBarButtonSystemItemFixedSpace, action)
     end
 
     def fixed_space(&action)
-      sugarcube_barbuttonitem(:fixed_space, action)
+      sugarcube_barbuttonitem(UIBarButtonSystemItemFixedSpace, action)
     end
 
     def compose(&action)
-      sugarcube_barbuttonitem(:compose, action)
+      sugarcube_barbuttonitem(UIBarButtonSystemItemCompose, action)
     end
 
     def reply(&action)
-      sugarcube_barbuttonitem(:reply, action)
+      sugarcube_barbuttonitem(UIBarButtonSystemItemReply, action)
     end
 
     def action(&action)
-      sugarcube_barbuttonitem(:action, action)
+      sugarcube_barbuttonitem(UIBarButtonSystemItemAction, action)
     end
 
     def organize(&action)
-      sugarcube_barbuttonitem(:organize, action)
+      sugarcube_barbuttonitem(UIBarButtonSystemItemOrganize, action)
     end
 
     def bookmarks(&action)
-      sugarcube_barbuttonitem(:bookmarks, action)
+      sugarcube_barbuttonitem(UIBarButtonSystemItemBookmarks, action)
     end
 
     def search(&action)
-      sugarcube_barbuttonitem(:search, action)
+      sugarcube_barbuttonitem(UIBarButtonSystemItemSearch, action)
     end
 
     def refresh(&action)
-      sugarcube_barbuttonitem(:refresh, action)
+      sugarcube_barbuttonitem(UIBarButtonSystemItemRefresh, action)
     end
 
     def stop(&action)
-      sugarcube_barbuttonitem(:stop, action)
+      sugarcube_barbuttonitem(UIBarButtonSystemItemStop, action)
     end
 
     def camera(&action)
-      sugarcube_barbuttonitem(:camera, action)
+      sugarcube_barbuttonitem(UIBarButtonSystemItemCamera, action)
     end
 
     def trash(&action)
-      sugarcube_barbuttonitem(:trash, action)
+      sugarcube_barbuttonitem(UIBarButtonSystemItemTrash, action)
     end
 
     def play(&action)
-      sugarcube_barbuttonitem(:play, action)
+      sugarcube_barbuttonitem(UIBarButtonSystemItemPlay, action)
     end
 
     def pause(&action)
-      sugarcube_barbuttonitem(:pause, action)
+      sugarcube_barbuttonitem(UIBarButtonSystemItemPause, action)
     end
 
     def rewind(&action)
-      sugarcube_barbuttonitem(:rewind, action)
+      sugarcube_barbuttonitem(UIBarButtonSystemItemRewind, action)
     end
 
+    # deprecated
     def fastforward(&action)
-      sugarcube_barbuttonitem(:fastforward, action)
+      sugarcube_barbuttonitem(UIBarButtonSystemItemFastForward, action)
     end
 
     def fast_forward(&action)
-      sugarcube_barbuttonitem(:fast_forward, action)
+      sugarcube_barbuttonitem(UIBarButtonSystemItemFastForward, action)
     end
 
     def undo(&action)
-      sugarcube_barbuttonitem(:undo, action)
+      sugarcube_barbuttonitem(UIBarButtonSystemItemUndo, action)
     end
 
     def redo(&action)
-      sugarcube_barbuttonitem(:redo, action)
+      sugarcube_barbuttonitem(UIBarButtonSystemItemRedo, action)
     end
 
+    # deprecated
     def pagecurl(&action)
-      sugarcube_barbuttonitem(:pagecurl, action)
+      sugarcube_barbuttonitem(UIBarButtonSystemItemPageCurl, action)
     end
 
     def page_curl(&action)
-      sugarcube_barbuttonitem(:page_curl, action)
+      sugarcube_barbuttonitem(UIBarButtonSystemItemPageCurl, action)
     end
 
-    def titled(title, style = :bordered, &action)
+    def titled(title, style = UIBarButtonItemStyleBordered, &action)
       sugarcube_barbuttonitem_with_title(title, style, action)
     end
 
-    def imaged(image, style = :bordered, &action)
+    def imaged(image, style = UIBarButtonItemStyleBordered, &action)
       sugarcube_barbuttonitem_with_image(image, style, action)
     end
 

data/lib/sugarcube-factories/uitabbaritem.rb

@@ -0,0 +1,89 @@
+# Factory methods for UITabBarItem. I've never understood why UITabBarItem makes
+# it so easy to set the view tag, but these methods do not require you to do so.
+class UITabBarItem
+
+  class << self
+
+    def titled(title, options={})
+      tag = options.fetch(:tag, 0)
+      image = options[:image]
+      badge = options[:badge]
+      if image && image.respond_to?(:uiimage)
+        image = image.uiimage
+      end
+      selected_image = options[:selected_image]
+      if selected_image && selected_image.respond_to?(:uiimage)
+        selected_image = selected_image.uiimage
+      end
+      item = self.alloc.initWithTitle(title, image: image, selectedImage: selected_image)
+      if tag
+        item.tag = tag
+      end
+      if badge
+        item.badgeValue = badge.to_s
+      end
+      return item
+    end
+
+    def system(type, options={})
+      type = type.uitabbarsystemitem if type.respond_to?(:uitabbarsystemitem)
+      tag = options.fetch(:tag, 0)
+      badge = options[:badge]
+      item = self.alloc.initWithTabBarSystemItem(type, tag: tag)
+      if badge
+        item.badgeValue = badge.to_s
+      end
+      return item
+    end
+
+    def more(options={})
+      return self.system(UITabBarSystemItemMore, options)
+    end
+
+    def favorites(options={})
+      return self.system(UITabBarSystemItemFavorites, options)
+    end
+
+    def featured(options={})
+      return self.system(UITabBarSystemItemFeatured, options)
+    end
+
+    def top_rated(options={})
+      return self.system(UITabBarSystemItemTopRated, options)
+    end
+
+    def recents(options={})
+      return self.system(UITabBarSystemItemRecents, options)
+    end
+
+    def contacts(options={})
+      return self.system(UITabBarSystemItemContacts, options)
+    end
+
+    def history(options={})
+      return self.system(UITabBarSystemItemHistory, options)
+    end
+
+    def bookmarks(options={})
+      return self.system(UITabBarSystemItemBookmarks, options)
+    end
+
+    def search(options={})
+      return self.system(UITabBarSystemItemSearch, options)
+    end
+
+    def downloads(options={})
+      return self.system(UITabBarSystemItemDownloads, options)
+    end
+
+    def most_recent(options={})
+      return self.system(UITabBarSystemItemMostRecent, options)
+    end
+
+    def most_viewed(options={})
+      return self.system(UITabBarSystemItemMostViewed, options)
+    end
+
+  end
+
+end

data/lib/sugarcube-foundation/nsstring.rb

@@ -28,4 +28,12 @@ class NSString
             )
   end
 
+  def remove_accents
+    # removes diacritics by using a lossy conversion
+    ascii = self.dataUsingEncoding(NSASCIIStringEncoding, allowLossyConversion: true)
+
+    # turn it back into a string
+    return NSString.alloc.initWithData(ascii, encoding: NSASCIIStringEncoding)
+  end
+
 end

data/lib/sugarcube-uikit/uiview.rb

@@ -109,11 +109,19 @@ class UIView
   end
 
   def convert_frame_to(destination)
-    return self.convertRect(CGRectMake(0, 0, self.frame.size.width, self.frame.size.height), toView:destination)
+    return self.convert_rect(CGRectMake(0, 0, self.frame.size.width, self.frame.size.height), to: destination)
   end
 
   def convert_frame_from(source)
-    return self.convertRect(CGRectMake(0, 0, source.frame.size.width, source.frame.size.height), fromView:source)
+    return self.convert_rect(CGRectMake(0, 0, source.frame.size.width, source.frame.size.height), from: source)
+  end
+
+  def convert_rect(rect, to: destination)
+    return self.convertRect(rect, toView: destination)
+  end
+
+  def convert_rect(rect, from: source)
+    return self.convertRect(rect, fromView: source)
   end
 
   # Returns the receiver's bounds in the coordinate system of `destination`
@@ -127,12 +135,20 @@ class UIView
     return self.convert_origin_to(destination)
   end
 
+  def convert_point(point, to: destination)
+    return self.convertPoint(point, toView: destination)
+  end
+
+  def convert_point(point, from: source)
+    return self.convertPoint(point, fromView: source)
+  end
+
   def convert_origin_to(destination)
-    return self.convertPoint([0, 0], toView:destination)
+    return self.convert_point([0, 0], to: destination)
   end
 
   def convert_origin_from(source)
-    return self.convertPoint([0, 0], fromView:source)
+    return self.convert_point([0, 0], from: source)
   end
 
   # Easily get and set a UIView's frame properties

data/spec/nsstring_spec.rb

@@ -98,4 +98,8 @@ describe "NSString" do
     "3.12159".nan?.should.equal false
   end
 
+  it "should have a #remove_accents method" do
+    'çan thîs tést ruñ òk?'.remove_accents.should == 'can this test run ok?'
+  end
+
 end

data/spec/uitabbaritem_spec.rb

@@ -0,0 +1,114 @@
+describe UITabBarItem do
+
+  it 'should support `titled`' do
+    item = UITabBarItem.titled('title')
+    item.should.be.kind_of(UITabBarItem)
+    item.title.should == 'title'
+  end
+
+  it 'should support `titled` with options' do
+    item = UITabBarItem.titled('title',
+      tag: 1,
+      badge: 'test',
+      image: UIImage.imageNamed('little_square'),
+      selected_image: UIImage.imageNamed('little_square'),
+      )
+    item.should.be.kind_of(UITabBarItem)
+    item.title.should == 'title'
+    item.tag.should == 1
+    item.badgeValue.should == 'test'
+    item.image.should.be.kind_of(UIImage)
+  end
+
+  it 'should support `titled` with sugary options' do
+    item = UITabBarItem.titled('title',
+      tag: 1,
+      badge: 'test',
+      image: 'little_square',
+      selected_image: 'little_square',
+      )
+    item.title.should == 'title'
+    item.tag.should == 1
+    item.badgeValue.should == 'test'
+    item.image.should.be.kind_of(UIImage)
+  end
+
+  it 'should support `system`' do
+    item = UITabBarItem.system(UITabBarSystemItemMore)
+    item.should.be.kind_of(UITabBarItem)
+  end
+
+  it 'should support `system` with options' do
+    item = UITabBarItem.system(UITabBarSystemItemMore,
+      tag: 1,
+      badge: 'test',
+      )
+    item.should.be.kind_of(UITabBarItem)
+  end
+
+  it 'should support `system` with sugar' do
+    item = UITabBarItem.system(:more)
+    item.should.be.kind_of(UITabBarItem)
+  end
+
+  it 'should support `more`' do
+    item = UITabBarItem.more
+    item.should.be.kind_of(UITabBarItem)
+  end
+
+  it 'should support `favorites`' do
+    item = UITabBarItem.favorites
+    item.should.be.kind_of(UITabBarItem)
+  end
+
+  it 'should support `featured`' do
+    item = UITabBarItem.featured
+    item.should.be.kind_of(UITabBarItem)
+  end
+
+  it 'should support `top_rated`' do
+    item = UITabBarItem.top_rated
+    item.should.be.kind_of(UITabBarItem)
+  end
+
+  it 'should support `recents`' do
+    item = UITabBarItem.recents
+    item.should.be.kind_of(UITabBarItem)
+  end
+
+  it 'should support `contacts`' do
+    item = UITabBarItem.contacts
+    item.should.be.kind_of(UITabBarItem)
+  end
+
+  it 'should support `history`' do
+    item = UITabBarItem.history
+    item.should.be.kind_of(UITabBarItem)
+  end
+
+  it 'should support `bookmarks`' do
+    item = UITabBarItem.bookmarks
+    item.should.be.kind_of(UITabBarItem)
+  end
+
+  it 'should support `search`' do
+    item = UITabBarItem.search
+    item.should.be.kind_of(UITabBarItem)
+  end
+
+  it 'should support `downloads`' do
+    item = UITabBarItem.downloads
+    item.should.be.kind_of(UITabBarItem)
+  end
+
+  it 'should support `most_recent`' do
+    item = UITabBarItem.most_recent
+    item.should.be.kind_of(UITabBarItem)
+  end
+
+  it 'should support `most_viewed`' do
+    item = UITabBarItem.most_viewed
+    item.should.be.kind_of(UITabBarItem)
+  end
+
+end

data/spec/uiview_spec.rb

@@ -100,6 +100,23 @@ describe "UIView" do
       frame.size.width.should == 60
       frame.size.height.should == 80
     end
+
+    it "should convert_rect(to:)" do
+      frame = @view3.convert_rect([[1, 2], [10, 20]], to: @view1)
+      frame.origin.x.should == 21
+      frame.origin.y.should == 12
+      frame.size.width.should == 10
+      frame.size.height.should == 20
+    end
+
+    it "should convert_rect(from:)" do
+      frame = @view1.convert_rect([[1, 2], [10, 20]], from: @view3)
+      frame.origin.x.should == 21
+      frame.origin.y.should == 12
+      frame.size.width.should == 10
+      frame.size.height.should == 20
+    end
+
   end
 
   describe "should convert point" do
@@ -122,6 +139,19 @@ describe "UIView" do
       point.x.should == 20
       point.y.should == 10
     end
+
+    it "should convert_point(to:)" do
+      point = @view3.convert_point([1, 2], to: @view1)
+      point.x.should == 21
+      point.y.should == 12
+    end
+
+    it "should convert_point(:from)" do
+      point = @view1.convert_point([1, 2], from: @view3)
+      point.x.should == 21
+      point.y.should == 12
+    end
+
   end
 
   it "should return x" do

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugarcube
 version: !ruby/object:Gem::Version
-  version: 1.5.0
-  prerelease: 
+  version: 1.5.1
 platform: ruby
 authors:
 - Colin T.A. Gray
@@ -12,29 +11,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-11 00:00:00.000000000 Z
+date: 2014-03-03 00:00:00.000000000 Z
 dependencies: []
-description: ! '== Description
-
+description: |
+  == Description
 
   CocoaTouch/iOS is a *verbose* framework.  These extensions hope to make
-
   development in rubymotion more enjoyable by tacking "UI" methods onto the
-
   base classes (String, Fixnum, Float).  With sugarcube, you can create a
-
   color from an integer or symbol, or create a UIFont or UIImage from a
-
   string.
 
-
   Some UI classes are opened up as well, like adding the <tt><<</tt> operator to a
-
   <tt>UIView</tt> instance, instead of <tt>view.addSubview(subview)</tt>, you can
-
   use the more idiomatic: <tt>view << subview</tt>.
-
-'
 email:
 - colinta@gmail.com
 executables: []
@@ -94,6 +84,7 @@ files:
 - lib/sugarcube-factories/uibarbuttonitem.rb
 - lib/sugarcube-factories/uibutton.rb
 - lib/sugarcube-factories/uisegmentedcontrol.rb
+- lib/sugarcube-factories/uitabbaritem.rb
 - lib/sugarcube-factories/uitableview.rb
 - lib/sugarcube-factories/uitableviewcell.rb
 - lib/sugarcube-files.rb
@@ -247,6 +238,7 @@ files:
 - spec/uicontrol_spec.rb
 - spec/uiimage_spec.rb
 - spec/uilabel_spec.rb
+- spec/uitabbaritem_spec.rb
 - spec/uitableviewcell_spec.rb
 - spec/uiview_animation_spec.rb
 - spec/uiview_attr_updates_spec.rb
@@ -258,27 +250,26 @@ files:
 homepage: https://github.com/rubymotion/sugarcube
 licenses:
 - BSD
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Extensions for Ruby to make Rubymotion development more enjoyable, and hopefully
   more rubyesque!
 test_files:
@@ -325,6 +316,7 @@ test_files:
 - spec/uicontrol_spec.rb
 - spec/uiimage_spec.rb
 - spec/uilabel_spec.rb
+- spec/uitabbaritem_spec.rb
 - spec/uitableviewcell_spec.rb
 - spec/uiview_animation_spec.rb
 - spec/uiview_attr_updates_spec.rb