ProMotion 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64a321e5c84fb57549e6926cf53e2c1024a37b87
-  data.tar.gz: b9a9fda8c8db70cda658faa046798fe47a01bcdf
+  metadata.gz: 18aba155900b900206601bcf9a0758bfce9408dd
+  data.tar.gz: 5bc594a3e0c965bfe2f15ebb88df5da5d7e88f94
 SHA512:
-  metadata.gz: bda6e2a93b03f8e4e1e1153766e010b762dea1d7a4dae3c64b39defaa9124a0077c030312cf158e86c3fc289c20cb96a7ba6309b3e401b86d6773e8a87d7dce3
-  data.tar.gz: 92d22300edaca3ad9d5f50c555c526b1e30c9ef5a76f783301eef55c09dd60c338449bc7e4e1059b97db357bbe810630f81c231bb101256ed35db83cbeb83970
+  metadata.gz: aac102a4899e41da994269077fba1a7a71659e35a8324981fdbb34f0d440e10d6db0a1888cfdde72131113824f7b1e988462ef6635ab1b331bd1935a20247214
+  data.tar.gz: 49a32c00365af4338df6d3bbae82caf60a14bd0208d9a8b28b89d418e2bbc9268257c46fb1944c5dfa917e351c422b3c230ba1fe1d3f61303cf7666f6ba12f84

data/README.md

@@ -4,6 +4,8 @@
 [![Build Status](https://img.shields.io/travis/infinitered/ProMotion.svg?style=flat)](https://travis-ci.org/infinitered/ProMotion)
 [![Code Climate](https://img.shields.io/codeclimate/github/infinitered/ProMotion.svg?style=flat)](https://codeclimate.com/github/infinitered/ProMotion)
 
+ProMotion is maintained by [Infinite Red](http://infinite.red), a web and mobile development company based in Portland, OR and San Francisco, CA.
+
 ## iPhone Apps, Ruby-style
 
 ProMotion is a RubyMotion gem that makes iOS development more like Ruby and less like Objective-C.
@@ -87,6 +89,14 @@ end
 
 # Changelog
 
+## Version 2.6.0
+
+This release includes a few new features and bugfixes and is backwards compatible with all 2.x releases.
+
+* PR #773 Add a `on_continue_user_activity` delegate method
+* PR #766 Fix nav_bar_button class method
+* Other minor bugfixes and documentation updates
+
 ## Version 2.5.0
 
 This release includes some new features and bugfixes and is backwards compatible with all 2.x releases.
@@ -96,16 +106,6 @@ This release includes some new features and bugfixes and is backwards compatible
 * PR #736 Adds the index path when deleting a cell
 * Several other bugfix PRs
 
-## Version 2.4.0
-
-This release includes several new features and is backwards compatible with all 2.x releases.
-
-* PR #686 Adds :searchable to the whitelisted properties a cell can have so that a warning is not generated.
-* PR #688 Adds support for SDWebImage and takes preference over JMImageCache. _JMImageCache will still be supported till ProMotion 3.0 but we highly recommend you switch to SDWebImage._
-* PR #679 Extract methods from tablescreen for reuse in modules for [redpotion](https://github.com/infinitered/redpotion).
-* PR #677 Added `add_child_screen` and `remove_child_screen` methods to `PM::Screen`.
-* PR #687 Adds persisting tab order when changed by the user for tab bars over 5 screens.
-
 # Apps built on ProMotion
 
 [Apps built on ProMotion](http://promotion.readthedocs.org/en/master/ProMotion%20Apps/)

data/lib/ProMotion/cocoatouch/tab_bar_controller.rb

@@ -42,15 +42,17 @@ module ProMotion
         selected_tab_vc = viewControllers[tab]
       end
 
-      if selected_tab_vc
-        self.selectedViewController = selected_tab_vc
-        on_tab_selected_try(selected_tab_vc)
-
-        selected_tab_vc
-      else
-        mp "Unable to open tab #{tab.to_s} -- not found.", force_color: :red
-        nil
+      unless selected_tab_vc
+        mp "Unable to open tab #{tab} -- not found.", force_color: :red
+        return
       end
+
+      return unless should_select_tab_try(selected_tab_vc)
+
+      self.selectedViewController = selected_tab_vc
+      on_tab_selected_try(selected_tab_vc)
+
+      selected_tab_vc
     end
 
     def find_tab(tab_title)
@@ -58,13 +60,17 @@ module ProMotion
     end
 
     # Cocoa touch methods below
+    def tabBarController(tbc, shouldSelectViewController: vc)
+      should_select_tab_try(vc)
+    end
+
     def tabBarController(tbc, didSelectViewController: vc)
       on_tab_selected_try(vc)
     end
 
     def tabBarController(tbc, didEndCustomizingViewControllers:vcs, changed:changed)
       if changed
-        tab_order = vcs.map{ |vc| vc.tabBarItem.tag }
+        tab_order = vcs.map { |vc| vc.tabBarItem.tag }
         NSUserDefaults.standardUserDefaults.setObject(tab_order, forKey:"tab_bar_order_#{@name}")
         NSUserDefaults.standardUserDefaults.synchronize
       end
@@ -84,10 +90,19 @@ module ProMotion
 
     private
 
+    # Defaults to true if :should_select_tab tab is not implemented by the tab delegate.
+    def should_select_tab_try(vc)
+      method_name = :should_select_tab
+      return true unless can_send_method_to_delegate?(method_name)
+
+      pm_tab_delegate.send(method_name, vc)
+    end
+
     def on_tab_selected_try(vc)
-      if pm_tab_delegate && pm_tab_delegate.respond_to?(:weakref_alive?) && pm_tab_delegate.weakref_alive? && pm_tab_delegate.respond_to?("on_tab_selected:")
-        pm_tab_delegate.send(:on_tab_selected, vc)
-      end
+      method_name = :on_tab_selected
+      return unless can_send_method_to_delegate?(method_name)
+
+      pm_tab_delegate.send(method_name, vc)
     end
 
     def current_view_controller
@@ -95,8 +110,16 @@ module ProMotion
     end
 
     def current_view_controller_try(method, *args)
-      current_view_controller.send(method, *args) if current_view_controller.respond_to?(method)
+      return unless current_view_controller.respond_to?(method)
+
+      current_view_controller.send(method, *args)
     end
 
+    def can_send_method_to_delegate?(method)
+      pm_tab_delegate &&
+        pm_tab_delegate.respond_to?(:weakref_alive?) &&
+        pm_tab_delegate.weakref_alive? &&
+        pm_tab_delegate.respond_to?("#{method}:")
+    end
   end
 end

data/lib/ProMotion/delegate/delegate_module.rb

@@ -43,6 +43,10 @@ module ProMotion
       try :on_open_url, { url: url, source_app: source_app, annotation: annotation }
     end
 
+    def application(application, continueUserActivity:user_activity, restorationHandler:restoration_handler)
+      try :on_continue_user_activity, { user_activity: user_activity, restoration_handler: restoration_handler }
+    end
+
     def ui_window
       (defined?(Motion) && defined?(Motion::Xray) && defined?(Motion::Xray::XrayWindow)) ? Motion::Xray::XrayWindow : UIWindow
     end

data/lib/ProMotion/screen/screen_module.rb

@@ -198,7 +198,9 @@ module ProMotion
     end
 
     def add_nav_bar_buttons
-      set_nav_bar_button(self.class.get_nav_bar_button[:side], self.class.get_nav_bar_button) if self.class.get_nav_bar_button
+      self.class.get_nav_bar_button.each do |button_args|
+        set_nav_bar_button(button_args[:side], button_args)
+      end
     end
 
     def status_bar_hidden(hidden)
@@ -276,12 +278,14 @@ module ProMotion
       end
 
       def nav_bar_button(side, args={})
-        @nav_bar_button_args = args
-        @nav_bar_button_args[:side] = side
+        button_args = args.merge(:side => side)
+
+        @nav_bar_button_args ||= []
+        @nav_bar_button_args << button_args
       end
 
       def get_nav_bar_button
-        @nav_bar_button_args
+        @nav_bar_button_args ||= []
       end
     end
 

data/lib/ProMotion/version.rb

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

data/spec/unit/delegate_spec.rb

@@ -79,6 +79,24 @@ describe "PM::Delegate" do
 
     @subject.application(UIApplication.sharedApplication, openURL: url, sourceApplication:sourceApplication, annotation: annotation)
   end
+
+  describe "#on_continue_user_activity" do
+    before do
+      @subject.application(UIApplication.sharedApplication, continueUserActivity: {}, restorationHandler: [])
+    end
+
+    it "should call on_continue_user_activity when launching with a user activity" do
+      @subject.called_on_continue_user_activity.should == true
+    end
+
+    it "should pass the user activity" do
+      @subject.user_activity.should == {}
+    end
+
+    it "should pass the restoration_handler" do
+      @subject.restoration_handler.should == []
+    end
+  end
 end
 
 # iOS 7 ONLY tests

data/spec/unit/screen_helpers_spec.rb

@@ -89,8 +89,13 @@ describe "screen helpers" do
 
     end
 
-    it "allows setting a nav_bar_button with a class method" do
+    it "allows setting nav bar buttons via nav_bar_button class method" do
       screen = DetailScreen.new(nav_bar: true)
+
+      screen.navigationItem.leftBarButtonItem.title.should == 'Back'
+      screen.navigationItem.rightBarButtonItem.title.should == 'More'
+
+      screen.navigationItem.leftBarButtonItem.class.should == UIBarButtonItem
       screen.navigationItem.rightBarButtonItem.class.should == UIBarButtonItem
     end
   end

data/spec/unit/tab_bar_spec.rb

@@ -24,12 +24,42 @@ describe "PM::Tabs" do
     tab_bar.delegate.should.equal(tab_bar)
   end
 
+  it "should call should_select_tab before a tab is selected" do
+    tab_bar.pm_tab_delegate.called_should_select_tab = false
+    @screen1.open_tab "Screen 2"
+    tab_bar.pm_tab_delegate.called_should_select_tab.should.be.true
+  end
+
   it "should call on_tab_selected when a tab is selected" do
     tab_bar.pm_tab_delegate.called_on_tab_selected = false
     @screen1.open_tab "Screen 2"
     tab_bar.pm_tab_delegate.called_on_tab_selected.should.be.true
   end
 
+  it "should call on_tab_selected when delegate does not respond to should_select_tab" do
+    method_to_stub = :can_send_method_to_delegate?
+    tab_bar.pm_tab_delegate.stub!(method_to_stub) do |method|
+      method == :should_select_tab ? false : send("__original_#{method_to_stub}", method)
+    end
+
+    tab_bar.pm_tab_delegate.called_on_tab_selected = false
+    @screen1.open_tab "Screen 2"
+    tab_bar.pm_tab_delegate.called_on_tab_selected.should.be.true
+
+    tab_bar.pm_tab_delegate.reset(method_to_stub)
+  end
+
+  it "does not call on_tab_selected when should_select_tab returns false" do
+    method_to_stub = :should_select_tab
+    tab_bar.pm_tab_delegate.stub!(method_to_stub) { |_vc| false }
+
+    tab_bar.pm_tab_delegate.called_on_tab_selected = false
+    @screen1.open_tab "Screen 2"
+    tab_bar.pm_tab_delegate.called_on_tab_selected.should.be.false
+
+    tab_bar.pm_tab_delegate.reset(method_to_stub)
+  end
+
   it "should have four tabs" do
     tab_bar.viewControllers.length.should == 4
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ProMotion
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Jamon Holmgren
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-20 00:00:00.000000000 Z
+date: 2016-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: methadone
@@ -96,11 +96,11 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ProMotion is a fast way to get started building RubyMotion iOS apps.
+description: ProMotion gives RubyMotion iOS view controllers a more Ruby-like API.
 email:
-- jamon@clearsightstudio.com
-- mark@mohawkapps.com
-- silas@clearsightstudio.com
+- jamon@infinite.red
+- mark@infinite.red
+- silas@infinite.red
 executables:
 - promotion
 extensions: []
@@ -193,7 +193,7 @@ files:
 - spec/unit/view_helper_spec.rb
 - spec/unit/view_title_screen_spec.rb
 - spec/unit/web_spec.rb
-homepage: https://github.com/clearsightstudio/ProMotion
+homepage: https://github.com/infinitered/ProMotion
 licenses:
 - MIT
 metadata: {}
@@ -219,8 +219,8 @@ specification_version: 4
 summary: ProMotion is a fast way to get started building RubyMotion apps. Instead
   of dealing with UIViewControllers, UITableViewControllers, and the like, you work
   with Screens. We abstract the view controller boilerplate to make iOS development
-  more like Ruby and less like Objective-C. With a memorable, concise syntax and a
-  friendly, helpful community, ProMotion is a great way to get started with iOS development.
+  more like Ruby and less like Objective-C. With a memorable, concise API and a friendly,
+  helpful community, ProMotion is a great way to get started with iOS development.
 test_files:
 - spec/functional/func_screen_spec.rb
 - spec/functional/func_split_screen_spec.rb
@@ -255,3 +255,4 @@ test_files:
 - spec/unit/view_helper_spec.rb
 - spec/unit/view_title_screen_spec.rb
 - spec/unit/web_spec.rb
+has_rdoc: