Changed on_ to will_

lib/ProMotion/table/extensions/searchable.rb

@@ -51,13 +51,12 @@ module ProMotion
         @promotion_table_data_data = nil
         self.table_view.setScrollEnabled true
         self.table_view.reloadData
-        @table_search_display_controller.delegate.on_end_search if @table_search_display_controller.delegate.respond_to? "on_end_search"
+        @table_search_display_controller.delegate.will_end_search if @table_search_display_controller.delegate.respond_to? "will_end_search"
       end
 
       def searchDisplayControllerWillBeginSearch(controller)
         self.table_view.setScrollEnabled false
-        puts 'searchDisplayControllerWillBeginSearch(controller)'
-        @table_search_display_controller.delegate.on_begin_search if @table_search_display_controller.delegate.respond_to? "on_begin_search"
+        @table_search_display_controller.delegate.will_begin_search if @table_search_display_controller.delegate.respond_to? "will_begin_search"
       end
     end
   end

spec/functional/func_searchable_table_spec.rb

@@ -42,15 +42,15 @@ describe "Searchable table spec" do
   end
 
   it "should call the start and stop searching callbacks properly" do
-    @controller.on_begin_search_called.should == nil
-    @controller.on_end_search_called.should == nil
+    @controller.will_begin_search_called.should == nil
+    @controller.will_end_search_called.should == nil
 
     @controller.searchDisplayControllerWillBeginSearch(@controller)
     @controller.searchDisplayController(@controller, shouldReloadTableForSearchString:"North")
-    @controller.on_begin_search_called.should == true
+    @controller.will_begin_search_called.should == true
 
     @controller.searchDisplayControllerWillEndSearch(@controller)
-    @controller.on_end_search_called.should == true
+    @controller.will_end_search_called.should == true
   end
 
 end

spec/helpers/table_screen_searchable.rb

@@ -2,7 +2,7 @@ class TableScreenSearchable < TestTableScreen
 
   searchable
 
-  attr_accessor :on_end_search_called, :on_begin_search_called
+  attr_accessor :will_end_search_called, :will_begin_search_called
 
   def table_data
     @search_table_data ||= [{
@@ -61,12 +61,12 @@ class TableScreenSearchable < TestTableScreen
     }]
   end
 
-  def on_begin_search
-    self.on_begin_search_called = true
+  def will_begin_search
+    self.will_begin_search_called = true
   end
 
-  def on_end_search
-    self.on_end_search_called = true
+  def will_end_search
+    self.will_end_search_called = true
   end
 
 end