ProMotion 2.3.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22dee782b5f904dab39ce97ce900fe1012daf866
-  data.tar.gz: 92a7e426f1d01a67fa8a8431d23f912109e14322
+  metadata.gz: 78d4da42d437262fe73051ce835ad8753426509b
+  data.tar.gz: eddb27a4dea01d3e8bca74b058516d7440a31f05
 SHA512:
-  metadata.gz: ad1fd5927fa02167ecb552141242827953fc22288e625ab342ec592ff2ef26da757f76c37f7d88657cb5df7968873ca97188fd99f3abd7d545f324d4328cdc0b
-  data.tar.gz: 773bb526a2679efdc727e460e59b087cdb8d599c3264c6838279605af19117ba0cbd2bf600c8849cffe2ee90a54732dc39608e67f616033d7edd8cffe6ea0b68
+  metadata.gz: db287d8260bf8fd89f2a2652e381ef11731694c81bec03cb0b0478286f5dbc70d22c919378e25679fe6bd4c180e77c826d22c6371a501c9817c5787d86900945
+  data.tar.gz: d5a780fa6df0bd7daab53f072d6f063f4fffd3f1eb1f0dc4a00e3f546b0b5827dd625a9fa851e1d2a36ad89f1949197cd22aa984484001e9d7e9ddac8b9296a9

data/README.md

@@ -91,6 +91,16 @@ end
 
 # Changelog
 
+## Version 2.4.0
+
+This release includes several new features and is backwards compatible with all 2.x releases.
+
+* PR #686 Adds :searchable to the whitelisted properties a cell can have so that a warning is not generated.
+* PR #688 Adds support for SDWebImage and takes preference over JMImageCache. _JMImageCache will still be supported till ProMotion 3.0 but we highly recommend you switch to SDWebImage._
+* PR #679 Extract methods from tablescreen for reuse in modules for [redpotion](https://github.com/infinitered/redpotion).
+* PR #677 Added `add_child_screen` and `remove_child_screen` methods to `PM::Screen`.
+* PR #687 Adds persisting tab order when changed by the user for tab bars over 5 screens.
+
 ## Version 2.3.0
 
 This release includes several new features and is backwards compatible with all 2.x releases.

data/lib/ProMotion.rb

@@ -24,8 +24,13 @@ Motion::Project::App.setup do |app|
     ],
     "#{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" ],
+    "#{core_lib}/table/data/table_data.rb" => [
+      "#{core_lib}/table/data/table_data_builder.rb",
+      "#{core_lib}/table/table.rb"
+    ],
     "#{core_lib}/table/table.rb" => [
+      "#{core_lib}/table/table_class_methods.rb",
+      "#{core_lib}/table/table_builder.rb",
       "#{core_lib}/table/table_utils.rb",
       "#{core_lib}/table/extensions/searchable.rb",
       "#{core_lib}/table/extensions/refreshable.rb",

data/lib/ProMotion/cocoatouch/tab_bar_controller.rb

@@ -1,7 +1,6 @@
 module ProMotion
   class TabBarController < UITabBarController
-
-    attr_accessor :pm_tab_delegate
+    attr_accessor :pm_tab_delegate, :name
 
     def self.new(*screens)
       tab_bar_controller = alloc.init
@@ -17,10 +16,25 @@ module ProMotion
       end
 
       tab_bar_controller.viewControllers = view_controllers
+      name = ""
       tab_bar_controller.delegate = tab_bar_controller
       tab_bar_controller
     end
 
+    def name=(n)
+      @name = n
+      tab_bar_order = NSUserDefaults.standardUserDefaults.arrayForKey("tab_bar_order_#{@name}")
+      if tab_bar_order
+        sorted_controllers = []
+        unsorted_controllers = self.viewControllers.copy
+        tab_bar_order.each do |order|
+          sorted_controllers << unsorted_controllers[order]
+        end
+        self.viewControllers = sorted_controllers
+        open_tab(0) # Open the tab on the far left
+      end
+    end
+
     def open_tab(tab)
       if tab.is_a? String
         selected_tab_vc = find_tab(tab)
@@ -48,6 +62,14 @@ module ProMotion
       on_tab_selected_try(vc)
     end
 
+    def tabBarController(tbc, didEndCustomizingViewControllers:vcs, changed:changed)
+      if changed
+        tab_order = vcs.map{ |vc| vc.tabBarItem.tag }
+        NSUserDefaults.standardUserDefaults.setObject(tab_order, forKey:"tab_bar_order_#{@name}")
+        NSUserDefaults.standardUserDefaults.synchronize
+      end
+    end
+
     def shouldAutorotate
       current_view_controller_try(:shouldAutorotate)
     end

data/lib/ProMotion/screen/screen_module.rb

@@ -25,45 +25,6 @@ module ProMotion
       self.modal == true
     end
 
-    def resolve_title
-      case self.class.title_type
-      when :text then self.title = self.class.title
-      when :view then self.navigationItem.titleView = self.class.title
-      when :image then self.navigationItem.titleView = UIImageView.alloc.initWithImage(self.class.title)
-      else
-        PM.logger.warn("title expects string, UIView, or UIImage, but #{self.class.title.class.to_s} given.")
-      end
-    end
-
-    def resolve_status_bar
-      case self.class.status_bar_type
-      when :none
-        status_bar_hidden true
-      when :light
-        status_bar_hidden false
-        status_bar_style UIStatusBarStyleLightContent
-      when :dark
-        status_bar_hidden false
-        status_bar_style UIStatusBarStyleDefault
-      else
-        status_bar_hidden false
-        global_style = NSBundle.mainBundle.objectForInfoDictionaryKey("UIStatusBarStyle")
-        status_bar_style global_style ? Object.const_get(global_style) : UIStatusBarStyleDefault
-      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
-
-    def status_bar_style(style)
-      UIApplication.sharedApplication.setStatusBarStyle(style)
-    end
-
     def parent_screen=(parent)
       @parent_screen = WeakRef.new(parent)
     end
@@ -176,10 +137,64 @@ module ProMotion
       return self.view_or_self.frame
     end
 
+    def add_child_screen(screen)
+      screen = screen.new if screen.respond_to?(:new)
+      addChildViewController(screen)
+      screen.parent_screen = WeakRef.new(self)
+      screen.didMoveToParentViewController(self) # Required
+      screen
+    end
+
+    def remove_child_screen(screen)
+      screen.parent_screen = nil
+      screen.willMoveToParentViewController(nil) # Required
+      screen.removeFromParentViewController
+      screen
+    end
+
   private
 
+    def resolve_title
+      case self.class.title_type
+      when :text then self.title = self.class.title
+      when :view then self.navigationItem.titleView = self.class.title
+      when :image then self.navigationItem.titleView = UIImageView.alloc.initWithImage(self.class.title)
+      else
+        PM.logger.warn("title expects string, UIView, or UIImage, but #{self.class.title.class.to_s} given.")
+      end
+    end
+
+    def resolve_status_bar
+      case self.class.status_bar_type
+      when :none
+        status_bar_hidden true
+      when :light
+        status_bar_hidden false
+        status_bar_style UIStatusBarStyleLightContent
+      when :dark
+        status_bar_hidden false
+        status_bar_style UIStatusBarStyleDefault
+      else
+        status_bar_hidden false
+        global_style = NSBundle.mainBundle.objectForInfoDictionaryKey("UIStatusBarStyle")
+        status_bar_style global_style ? Object.const_get(global_style) : UIStatusBarStyleDefault
+      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
+
+    def status_bar_style(style)
+      UIApplication.sharedApplication.setStatusBarStyle(style)
+    end
+
     def apply_properties(args)
-      reserved_args = [ :nav_bar, :hide_nav_bar, :hide_tab_bar, :animated, :close_all, :in_tab, :in_detail, :in_master, :to_screen ]
+      reserved_args = [ :nav_bar, :hide_nav_bar, :hide_tab_bar, :animated, :close_all, :in_tab, :in_detail, :in_master, :to_screen, :toolbar ]
       set_attributes self, args.dup.delete_if { |k,v| reserved_args.include?(k) }
     end
 

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

@@ -23,7 +23,7 @@ module ProMotion
 
     # TODO: Remove this in ProMotion 2.1. Just for migration purposes.
     def check_deprecated_styles
-      whitelist = [ :title, :subtitle, :image, :remote_image, :accessory, :selection_style, :action, :long_press_action, :arguments, :cell_style, :cell_class, :cell_identifier, :editing_style, :moveable, :search_text, :keep_selection, :height, :accessory_type, :style, :properties ]
+      whitelist = [ :title, :subtitle, :image, :remote_image, :accessory, :selection_style, :action, :long_press_action, :arguments, :cell_style, :cell_class, :cell_identifier, :editing_style, :moveable, :search_text, :keep_selection, :height, :accessory_type, :style, :properties, :searchable ]
       if (data_cell.keys - whitelist).length > 0
         PM.logger.deprecated("In #{self.table_screen.class.to_s}#table_data, you should set :#{(data_cell.keys - whitelist).join(", :")} in a `properties:` hash. See TableScreen documentation.")
       end
@@ -46,13 +46,26 @@ module ProMotion
     end
 
     def set_remote_image
-      return unless data_cell[:remote_image] && jm_image_cache?
+      return unless data_cell[:remote_image] && (sd_web_image? || jm_image_cache?)
 
       self.imageView.image = remote_placeholder
-      JMImageCache.sharedCache.imageForURL(data_cell[:remote_image][:url].to_url, completionBlock:proc { |downloaded_image|
-        self.imageView.image = downloaded_image
-        self.setNeedsLayout
-      })
+
+      if sd_web_image?
+        @remote_image_operation = SDWebImageManager.sharedManager.downloadWithURL(data_cell[:remote_image][:url].to_url,
+          options:SDWebImageRefreshCached,
+          progress:nil,
+          completed: -> image, error, cacheType, finished {
+            self.imageView.image = image unless image.nil?
+        })
+      elsif jm_image_cache?
+        PM.logger.warning "'JMImageCache' is known to have issues with ProMotion. Please consider switching to 'SDWebImage'. 'JMImageCache' support will be deprecated in the next major version."
+        JMImageCache.sharedCache.imageForURL(data_cell[:remote_image][:url].to_url, completionBlock:proc { |downloaded_image|
+          self.imageView.image = downloaded_image
+          self.setNeedsLayout
+        })
+      else
+        PM.logger.error "To use remote_image with TableScreen you need to include the CocoaPod 'SDWebImage'."
+      end
 
       self.imageView.layer.masksToBounds = true
       self.imageView.layer.cornerRadius = data_cell[:remote_image][:radius] if data_cell[:remote_image][:radius]
@@ -89,12 +102,25 @@ module ProMotion
       self.accessoryType = map_accessory_type_symbol(data_cell[:accessory_type]) if data_cell[:accessory_type]
     end
 
+    def prepareForReuse
+      super
+      if @remote_image_operation && @remote_image_operation.respond_to?(:cancel)
+        @remote_image_operation.cancel
+        @remote_image_operation = nil
+      end
+      self.send(:prepare_for_reuse) if self.respond_to?(:prepare_for_reuse)
+    end
+
   private
 
+    def sd_web_image?
+      return false if RUBYMOTION_ENV == 'test'
+      !!defined?(SDWebImageManager)
+    end
+
     def jm_image_cache?
       return false if RUBYMOTION_ENV == 'test'
-      return true if self.imageView.respond_to?("setImageWithURL:placeholder:")
-      PM.logger.error "ProMotion Warning: to use remote_image with TableScreen you need to include the CocoaPod 'JMImageCache'."
+      !!defined?(JMImageCache)
       false
     end
 

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

@@ -1,6 +1,7 @@
 module ProMotion
   class TableData
     include ProMotion::Table::Utils
+    include ProMotion::TableDataBuilder
 
     attr_accessor :data, :filtered_data, :search_string, :original_search_string, :filtered, :table_view, :search_params
 
@@ -73,34 +74,6 @@ module ProMotion
       self.original_search_string = false
     end
 
-    def set_data_cell_defaults(data_cell)
-      data_cell[:cell_style] ||= begin
-        data_cell[:subtitle] ? UITableViewCellStyleSubtitle : UITableViewCellStyleDefault
-      end
-      data_cell[:cell_class] ||= PM::TableViewCell
-      data_cell[:cell_identifier] ||= build_cell_identifier(data_cell)
-      data_cell[:properties] ||= data_cell[:style] || data_cell[:styles]
-
-      data_cell[:accessory] = {
-        view: data_cell[:accessory],
-        value: data_cell[:accessory_value],
-        action: data_cell[:accessory_action],
-        arguments: data_cell[:accessory_arguments]
-      } unless data_cell[:accessory].nil? || data_cell[:accessory].is_a?(Hash)
-
-      data_cell
-    end
-
-    def build_cell_identifier(data_cell)
-      ident = "#{data_cell[:cell_class].to_s}"
-      ident << "-#{data_cell[:stylename].to_s}" if data_cell[:stylename] # For Teacup
-      ident << "-accessory" if data_cell[:accessory]
-      ident << "-subtitle" if data_cell[:subtitle]
-      ident << "-remoteimage" if data_cell[:remote_image]
-      ident << "-image" if data_cell[:image]
-      ident
-    end
-
   private
 
     def start_searching(search_string)

data/lib/ProMotion/table/data/table_data_builder.rb

@@ -0,0 +1,31 @@
+module ProMotion
+  module TableDataBuilder
+    def set_data_cell_defaults(data_cell)
+      data_cell[:cell_style] ||= begin
+        data_cell[:subtitle] ? UITableViewCellStyleSubtitle : UITableViewCellStyleDefault
+      end
+      data_cell[:cell_class] ||= PM::TableViewCell
+      data_cell[:cell_identifier] ||= build_cell_identifier(data_cell)
+      data_cell[:properties] ||= data_cell[:style] || data_cell[:styles]
+
+      data_cell[:accessory] = {
+        view: data_cell[:accessory],
+        value: data_cell[:accessory_value],
+        action: data_cell[:accessory_action],
+        arguments: data_cell[:accessory_arguments]
+      } unless data_cell[:accessory].nil? || data_cell[:accessory].is_a?(Hash)
+
+      data_cell
+    end
+
+    def build_cell_identifier(data_cell)
+      ident = "#{data_cell[:cell_class].to_s}"
+      ident << "-#{data_cell[:stylename].to_s}" if data_cell[:stylename] # For Teacup
+      ident << "-accessory" if data_cell[:accessory]
+      ident << "-subtitle" if data_cell[:subtitle]
+      ident << "-remoteimage" if data_cell[:remote_image]
+      ident << "-image" if data_cell[:image]
+      ident
+    end
+  end
+end

data/lib/ProMotion/table/grouped_table_screen.rb

@@ -1,6 +1,7 @@
 module ProMotion
   class GroupedTableScreen < TableViewController
     include ProMotion::ScreenModule
+    include ProMotion::TableBuilder
     include ProMotion::Table
     include ProMotion::Table::Utils # Workaround until https://hipbyte.freshdesk.com/support/tickets/2086 is fixed.
     include ProMotion::GroupedTable

data/lib/ProMotion/table/table.rb

@@ -6,6 +6,7 @@ module ProMotion
     include ProMotion::Table::Indexable
     include ProMotion::Table::Longpressable
     include ProMotion::Table::Utils
+    include ProMotion::TableBuilder
 
     attr_reader :promotion_table_data
 
@@ -129,15 +130,6 @@ module ProMotion
       @table_search_display_controller.searchResultsTableView.reloadData if searching?
     end
 
-    def trigger_action(action, arguments, index_path)
-      return PM.logger.info "Action not implemented: #{action.to_s}" unless self.respond_to?(action)
-      case self.method(action).arity
-      when 0 then self.send(action) # Just call the method
-      when 2 then self.send(action, arguments, index_path) # Send arguments and index path
-      else self.send(action, arguments) # Send arguments
-      end
-    end
-
     def accessory_toggled_switch(switch)
       table_cell = closest_parent(UITableViewCell, switch)
       index_path = closest_parent(UITableView, table_cell).indexPathForCell(table_cell)
@@ -162,29 +154,6 @@ module ProMotion
       table_view.deleteRowsAtIndexPaths(deletable_index_paths, withRowAnimation: map_row_animation_symbol(animation)) if deletable_index_paths.length > 0
     end
 
-    def create_table_cell(data_cell)
-      new_cell = nil
-      table_cell = table_view.dequeueReusableCellWithIdentifier(data_cell[:cell_identifier]) || begin
-        new_cell = data_cell[:cell_class].alloc.initWithStyle(data_cell[:cell_style], reuseIdentifier:data_cell[:cell_identifier])
-        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
-        on_cell_created new_cell, data_cell
-        new_cell
-      end
-      table_cell.setup(data_cell, self) if table_cell.respond_to?(:setup)
-      on_cell_reused(table_cell, data_cell) if !new_cell
-      table_cell
-    end
-
-    def on_cell_created(new_cell, data_cell)
-      new_cell.send(:on_load) if new_cell.respond_to?(:on_load)
-    end
-
-    def on_cell_reused(cell, data)
-      cell.send(:on_reuse) if cell.respond_to?(:on_reuse)
-    end
-
     def update_table_data(args = {})
       args = { index_paths: args } unless args.is_a?(Hash)
 
@@ -371,85 +340,6 @@ module ProMotion
       }[symbol] || symbol || UITableViewRowAnimationAutomatic
     end
 
-    module TableClassMethods
-      def table_style
-        UITableViewStylePlain
-      end
-
-      def row_height(height, args={})
-        if height == :auto
-          if UIDevice.currentDevice.systemVersion.to_f < 8.0
-            height = args[:estimated] || 44.0
-            PM.logger.warn "Using `row_height :auto` is not supported in iOS 7 apps. Setting to #{height}."
-          else
-            height = UITableViewAutomaticDimension
-          end
-        end
-        args[:estimated] ||= height unless height == UITableViewAutomaticDimension
-        @row_height = { height: height, estimated: args[:estimated] || 44.0 }
-      end
-
-      def get_row_height
-        @row_height ||= nil
-      end
-
-      # Searchable
-      def searchable(params={})
-        @searchable_params = params
-        @searchable = true
-      end
-
-      def get_searchable_params
-        @searchable_params ||= nil
-      end
-
-      def get_searchable
-        @searchable ||= false
-      end
-
-      # Refreshable
-      def refreshable(params = {})
-        @refreshable_params = params
-        @refreshable = true
-      end
-
-      def get_refreshable
-        @refreshable ||= false
-      end
-
-      def get_refreshable_params
-        @refreshable_params ||= nil
-      end
-
-      # Indexable
-      def indexable(params = {})
-        @indexable_params = params
-        @indexable = true
-      end
-
-      def get_indexable
-        @indexable ||= false
-      end
-
-      def get_indexable_params
-        @indexable_params ||= nil
-      end
-
-      # Longpressable
-      def longpressable(params = {})
-        @longpressable_params = params
-        @longpressable = true
-      end
-
-      def get_longpressable
-        @longpressable ||= false
-      end
-
-      def get_longpressable_params
-        @longpressable_params ||= nil
-      end
-    end
-
     def self.included(base)
       base.extend(TableClassMethods)
     end

data/lib/ProMotion/table/table_builder.rb

@@ -0,0 +1,35 @@
+module ProMotion
+  module TableBuilder
+    def trigger_action(action, arguments, index_path)
+      return PM.logger.info "Action not implemented: #{action.to_s}" unless self.respond_to?(action)
+      case self.method(action).arity
+      when 0 then self.send(action) # Just call the method
+      when 2 then self.send(action, arguments, index_path) # Send arguments and index path
+      else self.send(action, arguments) # Send arguments
+      end
+    end
+
+    def create_table_cell(data_cell)
+      new_cell = nil
+      table_cell = table_view.dequeueReusableCellWithIdentifier(data_cell[:cell_identifier]) || begin
+        new_cell = data_cell[:cell_class].alloc.initWithStyle(data_cell[:cell_style], reuseIdentifier:data_cell[:cell_identifier])
+        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
+        on_cell_created new_cell, data_cell
+        new_cell
+      end
+      table_cell.setup(data_cell, self) if table_cell.respond_to?(:setup)
+      on_cell_reused(table_cell, data_cell) if !new_cell
+      table_cell
+    end
+
+    def on_cell_created(new_cell, data_cell)
+      new_cell.send(:on_load) if new_cell.respond_to?(:on_load)
+    end
+
+    def on_cell_reused(cell, data)
+      cell.send(:on_reuse) if cell.respond_to?(:on_reuse)
+    end
+  end
+end

data/lib/ProMotion/table/table_class_methods.rb

@@ -0,0 +1,78 @@
+module TableClassMethods
+  def table_style
+    UITableViewStylePlain
+  end
+
+  def row_height(height, args={})
+    if height == :auto
+      if UIDevice.currentDevice.systemVersion.to_f < 8.0
+        height = args[:estimated] || 44.0
+        PM.logger.warn "Using `row_height :auto` is not supported in iOS 7 apps. Setting to #{height}."
+      else
+        height = UITableViewAutomaticDimension
+      end
+    end
+    args[:estimated] ||= height unless height == UITableViewAutomaticDimension
+    @row_height = { height: height, estimated: args[:estimated] || 44.0 }
+  end
+
+  def get_row_height
+    @row_height ||= nil
+  end
+
+  # Searchable
+  def searchable(params={})
+    @searchable_params = params
+    @searchable = true
+  end
+
+  def get_searchable_params
+    @searchable_params ||= nil
+  end
+
+  def get_searchable
+    @searchable ||= false
+  end
+
+  # Refreshable
+  def refreshable(params = {})
+    @refreshable_params = params
+    @refreshable = true
+  end
+
+  def get_refreshable
+    @refreshable ||= false
+  end
+
+  def get_refreshable_params
+    @refreshable_params ||= nil
+  end
+
+  # Indexable
+  def indexable(params = {})
+    @indexable_params = params
+    @indexable = true
+  end
+
+  def get_indexable
+    @indexable ||= false
+  end
+
+  def get_indexable_params
+    @indexable_params ||= nil
+  end
+
+  # Longpressable
+  def longpressable(params = {})
+    @longpressable_params = params
+    @longpressable = true
+  end
+
+  def get_longpressable
+    @longpressable ||= false
+  end
+
+  def get_longpressable_params
+    @longpressable_params ||= nil
+  end
+end

data/lib/ProMotion/table/table_screen.rb

@@ -1,6 +1,7 @@
 module ProMotion
   class TableScreen < TableViewController
     include ProMotion::ScreenModule
+    include ProMotion::TableBuilder
     include ProMotion::Table
   end
 end

data/lib/ProMotion/version.rb

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

data/spec/functional/func_table_screen_cell_spec.rb

@@ -38,7 +38,33 @@ describe "ProMotion::TableScreen functionality" do
     end
   end
 
-end
+  it "no cells have fired prepare_for_reuse before scrolling" do
+    ip = NSIndexPath.indexPathForRow(0, inSection: 0)
+    cell = table_screen.tableView(table_screen.table_view, cellForRowAtIndexPath: ip)
+    cell.prepare_for_reuse_fired.should.not == true
+  end
 
+  it "cell has fired prepare_for_reuse after scrolling" do
+    ip = NSIndexPath.indexPathForRow(10, inSection: 0)
+    table_screen.tableView.scrollToRowAtIndexPath(ip, atScrollPosition: UITableViewScrollPositionTop, animated: false)
+    wait 0.001 do
+      ip = NSIndexPath.indexPathForRow(0, inSection: 0)
+      table_screen.tableView.scrollToRowAtIndexPath(ip, atScrollPosition: UITableViewScrollPositionTop, animated: false)
+
+      cell = views(TestCell).first
+      cell.prepare_for_reuse_fired.should == true
+    end
+  end
 
+  it "should fire prepare_for_reuse before on_reuse" do
+    ip = NSIndexPath.indexPathForRow(10, inSection: 0)
+    table_screen.tableView.scrollToRowAtIndexPath(ip, atScrollPosition: UITableViewScrollPositionTop, animated: false)
+    wait 0.001 do
+      ip = NSIndexPath.indexPathForRow(0, inSection: 0)
+      table_screen.tableView.scrollToRowAtIndexPath(ip, atScrollPosition: UITableViewScrollPositionTop, animated: false)
 
+      cell = views(TestCell).first
+      cell.prepare_for_reuse_time.should < cell.on_reuse_time
+    end
+  end
+end

data/spec/unit/screen_spec.rb

@@ -316,19 +316,19 @@ describe "screen with toolbar" do
 
   it "showing" do
     # Simulate AppDelegate setup of main screen
-    screen = HomeScreen.new modal: true, nav_bar: true, toolbar: true
+    screen = HomeScreen.new(nav_bar: true, modal: true, toolbar: true)
     screen.on_load
     screen.navigationController.toolbarHidden?.should == false
   end
 
   it "hidden" do
-    screen = HomeScreen.new modal: true, nav_bar: true, toolbar: false
+    screen = HomeScreen.new(nav_bar: true, modal: true, toolbar: false)
     screen.on_load
     screen.navigationController.toolbarHidden?.should == true
   end
 
   it "adds a single item" do
-    screen = HomeScreen.new modal: true, nav_bar: true, toolbar: true
+    screen = HomeScreen.new(nav_bar: true, modal: true, toolbar: true)
     screen.on_load
     screen.set_toolbar_button([{title: "Testing Toolbar"}])
 
@@ -339,7 +339,7 @@ describe "screen with toolbar" do
   end
 
   it "adds multiple items" do
-    screen = HomeScreen.new modal: true, nav_bar: true, toolbar: true
+    screen = HomeScreen.new(nav_bar: true, modal: true, toolbar: true)
     screen.set_toolbar_buttons [{title: "Testing Toolbar"}, {title: "Another Test"}]
 
     screen.navigationController.toolbar.items.should.be.instance_of Array
@@ -349,7 +349,7 @@ describe "screen with toolbar" do
   end
 
   it "shows the toolbar when setting items" do
-    screen = HomeScreen.new modal: true, nav_bar: true, toolbar: false
+    screen = HomeScreen.new(nav_bar: true, modal: true, toolbar: false)
     screen.on_load
     screen.navigationController.toolbarHidden?.should == true
     screen.set_toolbar_button([{title: "Testing Toolbar"}], false)
@@ -357,21 +357,21 @@ describe "screen with toolbar" do
   end
 
   it "doesn't show the toolbar when passed nil" do
-    screen = HomeScreen.new modal: true, nav_bar: true, toolbar: true
+    screen = HomeScreen.new(nav_bar: true, modal: true, toolbar: true)
     screen.on_load
     screen.set_toolbar_button(nil, false)
     screen.navigationController.toolbarHidden?.should == true
   end
 
   it "doesn't show the toolbar when passed false" do
-    screen = HomeScreen.new modal: true, nav_bar: true, toolbar: true
+    screen = HomeScreen.new(nav_bar: true, modal: true, toolbar: true)
     screen.on_load
     screen.set_toolbar_button(false, false)
     screen.navigationController.toolbarHidden?.should == true
   end
 
   it "hides the toolbar when passed nil" do
-    screen = HomeScreen.new modal: true, nav_bar: true, toolbar: true
+    screen = HomeScreen.new(nav_bar: true, modal: true, toolbar: true)
     screen.on_load
     screen.set_toolbar_button([{title: "Testing Toolbar"}], false)
     screen.navigationController.toolbarHidden?.should == false
@@ -381,9 +381,9 @@ describe "screen with toolbar" do
 
 end
 
-describe 'toolbar tinted buttons' do
+describe "toolbar tinted buttons" do
   before do
-    @screen = HomeScreen.new modal: true, nav_bar: true, toolbar: true
+    @screen = HomeScreen.new(nav_bar: true, modal: true, toolbar: true)
     @screen.on_load
   end
 
@@ -403,3 +403,28 @@ describe 'toolbar tinted buttons' do
   end
 
 end
+
+describe "child screen management" do
+  before do
+    @screen = HomeScreen.new
+    @child = BasicScreen.new
+  end
+
+  it "#add_child_screen" do
+    @screen.add_child_screen @child
+    @screen.childViewControllers.should.include(@child)
+    @screen.childViewControllers.length.should == 1
+    @child.parent_screen.should == @screen
+  end
+
+  it "#remove_child_screen" do
+    @screen.add_child_screen @child
+    @screen.childViewControllers.should.include(@child)
+    @screen.remove_child_screen @child
+    @screen.childViewControllers.length.should == 0
+    @child.parent_screen.should == nil
+  end
+
+end
+
+

data/spec/unit/tab_spec.rb

@@ -3,12 +3,12 @@ describe "tab bar functionality" do
   before do
     @app = TestDelegate.new
 
-    @tab_1 = TabScreen.new
-    @tab_2 = BasicScreen.new
-    @tab_3 = HomeScreen.new
-    @tab_4 = TestTableScreen.new
+    @tab_0 = TabScreen.new
+    @tab_1 = BasicScreen.new
+    @tab_2 = HomeScreen.new
+    @tab_3 = TestTableScreen.new
 
-    @tab_bar = @app.open_tab_bar @tab_1, @tab_2, @tab_3, @tab_4
+    @tab_bar = @app.open_tab_bar @tab_0, @tab_1, @tab_2, @tab_3
   end
 
   after do
@@ -36,16 +36,85 @@ describe "tab bar functionality" do
   end
 
   it "should allow changing the tab bar item with set_tab_bar_item" do
-    @tab_1.set_tab_bar_item title: "Custom", item: "test.jpeg"
+    @tab_0.set_tab_bar_item title: "Custom", item: "test.jpeg"
     @tab_bar.tabBar.items.first.title.should == "Custom"
   end
 
   it "should allow replacing a view controller with `open`" do
     new_screen = BasicScreen.new
-    @tab_4.open new_screen, in_tab: "Home"
+    @tab_3.open new_screen, in_tab: "Home"
     @tab_bar.viewControllers[2].should == new_screen
   end
 
-end
+  describe "changing tab bar orders" do
+    before do
+      # Reset the user defaults
+      app_domain = NSBundle.mainBundle.bundleIdentifier
+      NSUserDefaults.standardUserDefaults.removePersistentDomainForName(app_domain)
+      NSUserDefaults.standardUserDefaults.synchronize
+
+      @tab_0 = TabScreen.new
+      @tab_1 = BasicScreen.new
+      @tab_2 = HomeScreen.new
+      @tab_3 = TestTableScreen.new
+      @tab_4 = PresentScreen.new
+      @tab_5 = TestWebScreen.new
+
+      @tab_bar = @app.open_tab_bar @tab_0, @tab_1, @tab_2, @tab_3, @tab_4, @tab_5
+    end
+
+    it "should start without a name" do
+      @tab_bar.name.should.be.nil
+    end
+
+    it "should set a name" do
+      NSUserDefaults.standardUserDefaults.arrayForKey("tab_bar_order_test_tabs").should.be.nil
+      @tab_bar.name = "test_tabs"
+      @tab_bar.name.should == "test_tabs"
+    end
+
+    it "should not save the order when not changed" do
+      NSUserDefaults.standardUserDefaults.arrayForKey("tab_bar_order_").should.be.nil
+      @tab_bar.tabBarController(@tab_bar, didEndCustomizingViewControllers:@tab_bar.viewControllers, changed:false)
+      NSUserDefaults.standardUserDefaults.arrayForKey("tab_bar_order_").should.be.nil
+    end
+
+    it "should save an order without a name" do
+      @tab_bar.name = ""
+      new_order = [@tab_5, @tab_1, @tab_2, @tab_3, @tab_4, @tab_0]
+      NSUserDefaults.standardUserDefaults.arrayForKey("tab_bar_order_").should.be.nil
+      @tab_bar.tabBarController(@tab_bar, didEndCustomizingViewControllers:new_order, changed:true)
+      NSUserDefaults.standardUserDefaults.arrayForKey("tab_bar_order_").nil?.should == false
+      NSUserDefaults.standardUserDefaults.arrayForKey("tab_bar_order_").should == [5, 1, 2, 3, 4, 0]
+    end
 
+    it "should save an order with a name" do
+      new_name = "test_tab_bar"
 
+      @tab_bar.name = new_name
+      new_order = [@tab_5, @tab_4, @tab_3, @tab_2, @tab_1, @tab_0]
+      NSUserDefaults.standardUserDefaults.arrayForKey("tab_bar_order_#{new_name}").should.be.nil
+      @tab_bar.tabBarController(@tab_bar, didEndCustomizingViewControllers:new_order, changed:true)
+      NSUserDefaults.standardUserDefaults.arrayForKey("tab_bar_order_#{new_name}").should == [5, 4, 3, 2, 1, 0]
+    end
+
+    it "should persist order when reopening the tabs" do
+      @tab_bar.name = "test_tab_bar"
+      new_order = [@tab_5, @tab_4, @tab_3, @tab_2, @tab_1, @tab_0]
+      @tab_bar.tabBarController(@tab_bar, didEndCustomizingViewControllers:new_order, changed:true)
+
+      new_tab_bar = @app.open_tab_bar @tab_0, @tab_1, @tab_2, @tab_3, @tab_4, @tab_5
+      new_tab_bar.name = "test_tab_bar"
+      new_tab_bar.viewControllers.should == new_order
+    end
+
+    it "should always select the leftmost tab when rearranging tabs" do
+      new_order = [@tab_5, @tab_4, @tab_3, @tab_2, @tab_1, @tab_0]
+      @tab_bar.tabBarController(@tab_bar, didEndCustomizingViewControllers:new_order, changed:true)
+      new_tab_bar = @app.open_tab_bar @tab_0, @tab_1, @tab_2, @tab_3, @tab_4, @tab_5
+      new_tab_bar.selectedIndex.should == 0
+    end
+
+  end
+
+end

data/spec/unit/tables/table_module_spec.rb

@@ -24,7 +24,7 @@ describe "PM::Table module" do
         value: true # whether it's "checked" or not
       },
       image: { image: @image, radius: 15 },
-      remote_image: {  # remote image, requires JMImageCache CocoaPod
+      remote_image: {  # remote image, requires SDWebImage CocoaPod
         url: "http://placekitten.com/200/300",
         placeholder: "some-local-image",
         size: 50,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ProMotion
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Jamon Holmgren
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-09 00:00:00.000000000 Z
+date: 2015-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: methadone
@@ -119,6 +119,7 @@ files:
 - lib/ProMotion/support/support.rb
 - lib/ProMotion/table/cell/table_view_cell_module.rb
 - lib/ProMotion/table/data/table_data.rb
+- lib/ProMotion/table/data/table_data_builder.rb
 - lib/ProMotion/table/extensions/indexable.rb
 - lib/ProMotion/table/extensions/longpressable.rb
 - lib/ProMotion/table/extensions/refreshable.rb
@@ -126,6 +127,8 @@ files:
 - lib/ProMotion/table/grouped_table.rb
 - lib/ProMotion/table/grouped_table_screen.rb
 - lib/ProMotion/table/table.rb
+- lib/ProMotion/table/table_builder.rb
+- lib/ProMotion/table/table_class_methods.rb
 - lib/ProMotion/table/table_screen.rb
 - lib/ProMotion/table/table_utils.rb
 - lib/ProMotion/tabs/tabs.rb
@@ -140,8 +143,8 @@ files:
 - spec/functional/func_web_screen_spec.rb
 - spec/helpers/test_helper.rb
 - spec/unit/delegate_spec.rb
-- spec/unit/image_title_screen.rb
-- spec/unit/image_view_title_screen.rb
+- spec/unit/image_title_screen_spec.rb
+- spec/unit/image_view_title_screen_spec.rb
 - spec/unit/load_view_spec.rb
 - spec/unit/logger_spec.rb
 - spec/unit/main_spec.rb
@@ -161,7 +164,7 @@ files:
 - spec/unit/tables/table_utils_spec.rb
 - spec/unit/tables/table_view_cell_spec.rb
 - spec/unit/view_helper_spec.rb
-- spec/unit/view_title_screen.rb
+- spec/unit/view_title_screen_spec.rb
 - spec/unit/web_spec.rb
 homepage: https://github.com/clearsightstudio/ProMotion
 licenses:
@@ -183,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: ProMotion is a fast way to get started building RubyMotion apps. Instead
@@ -200,8 +203,8 @@ test_files:
 - spec/functional/func_web_screen_spec.rb
 - spec/helpers/test_helper.rb
 - spec/unit/delegate_spec.rb
-- spec/unit/image_title_screen.rb
-- spec/unit/image_view_title_screen.rb
+- spec/unit/image_title_screen_spec.rb
+- spec/unit/image_view_title_screen_spec.rb
 - spec/unit/load_view_spec.rb
 - spec/unit/logger_spec.rb
 - spec/unit/main_spec.rb
@@ -221,5 +224,5 @@ test_files:
 - spec/unit/tables/table_utils_spec.rb
 - spec/unit/tables/table_view_cell_spec.rb
 - spec/unit/view_helper_spec.rb
-- spec/unit/view_title_screen.rb
+- spec/unit/view_title_screen_spec.rb
 - spec/unit/web_spec.rb