ProMotion 0.7.5 → 0.7.6

data/.travis.yml

@@ -3,4 +3,4 @@ gemfile:
   - Gemfile
 before_script: bundle install
 script: bundle exec rake spec
-bump: 2
+bump: 3

data/README.md

@@ -1,8 +1,38 @@
-# ProMotion [![Build Status](https://travis-ci.org/clearsightstudio/ProMotion.png)](https://travis-ci.org/clearsightstudio/ProMotion)
+# 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)
 
 ## A new way to easily build RubyMotion apps.
 
-ProMotion is a RubyMotion gem that makes iOS development more like Ruby and less like Objective-C.
+ProMotion is a RubyMotion gem that makes iOS development more like Ruby and less like Objective-C. It introduces a clean, Ruby-style syntax for building screens that is easy to learn and remember.
+
+```ruby
+class AppDelegate < PM::Delegate
+  def on_load(app, options)
+    open RootScreen.new(nav_bar: true)
+  end
+end
+
+class RootScreen < PM::Screen
+  title "Root Screen"
+  
+  def push_new_screen
+    open NewScreen
+  end
+end
+
+class NewScreen < PM::TableScreen
+  title "Table Screen"
+  
+  def table_data
+    [{
+      cells: [
+        { title: "About this app", action: :tapped_about },
+        { title: "Log out", action: :log_out }
+      ]
+    }]
+  end
+end
+```
+
 
 Featured on the RubyMotion blog: [http://blog.rubymotion.com/post/50523137515/introducing-promotion-a-full-featured-rubymotion](http://blog.rubymotion.com/post/50523137515/introducing-promotion-a-full-featured-rubymotion)
 
@@ -506,6 +536,7 @@ incorporated.
 * Jamon Holmgren: [@jamonholmgren](https://twitter.com/jamonholmgren)
 * Silas Matson: [@silasjmatson](https://twitter.com/silasjmatson)
 * Matt Brewer: [@macfanatic](https://twitter.com/macfanatic)
+* Mark Rickert: [@markrickert](https://twitter.com/markrickert)
 * [Many others](https://github.com/clearsightstudio/ProMotion/graphs/contributors)
-* If you really want to know, run `git shortlog -s -n -e`
+* Run `git shortlog -s -n -e` to see everyone who has contributed.
 

data/lib/ProMotion/helpers/view_helper.rb

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

data/lib/ProMotion/screen_helpers/screen_navigation.rb

@@ -2,13 +2,13 @@ module ProMotion
   module ScreenNavigation
 
     def open_screen(screen, args = {})
+      args = { in_detail: false, in_master: false, close_all: false, modal: false, in_tab: false, animated: true }.merge args
 
       # Apply properties to instance
-      screen = setup_screen_for_open(screen, args)
+      screen = set_up_screen_for_open(screen, args)
       ensure_wrapper_controller_in_place(screen, args)
 
       screen.send(:on_load) if screen.respond_to?(:on_load)
-      animated = args[:animated] || true
 
       if args[:in_detail] && self.split_screen
         self.split_screen.detail_screen = screen
@@ -20,7 +20,7 @@ module ProMotion
         open_root_screen screen
 
       elsif args[:modal]
-        present_modal_view_controller screen, animated
+        present_modal_view_controller screen, args[:animated]
 
       elsif args[:in_tab] && self.tab_bar
         present_view_controller_in_tab_bar_controller screen, args[:in_tab]
@@ -51,7 +51,7 @@ module ProMotion
     def close_screen(args = {})
       args ||= {}
       args = { sender: args } unless args.is_a?(Hash)
-      args[:animated] ||= true
+      args[:animated] = true unless args.has_key?(:animated)
 
       if self.modal?
         close_modal_screen args
@@ -69,7 +69,7 @@ module ProMotion
 
     def send_on_return(args = {})
       if self.parent_screen && self.parent_screen.respond_to?(:on_return)
-        if args
+        if args && self.parent_screen.method(:on_return).arity != 0
           self.parent_screen.send(:on_return, args)
         else
           self.parent_screen.send(:on_return)
@@ -88,20 +88,23 @@ module ProMotion
       end
       nav_controller ||= self.navigation_controller
       vc.first_screen = false if vc.respond_to?(:first_screen=)
+      vc.navigation_controller = nav_controller if vc.respond_to?(:navigation_controller=)
       nav_controller.pushViewController(vc, animated: true)
     end
 
     protected
 
-    def setup_screen_for_open(screen, args={})
+    def set_up_screen_for_open(screen, args={})
 
       # Instantiate screen if given a class
       screen = screen.new if screen.respond_to?(:new)
+      
+      # Set parent
+      screen.parent_screen = self if screen.respond_to?(:parent_screen=)
 
-      # Set parent, title & modal properties
-      screen.parent_screen = self if screen.respond_to?("parent_screen=")
-      screen.title = args[:title] if args[:title] && screen.respond_to?("title=")
-      screen.modal = args[:modal] if args[:modal] && screen.respond_to?("modal=")
+      # Set title & modal properties
+      screen.title = args[:title] if args[:title] && screen.respond_to?(:title=)
+      screen.modal = args[:modal] if args[:modal] && screen.respond_to?(:modal=)
 
       # Hide bottom bar?
       screen.hidesBottomBarWhenPushed = args[:hide_tab_bar] == true
@@ -115,7 +118,7 @@ module ProMotion
     end
 
     def ensure_wrapper_controller_in_place(screen, args={})
-      unless args[:close_all] || args[:modal]
+      unless args[:close_all] || args[:modal] || args[:in_detail] || args[:in_master]
         screen.navigation_controller ||= self.navigation_controller if screen.respond_to?("navigation_controller=")
         screen.tab_bar ||= self.tab_bar if screen.respond_to?("tab_bar=")
       end
@@ -144,14 +147,14 @@ module ProMotion
     end
 
     def close_modal_screen(args={})
-      args[:animated] ||= true
+      args[:animated] = true unless args.has_key?(:animated)
       self.parent_screen.dismissViewControllerAnimated(args[:animated], completion: lambda {
         send_on_return(args)
       })
     end
 
     def close_nav_screen(args={})
-      args[:animated] ||= true
+      args[:animated] = true unless args.has_key?(:animated)
       if args[:to_screen] && args[:to_screen].is_a?(UIViewController)
         self.parent_screen = args[:to_screen]
         self.navigation_controller.popToViewController(args[:to_screen], animated: args[:animated])
@@ -162,3 +165,6 @@ module ProMotion
 
   end
 end
+
+
+

data/lib/ProMotion/screens/_screen_module.rb

@@ -103,18 +103,19 @@ module ProMotion
 
     def bar_button_item(button_type, args)
       case button_type
-        when UIBarButtonItem
-          button_type
-        when UIImage
-          UIBarButtonItem.alloc.initWithImage(button_type, style: args[:style], target: args[:target], action: args[:action])
-        when String
-          UIBarButtonItem.alloc.initWithTitle(button_type, style: args[:style], target: args[:target], action: args[:action])
+      when UIBarButtonItem
+        button_type
+      when UIImage
+        UIBarButtonItem.alloc.initWithImage(button_type, style: args[:style], target: args[:target], action: args[:action])
+      when String
+        UIBarButtonItem.alloc.initWithTitle(button_type, style: args[:style], target: args[:target], action: args[:action])
+      else
+        if args[:system_icon]
+          UIBarButtonItem.alloc.initWithBarButtonSystemItem(args[:system_icon], target: args[:target], action: args[:action])
         else
-          if args[:system_icon]
-            UIBarButtonItem.alloc.initWithBarButtonSystemItem(args[:system_icon], target: args[:target], action: args[:action])
-          else
-            PM.logger.error("Please supply a title string, a UIImage or :system.")
-          end
+          PM.logger.error("Please supply a title string, a UIImage or :system.")
+          nil
+        end
       end
     end
 

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

@@ -10,10 +10,10 @@ module ProMotion
         search_bar.placeholder = params[:search_bar][:placeholder]
       end
 
-      @contacts_search_display_controller = UISearchDisplayController.alloc.initWithSearchBar(search_bar, contentsController: params[:content_controller])
-      @contacts_search_display_controller.delegate = params[:delegate]
-      @contacts_search_display_controller.searchResultsDataSource = params[:data_source]
-      @contacts_search_display_controller.searchResultsDelegate = params[:search_results_delegate]
+      @table_search_display_controller = UISearchDisplayController.alloc.initWithSearchBar(search_bar, contentsController: params[:content_controller])
+      @table_search_display_controller.delegate = params[:delegate]
+      @table_search_display_controller.searchResultsDataSource = params[:data_source]
+      @table_search_display_controller.searchResultsDelegate = params[:search_results_delegate]
 
       self.table_view.tableHeaderView = search_bar
     end

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

@@ -69,8 +69,10 @@ module ProMotion
     end
 
     def accessory_toggled_switch(switch)
-      table_cell = switch.superview
-      index_path = table_cell.superview.indexPathForCell(table_cell)
+      # table_cell = switch.superview
+      table_cell = closest_parent(UITableViewCell, switch)
+      # index_path = table_cell.superview.indexPathForCell(table_cell)
+      index_path = closest_parent(UITableView, table_cell).indexPathForCell(table_cell)
 
       data_cell = cell_at_section_and_index(index_path.section, index_path.row)
       data_cell[:accessory][:arguments] = {} unless data_cell[:accessory][:arguments]
@@ -106,7 +108,11 @@ module ProMotion
 
     # Set table_data_index if you want the right hand index column (jumplist)
     def sectionIndexTitlesForTableView(table_view)
-      self.table_data_index if self.respond_to?(:table_data_index)
+      if @promotion_table_data.filtered
+        nil
+      else
+        self.table_data_index if self.respond_to?(:table_data_index)
+      end
     end
 
     def tableView(table_view, cellForRowAtIndexPath:index_path)

data/lib/ProMotion/version.rb

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

data/spec/functional/func_table_screen_spec.rb

@@ -55,12 +55,6 @@ describe "ProMotion::TestTableScreen functionality" do
     @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"
@@ -70,4 +64,10 @@ describe "ProMotion::TestTableScreen functionality" do
     @controller.tap_counter.should == 13
   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
+
 end

data/spec/unit/screen_helpers_spec.rb

@@ -108,11 +108,11 @@ describe "screen helpers" do
     describe "opening a screen" do
 
       it "should create an instance from class when opening a new screen" do
-        @screen.send(:setup_screen_for_open, BasicScreen).should.be.instance_of BasicScreen
+        @screen.send(:set_up_screen_for_open, BasicScreen).should.be.instance_of BasicScreen
       end
 
       it "should apply properties when opening a new screen" do
-        new_screen = @screen.send(:setup_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)
 
         new_screen.parent_screen.should == @screen
         new_screen.title.should == 'Some Title'
@@ -122,7 +122,7 @@ describe "screen helpers" do
       end
 
       it "should present the #main_controller when showing a modal screen" do
-        new_screen = @screen.send(:setup_screen_for_open, BasicScreen, modal: true)
+        new_screen = @screen.send(:set_up_screen_for_open, BasicScreen, modal: true)
 
         @screen.mock!('presentModalViewController:animated:') do |vc, animated|
           vc.should == new_screen.main_controller
@@ -151,7 +151,7 @@ describe "screen helpers" do
         end
         @screen.open BasicScreen, modal: true
       end
-
+      
       it "should present a modal screen if open_modal is used" do
         @screen.mock!(:present_modal_view_controller) do |screen, animated|
           screen.should.be.instance_of BasicScreen
@@ -160,6 +160,16 @@ describe "screen helpers" do
         @screen.open_modal BasicScreen
       end
 
+      it "should respect animated property of opening modal screens" do
+        new_screen = @screen.send(:set_up_screen_for_open, BasicScreen)
+
+        @screen.mock!('presentModalViewController:animated:') do |vc, animated|
+          animated.should == false
+        end
+
+        @screen.send(:open, new_screen, animated: false, modal: true)
+      end
+
       it "should open screen in tab bar if :in_tab is provided" do
         @screen.stub!(:tab_bar, return: true)
         @screen.mock!(:present_view_controller_in_tab_bar_controller) do |screen, tab_name|
@@ -173,6 +183,14 @@ describe "screen helpers" do
         @screen.mock!(:push_view_controller) { |vc| vc.should.be.instance_of BasicScreen }
         @screen.open BasicScreen
       end
+      
+      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.open basic
+        basic.navigationController.should == @screen.navigationController
+        basic.navigation_controller.should == @screen.navigationController
+        @screen.navigation_controller.should == @screen.navigationController
+      end
 
       it "should open the provided view controller as root view if no other conditions are met" do
         parent_screen = HomeScreen.new
@@ -213,6 +231,18 @@ describe "screen helpers" do
         @screen.close
       end
 
+      it "should respect animated value for closing modal screens" do
+        parent_screen = HomeScreen.new
+        @screen.parent_screen = parent_screen
+        @screen.modal = true
+
+        parent_screen.mock!('dismissViewControllerAnimated:completion:') do |animated, completion|
+          animated.should == false
+        end
+
+        @screen.send(:close, animated: false)
+      end
+
       it "#close should pop from the navigation controller" do
         @screen.navigation_controller.mock!(:popViewControllerAnimated) { |animated| animated.should == true }
         @screen.close

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ProMotion
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-11 00:00:00.000000000 Z
+date: 2013-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: motion-stump