bubble-wrap 1.2.0 → 1.3.0.osx

data/lib/bubble-wrap/location.rb

@@ -1,8 +1,11 @@
 require 'bubble-wrap/loader'
-BubbleWrap.require('motion/util/constants.rb')
-BubbleWrap.require('motion/core/string.rb')
-BubbleWrap.require('motion/location/**/*.rb') do
-  file('motion/location/pollute.rb').depends_on 'motion/location/location.rb'
-  file('motion/location/location.rb').depends_on 'motion/util/constants.rb'
-  file('motion/location/location.rb').uses_framework('CoreLocation')
+
+BubbleWrap.require_ios("location") do
+  BubbleWrap.require('motion/util/constants.rb')
+  BubbleWrap.require('motion/core/string.rb')
+  BubbleWrap.require('motion/location/**/*.rb') do
+    file('motion/location/pollute.rb').depends_on 'motion/location/location.rb'
+    file('motion/location/location.rb').depends_on 'motion/util/constants.rb'
+    file('motion/location/location.rb').uses_framework('CoreLocation')
+  end
 end

data/lib/bubble-wrap/media.rb

@@ -1,8 +1,12 @@
 require 'bubble-wrap/loader'
-BubbleWrap.require('motion/core/string.rb')
-BubbleWrap.require('motion/core/ns_notification_center.rb')
-BubbleWrap.require('motion/media/**/*.rb') do
-  file('motion/media/media.rb').depends_on('motion/media/player.rb')
-  file('motion/media/player.rb').depends_on 'motion/core/string.rb'
-  file('motion/media/player.rb').uses_framework('MediaPlayer')
+
+BubbleWrap.require_ios("media") do
+  BubbleWrap.require('motion/core/app.rb')
+  BubbleWrap.require('motion/core/string.rb')
+  BubbleWrap.require('motion/core/ns_notification_center.rb')
+  BubbleWrap.require('motion/media/**/*.rb') do
+    file('motion/media/media.rb').depends_on('motion/media/player.rb')
+    file('motion/media/player.rb').depends_on 'motion/core/string.rb'
+    file('motion/media/player.rb').uses_framework('MediaPlayer')
+  end
 end

data/lib/bubble-wrap/test.rb

@@ -1,8 +1,13 @@
 require 'bubble-wrap/loader'
+BW.require 'motion/util/*.rb'
 BW.require 'motion/test_suite_delegate.rb'
 
 Motion::Project::App.setup do |app|
   app.development do
-    app.delegate_class = 'TestSuiteDelegate'
+    if Motion::Project::App.osx?
+      app.delegate_class = 'TestSuiteOSXDelegate'
+    else
+      app.delegate_class = 'TestSuiteDelegate'
+    end
   end
 end

data/lib/bubble-wrap/ui.rb

@@ -1,4 +1,7 @@
 require 'bubble-wrap/loader'
-BubbleWrap.require('motion/ui/**/*.rb') do 
-  file('motion/ui/pollute.rb').depends_on 'motion/ui/ui_control.rb'
+
+BubbleWrap.require_ios("ui") do
+  BubbleWrap.require('motion/ui/**/*.rb') do
+    file('motion/ui/pollute.rb').depends_on 'motion/ui/ui_control.rb'
+  end
 end

data/lib/bubble-wrap/version.rb

@@ -1,9 +1,4 @@
 module BubbleWrap
-  VERSION = '1.2.0' unless defined?(BubbleWrap::VERSION)
-  MIN_MOTION_VERSION = '1.24'
-
-  module_function
-  def minor_version(version_str)
-    version_str.split(".")[1].to_i
-  end
+  VERSION = '1.3.0.osx' unless defined?(BubbleWrap::VERSION)
+  MIN_MOTION_VERSION = '1.36'
 end

data/motion/core.rb

@@ -8,7 +8,12 @@ module BubbleWrap
 
   # @return [UIcolor]
   def rgba_color(r,g,b,a)
-    UIColor.colorWithRed((r/255.0), green:(g/255.0), blue:(b/255.0), alpha:a)
+    r,g,b = [r,g,b].map { |i| i / 255.0}
+    if App.osx?
+      NSColor.colorWithDeviceRed(r, green: g, blue: b, alpha: a)
+    else
+      UIColor.colorWithRed(r, green: g, blue:b, alpha:a)
+    end
   end
 
   def localized_string(key, value)

data/motion/core/app.rb

@@ -26,34 +26,6 @@ module BubbleWrap
       NSUserDefaults.standardUserDefaults
     end
 
-    # Displays a UIAlertView.
-    #
-    # title - The title as a String.
-    # args  - The title of the cancel button as a String, or a Hash of options.
-    #         (Default: { cancel_button_title: 'OK' })
-    #         cancel_button_title - The title of the cancel button as a String.
-    #         message             - The main message as a String.
-    # block - Yields the alert object if a block is given, and does so before the alert is shown.
-    def alert(title, *args, &block)
-      options = { cancel_button_title: 'OK' }
-      options.merge!(args.pop) if args.last.is_a?(Hash)
-
-      if args.size > 0 && args.first.is_a?(String)
-        options[:cancel_button_title] = args.shift
-      end
-
-      alert = UIAlertView.alloc.initWithTitle title,
-        message: options[:message],
-        delegate: nil,
-        cancelButtonTitle: options[:cancel_button_title],
-        otherButtonTitles: nil
-
-      yield(alert) if block_given?
-
-      alert.show
-      alert
-    end
-
     # Executes a block after a certain delay
     # Usage example:
     #   App.run_after(0.5) {  p "It's #{Time.now}"   }
@@ -65,17 +37,6 @@ module BubbleWrap
                                               repeats: false)
     end
 
-    # Opens an url (string or instance of `NSURL`)
-    # in the device's web browser.
-    # Usage Example:
-    #   App.open_url("http://matt.aimonetti.net")
-    def open_url(url)
-      unless url.is_a?(NSURL)
-        url = NSURL.URLWithString(url)
-      end
-      UIApplication.sharedApplication.openURL(url)
-    end
-
     @states = {}
 
     def states
@@ -94,31 +55,6 @@ module BubbleWrap
       NSBundle.mainBundle.infoDictionary['CFBundleVersion']
     end
 
-    # Return application frame
-    def frame
-      UIScreen.mainScreen.applicationFrame
-    end
-
-    # Main Screen bounds. Useful when starting the app
-    def bounds
-      UIScreen.mainScreen.bounds
-    end
-
-    # Application Delegate
-    def delegate
-      UIApplication.sharedApplication.delegate
-    end
-
-    # the Application object.
-    def shared
-      UIApplication.sharedApplication
-    end
-
-    # the Application Window
-    def window
-      UIApplication.sharedApplication.keyWindow || UIApplication.sharedApplication.windows[0]
-    end
-
     # @return [NSLocale] locale of user settings
     def current_locale
       languages = NSLocale.preferredLanguages
@@ -146,6 +82,9 @@ module BubbleWrap
       environment == 'release'
     end
 
+    def osx?
+      Kernel.const_defined?(:NSApplication)
+    end
   end
 end
 ::App = BubbleWrap::App unless defined?(::App)

data/motion/core/device.rb

@@ -2,55 +2,6 @@ module BubbleWrap
   module Device
     module_function
 
-    # Verifies that the device running the app is an iPhone.
-    # @return [TrueClass, FalseClass] true will be returned if the device is an iPhone, false otherwise.
-    def iphone?(idiom=UIDevice.currentDevice.userInterfaceIdiom)
-      idiom == UIUserInterfaceIdiomPhone
-    end
-
-    # Verifies that the device running the app is an iPad.
-    # @return [TrueClass, FalseClass] true will be returned if the device is an iPad, false otherwise.
-    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
-    # @return [Device::Camera::CameraWrapper]
-    def camera
-      BubbleWrap::Device::CameraWrapper
-    end
-
-    # Verifies that the device running has a front facing camera.
-    # @return [TrueClass, FalseClass] true will be returned if the device has a front facing camera, false otherwise.
-    def front_camera?(picker=UIImagePickerController)
-      p "This method (front_camera?) is DEPRECATED. Transition to using Device.camera.front?"
-      picker.isCameraDeviceAvailable(UIImagePickerControllerCameraDeviceFront)
-    end
-
-    # Verifies that the device running has a rear facing camera.
-    # @return [TrueClass, FalseClass] true will be returned if the device has a rear facing camera, false otherwise.
-    def rear_camera?(picker=UIImagePickerController)
-      p "This method (rear_camera?) is DEPRECATED. Transition to using Device.camera.rear?"
-      picker.isCameraDeviceAvailable(UIImagePickerControllerCameraDeviceRear)
-    end
-
-    def simulator?
-      @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
@@ -60,12 +11,6 @@ module BubbleWrap
     def retina?
       screen.retina?
     end
-
-    # Delegates to BubbleWrap::Screen.orientation
-    def orientation
-      screen.orientation
-    end
-
   end
 end
 ::Device = BubbleWrap::Device unless defined?(::Device)

data/motion/core/device/ios/screen.rb

@@ -0,0 +1,75 @@
+module BubbleWrap
+  module Device
+    module Screen
+
+      module_function
+
+      # Certifies that the device running the app has a Retina display
+      # @return [TrueClass, FalseClass] true will be returned if the device has a Retina display, false otherwise.
+      def retina?(screen=UIScreen.mainScreen)
+        if screen.respondsToSelector('displayLinkWithTarget:selector:') && screen.scale == 2.0
+          true
+        else
+          false
+        end
+      end
+
+      # 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, fallback=true)
+        case device_orientation
+        when UIDeviceOrientationPortrait then :portrait
+        when UIDeviceOrientationPortraitUpsideDown then :portrait_upside_down
+        when UIDeviceOrientationLandscapeLeft then :landscape_left
+        when UIDeviceOrientationLandscapeRight then :landscape_right
+        when UIDeviceOrientationFaceUp then :face_up
+        when UIDeviceOrientationFaceDown then :face_down
+        else
+          # 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
+
+      # The width of the device's screen.
+      # The real resolution is dependant on the scale
+      # factor (see `retina?`) but the coordinate system
+      # is in non-retina pixels. You can get pixel
+      # accuracy by using half-coordinates.
+      # This is a Float
+      def width
+        UIScreen.mainScreen.bounds.size.width
+      end
+
+      # The height of the device's screen.
+      # The real resolution is dependant on the scale
+      # factor (see `retina?`) but the coordinate system
+      # is in non-retina pixels. You can get pixel
+      # accuracy by using half-coordinates.
+      # This is a Float
+      def height
+        UIScreen.mainScreen.bounds.size.height
+      end
+
+      # The same as `.width` and `.height` but
+      # compensating for screen rotation (which
+      # can do your head in).
+      def width_for_orientation(o=orientation)
+        return height if (o == :landscape_left) || (o == :landscape_right) 
+        width
+      end
+
+      # The same as `.width` and `.height` but
+      # compensating for screen rotation (which
+      # can do your head in).
+      def height_for_orientation(o=orientation)
+        return width if (o == :landscape_left) || (o == :landscape_right) 
+        height
+      end
+    end
+  end
+end

data/motion/core/device/osx/screen.rb

@@ -0,0 +1,18 @@
+module BubbleWrap
+  module Device
+    module Screen
+
+      module_function
+
+      # Certifies that the device running the app has a Retina display
+      # @return [TrueClass, FalseClass] true will be returned if the device has a Retina display, false otherwise.
+      def retina?(screen=NSScreen.mainScreen)
+        if screen.respondsToSelector('backingScaleFactor') && screen.backingScaleFactor == 2.0
+          true
+        else
+          false
+        end
+      end
+    end
+  end
+end

data/motion/core/device/screen.rb

@@ -2,74 +2,6 @@ module BubbleWrap
   module Device
     module Screen
 
-      module_function
-
-      # Certifies that the device running the app has a Retina display
-      # @return [TrueClass, FalseClass] true will be returned if the device has a Retina display, false otherwise.
-      def retina?(screen=UIScreen.mainScreen)
-        if screen.respondsToSelector('displayLinkWithTarget:selector:') && screen.scale == 2.0
-          true
-        else
-          false
-        end
-      end
-
-      # 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, fallback=true)
-        case device_orientation
-        when UIDeviceOrientationPortrait then :portrait
-        when UIDeviceOrientationPortraitUpsideDown then :portrait_upside_down
-        when UIDeviceOrientationLandscapeLeft then :landscape_left
-        when UIDeviceOrientationLandscapeRight then :landscape_right
-        when UIDeviceOrientationFaceUp then :face_up
-        when UIDeviceOrientationFaceDown then :face_down
-        else
-          # 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
-
-      # The width of the device's screen.
-      # The real resolution is dependant on the scale
-      # factor (see `retina?`) but the coordinate system
-      # is in non-retina pixels. You can get pixel
-      # accuracy by using half-coordinates.
-      # This is a Float
-      def width
-        UIScreen.mainScreen.bounds.size.width
-      end
-
-      # The height of the device's screen.
-      # The real resolution is dependant on the scale
-      # factor (see `retina?`) but the coordinate system
-      # is in non-retina pixels. You can get pixel
-      # accuracy by using half-coordinates.
-      # This is a Float
-      def height
-        UIScreen.mainScreen.bounds.size.height
-      end
-
-      # The same as `.width` and `.height` but
-      # compensating for screen rotation (which
-      # can do your head in).
-      def width_for_orientation(o=orientation)
-        return height if (o == :landscape_left) || (o == :landscape_right) 
-        width
-      end
-
-      # The same as `.width` and `.height` but
-      # compensating for screen rotation (which
-      # can do your head in).
-      def height_for_orientation(o=orientation)
-        return width if (o == :landscape_left) || (o == :landscape_right) 
-        height
-      end
     end
   end
-end
+end

data/motion/core/ios/app.rb

@@ -0,0 +1,71 @@
+module BubbleWrap
+  module App
+    module_function
+
+    # Opens an url (string or instance of `NSURL`)
+    # in the device's web browser.
+    # Usage Example:
+    #   App.open_url("http://matt.aimonetti.net")
+    def open_url(url)
+      unless url.is_a?(NSURL)
+        url = NSURL.URLWithString(url)
+      end
+      UIApplication.sharedApplication.openURL(url)
+    end
+
+    # Displays a UIAlertView.
+    #
+    # title - The title as a String.
+    # args  - The title of the cancel button as a String, or a Hash of options.
+    #         (Default: { cancel_button_title: 'OK' })
+    #         cancel_button_title - The title of the cancel button as a String.
+    #         message             - The main message as a String.
+    # block - Yields the alert object if a block is given, and does so before the alert is shown.
+    #
+    # Returns an instance of BW::UIAlertView
+    def alert(title, *args, &block)
+      options = { cancel_button_title: 'OK' }
+      options.merge!(args.pop) if args.last.is_a?(Hash)
+
+      if args.size > 0 && args.first.is_a?(String)
+        options[:cancel_button_title] = args.shift
+      end
+
+      options[:title]               = title
+      options[:buttons]             = options[:cancel_button_title]
+      options[:cancel_button_index] = 0 # FIXME: alerts don't have "Cancel" buttons
+
+      alert = UIAlertView.default(options)
+
+      yield(alert) if block_given?
+
+      alert.show
+      alert
+    end
+
+    # Return application frame
+    def frame
+      UIScreen.mainScreen.applicationFrame
+    end
+
+    # Main Screen bounds. Useful when starting the app
+    def bounds
+      UIScreen.mainScreen.bounds
+    end
+
+    # Application Delegate
+    def delegate
+      UIApplication.sharedApplication.delegate
+    end
+
+    # the Application object.
+    def shared
+      UIApplication.sharedApplication
+    end
+
+    # the Application Window
+    def window
+      UIApplication.sharedApplication.keyWindow || UIApplication.sharedApplication.windows[0]
+    end
+  end
+end