ProMotion 0.7.3 → 0.7.4

data/lib/ProMotion/helpers/measure_helper.rb

@@ -2,7 +2,7 @@ module ProMotion
   class MeasureHelper
     class << self
       def content_height(view)
-        warn "[DEPRECATION] `MeasureHelper.content_height` is deprecated. Include the module `ScreenElements` to get access to this method (already included in Screen)."
+        PM.logger.deprecated "`MeasureHelper.content_height` is deprecated. Include the module `ScreenElements` to get access to this method (already included in Screen)."
 
         height = 0
         view.subviews.each do |subview|
@@ -17,4 +17,4 @@ module ProMotion
       end
     end
   end
-end
+end

data/lib/ProMotion/helpers/view_helper.rb

@@ -69,5 +69,14 @@ module ProMotion
       height
     end
 
+    def closest_parent(type)
+      # iterate up the view hierarchy to find the parent element of "type" containing this view
+      this_view = self.superview
+      while this_view != nil do
+        return this_view if this_view.is_a? type
+        this_view = this_view.superview
+      end
+      nil
+    end
   end
 end

data/lib/ProMotion/screens/_screen_module.rb

@@ -126,7 +126,7 @@ module ProMotion
 
     # [DEPRECATED]
     def set_view_controller(vc)
-      warn "[DEPRECATION] `set_view_controller` is deprecated and discontinued.  Please inherit from the UIViewController you wish to use and include ProMotion::ScreenViewController instead."
+      PM.logger.deprecated "`set_view_controller` is deprecated and discontinued.  Please inherit from the UIViewController you wish to use and include ProMotion::ScreenViewController instead."
       self
     end
 
@@ -153,7 +153,7 @@ module ProMotion
     def on_disappear; end
 
     def view_controller
-      warn "[DEPRECATION] `view_controller` is deprecated, as screens are now UIViewController subclasses."
+      PM.logger.deprecated "`view_controller` is deprecated, as screens are now UIViewController subclasses."
       self
     end
 

data/lib/ProMotion/screens/_tables/_refreshable_table.rb

@@ -14,23 +14,12 @@ module ProMotion
     end
     alias :makeRefreshable :make_refreshable
 
-    ######### iOS methods, headless camel case #######
-
-    # UIRefreshControl Delegates
-    def refreshView(refresh)
-      refresh.attributedTitle = NSAttributedString.alloc.initWithString(@refreshing)
-      if @refreshable_callback && self.respond_to?(@refreshable_callback)
-        self.send(@refreshable_callback)
-      else
-        PM.logger.warn "You must implement the '#{@refreshable_callback}' method in your TableScreen."
-      end
-    end
-
     def start_refreshing
       return unless @refresh_control
 
       @refresh_control.beginRefreshing
     end
+    alias :begin_refreshing :start_refreshing
 
     def end_refreshing
       return unless @refresh_control
@@ -38,5 +27,19 @@ module ProMotion
       @refresh_control.attributedTitle = NSAttributedString.alloc.initWithString(sprintf(@updated_format, Time.now.strftime(@updated_time_format)))
       @refresh_control.endRefreshing
     end
+    alias :stop_refreshing :end_refreshing
+    
+    ######### iOS methods, headless camel case #######
+
+    # UIRefreshControl Delegates
+    def refreshView(refresh)
+      refresh.attributedTitle = NSAttributedString.alloc.initWithString(@refreshing)
+      if @refreshable_callback && self.respond_to?(@refreshable_callback)
+        self.send(@refreshable_callback)
+      else
+        PM.logger.warn "You must implement the '#{@refreshable_callback}' method in your TableScreen."
+      end
+    end
+
   end
 end

data/lib/ProMotion/screens/_tables/_searchable_table.rb

@@ -49,6 +49,7 @@ module ProMotion
       @promotion_table_data.stop_searching
       @promotion_table_data_data = nil
       self.table_view.setScrollEnabled true
+      self.table_view.reloadData
     end
 
     def searchDisplayControllerWillBeginSearch(controller)

data/lib/ProMotion/screens/_tables/_table.rb

@@ -73,11 +73,10 @@ module ProMotion
       index_path = table_cell.superview.indexPathForCell(table_cell)
 
       data_cell = cell_at_section_and_index(index_path.section, index_path.row)
-      data_cell[:arguments] = {} unless data_cell[:arguments]
-      data_cell[:arguments][:value] = switch.isOn if data_cell[:arguments].is_a? Hash
-      data_cell[:accessory_action] ||= data_cell[:accessoryAction] # For legacy support
+      data_cell[:accessory][:arguments] = {} unless 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[:arguments]) if data_cell[:accessory_action]
+      trigger_action(data_cell[:accessory][:action], data_cell[:accessory][:arguments]) if data_cell[:accessory][:action]
     end
 
     def delete_row(index_paths, animation = nil)

data/lib/ProMotion/screens/_tables/table_data.rb

@@ -102,8 +102,10 @@ module ProMotion
         background_color: :backgroundColor,
         selection_style: :selectionStyle,
         cell_class_attributes: :cellClassAttributes,
-        accessory_view: :accessoryView,
+        accessory: :accessoryView,
+        accessory: :accessory_view,
         accessory_type: :accessoryType,
+        accessory_action: :accessoryAction,
         accessory_checked: :accessoryDefault,
         remote_image: :remoteImage,
         subviews: :subViews
@@ -117,13 +119,13 @@ module ProMotion
 
       mappings.each_pair do |n, old|
         if data_cell[old]
-          warn "[DEPRECATION] `:#{old}` is deprecated in TableScreens. Use `:#{n}`"
+          PM.logger.deprecated "`:#{old}` is deprecated in TableScreens. Use `:#{n}`"
           data_cell[n] = data_cell[old]
         end
       end
 
       if data_cell[:styles] && data_cell[:styles][:textLabel]
-        warn "[DEPRECATION] `:textLabel` is deprecated in TableScreens. Use `:label`"
+        PM.logger.deprecated "`:textLabel` is deprecated in TableScreens. Use `:label`"
         data_cell[:styles][:label] = data_cell[:styles][:textLabel]
       end
 

data/lib/ProMotion/screens/_tables/table_view_cell_module.rb

@@ -24,7 +24,9 @@ module ProMotion
     end
 
     def set_cell_attributes
-      set_attributes self, data_cell.dup.tap{ |h| h.delete(:image) }
+      data_cell_attributes = data_cell.dup
+      [:image, :accessory_action].each { |k| data_cell_attributes.delete(k) }
+      set_attributes self, data_cell_attributes
       self
     end
 
@@ -41,16 +43,25 @@ module ProMotion
     end
 
     def set_accessory_view
-      if data_cell[:accessory_view]
-        self.accessoryView = data_cell[:accessory_view]
-        self.accessoryView.autoresizingMask = UIViewAutoresizingFlexibleWidth
-      end
-
-      if data_cell[:accessory] && data_cell[:accessory] == :switch
+       # Legacy Support < 0.7.4
+      data_cell[:accessory] ||= data_cell[:accessory_view]
+      data_cell[:accessory] = {
+        view: data_cell[:accessory],
+        value: data_cell[:accessory_value],
+        action: data_cell[:accessory_action],
+        arguments: data_cell[:accessory_arguments]
+      } unless data_cell[:accessory].is_a? Hash
+      # End Legacy Support
+
+      if data_cell[:accessory][:view] == :switch
         switch_view = UISwitch.alloc.initWithFrame(CGRectZero)
-        switch_view.addTarget(self, action: "accessory_toggled_switch:", forControlEvents:UIControlEventValueChanged)
-        switch_view.on = true if data_cell[:accessory_checked]
+        switch_view.setAccessibilityLabel(data_cell[:accessory][:accessibility_label]) if data_cell[:accessory][:accessibility_label]
+        switch_view.addTarget(self.closest_parent(UITableView), action: "accessory_toggled_switch:", forControlEvents:UIControlEventValueChanged)
+        switch_view.on = true if data_cell[:accessory][:value]
         self.accessoryView = switch_view
+      elsif data_cell[:accessory][:view]
+        self.accessoryView = data_cell[:accessory][:view]
+        self.accessoryView.autoresizingMask = UIViewAutoresizingFlexibleWidth
       end
 
       self

data/lib/ProMotion/version.rb

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

data/spec/functional/func_screen_spec.rb

@@ -1,66 +1,66 @@
 describe "ProMotion::Screen functional" do
   tests PM::Screen
-  
+
   # Override controller to properly instantiate
   def controller
     rotate_device to: :portrait, button: :bottom
     @controller ||= FunctionalScreen.new(nav_bar: true)
     @controller.main_controller
   end
-  
+
   after do
     @controller = nil
   end
-  
+
   it "should have a navigation bar" do
     view("Functional").should.be.kind_of UINavigationItemView
   end
-  
+
   it "should allow setting a left nav bar button" do
     @controller.set_nav_bar_button :left, title: "Cool", action: :triggered_button
     tap("Cool")
     @controller.button_was_triggered.should.be.true
   end
-  
+
   it "should allow setting a right nav bar button" do
     @controller.set_nav_bar_button :right, title: "Cool2", action: :triggered_button
     tap("Cool2")
     @controller.button_was_triggered.should.be.true
   end
-  
+
   it "should allow opening another screen in the same nav bar and have a back button that is operational" do
     @controller.open BasicScreen
-    
+
     wait 0.5 do
-      
+
       view("Basic").should.be.kind_of UINavigationItemView
       view("Functional").should.be.kind_of UINavigationItemButtonView
-      
+
       tap("Functional")
       wait 0.5 do
         view("Functional").should.be.kind_of UINavigationItemView
       end
-        
+
     end
   end
-  
+
   it "should allow opening and closing a modal screen" do
     @basic = BasicScreen.new(nav_bar: true)
     wait 0.1 do
       @controller.open_modal @basic
-      
+
       wait 0.6 do
-        
+
         view("Basic").should.be.kind_of UINavigationItemView
         @basic.close
-        
+
         wait 0.6 do
           @basic = nil
           view("Functional").should.be.kind_of UINavigationItemView
         end
-        
+
       end
     end
   end
-  
+
 end

data/spec/functional/func_searchable_table_spec.rb

@@ -0,0 +1,32 @@
+describe "Searchable table spec" do
+  tests TableScreenSearchable
+  
+  # Override controller to properly instantiate
+  def controller
+    @controller ||= TableScreenSearchable.new(nav_bar: true)
+    @controller.on_load
+    @controller.main_controller
+  end
+
+  it "should be rotated in portrait mode" do
+    rotate_device to: :portrait, button: :bottom
+    true.should == true
+  end
+
+  it "should show all 50 states" do
+    @controller.tableView(@controller.tableView, numberOfRowsInSection:0).should == 50
+  end
+  
+  it "should allow searching for all the 'New' states" do
+    @controller.searchDisplayController(@controller, shouldReloadTableForSearchString:"New")
+    @controller.tableView(@controller.tableView, numberOfRowsInSection:0).should == 4
+  end
+  
+  it "should allow ending searches" do
+    @controller.searchDisplayController(@controller, shouldReloadTableForSearchString:"North")
+    @controller.tableView(@controller.tableView, numberOfRowsInSection:0).should == 2
+    @controller.searchDisplayControllerWillEndSearch(@controller)
+    @controller.tableView(@controller.tableView, numberOfRowsInSection:0).should == 50
+  end
+    
+end

data/spec/functional/func_split_screen_spec.rb

@@ -1,6 +1,6 @@
 describe "Split screen functional" do
   tests PM::SplitViewController
-  
+
   # Override controller to properly instantiate
   def controller
     @app ||= TestDelegate.new
@@ -8,59 +8,59 @@ describe "Split screen functional" do
     @detail = DetailScreen.new(nav_bar: true)
     @controller ||= @app.create_split_screen @master, @detail
   end
-  
+
   before do
     rotate_device to: :landscape, button: :right
   end
-  
+
   after do
     rotate_device to: :portrait, button: :bottom
   end
-  
+
   it "should allow opening a detail view from the master view" do
-    
+
     @master.open BasicScreen.new(nav_bar: true), in_detail: true
-    
+
     wait 0.75 do
       view("Master").should.be.kind_of UINavigationItemView
       view("Basic").should.be.kind_of UINavigationItemView
       views(UINavigationItemView).each { |v| v.title.should.not == "Detail" }
     end
-    
+
   end
-    
+
   it "should allow opening another view from the master view" do
-    
+
     @master.open BasicScreen
-    
+
     wait 0.75 do
       view("Basic").should.be.kind_of UINavigationItemView
       view("Detail").should.be.kind_of UINavigationItemView
     end
-    
+
   end
-    
+
   it "should allow opening a master view from the detail view" do
-    
+
     @detail.open BasicScreen.new(nav_bar: true), in_master: true
-    
+
     wait 0.75 do
       view("Basic").should.be.kind_of UINavigationItemView
       view("Detail").should.be.kind_of UINavigationItemView
       views(UINavigationItemView).each { |v| v.title.should.not == "Master" }
     end
-    
+
   end
-    
+
   it "should allow opening another view from the detail view" do
-    
+
     @detail.open BasicScreen
-    
+
     wait 0.75 do
       view("Basic").should.be.kind_of UINavigationItemView
       view("Master").should.be.kind_of UINavigationItemView
     end
-    
+
   end
-    
+
 end

data/spec/functional/func_table_screen_spec.rb

@@ -49,4 +49,25 @@ describe "ProMotion::TestTableScreen functionality" do
     @controller.tableView(@controller.tableView, numberOfRowsInSection:0).should == 5
   end
 
+  it "should call a method when the switch is flipped" do
+    @controller.scroll_to_bottom
+    tap "switch_1"
+    @controller.tap_counter.should == 1
+  end
+
+  it "should call the method with arguments when the switch is flipped" do
+    @controller.scroll_to_bottom
+    tap "switch_2"
+    @controller.tap_counter.should == 3
+  end
+
+  it "should call the method with arguments when the switch is flipped and when the cell is tapped" do
+    @controller.scroll_to_bottom
+    tap "switch_3"
+    @controller.tap_counter.should == 3
+
+    tap "Switch With Cell Tap, Switch Action And Parameters"
+    @controller.tap_counter.should == 13
+  end
+
 end

data/spec/helpers/table_screen.rb

@@ -1,20 +1,22 @@
 class TestTableScreen < ProMotion::SectionedTableScreen
 
+  attr_accessor :tap_counter
+
   def promotion_table_data
     @promotion_table_data
   end
 
   def on_load
-    @tap_counter ||= 0
+    self.tap_counter = 0
   end
 
   def table_data
     @data ||= [{
       title: "Your Account",
       cells: [
-        { title: "Increment", action: :increment_counter_by, arguments: { number: 3 } },
+        { title: "Increment", action: :increment_counter_by, arguments: {number: 3} },
         { title: "Add New Row", action: :add_tableview_row },
-        { title: "Delete the row below", action: :delete_cell, arguments: {section: 0, row:3 } },
+        { title: "Delete the row below", action: :delete_cell, arguments: {section: 0, row:3} },
         { title: "Just another blank row" },
         { title: "Delete the row below with an animation", action: :delete_cell, arguments: {animated: true, section: 0, row:5 } },
         { title: "Just another blank row" }
@@ -23,16 +25,44 @@ class TestTableScreen < ProMotion::SectionedTableScreen
       title: "App Stuff",
       cells: [
         { title: "Increment One", action: :increment_counter },
-        { title: "Feedback", remote_image: { url: "http://placekitten.com/100/100", placeholder: "some-local-image", size: 50, radius: 15 } }
+        { title: "Feedback", cell_identifier: "ImagedCell", remote_image: { url: "http://placekitten.com/100/100", placeholder: "some-local-image", size: 50, radius: 15 } }
       ]
     }, {
       title: "Image Tests",
       cells: [
-        { title: "Image Test 1", image: {image: UIImage.imageNamed("list.png"), radius: 10} },
-        { title: "Image Test 2", image: {image: "list.png"} },
-        { title: "Image Test 3", image: UIImage.imageNamed("list.png") },
+        { title: "Image Test 1", cell_identifier: "ImagedCell", image: {image: UIImage.imageNamed("list.png"), radius: 10} },
+        { title: "Image Test 2", cell_identifier: "ImagedCell", image: {image: "list.png"} },
+        { title: "Image Test 3", cell_identifier: "ImagedCell", cell_identifier: "ImagedCell", image: UIImage.imageNamed("list.png") },
         { title: "Image Test 4", image: "list.png" },
       ]
+    }, {
+      title: "Cell Accessory Tests",
+      cells: [{
+          title: "Switch With Action",
+          accessory: {
+              view: :switch,
+              action: :increment_counter,
+              accessibility_label: "switch_1"
+            } ,
+        }, {
+          title: "Switch With Action And Parameters",
+          accessory: {
+            view: :switch,
+            action: :increment_counter_by,
+            arguments: { number: 3 },
+            accessibility_label: "switch_2"
+          } ,
+        }, {
+          title: "Switch With Cell Tap, Switch Action And Parameters",
+          accessory:{
+            view: :switch,
+            action: :increment_counter_by,
+            arguments: { number: 3 },
+            accessibility_label: "switch_3"
+          },
+          action: :increment_counter_by,
+          arguments: { number: 10 }
+        }]
     }]
   end
 
@@ -56,17 +86,25 @@ class TestTableScreen < ProMotion::SectionedTableScreen
     end
   end
 
-  def increment_counter(args={})
-    @tap_counter += 1
+  def increment_counter
+    self.tap_counter = self.tap_counter + 1
   end
 
   def increment_counter_by(args={})
-    @tap_counter = @tap_counter + args[:number]
+    self.tap_counter = self.tap_counter + args[:number]
   end
 
-  def tap_counter
-    @tap_counter
+  def custom_accessory_view
+    set_attributes UIView.new, {
+      background_color: UIColor.orangeColor
+    }
   end
 
+  def scroll_to_bottom
+    if table_view.contentSize.height > table_view.frame.size.height
+        offset = CGPointMake(0, table_view.contentSize.height - table_view.frame.size.height)
+        table_view.setContentOffset(offset, animated:false)
+    end
+  end
 
 end

data/spec/helpers/table_screen_searchable.rb

@@ -1,5 +1,62 @@
 class TableScreenSearchable < TestTableScreen
 
   searchable
+  
+  def table_data
+    @search_table_data ||= [{
+      cells: [
+        { title: "Alabama" },
+        { title: "Alaska" },
+        { title: "Arizona" },
+        { title: "Arkansas" },
+        { title: "California" },
+        { title: "Colorado" },
+        { title: "Connecticut" },
+        { title: "Delaware" },
+        { title: "Florida" },
+        { title: "Georgia" },
+        { title: "Hawaii" },
+        { title: "Idaho" },
+        { title: "Illinois" },
+        { title: "Indiana" },
+        { title: "Iowa" },
+        { title: "Kansas" },
+        { title: "Kentucky" },
+        { title: "Louisiana" },
+        { title: "Maine" },
+        { title: "Maryland" },
+        { title: "Massachusetts" },
+        { title: "Michigan" },
+        { title: "Minnesota" },
+        { title: "Mississippi" },
+        { title: "Missouri" },
+        { title: "Montana" },
+        { title: "Nebraska" },
+        { title: "Nevada" },
+        { title: "New Hampshire" },
+        { title: "New Jersey" },
+        { title: "New Mexico" },
+        { title: "New York" },
+        { title: "North Carolina" },
+        { title: "North Dakota" },
+        { title: "Ohio" },
+        { title: "Oklahoma" },
+        { title: "Oregon" },
+        { title: "Pennsylvania" },
+        { title: "Rhode Island" },
+        { title: "South Carolina" },
+        { title: "South Dakota" },
+        { title: "Tennessee" },
+        { title: "Texas" },
+        { title: "Utah" },
+        { title: "Vermont" },
+        { title: "Virginia" },
+        { title: "Washington" },
+        { title: "West Virginia" },
+        { title: "Wisconsin" },
+        { title: "Wyoming" }
+      ]
+    }]
+  end
 
-end
+end

data/spec/unit/tables/table_module_spec.rb

@@ -1,9 +1,9 @@
 describe "PM::Table module" do
-  
+
   def cell_factory(args={})
     { title: "Basic", action: :basic_cell_tapped, arguments: { id: 1 } }.merge!(args)
   end
-  
+
   def custom_cell
     cell_factory({
       title: "Crazy Full Featured Cell",
@@ -22,7 +22,6 @@ describe "PM::Table module" do
         backgroundColor: UIColor.whiteColor
       },
       accessory: :switch, # currently only :switch is supported
-      accessory_view: @some_accessory_view,
       accessory_type: UITableViewCellAccessoryCheckmark,
       accessory_checked: true, # whether it's "checked" or not
       image: { image: UIImage.imageNamed("something"), radius: 15 },
@@ -33,7 +32,7 @@ describe "PM::Table module" do
       subviews: [ @some_view, @some_other_view ] # arbitrary views added to the cell
     })
   end
-  
+
   before do
     @subject = TestTableScreen.new
     @subject.mock! :table_data do
@@ -47,62 +46,62 @@ describe "PM::Table module" do
         title: "Table cell group 4", cells: [ custom_cell, cell_factory(title: "4-2"), cell_factory(title: "4-3"), cell_factory(title: "4-4") ]
       }]
     end
-    
+
     @subject.on_load
-    
+
     @ip = NSIndexPath.indexPathForRow(1, inSection: 2) # Cell 3-2
     @custom_ip = NSIndexPath.indexPathForRow(0, inSection: 3) # Cell "Crazy Full Featured Cell"
-    
+
     @subject.update_table_data
   end
-  
+
   it "should have the right number of sections" do
     @subject.numberOfSectionsInTableView(@subject.table_view).should == 4
   end
-  
+
   it "should set the section titles" do
     @subject.tableView(@subject.table_view, titleForHeaderInSection:0).should == "Table cell group 1"
     @subject.tableView(@subject.table_view, titleForHeaderInSection:1).should == "Table cell group 2"
     @subject.tableView(@subject.table_view, titleForHeaderInSection:2).should == "Table cell group 3"
     @subject.tableView(@subject.table_view, titleForHeaderInSection:3).should == "Table cell group 4"
   end
-  
+
   it "should create the right number of cells" do
     @subject.tableView(@subject.table_view, numberOfRowsInSection:0).should == 0
     @subject.tableView(@subject.table_view, numberOfRowsInSection:1).should == 1
     @subject.tableView(@subject.table_view, numberOfRowsInSection:2).should == 2
     @subject.tableView(@subject.table_view, numberOfRowsInSection:3).should == 4
   end
-  
+
   it "should create the jumplist" do
     @subject.mock! :table_data_index, do
       Array("A".."Z")
     end
-    
+
     @subject.sectionIndexTitlesForTableView(@subject.table_view).should == Array("A".."Z")
   end
-  
+
   it "should return the proper cell" do
     cell = @subject.tableView(@subject.table_view, cellForRowAtIndexPath: @ip)
     cell.should.be.kind_of(UITableViewCell)
     cell.textLabel.text.should == "3-2"
   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
   end
-  
+
   it "should allow setting a custom cell height" do
     @subject.tableView(@subject.table_view, heightForRowAtIndexPath:@custom_ip).should.be > 0.0
     @subject.tableView(@subject.table_view, heightForRowAtIndexPath:@custom_ip).should == custom_cell[:height].to_f
   end
-  
+
   it "should trigger the right action on select and pass in the right arguments" do
     @subject.mock! :tapped_cell_1 do |args|
       args[:data].should == [ "lots", "of", "data" ]
     end
-    
+
     @subject.tableView(@subject.table_view, didSelectRowAtIndexPath:@custom_ip)
   end
-  
+
 end

data/spec/unit/tables/table_screen_spec.rb

@@ -15,6 +15,7 @@ describe "table screens" do
       @screen.tableView(@screen.tableView, numberOfRowsInSection:0).should == 6
       @screen.tableView(@screen.tableView, numberOfRowsInSection:1).should == 2
       @screen.tableView(@screen.tableView, numberOfRowsInSection:2).should == 4
+      @screen.tableView(@screen.tableView, numberOfRowsInSection:3).should == 3
     end
 
     it "should return a UITableViewCell" do
@@ -30,10 +31,8 @@ describe "table screens" do
     end
 
     it "should display all images properly no matter how they were initialized" do
-      section = @screen.promotion_table_data.sections.count - 1 # All the cells we want to test are in the last section
-
-      @screen.tableView(@screen.tableView, numberOfRowsInSection:section).times do |i|
-        index_path = NSIndexPath.indexPathForRow(i, inSection: section)
+      @screen.tableView(@screen.tableView, numberOfRowsInSection:2).times do |i|
+        index_path = NSIndexPath.indexPathForRow(i, inSection:2)
 
         @screen.tableView(@screen.tableView, cellForRowAtIndexPath: index_path).imageView.should.be.kind_of UIImageView
 

data/spec/unit/tables/table_view_cell_spec.rb

@@ -1,5 +1,5 @@
 describe "PM::TableViewCellModule" do
-  
+
   def custom_cell
     {
       title: "Crazy Full Featured Cell",
@@ -13,13 +13,12 @@ describe "PM::TableViewCellModule" do
       layer: { masks_to_bounds: true },
       background_color: UIColor.redColor,
       selection_style: UITableViewCellSelectionStyleGray,
-      accessory: :switch, # currently only :switch is supported
-      accessory_checked: true, # whether it's "checked" or not
+      accessory:{view: :switch, value: true}, # currently only :switch is supported
       image: { image: UIImage.imageNamed("list"), radius: 15 },
       subviews: [ UIView.alloc.initWithFrame(CGRectZero), UILabel.alloc.initWithFrame(CGRectZero) ] # arbitrary views added to the cell
     }
   end
-  
+
   before do
     @screen = TestTableScreen.new
     button = UIButton.buttonWithType(UIButtonTypeRoundedRect).tap{|b| b.titleLabel.text = "ACC" }
@@ -29,47 +28,47 @@ describe "PM::TableViewCellModule" do
         { title: "", cells: [
           {title: "Test 1", accessory_type: UITableViewCellStateShowingEditControlMask },
           custom_cell,
-          { title: "Test2", accessory_view: button } ] }
+          { title: "Test2", accessory: button } ] }
       ]
     end
-    
+
     @screen.on_load
-    
+
     custom_ip = NSIndexPath.indexPathForRow(1, inSection: 1) # Cell "Crazy Full Featured Cell"
-    
+
     @screen.update_table_data
-    
+
     @subject = @screen.tableView(@screen.table_view, cellForRowAtIndexPath: custom_ip)
   end
-  
+
   it "should be a PM::TableViewCell" do
     @subject.should.be.kind_of(PM::TableViewCell)
   end
-  
+
   it "should have the right title" do
     @subject.textLabel.text.should == "Crazy Full Featured Cell"
   end
-  
+
   it "should have the right subtitle" do
     @subject.detailTextLabel.text.should == "This is way too huge..."
   end
-  
+
   it "should have the right re-use identifier" do
     @subject.reuseIdentifier.should == "Cell"
   end
-  
+
   it "should set the layer.masksToBounds" do
     @subject.layer.masksToBounds.should == true
   end
-  
+
   it "should set the background color" do
     @subject.backgroundView.backgroundColor.should == UIColor.redColor
   end
-  
+
   it "should set the selection color style" do
     @subject.selectionStyle.should == UITableViewCellSelectionStyleGray
   end
-  
+
   it "should set the accessory view to a switch" do
     @subject.accessoryView.should.be.kind_of(UISwitch)
   end
@@ -79,14 +78,14 @@ describe "PM::TableViewCellModule" do
     subject = @screen.tableView(@screen.table_view, cellForRowAtIndexPath: ip)
     subject.accessoryView.should.be.kind_of(UIRoundedRectButton)
   end
-  
+
   it "should set the accessory type to edit" do
     ip = NSIndexPath.indexPathForRow(0, inSection: 1)
     subject = @screen.tableView(@screen.table_view, cellForRowAtIndexPath: ip)
     subject.accessoryView.should.be.nil
     subject.accessoryType.should == UITableViewCellStateShowingEditControlMask
   end
-  
+
   it "should set an image with a radius" do
     @subject.imageView.should.be.kind_of(UIImageView)
     @subject.imageView.image.should == UIImage.imageNamed("list")
@@ -98,9 +97,9 @@ describe "PM::TableViewCellModule" do
     @subject.subviews[2].class.should == UIView
     @subject.subviews[3].class.should == UILabel
   end
-  
-  
-  
+
+
+
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ProMotion
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-06 00:00:00.000000000 Z
+date: 2013-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: motion-stump
@@ -120,6 +120,7 @@ files:
 - lib/ProMotion/version.rb
 - resources/list.png
 - spec/functional/func_screen_spec.rb
+- spec/functional/func_searchable_table_spec.rb
 - spec/functional/func_split_screen_spec.rb
 - spec/functional/func_table_screen_spec.rb
 - spec/helpers/basic_screen.rb
@@ -176,6 +177,7 @@ summary: ProMotion is a new way to organize RubyMotion apps. Instead of dealing
   Ruby and less like Objective-C.
 test_files:
 - spec/functional/func_screen_spec.rb
+- spec/functional/func_searchable_table_spec.rb
 - spec/functional/func_split_screen_spec.rb
 - spec/functional/func_table_screen_spec.rb
 - spec/helpers/basic_screen.rb