ProMotion 2.2.2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c43b2e73403d46846ef391c38eff15acd4239324
-  data.tar.gz: aa5c91f5332d8764690dd8de33c0bc4c0f59ef9f
+  metadata.gz: be839599d650130f82f0fa241e88bf2b76fc4964
+  data.tar.gz: b1f0799f8f393b3de1d8b60307b6e256225682c3
 SHA512:
-  metadata.gz: d54c1e1f6fc6c2d983505aad1df54faa34d711a3e1662727c396c0ae4b524d40eea5bdcf8b43a82b8287b216d2f3c67d2d92730472a3e9738833a1b338d71b51
-  data.tar.gz: d6cc272e0f8be4c6282c1d5bdf03ec4e42244f0c380802f8dcb144351ae8901be5f80470c765fcc5fec026f1b152f610e5702214b3ea64977c88a2b7f66f3490
+  metadata.gz: 3fedb2aff2f4df877da8a384599ea6aaec3ef572c479016a7fc84d8447b4089459a88ef1611502df27668bd29a2fa25f597d7c83333ffeae5c26091b43a1e88c
+  data.tar.gz: 54c0ccb64e0eb8dab7b113efa724ce33e239d2b6464a69107ba5087ec9d6025f6306ddbda274980f944770769d72ff35ff2b6d56d7fc06320e2def33409de071

data/README.md

@@ -1,4 +1,3 @@
-[![Stories in Ready](https://badge.waffle.io/clearsightstudio/ProMotion.png?label=ready&title=Ready)](https://waffle.io/clearsightstudio/ProMotion)
 # ProMotion
 
 [![Gem Version](https://img.shields.io/gem/v/ProMotion.svg?style=flat)](https://rubygems.org/gems/ProMotion)
@@ -6,6 +5,7 @@
 [![Code Climate](https://img.shields.io/codeclimate/github/clearsightstudio/ProMotion.svg?style=flat)](https://codeclimate.com/github/clearsightstudio/ProMotion)
 [![Dependency Status](https://img.shields.io/gemnasium/clearsightstudio/ProMotion.svg?style=flat)](https://gemnasium.com/clearsightstudio/ProMotion)
 [![omniref](https://img.shields.io/badge/omniref-docs-blue.svg?style=flat)](https://www.omniref.com/ruby/gems/ProMotion)
+[![Stories in Ready](https://badge.waffle.io/clearsightstudio/ProMotion.png?label=ready&title=Ready)](https://waffle.io/clearsightstudio/ProMotion)
 
 ## iPhone Apps, Ruby-style
 
@@ -69,54 +69,57 @@ end
 
 |Screens|Navigation Bars|Tab Bars|
 |---|---|---|
-|![ProMotion Screen](https://f.cloud.github.com/assets/1479215/1534021/060aaaac-4c8f-11e3-903c-743e54252222.png)|![ProMotion Nav Bar](https://f.cloud.github.com/assets/1479215/1534077/db39aab6-4c8f-11e3-83f7-e03d52ac615d.png)|![ProMotion Tabs](https://f.cloud.github.com/assets/1479215/1534115/9f4c4cd8-4c90-11e3-9285-96ac253facda.png)|
+|[![ProMotion Screen](https://f.cloud.github.com/assets/1479215/1534021/060aaaac-4c8f-11e3-903c-743e54252222.png)](http://promotion.readthedocs.org/en/master/API%20Reference%20-%20ProMotion%20Screen/)|[![ProMotion Nav Bar](https://f.cloud.github.com/assets/1479215/1534077/db39aab6-4c8f-11e3-83f7-e03d52ac615d.png)](http://promotion.readthedocs.org/en/master/API%20Reference%20-%20ProMotion%20Screen/#set_nav_bar_buttonside-args)|[![ProMotion Tabs](https://f.cloud.github.com/assets/1479215/1534115/9f4c4cd8-4c90-11e3-9285-96ac253facda.png)](http://promotion.readthedocs.org/en/master/API%20Reference%20-%20ProMotion%20Tabs/)|
 
 |Table Screens|Grouped Tables|Searchable|Refreshable|
 |---|---|---|---|
-|![ProMotion TableScreen](https://f.cloud.github.com/assets/1479215/1534137/ed71e864-4c90-11e3-98aa-ed96049f5407.png)|![Grouped Table Screen](https://f.cloud.github.com/assets/1479215/1589973/61a48610-5281-11e3-85ac-abee99bf73ad.png)|![Searchable](https://f.cloud.github.com/assets/1479215/1534299/20cc05c6-4c93-11e3-92ca-9ee39c044457.png)|![Refreshable](https://f.cloud.github.com/assets/1479215/1534317/5a14ef28-4c93-11e3-8e9e-f8c08d8464f8.png)|
+|[![ProMotion TableScreen](https://f.cloud.github.com/assets/1479215/1534137/ed71e864-4c90-11e3-98aa-ed96049f5407.png)](http://promotion.readthedocs.org/en/master/API%20Reference%20-%20ProMotion%20TableScreen/)|[![Grouped Table Screen](https://f.cloud.github.com/assets/1479215/1589973/61a48610-5281-11e3-85ac-abee99bf73ad.png)](https://gist.github.com/jamonholmgren/382a6cf9963c5f0b2248)|[![Searchable](https://f.cloud.github.com/assets/1479215/1534299/20cc05c6-4c93-11e3-92ca-9ee39c044457.png)](http://promotion.readthedocs.org/en/master/API%20Reference%20-%20ProMotion%20TableScreen/#searchableplaceholder-placeholder-text)|[![Refreshable](https://f.cloud.github.com/assets/1479215/1534317/5a14ef28-4c93-11e3-8e9e-f8c08d8464f8.png)](http://promotion.readthedocs.org/en/master/API%20Reference%20-%20ProMotion%20TableScreen/#refreshableoptions)|
 
 
 |iPad SplitScreens|Map Screens|Web Screens|
 |---|---|---|
-|![ProMotion SplitScreens](https://f.cloud.github.com/assets/1479215/1534507/0edb8dd4-4c96-11e3-9896-d4583d0ed161.png)|![MapScreen](https://f.cloud.github.com/assets/1479215/1534628/f7dbf7e8-4c97-11e3-8817-4c2a58824771.png)|![ProMotion WebScreen](https://f.cloud.github.com/assets/1479215/1534631/ffe1b36a-4c97-11e3-8c8f-c7b14e26182d.png)|
+|[![ProMotion SplitScreens](https://f.cloud.github.com/assets/1479215/1534507/0edb8dd4-4c96-11e3-9896-d4583d0ed161.png)](http://promotion.readthedocs.org/en/master/API%20Reference%20-%20ProMotion%20SplitScreen/)|[![MapScreen](https://f.cloud.github.com/assets/1479215/1534628/f7dbf7e8-4c97-11e3-8817-4c2a58824771.png)](http://promotion.readthedocs.org/en/master/API%20Reference%20-%20ProMotion%20MapScreen/)|[![ProMotion WebScreen](https://f.cloud.github.com/assets/1479215/1534631/ffe1b36a-4c97-11e3-8c8f-c7b14e26182d.png)](http://promotion.readthedocs.org/en/master/API%20Reference%20-%20ProMotion%20WebScreen/)|
 
 #### ...and much more.
 
 # Getting Started
 
-1. Check out the [Getting Started Guide](https://github.com/clearsightstudio/ProMotion/wiki/Guide:-Getting-Started) in the wiki
+1. Check out the [Getting Started Guide](https://github.com/clearsightstudio/ProMotion/blob/master/docs/Guides/Guide%20-%20Getting%20Started.md)
 2. Watch the excellent [MotionInMotion screencast about ProMotion](https://motioninmotion.tv/screencasts/8) (very reasonably priced subscription required)
 3. Follow a tutorial: [Building an ESPN app using RubyMotion, ProMotion, and TDD](http://jamonholmgren.com/building-an-espn-app-using-rubymotion-promotion-and-tdd)
-4. Read the updated and exhaustive [Wiki](https://github.com/clearsightstudio/ProMotion/wiki)
+4. Read the [Documentation](https://github.com/clearsightstudio/ProMotion/blob/master/docs)
 
 # Changelog
 
-## Version 2.2.0
+## Version 2.3.0
 
 This release includes several new features and is backwards compatible with all 2.x releases.
 
-* PM::TableScreen: You can now set a custom table view header view ([thanks Mark Rickert](https://github.com/clearsightstudio/ProMotion/pull/556))
-* PM::TableScreen refreshable: Refresh controls now show when programmatically initiating refresh ([thanks Mark Rickert](https://github.com/clearsightstudio/ProMotion/pull/569))
-* PM::TableScreen: Added reorderable ([thanks Mark Rickert](https://github.com/clearsightstudio/ProMotion/pull/569))
-* PM::TableScreen: Added auto height feature ([thanks Carlin Isaacson](https://github.com/clearsightstudio/ProMotion/pull/574))
-* PM::Screen: The navigation controller bottom toolbar will auto-hide when passed nil or false ([thanks Mark Rickert](https://github.com/clearsightstudio/ProMotion/pull/577))
-* PM::Screen: You can now choose a status bar style ([thanks Mark Rickert](https://github.com/clearsightstudio/ProMotion/pull/563))
-* Added `on_load` and `on_styled` hooks for UIViews that implement those methods ([Jamon Holmgren](https://github.com/clearsightstudio/ProMotion/pull/567))
-* Fixed an issue where cell properties would be applied twice unnecessarily ([Jamon Holmgren](https://github.com/clearsightstudio/ProMotion/pull/573))
+* PR #618 Allow search bar to be hidden initially
+* PR #606 Adds capability for table_footer_view
+* PR #602 Add image inset support for tab bar item
+* PR #595 Feature/support module
+* PR #582 Allow setting of multiple nav bar buttons instead of just one left an one right
+* PR #581 Adds on_tab_selected
+* PR #579 implemented nav_bar_button class method RE #272
+* PR #565 Adds header_will_display method to PM::TableScreen
+* PR #663 Adds `on_load` back to cell dequeue code
+* PR #641 Custom search for PM::TableScreen
+* PR #658 Fix cell height issue
 
 # Apps built on ProMotion
 
-[Apps built on ProMotion](https://github.com/clearsightstudio/ProMotion/wiki/Apps-built-on-ProMotion)
+[Apps built on ProMotion](http://promotion.readthedocs.org/en/master/ProMotion%20Apps/)
 
-##Your app
+## Your app
 
-Tweet [@jamonholmgren](https://twitter.com/jamonholmgren) if you built an app in ProMotion and want it included!
+Open a pull request!
 
 # API Reference
 
 We've created a comprehensive and always updated wiki with code examples, usage examples, and API reference.
 
-### [ProMotion API Reference](https://github.com/clearsightstudio/ProMotion/wiki)
+### [ProMotion Documentation](https://github.com/clearsightstudio/ProMotion/blob/master/docs)
 
 # Help
 

data/lib/ProMotion.rb

@@ -17,7 +17,11 @@ Motion::Project::App.setup do |app|
     "#{core_lib}/table/cell/table_view_cell_module.rb" => [ "#{core_lib}/styling/styling.rb" ],
     "#{core_lib}/delegate/delegate.rb" => [ "#{core_lib}/delegate/delegate_parent.rb" ],
     "#{core_lib}/delegate/delegate_parent.rb" => [ "#{core_lib}/delegate/delegate_module.rb" ],
-    "#{core_lib}/delegate/delegate_module.rb" => [ "#{core_lib}/tabs/tabs.rb", "#{core_lib}/ipad/split_screen.rb" ],
+    "#{core_lib}/delegate/delegate_module.rb" => [
+      "#{core_lib}/support/support.rb",
+      "#{core_lib}/tabs/tabs.rb",
+      "#{core_lib}/ipad/split_screen.rb"
+    ],
     "#{core_lib}/screen/screen.rb" => [ "#{core_lib}/screen/screen_module.rb" ],
     "#{core_lib}/screen/screen_module.rb" => [ "#{core_lib}/screen/screen_navigation.rb" ],
     "#{core_lib}/table/data/table_data.rb" => [ "#{core_lib}/table/table.rb" ],

data/lib/ProMotion/cocoatouch/tab_bar_controller.rb

@@ -1,6 +1,8 @@
 module ProMotion
   class TabBarController < UITabBarController
 
+    attr_accessor :pm_tab_delegate
+
     def self.new(*screens)
       tab_bar_controller = alloc.init
 
@@ -15,6 +17,7 @@ module ProMotion
       end
 
       tab_bar_controller.viewControllers = view_controllers
+      tab_bar_controller.delegate = tab_bar_controller
       tab_bar_controller
     end
 
@@ -27,6 +30,9 @@ module ProMotion
 
       if selected_tab_vc
         self.selectedViewController = selected_tab_vc
+        on_tab_selected_try(selected_tab_vc)
+
+        selected_tab_vc
       else
         PM.logger.error "Unable to open tab #{tab.to_s} -- not found."
         nil
@@ -38,6 +44,9 @@ module ProMotion
     end
 
     # Cocoa touch methods below
+    def tabBarController(tbc, didSelectViewController: vc)
+      on_tab_selected_try(vc)
+    end
 
     def shouldAutorotate
       current_view_controller_try(:shouldAutorotate)
@@ -53,6 +62,12 @@ module ProMotion
 
     private
 
+    def on_tab_selected_try(vc)
+      if pm_tab_delegate && pm_tab_delegate.respond_to?(:weakref_alive?) && pm_tab_delegate.weakref_alive? && pm_tab_delegate.respond_to?("on_tab_selected:")
+        pm_tab_delegate.send(:on_tab_selected, vc)
+      end
+    end
+
     def current_view_controller
       selectedViewController || viewControllers.first
     end

data/lib/ProMotion/delegate/delegate_module.rb

@@ -1,5 +1,6 @@
 module ProMotion
   module DelegateModule
+    include ProMotion::Support
     include ProMotion::Tabs
     include ProMotion::SplitScreen if UIDevice.currentDevice.userInterfaceIdiom == UIUserInterfaceIdiomPad
 
@@ -42,18 +43,6 @@ module ProMotion
       try :on_open_url, { url: url, source_app: source_app, annotation: annotation }
     end
 
-    def app
-      UIApplication.sharedApplication
-    end
-
-    def app_delegate
-      self
-    end
-
-    def app_window
-      window
-    end
-
     def ui_window
       (defined?(Motion) && defined?(Motion::Xray) && defined?(Motion::Xray::XrayWindow)) ? Motion::Xray::XrayWindow : UIWindow
     end
@@ -83,10 +72,6 @@ module ProMotion
       self.class.send(:apply_status_bar)
     end
 
-    def try(method, *args)
-      send(method, *args) if respond_to?(method)
-    end
-
   public
 
     module ClassMethods

data/lib/ProMotion/screen/nav_bar_module.rb

@@ -18,8 +18,8 @@ module ProMotion
     end
 
     def set_nav_bar_button(side, args={})
-      button = create_toolbar_button(args)
-      button.setTintColor args[:tint_color] if args[:tint_color]
+      button = (args.is_a?(UIBarButtonItem)) ? args : create_toolbar_button(args)
+      button.setTintColor args[:tint_color] if args.is_a?(Hash) && args[:tint_color]
 
       self.navigationItem.leftBarButtonItem = button if side == :left
       self.navigationItem.rightBarButtonItem = button if side == :right
@@ -28,6 +28,13 @@ module ProMotion
       button
     end
 
+    def set_nav_bar_buttons(side, buttons=[])
+      buttons = buttons.map{ |b| b.is_a?(UIBarButtonItem) ? b : create_toolbar_button(b) }.reverse
+
+      self.navigationItem.setLeftBarButtonItems(buttons) if side == :left
+      self.navigationItem.setRightBarButtonItems(buttons) if side == :right
+    end
+
     # TODO: In PM 2.1+, entirely remove this deprecated method.
     def set_nav_bar_left_button(title, args={})
       PM.logger.deprecated "set_nav_bar_right_button and set_nav_bar_left_button have been removed. Use set_nav_bar_button :right/:left instead."

data/lib/ProMotion/screen/screen_module.rb

@@ -1,5 +1,6 @@
 module ProMotion
   module ScreenModule
+    include ProMotion::Support
     include ProMotion::ScreenNavigation
     include ProMotion::Styling
     include ProMotion::NavBarModule
@@ -13,6 +14,7 @@ module ProMotion
       resolve_title
       apply_properties(args)
       add_nav_bar(args) if args[:nav_bar]
+      add_nav_bar_buttons
       tab_bar_setup
       try :on_init
       try :screen_setup
@@ -46,6 +48,10 @@ module ProMotion
       end
     end
 
+    def add_nav_bar_buttons
+      set_nav_bar_button(self.class.get_nav_bar_button[:side], self.class.get_nav_bar_button) if self.class.get_nav_bar_button
+    end
+
     def status_bar_hidden(hidden)
       UIApplication.sharedApplication.setStatusBarHidden(hidden, withAnimation:self.class.status_bar_animation)
     end
@@ -166,10 +172,6 @@ module ProMotion
       return self.view_or_self.frame
     end
 
-    def try(method, *args)
-      send(method, *args) if respond_to?(method)
-    end
-
   private
 
     def apply_properties(args)
@@ -229,6 +231,15 @@ module ProMotion
       def status_bar_animation
         @status_bar_animation || UIStatusBarAnimationSlide
       end
+
+      def nav_bar_button(side, args={})
+        @nav_bar_button_args = args
+        @nav_bar_button_args[:side] = side
+      end
+
+      def get_nav_bar_button
+        @nav_bar_button_args
+      end
     end
 
     def self.included(base)

data/lib/ProMotion/screen/screen_navigation.rb

@@ -1,5 +1,6 @@
 module ProMotion
   module ScreenNavigation
+    include ProMotion::Support
 
     def open_screen(screen, args = {})
       args = { animated: true }.merge(args)
@@ -32,14 +33,6 @@ module ProMotion
       open screen, args.merge({ modal: true })
     end
 
-    def app
-      UIApplication.sharedApplication
-    end
-
-    def app_delegate
-      UIApplication.sharedApplication.delegate
-    end
-
     def close_screen(args = {})
       args ||= {}
       args = { sender: args } unless args.is_a?(Hash)

data/lib/ProMotion/support/support.rb

@@ -0,0 +1,21 @@
+module ProMotion
+  module Support
+
+    def app
+      UIApplication.sharedApplication
+    end
+
+    def app_delegate
+      UIApplication.sharedApplication.delegate
+    end
+
+    def app_window
+      UIApplication.sharedApplication.delegate.window
+    end
+
+    def try(method, *args)
+      send(method, *args) if respond_to?(method)
+    end
+
+  end
+end

data/lib/ProMotion/table/cell/table_view_cell_module.rb

@@ -35,7 +35,7 @@ module ProMotion
     end
 
     def set_title
-      set_attributed_text(self.textLabel, data_cell[:title])
+      set_attributed_text(self.textLabel, data_cell[:title]) if data_cell[:title]
     end
 
     def set_subtitle

data/lib/ProMotion/table/data/table_data.rb

@@ -2,16 +2,16 @@ module ProMotion
   class TableData
     include ProMotion::Table::Utils
 
-    attr_accessor :data, :filtered_data, :search_string, :original_search_string, :filtered, :table_view
+    attr_accessor :data, :filtered_data, :search_string, :original_search_string, :filtered, :table_view, :search_params
 
-    def initialize(data, table_view)
+    def initialize(data, table_view, search_action = nil)
+      @search_action ||= search_action
       self.data = data
       self.table_view = WeakRef.new(table_view)
     end
 
     def section(index)
-      s = sections.at(index)
-      s || { title: nil, cells: [] }
+      sections.at(index) || { cells: [] }
     end
 
     def sections
@@ -39,6 +39,10 @@ module ProMotion
       section(to.section)[:cells].insert(to.row, section(from.section)[:cells].delete_at(from.row))
     end
 
+    def default_search(cell, search_string)
+      cell[:searchable] != false && "#{cell[:title]}\n#{cell[:search_text]}".downcase.strip.include?(search_string.downcase.strip)
+    end
+
     def search(search_string)
       start_searching(search_string)
 
@@ -46,7 +50,11 @@ module ProMotion
         new_section = {}
 
         new_section[:cells] = section[:cells].map do |cell|
-          cell[:searchable] != false && "#{cell[:title]}\n#{cell[:search_text]}".downcase.strip.include?(self.search_string) ? cell : nil
+          if @search_action
+            @search_action.call(cell, search_string)
+          else
+            self.default_search(cell, search_string)
+          end ? cell : nil
         end.compact
 
         if new_section[:cells] && new_section[:cells].length > 0

data/lib/ProMotion/table/extensions/searchable.rb

@@ -16,7 +16,7 @@ module ProMotion
         @table_search_display_controller.searchResultsDataSource = params[:data_source]
         @table_search_display_controller.searchResultsDelegate = params[:search_results_delegate]
 
-        self.table_view.tableHeaderView = search_bar
+        self.tableView.tableHeaderView = search_bar
       end
       alias :makeSearchable :make_searchable
 

data/lib/ProMotion/table/table.rb

@@ -15,7 +15,7 @@ module ProMotion
 
     def screen_setup
       check_table_data
-      set_up_header_view
+      set_up_header_footer_views
       set_up_searchable
       set_up_refreshable
       set_up_longpressable
@@ -27,16 +27,18 @@ module ProMotion
     end
 
     def promotion_table_data
-      @promotion_table_data ||= TableData.new(table_data, table_view)
+      @promotion_table_data ||= TableData.new(table_data, table_view, setup_search_method)
     end
 
-    def set_up_header_view
-      if self.respond_to?(:table_header_view)
-        header_view = self.table_header_view
-        if header_view.is_a? UIView
-          self.tableView.tableHeaderView = header_view
-        else
-          PM.logger.warn "Table header views must be a UIView."
+    def set_up_header_footer_views
+      [:header, :footer].each do |hf_view|
+        if self.respond_to?("table_#{hf_view}_view".to_sym)
+          view = self.send("table_#{hf_view}_view")
+          if view.is_a? UIView
+            self.tableView.send(camelize("set_table_#{hf_view}_view:"), view)
+          else
+            PM.logger.warn "Table #{hf_view} view must be a UIView."
+          end
         end
       end
     end
@@ -44,6 +46,23 @@ module ProMotion
     def set_up_searchable
       if self.class.respond_to?(:get_searchable) && self.class.get_searchable
         self.make_searchable(content_controller: self, search_bar: self.class.get_searchable_params)
+        if self.class.get_searchable_params[:hide_initially]
+          self.tableView.contentOffset = CGPointMake(0, self.searchDisplayController.searchBar.frame.size.height)
+        end
+      end
+    end
+
+    def setup_search_method
+      params = self.class.get_searchable_params
+      if params.nil?
+        return nil
+      else
+        @search_method || begin
+          params = self.class.get_searchable_params
+          @search_action = params[:with] || params[:find_by] || params[:search_by] || params[:filter_by]
+          @search_action = method(@search_action) if @search_action.is_a?(Symbol) || @search_action.is_a?(String)
+          @search_action
+        end
       end
     end
 
@@ -136,9 +155,9 @@ module ProMotion
         new_cell.extend(PM::TableViewCellModule) unless new_cell.is_a?(PM::TableViewCellModule)
         new_cell.autoresizingMask = UIViewAutoresizingFlexibleWidth|UIViewAutoresizingFlexibleLeftMargin|UIViewAutoresizingFlexibleRightMargin
         new_cell.clipsToBounds = true # fix for changed default in 7.1
+        new_cell.send(:on_load) if new_cell.respond_to?(:on_load)
         new_cell
       end
-
       table_cell.setup(data_cell, self) if table_cell.respond_to?(:setup)
       table_cell.send(:on_reuse) if !new_cell && table_cell.respond_to?(:on_reuse)
       table_cell
@@ -167,42 +186,42 @@ module ProMotion
     end
 
     ########## Cocoa touch methods #################
-    def numberOfSectionsInTableView(table_view)
+    def numberOfSectionsInTableView(_)
       self.promotion_table_data.sections.length
     end
 
     # Number of cells
-    def tableView(table_view, numberOfRowsInSection: section)
+    def tableView(_, numberOfRowsInSection: section)
       self.promotion_table_data.section_length(section)
     end
 
-    def tableView(table_view, titleForHeaderInSection: section)
+    def tableView(_, titleForHeaderInSection: section)
       section = promotion_table_data.section(section)
       section && section[:title]
     end
 
     # Set table_data_index if you want the right hand index column (jumplist)
-    def sectionIndexTitlesForTableView(table_view)
+    def sectionIndexTitlesForTableView(_)
       return if self.promotion_table_data.filtered
       return self.table_data_index if self.respond_to?(:table_data_index)
       nil
     end
 
-    def tableView(table_view, cellForRowAtIndexPath: index_path)
+    def tableView(_, cellForRowAtIndexPath: index_path)
       params = index_path_to_section_index(index_path: index_path)
       data_cell = self.promotion_table_data.cell(section: params[:section], index: params[:index])
       return UITableViewCell.alloc.init unless data_cell
       create_table_cell(data_cell)
     end
 
-    def tableView(table_view, willDisplayCell: table_cell, forRowAtIndexPath: index_path)
+    def tableView(_, willDisplayCell: table_cell, forRowAtIndexPath: index_path)
       data_cell = self.promotion_table_data.cell(index_path: index_path)
       table_cell.send(:will_display) if table_cell.respond_to?(:will_display)
       table_cell.send(:restyle!) if table_cell.respond_to?(:restyle!) # Teacup compatibility
     end
 
-    def tableView(table_view, heightForRowAtIndexPath: index_path)
-      (self.promotion_table_data.cell(index_path: index_path)[:height] || table_view.rowHeight).to_f
+    def tableView(_, heightForRowAtIndexPath: index_path)
+      (self.promotion_table_data.cell(index_path: index_path)[:height] || tableView.rowHeight).to_f
     end
 
     def tableView(table_view, didSelectRowAtIndexPath: index_path)
@@ -211,18 +230,18 @@ module ProMotion
       trigger_action(data_cell[:action], data_cell[:arguments], index_path) if data_cell[:action]
     end
 
-    def tableView(table_view, editingStyleForRowAtIndexPath: index_path)
+    def tableView(_, editingStyleForRowAtIndexPath: index_path)
       data_cell = self.promotion_table_data.cell(index_path: index_path, unfiltered: true)
       map_cell_editing_style(data_cell[:editing_style])
     end
 
-    def tableView(table_view, commitEditingStyle: editing_style, forRowAtIndexPath: index_path)
+    def tableView(_, commitEditingStyle: editing_style, forRowAtIndexPath: index_path)
       if editing_style == UITableViewCellEditingStyleDelete
         delete_row(index_path)
       end
     end
 
-    def tableView(tableView, canMoveRowAtIndexPath:index_path)
+    def tableView(_, canMoveRowAtIndexPath:index_path)
       data_cell = self.promotion_table_data.cell(index_path: index_path, unfiltered: true)
 
       if (!data_cell[:moveable].nil? || data_cell[:moveable].is_a?(Symbol)) && data_cell[:moveable] != false
@@ -232,7 +251,7 @@ module ProMotion
       end
     end
 
-    def tableView(tableView, targetIndexPathForMoveFromRowAtIndexPath:source_index_path, toProposedIndexPath:proposed_destination_index_path)
+    def tableView(_, targetIndexPathForMoveFromRowAtIndexPath:source_index_path, toProposedIndexPath:proposed_destination_index_path)
       data_cell = self.promotion_table_data.cell(index_path: source_index_path, unfiltered: true)
 
       if data_cell[:moveable] == :section && source_index_path.section != proposed_destination_index_path.section
@@ -242,7 +261,7 @@ module ProMotion
       end
     end
 
-    def tableView(tableView, moveRowAtIndexPath:from_index_path, toIndexPath:to_index_path)
+    def tableView(_, moveRowAtIndexPath:from_index_path, toIndexPath:to_index_path)
       self.promotion_table_data.move_cell(from_index_path, to_index_path)
 
       if self.respond_to?("on_cell_moved:")
@@ -259,11 +278,11 @@ module ProMotion
       end
     end
 
-    def tableView(tableView, sectionForSectionIndexTitle: title, atIndex: index)
+    def tableView(table_view, sectionForSectionIndexTitle: title, atIndex: index)
       return index unless ["{search}", UITableViewIndexSearch].include?(self.table_data_index[0])
 
       if index == 0
-        tableView.scrollRectToVisible(CGRectMake(0.0, 0.0, 1.0, 1.0), animated: false)
+        table_view.scrollRectToVisible(CGRectMake(0.0, 0.0, 1.0, 1.0), animated: false)
         NSNotFound
       else
         index - 1
@@ -276,7 +295,7 @@ module ProMotion
     end
 
     # Section view methods
-    def tableView(table_view, viewForHeaderInSection: index)
+    def tableView(_, viewForHeaderInSection: index)
       section = promotion_table_data.section(index)
       view = section[:title_view]
       view = section[:title_view].new if section[:title_view].respond_to?(:new)
@@ -284,7 +303,7 @@ module ProMotion
       view
     end
 
-    def tableView(table_view, heightForHeaderInSection: index)
+    def tableView(_, heightForHeaderInSection: index)
       section = promotion_table_data.section(index)
       if section[:title_view] || section[:title].to_s.length > 0
         section[:title_view_height] || tableView.sectionHeaderHeight
@@ -293,6 +312,17 @@ module ProMotion
       end
     end
 
+    def tableView(_, willDisplayHeaderView:view, forSection:section)
+      action = :will_display_header
+      if respond_to?(action)
+        case self.method(action).arity
+        when 0 then self.send(action)
+        when 2 then self.send(action, view, section)
+        else self.send(action, view)
+        end
+      end
+    end
+
     protected
 
     def map_cell_editing_style(symbol)

data/lib/ProMotion/tabs/tabs.rb

@@ -4,6 +4,7 @@ module ProMotion
 
     def open_tab_bar(*screens)
       self.tab_bar = PM::TabBarController.new(screens)
+      self.tab_bar.pm_tab_delegate = WeakRef.new(self)
 
       delegate = self.respond_to?(:open_root_screen) ? self : UIApplication.sharedApplication.delegate
 
@@ -67,6 +68,7 @@ module ProMotion
       tab_bar_item = create_tab_bar_item_custom(title, tab[:item], current_tag) if tab[:item]
 
       tab_bar_item.badgeValue = tab[:badge_number].to_s unless tab[:badge_number].nil? || tab[:badge_number] <= 0
+      tab_bar_item.imageInsets = tab[:image_insets] if tab[:image_insets]
 
       tab_bar_item
     end

data/lib/ProMotion/version.rb

@@ -1,3 +1,3 @@
 module ProMotion
-  VERSION = "2.2.2" unless defined?(ProMotion::VERSION)
+  VERSION = "2.3.0" unless defined?(ProMotion::VERSION)
 end

data/spec/unit/delegate_spec.rb

@@ -79,11 +79,6 @@ describe "PM::Delegate" do
 
     @subject.application(UIApplication.sharedApplication, openURL: url, sourceApplication:sourceApplication, annotation: annotation)
   end
-
-  it "should have an awesome convenience method for UIApplication.sharedApplication" do
-    @subject.app.should == UIApplication.sharedApplication
-  end
-
 end
 
 # iOS 7 ONLY tests

data/spec/unit/screen_helpers_spec.rb

@@ -88,6 +88,11 @@ describe "screen helpers" do
       end
 
     end
+
+    it "allows setting a nav_bar_button with a class method" do
+      screen = DetailScreen.new(nav_bar: true)
+      screen.navigationItem.rightBarButtonItem.class.should == UIBarButtonItem
+    end
   end
 
   describe "screen navigation" do

data/spec/unit/screen_spec.rb

@@ -131,10 +131,6 @@ describe "screen properties" do
     @screen.shouldAutorotateToInterfaceOrientation(UIInterfaceOrientationMaskPortrait)
   end
 
-  it "should have an awesome convenience method for UIApplication.sharedApplication" do
-    @screen.app.should == UIApplication.sharedApplication
-  end
-
   describe "iOS lifecycle methods" do
 
     it "-viewDidLoad" do

data/spec/unit/searchable_table_spec.rb

@@ -58,4 +58,49 @@ describe "Searchable table spec" do
     controller.searchDisplayController(controller, didLoadSearchResultsTableView: tableView)
   end
 
+  describe "custom search" do
+    before do
+      @stabby_controller = TableScreenStabbySearchable.new
+      @proc_controller   = TableScreenSymbolSearchable.new
+    end
+
+    after do
+      @stabby_controller = nil
+      @proc_controller = nil
+    end
+
+    it "should allow searching for all the 'New' states using a custom search proc" do
+      @stabby_controller.searchDisplayController(@stabby_controller, shouldReloadTableForSearchString:"New Stabby")
+      @stabby_controller.tableView(@stabby_controller.tableView, numberOfRowsInSection:0).should == 4
+      rows = @stabby_controller.promotion_table_data.search("New stabby")
+      rows.first[:cells].length.should == 4
+      rows.first[:cells].each do |row|
+        # Starts with "New" and ends with "stabby"
+        row[:properties][:searched_title].should.match(/^New(.+)?stabby$/)
+      end
+    end
+
+    it "should allow searching for all the 'New' states using a symbol as a search proc" do
+      @proc_controller.searchDisplayController(@proc_controller, shouldReloadTableForSearchString:"New Symbol")
+      cell_count = @proc_controller.tableView(@proc_controller.tableView, numberOfRowsInSection:0)
+      cell_count.should == 4
+      rows = @proc_controller.promotion_table_data.search("New Symbol")
+      rows.first[:cells].length.should == 4
+      rows.first[:cells].each do |row|
+        # Starts with "New" and ends with "symbol"
+        row[:properties][:searched_title].should.match(/^New(.+)?symbol$/)
+      end
+    end
+
+    it "custom searches empty with stabby proc if there is no match" do
+      @stabby_controller.searchDisplayController(@stabby_controller, shouldReloadTableForSearchString:"Totally Bogus")
+      @stabby_controller.tableView(@stabby_controller.tableView, numberOfRowsInSection:0).should == 0
+    end
+
+    it "custom searches empty with symbol for proc if there is no match" do
+      @proc_controller.searchDisplayController(@proc_controller, shouldReloadTableForSearchString:"Totally Bogus")
+      @proc_controller.tableView(@proc_controller.tableView, numberOfRowsInSection:0).should == 0
+    end
+
+  end
 end

data/spec/unit/split_screen_spec.rb

@@ -1,46 +1,53 @@
 describe "split screen functionality" do
 
-  before do
-    @app = TestDelegate.new
+  def master_screen
+    @master_screen ||= MasterScreen.new nav_bar: true
+  end
 
-    @master_screen = MasterScreen.new nav_bar: true
-    @detail_screen = DetailScreen.new # no nav_bar on this one
+  def detail_screen
+    @detail_screen ||= DetailScreen.new # no nav_bar on this one
+  end
 
-    @split_screen = @app.open_split_screen @master_screen, @detail_screen
+  def app
+    @app ||= TestDelegate.new
+  end
+
+  def split_screen
+    @split_screen ||= app.open_split_screen master_screen, detail_screen
   end
 
   after do
-    @split_screen.delegate = nil # dereference to avoid memory issue
+    split_screen.delegate = nil # dereference to avoid memory issue
   end
 
   it "should have created a split screen" do
-    @split_screen.should != nil
-    @split_screen.is_a?(UISplitViewController).should == true
+    split_screen.should != nil
+    split_screen.is_a?(UISplitViewController).should == true
   end
 
   it "should have two viewControllers" do
-    @split_screen.viewControllers.length.should == 2
+    split_screen.viewControllers.length.should == 2
   end
 
   it "should set the root view to the UISplitScreenViewController" do
-    @app.window.rootViewController.should == @split_screen
+    app.window.rootViewController.should == split_screen
   end
 
   it "should set the first viewController to MasterScreen" do
-    @split_screen.master_screen.should == @master_screen
-    @split_screen.viewControllers.first.should == (@master_screen.navigationController || @master_screen)
+    split_screen.master_screen.should == master_screen
+    split_screen.viewControllers.first.should == (master_screen.navigationController || master_screen)
   end
 
   it "should set the second viewController to DetailScreen" do
-    @split_screen.detail_screen.should == @detail_screen
-    @split_screen.viewControllers.last.should == (@detail_screen.navigationController || @detail_screen)
+    split_screen.detail_screen.should == detail_screen
+    split_screen.viewControllers.last.should == (detail_screen.navigationController || detail_screen)
   end
 
   it "should set the title on both screens" do
-    @master_screen.class.title.should == "Master"
-    @master_screen.title.should == "Master"
-    @detail_screen.class.title.should == "Detail"
-    @detail_screen.title.should == "Detail"
+    master_screen.class.title.should == "Master"
+    master_screen.title.should == "Master"
+    detail_screen.class.title.should == "Detail"
+    detail_screen.title.should == "Detail"
   end
 end
 

data/spec/unit/support_spec.rb

@@ -0,0 +1,45 @@
+describe "PM::Support" do
+
+  before do
+    @app = TestDelegate.new
+    @screen = BasicScreen.new
+    @tab_screen = TabScreen.new
+    @table_screen = TestTableScreen.new
+    @web_screen = TestWebScreen.new
+  end
+
+  it "has a convenience method for UIApplication.sharedApplication" do
+    @app.app.should == UIApplication.sharedApplication
+    @screen.app.should == UIApplication.sharedApplication
+    @tab_screen.app.should == UIApplication.sharedApplication
+    @table_screen.app.should == UIApplication.sharedApplication
+    @web_screen.app.should == UIApplication.sharedApplication
+  end
+
+  it "has a convenience method for UIApplication.sharedApplication.delegate" do
+    @app.app_delegate.should == UIApplication.sharedApplication.delegate
+    @screen.app_delegate.should == UIApplication.sharedApplication.delegate
+    @tab_screen.app_delegate.should == UIApplication.sharedApplication.delegate
+    @table_screen.app_delegate.should == UIApplication.sharedApplication.delegate
+    @web_screen.app_delegate.should == UIApplication.sharedApplication.delegate
+  end
+
+  it "has a convenience method for UIApplication.sharedApplication.delegate.window" do
+    @app.app_window.should == UIApplication.sharedApplication.delegate.window
+    @screen.app_window.should == UIApplication.sharedApplication.delegate.window
+    @tab_screen.app_window.should == UIApplication.sharedApplication.delegate.window
+    @table_screen.app_window.should == UIApplication.sharedApplication.delegate.window
+    @web_screen.app_window.should == UIApplication.sharedApplication.delegate.window
+  end
+
+  it "has a try method" do
+    @app.try(:some_method).should == nil
+    @screen.try(:some_method).should == nil
+    @tab_screen.try(:some_method).should == nil
+    @table_screen.try(:some_method).should == nil
+    @web_screen.try(:some_method).should == nil
+  end
+
+end
+
+

data/spec/unit/tab_bar_spec.rb

@@ -19,6 +19,17 @@ describe "PM::Tabs" do
     app.window.rootViewController.should.be.kind_of UITabBarController
   end
 
+  it "should set the the pm_tab_delegate to the opener" do
+    tab_bar.pm_tab_delegate.should.equal(app)
+    tab_bar.delegate.should.equal(tab_bar)
+  end
+
+  it "should call on_tab_selected when a tab is selected" do
+    tab_bar.pm_tab_delegate.called_on_tab_selected = false
+    @screen1.open_tab "Screen 2"
+    tab_bar.pm_tab_delegate.called_on_tab_selected.should.be.true
+  end
+
   it "should have four tabs" do
     tab_bar.viewControllers.length.should == 4
   end

data/spec/unit/tab_spec.rb

@@ -25,6 +25,10 @@ describe "tab bar functionality" do
     @tab_bar.tabBar.items.first.title.should == "Tab Item"
   end
 
+  it "should allow setting image insets" do
+    @tab_bar.tabBar.items.first.imageInsets.should == UIEdgeInsetsMake(5,5,5,5)
+  end
+
   it "should have set the others to their respective titles" do
     @tab_bar.tabBar.items[1].title.should == "Basic"
     @tab_bar.tabBar.items[2].title.should == "Home"

data/spec/unit/tables/table_module_spec.rb

@@ -175,6 +175,10 @@ describe "PM::Table module" do
     @subject.tableView.tableHeaderView.class.should == UIImageView
   end
 
+  it "should have a footer view" do
+    @subject.tableView.tableFooterView.class.should == UIView
+  end
+
   describe("section with custom title_view") do
 
     it "should use the correct class for section view" do
@@ -196,4 +200,19 @@ describe "PM::Table module" do
     end
   end
 
+  describe "header view modifications" do
+
+    it "should call will_display_header" do
+      header = @subject.tableView(@subject.table_view, viewForHeaderInSection: 4)
+      @subject.tableView(@subject.table_view, willDisplayHeaderView:header, forSection:1)
+
+      @subject.got_will_display_header.tap do |h|
+        h.nil?.should == false
+        h[:section].should == 1
+        h[:view].should == header
+      end
+    end
+
+  end
+
 end

data/spec/unit/tables/table_screen_spec.rb

@@ -80,6 +80,19 @@ describe "table screens" 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ProMotion
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.0
 platform: ruby
 authors:
 - Jamon Holmgren
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2015-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: methadone
@@ -116,6 +116,7 @@ files:
 - lib/ProMotion/stubs/dummy_image_view.rb
 - lib/ProMotion/stubs/dummy_view.rb
 - lib/ProMotion/styling/styling.rb
+- lib/ProMotion/support/support.rb
 - lib/ProMotion/table/cell/table_view_cell_module.rb
 - lib/ProMotion/table/data/table_data.rb
 - lib/ProMotion/table/extensions/indexable.rb
@@ -151,6 +152,7 @@ files:
 - spec/unit/split_screen_in_tab_bar_spec.rb
 - spec/unit/split_screen_open_screen_spec.rb
 - spec/unit/split_screen_spec.rb
+- spec/unit/support_spec.rb
 - spec/unit/tab_bar_spec.rb
 - spec/unit/tab_spec.rb
 - spec/unit/tables/table_indexable_spec.rb
@@ -210,6 +212,7 @@ test_files:
 - spec/unit/split_screen_in_tab_bar_spec.rb
 - spec/unit/split_screen_open_screen_spec.rb
 - spec/unit/split_screen_spec.rb
+- spec/unit/support_spec.rb
 - spec/unit/tab_bar_spec.rb
 - spec/unit/tab_spec.rb
 - spec/unit/tables/table_indexable_spec.rb