ProMotion 1.2.1 → 2.0.0.rc1

data/lib/ProMotion/{view → styling}/styling.rb

@@ -1,9 +1,5 @@
-motion_require '../extensions/conversions'
-
 module ProMotion
   module Styling
-    include Conversions
-
     def set_attributes(element, args = {})
       args = get_attributes_from_symbol(args)
       args.each { |k, v| set_attribute(element, k, v) }
@@ -13,7 +9,9 @@ module ProMotion
     def set_attribute(element, k, v)
       return element unless element
 
-      if v.is_a?(Hash) && element.respond_to?(k)
+      if !element.is_a?(CALayer) && v.is_a?(Hash) && element.respond_to?("#{k}=")
+        element.send("#{k}=", v)
+      elsif v.is_a?(Hash) && element.respond_to?(k)
         sub_element = element.send(k)
         set_attributes(sub_element, v) if sub_element
       elsif element.respond_to?("#{k}=")
@@ -22,35 +20,13 @@ module ProMotion
         element.send("#{k}", *v)
       else
         # Doesn't respond. Check if snake case.
-        if k.to_s.include?("_")
-          set_attribute(element, objective_c_method_name(k), v)
-        end
+        set_attribute(element, camelize(k), v) if k.to_s.include?("_")
       end
       element
     end
 
-    def set_easy_attributes(parent, element, args={})
-      attributes = {}
-
-      if args[:resize]
-        attributes[:autoresizingMask]  = UIViewAutoresizingNone
-        args[:resize].each { |r| attributes[:autoresizingMask] |= map_resize_symbol(r) }
-      end
-
-      args[:left] = args.delete(:x) if args[:x]
-      args[:top] = args.delete(:y) if args[:y]
-      if [:left, :top, :width, :height].select{ |a| args[a] && args[a] != :auto }.length == 4
-        attributes[:frame] = CGRectMake(args[:left], args[:top], args[:width], args[:height])
-      end
-
-      set_attributes element, attributes
-      element
-    end
-
     def content_max(view, mode = :height)
-      return 0 if view.subviews.empty?
-
-      sizes = view.subviews.map do |sub_view|
+      view.subviews.map do |sub_view|
         if sub_view.isHidden
           0
         elsif mode == :height
@@ -58,9 +34,7 @@ module ProMotion
         else
           sub_view.frame.origin.x + sub_view.frame.size.width
         end
-      end
-
-      sizes.max
+      end.max.to_f
     end
 
     def content_height(view)
@@ -71,8 +45,9 @@ module ProMotion
       content_max(view, :width)
     end
 
+    # iterate up the view hierarchy to find the parent element
+    # of "type" containing this view
     def closest_parent(type, this_view = nil)
-      # iterate up the view hierarchy to find the parent element of "type" containing this view
       this_view ||= view_or_self.superview
       while this_view != nil do
         return this_view if this_view.is_a? type
@@ -84,23 +59,16 @@ module ProMotion
     def add(element, attrs = {})
       add_to view_or_self, element, attrs
     end
-    alias :add_element :add
-    alias :add_view :add
 
     def remove(elements)
       Array(elements).each(&:removeFromSuperview)
     end
-    alias :remove_element :remove
-    alias :remove_view :remove
 
     def add_to(parent_element, elements, attrs = {})
       attrs = get_attributes_from_symbol(attrs)
       Array(elements).each do |element|
         parent_element.addSubview element
-        if attrs && attrs.length > 0
-          set_attributes(element, attrs)
-          set_easy_attributes(parent_element, element, attrs)
-        end
+        set_attributes(element, attrs) if attrs && attrs.length > 0
       end
       elements
     end
@@ -130,14 +98,16 @@ module ProMotion
         raise ArgumentError
       end
 
-      if colors.size == 3
-        rgb_color(colors[0], colors[1], colors[2])
-      else
-        raise ArgumentError
-      end
+      raise ArgumentError unless colors.size == 3
+      rgb_color(colors[0], colors[1], colors[2])
+    end
+
+    # Turns a snake_case string into a camelCase string.
+    def camelize(str)
+      str.split('_').inject([]){ |buffer,e| buffer.push(buffer.empty? ? e : e.capitalize) }.join
     end
 
-    protected
+  protected
 
     def get_attributes_from_symbol(attrs)
       return attrs if attrs.is_a?(Hash)

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

@@ -1,5 +1,3 @@
-motion_require '../../view/styling'
-
 module ProMotion
   module TableViewCellModule
     include Styling
@@ -10,163 +8,118 @@ module ProMotion
       self.table_screen = WeakRef.new(screen)
       self.data_cell = data_cell
 
-      # TODO: Some of these need to go away. Unnecessary overhead.
-      set_cell_attributes
-      set_accessory_view
+      check_deprecated_styles
+      set_styles
+      set_title
       set_subtitle
       set_image
       set_remote_image
-      set_subviews
-      set_details
-      set_styles
+      set_accessory_view
       set_selection_style
-
-      self
     end
 
-    def set_cell_attributes
-      data_cell_attributes = data_cell.dup
-      [:image, :accessory_action, :editing_style].each { |k| data_cell_attributes.delete(k) }
-      set_attributes self, data_cell_attributes
-      self
-    end
+  protected
 
-    def set_accessory_view
-      if data_cell[:accessory]
-        if data_cell[:accessory][:view] == :switch
-          switch_view = UISwitch.alloc.initWithFrame(CGRectZero)
-          switch_view.setAccessibilityLabel(data_cell[:accessory][:accessibility_label] || data_cell[:title])
-          switch_view.addTarget(self.table_screen, action: "accessory_toggled_switch:", forControlEvents:UIControlEventValueChanged)
-          switch_view.on = !!data_cell[:accessory][:value]
-          self.accessoryView = switch_view
-        elsif data_cell[:accessory][:view]
-          self.accessoryView = data_cell[:accessory][:view]
-          self.accessoryView.autoresizingMask = UIViewAutoresizingFlexibleWidth
-        end
-      else
-        self.accessoryView = nil
+    # 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, :arguments, :cell_style, :cell_class, :cell_identifier, :editing_style, :search_text, :keep_selection, :height ]
+      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 `styles:` hash. See TableScreen documentation.")
       end
+    end
+
+    def set_styles
+      set_attributes self, data_cell[:style] if data_cell[:style]
+    end
 
-      self
+    def set_title
+      set_attributed_text(self.textLabel, data_cell[:title])
     end
 
     def set_subtitle
-      if data_cell[:subtitle] && self.detailTextLabel
-        if data_cell[:subtitle].is_a? NSAttributedString
-          self.detailTextLabel.attributedText = data_cell[:subtitle]
-        else
-          self.detailTextLabel.text = data_cell[:subtitle]
-        end
-        self.detailTextLabel.backgroundColor = UIColor.clearColor
-        self.detailTextLabel.autoresizingMask = UIViewAutoresizingFlexibleWidth
-      end
-      self
+      return unless data_cell[:subtitle] && self.detailTextLabel
+      set_attributed_text(self.detailTextLabel, data_cell[:subtitle])
+      self.detailTextLabel.backgroundColor = UIColor.clearColor
+      self.detailTextLabel.autoresizingMask = UIViewAutoresizingFlexibleWidth
     end
 
     def set_remote_image
-      if data_cell[:remote_image]
-        if self.imageView.respond_to?("setImageWithURL:placeholder:")
-          url = data_cell[:remote_image][:url]
-          url = NSURL.URLWithString(url) unless url.is_a?(NSURL)
-          placeholder = data_cell[:remote_image][:placeholder]
-          placeholder = UIImage.imageNamed(placeholder) if placeholder.is_a?(String)
-
-          self.image_size = data_cell[:remote_image][:size] if data_cell[:remote_image][:size] && self.respond_to?("image_size=")
-          self.imageView.setImageWithURL(url, placeholder: placeholder)
-          self.imageView.layer.masksToBounds = true
-          self.imageView.layer.cornerRadius = data_cell[:remote_image][:radius] if data_cell[:remote_image].has_key?(:radius)
-          self.imageView.contentMode = map_content_mode_symbol(data_cell[:remote_image][:content_mode]) if data_cell[:remote_image].has_key?(:content_mode)
-        elsif self.imageView.respond_to?("setImageWithURL:placeholderImage:")
-          # TODO - Remove this in next major release
-          PM.logger.deprecated "The SDWebImage cocoapod is deprecated. Please replace it with 'JMImageCache'."
-        else
-          PM.logger.error "ProMotion Warning: to use remote_image with TableScreen you need to include the CocoaPod 'JMImageCache'."
-        end
-      end
-      self
+      return unless data_cell[:remote_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
+      })
+
+      self.imageView.layer.masksToBounds = true
+      self.imageView.layer.cornerRadius = data_cell[:remote_image][:radius] if data_cell[:remote_image][:radius]
+      self.imageView.contentMode = map_content_mode_symbol(data_cell[:remote_image][:content_mode]) if data_cell[:remote_image][:content_mode]
     end
 
     def set_image
-      if data_cell[:image]
-
-        cell_image = data_cell[:image].is_a?(Hash) ? data_cell[:image][:image] : data_cell[:image]
-        cell_image = UIImage.imageNamed(cell_image) if cell_image.is_a?(String)
+      return unless data_cell[:image]
+      cell_image = data_cell[:image].is_a?(Hash) ? data_cell[:image][:image] : data_cell[:image]
+      cell_image = UIImage.imageNamed(cell_image) if cell_image.is_a?(String)
+      self.imageView.layer.masksToBounds = true
+      self.imageView.image = cell_image
+      self.imageView.layer.cornerRadius = data_cell[:image][:radius] if data_cell[:image].is_a?(Hash) && data_cell[:image][:radius]
+    end
 
-        self.imageView.layer.masksToBounds = true
-        self.imageView.image = cell_image
-        self.imageView.layer.cornerRadius = data_cell[:image][:radius] if data_cell[:image].is_a?(Hash) && data_cell[:image][:radius]
+    def set_accessory_view
+      return self.accessoryView = nil unless data_cell[:accessory] && data_cell[:accessory][:view]
+      if data_cell[:accessory][:view] == :switch
+        self.accessoryView = switch_view
+      else
+        self.accessoryView = data_cell[:accessory][:view]
+        self.accessoryView.autoresizingMask = UIViewAutoresizingFlexibleWidth
       end
-      self
     end
 
-    def set_subviews
-      tag_number = 0
-      Array(data_cell[:subviews]).each do |view|
-        # Remove an existing view at that tag number
-        tag_number += 1
-        existing_view = self.viewWithTag(tag_number)
-        existing_view.removeFromSuperview if existing_view
-
-        # Add the subview if it exists
-        if view
-          view.tag = tag_number
-          self.addSubview view
-        end
-      end
-      self
+    def set_selection_style
+      self.selectionStyle = map_selection_style_symbol(data_cell[:selection_style]) if data_cell[:selection_style]
     end
 
-    def set_details
-      if data_cell[:details]
-        self.addSubview data_cell[:details][:image]
-      end
-      self
+  private
+
+    def jm_image_cache?
+      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'."
+      false
     end
 
-    def set_styles
-      if data_cell[:styles] && data_cell[:styles][:label] && data_cell[:styles][:label][:frame]
-        ui_label = false
-        self.contentView.subviews.each do |view|
-          if view.is_a? UILabel
-            ui_label = true
-            view.text = data_cell[:styles][:label][:text]
-          end
-        end
-
-        unless ui_label == true
-          label ||= UILabel.alloc.initWithFrame(CGRectZero)
-          set_attributes label, data_cell[:styles][:label]
-          self.contentView.addSubview label
-        end
-
-        # TODO: What is this and why is it necessary?
-        self.textLabel.textColor = UIColor.clearColor
-      else
-        cell_title = data_cell[:title]
-        cell_title ||= ""
-        self.textLabel.backgroundColor = UIColor.clearColor
-        if cell_title.is_a? NSAttributedString
-          self.textLabel.attributedText = cell_title
-        else
-          self.textLabel.text = cell_title
-        end
-      end
+    def remote_placeholder
+      UIImage.imageNamed(data_cell[:remote_image][:placeholder]) if data_cell[:remote_image][:placeholder].is_a?(String)
+    end
 
-      self
+    def switch_view
+      switch = UISwitch.alloc.initWithFrame(CGRectZero)
+      switch.setAccessibilityLabel(data_cell[:accessory][:accessibility_label] || data_cell[:title])
+      switch.addTarget(self.table_screen, action: "accessory_toggled_switch:", forControlEvents:UIControlEventValueChanged)
+      switch.on = !!data_cell[:accessory][:value]
+      switch
     end
 
-    def set_selection_style
-      self.selectionStyle = UITableViewCellSelectionStyleNone if data_cell[:no_select]
+    def set_attributed_text(label, text)
+      text.is_a?(NSAttributedString) ? label.attributedText = text : label.text = text
     end
 
     def map_content_mode_symbol(symbol)
-      content_mode = {
+      {
         scale_to_fill:     UIViewContentModeScaleToFill,
         scale_aspect_fit:  UIViewContentModeScaleAspectFit,
         scale_aspect_fill: UIViewContentModeScaleAspectFill,
         mode_redraw:       UIViewContentModeRedraw
-      }[symbol] if symbol.is_a?(Symbol)
-      content_mode || symbol
+      }[symbol] || symbol
+    end
+
+    def map_selection_style_symbol(symbol)
+      {
+        none:     UITableViewCellSelectionStyleNone,
+        blue:     UITableViewCellSelectionStyleBlue,
+        gray:     UITableViewCellSelectionStyleGray,
+        default:  UITableViewCellSelectionStyleDefault
+      }[symbol] || symbol
     end
   end
 end

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

@@ -4,7 +4,7 @@ module ProMotion
 
     def initialize(data, table_view)
       self.data = data
-      self.table_view = table_view
+      self.table_view = WeakRef.new(table_view)
     end
 
     def section(index)

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

@@ -0,0 +1,24 @@
+module ProMotion
+  module Table
+    module Longpressable
+      def make_longpressable(params={})
+        params = {
+          min_duration: 1.0
+        }.merge(params)
+
+        long_press_gesture = UILongPressGestureRecognizer.alloc.initWithTarget(self, action:"on_long_press:")
+        long_press_gesture.minimumPressDuration = params[:min_duration]
+        long_press_gesture.delegate = self
+        self.table_view.addGestureRecognizer(long_press_gesture)
+      end
+
+      def on_long_press(gesture)
+        return unless gesture.state == UIGestureRecognizerStateBegan
+        gesture_point = gesture.locationInView(table_view)
+        index_path = table_view.indexPathForRowAtPoint(gesture_point)
+        data_cell = self.promotion_table_data.cell(index_path: index_path)
+        trigger_action(data_cell[:long_press_action], data_cell[:arguments]) if data_cell[:long_press_action]
+      end
+    end
+  end
+end

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

@@ -1,6 +1,7 @@
 module ProMotion
   module Table
     module Refreshable
+
       def make_refreshable(params={})
         pull_message = params[:pull_message] || "Pull to refresh"
         @refreshing = params[:refreshing] || "Refreshing data..."

data/lib/ProMotion/table/grouped_table_screen.rb

@@ -1,8 +1,3 @@
-motion_require '../cocoatouch/table_view_controller'
-motion_require '../screen/screen_module'
-motion_require 'table'
-motion_require 'grouped_table'
-
 module ProMotion
   class GroupedTableScreen < TableViewController
     include ProMotion::ScreenModule

data/lib/ProMotion/table/table.rb

@@ -1,15 +1,10 @@
-motion_require '../view/styling'
-motion_require 'extensions/searchable'
-motion_require 'extensions/refreshable'
-motion_require 'extensions/indexable'
-
 module ProMotion
   module Table
-
     include ProMotion::Styling
     include ProMotion::Table::Searchable
     include ProMotion::Table::Refreshable
     include ProMotion::Table::Indexable
+    include ProMotion::Table::Longpressable
 
     attr_reader :promotion_table_data
 
@@ -21,6 +16,7 @@ module ProMotion
       check_table_data
       set_up_searchable
       set_up_refreshable
+      set_up_longpressable
     end
 
     def check_table_data
@@ -47,6 +43,12 @@ module ProMotion
       end
     end
 
+    def set_up_longpressable
+      if self.class.respond_to?(:get_longpressable) && self.class.get_longpressable
+        self.make_longpressable(self.class.get_longpressable_params)
+      end
+    end
+
     def searching?
       self.promotion_table_data.filtered
     end
@@ -62,31 +64,13 @@ module ProMotion
     def update_table_view_data(data)
       self.promotion_table_data.data = data
       table_view.reloadData
-    end
-
-    # Methods to retrieve data
-
-    def section_at_index(index)
-      self.promotion_table_data.section(index)
-    end
-
-    def cell_at_section_and_index(section, index)
-      self.promotion_table_data.cell(section: section, index: index)
+      @table_search_display_controller.searchResultsTableView.reloadData if searching?
     end
 
     def trigger_action(action, arguments)
-      if self.respond_to?(action)
-        expected_arguments = self.method(action).arity
-        if expected_arguments == 0
-          self.send(action)
-        elsif expected_arguments == 1 || expected_arguments == -1
-          self.send(action, arguments)
-        else
-          PM.logger.warn "#{action} expects #{expected_arguments} arguments. Maximum number of required arguments for an action is 1."
-        end
-      else
-        PM.logger.info "Action not implemented: #{action.to_s}"
-      end
+      return PM.logger.info "Action not implemented: #{action.to_s}" unless self.respond_to?(action)
+      return self.send(action) if self.method(action).arity == 0
+      self.send(action, arguments)
     end
 
     def accessory_toggled_switch(switch)
@@ -94,20 +78,16 @@ module ProMotion
       index_path = closest_parent(UITableView, table_cell).indexPathForCell(table_cell)
 
       if index_path
-        data_cell = cell_at_section_and_index(index_path.section, index_path.row)
+        data_cell = promotion_table_data.cell(section: index_path.section, index: index_path.row)
         data_cell[:accessory][:arguments] ||= {}
         data_cell[:accessory][:arguments][:value] = switch.isOn if data_cell[:accessory][:arguments].is_a?(Hash)
-
         trigger_action(data_cell[:accessory][:action], data_cell[:accessory][:arguments]) if data_cell[:accessory][:action]
       end
     end
 
     def delete_row(index_paths, animation = nil)
-      animation = map_row_animation_symbol(animation)
-      index_paths = [index_paths] if index_paths.kind_of?(NSIndexPath)
       deletable_index_paths = []
-
-      index_paths.each do |index_path|
+      Array(index_paths).each do |index_path|
         delete_cell = false
         delete_cell = send(:on_cell_deleted, self.promotion_table_data.cell(index_path: index_path)) if self.respond_to?("on_cell_deleted:")
         unless delete_cell == false
@@ -115,45 +95,44 @@ module ProMotion
           deletable_index_paths << index_path
         end
       end
-      table_view.deleteRowsAtIndexPaths(deletable_index_paths, withRowAnimation:animation) if deletable_index_paths.length > 0
+      table_view.deleteRowsAtIndexPaths(deletable_index_paths, withRowAnimation:map_row_animation_symbol(animation)) if deletable_index_paths.length > 0
     end
 
     def table_view_cell(params={})
+      params = index_path_to_section_index(params)
+      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 index_path_to_section_index(params)
       if params[:index_path]
         params[:section] = params[:index_path].section
         params[:index] = params[:index_path].row
       end
-
-      data_cell = self.promotion_table_data.cell(section: params[:section], index: params[:index])
-      return UITableViewCell.alloc.init unless data_cell # No data?
-
-      table_cell = create_table_cell(data_cell)
-
-      table_cell
+      params
     end
 
     def create_table_cell(data_cell)
-      table_cell = table_view.dequeueReusableCellWithIdentifier(data_cell[:cell_identifier])
-
-      unless table_cell
+      table_cell = table_view.dequeueReusableCellWithIdentifier(data_cell[:cell_identifier]) || begin
         table_cell = data_cell[:cell_class].alloc.initWithStyle(data_cell[:cell_style], reuseIdentifier:data_cell[:cell_identifier])
-        table_cell.extend PM::TableViewCellModule unless table_cell.is_a?(PM::TableViewCellModule)
+        table_cell.extend(PM::TableViewCellModule) unless table_cell.is_a?(PM::TableViewCellModule)
         table_cell.autoresizingMask = UIViewAutoresizingFlexibleWidth|UIViewAutoresizingFlexibleLeftMargin|UIViewAutoresizingFlexibleRightMargin
         table_cell.clipsToBounds = true # fix for changed default in 7.1
+        table_cell
       end
-
       table_cell.setup(data_cell, self)
-
       table_cell
     end
 
     def update_table_data
       self.update_table_view_data(self.table_data)
+      self.promotion_table_data.search(search_string) if searching?
     end
 
     ########## Cocoa touch methods #################
     def numberOfSectionsInTableView(table_view)
-      Array(self.promotion_table_data.data).length
+      self.promotion_table_data.sections.length
     end
 
     # Number of cells
@@ -162,8 +141,8 @@ module ProMotion
     end
 
     def tableView(table_view, titleForHeaderInSection:section)
-      section = section_at_index(section) || return
-      section[:title]
+      section = promotion_table_data.section(section)
+      section && section[:title]
     end
 
     # Set table_data_index if you want the right hand index column (jumplist)
@@ -179,8 +158,9 @@ module ProMotion
 
     def tableView(table_view, willDisplayCell: table_cell, forRowAtIndexPath: index_path)
       data_cell = self.promotion_table_data.cell(index_path: index_path)
-      table_cell.backgroundColor = data_cell[:background_color] || UIColor.whiteColor
-      table_cell.send(:restyle!) if table_cell.respond_to?(:restyle!)
+      set_attributes table_cell, data_cell[:style] if data_cell[:style]
+      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)
@@ -190,26 +170,12 @@ module ProMotion
     def tableView(table_view, didSelectRowAtIndexPath:index_path)
       data_cell = self.promotion_table_data.cell(index_path: index_path)
       table_view.deselectRowAtIndexPath(index_path, animated: true) unless data_cell[:keep_selection] == true
-
-      data_cell[:arguments] ||= {}
-      data_cell[:arguments][:cell] = data_cell if data_cell[:arguments].is_a?(Hash) # TODO: Should we really do this?
-
       trigger_action(data_cell[:action], data_cell[:arguments]) if data_cell[:action]
     end
 
     def tableView(table_view, editingStyleForRowAtIndexPath: index_path)
       data_cell = self.promotion_table_data.cell(index_path: index_path)
-
-      case data_cell[:editing_style]
-      when nil, :none
-        UITableViewCellEditingStyleNone
-      when :delete
-        UITableViewCellEditingStyleDelete
-      when :insert
-        UITableViewCellEditingStyleInsert
-      else
-        data_cell[:editing_style]
-      end
+      map_cell_editing_style(data_cell[:editing_style])
     end
 
     def tableView(table_view, commitEditingStyle: editing_style, forRowAtIndexPath: index_path)
@@ -236,22 +202,16 @@ module ProMotion
 
     # Section view methods
     def tableView(table_view, viewForHeaderInSection: index)
-      section = section_at_index(index)
-
-      if section[:title_view]
-        klass      = section[:title_view]
-        view       = klass.new if klass.respond_to?(:new)
-        view.title = section[:title] if view.respond_to?(:title=)
-        view
-      else
-        nil
-      end
+      section = promotion_table_data.section(index)
+      view = nil
+      view = section[:title_view].new if section[:title_view].respond_to?(:new)
+      view.title = section[:title] if view.respond_to?(:title=)
+      view
     end
 
     def tableView(table_view, heightForHeaderInSection: index)
-      section = section_at_index(index)
-
-      if section[:title_view] || (section[:title] && !section[:title].empty?)
+      section = promotion_table_data.section(index)
+      if section[:title_view] || section[:title].to_s.length > 0
         section[:title_view_height] || tableView.sectionHeaderHeight
       else
         0.0
@@ -260,10 +220,17 @@ module ProMotion
 
     protected
 
+    def map_cell_editing_style(symbol)
+      {
+        none:   UITableViewCellEditingStyleNone,
+        delete: UITableViewCellEditingStyleDelete,
+        insert: UITableViewCellEditingStyleInsert
+      }[symbol] || symbol || UITableViewCellEditingStyleNone
+    end
+
     def map_row_animation_symbol(symbol)
       symbol ||= UITableViewRowAnimationAutomatic
       {
-        automatic:  UITableViewRowAnimationAutomatic,
         fade:       UITableViewRowAnimationFade,
         right:      UITableViewRowAnimationRight,
         left:       UITableViewRowAnimationLeft,
@@ -272,7 +239,7 @@ module ProMotion
         none:       UITableViewRowAnimationNone,
         middle:     UITableViewRowAnimationMiddle,
         automatic:  UITableViewRowAnimationAutomatic
-      }[symbol] || symbol
+      }[symbol] || symbol || UITableViewRowAnimationAutomatic
     end
 
     module TableClassMethods
@@ -322,6 +289,19 @@ module ProMotion
         @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)