ProMotion 2.0.1 → 2.1.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26a3f842a22164f1646fa4c70c06717331c37b37
-  data.tar.gz: b71313bd4e58fd83a405e8741c264547b80e0f19
+  metadata.gz: 069e30500b3574a7ff83d4a179af392513ffac2b
+  data.tar.gz: e7a65eb50f555d29c2b406deaf3f4bb0c9e88aa1
 SHA512:
-  metadata.gz: 309c74e1577110e7c0ab397fe120a367f77343b11f5cfb4813bd99e6f942f89d463eadc36fc143324c49b7fd428ba50191c896246a91dddb17f6d05048eac843
-  data.tar.gz: c0dbd687ecb04bdea39a131e9b8313da6b12ca5b3a83fc7ab8a6ee915b4efc8ead92fb10247c16613907167f83c877c441078b2da22408003ef5f0212f91ce62
+  metadata.gz: 24902da29b4aef04a2620dd41a527052c39a3d9e5bcba5f556d3048cf83a7558b58c8b72ed28ae54f04c92dfb8b6bee847ce842b85c5f2ac6f574ddb70bb3dab
+  data.tar.gz: 007f7044aa819c3ce5e1a9b4e16048886984bc65aaf8d8fd16757a43a481ef52753919a9e6d9eaa62ef54cbb217ab73865ed71c601167de11a744d2a8ef20e7c

data/README.md

@@ -1,4 +1,10 @@
-# ProMotion [![Gem Version](https://badge.fury.io/rb/ProMotion.png)](http://badge.fury.io/rb/ProMotion) [![Build Status](https://travis-ci.org/clearsightstudio/ProMotion.png)](https://travis-ci.org/clearsightstudio/ProMotion) [![Code Climate](https://codeclimate.com/github/clearsightstudio/ProMotion.png)](https://codeclimate.com/github/clearsightstudio/ProMotion) [![Dependency Status](https://gemnasium.com/clearsightstudio/ProMotion.png)](https://gemnasium.com/clearsightstudio/ProMotion)
+# ProMotion
+
+[![Gem Version](https://badge.fury.io/rb/ProMotion.png)](http://badge.fury.io/rb/ProMotion)
+[![Build Status](https://travis-ci.org/clearsightstudio/ProMotion.png)](https://travis-ci.org/clearsightstudio/ProMotion)
+[![Code Climate](https://codeclimate.com/github/clearsightstudio/ProMotion.png)](https://codeclimate.com/github/clearsightstudio/ProMotion)
+[![Dependency Status](https://gemnasium.com/clearsightstudio/ProMotion.png)](https://gemnasium.com/clearsightstudio/ProMotion)
+[![omniref](https://www.omniref.com/ruby/gems/ProMotion.png)](https://www.omniref.com/ruby/gems/ProMotion)
 
 ## iPhone Apps, Ruby-style
 

data/lib/ProMotion.rb

@@ -9,4 +9,24 @@ Motion::Project::App.setup do |app|
   Dir.glob(File.join(core_lib, '**/*.rb')).reverse.each do |file|
     app.files.insert(insert_point, file)
   end
+
+  # For compatibility with libraries that don't use detect_dependencies. :-(
+  app.files_dependencies({
+    "#{core_lib}/cocoatouch/table_view_cell.rb" => [ "#{core_lib}/table/cell/table_view_cell_module.rb" ],
+    "#{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}/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/table.rb" => [
+      "#{core_lib}/table/table_utils.rb",
+      "#{core_lib}/table/extensions/searchable.rb",
+      "#{core_lib}/table/extensions/refreshable.rb",
+      "#{core_lib}/table/extensions/indexable.rb",
+      "#{core_lib}/table/extensions/longpressable.rb"
+    ],
+    "#{core_lib}/web/web_screen.rb" => [ "#{core_lib}/web/web_screen_module.rb" ],
+  })
 end

data/lib/ProMotion/cocoatouch/navigation_controller.rb

@@ -2,10 +2,8 @@ module ProMotion
   class NavigationController < UINavigationController
 
     def popViewControllerAnimated(animated)
-      if self.viewControllers[-2].respond_to? :on_back
-        self.viewControllers[-2].send(:on_back)
-      end
-      super animated
+      super
+      self.viewControllers.last.send(:on_back) if self.viewControllers.last.respond_to?(:on_back)
     end
 
     def shouldAutorotate

data/lib/ProMotion/logger/logger.rb

@@ -19,12 +19,17 @@ module ProMotion
       error:      [:error],
       warn:       [:error, :warn],
       info:       [:error, :warn, :info],
+      debug:      [:error, :warn, :info, :debug],
       verbose:    [:error, :warn, :info, :debug, :verbose],
-      debug:      [:error, :warn, :info, :debug, :verbose]
     }
 
     def level
-      @level ||= :debug
+      @level ||= (RUBYMOTION_ENV == "release" ? :error : :debug)
+    end
+
+    def level=(new_level)
+      log('LOG LEVEL', 'Setting PM.logger to :verbose will make everything REALLY SLOW!', :purple) if new_level == :verbose
+      @level = new_level
     end
 
     def levels
@@ -33,9 +38,9 @@ module ProMotion
 
     # Usage: PM.logger.log("ERROR", "message here", :red)
     def log(label, message_text, color)
-      return if defined?(RUBYMOTION_ENV) && RUBYMOTION_ENV == "test"
+      # return if defined?(RUBYMOTION_ENV) && RUBYMOTION_ENV == "test"
       color = COLORS[color] || COLORS[:default]
-      puts color[0] + NAME + "[#{label}] #{message_text}" + color[1]
+      $stderr.puts color[0] + NAME + "[#{label}] #{message_text}" + color[1]
       nil
     end
 

data/lib/ProMotion/screen/nav_bar_module.rb

@@ -50,6 +50,7 @@ module ProMotion
         nav
       end
       self.navigationController.toolbarHidden = !args[:toolbar] unless args[:toolbar].nil?
+      self.navigationController.setNavigationBarHidden(args[:hide_nav_bar], animated: false) unless args[:hide_nav_bar].nil?
     end
 
   private

data/lib/ProMotion/screen/screen_module.rb

@@ -11,9 +11,9 @@ module ProMotion
     def screen_init(args = {})
       check_ancestry
       resolve_title
-      tab_bar_setup
-      set_attributes self, args
+      apply_properties(args)
       add_nav_bar(args) if args[:nav_bar]
+      tab_bar_setup
       try :screen_setup
       try :on_init
       PM.logger.deprecated "In #{self.class.to_s}, #on_create has been deprecated and removed. Use #screen_init instead." if respond_to?(:on_create)
@@ -146,6 +146,11 @@ module ProMotion
 
   private
 
+    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 ]
+      set_attributes self, args.dup.delete_if { |k,v| reserved_args.include?(k) }
+    end
+
     def tab_bar_setup
       self.tab_bar_item = self.class.send(:get_tab_bar_item)
       self.refresh_tab_bar_item if self.tab_bar_item

data/lib/ProMotion/styling/styling.rb

@@ -18,9 +18,11 @@ module ProMotion
         element.send("#{k}=", v)
       elsif v.is_a?(Array) && element.respond_to?("#{k}") && element.method("#{k}").arity == v.length
         element.send("#{k}", *v)
-      else
-        # Doesn't respond. Check if snake case.
-        set_attribute(element, camelize(k), v) if k.to_s.include?("_")
+      elsif k.to_s.include?("_") # Snake case?
+        set_attribute(element, camelize(k), v)
+      else # Warn
+        PM.logger.debug "set_attribute: #{element.inspect} does not respond to #{k}=."
+        PM.logger.log("BACKTRACE", caller(0).join("\n"), :default) if PM.logger.level == :verbose
       end
       element
     end

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

@@ -23,14 +23,15 @@ 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 ]
+      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 ]
       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 `style:` hash. See TableScreen documentation.")
+        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
     end
 
     def set_styles
-      set_attributes self, data_cell[:style] if data_cell[:style]
+      data_cell[:properties] ||= data_cell[:style] || data_cell[:styles]
+      set_attributes self, data_cell[:properties] if data_cell[:properties]
     end
 
     def set_title
@@ -88,6 +89,7 @@ module ProMotion
   private
 
     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'."
       false

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

@@ -24,7 +24,7 @@ module ProMotion
 
     def cell(params={})
       params = index_path_to_section_index(params)
-      table_section = self.section(params[:section])
+      table_section = params[:unfiltered] ? self.data[params[:section]] : self.section(params[:section])
       c = table_section[:cells].at(params[:index].to_i)
       set_data_cell_defaults c
     end
@@ -67,6 +67,7 @@ module ProMotion
       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],

data/lib/ProMotion/table/table.rb

@@ -62,9 +62,17 @@ module ProMotion
       self.promotion_table_data.search_string
     end
 
-    def update_table_view_data(data)
+    def update_table_view_data(data, args = {})
       self.promotion_table_data.data = data
-      table_view.reloadData
+      if args[:index_paths]
+        args[:animation] ||= UITableViewRowAnimationNone
+
+        table_view.beginUpdates
+        table_view.reloadRowsAtIndexPaths(Array(args[:index_paths]), withRowAnimation: args[:animation])
+        table_view.endUpdates
+      else
+        table_view.reloadData
+      end
       @table_search_display_controller.searchResultsTableView.reloadData if searching?
     end
 
@@ -100,7 +108,7 @@ module ProMotion
           deletable_index_paths << index_path
         end
       end
-      table_view.deleteRowsAtIndexPaths(deletable_index_paths, withRowAnimation:map_row_animation_symbol(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={})
@@ -122,8 +130,11 @@ module ProMotion
       table_cell
     end
 
-    def update_table_data
-      self.update_table_view_data(self.table_data)
+    def update_table_data(args = {})
+      # Try and detect if the args param is a NSIndexPath or an array of them
+      args = { index_paths: args } if args.is_a?(NSIndexPath) || (args.is_a?(Array) && array_all_members_of?(args, NSIndexPath))
+
+      self.update_table_view_data(self.table_data, args)
       self.promotion_table_data.search(search_string) if searching?
     end
 
@@ -133,11 +144,11 @@ module ProMotion
     end
 
     # Number of cells
-    def tableView(table_view, numberOfRowsInSection:section)
+    def tableView(table_view, numberOfRowsInSection: section)
       self.promotion_table_data.section_length(section)
     end
 
-    def tableView(table_view, titleForHeaderInSection:section)
+    def tableView(table_view, titleForHeaderInSection: section)
       section = promotion_table_data.section(section)
       section && section[:title]
     end
@@ -149,29 +160,29 @@ module ProMotion
       nil
     end
 
-    def tableView(table_view, cellForRowAtIndexPath:index_path)
+    def tableView(table_view, cellForRowAtIndexPath: index_path)
       table_view_cell(index_path: index_path)
     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[:style] if data_cell[:style]
+      set_attributes table_cell, data_cell[:properties] if data_cell[:properties]
       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)
+    def tableView(table_view, heightForRowAtIndexPath: index_path)
       (self.promotion_table_data.cell(index_path: index_path)[:height] || table_view.rowHeight).to_f
     end
 
-    def tableView(table_view, didSelectRowAtIndexPath:index_path)
+    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
       trigger_action(data_cell[:action], data_cell[:arguments], index_path) if data_cell[:action]
     end
 
     def tableView(table_view, editingStyleForRowAtIndexPath: index_path)
-      data_cell = self.promotion_table_data.cell(index_path: index_path)
+      data_cell = self.promotion_table_data.cell(index_path: index_path, unfiltered: true)
       map_cell_editing_style(data_cell[:editing_style])
     end
 
@@ -181,18 +192,18 @@ module ProMotion
       end
     end
 
-    def tableView(tableView, sectionForSectionIndexTitle:title, atIndex:index)
+    def tableView(tableView, 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)
+        tableView.scrollRectToVisible(CGRectMake(0.0, 0.0, 1.0, 1.0), animated: false)
         NSNotFound
       else
         index - 1
       end
     end
 
-    def deleteRowsAtIndexPaths(index_paths, withRowAnimation:animation)
+    def deleteRowsAtIndexPaths(index_paths, withRowAnimation: animation)
       PM.logger.warn "ProMotion expects you to use 'delete_cell(index_paths, animation)'' instead of 'deleteRowsAtIndexPaths(index_paths, withRowAnimation:animation)'."
       delete_row(index_paths, animation)
     end

data/lib/ProMotion/table/table_utils.rb

@@ -2,12 +2,17 @@ module ProMotion
   module Table
     module Utils
       def index_path_to_section_index(params)
-        if params[:index_path]
+        if params.is_a?(Hash) && params[:index_path]
           params[:section] = params[:index_path].section
           params[:index] = params[:index_path].row
         end
         params
       end
+
+      # Determines if all members of an array are a certain class
+      def array_all_members_of?(arr, klass)
+        arr.select{ |e| e.is_a?(klass) }.length == arr.length
+      end
     end
   end
 end

data/lib/ProMotion/tabs/tabs.rb

@@ -38,13 +38,13 @@ module ProMotion
         item_image = nil
       end
 
-      item = UITabBarItem.alloc.initWithTitle(title, image:item_image, tag:tag)
+      item = UITabBarItem.alloc.initWithTitle(title, image: item_image, tag: tag)
 
       if item_selected || item_unselected
         item.setFinishedSelectedImage(item_selected, withFinishedUnselectedImage: item_unselected)
       end
 
-      return item
+      item
     end
 
     def create_tab_bar_item(tab={})
@@ -55,17 +55,24 @@ module ProMotion
         tab[:item] ||= tab[:icon]
       end
 
-      title = "Untitled"
-      title = tab[:title] if tab[:title]
-      tab[:tag] ||= @current_tag ||= 0
-      @current_tag = tab[:tag] + 1
+      unless tab[:system_item] || tab[:item]
+        PM.logger.warn("You must provide either a `system_item:` or custom `item:` in `tab_bar_item`")
+        abort
+      end
+
+      title = tab[:title] || "Untitled"
 
-      tab_bar_item = UITabBarItem.alloc.initWithTabBarSystemItem(map_tab_symbol(tab[:system_item]), tag: tab[:tag]) if tab[:system_item]
-      tab_bar_item = create_tab_bar_item_custom(title, tab[:item], tab[:tag]) if tab[:item]
+      tab_bar_item = UITabBarItem.alloc.initWithTabBarSystemItem(map_tab_symbol(tab[:system_item]), tag: current_tag) if tab[:system_item]
+      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
 
-      return tab_bar_item
+      tab_bar_item
+    end
+
+    def current_tag
+      return @prev_tag = 0 unless @prev_tag
+      @prev_tag += 1
     end
 
     def replace_current_item(tab_bar_controller, view_controller: vc)
@@ -96,6 +103,7 @@ module ProMotion
       def tab_bar_item(args={})
         @tab_bar_item = args
       end
+
       def get_tab_bar_item
         @tab_bar_item
       end

data/lib/ProMotion/version.rb

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

data/lib/ProMotion/web/web_screen_module.rb

@@ -36,7 +36,9 @@ module ProMotion
 
     def set_initial_content
       return unless self.respond_to?(:content)
-      content.is_a?(NSURL) ? open_url(content) : set_content(content)
+      current_content = content
+      return unless current_content
+      current_content.is_a?(NSURL) ? open_url(current_content) : set_content(current_content)
     end
 
     def set_content(content)

data/spec/functional/func_screen_spec.rb

@@ -1,6 +1,8 @@
 describe "ProMotion::Screen functionality" do
   tests PM::Screen
 
+  before { UIView.setAnimationDuration 0.01 }
+
   # Override controller to properly instantiate
   def controller
     rotate_device to: :portrait, button: :bottom
@@ -69,23 +71,22 @@ describe "ProMotion::Screen functionality" do
   end
 
   it "should call the on_back method on the root controller when navigating back" do
-    @nav_screen = NavigationScreen.new nav_bar: true
-    @presented_screen = PresentScreen.new
-    @nav_screen.open @presented_screen
-    @presented_screen.close
-    @nav_screen.on_back_fired.should == true
+    presented_screen = PresentScreen.new
+    @controller.open presented_screen, animated: false
+    @controller.navigationController.viewControllers.should == [ @controller, presented_screen ]
+    presented_screen.close animated: false
+    @controller.on_back_fired.should == true
   end
 
   it "should call the correct on_back method when nesting screens" do
-    @base_screen = NavigationScreen.new nav_bar: true
-    @child_screen = @base_screen.open NavigationScreen.new
-    @grandchild_screen = @child_screen.open NavigationScreen.new
+    child_screen = @controller.open NavigationScreen.new, animated: false
+    grandchild_screen = child_screen.open NavigationScreen.new, animated: false
 
     # start closing
-    @grandchild_screen.close
-    @child_screen.on_back_fired.should == true
-    @child_screen.close
-    @base_screen.on_back_fired.should == true
+    grandchild_screen.close animated: false
+    child_screen.on_back_fired.should == true
+    child_screen.close animated: false
+    @controller.on_back_fired.should == true
   end
 
   it "should allow opening and closing a modal screen" do

data/spec/functional/func_split_screen_spec.rb

@@ -10,6 +10,7 @@ describe "Split screen functionality" do
   end
 
   before do
+    UIView.setAnimationDuration 0.01
     rotate_device to: :landscape, button: :right
   end
 

data/spec/functional/func_table_screen_spec.rb

@@ -15,9 +15,15 @@ describe "ProMotion::TableScreen functionality" do
   end
 
   def confirmation_class
-    TestHelper.ios7 ? UITableViewCellDeleteConfirmationButton : UITableViewCellDeleteConfirmationControl
+    TestHelper.ios7 ? "UITableViewCellDeleteConfirmationButton" : "UITableViewCellDeleteConfirmationControl"
   end
 
+  def table_label_class
+    TestHelper.ios7 ? "UILabel" : "UITableViewLabel"
+  end
+
+  before { UIView.setAnimationDuration 0.01 }
+
   after { @table_screen = nil }
 
   it "should have a navigation bar" do
@@ -31,7 +37,7 @@ describe "ProMotion::TableScreen functionality" do
 
   it "should add a new table cell on tap" do
     tap("Add New Row")
-    view("Dynamically Added").class.should == UILabel
+    view("Dynamically Added").class.to_s.should == table_label_class
   end
 
   it "should do nothing when no action specified" do
@@ -47,7 +53,7 @@ describe "ProMotion::TableScreen functionality" do
   it "should delete the specified row from the table view on tap" do
     table_screen.tableView(table_screen.tableView, numberOfRowsInSection:0).should == 7
     tap("Delete the row below")
-    wait 0.3 do
+    wait 0.11 do
       table_screen.tableView(table_screen.tableView, numberOfRowsInSection:0).should == 6
     end
   end
@@ -55,7 +61,7 @@ describe "ProMotion::TableScreen functionality" do
   it "should delete the specified row from the table view on tap with an animation" do
     table_screen.tableView(table_screen.tableView, numberOfRowsInSection:0).should == 7
     tap("Delete the row below with an animation")
-    wait 0.3 do
+    wait 0.11 do
       table_screen.tableView(table_screen.tableView, numberOfRowsInSection:0).should == 6
     end
   end
@@ -66,12 +72,12 @@ describe "ProMotion::TableScreen functionality" do
     table_screen.cell_was_deleted.should != true
     flick("Just another deletable blank row", :to => :left)
 
-    wait 0.25 do
+    wait 0.11 do
       # Tap the delete button
       view('Just another deletable blank row').superview.superview.subviews.each do |subview|
-        if subview.class == confirmation_class
+        if subview.class.to_s == confirmation_class
           tap subview
-          wait 0.25 do
+          wait 0.11 do
             table_screen.tableView(table_screen.tableView, numberOfRowsInSection:0).should == 6
             table_screen.cell_was_deleted.should == true
           end
@@ -85,12 +91,12 @@ describe "ProMotion::TableScreen functionality" do
     table_screen.cell_was_deleted.should != true
     flick("A non-deletable blank row", :to => :left)
 
-    wait 0.25 do
+    wait 0.11 do
       # Tap the delete button
       view('A non-deletable blank row').superview.superview.subviews.each do |subview|
         if subview.class == confirmation_class
           tap subview
-          wait 0.25 do
+          wait 0.11 do
             table_screen.tableView(table_screen.tableView, numberOfRowsInSection:0).should == 7
             table_screen.cell_was_deleted.should != false
           end

data/spec/functional/func_table_screen_updating_spec.rb

@@ -0,0 +1,52 @@
+describe "ProMotion::TableScreen updating functionality" do
+  tests PM::UpdateTestTableScreen
+
+  before { UIView.setAnimationDuration 0.01 }
+
+  it 'should update a single row in the table view' do
+    table_screen = UpdateTestTableScreen.new
+    table_screen.make_more_cells
+    table_screen.update_table_data
+    table_screen.change_cells
+
+    table_screen.first_cell_title.should == "Cell 1"
+    table_screen.second_cell_title.should == "Cell 2"
+
+    table_screen.update_table_data(NSIndexPath.indexPathForRow(0, inSection:0))
+
+    table_screen.first_cell_title.should == "Cell A"
+    table_screen.second_cell_title.should == "Cell 2"
+  end
+
+  it 'should allow multiple formats of index paths to be passed' do
+    table_screen = UpdateTestTableScreen.new
+    table_screen.make_more_cells
+    table_screen.update_table_data
+    table_screen.change_cells
+
+    # Single NSIndexPath
+    Proc.new {
+      table_screen.update_table_data(NSIndexPath.indexPathForRow(0, inSection:0))
+    }.should.not.raise(StandardError)
+
+    # Array of NSIndexPaths
+    Proc.new {
+      table_screen.update_table_data([NSIndexPath.indexPathForRow(0, inSection:0), NSIndexPath.indexPathForRow(1, inSection:0)])
+    }.should.not.raise(StandardError)
+
+    # # Hash with single NSIndexPath
+    Proc.new {
+      table_screen.update_table_data({index_paths: NSIndexPath.indexPathForRow(0, inSection:0)})
+    }.should.not.raise(StandardError)
+
+    # Hash with array of NSIndexPaths
+    Proc.new {
+      table_screen.update_table_data({index_paths: [NSIndexPath.indexPathForRow(0, inSection:0), NSIndexPath.indexPathForRow(1, inSection:0)]})
+    }.should.not.raise(StandardError)
+
+    # Hash with NSIndexPath and row animation
+    Proc.new {
+      table_screen.update_table_data({index_paths: NSIndexPath.indexPathForRow(0, inSection:0), animation: UITableViewRowAnimationFade})
+    }.should.not.raise(StandardError)
+  end
+end

data/spec/functional/func_web_screen_spec.rb

@@ -1,7 +1,10 @@
 describe "ProMotion::TestWebScreen functionality" do
   extend WebStub::SpecHelpers
 
-  before  { disable_network_access! }
+  before do
+    disable_network_access!
+    UIView.setAnimationDuration 0.01
+  end
   after   { enable_network_access! }
 
   def controller

data/spec/helpers/test_helper.rb

@@ -1,6 +1,17 @@
 class TestHelper
+  def self.ios6
+    UIDevice.currentDevice.systemVersion.to_f >= 6.0 &&
+    UIDevice.currentDevice.systemVersion.to_f < 7.0
+  end
+
   def self.ios7
-    UIDevice.currentDevice.systemVersion.to_f >= 7.0
+    UIDevice.currentDevice.systemVersion.to_f >= 7.0 &&
+    UIDevice.currentDevice.systemVersion.to_f < 8.0
+  end
+
+  def self.ios8
+    UIDevice.currentDevice.systemVersion.to_f >= 8.0 &&
+    UIDevice.currentDevice.systemVersion.to_f < 9.0
   end
 end
 

data/spec/unit/screen_helpers_spec.rb

@@ -100,13 +100,13 @@ describe "screen helpers" do
 
     it "#push_view_controller should use the default navigation controller if not provided" do
       vcs = @screen.navigationController.viewControllers
-      @screen.push_view_controller @second_vc
+      @screen.push_view_controller @second_vc, @screen.navigationController, false
       @screen.navigationController.viewControllers.count.should == vcs.count + 1
     end
 
     it "#push_view_controller should use a provided navigation controller" do
       second_nav_controller = UINavigationController.alloc.initWithRootViewController @screen
-      @screen.push_view_controller @second_vc, second_nav_controller
+      @screen.push_view_controller @second_vc, second_nav_controller, false
       second_nav_controller.viewControllers.count.should == 2
     end
 
@@ -123,13 +123,14 @@ describe "screen helpers" do
       end
 
       it "should apply properties when opening a new screen" do
-        new_screen = @screen.send(:set_up_screen_for_open, BasicScreen, { title: 'Some Title', modal: true, hide_tab_bar: true, nav_bar: true })
+        new_screen = @screen.send(:set_up_screen_for_open, BasicScreen, { title: 'Some Title', modal: true, hide_tab_bar: true, nav_bar: true, hide_nav_bar: true })
 
         new_screen.parent_screen.should == @screen
         new_screen.title.should == 'Some Title'
         new_screen.modal?.should == true
         new_screen.hidesBottomBarWhenPushed.should == true
         new_screen.nav_bar?.should == true
+        new_screen.navigationController.isNavigationBarHidden.should == true
       end
 
       it "should present the navigationController when showing a modal screen" do
@@ -199,7 +200,7 @@ describe "screen helpers" do
 
       it "should ignore its own navigation controller if current screen has a navigation controller" do
         basic = BasicScreen.new(nav_bar: true) # creates a dangling nav_bar that will be discarded.
-        screen = @screen.open basic
+        screen = @screen.open basic, animated: false
         screen.should.be.kind_of BasicScreen
         basic.navigationController.should == @screen.navigationController
       end
@@ -301,13 +302,13 @@ describe "screen helpers" do
 
         it "#send_on_return should pass args to the first screen with :root" do
           first_screen = HomeScreen.new(nav_bar: true)
-          second_screen = first_screen.open(BasicScreen)
-          second_screen.open @screen
+          second_screen = first_screen.open(BasicScreen, animated: false)
+          second_screen.open @screen, animated: false
 
 
           second_screen.stub!(:on_return) { |args| should.flunk "shouldn't call on_return on second_screen!" }
           first_screen.mock!(:on_return) { |args| args[:key].should == :value }
-          @screen.close({ key: :value, to_screen: :root })
+          @screen.close key: :value, to_screen: :root, animated: false
         end
       end
 

data/spec/unit/screen_spec.rb

@@ -60,7 +60,7 @@ describe "screen properties" do
   # Issue https://github.com/clearsightstudio/ProMotion/issues/109
   it "#should_autorotate should fire when shouldAutorotate fires when in a navigation bar" do
     parent_screen = BasicScreen.new(nav_bar: true)
-    parent_screen.open @screen
+    parent_screen.open @screen, animated: false
     @screen.mock!(:should_autorotate) { true.should == true }
     parent_screen.navigationController.shouldAutorotate
   end

data/spec/unit/split_screen_open_screen_spec.rb

@@ -31,14 +31,14 @@ describe "split screen `open` functionality" do
   end
 
   it "should open a new screen in the master view's navigation controller" do
-    screen = @master_screen.open @detail_screen_2
+    screen = @master_screen.open @detail_screen_2, animated: false
     @split_screen.detail_screen.should == @detail_screen_1 # no change
     @master_screen.navigationController.topViewController.should == @detail_screen_2
     screen.should == @detail_screen_2
   end
 
   it "should open a new modal screen in the detail view" do
-    screen = @detail_screen_1.open @detail_screen_2, modal: true
+    screen = @detail_screen_1.open @detail_screen_2, modal: true, animated: false
     @split_screen.detail_screen.should == @detail_screen_1
     @detail_screen_1.presentedViewController.should == (@detail_screen_2.navigationController || @detail_screen_2)
     screen.should == @detail_screen_2
@@ -47,7 +47,7 @@ describe "split screen `open` functionality" do
   it "should not interfere with normal non-split screen navigation" do
     home = HomeScreen.new(nav_bar: true)
     child = BasicScreen.new
-    screen = home.open child, in_detail: true, in_master: true
+    screen = home.open child, in_detail: true, in_master: true, animated: false
     home.navigationController.topViewController.should == child
     screen.should == child
   end

data/spec/unit/tab_bar_spec.rb

@@ -23,6 +23,13 @@ describe "PM::Tabs" do
     tab_bar.viewControllers.length.should == 4
   end
 
+  it "should have correct tags on each tabBarItem" do
+    @screen1.tabBarItem.tag.should == 0
+    @screen2.tabBarItem.tag.should == 1
+    @screen3.tabBarItem.tag.should == 2
+    @screen4.tabBarItem.tag.should == 3
+  end
+
   it "should have the right screens in the right places" do
     tab_bar.viewControllers[0].should == @screen1.navigationController
     tab_bar.viewControllers[1].should == @screen2.navigationController

data/spec/unit/tab_spec.rb

@@ -28,7 +28,7 @@ describe "tab bar functionality" do
   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"
-    @tab_bar.tabBar.items[3].title.should == "TestTableScreen"
+    @tab_bar.tabBar.items[3].title.should == "Test tab title"
   end
 
   it "should allow changing the tab bar item with set_tab_bar_item" do

data/spec/unit/tables/table_module_spec.rb

@@ -5,7 +5,8 @@ describe "PM::Table module" do
   end
 
   def custom_cell
-    @image = UIImage.imageNamed("list")
+    @image ||= UIImage.imageNamed("list")
+    @pattern_image_color ||= UIColor.colorWithPatternImage(@image)
     cell_factory({
       title: "Crazy Full Featured Cell",
       subtitle: "This is way too huge..see note",
@@ -29,13 +30,29 @@ describe "PM::Table module" do
         size: 50,
         radius: 15
       },
-      style: {
-        masks_to_bounds: true,
-        background_color: UIColor.colorWithPatternImage(@image)
+      properties: {
+        content_view: {
+          background_color: @pattern_image_color,
+        },
+        layer: {
+          masks_to_bounds: true,
+        },
       }
     })
   end
 
+  def default_cell_height
+    return UITableViewAutomaticDimension if TestHelper.ios8
+    return 44.0 if TestHelper.ios7
+  end
+
+  def default_header_height
+    # Thanks, Apple.
+    return -1.0 if TestHelper.ios8
+    return 23.0 if TestHelper.ios7
+    return 22.0 if TestHelper.ios6
+  end
+
   before do
     @subject = TestTableScreen.new
     @subject.mock! :table_data do
@@ -44,7 +61,7 @@ describe "PM::Table module" do
       },{
         title: "Table cell group 2", cells: [ cell_factory ]
       },{
-        title: "Table cell group 3", cells: [ cell_factory(title: "3-1"), cell_factory({title: "3-2", style: { background_color: UIColor.blueColor } }) ]
+        title: "Table cell group 3", cells: [ cell_factory(title: "3-1"), cell_factory({title: "3-2", properties: { background_color: UIColor.blueColor } }) ]
       },{
         title: "Table cell group 4", cells: [ custom_cell, cell_factory(title: "4-2"), cell_factory(title: "4-3"), cell_factory(title: "4-4") ]
       },{
@@ -101,7 +118,7 @@ describe "PM::Table module" do
   end
 
   it "should return the table's cell height if none is given" do
-    @subject.tableView(@subject.table_view, heightForRowAtIndexPath:@ip).should == 44.0 # Built-in default
+    @subject.tableView(@subject.table_view, heightForRowAtIndexPath:@ip).should == default_cell_height
   end
 
   it "should allow setting a custom cell height" do
@@ -140,11 +157,12 @@ describe "PM::Table module" do
 
   it "should set a custom cell background image" do
     @image.should.not.be.nil
-    ip = NSIndexPath.indexPathForRow(0, inSection: 3) # Cell 2-1
+    ip = NSIndexPath.indexPathForRow(0, inSection: 3) # Cell 4-1
     cell = @subject.tableView(@subject.table_view, cellForRowAtIndexPath: ip)
     cell.should.be.kind_of(UITableViewCell)
-    cell.backgroundColor.should.be.kind_of(UIColor)
-    cell.backgroundColor.should == UIColor.colorWithPatternImage(@image)
+    cell.layer.masksToBounds.should == true
+    cell.contentView.backgroundColor.should.be.kind_of(UIColor)
+    cell.contentView.backgroundColor.should == @pattern_image_color
   end
 
   it "should set a custom cell background color" do
@@ -162,8 +180,7 @@ describe "PM::Table module" do
     end
 
     it "should use the default section height if none is specified" do
-      header_height = (UIDevice.currentDevice.systemVersion.to_f >= 7.0) ? 23.0 : 22.0
-      @subject.tableView(@subject.table_view, heightForHeaderInSection:4).should == header_height # Built-in default
+      @subject.tableView(@subject.table_view, heightForHeaderInSection:4).should == default_header_height
     end
 
     it "should use the set title_view_height if one is specified" do

data/spec/unit/tables/table_screen_spec.rb

@@ -112,20 +112,6 @@ describe "table screens" do
   end
 
   describe "test PM::TableScreen's updating functionality" do
-    before do
-      class UpdateTestTableScreen < PM::TableScreen
-        def table_data; @table_data ||= []; end
-        def on_load
-          @table_data = [{cells: []}]
-          update_table_data
-        end
-
-        def make_more_cells
-          @table_data = [{cells: [{title: "Cell 1"},{title: "Cell 2"}]}]
-        end
-      end
-    end
-
     it 'should update the table data when update_table_data is called' do
       @screen = UpdateTestTableScreen.new
       @screen.tableView(@screen.tableView, numberOfRowsInSection:0).should == 0

data/spec/unit/tables/table_utils_spec.rb

@@ -0,0 +1,34 @@
+describe "PM::Table utils" do
+
+  before do
+    @subject = TestTableScreen.new
+    @subject.on_load
+    @subject.update_table_data
+  end
+
+  it "should convert an index path to a section index" do
+    index_path = NSIndexPath.indexPathForRow(12, inSection:2)
+    given = {index_path: index_path}
+    expected = {
+      index_path: index_path,
+      section: 2,
+      index: 12
+    }
+
+    @subject.index_path_to_section_index(given).should == expected
+  end
+
+  it "return the original param when converting an index path with incorrect values" do
+    @subject.index_path_to_section_index(17).should == 17
+  end
+
+  it "should properly determine if all members of an array are the same class" do
+    @subject.array_all_members_of?([1, 2, 3, 4], Fixnum).should == true
+    @subject.array_all_members_of?(["string", 'string2'], String).should == true
+    @subject.array_all_members_of?([:sym1, :sym2, :sym3], Symbol).should == true
+
+    @subject.array_all_members_of?([1, 2, 3, 4, 'String'], Fixnum).should == false
+    @subject.array_all_members_of?([4.4, 2], Fixnum).should == false
+  end
+
+end

data/spec/unit/tables/table_view_cell_spec.rb

@@ -19,7 +19,7 @@ describe "PM::TableViewCellModule" do
         radius: 15
       },
       selection_style: :gray,
-      style: {
+      properties: {
         layer: {
           masks_to_bounds: true
         },
@@ -48,7 +48,7 @@ describe "PM::TableViewCellModule" do
         {
           title: "",
           cells: [
-            { title: "Test 1", style: { accessory_type: UITableViewCellStateShowingEditControlMask } },
+            { title: "Test 1", properties: { accessory_type: UITableViewCellStateShowingEditControlMask } },
             custom_cell,
             { title: "Test2", accessory: { view: button } },
             attributed_cell

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ProMotion
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0.beta1
 platform: ruby
 authors:
 - Jamon Holmgren
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-04 00:00:00.000000000 Z
+date: 2014-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: methadone
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: webstub
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: motion-stump
   requirement: !ruby/object:Gem::Requirement
@@ -134,6 +134,7 @@ files:
 - spec/functional/func_screen_spec.rb
 - spec/functional/func_split_screen_spec.rb
 - spec/functional/func_table_screen_spec.rb
+- spec/functional/func_table_screen_updating_spec.rb
 - spec/functional/func_web_screen_spec.rb
 - spec/helpers/test_helper.rb
 - spec/unit/delegate_spec.rb
@@ -154,6 +155,7 @@ files:
 - spec/unit/tables/table_indexable_spec.rb
 - spec/unit/tables/table_module_spec.rb
 - spec/unit/tables/table_screen_spec.rb
+- 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
@@ -173,12 +175,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: ProMotion is a fast way to get started building RubyMotion apps. Instead
@@ -190,6 +192,7 @@ test_files:
 - spec/functional/func_screen_spec.rb
 - spec/functional/func_split_screen_spec.rb
 - spec/functional/func_table_screen_spec.rb
+- spec/functional/func_table_screen_updating_spec.rb
 - spec/functional/func_web_screen_spec.rb
 - spec/helpers/test_helper.rb
 - spec/unit/delegate_spec.rb
@@ -210,8 +213,8 @@ test_files:
 - spec/unit/tables/table_indexable_spec.rb
 - spec/unit/tables/table_module_spec.rb
 - spec/unit/tables/table_screen_spec.rb
+- 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/web_spec.rb
-has_rdoc: