ProMotion 2.4.2 → 2.5.0.beta1

data/lib/ProMotion/version.rb

@@ -1,3 +1,3 @@
 module ProMotion
-  VERSION = "2.4.2" unless defined?(ProMotion::VERSION)
+  VERSION = "2.5.0.beta1" unless defined?(ProMotion::VERSION)
 end

data/spec/functional/func_screen_spec.rb

@@ -1,37 +1,42 @@
 describe "ProMotion::Screen functionality" do
-  tests PM::Screen
+  tests FunctionalScreen
 
   before { UIView.setAnimationDuration 0.01 }
 
   # Override controller to properly instantiate
+  def screen
+    @screen ||= FunctionalScreen.new
+  end
+
   def controller
-    rotate_device to: :portrait, button: :bottom
-    @controller = FunctionalScreen.new(nav_bar: true)
-    @controller.navigationController
+    screen.navigationController
   end
 
+  before { rotate_device to: :portrait, button: :bottom }
+  after { @screen = nil }
+
   it "should call the on_back method on the root controller when navigating back" do
     presented_screen = PresentScreen.new
-    @controller.open presented_screen, animated: false
-    @controller.navigationController.viewControllers.should == [ @controller, presented_screen ]
+    screen.open presented_screen, animated: false
+    screen.navigationController.viewControllers.should == [ screen, presented_screen ]
     presented_screen.close animated: false
-    @controller.on_back_fired.should == true
+    screen.on_back_fired.should == true
   end
 
   it "should call the correct on_back method when nesting screens" do
-    child_screen = @controller.open NavigationScreen.new, animated: false
+    child_screen = screen.open NavigationScreen.new, animated: false
     grandchild_screen = child_screen.open NavigationScreen.new, animated: false
 
     # start closing
     grandchild_screen.close animated: false
     child_screen.on_back_fired.should == true
     child_screen.close animated: false
-    @controller.on_back_fired.should == true
+    screen.on_back_fired.should == true
   end
 
   it "should fire the will_present, on_present, will_dismiss, and on_dismiss_methods" do
     @presented_screen = PresentScreen.new
-    @controller.open @presented_screen, animated: false
+    screen.open @presented_screen, animated: false
 
     wait 0.01 do
       @presented_screen.will_present_fired.should == true
@@ -55,20 +60,20 @@ describe "ProMotion::Screen functionality" do
     end
   end
 
-  it "should pop to the root view controller" do
-    @root_vc = @controller.navigationController.visibleViewController
-    @controller.navigationController.viewControllers.count.should == 1
-    @controller.open BasicScreen.new, animated: false
+  it "should pop to the root view screen" do
+    @root_vc = screen.navigationController.visibleViewController
+    screen.navigationController.viewControllers.count.should == 1
+    screen.open BasicScreen.new, animated: false
     wait 0.01 do
-      @controller.open BasicScreen.new, animated: false
+      screen.open BasicScreen.new, animated: false
       wait 0.01 do
-        @controller.open BasicScreen.new, animated: false
+        screen.open BasicScreen.new, animated: false
         wait 0.01 do
-          @controller.navigationController.viewControllers.count.should == 4
-          @controller.close to_screen: :root, animated: false
+          screen.navigationController.viewControllers.count.should == 4
+          screen.close to_screen: :root, animated: false
           wait 0.01 do
-            @controller.navigationController.viewControllers.count.should == 1
-            @controller.navigationController.topViewController.should == @root_vc
+            screen.navigationController.viewControllers.count.should == 1
+            screen.navigationController.topViewController.should == @root_vc
           end
         end
       end

data/spec/functional/func_split_screen_spec.rb

@@ -31,7 +31,7 @@ describe "Split screen functionality" do
 
   it "should allow opening another view from the master view" do
 
-    @master.open BasicScreen, animated: false
+    @master.open BasicScreen.new(nav_bar: true), animated: false
 
     view("Basic").should.be.kind_of UINavigationItemView
     view("Detail").should.be.kind_of UINavigationItemView
@@ -50,7 +50,7 @@ describe "Split screen functionality" do
 
   it "should allow opening another view from the detail view" do
 
-    @detail.open BasicScreen, animated: false
+    @detail.open BasicScreen.new(nav_bar: true), animated: false
 
     view("Basic").should.be.kind_of UINavigationItemView
     view("Master").should.be.kind_of UINavigationItemView

data/spec/unit/collection_screen_spec.rb

@@ -0,0 +1,133 @@
+describe "collection screens" do
+  tests TestCollectionScreen
+
+  def screen
+    @screen ||= TestCollectionScreen.new(nav_bar: true)
+  end
+
+  def controller
+    screen.navigationController
+  end
+
+  describe "basic functionality" do
+
+    before do
+      @screen = TestCollectionScreen.new(nav_bar: true)
+      @view = @screen.collection_view
+    end
+
+    after do
+      @screen = nil
+    end
+
+    it "should display some sections" do
+      @screen.promotion_collection_data.sections.should.be.kind_of(Array)
+    end
+
+    it "should have the proper number of sections" do
+      @view.numberOfSections.should == 11
+      @screen.numberOfSectionsInCollectionView(@view).should == 11
+    end
+
+    it "should have the proper number of cells" do
+      @view.numberOfItemsInSection(1).should == 10
+      @screen.collectionView(@view, numberOfItemsInSection: 1).should == 10
+    end
+
+    it "should call the action" do
+      @screen.mock! :touched do |args|
+        args[:data].should == ['action']
+      end
+
+      index_path = NSIndexPath.indexPathForRow(1, inSection: 1)
+      @screen.collectionView(@view, didSelectItemAtIndexPath: index_path)
+    end
+
+    it "should proc the action" do
+      @screen.mock! :touched do |args|
+        args[:data].should == ['proc']
+      end
+
+      index_path = NSIndexPath.indexPathForRow(1, inSection: 10)
+      @screen.collectionView(@view, didSelectItemAtIndexPath: index_path)
+    end
+
+    it "should reload data" do
+      data = (1..2).to_a.map do |i|
+        (1..3).to_a.map do |o|
+          {
+              cell_identifier:  :custom_cell,
+              title:            "#{i}x#{o}",
+              action:           'touched:',
+              background_color: UIColor.colorWithRed(rand(255) / 255.0,
+                                                     green: rand(255) / 255.0,
+                                                     blue:  rand(255) / 255.0,
+                                                     alpha: 1.0)
+          }
+        end
+      end
+      @screen.update_collection_view_data(data)
+      @view.numberOfSections.should == 2
+      @view.numberOfItemsInSection(1).should == 3
+    end
+
+  end
+
+  describe "layout functionality" do
+    before do
+      @screen = TestCollectionScreen.new
+      @view = @screen.collection_view
+      @layout = @screen.collectionViewLayout
+    end
+
+    after do
+      @screen = nil
+    end
+
+    it "layout should have correct sizes" do
+      @layout.estimatedItemSize.should == CGSizeMake(80, 80) if TestHelper.gte_ios8
+      @layout.itemSize.should == CGSizeMake(100, 80)
+    end
+
+    it "layout should be :horizontal" do
+      @layout.scrollDirection.should == UICollectionViewScrollDirectionHorizontal
+    end
+
+    it "layout should have a correct sectionInset" do
+      @layout.sectionInset.should == UIEdgeInsetsMake(10, 10, 10, 10)
+    end
+
+  end
+
+  describe "cells" do
+    before do
+      @screen = TestCollectionScreen.new
+      @view = @screen.collection_view
+    end
+
+    after do
+      @screen = nil
+    end
+
+    it "should be CustomCollectionViewCell cells" do
+      index_path = NSIndexPath.indexPathForRow(1, inSection: 1)
+
+      @screen.collectionView(@view, cellForItemAtIndexPath: index_path).should.be.kind_of CustomCollectionViewCell
+    end
+
+    it "should have a correct size" do
+      index_path = NSIndexPath.indexPathForRow(1, inSection: 1)
+
+      cell = @screen.collectionView(@view, cellForItemAtIndexPath: index_path)
+      cell.should.not == nil
+      cell.frame.size.should == CGSizeMake(100, 80)
+    end
+
+    it "should get properties" do
+      data = @screen.cell_at(section: 1, index: 1)
+      data[:background_color].should.be.kind_of UIColor
+    end
+
+  end
+
+end

data/spec/unit/screen_helpers_spec.rb

@@ -135,7 +135,7 @@ describe "screen helpers" do
         new_screen.modal?.should == true
         new_screen.hidesBottomBarWhenPushed.should == true
         new_screen.nav_bar?.should == true
-        new_screen.navigationController.isNavigationBarHidden.should == true
+        new_screen.instance_variable_get(:@screen_options)[:hide_nav_bar].should == true
       end
 
       it "should present the navigationController when showing a modal screen" do

data/spec/unit/screen_spec.rb

@@ -6,6 +6,16 @@ describe "screen properties" do
     @screen.on_load
   end
 
+  it "does not have a default title" do
+    screen = UntitledScreen.new
+    screen.title.should == nil
+  end
+
+  it "does not display a default title in the nav bar" do
+    screen = UntitledScreen.new
+    screen.navigationItem.title.should == nil
+  end
+
   it "should store title" do
     HomeScreen.title.should == "Home"
   end
@@ -24,12 +34,6 @@ describe "screen properties" do
     HomeScreen.title.should != 'instance method'
   end
 
-  it "should have a default UIStatusBar style" do
-    @screen.view_will_appear(false)
-    UIApplication.sharedApplication.isStatusBarHidden.should == false
-    UIApplication.sharedApplication.statusBarStyle.should == UIStatusBarStyleDefault
-  end
-
   it "should set the UIStatusBar style to :none" do
     @screen.class.status_bar :none
     @screen.view_will_appear(false)
@@ -61,6 +65,13 @@ describe "screen properties" do
     UIApplication.sharedApplication.statusBarStyle.should == UIStatusBarStyleLightContent
   end
 
+  it "should default to a hidden UIStatusBar if already hidden" do
+    UIApplication.sharedApplication.setStatusBarHidden(true, withAnimation: UIStatusBarAnimationNone)
+    @screen.class.status_bar :default
+    @screen.view_will_appear(false)
+    UIApplication.sharedApplication.isStatusBarHidden.should == true
+  end
+
   it "should set the tab bar item with a system item" do
     @screen.set_tab_bar_item system_item: :contacts
     comparison = UITabBarItem.alloc.initWithTabBarSystemItem(UITabBarSystemItemContacts, tag: 0)
@@ -201,6 +212,33 @@ describe "screen properties" do
 
   end
 
+  describe "memory warnings" do
+
+    it "should call didReceiveMemoryWarning when exists" do
+      memory_screen = MemoryWarningScreenSelfImplemented.new
+      memory_screen.memory_warning_from_uikit.should.be.nil
+      memory_screen.didReceiveMemoryWarning
+      memory_screen.memory_warning_from_uikit.should == true
+    end
+
+    it "should call super up the chain" do
+      memory_screen = MemoryWarningNotSoSuperScreen.new
+
+      memory_screen.memory_warning_from_super.should.be.nil
+      memory_screen.didReceiveMemoryWarning
+      memory_screen.memory_warning_from_super.should == true
+    end
+
+    it "should call on_memory_warning when implemented" do
+      memory_screen = MemoryWarningScreen.new
+
+      memory_screen.memory_warning_from_pm.should.be.nil
+      memory_screen.didReceiveMemoryWarning
+      memory_screen.memory_warning_from_pm.should == true
+    end
+
+  end
+
   describe "navigation controller behavior" do
 
     it "should have a navigation bar" do

data/spec/unit/tables/table_module_spec.rb

@@ -41,6 +41,16 @@ describe "PM::Table module" do
     })
   end
 
+  def proc_cell
+    custom_cell.merge({
+      action: -> (args, index_path) {
+        args[:data].should == [ "lots", "of", "data" ]
+        index_path.section.should == 7
+        index_path.row.should == 0
+      }
+      })
+  end
+
   def default_cell_height
     return UITableViewAutomaticDimension if TestHelper.ios8
     return 97.0 if TestHelper.ios7 # Normally 44, but 97 because of `row_height` designation
@@ -69,7 +79,13 @@ describe "PM::Table module" do
       },{
         title: "Custom section title 2", title_view: CustomTitleView.new, title_view_height: 50, cells: [ ]
       },{
-        title: "Action WIth Index Path Group", cells: [ cell_factory(title: "IndexPath Group 1", action: :tests_index_path) ]
+        title: "Action With Index Path Group", cells: [ cell_factory(title: "IndexPath Group 1", action: :tests_index_path) ]
+      }, {
+        title: "Action With A Proc", cells: [ proc_cell ]
+      },{
+        title: "test 40", title_view: DynamicHeightTitleView40, cells: []
+      }, {
+        title: "test 121", title_view: DynamicHeightTitleView121, cells: []
       }]
     end
 
@@ -77,12 +93,13 @@ describe "PM::Table module" do
 
     @ip = NSIndexPath.indexPathForRow(1, inSection: 2) # Cell 3-2
     @custom_ip = NSIndexPath.indexPathForRow(0, inSection: 3) # Cell "Crazy Full Featured Cell"
+    @proc_cell = NSIndexPath.indexPathForRow(0, inSection: 7)
 
     @subject.update_table_data
   end
 
   it "should have the right number of sections" do
-    @subject.numberOfSectionsInTableView(@subject.table_view).should == 7
+    @subject.numberOfSectionsInTableView(@subject.table_view).should == 10
   end
 
   it "should set the section titles" do
@@ -134,6 +151,10 @@ describe "PM::Table module" do
     @subject.tableView(@subject.table_view, didSelectRowAtIndexPath:@custom_ip)
   end
 
+  it "should trigger the proc" do
+    @subject.tableView(@subject.table_view, didSelectRowAtIndexPath: @proc_cell)
+  end
+
   it "should return an NSIndexPath when the action has two parameters" do
     ip = NSIndexPath.indexPathForRow(0, inSection: 6)
 
@@ -198,6 +219,11 @@ describe "PM::Table module" do
       cell = @subject.tableView(@subject.table_view, viewForHeaderInSection: 5)
       cell.should.be.kind_of(CustomTitleView)
     end
+
+    it "should set the height of a title view when the method `height` is implemented" do
+      @subject.tableView(@subject.table_view, heightForHeaderInSection:8).should == 40.0
+      @subject.tableView(@subject.table_view, heightForHeaderInSection:9).should == 121.0
+    end
   end
 
   describe "header view modifications" do

data/spec/unit/tables/table_refreshable_spec.rb

@@ -0,0 +1,25 @@
+describe "table screen refresh functionality" do
+
+  # Note this test only works if on iOS 6+ or when using CKRefreshControl.
+
+  before do
+    @screen = TableScreenRefreshable.new
+    @screen.on_load
+  end
+
+  it "should be refreshable" do
+    @screen.class.get_refreshable.should == true
+  end
+
+  it "should create a refresh object" do
+    @screen.instance_variable_get("@refresh_control").should.be.kind_of UIRefreshControl
+  end
+
+  it "should respond to start_refreshing and end_refreshing" do
+    @screen.respond_to?(:start_refreshing).should == true
+    @screen.respond_to?(:end_refreshing).should == true
+  end
+
+  # Animations cause the refresh object to fail when tested. Test manually.
+
+end

data/spec/unit/tables/table_screen_spec.rb

@@ -64,62 +64,6 @@ describe "table screens" do
     end
   end
 
-  describe "search functionality" do
-
-    before do
-      @screen = TableScreenSearchable.new
-      @screen.on_load
-    end
-
-    it "should be searchable" do
-      @screen.class.get_searchable.should == true
-    end
-
-    it "should create a search header" do
-      @screen.tableView.tableHeaderView.should.be.kind_of UISearchBar
-    end
-
-    it "should not hide the search bar initally by default" do
-      @screen.tableView.contentOffset.should == CGPointMake(0,0)
-    end
-
-    it "should allow hiding the search bar initally" do
-      class HiddenSearchScreen < TableScreenSearchable
-        searchable hide_initially: true
-      end
-      screen = HiddenSearchScreen.new
-      screen.on_load
-      screen.tableView.contentOffset.should == CGPointMake(0,screen.searchDisplayController.searchBar.frame.size.height)
-    end
-
-  end
-
-  describe "refresh functionality" do
-
-    # Note this test only works if on iOS 6+ or when using CKRefreshControl.
-
-    before do
-      @screen = TableScreenRefreshable.new
-      @screen.on_load
-    end
-
-    it "should be refreshable" do
-      @screen.class.get_refreshable.should == true
-    end
-
-    it "should create a refresh object" do
-      @screen.instance_variable_get("@refresh_control").should.be.kind_of UIRefreshControl
-    end
-
-    it "should respond to start_refreshing and end_refreshing" do
-      @screen.respond_to?(:start_refreshing).should == true
-      @screen.respond_to?(:end_refreshing).should == true
-    end
-
-    # Animations cause the refresh object to fail when tested. Test manually.
-
-  end
-
   describe 'test PM::TableScreen\'s method call order' do
     before do
       class MethodCallOrderTestTableScreen < PM::TableScreen