bubble-wrap 1.1.2 → 1.1.3

data/motion/location/location.rb

@@ -117,8 +117,8 @@ module BubbleWrap
           if @retries > @options[:retries]
             error(Error::LOCATION_UNKNOWN)
           else
-            self.locationManager.stopUpdatingLocation
-            self.locationManager.startUpdatingLocation
+            self.location_manager.stopUpdatingLocation
+            self.location_manager.startUpdatingLocation
           end
         when KCLErrorNetwork
           error(Error::NETWORK_FAILURE)

data/motion/media/media.rb

@@ -0,0 +1,15 @@
+module BubbleWrap
+  module Media
+    module_function
+
+    def play_modal(*args, &block)
+      Media::Player.new.retain.send(:play_modal, *args, &block)
+    end
+
+    def play(*args, &block)
+      Media::Player.new.retain.send(:play, *args, &block)
+    end
+  end
+end
+
+::Media = BubbleWrap::Media

data/motion/media/player.rb

@@ -0,0 +1,139 @@
+module BubbleWrap
+  module Media
+    module Error
+      class InvalidPlayerType < StandardError; end
+      class NilPlayerCallback < StandardError; end
+    end
+
+    class Player
+      attr_reader :media_player
+      ############
+      # Playing Media
+
+      # Plays media in the system-default modal controller
+      # Takes same parameters as #play
+      # NOTE: If you don't supply a :controller option,
+      # the rootViewController will be used.
+      def play_modal(content_url, options = {})
+        play(content_url, options.merge(modal: true))
+      end
+
+      # @param [String, NSURL] content_url is either a local or remote string
+      #   for the location of the media you're playing.
+      #   NOTE: if you're playing a remote file, your server needs to support
+      #   range requests for that URL.
+      #
+      # @param [Hash] options to open the MPMoviePlayerController with
+      # the form {
+      #   ### These are properties of MPMoviePlayerController
+      #   allows_air_play: true/false; default false,
+      #   control_style: [MPMovieControlStyle]; default MPMovieControlStyleDefault,
+      #   end_playback_time: [Integer] end time (in seconds) for media; default is -1,
+      #   initial_playback_time: [Integer] start time (in seconds) for media; default is -1,
+      #   movie_source_type: [MPMovieSourceType] a "hint" so the player knows how to load the data type;
+      #     either MPMovieSourceTypeFile or MPMovieSourceTypeStreaming; default is MPMovieSourceTypeUnknown
+      #     which may delay playback,
+      #   repeat_mode: [MPMovieRepeatMode] how the player repeats at the end of playback; defautl is
+      #     MPMovieRepeatModeNone
+      #   scaling_mode: [MPMovieScalingMode] scaling mode for movies; default is MPMovieScalingModeAspectFit
+      #   should_autoplay: true/false; default true,
+      #   use_application_audio_session: true/false; default true.
+      #
+      #   ### These are properties of just the ::Player
+      #   delay_play: true/false, default false. If false then you have to manually call
+      #     @media_player.play in your code
+      #   modal: true/false; default false,
+      #   controller: [UIViewController] used to present the player modally;
+      #     default uses root view controller of window
+      # }
+      #
+      # @block for when setup is done; use this block to present
+      #   @media_player.view if options[:modal] == false
+      #
+      # EX
+      #  From a local URL:
+      #    file = File.join(App.resources_path, 'test.mp3')
+      #    BW::Media::Player.play(NSURL.fileURLWithPath(file)) do |media_player|
+      #      media_player.view.frame = some_view.bounds
+      #      self.view.addSubview media_player.view
+      #    end
+      #
+      #  From a remote URL:
+      #    BW::Media::Player.play("http://www.hrupin.com/wp-content/uploads/mp3/testsong_20_sec.mp3") do |media_player|
+      #      media_player.view.frame = some_view.bounds
+      #      self.view.addSubview media_player.view
+      #    end
+      def play(content_url, options = {}, &block)
+        display_modal = !!options[:modal]
+
+        klass = display_modal ? MPMoviePlayerViewController : MPMoviePlayerController
+
+        content_url = content_url.is_a?(NSURL) ? content_url : NSURL.URLWithString(content_url)
+        @media_player = klass.alloc.initWithContentURL(content_url)
+
+        self.media_player.prepareToPlay if not display_modal
+
+        options[:delay_play] = false if not options.has_key? :delay_play
+        set_player_options(options)
+
+        NSNotificationCenter.defaultCenter.observe MPMoviePlayerPlaybackDidFinishNotification do |notification|
+          h = notification.userInfo
+          error = h["error"]
+          if error
+            p "BW::Media::Player error: #{error.userInfo.inspect}"
+            p "Code: #{error.code}, Domain: #{error.domain}"
+          end
+        end
+
+        if display_modal
+          @presenting_controller = options[:controller]
+          @presenting_controller ||= UIApplication.sharedApplication.keyWindow.rootViewController
+          @presenting_controller.presentMoviePlayerViewControllerAnimated(@media_player)
+        else
+          if block.nil?
+            raise Error::NilPlayerCallback, "no block callback given in #play; you need\
+                                              to supply one if options[:modal] == false"
+          end
+          block.call(@media_player)
+        end
+
+        if not display_modal and not options[:delay_play]
+          @media_player.play
+        end
+      end
+
+      # Stops playback for a Media::Player
+      def stop
+        if @media_player.is_a? MPMoviePlayerViewController
+          @presenting_controller.dismissMoviePlayerViewControllerAnimated
+          @presenting_controller = nil
+        else
+          @media_player.stop
+        end
+        @media_player = nil
+      end
+
+      def media_player
+        if @media_player.is_a? MPMoviePlayerViewController
+          return @media_player.moviePlayer
+        end
+        @media_player
+      end
+
+      private
+      # RubyMotion has a problem calling some objective-c methods at runtime, so we can't
+      # do any cool `camelize` tricks.
+      def set_player_options(options)
+        self.media_player.allowsAirPlay = options[:allows_air_play] if options.has_key? :allows_air_play
+        self.media_player.controlStyle = options[:control_style] if options.has_key? :control_style
+        self.media_player.endPlaybackTime = options[:end_playback_time] if options.has_key? :end_playback_time
+        self.media_player.initialPlaybackTime = options[:initial_playback_time] if options.has_key? :initial_playback_time
+        self.media_player.movieSourceType = options[:movie_source_type] if options.has_key? :movie_source_type
+        self.media_player.repeatMode = options[:repeat_mode] if options.has_key? :repeat_mode
+        self.media_player.scalingMode = options[:scaling_mode] if options.has_key? :scaling_mode
+        self.media_player.shouldAutoplay = options[:should_autoplay] if options.has_key? :should_autoplay
+        self.media_player.useApplicationAudioSession = options[:use_application_audio_session] if options.has_key? :use_application_audio_session
+      end
+    end
+  end
+end

data/motion/test_suite_delegate.rb

@@ -4,6 +4,7 @@ class TestSuiteDelegate
   def application(application, didFinishLaunchingWithOptions:launchOptions)
     @window = UIWindow.alloc.initWithFrame(UIScreen.mainScreen.bounds)
     @window.rootViewController = UIViewController.alloc.init
+    @window.makeKeyAndVisible
     true
   end
 end

data/samples/camera/Gemfile

@@ -0,0 +1,3 @@
+source :rubygems
+
+gem 'bubble-wrap', '~> 1.1.0'

data/samples/camera/README.md

@@ -0,0 +1,4 @@
+## Location Demo
+
+A bubble-wrap demo to show how to use location API.
+

data/samples/camera/Rakefile

@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+$:.unshift("/Library/RubyMotion/lib")
+require 'motion/project'
+require 'bubble-wrap/core'
+require 'bubble-wrap/camera'
+
+Motion::Project::App.setup do |app|
+  app.name = 'camera'
+end

data/samples/camera/app/app_delegate.rb

@@ -0,0 +1,8 @@
+class AppDelegate
+  def application(application, didFinishLaunchingWithOptions:launchOptions)
+    @window = UIWindow.alloc.initWithFrame(UIScreen.mainScreen.bounds)
+    camera_controller = CameraController.alloc.initWithNibName(nil, bundle:nil)
+    @window.rootViewController = camera_controller
+    @window.makeKeyAndVisible
+  end
+end

data/samples/camera/app/controllers/camera_controller.rb

@@ -0,0 +1,61 @@
+class CameraController < UIViewController
+
+  def viewDidLoad
+    super
+
+    @buttons = []
+
+    @library = UIButton.buttonWithType(UIButtonTypeRoundedRect)
+    @library.setTitle("Library", forState:UIControlStateNormal)
+    @library.sizeToFit
+    @library.when UIControlEventTouchUpInside do
+      BW::Device.camera.any.picture(media_types: [:image]) do |result|
+        image_view = UIImageView.alloc.initWithImage(result[:original_image])
+        add_image_view(image_view)
+      end
+    end
+    self.view.addSubview(@library)
+    @buttons << @library
+
+    if BW::Device.camera.front?
+      @front = UIButton.buttonWithType(UIButtonTypeRoundedRect)
+      @front.setTitle("Front", forState:UIControlStateNormal)
+      @front.sizeToFit
+      last_button = @buttons.last
+      @front.frame = [[last_button.frame.origin.x, last_button.frame.origin.y + last_button.frame.size.height + 10], @front.frame.size]
+      @front.when UIControlEventTouchUpInside do
+        BW::Device.camera.front.picture(media_types: [:image]) do |result|
+          image_view = UIImageView.alloc.initWithImage(result[:original_image])
+          add_image_view(image_view)
+        end
+      end
+      self.view.addSubview(@front)
+      @buttons << @front
+    end
+
+    if BW::Device.camera.rear?
+      @rear = UIButton.buttonWithType(UIButtonTypeRoundedRect)
+      @rear.setTitle("Read", forState:UIControlStateNormal)
+      @rear.sizeToFit
+      last_button = @buttons.last
+      @rear.frame = [[last_button.frame.origin.x, last_button.frame.origin.y + last_button.frame.size.height + 10], @rear.frame.size]
+      @rear.when UIControlEventTouchUpInside do
+        BW::Device.camera.rear.picture(media_types: [:image]) do |result|
+          image_view = UIImageView.alloc.initWithImage(result[:original_image])
+          add_image_view(image_view)
+        end
+      end
+      self.view.addSubview(@rear)
+      @buttons << @rear
+    end
+  end
+
+  def add_image_view(image_view)
+    image_view.frame = [CGPointZero, self.view.frame.size]
+    image_view.center = [self.view.frame.size.width / 2, self.view.frame.size.height / 2]
+    self.view.addSubview(image_view)
+    @buttons.each do |button|
+      self.view.bringSubviewToFront(button)
+    end
+  end
+end

data/samples/camera/spec/main_spec.rb

@@ -0,0 +1,9 @@
+describe "Application 'google_location'" do
+  before do
+    @app = UIApplication.sharedApplication
+  end
+
+  it "has one window" do
+    @app.windows.size.should == 1
+  end
+end

data/samples/location/.gitignore

@@ -0,0 +1,5 @@
+.repl_history
+build
+resources/*.nib
+resources/*.momd
+resources/*.storyboardc

data/samples/location/Gemfile

@@ -0,0 +1,3 @@
+source :rubygems
+
+gem 'bubble-wrap', '~> 1.1.0'

data/samples/location/README.md

@@ -0,0 +1,4 @@
+## Location Demo
+
+A bubble-wrap demo to show how to use location API.
+

data/samples/location/Rakefile

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

data/samples/location/app/app_delegate.rb

@@ -0,0 +1,8 @@
+class AppDelegate
+  def application(application, didFinishLaunchingWithOptions:launchOptions)
+    @window = UIWindow.alloc.initWithFrame(UIScreen.mainScreen.bounds)
+    places_list_controller = PlacesListController.alloc.init
+    @window.rootViewController = places_list_controller
+    @window.makeKeyAndVisible
+  end
+end

data/samples/location/app/controllers/image_list_controller.rb

@@ -0,0 +1,30 @@
+class PlacesListController < UITableViewController
+  attr_accessor :places_list
+
+  def viewDidLoad
+    @places_list = []
+    Places.load(self)
+    view.dataSource = view.delegate = self
+  end 
+
+  def viewWillAppear(animated)
+    view.reloadData
+  end
+
+  def tableView(tableView, numberOfRowsInSection:section)
+    @places_list.size
+  end
+
+  def reloadData
+    view.reloadData
+  end
+
+  CellID = 'CellIdentifier'
+  def tableView(tableView, cellForRowAtIndexPath:indexPath)
+    cell = tableView.dequeueReusableCellWithIdentifier(CellID) || UITableViewCell.alloc.initWithStyle(UITableViewCellStyleSubtitle, reuseIdentifier:CellID)
+    placeItem= @places_list[indexPath.row]
+    cell.textLabel.text = placeItem
+    cell
+  end
+
+end

data/samples/location/app/models/places.rb

@@ -0,0 +1,15 @@
+class Places
+  API_KEY = ""
+  #See google places documentation at https://developers.google.com/places/documentation/ to obtain a key
+
+  def self.load(places_list_controller)
+    BW::Location.get do |result|
+      BW::Location.stop
+      BubbleWrap::HTTP.get("https://maps.googleapis.com/maps/api/place/search/json?location=#{result[:to].latitude},#{result[:to].longitude}&radius=500&sensor=false&key=#{API_KEY}") do |response|
+        names = BW::JSON.parse(response.body.to_str)["results"].map{|r| r["name"]}
+        places_list_controller.places_list = names  
+        places_list_controller.reloadData
+      end
+    end
+  end
+end

data/samples/location/spec/main_spec.rb

@@ -0,0 +1,9 @@
+describe "Application 'google_location'" do
+  before do
+    @app = UIApplication.sharedApplication
+  end
+
+  it "has one window" do
+    @app.windows.size.should == 1
+  end
+end

data/spec/motion/core/app_spec.rb

@@ -25,7 +25,7 @@ describe BubbleWrap::App do
 
   describe '.alert' do
     after do
-      @alert.removeFromSuperview
+      @alert.dismissWithClickedButtonIndex(@alert.cancelButtonIndex, animated: false)
     end
 
     describe "with only one string argument" do
@@ -176,6 +176,12 @@ describe BubbleWrap::App do
     end
   end
 
+  describe '.app' do
+    it 'returns UIApplication.sharedApplication' do
+      BW::App.shared.should == UIApplication.sharedApplication
+    end
+  end
+
   describe '.run_after' do
     class DelayedRunAfterTest; attr_accessor :test_value end
 

data/spec/motion/core/json_spec.rb

@@ -32,6 +32,10 @@ EOS
       @parsed = BubbleWrap::JSON.parse(@json_string)
     end
 
+    it "doesn't crash when data is nil" do
+      Proc.new { BW::JSON.parse(nil) }.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/core/persistence_spec.rb

@@ -1,7 +1,7 @@
 describe BubbleWrap::Persistence do
 
   describe '.app_key' do
-    
+
     it "caches the @app_key" do
       BubbleWrap::Persistence.instance_variable_get(:@app_key).should.equal nil
       BubbleWrap::Persistence.app_key
@@ -21,7 +21,7 @@ describe BubbleWrap::Persistence do
         BubbleWrap::Persistence['arbitraryNumber'] = 42
       end.
         should.not.raise(Exception)
-    end 
+    end
 
     it "must call synchronize" do
       storage = NSUserDefaults.standardUserDefaults
@@ -29,7 +29,7 @@ describe BubbleWrap::Persistence do
 
       BubbleWrap::Persistence['arbitraryNumber'] = 42
       storage.instance_variable_get(:@sync_was_called).should.equal true
-    end 
+    end
   end
 
   describe "storing multiple objects" do
@@ -60,5 +60,9 @@ describe BubbleWrap::Persistence do
       BubbleWrap::Persistence['arbitraryNumber'].should == 42
       BubbleWrap::Persistence[:arbitraryString].should == 'test string'
     end
+
+    it 'returns fully functional strings' do
+      BubbleWrap::Persistence[:arbitraryString].methods.should == 'test string'.methods
+    end
   end
 end