ProMotion 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14987f5aeab8920859f57503394853b2df7d89bb
-  data.tar.gz: ecdd5d911f9642b4b2bebc68f2741bc21ea71e7f
+  metadata.gz: 26a3f842a22164f1646fa4c70c06717331c37b37
+  data.tar.gz: b71313bd4e58fd83a405e8741c264547b80e0f19
 SHA512:
-  metadata.gz: 74a9842f7871a930fd367c216c6a54a131869c6ce2c8d8be355265f8a4af37347da4a887fa6977dbcaf2973ce843394bfa08c02e5ca09b293321fd5da22692ce
-  data.tar.gz: 3d42d49c8f5993725fb564deb77d76a6bccf59d493c0c8c4c59427c86692afb330b63374419714db098b46029661ed42f16ed5829516136be920db06ae2b615d
+  metadata.gz: 309c74e1577110e7c0ab397fe120a367f77343b11f5cfb4813bd99e6f942f89d463eadc36fc143324c49b7fd428ba50191c896246a91dddb17f6d05048eac843
+  data.tar.gz: c0dbd687ecb04bdea39a131e9b8313da6b12ca5b3a83fc7ab8a6ee915b4efc8ead92fb10247c16613907167f83c877c441078b2da22408003ef5f0212f91ce62

data/lib/ProMotion/cocoatouch/navigation_controller.rb

@@ -1,5 +1,13 @@
 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
+    end
+
     def shouldAutorotate
       visibleViewController.shouldAutorotate
     end
@@ -11,5 +19,6 @@ module ProMotion
     def preferredInterfaceOrientationForPresentation
       visibleViewController.preferredInterfaceOrientationForPresentation
     end
+
   end
 end

data/lib/ProMotion/cocoatouch/tab_bar_controller.rb

@@ -34,7 +34,31 @@ module ProMotion
     end
 
     def find_tab(tab_title)
-      self.viewControllers.find { |vc| vc.tabBarItem.title == tab_title }
+      viewControllers.find { |vc| vc.tabBarItem.title == tab_title }
+    end
+
+    # Cocoa touch methods below
+
+    def shouldAutorotate
+      current_view_controller_try(:shouldAutorotate)
+    end
+
+    def supportedInterfaceOrientations
+      current_view_controller_try(:supportedInterfaceOrientations)
+    end
+
+    def preferredInterfaceOrientationForPresentation
+      current_view_controller_try(:preferredInterfaceOrientationForPresentation)
+    end
+
+    private
+
+    def current_view_controller
+      selectedViewController || viewControllers.first
+    end
+
+    def current_view_controller_try(method, *args)
+      current_view_controller.send(method, *args) if current_view_controller.respond_to?(method)
     end
 
   end

data/lib/ProMotion/screen/nav_bar_module.rb

@@ -70,15 +70,21 @@ module ProMotion
     end
 
     def bar_button_item_image(img, args)
-      UIBarButtonItem.alloc.initWithImage(img, style: map_bar_button_item_style(args[:style]), target: args[:target] || self, action: args[:action])
+      button = UIBarButtonItem.alloc.initWithImage(img, style: map_bar_button_item_style(args[:style]), target: args[:target] || self, action: args[:action])
+      button.setTintColor args[:tint_color] if args[:tint_color]
+      button
     end
 
     def bar_button_item_string(str, args)
-      UIBarButtonItem.alloc.initWithTitle(str, style: map_bar_button_item_style(args[:style]), target: args[:target] || self, action: args[:action])
+      button = UIBarButtonItem.alloc.initWithTitle(str, style: map_bar_button_item_style(args[:style]), target: args[:target] || self, action: args[:action])
+      button.setTintColor args[:tint_color] if args[:tint_color]
+      button
     end
 
     def bar_button_item_system_item(args)
-      UIBarButtonItem.alloc.initWithBarButtonSystemItem(map_bar_button_system_item(args[:system_item]), target: args[:target] || self, action: args[:action])
+      button = UIBarButtonItem.alloc.initWithBarButtonSystemItem(map_bar_button_system_item(args[:system_item]), target: args[:target] || self, action: args[:action])
+      button.setTintColor args[:tint_color] if args[:tint_color]
+      button
     end
 
     def bar_button_item_custom(custom_view)

data/lib/ProMotion/screen/screen_module.rb

@@ -27,7 +27,7 @@ module ProMotion
       case self.class.title_type
       when :text then self.title = self.class.title
       when :view then self.navigationItem.titleView = self.class.title
-      when :image then self.navigationItem.titleView = UIImageView.alloc.initWithImage(UIImage.imageNamed(self.class.title))
+      when :image then self.navigationItem.titleView = UIImageView.alloc.initWithImage(self.class.title)
       else
         PM.logger.warn("title expects string, UIView, or UIImage, but #{self.class.title.class.to_s} given.")
       end
@@ -178,7 +178,7 @@ module ProMotion
       end
 
       def title_image(t)
-        @title = t
+        @title = t.is_a?(UIImage) ? t : UIImage.imageNamed(t)
         @title_type = :image
       end
 

data/lib/ProMotion/stubs/dummy_image_view.rb

@@ -0,0 +1,7 @@
+class DummyImageView < UIImageView
+private
+
+  def dummy
+    imageForURL(nil, completionBlock:nil)
+  end
+end

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

@@ -1,5 +1,7 @@
 module ProMotion
   class TableData
+    include ProMotion::Table::Utils
+
     attr_accessor :data, :filtered_data, :search_string, :original_search_string, :filtered, :table_view
 
     def initialize(data, table_view)
@@ -21,36 +23,23 @@ module ProMotion
     end
 
     def cell(params={})
-      if params[:index_path]
-        params[:section] = params[:index_path].section
-        params[:index] = params[:index_path].row
-      end
-
+      params = index_path_to_section_index(params)
       table_section = self.section(params[:section])
       c = table_section[:cells].at(params[:index].to_i)
       set_data_cell_defaults c
     end
 
     def delete_cell(params={})
-      if params[:index_path]
-        params[:section] = params[:index_path].section
-        params[:index] = params[:index_path].row
-      end
-
+      params = index_path_to_section_index(params)
       table_section = self.section(params[:section])
       table_section[:cells].delete_at(params[:index].to_i)
     end
 
     def search(search_string)
-      self.filtered_data = []
-      self.filtered = true
-
-      self.original_search_string = search_string
-      self.search_string = search_string.downcase.strip
+      start_searching(search_string)
 
       self.data.compact.each do |section|
         new_section = {}
-        new_section[:cells] = []
 
         new_section[:cells] = section[:cells].map do |cell|
           cell[:searchable] != false && "#{cell[:title]}\n#{cell[:search_text]}".downcase.strip.include?(self.search_string) ? cell : nil
@@ -99,5 +88,13 @@ module ProMotion
       ident
     end
 
+  private
+
+    def start_searching(search_string)
+      self.filtered_data = []
+      self.filtered = true
+      self.search_string = search_string.downcase.strip
+      self.original_search_string = search_string
+    end
   end
 end

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

@@ -17,7 +17,7 @@ module ProMotion
         gesture_point = gesture.locationInView(table_view)
         index_path = table_view.indexPathForRowAtPoint(gesture_point)
         data_cell = self.promotion_table_data.cell(index_path: index_path)
-        trigger_action(data_cell[:long_press_action], data_cell[:arguments]) if data_cell[:long_press_action]
+        trigger_action(data_cell[:long_press_action], data_cell[:arguments], index_path) if data_cell[:long_press_action]
       end
     end
   end

data/lib/ProMotion/table/grouped_table_screen.rb

@@ -2,6 +2,7 @@ module ProMotion
   class GroupedTableScreen < TableViewController
     include ProMotion::ScreenModule
     include ProMotion::Table
+    include ProMotion::Table::Utils # Workaround until https://hipbyte.freshdesk.com/support/tickets/2086 is fixed.
     include ProMotion::GroupedTable
   end
 end

data/lib/ProMotion/table/table.rb

@@ -5,6 +5,7 @@ module ProMotion
     include ProMotion::Table::Refreshable
     include ProMotion::Table::Indexable
     include ProMotion::Table::Longpressable
+    include ProMotion::Table::Utils
 
     attr_reader :promotion_table_data
 
@@ -67,10 +68,14 @@ module ProMotion
       @table_search_display_controller.searchResultsTableView.reloadData if searching?
     end
 
-    def trigger_action(action, arguments)
+    def trigger_action(action, arguments, index_path)
       return PM.logger.info "Action not implemented: #{action.to_s}" unless self.respond_to?(action)
-      return self.send(action) if self.method(action).arity == 0
-      self.send(action, arguments)
+
+      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
+      else self.send(action, arguments) # Send arguments
+      end
     end
 
     def accessory_toggled_switch(switch)
@@ -79,9 +84,8 @@ module ProMotion
 
       if index_path
         data_cell = promotion_table_data.cell(section: index_path.section, index: index_path.row)
-        data_cell[:accessory][:arguments] ||= {}
         data_cell[:accessory][:arguments][:value] = switch.isOn if data_cell[:accessory][:arguments].is_a?(Hash)
-        trigger_action(data_cell[:accessory][:action], data_cell[:accessory][:arguments]) if data_cell[:accessory][:action]
+        trigger_action(data_cell[:accessory][:action], data_cell[:accessory][:arguments], index_path) if data_cell[:accessory][:action]
       end
     end
 
@@ -106,14 +110,6 @@ module ProMotion
       create_table_cell(data_cell)
     end
 
-    def index_path_to_section_index(params)
-      if params[:index_path]
-        params[:section] = params[:index_path].section
-        params[:index] = params[:index_path].row
-      end
-      params
-    end
-
     def create_table_cell(data_cell)
       table_cell = table_view.dequeueReusableCellWithIdentifier(data_cell[:cell_identifier]) || begin
         table_cell = data_cell[:cell_class].alloc.initWithStyle(data_cell[:cell_style], reuseIdentifier:data_cell[:cell_identifier])
@@ -171,7 +167,7 @@ module ProMotion
     def tableView(table_view, didSelectRowAtIndexPath:index_path)
       data_cell = self.promotion_table_data.cell(index_path: index_path)
       table_view.deselectRowAtIndexPath(index_path, animated: true) unless data_cell[:keep_selection] == true
-      trigger_action(data_cell[:action], data_cell[:arguments]) if data_cell[:action]
+      trigger_action(data_cell[:action], data_cell[:arguments], index_path) if data_cell[:action]
     end
 
     def tableView(table_view, editingStyleForRowAtIndexPath: index_path)

data/lib/ProMotion/table/table_utils.rb

@@ -0,0 +1,13 @@
+module ProMotion
+  module Table
+    module Utils
+      def index_path_to_section_index(params)
+        if params[:index_path]
+          params[:section] = params[:index_path].section
+          params[:index] = params[:index_path].row
+        end
+        params
+      end
+    end
+  end
+end

data/lib/ProMotion/version.rb

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

data/spec/functional/func_screen_spec.rb

@@ -68,6 +68,25 @@ describe "ProMotion::Screen functionality" do
     end
   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
+  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
+
+    # start closing
+    @grandchild_screen.close
+    @child_screen.on_back_fired.should == true
+    @child_screen.close
+    @base_screen.on_back_fired.should == true
+  end
 
   it "should allow opening and closing a modal screen" do
     @basic = BasicScreen.new(nav_bar: true)

data/spec/functional/func_table_screen_spec.rb

@@ -99,27 +99,6 @@ describe "ProMotion::TableScreen functionality" do
     end
   end
 
-  it "should call a method when the switch is flipped" do
-    table_screen.scroll_to_bottom
-    tap "switch_1"
-    wait 0.3 do
-      table_screen.tap_counter.should == 1
-    end
-  end
-
-  it "should call the method with arguments when the switch is flipped and when the cell is tapped" do
-    table_screen.scroll_to_bottom
-    tap "switch_3"
-    wait 0.3 do
-      table_screen.tap_counter.should == 3
-
-      tap "Switch With Cell Tap, Switch Action And Parameters"
-      wait 0.3 do
-        table_screen.tap_counter.should == 13
-      end
-    end
-  end
-
   it "should not crash if cell with editing_style is swiped left" do
     Proc.new { flick("Just another deletable blank row", to: :left) }.should.not.raise(StandardError)
   end

data/spec/unit/image_title_screen.rb

@@ -1,9 +1,19 @@
-describe "ProMotion::Screen UIImage title" do
+describe "ProMotion::Screen UIImage string title" do
   def controller
     @controller = ImageTitleScreen.new(nav_bar: true)
   end
 
-  it "should allow an image title" do
+  it "should allow an image title as a String" do
+    controller.navigationItem.titleView.should.be.kind_of UIImageView
+  end
+end
+
+describe "ProMotion::Screen UIImage title" do
+  def controller
+    @controller = UIImageTitleScreen.new(nav_bar: true)
+  end
+
+  it "should allow an image title as a UIImage" do
     controller.navigationItem.titleView.should.be.kind_of UIImageView
   end
 end

data/spec/unit/screen_spec.rb

@@ -268,3 +268,26 @@ describe "screen with toolbar" do
   end
 
 end
+
+describe 'toolbar tinted buttons' do
+  before do
+    @screen = HomeScreen.new modal: true, nav_bar: true, toolbar: true
+    @screen.on_load
+  end
+
+  it "creates string toolbar buttons with tint colors" do
+    @screen.set_toolbar_button([{title: "Testing Toolbar", tint_color: UIColor.redColor}])
+    @screen.navigationController.toolbar.items.first.tintColor.should == UIColor.redColor
+  end
+
+  it "creates image toolbar buttons with tint colors" do
+    @screen.set_toolbar_button([{image: UIImage.imageNamed("list"), tint_color: UIColor.redColor}])
+    @screen.navigationController.toolbar.items.first.tintColor.should == UIColor.redColor
+  end
+
+  it "creates system item toolbar buttons with tint colors" do
+    @screen.set_toolbar_button([{system_item: :reply, tint_color: UIColor.redColor}])
+    @screen.navigationController.toolbar.items.first.tintColor.should == UIColor.redColor
+  end
+
+end

data/spec/unit/tab_bar_spec.rb

@@ -74,6 +74,9 @@ describe "PM::Tabs" do
     tab_bar.selectedIndex.should == 0
   end
 
-
+  it "should recognize setting #should_autorotate in screen" do
+    @screen1.stub! :should_autorotate, return: false
+    @tab_bar.shouldAutorotate.should == false
+  end
 
 end

data/spec/unit/tables/table_module_spec.rb

@@ -51,6 +51,8 @@ describe "PM::Table module" do
         title: "Custom section title 1", title_view: CustomTitleView, cells: [ ]
       },{
         title: "Custom section title 2", title_view: CustomTitleView.new, title_view_height: 50, cells: [ ]
+      },{
+        title: "Action WIth Index Path Group", cells: [ cell_factory(title: "IndexPath Group 1", action: :tests_index_path) ]
       }]
     end
 
@@ -63,7 +65,7 @@ describe "PM::Table module" do
   end
 
   it "should have the right number of sections" do
-    @subject.numberOfSectionsInTableView(@subject.table_view).should == 6
+    @subject.numberOfSectionsInTableView(@subject.table_view).should == 7
   end
 
   it "should set the section titles" do
@@ -115,6 +117,17 @@ describe "PM::Table module" do
     @subject.tableView(@subject.table_view, didSelectRowAtIndexPath:@custom_ip)
   end
 
+  it "should return an NSIndexPath when the action has two parameters" do
+    ip = NSIndexPath.indexPathForRow(0, inSection: 6)
+
+    @subject.tableView(@subject.table_view, didSelectRowAtIndexPath:ip)
+
+    tapped_ip = @subject.got_index_path
+    tapped_ip.should.be.kind_of NSIndexPath
+    tapped_ip.section.should == 6
+    tapped_ip.row.should == 0
+  end
+
   # TODO - make this test work when MacBacon supports long press gestures
   # https://github.com/HipByte/RubyMotion/issues/160
   #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ProMotion
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Jamon Holmgren
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-03 00:00:00.000000000 Z
+date: 2014-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: methadone
@@ -113,6 +113,7 @@ files:
 - lib/ProMotion/screen/screen.rb
 - lib/ProMotion/screen/screen_module.rb
 - lib/ProMotion/screen/screen_navigation.rb
+- lib/ProMotion/stubs/dummy_image_view.rb
 - lib/ProMotion/stubs/dummy_view.rb
 - lib/ProMotion/styling/styling.rb
 - lib/ProMotion/table/cell/table_view_cell_module.rb
@@ -125,6 +126,7 @@ files:
 - lib/ProMotion/table/grouped_table_screen.rb
 - lib/ProMotion/table/table.rb
 - lib/ProMotion/table/table_screen.rb
+- lib/ProMotion/table/table_utils.rb
 - lib/ProMotion/tabs/tabs.rb
 - lib/ProMotion/version.rb
 - lib/ProMotion/web/web_screen.rb