ProMotion 2.5.0.beta1 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77d8dcbafac1e2b4972fc44dae533bf1c847b443
-  data.tar.gz: 8a7d5813a1c005b76a1354012205cd03f6845f86
+  metadata.gz: 64a321e5c84fb57549e6926cf53e2c1024a37b87
+  data.tar.gz: b9a9fda8c8db70cda658faa046798fe47a01bcdf
 SHA512:
-  metadata.gz: eb9181c62d284ba7e7a22ea3dd1902b284574f056e2e4c420961bf0d589b37dc2e2333d51c77de9bacb7d275e829de73c5804ff35423f83d78f30dbd72099c4c
-  data.tar.gz: bc025137788d5920b72e852c0b8a12545e4c49ef7fefde496ac66b293b4acc724df87e97ce3761b23002920f1a53ecf9f7560ff8cff66c1e2cf75c8beef937e4
+  metadata.gz: bda6e2a93b03f8e4e1e1153766e010b762dea1d7a4dae3c64b39defaa9124a0077c030312cf158e86c3fc289c20cb96a7ba6309b3e401b86d6773e8a87d7dce3
+  data.tar.gz: 92d22300edaca3ad9d5f50c555c526b1e30c9ef5a76f783301eef55c09dd60c338449bc7e4e1059b97db357bbe810630f81c231bb101256ed35db83cbeb83970

data/README.md

@@ -1,8 +1,8 @@
 # ProMotion
 
 [![Gem Version](https://img.shields.io/gem/v/ProMotion.svg?style=flat)](https://rubygems.org/gems/ProMotion)
-[![Build Status](https://img.shields.io/travis/clearsightstudio/ProMotion.svg?style=flat)](https://travis-ci.org/clearsightstudio/ProMotion)
-[![Code Climate](https://img.shields.io/codeclimate/github/clearsightstudio/ProMotion.svg?style=flat)](https://codeclimate.com/github/clearsightstudio/ProMotion)
+[![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)
 
 ## iPhone Apps, Ruby-style
 
@@ -74,19 +74,28 @@ end
 |---|---|---|
 |[![ProMotion SplitScreens](https://f.cloud.github.com/assets/1479215/1534507/0edb8dd4-4c96-11e3-9896-d4583d0ed161.png)](http://promotion.readthedocs.org/en/master/Reference/ProMotion%20SplitScreen/)|[![MapScreen](https://f.cloud.github.com/assets/1479215/1534628/f7dbf7e8-4c97-11e3-8817-4c2a58824771.png)](http://promotion.readthedocs.org/en/master/Reference/ProMotion%20MapScreen/)|[![ProMotion WebScreen](https://f.cloud.github.com/assets/1479215/1534631/ffe1b36a-4c97-11e3-8c8f-c7b14e26182d.png)](http://promotion.readthedocs.org/en/master/Reference/ProMotion%20WebScreen/)|
 
-**NEW** [Live reloading!](http://promotion.readthedocs.org/en/master/Guides/Live Screen Reloading/) Use `pm_live_screens` to enable it, and `on_live_reload` in your screen to refresh things.
+**NEW** [Live reloading!](http://promotion.readthedocs.org/en/master/Guides/Live Screen Reloading/) Use `pm_live` to enable it, and `on_live_reload` in your screen to refresh things.
 
 #### ...and much more.
 
 # Getting Started
 
-1. Check out the [Getting Started Guide](https://github.com/clearsightstudio/ProMotion/blob/master/docs/Guides/Guide%20-%20Getting%20Started.md)
+1. Check out the [Getting Started Guide](https://github.com/infinitered/ProMotion/blob/master/docs/Guides/Getting%20Started.md)
 2. Watch the excellent [MotionInMotion screencast about ProMotion](https://motioninmotion.tv/screencasts/8) (very reasonably priced subscription required)
 3. Follow a tutorial: [Building an ESPN app using RubyMotion, ProMotion, and TDD](http://jamonholmgren.com/building-an-espn-app-using-rubymotion-promotion-and-tdd)
-4. Read the [Documentation](https://github.com/clearsightstudio/ProMotion/blob/master/docs)
+4. Read the [Documentation](https://github.com/infinitered/ProMotion/blob/master/docs)
 
 # Changelog
 
+## Version 2.5.0
+
+This release includes some new features and bugfixes and is backwards compatible with all 2.x releases.
+
+* PR #763 Adds footer_view to TableScreens
+* PR #705 Adds split-screen support for large iPhones
+* 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.
@@ -97,22 +106,6 @@ This release includes several new features and is backwards compatible with all
 * 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.
 
-## Version 2.3.0
-
-This release includes several new features and is backwards compatible with all 2.x releases.
-
-* PR #618 Allow search bar to be hidden initially
-* PR #606 Adds capability for table_footer_view
-* PR #602 Add image inset support for tab bar item
-* PR #595 Feature/support module
-* PR #582 Allow setting of multiple nav bar buttons instead of just one left an one right
-* PR #581 Adds on_tab_selected
-* PR #579 implemented nav_bar_button class method RE #272
-* PR #565 Adds header_will_display method to PM::TableScreen
-* PR #663 Adds `on_load` back to cell dequeue code
-* PR #641 Custom search for PM::TableScreen
-* PR #658 Fix cell height issue
-
 # Apps built on ProMotion
 
 [Apps built on ProMotion](http://promotion.readthedocs.org/en/master/ProMotion%20Apps/)
@@ -125,7 +118,7 @@ Open a pull request! We love adding new ProMotion-built apps.
 
 We've created a comprehensive and always updated wiki with code examples, usage examples, and API reference.
 
-### [ProMotion Documentation](https://github.com/clearsightstudio/ProMotion/blob/master/docs)
+### [ProMotion Documentation](https://github.com/infinitered/ProMotion/blob/master/docs)
 
 # Screencasts
 
@@ -138,11 +131,11 @@ interviews Jamon Holmgren about ProMotion
 ProMotion is not only an easy DSL to get started. The community is very helpful and
 welcoming to new RubyMotion developers. We don't mind newbie questions.
 
-If you need help, feel free to open an issue on GitHub. If we don't respond within a day, tweet us a link to the issue -- sometimes we get busy.
+The quickest way to get help is to join the [Motioneers Slack Group](http://motioneers.herokuapp.com). If you still need help, feel free to open an issue on GitHub. If we don't respond within a day, tweet us a link to the issue -- sometimes we get busy.
 
 # Contributing
 
-See [CONTRIBUTING.md](https://github.com/clearsightstudio/ProMotion/blob/master/CONTRIBUTING.md).
+See [CONTRIBUTING.md](https://github.com/infinitered/ProMotion/blob/master/CONTRIBUTING.md).
 
 ## Core Team
 
@@ -154,4 +147,4 @@ See [CONTRIBUTING.md](https://github.com/clearsightstudio/ProMotion/blob/master/
 
 ## Other Contributors
 
-* [Many others](https://github.com/clearsightstudio/ProMotion/graphs/contributors)
+* [Many others](https://github.com/infinitered/ProMotion/graphs/contributors)

data/lib/ProMotion/collection/collection.rb

@@ -57,6 +57,8 @@ module ProMotion
     def reload_data
       update_collection_view_data(collection_data)
     end
+    alias_method :update_collection_data, :reload_data
+
 
     ########## Cocoa touch methods #################
 

data/lib/ProMotion/screen/screen_module.rb

@@ -7,7 +7,8 @@ module ProMotion
     include ProMotion::Tabs
     include ProMotion::SplitScreen if UIDevice.currentDevice.userInterfaceIdiom == UIUserInterfaceIdiomPad || (UIDevice.currentDevice.systemVersion.to_i >= 8 )
 
-    attr_accessor :parent_screen, :first_screen, :modal, :split_screen
+    attr_reader :parent_screen
+    attr_accessor :first_screen, :modal, :split_screen
 
     def screen_init(args = {})
       @screen_options = args
@@ -154,7 +155,7 @@ module ProMotion
     def add_child_screen(screen)
       screen = screen.new if screen.respond_to?(:new)
       addChildViewController(screen)
-      screen.parent_screen = WeakRef.new(self)
+      screen.parent_screen = self
       screen.didMoveToParentViewController(self) # Required
       screen
     end

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

@@ -7,7 +7,18 @@ module ProMotion
 
     def initialize(data, table_view, search_action = nil)
       @search_action ||= search_action
-      self.data = data
+
+      if data.include?(nil)
+        mp("Warning: You have a `nil` section in your table_data method.", force_color: :yellow)
+      end
+
+      self.data = data.compact.each_with_index.map do |section,index|
+        if section[:cells].include?(nil)
+          mp("Warning: You have a `nil` cell in table section #{index}.", force_color: :yellow)
+          section[:cells].compact!
+        end
+        section
+      end
       self.table_view = WeakRef.new(table_view)
     end
 

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

@@ -19,7 +19,7 @@ module ProMotion
         return unless @refresh_control
 
         @refresh_control.beginRefreshing
-
+        @refresh_control.attributedTitle = NSAttributedString.alloc.initWithString(@refreshing)
         # Scrolls the table down to show the refresh control when invoked programatically
         tableView.setContentOffset(CGPointMake(0, tableView.contentOffset.y-@refresh_control.frame.size.height), animated:true) if tableView.contentOffset.y > -65.0
       end

data/lib/ProMotion/table/table.rb

@@ -135,7 +135,8 @@ module ProMotion
       deletable_index_paths = []
       Array(index_paths).each do |index_path|
         delete_cell = false
-        delete_cell = send(:on_cell_deleted, cell_at(index_path: index_path)) if self.respond_to?("on_cell_deleted:")
+
+        delete_cell = trigger_action(:on_cell_deleted, cell_at(index_path: index_path), index_path) if respond_to?(:on_cell_deleted)
         unless delete_cell == false
           self.promotion_table_data.delete_cell(index_path: index_path)
           deletable_index_paths << index_path
@@ -186,6 +187,11 @@ module ProMotion
       section && section[:title]
     end
 
+    def tableView(_, titleForFooterInSection: section)
+      section = promotion_table_data.section(section)
+      section && section[:footer]
+    end
+
     # Set table_data_index if you want the right hand index column (jumplist)
     def sectionIndexTitlesForTableView(_)
       return if self.promotion_table_data.filtered
@@ -218,12 +224,12 @@ module ProMotion
     end
 
     def tableView(_, canEditRowAtIndexPath:index_path)
-      data_cell = cell_at(index_path: index_path, unfiltered: true)
+      data_cell = cell_at(index_path: index_path, unfiltered: !searching?)
       [:insert,:delete].include?(data_cell[:editing_style])
     end
 
     def tableView(_, editingStyleForRowAtIndexPath: index_path)
-      data_cell = cell_at(index_path: index_path, unfiltered: true)
+      data_cell = cell_at(index_path: index_path, unfiltered: !searching?)
       map_cell_editing_style(data_cell[:editing_style])
     end
 
@@ -234,7 +240,7 @@ module ProMotion
     end
 
     def tableView(_, canMoveRowAtIndexPath:index_path)
-      data_cell = cell_at(index_path: index_path, unfiltered: true)
+      data_cell = cell_at(index_path: index_path, unfiltered: !searching?)
 
       if (!data_cell[:moveable].nil? || data_cell[:moveable].is_a?(Symbol)) && data_cell[:moveable] != false
         true
@@ -244,7 +250,7 @@ module ProMotion
     end
 
     def tableView(_, targetIndexPathForMoveFromRowAtIndexPath:source_index_path, toProposedIndexPath:proposed_destination_index_path)
-      data_cell = cell_at(index_path: source_index_path, unfiltered: true)
+      data_cell = cell_at(index_path: source_index_path, unfiltered: !searching?)
 
       if data_cell[:moveable] == :section && source_index_path.section != proposed_destination_index_path.section
         source_index_path
@@ -286,7 +292,7 @@ module ProMotion
       delete_row(index_paths, animation)
     end
 
-    # Section view methods
+    # Section header view methods
     def tableView(_, viewForHeaderInSection: index)
       section = promotion_table_data.section(index)
       view = section[:title_view]
@@ -322,6 +328,42 @@ module ProMotion
       end
     end
 
+    # Section footer view methods
+    def tableView(_, viewForFooterInSection: index)
+      section = promotion_table_data.section(index)
+      view = section[:footer_view]
+      view = section[:footer_view].new if section[:footer_view].respond_to?(:new)
+      view.on_load if view.respond_to?(:on_load)
+      view.title = section[:footer] if view.respond_to?(:title=)
+      view
+    end
+
+    def tableView(_, heightForFooterInSection: index)
+      section = promotion_table_data.section(index)
+      if section[:footer_view] || section[:footer].to_s.length > 0
+        if section[:footer_view_height]
+          section[:footer_view_height]
+        elsif (section_footer = tableView(_, viewForFooterInSection: index)) && section_footer.respond_to?(:height)
+          section_footer.height
+        else
+          tableView.sectionFooterHeight
+        end
+      else
+        0.0
+      end
+    end
+
+    def tableView(_, willDisplayFooterView:view, forSection:section)
+      action = :will_display_footer
+      if respond_to?(action)
+        case self.method(action).arity
+        when 0 then self.send(action)
+        when 2 then self.send(action, view, section)
+        else self.send(action, view)
+        end
+      end
+    end
+
     protected
 
     def map_cell_editing_style(symbol)

data/lib/ProMotion/version.rb

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

data/lib/ProMotion/web/web_screen_module.rb

@@ -34,7 +34,13 @@ module ProMotion
 
     def set_initial_content
       return unless self.respond_to?(:content) && self.content
-      self.content.is_a?(NSURL) ? open_url(self.content) : set_content(self.content)
+      if self.content.is_a?(NSURL) 
+        open_url(self.content) 
+      elsif self.content.is_a?(NSMutableURLRequest)
+        web.loadRequest self.content
+      else
+        set_content(self.content)
+      end
     end
 
     def set_content(content)

data/spec/functional/func_table_screen_spec.rb

@@ -75,6 +75,7 @@ describe "ProMotion::TableScreen functionality" do
             wait 0.01 do
               table_screen.tableView(table_screen.tableView, numberOfRowsInSection:0).should == 6
               table_screen.cell_was_deleted.should == true
+              table_screen.cell_deleted_index_path.should == NSIndexPath.indexPathForRow(3, inSection:0)
             end
           end
         end

data/spec/unit/screen_spec.rb

@@ -449,7 +449,9 @@ describe "child screen management" do
   end
 
   it "#add_child_screen" do
-    @screen.add_child_screen @child
+    autorelease_pool do
+      @screen.add_child_screen @child
+    end
     @screen.childViewControllers.should.include(@child)
     @screen.childViewControllers.length.should == 1
     @child.parent_screen.should == @screen

data/spec/unit/tables/table_module_spec.rb

@@ -52,40 +52,55 @@ describe "PM::Table module" do
   end
 
   def default_cell_height
-    return UITableViewAutomaticDimension if TestHelper.ios8
+    return UITableViewAutomaticDimension if TestHelper.gte_ios8
     return 97.0 if TestHelper.ios7 # Normally 44, but 97 because of `row_height` designation
   end
 
   def default_header_height
     # Thanks, Apple.
-    return -1.0 if TestHelper.ios8
+    return -1.0 if TestHelper.gte_ios8
     return 23.0 if TestHelper.ios7
     return 22.0 if TestHelper.ios6
   end
 
+  def default_footer_height
+    # Couldn't alias_method inside of a Bacon::Context so I'm defining this
+    # method to just call default_header_height. I'm reasonably sure that
+    # the defaults are the same for section headers and footers.
+    default_header_height
+  end
+
   before do
     @subject = TestTableScreen.new
     @subject.mock! :table_data do
       [{
-        title: "Table cell group 1", cells: [ ]
-      },{
-        title: "Table cell group 2", cells: [ cell_factory ]
-      },{
-        title: "Table cell group 3", cells: [ cell_factory(title: "3-1"), cell_factory({title: "3-2", properties: { background_color: UIColor.blueColor } }) ]
-      },{
-        title: "Table cell group 4", cells: [ custom_cell, cell_factory(title: "4-2"), cell_factory(title: "4-3"), cell_factory(title: "4-4") ]
-      },{
+        title: "Table cell group 1", :footer => "Footer for table cell group 1", cells: [ ]
+      }, {
+        title: "Table cell group 2", :footer => "Footer for table cell group 2", cells: [ cell_factory ]
+      }, {
+        title: "Table cell group 3", :footer => "Footer for table cell group 3", cells: [ cell_factory(title: "3-1"), cell_factory({title: "3-2", properties: { background_color: UIColor.blueColor } }) ]
+      }, {
+        title: "Table cell group 4", :footer => "Footer for table cell group 4", cells: [ custom_cell, cell_factory(title: "4-2"), cell_factory(title: "4-3"), cell_factory(title: "4-4") ]
+      }, {
         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) ]
       }, {
         title: "Action With A Proc", cells: [ proc_cell ]
-      },{
+      }, {
         title: "test 40", title_view: DynamicHeightTitleView40, cells: []
       }, {
         title: "test 121", title_view: DynamicHeightTitleView121, cells: []
+      }, {
+        footer: "Custom section footer 1", footer_view: CustomFooterView, cells: [ ]
+      }, {
+        footer: "Custom section footer 2", footer_view: CustomFooterView.new, footer_view_height: 50, cells: [ ]
+      }, {
+        footer: "Footer test 40", footer_view: DynamicHeightFooterView40, cells: []
+      }, {
+        footer: "Footer test 121", footer_view: DynamicHeightFooterView121, cells: []
       }]
     end
 
@@ -99,7 +114,7 @@ describe "PM::Table module" do
   end
 
   it "should have the right number of sections" do
-    @subject.numberOfSectionsInTableView(@subject.table_view).should == 10
+    @subject.numberOfSectionsInTableView(@subject.table_view).should == 14
   end
 
   it "should set the section titles" do
@@ -111,6 +126,15 @@ describe "PM::Table module" do
     @subject.tableView(@subject.table_view, titleForHeaderInSection:5).should == "Custom section title 2"
   end
 
+  it "should set the section footers" do
+    @subject.tableView(@subject.table_view, titleForFooterInSection:0).should == "Footer for table cell group 1"
+    @subject.tableView(@subject.table_view, titleForFooterInSection:1).should == "Footer for table cell group 2"
+    @subject.tableView(@subject.table_view, titleForFooterInSection:2).should == "Footer for table cell group 3"
+    @subject.tableView(@subject.table_view, titleForFooterInSection:3).should == "Footer for table cell group 4"
+    @subject.tableView(@subject.table_view, titleForFooterInSection:10).should == "Custom section footer 1"
+    @subject.tableView(@subject.table_view, titleForFooterInSection:11).should == "Custom section footer 2"
+  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
@@ -121,7 +145,7 @@ describe "PM::Table module" do
   end
 
   it "should create the jumplist" do
-    @subject.mock! :table_data_index, do
+    @subject.mock!(:table_data_index) do
       Array("A".."Z")
     end
 
@@ -226,6 +250,32 @@ describe "PM::Table module" do
     end
   end
 
+  describe("section with custom footer_view") do
+
+    it "should use the correct class for section view" do
+      cell = @subject.tableView(@subject.table_view, viewForFooterInSection: 10)
+      cell.should.be.kind_of(CustomFooterView)
+    end
+
+    it "should use the default section height if none is specified" do
+      @subject.tableView(@subject.table_view, heightForFooterInSection: 10).should == default_footer_height
+    end
+
+    it "should use the set footer_view_height if one is specified" do
+      @subject.tableView(@subject.table_view, heightForFooterInSection: 11).should == 50.0
+    end
+
+    it "should use the instantiated section view if one is specified" do
+      cell = @subject.tableView(@subject.table_view, viewForFooterInSection: 11)
+      cell.should.be.kind_of(CustomFooterView)
+    end
+
+    it "should set the height of a title view when the method `height` is implemented" do
+      @subject.tableView(@subject.table_view, heightForFooterInSection: 12).should == 40.0
+      @subject.tableView(@subject.table_view, heightForFooterInSection: 13).should == 121.0
+    end
+  end
+
   describe "header view modifications" do
 
     it "should call will_display_header" do

data/spec/unit/web_spec.rb

@@ -31,6 +31,15 @@ describe "web screen properties" do
         @webscreen.current_url.should == 'http://mixi.jp/'
       end
     end
+    
+    it "should open web page via NSMutableURLRequest" do
+      nsurl = NSURL.URLWithString('http://mixi.jp/')
+      @webscreen.web.loadRequest NSMutableURLRequest.requestWithURL(nsurl)
+
+      wait_for_change @webscreen, 'is_load_finished' do
+        @webscreen.current_url.should == 'http://mixi.jp/'
+      end
+    end
 
     it "should open web page by url string" do
       @webscreen.open_url('http://mixi.jp/')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ProMotion
 version: !ruby/object:Gem::Version
-  version: 2.5.0.beta1
+  version: 2.5.0
 platform: ruby
 authors:
 - Jamon Holmgren
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-13 00:00:00.000000000 Z
+date: 2015-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: methadone
@@ -208,9 +208,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5