bubble-wrap 1.7.1 → 1.8.0

data/motion/reactor/deferrable.rb

@@ -19,7 +19,7 @@ module BubbleWrap
         return unless blk
         @deferred_status ||= :unknown
         if @deferred_status == :succeeded
-          blk.call(*@deferred_args)
+          execute_block(&blk)
         elsif @deferred_status != :failed
           @callbacks ||= []
           @callbacks.unshift blk
@@ -42,6 +42,7 @@ module BubbleWrap
         return unless blk
         @deferred_status ||= :unknown
         if @deferred_status == :failed
+          execute_block(&blk)
           blk.call(*@deferred_args)
         elsif @deferred_status != :succeeded
           @errbacks ||= []
@@ -49,6 +50,31 @@ module BubbleWrap
         end
       end
 
+      def execute_block(&blk)
+        return unless blk
+        blk.call(*@deferred_args)
+      end
+
+      def delegate(delegate)
+        callback_delegate(delegate)
+        errback_delegate(delegate)
+        self
+      end
+
+      def errback_delegate(delegate)
+        errback do |*args|
+          delegate.fail *args
+        end
+        self
+      end
+
+      def callback_delegate(delegate)
+        callback do |*args|
+          delegate.succeed *args
+        end
+        self
+      end
+
       # Sugar for set_deferred_status(:failed, …)
       def fail(*args)
         set_deferred_status :failed, *args
@@ -91,14 +117,14 @@ module BubbleWrap
         when :succeeded
           if @callbacks
             while cb = @callbacks.pop
-              cb.call(*@deferred_args)
+              execute_block(&cb)
             end
           end
           @errbacks.clear if @errbacks
         when :failed
           if @errbacks
             while eb = @errbacks.pop
-              eb.call(*@deferred_args)
+              execute_block(&eb)
             end
           end
           @callbacks.clear if @callbacks

data/motion/reactor/eventable.rb

@@ -18,8 +18,10 @@ module BubbleWrap
         events = _events_for_key(event)
         if method
           events.delete_if { |m| m.receiver == method.receiver and m.name == method.name }
-        else
+        elsif blk
           events.delete_if { |b| b == blk }
+        else
+          __events__[event] = Array.new
         end
         blk
       end

data/motion/reactor/thread_aware_deferrable.rb

@@ -0,0 +1,37 @@
+module BubbleWrap
+  module Reactor
+    class ThreadAwareDeferrable < DefaultDeferrable
+      include ::BubbleWrap::Reactor::Deferrable
+
+      
+      # need to store the the queue in callback / errback
+      def callback(&blk)
+        return unless blk
+        cache_block_queue(&blk)
+        super(&blk)
+      end
+
+      def errback(&blk)
+        return unless blk
+        cache_block_queue(&blk)
+        super(&blk)
+      end
+
+      def execute_block(&blk)
+        return unless blk
+        queue = @queue_cache.delete(blk.object_id)
+        return unless queue
+        queue.async do
+          blk.call(*@deferred_args)
+        end
+      end
+
+      def cache_block_queue(&blk)
+        return unless blk
+        @queue_cache ||= {}
+        @queue_cache[blk.object_id] = Dispatch::Queue.current
+      end
+    end
+  end
+end
+

data/motion/rss_parser.rb

@@ -50,9 +50,11 @@ module BubbleWrap
       if data
         data_to_parse = input.respond_to?(:to_data) ? input.to_data : input
         @source = data_to_parse
+        @source_type = :data
       else
         url = input.is_a?(NSURL) ? input : NSURL.alloc.initWithString(input)
         @source = url
+        @source_type = :url
       end
       self.state = :initializes
       self
@@ -75,12 +77,15 @@ module BubbleWrap
     def parse(&block)
       @block = block
 
-      fetch_source_data do |data|
-        @parser = NSXMLParser.alloc.initWithData(data)
-        @parser.shouldProcessNamespaces = true
-        @parser.delegate ||= self
-        @parser.parse
+      if @source_type == :url
+        @parser = NSXMLParser.alloc.initWithContentsOfURL(@source)
+      else
+        @parser = NSXMLParser.alloc.initWithData(@source)
       end
+
+      @parser.shouldProcessNamespaces = true
+      @parser.delegate ||= self
+      @parser.parse
     end
 
     # Delegate getting called when parsing starts
@@ -129,7 +134,7 @@ module BubbleWrap
     # If a block was set, it will be called on each parsed items
     def parserDidEndDocument(parser)
       puts "done parsing" if debug
-      self.state = :is_done
+      self.state = :is_done unless self.state == :errors
     end
 
     def parserError
@@ -140,20 +145,5 @@ module BubbleWrap
     # parser:validationErrorOccurred:
     # parser:foundCDATA:
 
-    protected
-
-    def fetch_source_data(&blk)
-      if @source.is_a?(NSURL)
-        HTTP.get(@source.absoluteString) do |response|
-          if response.ok?
-            blk.call(response.body)
-          else
-            parser(parser, parseErrorOccurred:"HTTP request failed (#{response})")
-          end
-        end
-      else
-        yield @source
-      end
-    end
   end
 end

data/motion/sms/sms.rb

@@ -37,6 +37,10 @@ module BubbleWrap
       message_controller
     end
 
+    def can_send_sms?
+      !!MFMessageComposeViewController.canSendText
+    end
+
     # Event when the MFMessageComposeViewController is closed
     # -------------------------------------------------------------
     # the callback is fired if it was present in the constructor

data/motion/ui/ui_alert_view.rb

@@ -49,7 +49,9 @@ module BW
         options = {buttons: ["Cancel", "OK"],
                    cancel_button_index: 0}.merge!(options)
         options[:style] = :plain_text_input
-        new(options, &block)
+        new(options, &block).tap do |view|
+          view.textFieldAtIndex(0).placeholder = options[:placeholder] if options[:placeholder]
+        end
       end
 
       def secure_text_input(options = {}, &block)

data/motion/ui/ui_control_wrapper.rb

@@ -1,6 +1,8 @@
 module BubbleWrap
   module UIControlWrapper
     def when(events, options = {}, &block)
+      events = BW::Constants.get("UIControlEvent", events)
+
       @callback ||= {}
       @callback[events] ||= []
 
@@ -14,4 +16,29 @@ module BubbleWrap
       addTarget(@callback[events].last, action:'call', forControlEvents: events)
     end
   end
+
+  Constants.register(
+    UIControlEventTouchDown,
+    UIControlEventTouchDownRepeat,
+    UIControlEventTouchDragInside,
+    UIControlEventTouchDragOutside,
+    UIControlEventTouchDragEnter,
+    UIControlEventTouchDragExit,
+    UIControlEventTouchUpInside,
+    UIControlEventTouchUpOutside,
+    UIControlEventTouchCancel,
+
+    UIControlEventValueChanged,
+
+    UIControlEventEditingDidBegin,
+    UIControlEventEditingChanged,
+    UIControlEventEditingDidEnd,
+    UIControlEventEditingDidEndOnExit,
+
+    UIControlEventAllTouchEvents,
+    UIControlEventAllEditingEvents,
+    # UIControlEventApplicationReserved,
+    # UIControlEventSystemReserved,
+    UIControlEventAllEvents
+  )
 end

data/motion/ui/ui_view_wrapper.rb

@@ -25,7 +25,7 @@ module BubbleWrap
     end
 
     def when_pressed(enableInteraction=true, &proc)
-      add_gesture_recognizer_helper(UILongPressGestureRecognizer.alloc.initWithTarget(self, action:'handle_gesture_pressed_on_begin:'), enableInteraction, proc)
+      add_gesture_recognizer_helper(UILongPressGestureRecognizer.alloc.initWithTarget(self, action:'handle_gesture:'), enableInteraction, proc)
     end
 
     def self.deprecated_methods
@@ -45,12 +45,6 @@ module BubbleWrap
       @recognizers[recognizer].call(recognizer)
     end
 
-    def handle_gesture_pressed_on_begin(recognizer)
-      if recognizer.state==UIGestureRecognizerStateBegan
-        @recognizers[recognizer].call(recognizer)
-      end
-    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

data/motion/util/constants.rb

@@ -3,7 +3,7 @@ module BubbleWrap
   module Constants
     module_function
 
-    # Looks like RubyMotiononly  adds UIKit constants
+    # Looks like RubyMotion only adds UIKit constants
     # at compile time. If you don't use these
     # directly in your code, they don't get added
     # to Kernel and Constants.get crashes.

data/samples/alert/Gemfile

@@ -1,3 +1,4 @@
 source "https://rubygems.org"
 
+gem "rake"
 gem "bubble-wrap", :path => "../../"

data/samples/alert/Gemfile.lock

@@ -0,0 +1,16 @@
+PATH
+  remote: ../../
+  specs:
+    bubble-wrap (1.7.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    rake (10.4.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bubble-wrap!
+  rake

data/samples/alert/Rakefile

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 $:.unshift("/Library/RubyMotion/lib")
-require 'motion/project'
+require 'motion/project/template/ios'
 require 'bundler'
 Bundler.require
 

data/samples/camera/Gemfile

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

data/samples/camera/Gemfile.lock

@@ -0,0 +1,16 @@
+PATH
+  remote: ../../
+  specs:
+    bubble-wrap (1.7.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    rake (10.4.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bubble-wrap!
+  rake

data/samples/camera/Rakefile

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 $:.unshift("/Library/RubyMotion/lib")
-require 'motion/project'
+require 'motion/project/template/ios'
 require 'bubble-wrap/core'
 require 'bubble-wrap/camera'
 

data/samples/gesture/Gemfile

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

data/samples/gesture/Gemfile.lock

@@ -1,12 +1,18 @@
+PATH
+  remote: ../../
+  specs:
+    bubble-wrap (1.7.1)
+
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    bubble-wrap (1.1.1)
     motion-dryer (0.0.1)
+    rake (10.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bubble-wrap (~> 1.1.0)
+  bubble-wrap!
   motion-dryer
+  rake

data/samples/gesture/Rakefile

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 $:.unshift("/Library/RubyMotion/lib")
-require 'motion/project'
+require 'motion/project/template/ios'
 require 'bundler'
 Bundler.require :default
 

data/samples/location/Gemfile

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

data/samples/location/Gemfile.lock

@@ -0,0 +1,18 @@
+PATH
+  remote: ../../
+  specs:
+    bubble-wrap (1.7.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    bubble-wrap-http (1.7.1)
+    rake (10.4.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bubble-wrap!
+  bubble-wrap-http
+  rake

data/samples/location/Rakefile

@@ -1,10 +1,12 @@
 # -*- coding: utf-8 -*-
 $:.unshift("/Library/RubyMotion/lib")
-require 'motion/project'
+require 'motion/project/template/ios'
 require 'bubble-wrap/location'
-require 'bubble-wrap/http'
 require 'bubble-wrap/core'
 
+require 'bundler'
+Bundler.require
+
 Motion::Project::App.setup do |app|
   app.name = 'location'
 end

data/samples/media/Gemfile

@@ -0,0 +1,4 @@
+source "https://rubygems.org"
+
+gem "rake"
+gem "bubble-wrap", :path => "../../"

data/samples/media/Gemfile.lock

@@ -0,0 +1,16 @@
+PATH
+  remote: ../../
+  specs:
+    bubble-wrap (1.7.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    rake (10.4.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bubble-wrap!
+  rake