sugarcube 1.4.2 → 1.4.3

data/Gemfile.lock

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

data/README.md

@@ -306,32 +306,41 @@ three `:touch` events, calling `button.off(:touch)` will remove all three.
 UITextView
 ------------
 
-You MUST call the `off` methods, because these methods use `NSNotification`s,
-and you must turn off listeners.
+These handlers are functionally identical in usage to the same methods in
+`UIControl`.  They use the `NSNotificationCenter#addObserverForName:object:queue:usingBlock:`
+method, but you do not have to worry about un-observing.  When the text view is
+released, these observers will be removed.
 
-There are two aliases for each event. I prefer the present tense (jQuery-style `on :change`),
-but UIKit prefers past simple (`UITextViewTextDidBeginEditingNotification`).
+There are two aliases for each event, or you can use the event notification. I
+prefer the present tense (jQuery-style `on :change`), but UIKit prefers past
+simple (`:editing_did_begin`).  The notifications, on the other hand, are in
+present simple (`UITextViewTextDidBeginEditingNotification`).  Whatever floats
+your boat.
 
-So these are all the same:
+Anyway, these are all the same:
 
-    :editing_did_begin  :begin
-    :editing_did_change :change
-    :editing_did_end    :end
+    :editing_did_begin   :begin   UITextViewTextDidBeginEditingNotification
+    :editing_did_change  :change  UITextViewTextDidChangeNotification
+    :editing_did_end     :end     UITextViewTextDidEndEditingNotification
 
 ```ruby
 text_view = UITextView.new
-text_view.on :begin do
+text_view.on :begin do |notification|  # <= you have to accept the notification in your block
   p 'wait for it...'
 end
-text_view.on :change do
+text_view.on :change do |notification|
   p text_view.text
 end
-text_view.on :end do
+text_view.on :end do |notification|
   p 'done!'
 end
 
-# later... like in `viewWillDisappear`.  I'll use the alternative aliases here
-text_view.off :editing_did_change, :editing_did_end, :editing_did_begin
+# if you want to remove the block, use the off method
+text_view.off :editing_did_change
+# or
+text_view.off :change
+# or
+text_view.off UITextViewTextDidChangeNotification
 ```
 
 Gestures

data/lib/sugarcube-events/uicontrol.rb

@@ -16,8 +16,8 @@ class UIControl
     events.each do |event|
       event = event.uicontrolevent if event.respond_to?(:uicontrolevent)
 
-      sugarcube_callbacks[event].push(handler)
-      addTarget(handler, action:'call:event:', forControlEvents:event)
+      sugarcube_callbacks(event).push(handler)
+      self.addTarget(handler, action:'call:event:', forControlEvents:event)
     end
 
     self
@@ -38,11 +38,12 @@ class UIControl
     events.each do |event|
       event = event.uicontrolevent if event.respond_to?(:uicontrolevent)
 
-      sugarcube_callbacks[event].each do |handler|
+      sugarcube_callbacks(event).each do |handler|
         self.removeTarget(handler, action:'call:event:', forControlEvents:event)
       end
       sugarcube_callbacks.delete(event)
     end
+
     self
   end
 
@@ -64,8 +65,14 @@ 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] = [] }
+  def sugarcube_callbacks(event=nil)
+    @sugarcube_callbacks ||= {}
+    if event
+      @sugarcube_callbacks[event] ||= []
+      return @sugarcube_callbacks[event]
+    else
+      return @sugarcube_callbacks
+    end
   end
 
 end

data/lib/sugarcube-events/uitextview.rb

@@ -1,7 +1,13 @@
 class UITextView
 
-  def sugarcube_callbacks
-    @sugarcube_callbacks ||= Hash.new { |h,k| h[k] = [] }
+  def sugarcube_callbacks(notification=nil)
+    @sugarcube_callbacks ||= {}
+    if notification
+      @sugarcube_callbacks[notification] ||= SugarCubeNotificationForgetter.new
+      return @sugarcube_callbacks[notification]
+    else
+      return @sugarcube_callbacks
+    end
   end
 
   # Add event handlers to UITextView, with the same syntax as `UIControl`
@@ -62,17 +68,45 @@ class UITextView
   end
 
 private
-  def _onEventNotification(notication, &block)
-    self.sugarcube_callbacks[notication] << NSNotificationCenter.defaultCenter.addObserverForName(notication,
+  def _onEventNotification(notification, &block)
+    self.sugarcube_callbacks(notification) << NSNotificationCenter.defaultCenter.addObserverForName(notification,
           object: self,
            queue: NSOperationQueue.mainQueue,
       usingBlock: block.weak!)
   end
 
-  def _offEventNotification(nofication)
-    self.sugarcube_callbacks[nofication].each do |callback_observer|
+  def _offEventNotification(notification)
+    self.sugarcube_callbacks(notification).tap { |s| ap s }.remove_all
+  end
+
+end
+
+
+class SugarCubeNotificationForgetter
+
+  def initialize
+    @observers = []
+  end
+
+  def <<(observer)
+    @observers << observer
+  end
+
+  def remove_all
+    @observers.each do |callback_observer|
+      self.remove(callback_observer)
+    end
+    @observers = []
+  end
+
+  def remove(callback_observer)
+    if @observers.delete(callback_observer)
       NSNotificationCenter.defaultCenter.removeObserver(callback_observer)
     end
   end
 
+  def dealloc
+    self.remove_all
+  end
+
 end

data/lib/sugarcube/version.rb

@@ -1,3 +1,3 @@
 module SugarCube
-  Version = '1.4.2'
+  Version = '1.4.3'
 end

data/spec/nsstring_files_spec.rb

@@ -20,9 +20,18 @@ describe 'NSString' do
     'foo'.temporary_path.should.end_with?('tmp/foo')
   end
 
-  it "should have an #file_exists? method" do
-    'foo'.document.file_exists?.should == false
-    'foo'.document.exists?.should == false
+  it "should have a resource_path method" do
+    'little_square.png'.resource_path.should.start_with?("/Users")
+    'little_square.png'.resource_path.should.end_with?("SugarCube_spec.app/little_square.png")
+  end
+
+  it "should have a resource_exists? method" do
+    'little_square.png'.resource_exists?.should == true
+    'foo'.resource_exists?.should == false
+  end
+
+  it "should have a #file_exists? method" do
+    'foo'.document_path.file_exists?.should == false
   end
 
   it "should have a remove_file! method" do
@@ -34,11 +43,6 @@ describe 'NSString' do
     filename.file_exists?.should == false
   end
 
-  it "should have a resource_exists? method" do
-    'little_square.png'.resource_exists?.should == true
-    'foo'.resource_exists?.should == false
-  end
-
   describe "file_exists?" do
 
     it "should not file_exists" do
@@ -201,3 +205,45 @@ describe 'NSString' do
 
 end
 
+
+describe 'NSString deprecated methods' do
+
+  it "should have a #document method" do
+    'foo'.document.should.start_with?('/Users')
+    'foo'.document.should.end_with?('Documents/foo')
+  end
+
+  it "should have a #cache method" do
+    'foo'.cache.should.start_with?('/Users')
+    'foo'.cache.should.end_with?('Library/Caches/foo')
+  end
+
+  it "should have a #app_support method" do
+    'foo'.app_support.should.start_with?('/Users')
+    'foo'.app_support.should.end_with?('Library/Application Support/foo')
+  end
+
+  it "should have a #temporary method" do
+    'foo'.temporary.should.start_with?('/Users')
+    'foo'.temporary.should.end_with?('tmp/foo')
+  end
+
+  it "should have a resource method" do
+    'little_square.png'.resource.should.start_with?("/Users")
+    'little_square.png'.resource.should.end_with?("SugarCube_spec.app/little_square.png")
+  end
+
+  it "should have an #exists? method" do
+    'foo'.document_path.exists?.should == false
+  end
+
+  it "should have a remove! method" do
+    filename = 'remove_me'.document_path
+    unless filename.file_exists?
+      NSData.data.writeToFile(filename, atomically: true)
+    end
+    filename.remove!
+    filename.file_exists?.should == false
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugarcube
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2014-01-29 00:00:00.000000000 Z
 dependencies: []
 description: ! '== Description
 
@@ -276,7 +276,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Extensions for Ruby to make Rubymotion development more enjoyable, and hopefully