bubble-wrap 1.5.0 → 1.6.0.rc1

data/motion/reactor/eventable.rb

@@ -6,14 +6,16 @@ module BubbleWrap
       # When `event` is triggered the block will execute
       # and be passed the arguments that are passed to
       # `trigger`.
-      def on(event, &blk)
-        __events__[event].push blk
+      def on(event, method = nil, &blk)
+        method_or_block = method ? method : blk
+        __events__[event].push method_or_block
       end
 
       # When `event` is triggered, do not call the given
       # block any more
-      def off(event, &blk)
-        __events__[event].delete_if { |b| b == blk }
+      def off(event, method = nil, &blk)
+        method_or_block = method ? method : blk
+        __events__[event].delete_if { |b| b == method_or_block }
         blk
       end
 

data/motion/ui/ui_activity_view_controller_wrapper.rb

@@ -0,0 +1,51 @@
+module BW
+  class UIActivityViewController < ::UIActivityViewController
+    class << self
+      def new(options = {}, presenting_controller = nil, &block)
+        options = {
+          activities: nil,
+          animated: true
+        }.merge(options)
+
+        if options[:item] || options[:items]
+          items = Array(options[:item] || options[:items])
+        else
+          raise ArgumentError, "You must specify at least one item - #{options.inspect}"
+        end
+
+        vc = alloc.initWithActivityItems(items, applicationActivities:options[:activities])
+        vc.excludedActivityTypes = BW::Constants.get("UIActivityType", Array(options[:excluded])) if options[:excluded]
+
+        unless block.nil?
+          block.weak! if BubbleWrap.use_weak_callbacks?
+          vc.setCompletionHandler block
+        end
+
+        presenting_controller ||= App.window.rootViewController.presentedViewController # May be nil, but handles use case of container views
+        presenting_controller ||= App.window.rootViewController
+
+        presenting_controller.presentViewController(vc, animated:options[:animated], completion: lambda {})
+        vc
+      end
+
+    end
+  end
+
+  # UIActivityTypes
+  Constants.register(
+    UIActivityTypePostToFacebook,
+    UIActivityTypePostToTwitter,
+    UIActivityTypePostToWeibo,
+    UIActivityTypeMessage,
+    UIActivityTypeMail,
+    UIActivityTypePrint,
+    UIActivityTypeCopyToPasteboard,
+    UIActivityTypeAssignToContact,
+    UIActivityTypeSaveToCameraRoll,
+    UIActivityTypeAddToReadingList,
+    UIActivityTypePostToFlickr,
+    UIActivityTypePostToVimeo,
+    UIActivityTypePostToTencentWeibo,
+    UIActivityTypeAirDrop
+  )
+end

data/motion/util/constants.rb

@@ -13,7 +13,7 @@ module BubbleWrap
       # do nothing, just get the constants in the code
     end
 
-    # @param [String] base of the constant 
+    # @param [String] base of the constant
     # @param [Integer, NSArray, String, Symbol] the suffix of the constant
     #   when NSArray, will return the bitmask of all suffixes in the array
     # @return [Integer] the constant for this base and suffix
@@ -22,19 +22,24 @@ module BubbleWrap
     # get("UIReturnKey", "done") => UIReturnKeyDone == 9
     # get("UIReturnKey", 9) => 9
     # get("UIImagePickerControllerSourceType", ["photo_library", "camera", "saved_photos_album"]) => 3
+    # get("UIActivityType", [:air_drop, :print]) => ["com.apple.UIKit.activity.AirDrop", "com.apple.UIKit.activity.Print"]
     def get(base, *values)
       value = values.size == 1 ? values.first : values.flatten
       case value
       when Numeric
         value.to_i
       when NSArray
-        value.reduce { |i, j|
-          get(base, i) | get(base, j)
-        }
+        unless get(base, value.first).is_a? Fixnum
+          value.map { |v| get(base, v) }
+        else
+          value.reduce { |i, j|
+            get(base, i) | get(base, j)
+          }
+        end
       else
         value = value.to_s.camelize
         Kernel.const_get("#{base}#{value}")
       end
     end
   end
-end
+end

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

@@ -205,5 +205,32 @@ describe BubbleWrap::App do
       end
 
     end
+
+    describe ".can_open_url" do
+
+      it "uses NSURL or converts NSString in NSURL and opens it" do
+        application = UIApplication.sharedApplication
+        def application.url; @url end
+        def application.canOpenURL(url); @url = url; super; end
+
+        url = NSURL.URLWithString('http://localhost')
+        App.can_open_url(url)
+        application.url.should.equal url
+
+        url = 'http://localhost'
+        App.can_open_url(url)
+        application.url.class.should.equal NSURL
+        application.url.description.should.equal url
+      end
+
+      it "returns false when it can't open the given url" do
+        App.can_open_url("inexistent_schema://").should.equal false
+      end
+
+      it "returns true when it can open the given url" do
+        App.can_open_url("http://google.com").should.equal true
+        App.can_open_url("rdar:").should.equal true
+      end
+    end
   end
 end

data/spec/motion/core/string_spec.rb

@@ -93,12 +93,23 @@ describe BubbleWrap::String do
 
   before do
     @blue_color = App.osx? ? NSColor.colorWithDeviceRed(0,green:0,blue:1,alpha:1) : UIColor.blueColor
-    r,g,b,a = [1, (138.0/255.0), (25.0/255.0), 1]
-    @orange_color = App.osx? ? NSColor.colorWithDeviceRed(r, green:g, blue:b, alpha: a) :
+    r,g,b,a = [1, (0x8A.to_f/0xFF.to_f), (0x19/0xFF.to_f), (0x88.to_f/0xFF.to_f)]
+    @orange_color = App.osx? ? NSColor.colorWithDeviceRed(r, green:g, blue:b, alpha: 1.0) :
+                                UIColor.colorWithRed(r, green:g, blue:b, alpha:1.0)
+    @orange_alpha_color = App.osx? ? NSColor.colorWithDeviceRed(r, green:g, blue:b, alpha: a) :
                                 UIColor.colorWithRed(r, green:g, blue:b, alpha:a)
   end
 
   describe "A UIColor should be created from a String with a hex color" do
+    it "with 8 digits" do
+      @orange_color_from_hex = '88FF8A19'.to_color
+      @orange_color_from_hex.should == @orange_alpha_color
+    end
+
+    it "with 8 digits and # sign" do
+      @orange_color_from_hex = '#88FF8A19'.to_color
+      @orange_color_from_hex.should == @orange_alpha_color
+    end
 
     it "with 6 digits" do
       @orange_color_from_hex= '#FF8A19'.to_color

data/spec/motion/location/location_spec.rb

@@ -7,6 +7,10 @@ describe "CLLocationWrap" do
 end
 
 # monkey patch for testing
+class BWCLHeading
+  attr_accessor :timestamp, :z, :y, :x, :headingAccuracy, :trueHeading, :magneticHeading
+end
+
 class CLLocationManager
   def self.enable(enable)
     @enabled = enable
@@ -25,6 +29,14 @@ class CLLocationManager
     @stopUpdatingLocation = true
   end
 
+  def startUpdatingHeading
+    @startUpdatingHeading = true
+  end
+
+  def stopUpdatingHeading
+    @stopUpdatingHeading = true
+  end
+
   def startMonitoringSignificantLocationChanges
     @startMonitoringSignificantLocationChanges = true
   end
@@ -88,6 +100,13 @@ describe BubbleWrap::Location do
       location_manager.instance_variable_get("@startUpdatingLocation").should == true
     end
 
+    it "should use compass update functions" do
+      BW::Location.get_compass do
+      end
+
+      location_manager.instance_variable_get("@startUpdatingHeading").should == true
+    end
+
     it "should have correct location when succeeding" do
       to = CLLocation.alloc.initWithLatitude(100, longitude: 50)
       from = CLLocation.alloc.initWithLatitude(100, longitude: 49)
@@ -122,6 +141,38 @@ describe BubbleWrap::Location do
     end
   end
 
+  describe ".get_compass" do
+    before do
+      reset
+    end
+
+    it "should use compass functions" do
+      BW::Location.get_compass do |result|
+      end
+
+      location_manager.instance_variable_get("@startUpdatingHeading").should == true
+    end
+
+    it "should have correct heading when succeeding" do
+      timestamp = Time.now
+      heading = BWCLHeading.new.tap do |h|
+        h.timestamp = timestamp
+        h.headingAccuracy = 4
+        h.trueHeading = 220
+        h.magneticHeading = 270
+      end
+
+      BW::Location.get_compass do |heading|
+        heading[:magnetic_heading].should == 270
+        heading[:true_heading].should == 220
+        heading[:accuracy].should == 4
+        heading[:timestamp].should == timestamp
+      end
+
+      BW::Location.locationManager(location_manager, didUpdateHeading: heading)
+    end
+  end
+
   describe ".get_significant" do
     before do
       reset
@@ -161,6 +212,15 @@ describe BubbleWrap::Location do
       location_manager.instance_variable_get("@stopUpdatingLocation").should == true
     end
 
+    it "should use compass update functions" do
+      BW::Location.get_compass do |result|
+      end
+
+      BW::Location.stop
+
+      location_manager.instance_variable_get("@stopUpdatingHeading").should == true
+    end
+
     it "should use significant update functions with get_significant" do
       BW::Location.get_significant do
       end
@@ -169,5 +229,10 @@ describe BubbleWrap::Location do
 
       location_manager.instance_variable_get("@stopMonitoringSignificantLocationChanges").should == true
     end
+
+    it "should not throw an error stopping before it was started" do
+      Proc.new { BW::Location.stop }.should.not.raise Exception
+    end
+
   end
 end

data/spec/motion/network-indicator/network_indicator_spec.rb

@@ -0,0 +1,112 @@
+describe BW::NetworkIndicator do
+
+  before do
+    BW::NetworkIndicator.reset!
+  end
+
+  after do
+    BW::NetworkIndicator.instance_variable_set(:@counter, 0)
+    UIApplication.sharedApplication.networkActivityIndicatorVisible = false
+  end
+
+  it 'should show the indicator immediately' do
+    BW::NetworkIndicator.show
+    UIApplication.sharedApplication.networkActivityIndicatorVisible?.should == true
+  end
+
+  it 'should have a counter' do
+    BW::NetworkIndicator.show
+    BW::NetworkIndicator.counter.should == 1
+    BW::NetworkIndicator.hide
+    BW::NetworkIndicator.counter.should == 0
+  end
+
+  it 'should show the indicator from any thread' do
+    Dispatch::Queue.concurrent.async do
+      BW::NetworkIndicator.show
+    end
+    wait BW::NetworkIndicator::DELAY do
+      UIApplication.sharedApplication.networkActivityIndicatorVisible?.should == true
+    end
+  end
+
+  it 'should hide the indicator' do
+    BW::NetworkIndicator.show
+    BW::NetworkIndicator.hide
+    wait BW::NetworkIndicator::DELAY do
+      UIApplication.sharedApplication.networkActivityIndicatorVisible?.should == false
+    end
+  end
+
+  it 'should hide the indicator after a delay' do
+    BW::NetworkIndicator.show
+    BW::NetworkIndicator.hide
+    UIApplication.sharedApplication.networkActivityIndicatorVisible?.should == true
+    wait BW::NetworkIndicator::DELAY do
+      UIApplication.sharedApplication.networkActivityIndicatorVisible?.should == false
+    end
+  end
+
+  it 'should not hide the indicator if show/hide/show is called quickly' do
+    BW::NetworkIndicator.show
+    BW::NetworkIndicator.hide
+    UIApplication.sharedApplication.networkActivityIndicatorVisible?.should == true
+    wait BW::NetworkIndicator::DELAY/2 do
+      UIApplication.sharedApplication.networkActivityIndicatorVisible?.should == true
+      BW::NetworkIndicator.show
+      wait BW::NetworkIndicator::DELAY do
+        UIApplication.sharedApplication.networkActivityIndicatorVisible?.should == true
+      end
+    end
+  end
+
+  it 'should keep track of how many times `show` was called' do
+    BW::NetworkIndicator.show
+    BW::NetworkIndicator.show
+    UIApplication.sharedApplication.networkActivityIndicatorVisible?.should == true
+    BW::NetworkIndicator.hide
+    wait BW::NetworkIndicator::DELAY do
+      UIApplication.sharedApplication.networkActivityIndicatorVisible?.should == true
+      BW::NetworkIndicator.hide
+      wait BW::NetworkIndicator::DELAY do
+        UIApplication.sharedApplication.networkActivityIndicatorVisible?.should == false
+      end
+    end
+  end
+
+  it 'should allow `hide` to be called too many times' do
+    BW::NetworkIndicator.show
+    BW::NetworkIndicator.show
+    BW::NetworkIndicator.hide
+    BW::NetworkIndicator.hide
+    wait BW::NetworkIndicator::DELAY do
+      UIApplication.sharedApplication.networkActivityIndicatorVisible?.should == false
+
+      BW::NetworkIndicator.hide
+      BW::NetworkIndicator.hide
+      wait BW::NetworkIndicator::DELAY do
+        UIApplication.sharedApplication.networkActivityIndicatorVisible?.should == false
+
+        BW::NetworkIndicator.show
+        UIApplication.sharedApplication.networkActivityIndicatorVisible?.should == true
+      end
+    end
+  end
+
+  it 'should reset the counter when `reset!` is called' do
+    BW::NetworkIndicator.show
+    BW::NetworkIndicator.show
+    BW::NetworkIndicator.reset!
+    UIApplication.sharedApplication.networkActivityIndicatorVisible?.should == false
+  end
+
+  it 'should have `visible?` method' do
+    BW::NetworkIndicator.show
+    BW::NetworkIndicator.visible?.should == true
+    BW::NetworkIndicator.hide
+    wait BW::NetworkIndicator::DELAY do
+      BW::NetworkIndicator.visible?.should == false
+    end
+  end
+
+end

data/spec/motion/reactor/eventable_spec.rb

@@ -9,13 +9,21 @@ describe BubbleWrap::Reactor::Eventable do
   end
 
   describe '.on' do
-    it 'registers events' do
+    it 'registers events passing a block' do
       proof = proc {  }
       @subject.on(:foo, &proof)
       events = @subject.instance_variable_get(:@__events__)
       events[:foo].member?(proof).should == true
     end
 
+    it 'registers events passing a Method object' do
+      def bar; end
+      proof = method(:bar)
+      @subject.on(:foo, proof)
+      events = @subject.instance_variable_get(:@__events__)
+      events[:foo].member?(proof).should == true
+    end
+
     it 'returns the array of blocks for the event' do
       proof = proc {  }
       @subject.on(:foo, &proof).should == [proof]
@@ -23,7 +31,7 @@ describe BubbleWrap::Reactor::Eventable do
   end
 
   describe '.off' do
-    it 'unregisters events' do
+    it 'unregisters proc events' do
       proof = proc { }
       @subject.on(:foo, &proof)
       events = @subject.instance_variable_get(:@__events__)
@@ -31,6 +39,15 @@ describe BubbleWrap::Reactor::Eventable do
       events[:foo].member?(proof).should == false
     end
 
+    it 'unregisters method events' do
+      def bar; end
+      proof = method(:bar)
+      @subject.on(:foo, proof)
+      events = @subject.instance_variable_get(:@__events__)
+      @subject.off(:foo, proof)
+      events[:foo].member?(proof).should == false
+    end
+
     it 'calls other event procs when a proc unregisters itself' do
       @proxy.proof = 0
       proof1 = proc do |r|
@@ -57,6 +74,16 @@ describe BubbleWrap::Reactor::Eventable do
       @proxy.proof.should == true
     end
 
+    it 'calls event methods' do
+      @proxy.proof = false
+      def bar(r)
+        @proxy.proof = r
+      end
+      @subject.on(:foo, method(:bar))
+      @subject.trigger(:foo, true)
+      @proxy.proof.should == true
+    end
+
     it 'calls event procs for correct event' do
       @proxy.proof = false
       @subject.on(:foo) do |r|
@@ -66,6 +93,16 @@ describe BubbleWrap::Reactor::Eventable do
       @proxy.proof.should == false
     end
 
+    it 'calls event methods for correct event' do
+      @proxy.proof = false
+      def bar(r)
+        @proxy.proof = r
+      end
+      @subject.on(:foo, method(:bar))
+      @subject.trigger(:bar, true)
+      @proxy.proof.should == false
+    end
+
     it 'calls all the event procs' do
       @proxy.proof = 0
       @subject.on(:foo) { |r| @proxy.proof += r }
@@ -75,12 +112,27 @@ describe BubbleWrap::Reactor::Eventable do
       @proxy.proof.should == 6
     end
 
+    it 'calls all the event methods' do
+      def bar(r); @proxy.proof += r; end
+      def baz(r); @proxy.proof += r; end
+      @proxy.proof = 0
+      @subject.on(:foo, method(:baz))
+      @subject.on(:foo, method(:bar))
+      @subject.trigger(:foo, 2)
+      @proxy.proof.should == 4
+    end
+
     class TestUIViewControllerWithEventable
       include BubbleWrap::Reactor::Eventable
       def test_on
         on(:foo) do
         end
+        method(:bar)
       end
+
+      def bar
+      end
+
       def dealloc
         $test_dealloc = true
         super