bubble-wrap 1.8.0 → 1.9.0

data/motion/reactor/periodic_timer.rb

@@ -16,7 +16,7 @@ module BubbleWrap
         if options[:common_modes]
           NSLog "[DEPRECATED - Option :common_modes] a Run Loop Mode is no longer needed."
         end
-        
+
         self.interval = interval
 
         leeway = interval

data/motion/reactor/queue.rb

@@ -2,8 +2,8 @@ module BubbleWrap
   module Reactor
     # A GCD scheduled, linear queue.
     #
-    # This class provides a simple “Queue” like abstraction on top of the 
-    # GCD scheduler. 
+    # This class provides a simple “Queue” like abstraction on top of the
+    # GCD scheduler.
     #
     # Useful as an API sugar for stateful protocols
     #
@@ -29,17 +29,17 @@ module BubbleWrap
         @items.size
       end
 
-      # Push items onto the work queue. The items will not appear in the queue 
+      # Push items onto the work queue. The items will not appear in the queue
       # immediately, but will be scheduled for addition.
       def push(*items)
-        ::BubbleWrap::Reactor.schedule do 
+        ::BubbleWrap::Reactor.schedule do
           @items.push(*items)
           @popq.shift.call @items.shift until @items.empty? || @popq.empty?
         end
       end
 
-      # Pop items off the queue, running the block on the work queue. The pop 
-      # will not happen immediately, but at some point in the future, either 
+      # Pop items off the queue, running the block on the work queue. The pop
+      # will not happen immediately, but at some point in the future, either
       # in the next tick, if the queue has data, or when the queue is populated.
       def pop(*args, &blk)
         cb = proc do

data/motion/reactor/thread_aware_deferrable.rb

@@ -3,7 +3,7 @@ module BubbleWrap
     class ThreadAwareDeferrable < DefaultDeferrable
       include ::BubbleWrap::Reactor::Deferrable
 
-      
+
       # need to store the the queue in callback / errback
       def callback(&blk)
         return unless blk

data/motion/reactor/timer.rb

@@ -14,7 +14,7 @@ module BubbleWrap
           ensure
             src.cancel!
           end
-        end        
+        end
       end
 
       # Cancel the timer

data/motion/rss_parser.rb

@@ -28,10 +28,10 @@ module BubbleWrap
     # RSSItem is a simple class that holds all of RSS items.
     # Extend this class to display/process the item differently.
     class RSSItem
-      attr_accessor :title, :description, :link, :guid, :pubDate, :enclosure
+      attr_accessor :title, :description, :link, :guid, :pubDate, :creator, :category, :encoded, :enclosure
 
       def initialize
-        @title, @description, @link, @pubDate, @guid = '', '', '', '', ''
+        @title, @description, @link, @pubDate, @guid, @creator, @category, @encoded = '', '', '', '', ''
       end
 
       def to_hash
@@ -41,6 +41,9 @@ module BubbleWrap
           :link         => link,
           :pubDate      => pubDate,
           :guid         => guid,
+          :enclosure    => enclosure,
+          :category     => category,
+          :encoded      => encoded,
           :enclosure    => enclosure
         }
       end
@@ -56,7 +59,6 @@ module BubbleWrap
         @source = url
         @source_type = :url
       end
-      self.state = :initializes
       self
     end
 
@@ -85,6 +87,7 @@ module BubbleWrap
 
       @parser.shouldProcessNamespaces = true
       @parser.delegate ||= self
+      self.state = :initializes
       @parser.parse
     end
 

data/motion/shortcut.rb

@@ -1,4 +1,4 @@
-# Make sure that 
+# Make sure that
 # Both BubbleWrap and BW are defined.  This file is depended on by everything
 # else in BubbleWrap, so don't stuff anything in here unless you know why
 # you're doing it.

data/motion/sms/result.rb

@@ -18,7 +18,7 @@ module BubbleWrap
       def failed?
         self.result == MessageComposeResultFailed
       end
-      
+
     end
   end
 end

data/motion/test_suite_delegate.rb

@@ -65,4 +65,4 @@ class TestSuiteOSXDelegate
     item.submenu = menu
     item
   end
-end
+end

data/motion/ui/ui_activity_view_controller_wrapper.rb

@@ -41,6 +41,11 @@ module BW
     UIActivityTypePrint,
     UIActivityTypeCopyToPasteboard,
     UIActivityTypeAssignToContact,
-    UIActivityTypeSaveToCameraRoll
+    UIActivityTypeSaveToCameraRoll,
+    UIActivityTypeAddToReadingList,
+    UIActivityTypePostToFlickr,
+    UIActivityTypePostToVimeo,
+    UIActivityTypePostToTencentWeibo,
+    UIActivityTypeAirDrop
   )
 end

data/motion/ui/ui_alert_view.rb

@@ -10,6 +10,22 @@ module BW
       :did_dismiss
     ]
 
+    KEYBOARD_TYPES = {
+      default: UIKeyboardTypeDefault,
+      ascii: UIKeyboardTypeASCIICapable,
+      numbers_punctuation: UIKeyboardTypeNumbersAndPunctuation,
+      url: UIKeyboardTypeURL,
+      number_pad: UIKeyboardTypeNumberPad,
+      phone_pad: UIKeyboardTypePhonePad,
+      name_phone_pad: UIKeyboardTypeNamePhonePad,
+      email_address: UIKeyboardTypeEmailAddress,
+      email: UIKeyboardTypeEmailAddress, # Duplicate to help developers
+      decimal_pad: UIKeyboardTypeDecimalPad,
+      twitter: UIKeyboardTypeTwitter,
+      web_search: UIKeyboardTypeWebSearch,
+      alphabet: UIKeyboardTypeASCIICapable
+    }
+
     class << self
       attr_reader :callbacks
 
@@ -50,7 +66,11 @@ module BW
                    cancel_button_index: 0}.merge!(options)
         options[:style] = :plain_text_input
         new(options, &block).tap do |view|
-          view.textFieldAtIndex(0).placeholder = options[:placeholder] if options[:placeholder]
+          view.textFieldAtIndex(0).tap do |tf|
+            tf.text = options[:text] if options[:text]
+            tf.placeholder = options[:placeholder] if options[:placeholder]
+            tf.keyboardType = (KEYBOARD_TYPES[options[:keyboard_type]] || options[:keyboard_type]) if options[:keyboard_type]
+          end
         end
       end
 

data/motion/util/deprecated.rb

@@ -39,4 +39,4 @@ module BubbleWrap
       base.extend(self)
     end
   end
-end
+end

data/samples/alert/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../
   specs:
-    bubble-wrap (1.7.1)
+    bubble-wrap (1.8.0)
 
 GEM
   remote: https://rubygems.org/

data/spec/lib/bubble-wrap/requirement_spec.rb

@@ -10,11 +10,11 @@ describe BubbleWrap::Requirement do
   describe '.scan' do
     before do
       @subject.clear!
-      @root_path = File.expand_path('../../../../', __FILE__) 
+      @root_path = File.expand_path('../../../../', __FILE__)
     end
 
     it 'asking for a not-yet-found file raises an exception' do
-      should.raise(Exception) do 
+      should.raise(Exception) do
         @subject.find('foo')
       end
     end

data/spec/lib/bubble-wrap_spec.rb

@@ -19,7 +19,7 @@ describe BubbleWrap do
       BW::Requirement.clear!
       BW.require '../motion/core.rb'
       BW::Requirement.files.member?(File.expand_path('../../../motion/core.rb', __FILE__)).should == true
-    end 
+    end
 
     it 'finds files with absolute paths' do
       BW::Requirement.clear!

data/spec/lib/motion_stub.rb

@@ -5,7 +5,7 @@ module Motion
       def self.setup
       end
     end
-    
+
     class Config
       def files_dependencies
       end

data/spec/motion/core/app_spec.rb

@@ -60,6 +60,12 @@ describe BubbleWrap::App do
     end
   end
 
+  describe '.short_version' do
+    it 'returns the application short version' do
+      App.short_version.should == '3.2.1'
+    end
+  end
+
   describe '.run_after' do
     class DelayedRunAfterTest; attr_accessor :test_value end
 

data/spec/motion/core/device/osx/screen_spec.rb

@@ -23,4 +23,4 @@ describe BubbleWrap::Device::Screen do
       end
     end
   end
-end
+end

data/spec/motion/core/ios/ns_index_path_spec.rb

@@ -0,0 +1,20 @@
+describe "NSIndexPathWrap" do
+
+  before do
+      @index = NSIndexPath.indexPathForRow(0, inSection:3)
+  end
+
+  it "should support #+ and #-" do
+    @index = @index + 1
+    @index.row.should == 1
+    @index = @index + 1
+    @index.row.should == 2
+    @index = @index + 12
+    @index.row.should == 14
+    @index = @index - 3
+    @index.row.should == 11
+    @index = @index - 0
+    @index.row.should == 11
+  end
+
+end

data/spec/motion/core/kvo_spec.rb

@@ -11,29 +11,27 @@ describe BubbleWrap::KVO do
       @items = [ "Apple", "Banana", "Chickpeas" ]
       @age = 1
 
-      if App.osx?
-        @label = NSTextField.alloc.initWithFrame [[0,0],[320, 30]]
-        @label.stringValue = "Foo"
-      else
-        @label = UILabel.alloc.initWithFrame [[0,0],[320, 30]]
-        @label.text = "Foo"
-      end
+      @label = text_class.alloc.initWithFrame [[0,0],[320, 30]]
+
+      set_text "Foo"
     end
 
     # Test helper
 
     def get_text
-      App.osx? ? @label.stringValue : @label.text
+      @label.send(text_method_name)
     end
 
     def set_text(text)
-      method = App.osx? ? :stringValue : :text
-      @label.send("#{method}=", text)
+      @label.send("#{text_method_name}=", text)
     end
 
     def observe_label(&block)
-      method = App.osx? ? :stringValue : :text
-      observe(@label, method, &block)
+      observe(@label, text_method_name, &block)
+    end
+
+    def observe_label!(&block)
+      observe!(@label, text_method_name, &block)
     end
 
     def observe_collection(&block)
@@ -41,8 +39,23 @@ describe BubbleWrap::KVO do
     end
 
     def unobserve_label
-      method = App.osx? ? :stringValue : :text
-      unobserve(@label, method)
+      unobserve(@label, text_method_name)
+    end
+
+    def unobserve_label!
+      unobserve!(@label, text_method_name)
+    end
+
+    def text_method_name
+      App.osx? ? :stringValue : :text
+    end
+
+    def text_class
+      App.osx? ? NSTextField : UILabel
+    end
+
+    def update_collection
+      self.items += [ "Rice" ]
     end
 
     #  def unobserve_all
@@ -52,9 +65,9 @@ describe BubbleWrap::KVO do
 
   end
 
-  describe "Callbacks" do
+  describe "Registry" do
     before do
-      @example = KvoExample.new
+      @example = BW::KVO::Registry.new
     end
 
     after do
@@ -66,21 +79,21 @@ describe BubbleWrap::KVO do
     it "should add an observer block" do
       target = Object.new
       block = lambda { |old_value, new_value| }
-      @example.send(:add_observer_block, target, "key_path", &block)
-      @example.send(:registered?, target, "key_path").should == true
+      @example.add(target, "key_path", &block)
+      @example.registered?(target, "key_path").should == true
     end
 
     it "should not add an observer block if the key path is not present" do
       target = Object.new
       block = lambda { |old_value, new_value| }
-      @example.send(:add_observer_block, target, nil, &block)
-      @example.send(:registered?, target, nil).should == false
+      @example.add(target, nil, &block)
+      @example.registered?(target, nil).should == false
     end
 
     it "should not add an observer block if the block is not present" do
       target = Object.new
-      @example.send(:add_observer_block, target, "key_path")
-      @example.send(:registered?, target, "key_path").should == false
+      @example.add(target, "key_path")
+      @example.registered?(target, "key_path").should == false
     end
 
     # remove
@@ -88,35 +101,35 @@ describe BubbleWrap::KVO do
     it "should remove an observer block" do
       target = Object.new
       block = lambda { |old_value, new_value| }
-      @example.send(:add_observer_block, target, "key_path", &block)
-      @example.send(:remove_observer_block, target, "key_path")
-      @example.send(:registered?, target, "key_path").should == false
+      @example.add(target, "key_path", &block)
+      @example.remove(target, "key_path")
+      @example.registered?(target, "key_path").should == false
     end
 
     it "should not remove an observer block if the target is not present" do
       target = Object.new
       block = lambda { |old_value, new_value| }
-      @example.send(:add_observer_block, target, "key_path", &block)
-      @example.send(:remove_observer_block, nil, "key_path")
-      @example.send(:registered?, target, "key_path").should == true
+      @example.add(target, "key_path", &block)
+      @example.remove(nil, "key_path")
+      @example.registered?(target, "key_path").should == true
     end
 
     it "should not remove an observer block if the key path is not present" do
       target = Object.new
       block = lambda { |old_value, new_value| }
-      @example.send(:add_observer_block, target, "key_path", &block)
-      @example.send(:remove_observer_block, target, nil)
-      @example.send(:registered?, target, "key_path").should == true
+      @example.add(target, "key_path", &block)
+      @example.remove(target, nil)
+      @example.registered?(target, "key_path").should == true
     end
 
     it "should remove only one observer block" do
       target = Object.new
       block = lambda { |old_value, new_value| }
-      @example.send(:add_observer_block, target, "key_path1", &block)
-      @example.send(:add_observer_block, target, "key_path2", &block)
-      @example.send(:remove_observer_block, target, "key_path1")
-      @example.send(:registered?, target, "key_path1").should == false
-      @example.send(:registered?, target, "key_path2").should == true
+      @example.add(target, "key_path1", &block)
+      @example.add(target, "key_path2", &block)
+      @example.remove(target, "key_path1")
+      @example.registered?(target, "key_path1").should == false
+      @example.registered?(target, "key_path2").should == true
     end
 
     # remove all
@@ -124,28 +137,28 @@ describe BubbleWrap::KVO do
     it "should remove all observer blocks" do
       target = Object.new
       block = lambda { |old_value, new_value| }
-      @example.send(:add_observer_block, target, "key_path1", &block)
-      @example.send(:add_observer_block, target, "key_path2", &block)
-      @example.send(:remove_all_observer_blocks)
-      @example.send(:registered?, target, "key_path1").should == false
-      @example.send(:registered?, target, "key_path2").should == false
+      @example.add(target, "key_path1", &block)
+      @example.add(target, "key_path2", &block)
+      @example.remove_all
+      @example.registered?(target, "key_path1").should == false
+      @example.registered?(target, "key_path2").should == false
     end
 
     it "should remove target from targets if no observers remain" do
       target = Object.new
       block = lambda { |old_value, new_value| }
-      @example.send(:add_observer_block, target, "key_path", &block)
-      @example.send(:remove_observer_block, target, "key_path")
-      @example.instance_variable_get(:@targets).length.should == 0
+      @example.add(target, "key_path", &block)
+      @example.remove(target, "key_path")
+      @example.callbacks.length.should == 0
     end
 
     it "should not remove target from targets if observers remain" do
       target = Object.new
       block = lambda { |old_value, new_value| }
-      @example.send(:add_observer_block, target, "key_path1", &block)
-      @example.send(:add_observer_block, target, "key_path2", &block)
-      @example.send(:remove_observer_block, target, "key_path1")
-      @example.instance_variable_get(:@targets).length.should > 0
+      @example.add(target, "key_path1", &block)
+      @example.add(target, "key_path2", &block)
+      @example.remove(target, "key_path1")
+      @example.callbacks.length.should > 0
     end
 
   end
@@ -174,6 +187,18 @@ describe BubbleWrap::KVO do
       observed.should == true
     end
 
+    it "should immediately observe a key path" do
+      @example.set_text "Foo"
+
+      observed = false
+      @example.observe_label! do |new_value|
+        observed = true
+        new_value.should == "Foo"
+      end
+
+      observed.should == true
+    end
+
     it "should observe a key path with more than one block" do
       observed_one = false
       observed_two = false
@@ -207,6 +232,17 @@ describe BubbleWrap::KVO do
       observed.should == false
     end
 
+    it "should unobserve immediate observer" do
+      observed_times = 0
+      @example.observe_label do |old_value, new_value|
+        observed_times += 1
+      end
+      @example.unobserve_label!
+
+      @example.set_text "Bar"
+      observed_times.should == 1
+    end
+
     # without target
 
     it "should observe a key path without a target" do
@@ -232,19 +268,96 @@ describe BubbleWrap::KVO do
       observed.should == false
     end
 
-  end
+    # with multiple keypaths
+
+    it "should observe multiple key paths" do
+      observed = []
+      @example.observe [:age, :items] do |old_value, new_value|
+        observed << [old_value, new_value]
+      end
+
+      @example.age = 2
+      @example.age = 3
+      @example.update_collection
+
+      observed.should.be == [
+        [1, 2],
+        [2, 3],
+        [
+          ["Apple", "Banana", "Chickpeas"],
+          ["Apple", "Banana", "Chickpeas", "Rice"]
+        ]
+      ]
+    end
+
+    it "should observe multiple key paths with key_path argument" do
+      observed_changes = []
+      @example.observe [:age, :items] do |old_value, new_value, key_path|
+        observed_changes << { key_path => [old_value, new_value] }
+      end
 
-=begin
-  it "should be able to observe a collection" do
-    observed = false
-    @example.observe_collection do |old_value, new_value, indexes|
-      puts "#{collection} #{old_value} #{new_value} #{indexes}"
-      observed = true
+      @example.age = 2
+      @example.age = 3
+      @example.update_collection
+
+      observed_changes.should.be == [
+        {"age" => [1, 2]},
+        {"age" => [2, 3]},
+        {
+          "items" => [
+            ["Apple", "Banana", "Chickpeas"],
+            ["Apple", "Banana", "Chickpeas", "Rice"]
+          ]
+        }
+      ]
     end
 
-    @example.items << "Dragonfruit"
-    observed.should == true
+    it "should immediately observe multiple key paths" do
+      observed_changes = []
+      @example.observe! [:age, :items] do |new_value|
+        observed_changes << new_value
+      end
+
+      @example.age = 2
+      @example.age = 3
+      @example.update_collection
+
+      observed_changes.should.be == [1, ["Apple", "Banana", "Chickpeas"], 2, 3, ["Apple", "Banana", "Chickpeas", "Rice"]]
+    end
+
+    it "should immediately observe multiple key paths with key_path argument" do
+      observed_changes = []
+      @example.observe! [:age, :items] do |new_value, key_path|
+        observed_changes << { key_path => new_value }
+      end
+
+      @example.age = 2
+      @example.age = 3
+      @example.update_collection
+
+      observed_changes.should.be == [
+        {"age" => 1},
+        {"items" => ["Apple", "Banana", "Chickpeas"]},
+        {"age" => 2},
+        {"age" => 3},
+        {"items" => ["Apple", "Banana", "Chickpeas", "Rice"]}
+      ]
+    end
+
+    it "should unobserve multiple key paths" do
+      observed = 0
+
+      @example.observe [:age, :items] do
+        observed += 1
+      end
+
+      @example.unobserve [:age]
+
+      @example.age = 2
+      @example.update_collection
+
+      observed.should.be == 1
+    end
   end
-=end
 
 end