ProMotion 2.0.0.rc5 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1b745b9285361e5c83902ad54555b26eb25ef64
-  data.tar.gz: 3efb5c16c82d9f136dde950742724cc4713b1d49
+  metadata.gz: 14987f5aeab8920859f57503394853b2df7d89bb
+  data.tar.gz: ecdd5d911f9642b4b2bebc68f2741bc21ea71e7f
 SHA512:
-  metadata.gz: 6ee92756d4cafbbe466cc4e03e8bf9a136c89335d961e69d61b0553473b96e0313179ddd4179995ad58d738b3d4cd6d0e5861ee6d5ec02902ca6dce6e55b5d74
-  data.tar.gz: abce7aecfb21cb8ca89bef8c0af872307bf18b278cb89ffc51bafb98329d5b2133f73fd83087cb2fa039c220e13bd8e90e38ec9fcc7b4608a8c0f11cc2a055d3
+  metadata.gz: 74a9842f7871a930fd367c216c6a54a131869c6ce2c8d8be355265f8a4af37347da4a887fa6977dbcaf2973ce843394bfa08c02e5ca09b293321fd5da22692ce
+  data.tar.gz: 3d42d49c8f5993725fb564deb77d76a6bccf59d493c0c8c4c59427c86692afb330b63374419714db098b46029661ed42f16ed5829516136be920db06ae2b615d

data/README.md

@@ -9,7 +9,7 @@ simple, Ruby-like DSL.
 
 * Watch Jamon Holmgren give a talk about ProMotion at [RubyMotion #inspect2014](http://confreaks.com/videos/3813-inspect-going-pro-with-promotion-from-prototype-to-production) (video)
 * Watch the [September 2013 Motion Meetup](http://www.youtube.com/watch?v=rf7h-3AiMRQ) where Gant Laborde
-interviews Jamon Holmgren about ProMotion!
+interviews Jamon Holmgren about ProMotion
 
 ```ruby
 # app/app_delegate.rb
@@ -80,6 +80,7 @@ end
 1. Check out the [Getting Started Guide](https://github.com/clearsightstudio/ProMotion/wiki/Guide:-Getting-Started) in the wiki
 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 updated and exhaustive [Wiki](https://github.com/clearsightstudio/ProMotion/wiki)
 
 # Changelog
 
@@ -128,9 +129,7 @@ We've created a comprehensive and always updated wiki with code examples, usage
 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 tweet [@jamonholmgren](http://twitter.com/jamonholmgren)
-or open an issue on GitHub. Opening an issue is usually the best and we respond to those
-pretty quickly. If we don't respond within a day, tweet Jamon or Mark a link to the issue.
+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.
 
 # Contributing
 
@@ -140,6 +139,6 @@ See [CONTRIBUTING.md](https://github.com/clearsightstudio/ProMotion/blob/master/
 
 * 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)
+* Ryan Linton: [@ryanlntn](https://twitter.com/ryanlntn)
 * [Many others](https://github.com/clearsightstudio/ProMotion/graphs/contributors)

data/lib/ProMotion/screen/screen_navigation.rb

@@ -47,7 +47,7 @@ module ProMotion
 
       elsif self.navigationController
         close_nav_screen args
-        send_on_return(args) # TODO: this would be better implemented in a callback or view_did_disappear.
+        send_on_return(args)
 
       else
         PM.logger.warn "Tried to close #{self.to_s}; however, this screen isn't modal or in a nav bar."
@@ -138,6 +138,7 @@ module ProMotion
     def close_nav_screen(args={})
       args[:animated] = true unless args.has_key?(:animated)
       if args[:to_screen] == :root
+        self.parent_screen = self.navigationController.viewControllers.first
         self.navigationController.popToRootViewControllerAnimated args[:animated]
       elsif args[:to_screen] && args[:to_screen].is_a?(UIViewController)
         self.parent_screen = args[:to_screen]

data/lib/ProMotion/table/table.rb

@@ -87,7 +87,8 @@ module ProMotion
 
     def delete_row(index_paths, animation = nil)
       deletable_index_paths = []
-      Array(index_paths).each do |index_path|
+      index_paths = [index_paths] if index_paths.kind_of?(NSIndexPath)
+      index_paths.each do |index_path|
         delete_cell = false
         delete_cell = send(:on_cell_deleted, self.promotion_table_data.cell(index_path: index_path)) if self.respond_to?("on_cell_deleted:")
         unless delete_cell == false

data/lib/ProMotion/version.rb

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

data/spec/unit/screen_helpers_spec.rb

@@ -231,10 +231,6 @@ describe "screen helpers" do
 
     describe "closing a screen" do
 
-      before do
-        @second_screen = BasicScreen.new
-      end
-
       it "should close a modal screen" do
         parent_screen = HomeScreen.new
         @screen.parent_screen = parent_screen
@@ -291,6 +287,30 @@ describe "screen helpers" do
         @screen.send_on_return key: :value
       end
 
+      context "there are two parent screens and we're closing to the first" do
+        it "#send_on_return should pass args to the first screen" do
+          first_screen = HomeScreen.new(nav_bar: true)
+          second_screen = first_screen.open(BasicScreen)
+          second_screen.open @screen
+
+
+          second_screen.stub!(:on_return) { |args| should.flunk "shouldn't call on_return on second_screen!" }
+          first_screen.mock!(:on_return) { |args| args[:key].should == :value }
+          @screen.close({ key: :value, to_screen: first_screen })
+        end
+
+        it "#send_on_return should pass args to the first screen with :root" do
+          first_screen = HomeScreen.new(nav_bar: true)
+          second_screen = first_screen.open(BasicScreen)
+          second_screen.open @screen
+
+
+          second_screen.stub!(:on_return) { |args| should.flunk "shouldn't call on_return on second_screen!" }
+          first_screen.mock!(:on_return) { |args| args[:key].should == :value }
+          @screen.close({ key: :value, to_screen: :root })
+        end
+      end
+
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ProMotion
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc5
+  version: 2.0.0
 platform: ruby
 authors:
 - Jamon Holmgren
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-29 00:00:00.000000000 Z
+date: 2014-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: methadone
@@ -171,9 +171,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.2.2