routable 0.0.1 → 0.0.2

data/Rakefile

@@ -1 +1,11 @@
-require "bundler/gem_tasks"
+$:.unshift("/Library/RubyMotion/lib")
+require 'motion/project'
+require "bundler/gem_tasks"
+
+$:.unshift("./lib/")
+require './lib/routable'
+
+Motion::Project::App.setup do |app|
+  # Use `rake config' to see complete project settings.
+  app.name = 'Routable'
+end

data/lib/routable/router.rb

@@ -1,5 +1,19 @@
 module Routable
   class Router
+    TRANSITION_STYLES = {
+      :cover => UIModalTransitionStyleCoverVertical,
+      :flip => UIModalTransitionStyleFlipHorizontal,
+      :dissolve => UIModalTransitionStyleCrossDissolve,
+      :curl => UIModalTransitionStylePartialCurl
+    }
+
+    PRESENTATION_STYLES = {
+      :full_screen => UIModalPresentationFullScreen,
+      :page_sheet => UIModalPresentationPageSheet,
+      :form_sheet => UIModalPresentationFormSheet,
+      :current => UIModalPresentationCurrentContext
+    }
+
     # Singleton, for practical use (you might not want)
     # to have more than one router.
     class << self
@@ -28,9 +42,21 @@ 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.
-
+    #   :transition => [:cover, :flip, :dissolve, :curl]
+    #     - A symbol to represented transition style used. Mapped to UIModalTransitionStyle.
+    #   :presentation => [:full_screen, :page_sheet, :form_sheet, :current]
+    #     - A symbol to represented presentation style used. Mapped to UIModalPresentationStyle.
     def map(url, klass, options = {})
       format = url
+
+      if options[:transition] && !TRANSITION_STYLES.keys.include?(options[:transition])
+        raise ArgumentError, ":transition must be one of #{TRANSITION_STYLES.keys}"
+      end
+
+      if options[:presentation] && !PRESENTATION_STYLES.keys.include?(options[:presentation])
+        raise ArgumentError, ":presentation must be one of #{PRESENTATION_STYLES.keys}"
+      end
+
       self.routes[format] = options.merge!(klass: klass)
     end
 
@@ -50,6 +76,8 @@ module Routable
         else
           tempNavigationController = UINavigationController.alloc.init
           tempNavigationController.pushViewController(controller, animated: false)
+          tempNavigationController.modalTransitionStyle = controller.modalTransitionStyle
+          tempNavigationController.modalPresentationStyle = controller.modalPresentationStyle
           self.navigation_controller.presentModalViewController(tempNavigationController, animated: animated)
         end
       else
@@ -61,6 +89,17 @@ module Routable
       end
     end
 
+    # Pop the top level UIViewController
+    # EX
+    # router.pop
+    def pop(animated = true)
+      if self.navigation_controller.modalViewController
+        self.navigation_controller.dismissModalViewControllerAnimated(animated)
+      else
+        self.navigation_controller.popViewControllerAnimated(animated)
+      end
+    end
+
     def options_for_url(url)
       # map of url => options
 
@@ -136,6 +175,7 @@ module Routable
       else
         controller = controller.init
       end
+
       if open_options[:shared]
         shared_vc_cache[url] = controller
         # when controller.viewDidUnload called, remove from cache.
@@ -149,6 +189,17 @@ module Routable
           end
         end
       end
+
+      transition = open_options[:transition]
+      if transition
+        controller.modalTransitionStyle = TRANSITION_STYLES[transition]
+      end
+
+      presentation = open_options[:presentation]
+      if presentation
+        controller.modalPresentationStyle = PRESENTATION_STYLES[presentation] 
+      end
+
       controller
     end
 

data/lib/routable/version.rb

@@ -1,3 +1,3 @@
 module Routable
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/main_spec.rb

@@ -11,6 +11,9 @@ end
 class NoParamsController < UIViewController
 end
 
+class LoginController < UIViewController
+end
+
 describe "the url router" do
   before do
     @router = Routable::Router.new
@@ -68,4 +71,35 @@ describe "the url router" do
     @router.open("users")
     @nav_controller.viewControllers.count.should == 3
   end
+
+  it "should use transition option" do
+    [:cover, :flip, :dissolve, :curl].each do |transition|
+      url = "login/#{transition.to_s}"
+      @router.map(url, LoginController, modal: true, transition:transition)
+      controller = @router.controller_for_url(url)
+      controller.modalTransitionStyle.should == Routable::Router::TRANSITION_STYLES[transition]
+    end
+  end
+
+  it "should raise error when transition is unexpected value" do
+    lambda do
+      @router.map("login", LoginController, modal: true, transition: :unexpected)
+    end.should.raise(ArgumentError)
+  end
+
+  it "should use presentation option" do
+    [:full_screen, :page_sheet, :form_sheet, :current].each do |presentation|
+      url = "login/#{presentation.to_s}"
+      @router.map(url, LoginController, modal: true, presentation:presentation)
+      controller = @router.controller_for_url(url)
+      controller.modalPresentationStyle.should == Routable::Router::PRESENTATION_STYLES[presentation]
+    end
+  end
+
+  it "should raise error when presentation is unexpected value" do
+    lambda do
+      @router.map("login", LoginController, modal: true, presentation: :unexpected)
+    end.should.raise(ArgumentError)
+  end
+
 end

metadata

@@ -2,7 +2,7 @@
 name: routable
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Clay Allsopp
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-23 00:00:00 Z
+date: 2012-06-09 00:00:00 Z
 dependencies: []
 
 description: A RubyMotion UIViewController -> URL router