bubble-wrap 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c36af1404df9fe25d9bb32a34940b0877bf9eacd
-  data.tar.gz: c1d13206fbdff5651321d7ef362d7695ae8e2b7f
+  metadata.gz: faee2e15d6887fcd2cdb83c67b5cc2a62a421624
+  data.tar.gz: 2689f157cacaef27b81b313fff35803f78f8ea88
 SHA512:
-  metadata.gz: 03a94c71a69d7d27c68a7713f53f78db2daf10fe90561c03839f851ba0c2e65a1397ea0fe407432d1f4fcae9c317fe7265a06862ed66bbe81246121aab2667ab
-  data.tar.gz: f37b7ffddccd80b6716ea18efbdd11e217c66a3a15261e439e3b82caa048bb9ab0e4dc4a277c6dd89a66a27ff0c868eb2e7d13564d4d9e34f3ba2eb89913155e
+  metadata.gz: 9dcf5e4a7c790d9908499f9a0caafbfec344b264ff150741e2d86ad306f4b22ffe6335cdf552c1a6c2b4638b0e74771b705735b9315fbb54c3817c65d0cd8f3e
+  data.tar.gz: d1f7d8a3a0c0765c3da1ce7760b60ba2f55499b963e791c8df4ecec4d2587e3c3a6ee1dfb15a1c393efa557c7b1527b3079b5e8a74cc52b57be551d804327f12

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    bubble-wrap (1.7.0)
-      bubble-wrap-http (= 1.7.0)
+    bubble-wrap (1.7.1)
+      bubble-wrap-http (= 1.7.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
     bacon (1.1.0)
-    bubble-wrap-http (1.7.0)
+    bubble-wrap-http (1.7.1)
     metaclass (0.0.1)
     mocha (0.11.4)
       metaclass (~> 0.0.1)

data/README.md

@@ -26,7 +26,7 @@ require 'bubble-wrap'
 If you using Bundler:
 
 ```ruby
-gem "bubble-wrap", "~> 1.5.0"
+gem "bubble-wrap", "~> 1.7.0"
 ```
 
 BubbleWrap is split into multiple modules so that you can easily choose which parts

data/bubble-wrap.gemspec

@@ -4,8 +4,8 @@ require File.expand_path('../lib/bubble-wrap/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.authors       = ['Matt Aimonetti', 'Francis Chong', 'James Harton', 'Clay Allsopp', 'Dylan Markow', 'Jan Weinkauff', 'Marin Usalj']
   gem.email         = ['mattaimonetti@gmail.com', 'francis@ignition.hk', 'james@sociable.co.nz', 'clay.allsopp@gmail.com', 'dylan@dylanmarkow.com', 'jan@dreimannzelt.de', 'mneorr@gmail.com']
-  gem.description   = 'RubyMotion wrappers and helpers (Ruby for iOS) - Making Cocoa APIs more Ruby like, one API at a time. Fork away and send your pull request.'
-  gem.summary       = 'RubyMotion wrappers and helpers (Ruby for iOS) - Making Cocoa APIs more Ruby like, one API at a time. Fork away and send your pull request.'
+  gem.description   = 'RubyMotion wrappers and helpers (Ruby for iOS and OS X) - Making Cocoa APIs more Ruby like, one API at a time. Fork away and send your pull request.'
+  gem.summary       = 'RubyMotion wrappers and helpers (Ruby for iOS and OS X) - Making Cocoa APIs more Ruby like, one API at a time. Fork away and send your pull request.'
   gem.homepage      = 'http://rubymotion.github.io/BubbleWrap/'
 
   gem.files         = `git ls-files`.split($\)

data/lib/bubble-wrap/ext/motion_project_app.rb

@@ -6,9 +6,7 @@ module BubbleWrap
         base.instance_eval do
           def setup_with_bubblewrap(*args, &block)
             bw_config = proc do |app|
-              app.files = ::BubbleWrap::Requirement.files(app.files)
-              app.files_dependencies ::BubbleWrap::Requirement.files_dependencies
-              app.frameworks = ::BubbleWrap::Requirement.frameworks(app.frameworks)
+              ::BubbleWrap.before_config(app)
               block.call(app) unless block.nil?
             end
 
@@ -21,6 +19,20 @@ module BubbleWrap
 
     end
 
+    module Config
+      def config_with_bubblewrap
+        config_without_bubblewrap.tap do |c|
+          ::BubbleWrap.after_config(c)
+        end
+      end
+
+      def self.extended(base)
+        singleton_class = class << base; self; end
+        singleton_class.send :alias_method, :config_without_bubblewrap, :config
+        singleton_class.send :alias_method, :config, :config_with_bubblewrap
+      end
+    end
+
     module Platforms
       def osx?
         self.respond_to?(:template) && self.template == :osx
@@ -32,3 +44,5 @@ end
 Motion::Project::App.extend(BubbleWrap::Ext::BuildTask)
 
 Motion::Project::App.extend(BubbleWrap::Ext::Platforms)
+
+Motion::Project::App.extend(BubbleWrap::Ext::Config)

data/lib/bubble-wrap/loader.rb

@@ -39,6 +39,26 @@ unless defined?(BubbleWrap::LOADER_PRESENT)
         puts "bubble-wrap/#{requirement} requires OS X to use." if requirement
       end
     end
+
+    def before_config(app)
+      app.files = ::BubbleWrap::Requirement.files(app.files)
+      app.files_dependencies ::BubbleWrap::Requirement.files_dependencies
+      app.frameworks = ::BubbleWrap::Requirement.frameworks(app.frameworks)
+    end
+
+    def after_config(config)
+      BubbleWrap.require_ios do
+        ios7_files = 'motion/ios/7/uiactivity_view_controller_constants.rb'
+        if config.send(:deployment_target).to_f >= 7.0
+          ::BubbleWrap.require(ios7_files)
+          before_config(config)
+        else
+          config.files = config.files.reject {|s|
+            s.include?(ios7_files)
+          }
+        end
+      end
+    end
   end
 
   BW = BubbleWrap unless defined?(BW)

data/lib/bubble-wrap/ui.rb

@@ -2,7 +2,6 @@ require 'bubble-wrap/loader'
 
 BubbleWrap.require_ios("ui") do
   BubbleWrap.require('motion/util/constants.rb')
-  BubbleWrap.require('motion/ios/7/uiactivity_view_controller_constants.rb') if App.config.send(:deployment_target).to_f >= 7.0
   BubbleWrap.require('motion/ui/**/*.rb') do
     file('motion/ui/pollute.rb').depends_on %w(
       motion/ui/ui_control_wrapper.rb

data/lib/bubble-wrap/version.rb

@@ -1,4 +1,4 @@
 module BubbleWrap
-  VERSION = '1.7.0' unless defined?(BubbleWrap::VERSION)
+  VERSION = '1.7.1' unless defined?(BubbleWrap::VERSION)
   MIN_MOTION_VERSION = '2.17'
 end

data/motion/core/kvo.rb

@@ -53,7 +53,7 @@ module BubbleWrap
       @targets.each do |target, key_paths|
         key_paths.each_key do |key_path|
           target.removeObserver(self, forKeyPath:key_path)
-        end  
+        end
       end
       remove_all_observer_blocks
     end
@@ -81,6 +81,9 @@ module BubbleWrap
 
       key_paths = @targets[target]
       key_paths.delete(key_path.to_s) if !key_paths.nil?
+      if key_paths.nil? || key_paths.length == 0
+        @targets.delete(target)
+      end
     end
 
     def remove_all_observer_blocks

data/motion/location/location.rb

@@ -28,6 +28,8 @@ module BubbleWrap
     module_function
     # Start getting locations
     # @param [Hash] options = {
+    #   authorization_type: :always/:when_in_use to trigger the type of authorization you want
+    #     default == uses :always
     #   significant: true/false; whether to listen for significant location changes or
     #     all location changes (see Apple docs for info); default == false
     #   distance_filter:  minimum change in distance to be updated about, in meters;
@@ -37,6 +39,7 @@ module BubbleWrap
     #     :hundred_meters, :kilometer, or :three_kilometers; default == :best
     #   purpose: string to display when the system asks user for location,
     #   retries: if location cant be found. how many errors do we retry; default == 5
+    #   calibration: if the OS should display the heading calibration to the user; default == false
     # }
     # @block for callback. takes one argument, `result`.
     #   - On error or cancelled, is called with a hash {error: BW::Location::Error::<Type>}
@@ -52,11 +55,13 @@ module BubbleWrap
       @callback = block
       @callback.weak! if @callback && BubbleWrap.use_weak_callbacks?
       @options = {
+        authorization_type: :always,
         significant: false,
         distance_filter: KCLDistanceFilterNone,
         desired_accuracy: KCLLocationAccuracyBest,
         retries: 5,
-        once: false
+        once: false,
+        calibration: false
       }.merge(options)
 
       @options[:significant] = false if @options[:significant].nil?
@@ -66,6 +71,13 @@ module BubbleWrap
         error(Error::DISABLED) and return
       end
 
+      self.location_manager
+
+      if self.location_manager.respondsToSelector('requestAlwaysAuthorization')
+        @options[:authorization_type] == :always ? self.location_manager.requestAlwaysAuthorization : self.location_manager.requestWhenInUseAuthorization
+      end
+
+
       self.location_manager.distanceFilter = @options[:distance_filter]
       self.location_manager.desiredAccuracy = Constants.get("KCLLocationAccuracy", @options[:desired_accuracy])
       self.location_manager.purpose = @options[:purpose] if @options[:purpose]
@@ -212,6 +224,10 @@ module BubbleWrap
         error(Error::PERMISSION_DENIED)
       end
     end
+
+    def locationManagerShouldDisplayHeadingCalibration(manager)
+      @options[:calibration] ? @options[:calibration] : false
+    end
   end
 end
 ::Location = BubbleWrap::Location unless defined?(::Location)

data/motion/reactor/eventable.rb

@@ -7,21 +7,26 @@ module BubbleWrap
       # and be passed the arguments that are passed to
       # `trigger`.
       def on(event, method = nil, &blk)
+        events = _events_for_key(event)
         method_or_block = method ? method : blk
-        __events__[event].push method_or_block
+        events.push method_or_block
       end
 
       # When `event` is triggered, do not call the given
       # block any more
       def off(event, method = nil, &blk)
-        method_or_block = method ? method : blk
-        __events__[event].delete_if { |b| b == method_or_block }
+        events = _events_for_key(event)
+        if method
+          events.delete_if { |m| m.receiver == method.receiver and m.name == method.name }
+        else
+          events.delete_if { |b| b == blk }
+        end
         blk
       end
 
       # Trigger an event
       def trigger(event, *args)
-        blks = __events__[event].clone
+        blks = _events_for_key(event).clone
         blks.map do |blk|
           blk.call(*args)
         end
@@ -30,7 +35,11 @@ module BubbleWrap
       private
 
       def __events__
-        @__events__ ||= Hash.new { |h,k| h[k] = [] }
+        @__events__ ||= Hash.new
+      end
+
+      def _events_for_key(event)
+        __events__[event] ||= Array.new
       end
     end
   end

data/spec/motion/core/kvo_spec.rb

@@ -100,7 +100,7 @@ describe BubbleWrap::KVO do
       @example.send(:remove_observer_block, nil, "key_path")
       @example.send(: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| }
@@ -108,7 +108,7 @@ describe BubbleWrap::KVO do
       @example.send(:remove_observer_block, target, nil)
       @example.send(:registered?, target, "key_path").should == true
     end
-  
+
     it "should remove only one observer block" do
       target = Object.new
       block = lambda { |old_value, new_value| }
@@ -118,9 +118,9 @@ describe BubbleWrap::KVO do
       @example.send(:registered?, target, "key_path1").should == false
       @example.send(:registered?, target, "key_path2").should == true
     end
-  
+
     # remove all
-  
+
     it "should remove all observer blocks" do
       target = Object.new
       block = lambda { |old_value, new_value| }
@@ -128,21 +128,38 @@ describe BubbleWrap::KVO do
       @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.send(: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
+    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
     end
-    
+
   end
-  
+
   describe "API" do
     before do
       @example = KvoExample.new
     end
-  
+
     after do
       @example.unobserve_all
       @example = nil
     end
-    
+
     # observe
 
     it "should observe a key path" do
@@ -152,11 +169,11 @@ describe BubbleWrap::KVO do
         old_value.should == "Foo"
         new_value.should == "Bar"
       end
-    
+
       @example.set_text "Bar"
       observed.should == true
     end
-  
+
     it "should observe a key path with more than one block" do
       observed_one = false
       observed_two = false
@@ -170,22 +187,22 @@ describe BubbleWrap::KVO do
       @example.observe_label do |old_value, new_value|
         observed_three = true
       end
-    
+
       @example.set_text "Bar"
       observed_one.should == true
       observed_two.should == true
       observed_three.should == true
     end
-    
+
     # unobserve
-    
+
     it "should unobserve a key path" do
       observed = false
       @example.observe_label do |old_value, new_value|
         observed = true
       end
       @example.unobserve_label
-    
+
       @example.set_text "Bar"
       observed.should == false
     end
@@ -199,7 +216,7 @@ describe BubbleWrap::KVO do
         old_value.should == 1
         new_value.should == 2
       end
-    
+
       @example.age = 2
       observed.should == true
     end
@@ -210,13 +227,13 @@ describe BubbleWrap::KVO do
         observed = true
       end
       @example.unobserve :age
-    
+
       @example.age = 2
       observed.should == false
     end
-  
+
   end
- 
+
 =begin
   it "should be able to observe a collection" do
     observed = false
@@ -224,9 +241,9 @@ describe BubbleWrap::KVO do
       puts "#{collection} #{old_value} #{new_value} #{indexes}"
       observed = true
     end
-    
+
     @example.items << "Dragonfruit"
-    observed.should == true  
+    observed.should == true
   end
 =end
 

data/spec/motion/core_spec.rb

@@ -69,7 +69,7 @@ describe 'BubbleWrap' do
   
   describe "uuid" do
 
-    it "creates always the new UUID" do
+    it "always creates the new UUID" do
       previous = BW.create_uuid  
       10.times do
         uuid = BW.create_uuid

data/spec/motion/location/location_spec.rb

@@ -176,6 +176,7 @@ describe BubbleWrap::Location do
       end
 
       location_manager.instance_variable_get("@startUpdatingHeading").should == true
+      BW::Location.locationManagerShouldDisplayHeadingCalibration(location_manager).should == false
     end
 
     it "should have correct heading when succeeding" do
@@ -196,6 +197,13 @@ describe BubbleWrap::Location do
 
       BW::Location.locationManager(location_manager, didUpdateHeading: heading)
     end
+
+    it "should show the calibration screen when needed" do
+      BW::Location.get_compass(calibration: true) do |result|
+      end
+
+      BW::Location.locationManagerShouldDisplayHeadingCalibration(location_manager).should == true
+    end
   end
 
   describe ".get_significant" do

data/spec/motion/reactor/eventable_spec.rb

@@ -48,6 +48,21 @@ describe BubbleWrap::Reactor::Eventable do
       events[:foo].member?(proof).should == false
     end
 
+    it 'unregisters method events after kvo' do
+      observing_object = Class.new do
+        include BubbleWrap::KVO
+      end.new
+
+      @subject.on(:foo, @subject.method(:description))
+      block = lambda { |old_value, new_value| }
+      observing_object.observe(@subject, :cool_variable, &block)
+      @subject.off(:foo, @subject.method(:description))
+
+      events = @subject.instance_variable_get(:@__events__)
+      events[:foo].length.should == 0
+      observing_object.unobserve_all
+    end
+
     it 'calls other event procs when a proc unregisters itself' do
       @proxy.proof = 0
       proof1 = proc do |r|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bubble-wrap
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Matt Aimonetti
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-11 00:00:00.000000000 Z
+date: 2014-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bubble-wrap-http
@@ -22,14 +22,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.7.1
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -86,8 +86,8 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: RubyMotion wrappers and helpers (Ruby for iOS) - Making Cocoa APIs more
-  Ruby like, one API at a time. Fork away and send your pull request.
+description: RubyMotion wrappers and helpers (Ruby for iOS and OS X) - Making Cocoa
+  APIs more Ruby like, one API at a time. Fork away and send your pull request.
 email:
 - mattaimonetti@gmail.com
 - francis@ignition.hk
@@ -395,8 +395,8 @@ rubyforge_project:
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: RubyMotion wrappers and helpers (Ruby for iOS) - Making Cocoa APIs more Ruby
-  like, one API at a time. Fork away and send your pull request.
+summary: RubyMotion wrappers and helpers (Ruby for iOS and OS X) - Making Cocoa APIs
+  more Ruby like, one API at a time. Fork away and send your pull request.
 test_files:
 - spec/lib/bubble-wrap/ext/motion_project_app_spec.rb
 - spec/lib/bubble-wrap/ext/motion_project_config_spec.rb