bubble-wrap 1.1.4 → 1.1.5

data/CHANGELOG.md

@@ -2,7 +2,7 @@
 
 [Commit history](https://github.com/rubymotion/BubbleWrap/compare/v1.1.4...master)
 
-## 1.1.4 (Unreleased)
+## 1.1.4
 
 [Commit history](https://github.com/rubymotion/BubbleWrap/compare/v1.1.3...v1.1.4)
 

data/README.md

@@ -192,6 +192,8 @@ Examples:
 # :portrait
 > Device.simulator?
 # true
+> Device.ios_version
+# "6.0"
 > Device.retina?
 # false
 > Device.screen.width
@@ -372,7 +374,7 @@ BW::Media.play_modal("http://www.hrupin.com/wp-content/uploads/mp3/testsong_20_s
 Extra methods on `UIView` for working with gesture recognizers. A gesture recognizer can be added using a normal Ruby block, like so:
 
 ```ruby
-    view.whenTapped do
+    view.when_tapped do
       UIView.animateWithDuration(1,
         animations:lambda {
           # animate
@@ -381,7 +383,7 @@ Extra methods on `UIView` for working with gesture recognizers. A gesture recogn
     end
 ```
 
-There are similar methods for pinched, rotated, swiped, panned, and pressed (for long presses). All of the methods return the actual recognizer object, so it is possible to set the delegate if more fine-grained control is needed.
+There are similar methods for `pinched`, `rotated`, `swiped`, `panned`, and `pressed` (for long presses). All of the methods return the actual recognizer object, so it is possible to set the delegate if more fine-grained control is needed.
 
 ### UIViewController
 

data/lib/bubble-wrap/version.rb

@@ -1,5 +1,5 @@
 module BubbleWrap
-  VERSION = '1.1.4' unless defined?(BubbleWrap::VERSION)
+  VERSION = '1.1.5' unless defined?(BubbleWrap::VERSION)
   MIN_MOTION_VERSION = '1.24'
 
   module_function

data/motion/core/device.rb

@@ -13,6 +13,12 @@ module BubbleWrap
     def ipad?(idiom=UIDevice.currentDevice.userInterfaceIdiom)
       idiom == UIUserInterfaceIdiomPad
     end
+    
+    # Verifies that the device having a long screen (4 inch iPhone/iPod)
+    # @return [TrueClass, FalseClass] true will be returned if the device is an iPhone/iPod with 4 inche screen, false otherwise.
+    def long_screen?(idiom=UIDevice.currentDevice.userInterfaceIdiom, screen_height=UIScreen.mainScreen.bounds.size.height)
+      iphone?(idiom) && screen_height == 568.0
+    end
 
     # Use this to make a DSL-style call for picking images
     # @example Device.camera.front
@@ -39,6 +45,12 @@ module BubbleWrap
       @simulator_state ||= !(UIDevice.currentDevice.model =~ /simulator/i).nil?
     end
 
+    # Returns the IOS SDK version currently running (i.e. "5.1" or "6.0" etc)
+    # @return [String] the IOS SDK version currently running
+    def ios_version
+      UIDevice.currentDevice.systemVersion
+    end
+
     # Shameless shorthand for accessing BubbleWrap::Screen
     def screen
       BubbleWrap::Device::Screen

data/motion/core/device/camera.rb

@@ -21,17 +21,17 @@ module BubbleWrap
 
       def self.front
         return nil if not UIImagePickerController.isCameraDeviceAvailable(UIImagePickerControllerCameraDeviceFront)
-        Camera.new(:front).retain
+        @front ||= Camera.new(:front)
       end
 
       def self.rear
         return nil if not UIImagePickerController.isCameraDeviceAvailable(UIImagePickerControllerCameraDeviceRear)
-        Camera.new(:rear).retain
+        @rear ||= Camera.new(:rear)
       end
 
       # For uploading photos from the library.
       def self.any
-        Camera.new.retain
+        @any ||= Camera.new
       end
 
       def initialize(location = :none)
@@ -117,6 +117,7 @@ module BubbleWrap
           self.picker.cameraDevice = camera_device
         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(self.picker, animated:@options[:animated], completion: lambda {})
       end
@@ -217,4 +218,4 @@ module BubbleWrap
     end
   end
 end
-::Camera = BubbleWrap::Device::Camera unless defined?(::Camera)
+::Camera = BubbleWrap::Device::Camera unless defined?(::Camera)

data/motion/core/device/camera_wrapper.rb

@@ -7,7 +7,7 @@ module BubbleWrap
       # The front-facing camera used to capture media
       # @return [Device::Camera, NilClass] a Camera will be returned if there is a front camera, nil otherwise
       def front
-        BubbleWrap::Device::Camera.front
+        @front ||= BubbleWrap::Device::Camera.front
       end
 
       # Verifies that the device running has a front facing camera.
@@ -19,7 +19,7 @@ module BubbleWrap
       # The rear-facing camera used to capture media
       # @return [Device::Camera, NilClass] a Camera will be returned if there is a rear camera, nil otherwise
       def rear
-        BubbleWrap::Device::Camera.rear
+        @rear ||= BubbleWrap::Device::Camera.rear
       end
 
       # Verifies that the device running has a rear facing camera.
@@ -32,7 +32,7 @@ module BubbleWrap
       # See Device::Camera docs for more source type options.
       # @return [Device::Camera] a Camera will always be returned.
       def any
-        BubbleWrap::Device::Camera.any
+        @any ||= BubbleWrap::Device::Camera.any
       end
 
       # Should always return true, since picking images from *some* source is always possible

data/motion/core/device/screen.rb

@@ -16,7 +16,7 @@ module BubbleWrap
 
       # Figure out the current physical orientation of the device
       # @return [:portrait, :portrait_upside_down, :landscape_left, :landscape_right, :face_up, :face_down, :unknown]
-      def orientation(device_orientation=UIDevice.currentDevice.orientation)
+      def orientation(device_orientation=UIDevice.currentDevice.orientation, fallback=true)
         case device_orientation
         when UIDeviceOrientationPortrait then :portrait
         when UIDeviceOrientationPortraitUpsideDown then :portrait_upside_down
@@ -25,7 +25,13 @@ module BubbleWrap
         when UIDeviceOrientationFaceUp then :face_up
         when UIDeviceOrientationFaceDown then :face_down
         else
-          :unknown
+          # In some cases, the accelerometer can't get an accurate read of orientation so we fall back on the orientation of
+          # the status bar.
+          if fallback && (device_orientation != UIApplication.sharedApplication.statusBarOrientation)
+            orientation(UIApplication.sharedApplication.statusBarOrientation)
+          else
+            :unknown
+          end
         end
       end
 

data/motion/core/json.rb

@@ -15,7 +15,7 @@ module BubbleWrap
     def self.parse(str_data, &block)
       return nil unless str_data
       data = str_data.respond_to?(:to_data) ? str_data.to_data : str_data
-      opts = NSJSONReadingMutableContainers & NSJSONReadingMutableLeaves & NSJSONReadingAllowFragments
+      opts = NSJSONReadingMutableContainers | NSJSONReadingMutableLeaves | NSJSONReadingAllowFragments
       error = Pointer.new(:id)
       obj = NSJSONSerialization.JSONObjectWithData(data, options:opts, error:error)
       raise ParserError, error[0].description if error[0]

data/motion/http.rb

@@ -100,6 +100,7 @@ module BubbleWrap
         @headers = escape_line_feeds(options.delete :headers)
         @format = options.delete(:format)
         @cache_policy = options.delete(:cache_policy) || NSURLRequestUseProtocolCachePolicy
+        @credential_persistence = options.delete(:credential_persistence) || NSURLCredentialPersistenceForSession
         @options = options
         @response = HTTP::Response.new
 
@@ -175,9 +176,14 @@ Cache policy: #{@cache_policy}, response: #{@response.inspect} >"
 
       def connection(connection, didReceiveAuthenticationChallenge:challenge)
         if (challenge.previousFailureCount == 0)
-          new_credential = NSURLCredential.credentialWithUser(credentials[:username], password:credentials[:password], persistence:NSURLCredentialPersistenceForSession)
-          challenge.sender.useCredential(new_credential, forAuthenticationChallenge:challenge)
-          log "auth challenged, answered with credentials: #{credentials.inspect}"
+          if credentials[:username].to_s.empty? && credentials[:password].to_s.empty?
+            challenge.sender.continueWithoutCredentialForAuthenticationChallenge(challenge)
+            log 'Continue without credentials to get 401 status in response'
+          else
+            new_credential = NSURLCredential.credentialWithUser(credentials[:username], password:credentials[:password], persistence:@credential_persistence)
+            challenge.sender.useCredential(new_credential, forAuthenticationChallenge:challenge)
+            log "auth challenged, answered with credentials: #{credentials.inspect}"
+          end
         else
           challenge.sender.cancelAuthenticationChallenge(challenge)
           log 'Auth Failed :('
@@ -286,11 +292,12 @@ Cache policy: #{@cache_policy}, response: #{@response.inspect} >"
       end
 
       def create_url(url_string)
+        url_string = url_string.stringByAddingPercentEscapesUsingEncoding NSUTF8StringEncoding
         if (@method == "GET" || @method == "HEAD") && @payload
           convert_payload_to_url if @payload.is_a?(Hash)
           url_string += "?#{@payload}"
         end
-        url = NSURL.URLWithString(url_string.stringByAddingPercentEscapesUsingEncoding NSUTF8StringEncoding)
+        url = NSURL.URLWithString(url_string)
 
         validate_url(url)
         url
@@ -302,9 +309,15 @@ Cache policy: #{@cache_policy}, response: #{@response.inspect} >"
         end
       end
 
+      def escape(string)
+        if string
+          CFURLCreateStringByAddingPercentEscapes nil, string.to_s, "[]", ";=&,", KCFStringEncodingUTF8
+        end
+      end
+
       def convert_payload_to_url
         params_array = process_payload_hash(@payload)
-        params_array.map! { |key, value| "#{key}=#{value}" }
+        params_array.map! { |key, value| "#{escape key}=#{escape value}" }
         @payload = params_array.join("&")
       end
 

data/motion/reactor.rb

@@ -50,7 +50,7 @@ module BubbleWrap
     # Defer is for integrating blocking operations into the reactor's control
     # flow.
     # Call defer with one or two blocks, the second block is optional.
-    #     operator = proc do
+    #     operation = proc do
     #       # perform a long running operation here
     #       "result"
     #     end

data/motion/ui/gestures.rb

@@ -25,40 +25,18 @@ class UIView
   def when_pressed(enableInteraction=true, &proc)
     add_gesture_recognizer_helper(UILongPressGestureRecognizer.alloc.initWithTarget(self, action:'handle_gesture:'), enableInteraction, proc)
   end
-
-
-  def whenTapped(enableInteraction=true, &proc)
-    NSLog "[DEPRECATED - whenTapped] please use when_tapped instead."
-    when_tapped(enableInteraction, &proc)
-  end
-
-  def whenPinched(enableInteraction=true, &proc)
-    NSLog "[DEPRECATED - whenPinched] please use when_pinched instead."
-    when_pinched(enableInteraction, &proc)
-  end
-
-  def whenRotated(enableInteraction=true, &proc)
-    NSLog "[DEPRECATED - whenRotated] please use when_rotated instead."
-    when_rotated(enableInteraction, &proc)
+  
+  def self.deprecated_methods
+    %w(whenTapped whenPinched whenRotated whenSwiped whenPanned whenPressed)
   end
 
-  def whenSwiped(enableInteraction=true, &proc)
-    NSLog "[DEPRECATED - whenSwiped] please use when_swiped instead."
-    when_swiped(enableInteraction, &proc)
+  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
 
-  def whenPanned(enableInteraction=true, &proc)
-    NSLog "[DEPRECATED - whenPanned] please use when_panned instead."
-    when_panned(enableInteraction, &proc)
-  end
-
-  def whenPressed(enableInteraction=true, &proc)
-    NSLog "[DEPRECATED - whenPressed] please use when_pressed instead."
-    when_pressed(enableInteraction, &proc)
-  end
-
-
-
   private
 
   def handle_gesture(recognizer)

data/spec/motion/core/app_spec.rb

@@ -182,12 +182,18 @@ describe BubbleWrap::App do
     end
   end
 
-  describe '.app' do
+  describe '.shared' do
     it 'returns UIApplication.sharedApplication' do
       App.shared.should == UIApplication.sharedApplication
     end
   end
 
+  describe '.window' do
+    it 'returns UIApplication.sharedApplication.keyWindow' do
+      App.window.should == UIApplication.sharedApplication.keyWindow
+    end
+  end
+
   describe '.run_after' do
     class DelayedRunAfterTest; attr_accessor :test_value end
 

data/spec/motion/core/device/camera_wrapper_spec.rb

@@ -1,4 +1,10 @@
 describe BubbleWrap::Device::CameraWrapper do
+  
+  before do
+    BW::Device.camera.instance_variable_set(:@front, nil)
+    BW::Device.camera.instance_variable_set(:@rear, nil)
+  end
+  
   describe 'on device with only front facing camera' do
     before do
       UIImagePickerController.instance_eval do

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

@@ -85,14 +85,20 @@ describe BubbleWrap::Device::Screen do
     end
 
     describe 'unknown' do
-      it 'returns :unknown' do
-        BW::Device::Screen.orientation(UIDeviceOrientationUnknown).should == :unknown
+      it 'returns :unknown if fallback is false' do
+        BW::Device::Screen.orientation(UIDeviceOrientationUnknown, false).should == :unknown
+      end
+      it 'returns Status bar orientation if fallback not specified' do
+        BW::Device::Screen.orientation(UIDeviceOrientationUnknown).should == BW::Device::Screen.orientation(UIApplication.sharedApplication.statusBarOrientation)
       end
     end
 
     describe 'any other input' do
-      it 'returns :unknown' do
-        BW::Device::Screen.orientation('twiggy twiggy twiggy').should == :unknown
+      it 'returns :unknown  if fallback is false' do
+        BW::Device::Screen.orientation('twiggy twiggy twiggy', false).should == :unknown
+      end
+      it 'returns Status bar orientation if fallback not specified' do
+        BW::Device::Screen.orientation('twiggy twiggy twiggy').should == BW::Device::Screen.orientation(UIApplication.sharedApplication.statusBarOrientation)
       end
     end
   end

data/spec/motion/core/device_spec.rb

@@ -16,6 +16,16 @@ describe BubbleWrap::Device do
         BW::Device.ipad?(@idiom).should == false
       end
     end
+
+    describe '.long_screen?' do
+      it 'returns true if screen is wide' do
+        BW::Device.long_screen?(@idiom, 568.0).should == true
+      end
+
+      it 'returns false if screen is not wide' do
+        BW::Device.long_screen?(@idiom, 480.0).should == false
+      end
+    end
   end
 
   describe 'on iPad' do
@@ -34,6 +44,12 @@ describe BubbleWrap::Device do
         BW::Device.ipad?(@idiom).should == true
       end
     end
+
+    describe '.long_screen?' do
+      it 'always not a widescreen' do
+        BW::Device.long_screen?(@idiom, 1024.0).should == false
+      end
+    end
   end
 
   describe '.simulator?' do
@@ -42,6 +58,13 @@ describe BubbleWrap::Device do
     end
   end
 
+  describe '.ios_version' do
+    it 'returns true' do
+      # exact value depends on system where specs run. 4.0 seems like a safe guess
+      BW::Device.ios_version.should > '4.0'
+    end
+  end
+
   describe '.screen' do
     it 'return BubbleWrap::Screen' do
       BW::Device.screen.should == BW::Device::Screen

data/spec/motion/core/json_spec.rb

@@ -36,6 +36,10 @@ EOS
       Proc.new { BW::JSON.parse(nil) }.should.not.raise Exception
     end
 
+    it "returns a mutable object" do
+      Proc.new { @parsed[:blah] = 123 }.should.not.raise Exception
+    end
+
     it "should convert a top object into a Ruby hash" do
       obj = @parsed
       obj.class.should == Hash

data/spec/motion/http_spec.rb

@@ -103,6 +103,7 @@ describe "HTTP" do
 
     before do
       @credentials = { username: 'mneorr', password: '123456xx!@crazy' }
+      @credential_persistence = 0
       @payload = {
         user: { name: 'marin', surname: 'usalj' },
         twitter: '@mneorr',
@@ -124,6 +125,7 @@ describe "HTTP" do
         files: @files,
         payload: @payload,
         credentials: @credentials,
+        credential_persistence: @credential_persistence,
         headers: @headers,
         cache_policy: @cache_policy,
         leftover_option: @leftover_option,
@@ -316,6 +318,14 @@ describe "HTTP" do
         new_query.instance_variable_get(:@cache_policy).should.equal NSURLRequestUseProtocolCachePolicy
       end
 
+      it "should delete :credential_persistence or set NSURLCredentialPersistenceForSession" do
+        @query.instance_variable_get(:@credential_persistence).should.equal @credential_persistence
+        @options.should.not.has_key? :credential_persistence
+
+        new_query = BubbleWrap::HTTP::Query.new( @localhost_url, :get, {})
+        new_query.instance_variable_get(:@credential_persistence).should.equal NSURLCredentialPersistenceForSession
+      end
+
       it "should set the rest of options{} to ivar @options" do
         @query.options.size.should.equal 1
         @query.options.values[0].should.equal @leftover_option
@@ -614,14 +624,36 @@ describe "HTTP" do
         @challenge.sender.credential.password.should.equal @credentials[:password]
       end
 
-      it "always uses NSURLCredentialPersistenceForSession" do
-        @challenge.sender.credential.persistence.should.equal NSURLCredentialPersistenceForSession
+      it "should use Credential Persistence set in options" do
+        @challenge.sender.credential.persistence.should.equal @credential_persistence
+      end
+
+      it 'should continue without credentials when no credentials provided' do
+        @options.delete :credentials
+        @query = BubbleWrap::HTTP::Query.new( @localhost_url , :get, @options )
+        @query.connection(nil, didReceiveAuthenticationChallenge:@challenge)
+        @challenge.sender.continue_without_credential.should.equal true
+      end
+
+    end
+
+    describe "properly format payload to url get query string" do
+
+      before do
+        @payload = {"we love" => '#==Rock&Roll==#', "radio" => "Ga Ga", "qual" => 3.0, "incr" => -1}
+        @url_string = 'http://fake.url/method'
+        @get_query = BubbleWrap::HTTP::Query.new( @url_string, :get, :payload => @payload)
+        @escaped_url = "http://fake.url/method?we%20love=%23%3D%3DRock%26Roll%3D%3D%23&radio=Ga%20Ga&qual=3.0&incr=-1"
+      end
+
+      it "should escape \#=& characters only in keys and values" do
+        @get_query.instance_variable_get(:@url).description.should.equal @escaped_url
       end
 
     end
 
     class FakeSender
-      attr_reader :challenge, :credential, :was_cancelled
+      attr_reader :challenge, :credential, :was_cancelled, :continue_without_credential
       def cancelAuthenticationChallenge(challenge)
         @was_cancelled = true
       end
@@ -629,6 +661,9 @@ describe "HTTP" do
         @challenge = challenge
         @credential = credential
       end
+      def continueWithoutCredentialForAuthenticationChallenge(challenge)
+        @continue_without_credential = true
+      end
     end
 
     class FakeChallenge

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bubble-wrap
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-26 00:00:00.000000000 Z
+date: 2013-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
@@ -289,21 +289,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -27678325849561073
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -27678325849561073
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: RubyMotion wrappers and helpers (Ruby for iOS) - Making Cocoa APIs more Ruby
@@ -336,3 +330,4 @@ test_files:
 - spec/motion/reactor/eventable_spec.rb
 - spec/motion/reactor_spec.rb
 - spec/motion/rss_parser_spec.rb
+has_rdoc: