ProMotion 0.7.8 → 1.0.0

data/spec/helpers/table_screen_formotion.rb

@@ -0,0 +1,25 @@
+class TestFormotionScreen < PM::FormotionScreen
+
+  title "Formotion Test"
+
+  def table_data
+    @data ||= {
+      sections: [{
+        title: "Currency",
+        key: :currency,
+        select_one: true,
+        rows: [{
+          title: "EUR",
+          key: :eur,
+          value: true,
+          type: :check
+        }, {
+          title: "USD",
+          key: :usd,
+          type: :check
+        }]
+      }]
+    }
+  end
+
+end

data/spec/helpers/table_screen_indexable.rb

@@ -0,0 +1,13 @@
+class TableScreenIndexable < PM::TableScreen
+  indexable
+
+  def table_data
+    %w{ Apple Google Microsoft Oracle Sun UNIX }.map do |group_name|
+      {
+        title: "#{group_name} Group",
+        cells: [{ title: "Single cell for group #{group_name}" }]
+      }
+    end
+  end
+
+end

data/spec/helpers/test_delegate.rb

@@ -1,6 +1,34 @@
 class TestDelegate < ProMotion::Delegate
   status_bar false
 
+  attr_accessor :called_on_load, :called_will_load, :called_on_activate, :called_will_deactivate, :called_on_enter_background, :called_will_enter_foreground, :called_on_unload
+
   def on_load(app, options)
+    self.called_on_load = true
+  end
+
+  def will_load(application, launch_options)
+    self.called_will_load = true
+  end
+
+  def on_activate
+    self.called_on_activate = true
+  end
+
+  def will_deactivate
+    self.called_will_deactivate = true
   end
+
+  def on_enter_background
+    self.called_on_enter_background = true
+  end
+
+  def will_enter_foreground
+    self.called_will_enter_foreground = true
+  end
+
+  def on_unload
+    self.called_on_unload = true
+  end
+
 end

data/spec/helpers/web_screen.rb

@@ -0,0 +1,22 @@
+class TestWebScreen < PM::WebScreen
+
+  title "WebScreen Test"
+
+  attr_accessor :load_started, :load_failed, :load_finished, :load_failed_error
+
+  def load_started
+    self.load_started = true
+  end
+
+  def load_finished
+    self.load_finished = true
+  end
+
+  def load_failed(error)
+    puts "Load Failed: #{error.localizedDescription}"
+    puts error.localizedFailureReason
+    self.load_failed = true
+    self.load_failed_error = error
+  end
+
+end

data/spec/unit/delegate_spec.rb

@@ -13,7 +13,7 @@ describe "PM::Delegate" do
 
   it "should handle push notifications" do
 
-    @subject.mock!(:on_push_notification) do |notification|
+    @subject.mock!(:on_push_notification) do |notification, was_launched|
       notification.should.be.kind_of(PM::PushNotification)
       notification.alert.should == "Eating Bacon"
       notification.badge.should == 42
@@ -22,17 +22,66 @@ describe "PM::Delegate" do
     end
 
     launch_options = { UIApplicationLaunchOptionsRemoteNotificationKey => PM::PushNotification.fake_notification(alert: "Eating Bacon", badge: 42, sound: "jamon").notification }
-    @subject.application(nil, didFinishLaunchingWithOptions:launch_options )
+    @subject.application(UIApplication.sharedApplication, willFinishLaunchingWithOptions: nil)
+    @subject.application(UIApplication.sharedApplication, didFinishLaunchingWithOptions:launch_options )
 
   end
 
   it "should set home_screen when opening a new screen" do
-
+    @subject.application(UIApplication.sharedApplication, willFinishLaunchingWithOptions: nil)
     @subject.application(UIApplication.sharedApplication, didFinishLaunchingWithOptions: nil)
-    @subject.open BasicScreen.new(nav_bar: true)
+    screen = @subject.open BasicScreen.new(nav_bar: true)
     @subject.home_screen.should.be.kind_of BasicScreen
     @subject.window.rootViewController.should.be.kind_of UINavigationController
+    screen.should.be.kind_of BasicScreen
+  end
 
+  it "should call will_load on launch" do
+    @subject.called_will_load.should == nil
+    @subject.application(UIApplication.sharedApplication, willFinishLaunchingWithOptions: nil)
+    @subject.called_will_load.should == true
+  end
+
+  it "should call will_deactivate when quitting" do
+    @subject.application(UIApplication.sharedApplication, willFinishLaunchingWithOptions: nil)
+    @subject.application(UIApplication.sharedApplication, didFinishLaunchingWithOptions: nil)
+    @subject.called_will_deactivate.should == nil
+    @subject.applicationWillResignActive(UIApplication.sharedApplication)
+    @subject.called_will_deactivate.should == true
+  end
+
+  it "should call on_activate when resuming from an inactive state" do
+    @subject.application(UIApplication.sharedApplication, willFinishLaunchingWithOptions: nil)
+    @subject.application(UIApplication.sharedApplication, didFinishLaunchingWithOptions: nil)
+    @subject.applicationWillResignActive(UIApplication.sharedApplication)
+    @subject.called_on_activate.should == nil
+    @subject.applicationDidBecomeActive(UIApplication.sharedApplication)
+    @subject.called_on_activate.should == true
+  end
+
+  it "should call on_enter_background when hitting the home button" do
+    @subject.application(UIApplication.sharedApplication, willFinishLaunchingWithOptions: nil)
+    @subject.application(UIApplication.sharedApplication, didFinishLaunchingWithOptions: nil)
+    @subject.called_on_enter_background.should == nil
+    @subject.applicationDidEnterBackground(UIApplication.sharedApplication)
+    @subject.called_on_enter_background.should == true
+  end
+
+  it "should call will_enter_foreground when hitting the home button" do
+    @subject.application(UIApplication.sharedApplication, willFinishLaunchingWithOptions: nil)
+    @subject.application(UIApplication.sharedApplication, didFinishLaunchingWithOptions: nil)
+    @subject.applicationDidEnterBackground(UIApplication.sharedApplication)
+    @subject.called_will_enter_foreground.should == nil
+    @subject.applicationWillEnterForeground(UIApplication.sharedApplication)
+    @subject.called_will_enter_foreground.should == true
+  end
+
+  it "should call on_unload when the device is about to kill the app" do
+    @subject.application(UIApplication.sharedApplication, willFinishLaunchingWithOptions: nil)
+    @subject.application(UIApplication.sharedApplication, didFinishLaunchingWithOptions: nil)
+    @subject.called_on_unload.should == nil
+    @subject.applicationWillTerminate(UIApplication.sharedApplication)
+    @subject.called_on_unload.should == true
   end
 
 end

data/spec/unit/map_spec.rb

@@ -0,0 +1,48 @@
+describe "map properties" do
+
+  before do
+    # Simulate AppDelegate setup of map screen
+    @map = TestMapScreen.new modal: true, nav_bar: true
+    @map.view_will_appear(false)
+  end
+
+  it "should store title" do
+    @map.get_title.should == "Gorges State Park, NC"
+  end
+
+  it "should have 5 annotations" do
+    @map.annotations.count.should == 5
+  end
+
+  it "should convert annotation hashes to MapViewAnnotations" do
+    @map.annotations.each do |annotation|
+      annotation.class.to_s.should == "NSKVONotifying_MapScreenAnnotation"
+    end
+  end
+
+  it "should add an annotation" do
+    ann = {
+      longitude: -82.966093558105,
+      latitude: 35.092520895652,
+      title: "Something Else"
+    }
+    @map.add_annotation(ann)
+    @map.annotations.count.should == 6
+  end
+
+  it "should clear annotations" do
+    @map.clear_annotations
+    @map.annotations.count.should == 0
+  end
+
+  it "should geocode an address" do
+    @map.lookup_infinite_loop
+    wait_for_change @map, 'infinite_loop_points' do
+      placemarks = @map.infinite_loop_points
+      placemarks.count.should == 1
+      placemarks.first.postalCode.should == "95014"
+      placemarks.first.description.include?("Cupertino").should == true
+    end
+  end
+
+end

data/spec/unit/screen_helpers_spec.rb

@@ -45,36 +45,36 @@ describe "screen helpers" do
     end
 
     it "should add a left nav bar button" do
-      @screen.set_nav_bar_left_button "Save", action: :save_something, type: UIBarButtonItemStyleDone
+      @screen.set_nav_bar_button :left, title: "Save", action: :save_something, type: UIBarButtonItemStyleDone
       @screen.navigationItem.leftBarButtonItem.class.should == UIBarButtonItem
     end
 
     it "should add a right nav bar button" do
-      @screen.set_nav_bar_right_button "Cancel", action: :return_to_some_other_screen, type: UIBarButtonItemStylePlain
+      @screen.set_nav_bar_button :right, title: "Cancel", action: :return_to_some_other_screen, type: UIBarButtonItemStylePlain
       @screen.navigationItem.rightBarButtonItem.class.should == UIBarButtonItem
     end
 
     it "should add an image right nav bar button" do
       image = UIImage.imageNamed("list.png")
-      @screen.set_nav_bar_right_button image, action: :return_to_some_other_screen, type: UIBarButtonItemStylePlain
+      @screen.set_nav_bar_button :right, image: image, action: :return_to_some_other_screen, type: UIBarButtonItemStylePlain
       @screen.navigationItem.rightBarButtonItem.image.class.should == UIImage
       @screen.navigationItem.rightBarButtonItem.image.should == image
     end
 
     it "should add an image left nav bar button" do
       image = UIImage.imageNamed("list.png")
-      @screen.set_nav_bar_left_button image, action: :return_to_some_other_screen, type: UIBarButtonItemStylePlain
+      @screen.set_nav_bar_button :left, image: image, action: :return_to_some_other_screen, type: UIBarButtonItemStylePlain
       @screen.navigationItem.leftBarButtonItem.image.class.should == UIImage
       @screen.navigationItem.leftBarButtonItem.image.should == image
     end
 
     it "should add a left UIBarButtonItem" do
-      @screen.set_nav_bar_left_button @screen.editButtonItem
+      @screen.set_nav_bar_button :left, system_item: :edit
       @screen.navigationItem.leftBarButtonItem.class.should == UIBarButtonItem
     end
 
     it "should add a right UIBarButtonItem" do
-      @screen.set_nav_bar_right_button @screen.editButtonItem
+      @screen.set_nav_bar_button :right, system_item: :add
       @screen.navigationItem.rightBarButtonItem.class.should == UIBarButtonItem
     end
   end
@@ -121,11 +121,11 @@ describe "screen helpers" do
         new_screen.nav_bar?.should == true
       end
 
-      it "should present the #main_controller when showing a modal screen" do
+      it "should present the navigationController when showing a modal screen" do
         new_screen = @screen.send(:set_up_screen_for_open, BasicScreen, modal: true)
 
         @screen.mock!('presentModalViewController:animated:') do |vc, animated|
-          vc.should == new_screen.main_controller
+          vc.should == (new_screen.navigationController || new_screen)
           animated.should == true
         end
         @screen.send(:present_modal_view_controller, new_screen, true)
@@ -141,7 +141,8 @@ describe "screen helpers" do
 
       it "should open a root screen if :close_all is provided" do
         @screen.mock!(:open_root_screen) { |screen| screen.should.be.instance_of BasicScreen }
-        @screen.open BasicScreen, close_all: true
+        screen = @screen.open BasicScreen, close_all: true
+        screen.should.be.kind_of BasicScreen
       end
 
       it "should present a modal screen if :modal is provided" do
@@ -149,7 +150,8 @@ describe "screen helpers" do
           screen.should.be.instance_of BasicScreen
           animated.should == true
         end
-        @screen.open BasicScreen, modal: true
+        screen = @screen.open BasicScreen, modal: true
+        screen.should.be.kind_of BasicScreen
       end
       
       it "should present a modal screen if open_modal is used" do
@@ -157,7 +159,8 @@ describe "screen helpers" do
           screen.should.be.instance_of BasicScreen
           animated.should == true
         end
-        @screen.open_modal BasicScreen
+        screen = @screen.open_modal BasicScreen
+        screen.should.be.kind_of BasicScreen
       end
 
       it "should respect animated property of opening modal screens" do
@@ -167,7 +170,8 @@ describe "screen helpers" do
           animated.should == false
         end
 
-        @screen.send(:open, new_screen, animated: false, modal: true)
+        screen = @screen.send(:open, new_screen, animated: false, modal: true)
+        screen.should.be.kind_of BasicScreen
       end
 
       it "should open screen in tab bar if :in_tab is provided" do
@@ -176,17 +180,20 @@ describe "screen helpers" do
           screen.should.be.instance_of BasicScreen
           tab_name.should == 'my_tab'
         end
-        @screen.open BasicScreen, in_tab: 'my_tab'
+        screen = @screen.open BasicScreen, in_tab: 'my_tab'
+        screen.should.be.kind_of BasicScreen
       end
 
       it "should pop onto navigation controller if current screen is on nav stack already" do
         @screen.mock!(:push_view_controller) { |vc| vc.should.be.instance_of BasicScreen }
-        @screen.open BasicScreen
+        screen = @screen.open BasicScreen
+        screen.should.be.kind_of BasicScreen
       end
       
       it "should ignore its own navigation controller if current screen has a navigation controller" do
         basic = BasicScreen.new(nav_bar: true) # creates a dangling nav_bar that will be discarded.
-        @screen.open basic
+        screen = @screen.open basic
+        screen.should.be.kind_of BasicScreen
         basic.navigationController.should == @screen.navigationController
         basic.navigation_controller.should == @screen.navigationController
         @screen.navigation_controller.should == @screen.navigationController
@@ -196,7 +203,8 @@ describe "screen helpers" do
         parent_screen = HomeScreen.new
         new_screen = BasicScreen.new
         parent_screen.mock!(:open_root_screen) { |vc| vc.should.be == new_screen }
-        parent_screen.open_screen new_screen
+        screen = parent_screen.open_screen new_screen
+        screen.should == new_screen
       end
 
     end

data/spec/unit/screen_spec.rb

@@ -25,6 +25,25 @@ describe "screen properties" do
     @screen.title = "instance method"
     HomeScreen.get_title.should != 'instance method'
   end
+  
+  it "should set the tab bar item with a system icon" do
+    @screen.set_tab_bar_item system_icon: :contacts
+    comparison = UITabBarItem.alloc.initWithTabBarSystemItem(UITabBarSystemItemContacts, tag: 0)
+    @screen.tabBarItem.systemItem.should == comparison.systemItem
+    @screen.tabBarItem.tag.should == comparison.tag
+    @screen.tabBarItem.image.should == comparison.image
+  end
+
+  it "should set the tab bar item with a custom icon and title" do
+    @screen.set_tab_bar_item title: "My Screen", icon: "list"
+    
+    icon_image = UIImage.imageNamed("list")
+    comparison = UITabBarItem.alloc.initWithTitle("My Screen", image: icon_image, tag: 0)
+    
+    @screen.tabBarItem.systemItem.should == comparison.systemItem
+    @screen.tabBarItem.tag.should == comparison.tag
+    @screen.tabBarItem.image.should == comparison.image
+  end
 
   it "should store debug mode" do
     HomeScreen.debug_mode = true
@@ -109,30 +128,15 @@ describe "screen properties" do
 
   end
 
-
-  describe "pm_main_controller" do
-
-    it "should return the navigation controller wrapper" do
-      @screen.pm_main_controller.should.be.instance_of ProMotion::NavigationController
-    end
-
-    it "should return itself when screen is a plain UIViewController" do
-      vc = UIViewController.alloc.initWithNibName(nil, bundle: nil)
-      vc.respond_to?(:pm_main_controller).should == true
-      vc.pm_main_controller.should == vc
-    end
-
-  end
-
-
   describe "navigation controller behavior" do
 
     it "should have a nav bar" do
       @screen.nav_bar?.should == true
     end
 
-    it "#main_controller should return a navigation controller" do
-      @screen.main_controller.should.be.instance_of ProMotion::NavigationController
+    it "#navigation_controller should return a navigation controller" do
+      @screen.navigation_controller.should.be.instance_of ProMotion::NavigationController
+      @screen.navigationController.should.be.instance_of ProMotion::NavigationController
     end
 
     it "have a right bar button item" do

data/spec/unit/split_screen_in_tab_bar_spec.rb

@@ -38,12 +38,12 @@ describe "split screen in tab bar functionality" do
 
   it "should set the first viewController to HomeScreen's main controller" do
     @split_screen.master_screen.should == @master_screen
-    @split_screen.viewControllers.first.should == @master_screen.pm_main_controller
+    @split_screen.viewControllers.first.should == (@master_screen.navigationController || @master_screen)
   end
 
   it "should set the second viewController to BasicScreen's main controller" do
     @split_screen.detail_screen.should == @detail_screen
-    @split_screen.viewControllers.last.should == @detail_screen.pm_main_controller
+    @split_screen.viewControllers.last.should == (@detail_screen.navigationController || @detail_screen)
   end
 
   it "should set the tab bar first viewController to the split screen" do

data/spec/unit/split_screen_open_screen_spec.rb

@@ -15,36 +15,41 @@ describe "split screen `open` functionality" do
   end
 
   it "should open a new screen in the detail view" do
-    @master_screen.open @detail_screen_2, in_detail: true
+    screen = @master_screen.open @detail_screen_2, in_detail: true
     @split_screen.detail_screen.should == @detail_screen_2
-    @split_screen.viewControllers.first.should == @master_screen.pm_main_controller
-    @split_screen.viewControllers.last.should == @detail_screen_2.pm_main_controller
+    @split_screen.viewControllers.first.should == (@master_screen.navigationController || @master_screen)
+    @split_screen.viewControllers.last.should == (@detail_screen_2.navigationController || @detail_screen_2)
+    screen.should == @detail_screen_2
   end
 
   it "should open a new screen in the master view" do
-    @detail_screen_1.open @detail_screen_2, in_master: true
+    screen = @detail_screen_1.open @detail_screen_2, in_master: true
     @split_screen.master_screen.should == @detail_screen_2
-    @split_screen.viewControllers.first.should == @detail_screen_2.pm_main_controller
-    @split_screen.viewControllers.last.should == @detail_screen_1.pm_main_controller
+    @split_screen.viewControllers.first.should == (@detail_screen_2.navigationController || @detail_screen_2)
+    @split_screen.viewControllers.last.should == (@detail_screen_1.navigationController || @detail_screen_1)
+    screen.should == @detail_screen_2
   end
 
   it "should open a new screen in the master view's navigation controller" do
-    @master_screen.open @detail_screen_2
+    screen = @master_screen.open @detail_screen_2
     @split_screen.detail_screen.should == @detail_screen_1 # no change
     @master_screen.navigationController.topViewController.should == @detail_screen_2
+    screen.should == @detail_screen_2
   end
 
   it "should open a new modal screen in the detail view" do
-    @detail_screen_1.open @detail_screen_2, modal: true
+    screen = @detail_screen_1.open @detail_screen_2, modal: true
     @split_screen.detail_screen.should == @detail_screen_1
-    @detail_screen_1.presentedViewController.should == @detail_screen_2.pm_main_controller
+    @detail_screen_1.presentedViewController.should == (@detail_screen_2.navigationController || @detail_screen_2)
+    screen.should == @detail_screen_2
   end
 
   it "should not interfere with normal non-split screen navigation" do
     home = HomeScreen.new(nav_bar: true)
     child = BasicScreen.new
-    home.open child, in_detail: true, in_master: true
+    screen = home.open child, in_detail: true, in_master: true
     home.navigation_controller.topViewController.should == child
+    screen.should == child
   end
 
 end