ProMotion 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4ec0cb821081f967b54a5a719cb0144e97d4921
-  data.tar.gz: 42f01567d81eac734b854fb8f2d749207a755cb0
+  metadata.gz: 37daeda0dc99301ea7bb1fd7ab847e3fd1803cb1
+  data.tar.gz: 420f59061a730bb933e13a3fa0737be210be85de
 SHA512:
-  metadata.gz: 042c8b42abce3767dfd6dc18e759391f2edc6018d56ef3438a99dc9d131dd5359a164cf0a693d07246d6b4b31aa7146940e757a29fdc290e8e98d4046206a7f6
-  data.tar.gz: 063f34003549f6d15c8782cd99b8ea921ce8d3ba80b6bc692f1f7e9e5ac294a792cc959c63654c6ef1988b50d1b8757a290259848770d56abf514de5a576efbd
+  metadata.gz: 615447c2fffa5b940a792db69c5cac17d37f9b617323e5cc64cbdbf40f1007b8aff1bd8650e66d67400049e8cfb5f76a3d3543376c62cdd930c596e07aa126f4
+  data.tar.gz: 0275defb4b361f3ea70d3bb6f69ba5a78017dc271a40125f796083ee83cd57d3a63d4bcdefaab165b57c8790ad15a8f536bc3a150ccffb3d3cac77bc151b6c41

data/README.md

@@ -90,13 +90,18 @@ end
 
 # Changelog
 
-## Version 2.1.0
-
-This release includes a few minor new features, but mainly it's a bugfix release and upgrading should go smoothly.
-
-* Added `hide_nav_bar` option to screen init args
-* `update_table_data` can now take `index_paths:` array to selectively update cells
-* Table cell `style` has been changed to `properties`. `style` will persist as an alias for backwards-compatibility
+## Version 2.2.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))
 
 # API Reference
 

data/lib/ProMotion/screen/nav_bar_module.rb

@@ -35,8 +35,12 @@ module ProMotion
     alias_method :set_nav_bar_right_button, :set_nav_bar_left_button
 
     def set_toolbar_items(buttons = [], animated = true)
-      self.toolbarItems = Array(buttons).map{|b| b.is_a?(UIBarButtonItem) ? b : create_toolbar_button(b) }
-      navigationController.setToolbarHidden(false, animated:animated)
+      if buttons
+        self.toolbarItems = Array(buttons).map{|b| b.is_a?(UIBarButtonItem) ? b : create_toolbar_button(b) }
+        navigationController.setToolbarHidden(false, animated:animated)
+      else
+        navigationController.setToolbarHidden(true, animated:animated)
+      end
     end
     alias_method :set_toolbar_buttons, :set_toolbar_items
     alias_method :set_toolbar_button,  :set_toolbar_items

data/lib/ProMotion/screen/screen_module.rb

@@ -33,6 +33,27 @@ module ProMotion
       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
+      else
+        status_bar_hidden false
+        status_bar_style UIStatusBarStyleDefault
+      end
+    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
@@ -46,6 +67,7 @@ module ProMotion
     end
 
     def view_will_appear(animated)
+      resolve_status_bar
       self.will_appear
 
       self.will_present if isMovingToParentViewController
@@ -191,6 +213,22 @@ module ProMotion
         @title = t
         @title_type = :view
       end
+
+      def status_bar(style=nil, args={})
+        if NSBundle.mainBundle.objectForInfoDictionaryKey('UIViewControllerBasedStatusBarAppearance').nil?
+          PM.logger.warn("status_bar will have no effect unless you set 'UIViewControllerBasedStatusBarAppearance' to false in your info.plist")
+        end
+        @status_bar_style = style
+        @status_bar_animation = args[:animation] if args[:animation]
+      end
+
+      def status_bar_type
+        @status_bar_style || :default
+      end
+
+      def status_bar_animation
+        @status_bar_animation || UIStatusBarAnimationSlide
+      end
     end
 
     def self.included(base)

data/lib/ProMotion/styling/styling.rb

@@ -3,11 +3,12 @@ module ProMotion
     def set_attributes(element, args = {})
       args = get_attributes_from_symbol(args)
       args.each { |k, v| set_attribute(element, k, v) }
+      element.send(:on_styled) if element.respond_to?(:on_styled)
       element
     end
 
     def set_attribute(element, k, v)
-      return element unless element
+      return unless element
 
       if !element.is_a?(CALayer) && v.is_a?(Hash) && element.respond_to?("#{k}=")
         element.send("#{k}=", v)
@@ -71,6 +72,7 @@ module ProMotion
       Array(elements).each do |element|
         parent_element.addSubview element
         set_attributes(element, attrs) if attrs && attrs.length > 0
+        element.send(:on_load) if element.respond_to?(:on_load)
       end
       elements
     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, :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 ]
       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

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

@@ -35,6 +35,10 @@ module ProMotion
       table_section[:cells].delete_at(params[:index].to_i)
     end
 
+    def move_cell(from, to)
+      section(to.section)[:cells].insert(to.row, section(from.section)[:cells].delete_at(from.row))
+    end
+
     def search(search_string)
       start_searching(search_string)
 

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

@@ -1,6 +1,7 @@
 module ProMotion
   module Table
     module Longpressable
+
       def make_longpressable(params={})
         params = {
           min_duration: 1.0

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

@@ -19,6 +19,9 @@ module ProMotion
         return unless @refresh_control
 
         @refresh_control.beginRefreshing
+
+        # Scrolls the table down to show the refresh control when invoked programatically
+        table_view.setContentOffset(CGPointMake(0, table_view.contentOffset.y-@refresh_control.frame.size.height), animated:true) if table_view.contentOffset.y > -65.0
       end
       alias :begin_refreshing :start_refreshing
 

data/lib/ProMotion/table/table.rb

@@ -15,9 +15,11 @@ module ProMotion
 
     def screen_setup
       check_table_data
+      set_up_header_view
       set_up_searchable
       set_up_refreshable
       set_up_longpressable
+      set_up_row_height
     end
 
     def check_table_data
@@ -28,6 +30,17 @@ module ProMotion
       @promotion_table_data ||= TableData.new(table_data, table_view)
     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."
+        end
+      end
+    end
+
     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)
@@ -50,6 +63,13 @@ module ProMotion
       end
     end
 
+    def set_up_row_height
+      if self.class.respond_to?(:get_row_height) && params = self.class.get_row_height
+        self.view.rowHeight = params[:height]
+        self.view.estimatedRowHeight = params[:estimated]
+      end
+    end
+
     def searching?
       self.promotion_table_data.filtered
     end
@@ -78,7 +98,6 @@ module ProMotion
 
     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
@@ -111,22 +130,17 @@ module ProMotion
       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 create_table_cell(data_cell)
+      new_cell = nil
       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.autoresizingMask = UIViewAutoresizingFlexibleWidth|UIViewAutoresizingFlexibleLeftMargin|UIViewAutoresizingFlexibleRightMargin
-        table_cell.clipsToBounds = true # fix for changed default in 7.1
-        table_cell
+        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
+        new_cell.setup(data_cell, self)
+        new_cell
       end
-      table_cell.setup(data_cell, self)
+      table_cell.send(:on_reuse) if !new_cell && table_cell.respond_to?(:on_reuse)
       table_cell
     end
 
@@ -138,6 +152,21 @@ module ProMotion
       self.promotion_table_data.search(search_string) if searching?
     end
 
+    def toggle_edit_mode(animated = true)
+      edit_mode({enabled: !editing?, animated: animated})
+    end
+
+    def edit_mode(args = {})
+      args[:enabled] = false if args[:enabled].nil?
+      args[:animated] = true if args[:animated].nil?
+
+      setEditing(args[:enabled], animated:args[:animated])
+    end
+
+    def edit_mode?
+      !!isEditing
+    end
+
     ########## Cocoa touch methods #################
     def numberOfSectionsInTableView(table_view)
       self.promotion_table_data.sections.length
@@ -161,12 +190,15 @@ module ProMotion
     end
 
     def tableView(table_view, cellForRowAtIndexPath: index_path)
-      table_view_cell(index_path: 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)
       data_cell = self.promotion_table_data.cell(index_path: index_path)
-      set_attributes table_cell, data_cell[:properties] if data_cell[:properties]
+      table_cell.setup(data_cell, self) if table_cell.respond_to?(:setup)
       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
@@ -192,6 +224,43 @@ module ProMotion
       end
     end
 
+    def tableView(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
+        true
+      else
+        false
+      end
+    end
+
+    def tableView(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
+        source_index_path
+      else
+        proposed_destination_index_path
+      end
+    end
+
+    def tableView(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:")
+        args = {
+          paths: {
+            from: from_index_path,
+            to: to_index_path
+          },
+          cell: self.promotion_table_data.section(to_index_path.section)[:cells][to_index_path.row]
+        }
+        send(:on_cell_moved, args)
+      else
+        PM.logger.warn "Implement the on_cell_moved method in your PM::TableScreen to be notified when a user moves a cell."
+      end
+    end
+
     def tableView(tableView, sectionForSectionIndexTitle: title, atIndex: index)
       return index unless ["{search}", UITableViewIndexSearch].include?(self.table_data_index[0])
 
@@ -255,6 +324,16 @@ module ProMotion
         UITableViewStylePlain
       end
 
+      def row_height(height, args={})
+        height = UITableViewAutomaticDimension if height == :auto
+        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

data/lib/ProMotion/version.rb

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

data/spec/functional/func_table_screen_cell_spec.rb

@@ -0,0 +1,44 @@
+describe "ProMotion::TableScreen functionality" do
+  tests PM::TestMiniTableScreen
+
+  def table_screen
+    @table_screen ||= begin
+      t = TestMiniTableScreen.new(nav_bar: true)
+      t
+    end
+  end
+
+  def controller
+    table_screen.navigationController
+  end
+
+  before do
+    UIView.setAnimationsEnabled false
+  end
+
+  after do
+    @table_screen = nil
+  end
+
+  it "no cells have fired on_reuse before scrolling" do
+    ip = NSIndexPath.indexPathForRow(0, inSection: 0)
+    cell = table_screen.tableView(table_screen.table_view, cellForRowAtIndexPath: ip)
+    cell.on_reuse_fired.should.not == true
+  end
+
+  it "cell has fired on_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.on_reuse_fired.should == true
+    end
+  end
+
+end
+
+
+

data/spec/functional/func_table_screen_spec.rb

@@ -70,7 +70,7 @@ describe "ProMotion::TableScreen functionality" do
   it "should use editing_style to delete the table row" do
     table_screen.tableView(table_screen.tableView, numberOfRowsInSection:0).should == 7
     table_screen.cell_was_deleted.should != true
-    flick("Just another deletable blank row", :to => :left)
+    flick("Just another deletable blank row", to: :left)
 
     wait 0.11 do
       # Tap the delete button
@@ -89,7 +89,7 @@ describe "ProMotion::TableScreen functionality" do
   it "should not allow deleting if on_cell_delete returns `false`" do
     table_screen.tableView(table_screen.tableView, numberOfRowsInSection:0).should == 7
     table_screen.cell_was_deleted.should != true
-    flick("A non-deletable blank row", :to => :left)
+    flick("A non-deletable blank row", to: :left)
 
     wait 0.11 do
       # Tap the delete button

data/spec/unit/screen_spec.rb

@@ -26,6 +26,25 @@ describe "screen properties" do
     HomeScreen.title.should != 'instance method'
   end
 
+  it "should have a default UIStatusBar style" do
+    @screen.view_will_appear(false)
+    UIApplication.sharedApplication.isStatusBarHidden.should == false
+    UIApplication.sharedApplication.statusBarStyle.should == UIStatusBarStyleDefault
+  end
+
+  it "should set the UIStatusBar style to :none" do
+    @screen.class.status_bar :none
+    @screen.view_will_appear(false)
+    UIApplication.sharedApplication.isStatusBarHidden.should == true
+  end
+
+  it "should set the UIStatusBar style to :light" do
+    @screen.class.status_bar :light
+    @screen.view_will_appear(false)
+    UIApplication.sharedApplication.isStatusBarHidden.should == false
+    UIApplication.sharedApplication.statusBarStyle.should == UIStatusBarStyleLightContent
+  end
+
   it "should set the tab bar item with a system item" do
     @screen.set_tab_bar_item system_item: :contacts
     comparison = UITabBarItem.alloc.initWithTabBarSystemItem(UITabBarSystemItemContacts, tag: 0)
@@ -267,6 +286,29 @@ describe "screen with toolbar" do
     screen.navigationController.toolbarHidden?.should == false
   end
 
+  it "doesn't show the toolbar when passed nil" do
+    screen = HomeScreen.new modal: true, nav_bar: 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.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.on_load
+    screen.set_toolbar_button([{title: "Testing Toolbar"}], false)
+    screen.navigationController.toolbarHidden?.should == false
+    screen.set_toolbar_button(nil, false)
+    screen.navigationController.toolbarHidden?.should == true
+  end
+
 end
 
 describe 'toolbar tinted buttons' do

data/spec/unit/tables/table_module_spec.rb

@@ -172,6 +172,10 @@ describe "PM::Table module" do
     cell.backgroundColor.should == UIColor.blueColor
   end
 
+  it "should have a header view" do
+    @subject.tableView.tableHeaderView.class.should == UIImageView
+  end
+
   describe("section with custom title_view") do
 
     it "should use the correct class for section view" do

data/spec/unit/tables/table_screen_spec.rb

@@ -50,6 +50,18 @@ describe "table screens" do
       end
     end
 
+    it "sets the auto row height and estimated row height properly" do
+      @screen.view.rowHeight.should == UITableViewAutomaticDimension
+      @screen.view.estimatedRowHeight.should == 97
+    end
+
+    it "sets the fixed row height properly" do
+      screen = UpdateTestTableScreen.new
+
+      screen.view.rowHeight.should == 77
+      screen.view.estimatedRowHeight.should == 77
+    end
+
   end
 
   describe "search functionality" do
@@ -126,5 +138,103 @@ describe "table screens" do
 
   end
 
+  describe "test PM::TableScreen's moving cells functionality" do
+    before do
+      UIView.animationsEnabled = false
+      @screen = TestTableScreen.new
+      @screen.on_load
+    end
+
+    it "should allow the table screen to enter editing mode" do
+      @screen.isEditing.should == false
+      @screen.edit_mode(enabled:true, animated:false)
+      @screen.isEditing.should == true
+    end
+
+    it "should use a convenience method to see if the table is editing" do
+      @screen.isEditing.should == @screen.edit_mode?
+      @screen.edit_mode(enabled:true, animated:false)
+      @screen.isEditing.should == @screen.edit_mode?
+    end
+
+    it "should toggle editing mode" do
+      @screen.edit_mode?.should == false
+      @screen.toggle_edit_mode(false)
+      @screen.edit_mode?.should == true
+      @screen.toggle_edit_mode(false)
+      @screen.edit_mode?.should == false
+    end
+
+    it "should return true for cells that are moveable" do
+      # Index path with :moveable = true
+      index_path = NSIndexPath.indexPathForRow(0, inSection:4)
+      @screen.tableView(@screen.tableView, canMoveRowAtIndexPath: index_path).should == true
+
+      # Index path with no :moveable set
+      index_path = NSIndexPath.indexPathForRow(2, inSection:4)
+      @screen.tableView(@screen.tableView, canMoveRowAtIndexPath: index_path).should == false
+
+      # Index path with :moveable = false
+      index_path = NSIndexPath.indexPathForRow(4, inSection:4)
+      @screen.tableView(@screen.tableView, canMoveRowAtIndexPath: index_path).should == false
+    end
+
+    it "should rearrange the data object when a cell is moved" do
+      move_from = NSIndexPath.indexPathForRow(0, inSection:4)
+      move_to   = NSIndexPath.indexPathForRow(2, inSection:4)
+
+      @screen.promotion_table_data.section(4)[:cells].map{|c| c[:title]}.should == [
+        'Cell 1',
+        'Cell 2',
+        'Cell 3',
+        'Cell 4',
+        'Cell 5'
+      ]
+      @screen.tableView(@screen.tableView, moveRowAtIndexPath:move_from, toIndexPath:move_to)
+      @screen.promotion_table_data.section(4)[:cells].map{|c| c[:title]}.should == [
+        'Cell 2',
+        'Cell 3',
+        'Cell 1',
+        'Cell 4',
+        'Cell 5'
+      ]
+    end
+
+    it "should call :cell_moved when moving a cell" do
+      move_from = NSIndexPath.indexPathForRow(0, inSection:4)
+      move_to   = NSIndexPath.indexPathForRow(2, inSection:4)
+
+      @screen.cell_was_moved.nil?.should == true
+      @screen.tableView(@screen.tableView, moveRowAtIndexPath:move_from, toIndexPath:move_to)
+      @screen.cell_was_moved.is_a?(Hash).should == true
+
+      cell = @screen.cell_was_moved
+
+      cell[:paths][:from].should == move_from
+      cell[:paths][:to].should == move_to
+
+      cell[:cell][:title].should == "Cell 1"
+    end
+
+    it "should allow cells to move to other sections" do
+      move_from = NSIndexPath.indexPathForRow(1, inSection:4)
+      move_to   = NSIndexPath.indexPathForRow(0, inSection:3)
+
+      moving_to = @screen.tableView(@screen.tableView, targetIndexPathForMoveFromRowAtIndexPath:move_from, toProposedIndexPath:move_to)
+
+      moving_to.should == move_to
+    end
+
+    it "should not allow cells to move to other sections" do
+      move_from = NSIndexPath.indexPathForRow(0, inSection:4)
+      move_to   = NSIndexPath.indexPathForRow(0, inSection:3)
+
+      moving_to = @screen.tableView(@screen.tableView, targetIndexPathForMoveFromRowAtIndexPath:move_from, toProposedIndexPath:move_to)
+
+      moving_to.should == move_from
+    end
+
+  end
+
 end
 

data/spec/unit/view_helper_spec.rb

@@ -1,3 +1,16 @@
+class TestView < UIView
+  attr_accessor :on_load_fired
+  attr_accessor :on_styled_fired
+
+  def on_load
+    self.on_load_fired = true
+  end
+
+  def on_styled
+    self.on_styled_fired = true
+  end
+end
+
 describe "view helpers" do
 
   def equal_rect(rect)
@@ -61,6 +74,18 @@ describe "view helpers" do
     layered_view.layer.backgroundColor.should == UIColor.redColor.CGColor
   end
 
+  it "should trigger on_load on a view that supports it" do
+    v = TestView.new
+    @dummy.add v
+    v.on_load_fired.should == true
+  end
+
+  it "should trigger on_styled on a view that supports it" do
+    v = TestView.new
+    @dummy.set_attributes v, { background_color: UIColor.blueColor }
+    v.on_styled_fired.should == true
+  end
+
 
   context "content sizing" do
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ProMotion
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Jamon Holmgren
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2014-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: methadone
@@ -133,6 +133,7 @@ files:
 - lib/ProMotion/web/web_screen_module.rb
 - spec/functional/func_screen_spec.rb
 - spec/functional/func_split_screen_spec.rb
+- spec/functional/func_table_screen_cell_spec.rb
 - spec/functional/func_table_screen_spec.rb
 - spec/functional/func_table_screen_updating_spec.rb
 - spec/functional/func_web_screen_spec.rb
@@ -191,6 +192,7 @@ summary: ProMotion is a fast way to get started building RubyMotion apps. Instea
 test_files:
 - spec/functional/func_screen_spec.rb
 - spec/functional/func_split_screen_spec.rb
+- spec/functional/func_table_screen_cell_spec.rb
 - spec/functional/func_table_screen_spec.rb
 - spec/functional/func_table_screen_updating_spec.rb
 - spec/functional/func_web_screen_spec.rb