routable 0.1.1 → 0.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YzlmMzAzYzFlNDE4MDMyNTI4NTY1MmFkZGVhMGFkMDNjY2QxNjVkYQ==
+  data.tar.gz: !binary |-
+    ODcxNjZmOWUyNDdlNWQwYWNjNWUyZmI0NzUzNzI5YmU2YjIwNGZmMQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MDE5MDdiYmMwMTFlOWRhNzZlZjQyMGEzODI2ZWY4NDc4YzYwNWVmYTc2ODYy
+    MThkMWVkYjM4Mjk1ZjRmZjk3Y2RhNWIzZDU4NDJjN2E5OWI5NTQwNzcwYTlk
+    NzQwOTVlOTk0NTAwODkzNWMwMWVhOTZiMjkwYTIwMGE0NzAyNDk=
+  data.tar.gz: !binary |-
+    OWVkYTJmZmNlZTNlNDFiN2Y3NGRmNWRjNDhiZTNlNGRiM2M5NTRkMzExMmVm
+    ZWQ1ZDMzYjE3NTRkYjVlNDIxNjVjYmRiNTQ2MDFkYzUxN2U0NDQyNGY4ZDFl
+    NTkyZTNjZDQ5MjFjMDgzY2I3NzNlMTJiNTlmNjk2YmRmNTllYjU=

data/README.md

@@ -74,11 +74,14 @@ class AppDelegate
 
     # :modal means we push it modally.
     @router.map("login", LoginController, modal: true)
+
     # :shared means it will only keep one instance of this VC in the hierarchy;
     # if we push it again later, it will pop any covering VCs.
     @router.map("menu", MenuController, shared: true)
     @router.map("profile/:id", ProfileController)
-    @router.map("messages", MessagesController)
+
+    # :resets will reset the navigation stack with the target view controller
+    @router.map("messages", MessagesController, resets: true)
     @router.map("message/:id", MessageThreadController)
 
     # can also route arbitrary blocks of code
@@ -93,3 +96,16 @@ class AppDelegate
   end
 end
 ```
+
+## Configuration of View Controllers
+
+If you need to configure a view controller before the router navigates to it, use a block:
+
+``` ruby
+# Configure and push an ImageEditorController
+BW::Device.camera.any.picture(media_types: [:movie, :image]) do |result|
+  router.open('editor') do |controller|
+    controller.image = result[:original_image]
+  end
+end
+```

data/lib/routable/router.rb

@@ -47,6 +47,8 @@ module Routable
     #     - We present the VC modally (router is not shared between the new nav VC)
     #   :shared => true/false
     #     - If URL is called again, we pop to that VC if it's in memory.
+    #   :resets => true/false
+    #     - Resets the navigation stack with the target view controller
     #   :transition => [:cover, :flip, :dissolve, :curl]
     #     - A symbol to represented transition style used. Mapped to UIModalTransitionStyle.
     #   :presentation => [:full_screen, :page_sheet, :form_sheet, :current]
@@ -69,11 +71,19 @@ module Routable
       self.routes[format] = options.merge!(klass: klass)
     end
 
+    # Open the given URL via the iOS protocol
+    # EX
+    # router.open_external("http://google.com")
+    # => Opens Google in Safari.app
+    def open_external(url)
+      UIApplication.sharedApplication.openURL(NSURL.URLWithString(url))
+    end
+
     # Push the UIViewController for the given url
     # EX
     # router.open("users/3")
     # => router.navigation_controller pushes a UsersController
-    def open(url, animated = true)
+    def open(url, animated = true, &block)
       controller_options = options_for_url(url)
 
       if controller_options[:callback]
@@ -89,10 +99,28 @@ module Routable
       end
 
       controller = controller_for_url(url)
+
+      # Allow configuration of the view controller after
+      # initialization but before navigating to the view controller
+      if block_given?
+        block.call(controller)
+      end
+
       if self.navigation_controller.modalViewController
-        self.navigation_controller.dismissModalViewControllerAnimated(animated)
+        dismiss_animated = animated
+
+        # Can't dismiss and present two controllers animated at the same time,
+        # so we just dismiss the current one without an animation
+        if controller_options[:modal] && dismiss_animated
+          dismiss_animated = false
+        end
+
+        self.navigation_controller.dismissModalViewControllerAnimated(dismiss_animated)
       end
-      if controller_options[:modal]
+
+      if controller_options[:resets]
+        navigation_controller.setViewControllers([controller], animated: animated)
+      elsif controller_options[:modal]
         if controller.class == UINavigationController
           self.navigation_controller.presentModalViewController(controller, animated: animated)
         else
@@ -231,4 +259,4 @@ module Routable
       @shared_vc_cache ||= {}
     end
   end
-end
+end

data/lib/routable/version.rb

@@ -1,3 +1,3 @@
 module Routable
-  VERSION = "0.1.1"
+  VERSION = "0.2"
 end

data/spec/main_spec.rb

@@ -14,6 +14,16 @@ end
 class LoginController < UIViewController
 end
 
+class ConfigurableController < UIViewController
+  attr_accessor :configured
+
+  def init
+    super.tap do |controller|
+      controller.configured = false
+    end
+  end
+end
+
 describe "the url router" do
   before do
     @router = Routable::Router.new
@@ -23,6 +33,21 @@ describe "the url router" do
     @nav_controller.viewControllers.count.should == 0
   end
 
+  describe '#open' do
+    it 'accepts a configuration block' do
+      url = 'configured'
+      @router.navigation_controller = @nav_controller
+      @router.map(url, ConfigurableController, shared: true)
+
+      @router.open(url) do |controller|
+        controller.configured = true
+      end
+
+      controller = @router.controller_for_url(url)
+      controller.configured.should.be.true
+    end
+  end
+
   def make_test_controller_route
     format = "users/:user_id"
     @router.map(format, UsersTestController)
@@ -121,4 +146,17 @@ describe "the url router" do
     @router.open("logout/123")
     @called.should == "123"
   end
-end
+
+  describe 'reset option' do
+    it 'resets the navigation controller stack with the target controller' do
+      @router.navigation_controller = @nav_controller
+      @router.map('start', NoParamsController)
+      @router.map('reset', NoParamsController, resets: true)
+
+      @router.open('start')
+      @router.open('reset')
+
+      @router.navigation_controller.viewControllers.count.should == 1
+    end
+  end
+end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: routable
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: '0.2'
 platform: ruby
 authors:
 - Clay Allsopp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-25 00:00:00.000000000 Z
+date: 2013-05-06 00:00:00.000000000 Z
 dependencies: []
 description: A RubyMotion UIViewController -> URL router
 email:
@@ -30,27 +29,26 @@ files:
 - spec/main_spec.rb
 homepage: https://github.com/clayallsopp/Routable
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A RubyMotion UIViewController -> URL router
 test_files:
 - spec/main_spec.rb