bubble-wrap 1.3.0 → 1.4.0

data/motion/reactor/periodic_timer.rb

@@ -8,23 +8,27 @@ module BubbleWrap
 
       # Create a new timer that fires after a given number of seconds
       def initialize(interval, *args, &blk)
-        options = args.last.is_a?(Hash) ? args.last : {}
         callback = args.first.respond_to?(:call) ? args.first : blk
         raise ArgumentError, "No callback or block supplied to periodic timer" unless callback
-
+        
+        options = args.last.is_a?(Hash) ? args.last : {}
+        if options[:common_modes]
+          NSLog "[DEPRECATED - Option :common_modes] a Run Loop Mode is no longer needed."
+        end
+        
         self.interval = interval
-        fire = proc {
+
+        leeway = interval
+        queue  = Dispatch::Queue.current
+        @timer = Dispatch::Source.timer(leeway, interval, 0.0, queue) do
           callback.call
           trigger(:fired)
-        }
-        @timer = NSTimer.timerWithTimeInterval(interval, target: fire, selector: 'call:', userInfo: nil, repeats: true)
-        runloop_mode = options[:common_modes] ? NSRunLoopCommonModes : NSDefaultRunLoopMode 
-        NSRunLoop.currentRunLoop.addTimer(@timer, forMode: runloop_mode)
+        end
       end
 
       # Cancel the timer
       def cancel
-        @timer.invalidate
+        @timer.cancel!
         trigger(:cancelled)
       end
 

data/motion/reactor/timer.rb

@@ -5,17 +5,21 @@ module BubbleWrap
       include Eventable
 
       # Create a new timer that fires after a given number of seconds
-      def initialize(interval, callback=nil, &blk)
-        fire = proc {
-          (callback || blk).call
-          trigger(:fired)
-        }
-        @timer = NSTimer.scheduledTimerWithTimeInterval(interval,target: fire, selector: 'call:', userInfo: nil, repeats: false)
+      def initialize(leeway, callback=nil, &blk)
+        queue  = Dispatch::Queue.current
+        @timer = Dispatch::Source.timer(leeway, Dispatch::TIME_FOREVER, 0.0, queue) do |src|
+          begin
+            (callback || blk).call
+            trigger(:fired)
+          ensure
+            src.cancel!
+          end
+        end        
       end
 
       # Cancel the timer
       def cancel
-        @timer.invalidate
+        @timer.cancel! if @timer
         trigger(:cancelled)
         true
       end

data/motion/sms/result.rb

@@ -0,0 +1,24 @@
+module BubbleWrap
+  module SMS
+    class Result
+      attr_accessor :result
+
+      def initialize(result)
+        self.result = result
+      end
+
+      def sent?
+        self.result == MessageComposeResultSent
+      end
+
+      def canceled?
+        self.result == MessageComposeResultCancelled
+      end
+
+      def failed?
+        self.result == MessageComposeResultFailed
+      end
+      
+    end
+  end
+end

data/motion/sms/sms.rb

@@ -0,0 +1,47 @@
+module BubbleWrap
+  module SMS
+
+    module_function
+
+    # Base method to create your in-app mail
+    # ---------------------------------------
+    # EX
+    # BW::SMS.compose (
+    # {
+    #   delegate: self, # optional, will use root view controller by default
+    #   to: [ "1(234)567-8910" ],
+    #   message: "This is my message. It isn't very long.",
+    #   animated: false
+    # }) {|result, error|
+    #   result.sent?      # => boolean
+    #   result.canceled?  # => boolean
+    #   result.failed?    # => boolean
+    #   error             # => NSError
+    #   }           
+  
+    def compose(options={}, &callback)
+      @delegate = options[:delegate] || App.window.rootViewController
+      @callback = callback
+      @message_controller = create_message_controller(options)
+      @message_is_animated = options[:animated] == false ? false : true
+      @delegate.presentModalViewController(@message_controller, animated: @message_is_animated)
+    end
+    
+    def create_message_controller(options={})
+      message_controller = MFMessageComposeViewController.alloc.init
+      message_controller.messageComposeDelegate = self
+      message_controller.body = options[:message] 
+      message_controller.recipients = Array(options[:to])     
+      message_controller
+    end
+
+    # Event when the MFMessageComposeViewController is closed
+    # -------------------------------------------------------------
+    # the callback is fired if it was present in the constructor
+
+    def messageComposeViewController(controller, didFinishWithResult: result)
+      @delegate.dismissModalViewControllerAnimated(@message_is_animated)
+      @callback.call Result.new(result) if @callback
+    end
+  end
+end

data/motion/ui/pollute.rb

@@ -1,5 +1,8 @@
+# Please, no more!  It'll hurt BubbleWrap's compatibility with other libraries.
 [
-  [UIControl, UIControlWrap]
+  [UIControl,         BW::UIControlWrapper],
+  [UIView,            BW::UIViewWrapper],
+  [UIViewController,  BW::UIViewControllerWrapper],
 ].each do |base, wrapper|
     base.send(:include, wrapper)
 end

data/motion/ui/ui_alert_view.rb

@@ -38,23 +38,30 @@ module BW
       end
 
       def default(options = {}, &block)
-        options = { buttons: "OK" }.merge!(options)
-        new(options.merge!(style: :default), &block)
+        options = {buttons: "OK"}.merge!(options)
+        options[:style] = :default
+        new(options, &block)
       end
 
       def plain_text_input(options = {}, &block)
-        options = { buttons: ["Cancel", "OK"], cancel_button_index: 0 }.merge!(options)
-        new(options.merge!(style: :plain_text_input), &block)
+        options = {buttons: ["Cancel", "OK"],
+                   cancel_button_index: 0}.merge!(options)
+        options[:style] = :plain_text_input
+        new(options, &block)
       end
 
       def secure_text_input(options = {}, &block)
-        options = { buttons: ["Cancel", "OK"], cancel_button_index: 0 }.merge!(options)
-        new(options.merge!(style: :secure_text_input), &block)
+        options = {buttons: ["Cancel", "OK"],
+                   cancel_button_index: 0}.merge!(options)
+        options[:style] = :secure_text_input
+        new(options, &block)
       end
 
       def login_and_password_input(options = {}, &block)
-        options = { buttons: ["Cancel", "Log in"], cancel_button_index: 0 }.merge!(options)
-        new(options.merge!(style: :login_and_password_input), &block)
+        options = {buttons: ["Cancel", "Log in"],
+                   cancel_button_index: 0}.merge!(options)
+        options[:style] = :login_and_password_input
+        new(options, &block)
       end
     end
 

data/motion/ui/ui_control_wrapper.rb

@@ -0,0 +1,16 @@
+module BubbleWrap
+  module UIControlWrapper
+    def when(events, options={}, &block)
+      @callback ||= {}
+      @callback[events] ||= []
+
+      unless options[:append]
+        @callback[events] = []
+        removeTarget(nil, action: nil, forControlEvents: events)
+      end
+
+      @callback[events] << block
+      addTarget(@callback[events].last, action:'call', forControlEvents: events)
+    end
+  end
+end

data/motion/ui/ui_view_controller_wrapper.rb

@@ -0,0 +1,13 @@
+module BubbleWrap
+  module UIViewControllerWrapper
+    # Short hand to get the content frame
+    #
+    # Return content frame: the application frame - navigation bar frame
+    def content_frame
+      app_frame = App.frame
+      navbar_height = self.navigationController.nil? ?
+        0 : self.navigationController.navigationBar.frame.size.height
+      CGRectMake(0, 0, app_frame.size.width, app_frame.size.height - navbar_height)
+    end
+  end
+end

data/motion/ui/ui_view_wrapper.rb

@@ -0,0 +1,55 @@
+module BubbleWrap
+  module UIViewWrapper
+    def when_tapped(enableInteraction=true, &proc)
+      add_gesture_recognizer_helper(UITapGestureRecognizer.alloc.initWithTarget(self, action:'handle_gesture:'), enableInteraction, proc)
+    end
+
+    def when_pinched(enableInteraction=true, &proc)
+      add_gesture_recognizer_helper(UIPinchGestureRecognizer.alloc.initWithTarget(self, action:'handle_gesture:'), enableInteraction, proc)
+    end
+
+    def when_rotated(enableInteraction=true, &proc)
+      add_gesture_recognizer_helper(UIRotationGestureRecognizer.alloc.initWithTarget(self, action:'handle_gesture:'), enableInteraction, proc)
+    end
+
+    def when_swiped(enableInteraction=true, &proc)
+      add_gesture_recognizer_helper(UISwipeGestureRecognizer.alloc.initWithTarget(self, action:'handle_gesture:'), enableInteraction, proc)
+    end
+
+    def when_panned(enableInteraction=true, &proc)
+      add_gesture_recognizer_helper(UIPanGestureRecognizer.alloc.initWithTarget(self, action:'handle_gesture:'), enableInteraction, proc)
+    end
+
+    def when_pressed(enableInteraction=true, &proc)
+      add_gesture_recognizer_helper(UILongPressGestureRecognizer.alloc.initWithTarget(self, action:'handle_gesture:'), enableInteraction, proc)
+    end
+
+    def self.deprecated_methods
+      %w(whenTapped whenPinched whenRotated whenSwiped whenPanned whenPressed)
+    end
+
+    deprecated_methods.each do |method|
+      define_method(method) do |enableInteraction = true, &proc|
+        NSLog "[DEPRECATED - #{method}] please use #{method.underscore} instead."
+        send(method.underscore, enableInteraction, &proc)
+      end
+    end
+
+    private
+
+    def handle_gesture(recognizer)
+      @recognizers[recognizer].call(recognizer)
+    end
+
+    # Adds the recognizer and keeps a strong reference to the Proc object.
+    def add_gesture_recognizer_helper(recognizer, enableInteraction, proc)
+      setUserInteractionEnabled true if enableInteraction && !isUserInteractionEnabled
+      self.addGestureRecognizer(recognizer)
+
+      @recognizers = {} unless @recognizers
+      @recognizers[recognizer] = proc
+
+      recognizer
+    end
+  end
+end

data/resources/Localizable.strings

@@ -0,0 +1 @@
+"real_key" = "Real Key";

data/samples/gesture/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source "https://rubygems.org"
 
 gem 'bubble-wrap', '~> 1.1.0'
-gem 'motion-dryer'
+gem 'motion-dryer'

data/samples/location/Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source "https://rubygems.org"
 
 gem 'bubble-wrap', '~> 1.1.0'

data/samples/osx/Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source "https://rubygems.org"
 
-gem 'bubble-wrap', :path => "../../" # '~> 1.3.0'
+gem 'bubble-wrap', :path => "../../" # '~> 1.3.0'

data/spec/motion/core/app_spec.rb

@@ -36,6 +36,12 @@ describe BubbleWrap::App do
     end
   end
 
+  describe '.info_plist' do
+    it 'returns the information property list hash' do
+      App.info_plist.should == NSBundle.mainBundle.infoDictionary
+    end
+  end
+
   describe '.name' do
     it 'returns the application name' do
       App.name.should == 'testSuite'

data/spec/motion/core/device/ios/camera_spec.rb

@@ -3,9 +3,9 @@ def camera_picker
 end
 
 def example_info
-  info = { UIImagePickerControllerMediaType => KUTTypeImage,
-                 UIImagePickerControllerOriginalImage => UIImage.alloc.init,
-                 UIImagePickerControllerMediaURL => NSURL.alloc.init}
+  { UIImagePickerControllerMediaType => KUTTypeImage,
+    UIImagePickerControllerOriginalImage => UIImage.alloc.init,
+    UIImagePickerControllerMediaURL => NSURL.alloc.init}
 end
 
 describe BubbleWrap::Device::Camera do

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

@@ -103,6 +103,51 @@ describe "iOS" do
     end
   end
 
+  describe '.interface_orientation' do
+
+    describe 'portrait' do
+      it 'returns :portrait' do
+        BW::Device::Screen.interface_orientation(UIInterfaceOrientationPortrait).should == :portrait
+      end
+    end
+
+    describe 'portrait upside down' do
+      it 'returns :portrait_upside_down' do
+        BW::Device::Screen.interface_orientation(UIInterfaceOrientationPortraitUpsideDown).should == :portrait_upside_down
+      end
+    end
+
+    describe 'landscape left' do
+      it 'returns :landscape_left' do
+        BW::Device::Screen.interface_orientation(UIInterfaceOrientationLandscapeLeft).should == :landscape_left
+      end
+    end
+
+    describe 'landscape right' do
+      it 'returns :landscape_right' do
+        BW::Device::Screen.interface_orientation(UIInterfaceOrientationLandscapeRight).should == :landscape_right
+      end
+    end
+
+    describe 'unknown' do
+      it 'returns :unknown if fallback is false' do
+        BW::Device::Screen.interface_orientation(UIDeviceOrientationUnknown, false).should == :unknown
+      end
+      it 'returns Status bar orientation if fallback not specified' do
+        BW::Device::Screen.interface_orientation(UIDeviceOrientationUnknown).should == BW::Device::Screen.interface_orientation(UIApplication.sharedApplication.statusBarOrientation)
+      end
+    end
+
+    describe 'any other input' do
+      it 'returns :unknown  if fallback is false' do
+        BW::Device::Screen.interface_orientation('twiggy twiggy twiggy', false).should == :unknown
+      end
+      it 'returns Status bar orientation if fallback not specified' do
+        BW::Device::Screen.interface_orientation('twiggy twiggy twiggy').should == BW::Device::Screen.interface_orientation(UIApplication.sharedApplication.statusBarOrientation)
+      end
+    end
+  end
+
   describe '.width' do
     it 'returns the current device screen width' do
       BW::Device::Screen.width.should == 320.0 if BW::Device.iphone?

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

@@ -3,6 +3,9 @@ describe BubbleWrap::App do
     describe '.alert' do
       after do
         @alert.dismissWithClickedButtonIndex(@alert.cancelButtonIndex, animated: false)
+
+        wait 0.3 do
+        end
       end
 
       describe "with only one string argument" do
@@ -138,10 +141,36 @@ describe BubbleWrap::App do
       end
     end
 
+    describe '.windows' do
+      it 'returns UIApplication.sharedApplication.windows' do
+        App.windows.should == UIApplication.sharedApplication.windows
+      end
+    end
+
     describe '.window' do
       it 'returns UIApplication.sharedApplication.keyWindow' do
         App.window.should == UIApplication.sharedApplication.keyWindow
       end
+
+      describe 'with UIActionSheet' do
+
+        it 'returns the correct window' do
+          action_sheet = UIActionSheet.alloc.init
+          action_sheet.cancelButtonIndex = (action_sheet.addButtonWithTitle("Cancel"))
+
+          old_window = App.window
+          window_count = App.windows.count
+          action_sheet.showInView(App.window)
+          wait 1 do
+            UIApplication.sharedApplication.windows.count.should > window_count
+            App.window.should == old_window
+
+            action_sheet.dismissWithClickedButtonIndex(action_sheet.cancelButtonIndex, animated: false)
+
+            App.window.should == old_window
+          end
+        end
+      end
     end
 
     describe '.run_after' do

data/spec/motion/core/persistence_spec.rb

@@ -65,4 +65,29 @@ describe BubbleWrap::Persistence do
       BubbleWrap::Persistence[:arbitraryString].methods.should == 'test string'.methods
     end
   end
+
+  describe "deleting object" do
+    before do
+      BubbleWrap::Persistence['arbitraryString'] = 'foobarbaz'
+    end
+
+    it 'can delete persisted object' do
+      BubbleWrap::Persistence.delete(:arbitraryString).should == 'foobarbaz'
+      BubbleWrap::Persistence['arbitraryString'].should.equal nil
+    end
+
+    it 'returns nil when the object does not exist' do
+      BubbleWrap::Persistence.delete(:wrongKey).should == nil
+    end
+
+    it 'must call synchronize' do
+      storage = NSUserDefaults.standardUserDefaults
+      def storage.synchronize; @sync_was_called = true; end
+
+      BubbleWrap::Persistence.delete(:arbitraryString)
+      
+      storage.instance_variable_get(:@sync_was_called).should.equal true
+    end
+
+  end
 end