motion-hybrid 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1166d97948ca1aab9c9d25fd3ad29a7246a9765c
-  data.tar.gz: 1354f01d5146006199177ca31b5085dcb2c80a80
+  metadata.gz: ce0fa09ca4db9ca8ede81070958c19283aa176e4
+  data.tar.gz: 3e7355cc44d889739486a886afb825c9e9012ad3
 SHA512:
-  metadata.gz: 6e023a1082b61452efc640041812eb0f6736e627b5df879153731f008e3275881239c54ee6440c9bc6480e4887c5f44bf07d011e6c2a21dc8e569f4c06aeb025
-  data.tar.gz: 53cdaa93fe775e2c046405c44a0cb9016cbeac3a3775b59d232fbac0f393482d853763ed2fd25dd194829dda83f57f8d397a2c9f49e3b5b5bcfeafea4949976b
+  metadata.gz: b7d1d0c32961c63d908145a849a69a51dcec120ff4933c227a83cf879fdf2a803614562a81f931988b60e8eacf95c4f189fec5c3963827abfbe771375d6a88ed
+  data.tar.gz: 6e0b1e0dd7f1108c25966fd1256687e00c69399f88971625348c3e2cc9ba1cddd9481fba99206a5c512c5a79c3e9d0d10cbbc242b18f6d9f907818060961312c

data/README.md

@@ -35,7 +35,7 @@ Instantiate a screen and set the initial path:
 # app/app_delegate.rb
 class AppDelegate < PM::Delegate
   def on_load(app, options)
-    open BaseScreen.new(nav_bar: true, path: '/balvig'
+    open BaseScreen.new(nav_bar: true, path: '/balvig')
   end
 end
 ```
@@ -75,7 +75,25 @@ Links with anchor `#self` will open the new url within the current view without
 
 ### Non-GET requests
 
-Any non-GET requests (form posts etc) will display the result within the current view and also automatically refresh all other views so that pages are up to date.
+Any non-GET requests (form posts etc) will display the result within the current view and also automatically refresh all parent views so that pages are up to date.
+
+## Custom routes
+
+Sometimes you will want to trigger native iOS functionality from the web views, this is done by intercepting URLs that you can handle using the routing api, so you can do things like:
+
+```ruby
+class BaseScreen < MotionHybrid::Screen
+  # pops up in-app email composer when clicking mailto: links
+  route /^mailto:/ do
+    BW::Mail.compose(to: 'bob@example.com', subject: 'In app emailing', message: 'Hi!', animated: true)
+  end
+
+  # ask for push nofitication permisions when user hits '/setup' url
+  route '/setup' do
+    App.delegate.register_for_push_notifications :badge, :sound, :alert
+  end
+end
+```
 
 ## The Bridge
 
@@ -106,22 +124,3 @@ All markup is contained within a div with id `motion-hybrid-bridge`
 ### Navbar items
 
 TBA
-
-## Custom routes
-
-Sometimes you will want to trigger native iOS functionality from the web views, this is done by intercepting URLs that you can handle using the routing api, so you can do things like:
-
-```ruby
-class BaseScreen < MotionHybrid::Screen
-  # pops up in-app email composer when clicking mailto: links
-  route /^mailto:/ do
-    BW::Mail.compose(to: 'bob@example.com', subject: 'In app emailing', message: 'Hi!', animated: true)
-  end
-
-  # ask for push nofitication permisions when user hits '/setup' url
-  route '/setup' do
-    App.delegate.register_for_push_notifications :badge, :sound, :alert
-  end
-end
-```
-

data/Rakefile

@@ -9,3 +9,12 @@ Motion::Project::App.setup do |app|
   app.name = 'motion-hybrid test'
   app.version = '1.0'
 end
+
+namespace :spec do
+  task :unit do
+    App.config.spec_mode = true
+    spec_files = App.config.spec_files - Dir.glob('./spec/functional/**/*.rb')
+    App.config.instance_variable_set("@spec_files", spec_files)
+    Rake::Task["simulator"].invoke
+  end
+end

data/lib/motion-hybrid.rb

@@ -11,7 +11,7 @@ Motion::Require.all(Dir.glob(File.expand_path('../motion-hybrid/**/*.rb', __FILE
 Motion::Project::App.setup do |app|
   app.resources_dirs << File.join(File.dirname(__FILE__), 'resources')
   app.pods do
-    pod 'CRToast', '<0.0.6'
+    pod 'CRToast', git: 'git@github.com:cruffenach/CRToast.git'
     pod 'FontAwesomeKit'
     pod 'MBProgressHUD'
     pod 'SpinKit'

data/lib/motion-hybrid/concerns/basic_routes.rb

@@ -4,12 +4,6 @@ module MotionHybrid
 
     included do
 
-      # Trigger dom-loaded events
-      route 'motionhybrid://ready' do
-        dom_loaded
-        true
-      end
-
       # All clicked GET-links are pushed
       route /.*/ do |request|
         push(request.url) if request.http_method == 'GET' && request.type == UIWebViewNavigationTypeLinkClicked

data/lib/motion-hybrid/concerns/bridgeable.rb

@@ -3,95 +3,99 @@ module MotionHybrid
 
     def on_appear
       super
-      if title_blank? && bridge.present?
-        set_titles
-      else
-        @transition_finished = true
-      end
+      @appeared = true
+      set_titles if dom_loaded?
       refresher.endRefreshing if refresher #avoids stuck animation
     end
 
     private
 
-    def title_blank?
-      title.blank? && navigationItem.titleView.blank?
-    end
+      def load_bridge
+        self.bridge = Bridge.new(self)
+      end
 
-    def load_bridge
-      self.bridge = Bridge.new(self)
-    end
+      def dom_loaded
+        PM.logger.debug "#{self} dom_loaded"
+        set_titles if appeared?
+        set_buttons
+        set_refresher
+        render_flash
+        @dom_loaded = true
+      end
 
-    def dom_loaded
-      set_titles if transition_finished?
-      set_buttons
-      set_refresher
-      render_flash
-    end
+      def dom_loaded?
+        !!@dom_loaded
+      end
 
-    def transition_finished?
-      @transition_finished
-    end
+      def appeared?
+        !!@appeared
+      end
 
-    def set_titles
-      if bridge.subtitle.present?
-        self.navigationItem.titleView = MultiLineHeader.new(bridge.title, bridge.subtitle)
-      else
-        self.title = bridge.title
+      def set_titles
+        if bridge.subtitle.present?
+          self.navigationItem.titleView = MultiLineHeader.new(bridge.title, bridge.subtitle)
+        else
+          self.title = bridge.title
+          self.navigationItem.titleView = nil
+        end
       end
-    end
 
-    def set_buttons
-      set_button :left, bridge.nav_bar_buttons.left
-      set_button :right, bridge.nav_bar_buttons.right
-    end
+      def set_buttons
+        if bridge.nav_bar_buttons
+          set_button :left, bridge.nav_bar_buttons.left
+          set_button :right, bridge.nav_bar_buttons.right
+        else
+          PM.logger.debug 'No buttons found'
+        end
+      end
 
-    def set_button(side, button)
-      return unless button
-      icon = button.icon ? Icon.new(button.icon, 20) : nil
-      send "set_nav_bar_#{side}_button", icon, action: "on_nav_bar_#{side}_button_click"
-    end
+      def set_button(side, button)
+        return unless button
+        return if button.if && !send(button.if)
+        label = button.icon ? Icon.new(button.icon, 20) : button.label
+        send "set_nav_bar_#{side}_button", label, action: "on_nav_bar_#{side}_button_click"
+      end
 
-    def on_nav_bar_button_click(side)
-      button = bridge.nav_bar_buttons.send(side)
-      if button.options.any?
-        UIActionSheet.alert nil, buttons: button.options do |pressed, index|
-          index = remap_index(index, button.options)
-          bridge.click_child(button.id, index)
+      def on_nav_bar_button_click(side)
+        button = bridge.nav_bar_buttons.send(side)
+        if button.options.any?
+          UIActionSheet.alert nil, buttons: button.options do |pressed, index|
+            index = remap_index(index, button.options)
+            bridge.click_child(button.id, index)
+          end
+        else
+          bridge.click(button.id)
         end
-      else
-        bridge.click(button.id)
       end
-    end
 
-    #  iOS button order and actual order of buttons on screen are not the same
-    def remap_index(index, options)
-      if index == options.length - 1
-        0
-      else
-        index + 1
+      #  iOS button order and actual order of buttons on screen are not the same
+      def remap_index(index, options)
+        if index == options.length - 1
+          0
+        else
+          index + 1
+        end
       end
-    end
-
 
-    def on_nav_bar_left_button_click
-      on_nav_bar_button_click(:left)
-    end
+      def on_nav_bar_left_button_click
+        on_nav_bar_button_click(:left)
+      end
 
-    def on_nav_bar_right_button_click
-      on_nav_bar_button_click(:right)
-    end
+      def on_nav_bar_right_button_click
+        on_nav_bar_button_click(:right)
+      end
 
-    def set_refresher
-      if bridge.refreshable && !refresher
-        self.refresher = UIRefreshControl.alloc.init
-        refresher.addTarget(self, action: 'reload', forControlEvents: UIControlEventValueChanged)
-        webview.scrollView.addSubview(refresher)
+      def set_refresher
+        if bridge.refreshable && !refresher
+          self.refresher = UIRefreshControl.alloc.init
+          refresher.addTarget(self, action: 'reload', forControlEvents: UIControlEventValueChanged)
+          webview.scrollView.addSubview(refresher)
+        end
       end
-    end
 
-    def render_flash
-      Toast.new(bridge.flash.title, bridge.flash.subtitle) if bridge.flash
-    end
+      def render_flash
+        Flash.new(bridge.flash.title, subtitle: bridge.flash.subtitle).show if bridge.flash
+      end
 
   end
 end

data/lib/motion-hybrid/concerns/navigatable.rb

@@ -34,14 +34,15 @@ module MotionHybrid
     end
 
     def load_started
+      @dom_loaded = false
       start_transitions
     end
 
     def load_finished
       @url = current_url
-      load_bridge
-      reload_dependents if needs_reload?
       stop_transitions
+      load_bridge unless external_page?
+      reload_dependents if needs_reload?
     end
 
     def load_failed(error)
@@ -53,12 +54,13 @@ module MotionHybrid
     end
 
     def reset!
+      dismissModalViewControllerAnimated(false)
       return_to_root
       load_initial_url
     end
 
     def return_to_root
-      close_nav_screen(animated: false) if nav_bar?
+      close to_screen: :root, animated: false if nav_bar?
     end
 
     def on_request(nsurlrequest, type)
@@ -66,6 +68,7 @@ module MotionHybrid
     end
 
     def navigate(new_path)
+      new_path = self.class.path_for(new_path)
       return if path == new_path
       process_request Request.new(self.class.request_for(new_path), UIWebViewNavigationTypeLinkClicked)
     end
@@ -79,57 +82,63 @@ module MotionHybrid
 
     private
 
-    def process_request(request)
-      @needs_reload = true if request.http_method != 'GET'
-
-      if router.process(request)
-        false
-      else
-        PM.logger.info("#{self} #{request.http_method} #{request.url}")
-        true
+      def external_page?
+        !url.include?(self.class.root_url)
       end
-    end
-
-    def push(url, options = {})
-      view_options = options.slice!(:hide_tab_bar)
-      options[:modal] = view_options[:modal]
-      view_options.reverse_merge!(url: url, modal: modal?, transition_style: transition_style)
-      new_view = self.class.new(view_options)
-      open(new_view, options)
-      new_view
-    end
 
-    def load_initial_url
-      self.path = self.class.path_for(@initial_url)
-    end
+      def process_request(request)
+        return dom_loaded && false if request.url == 'motionhybrid://ready'
+        @needs_reload = true if request.http_method != 'GET'
 
-    def transition_style
-      modal? ? UIModalTransitionStyleFlipHorizontal : nil
-    end
-
-    def router
-      @router ||= Router.new(self)
-    end
+        if router.process(request)
+          PM.logger.info("#{self} #{request} <intercept>")
+          false
+        else
+          PM.logger.info("#{self} #{request} <load>")
+          true
+        end
+      end
 
-    module ClassMethods
-      def url_for(path)
-        "#{root_url}#{path}"
+      def push(url, options = {})
+        screen = options.delete(:screen) || self.class
+        view_options = options.slice!(:hide_tab_bar)
+        options[:modal] = view_options[:modal]
+        view_options.reverse_merge!(url: url, modal: modal?)
+        new_view = screen.new(view_options)
+        open(new_view, options)
+        new_view
       end
 
-      def request_for(path)
-        NSURLRequest.requestWithURL NSURL.URLWithString(url_for(path))
+      def load_initial_url
+        self.path = self.class.path_for(@initial_url)
       end
 
-      def path_for(url)
-        return if url.blank?
-        NSURL.URLWithString(url).path
+      def router
+        @router ||= Router.new(self)
       end
 
-      def route(*patterns, &block)
-        patterns.each do |pattern|
-          self.routes = [Route.new(pattern, &block)] + routes
+      module ClassMethods
+        def url_for(path)
+          "#{root_url}#{path}"
+        end
+
+        def request_for(path)
+          NSURLRequest.requestWithURL NSURL.URLWithString(url_for(path))
+        end
+
+        def path_for(url)
+          return if url.blank?
+          nsurl = NSURL.URLWithString(url)
+          url = url.sub("#{nsurl.scheme}://#{nsurl.host}", '')
+          url = url.sub(":#{nsurl.port}", '') if nsurl.port
+          url
+        end
+
+        def route(*patterns, &block)
+          patterns.each do |pattern|
+            self.routes = [Route.new(pattern, &block)] + routes
+          end
         end
       end
-    end
   end
 end

data/lib/motion-hybrid/concerns/presentable.rb

@@ -7,13 +7,13 @@ module MotionHybrid
 
     private
 
-    def presenter_url
-      presenter.url.sub(/\?.+/, '').sub(/#.+/, '')
-    end
+      def presenter_url
+        presenter.url.sub(/\?.+/, '').sub(/#.+/, '')
+      end
 
-    def presenter
-      navigationController.viewControllers.first.parent_screen if navigationController
-    end
+      def presenter
+        navigationController.viewControllers.first.parent_screen if navigationController
+      end
 
   end
 end

data/lib/motion-hybrid/concerns/releasable.rb

@@ -1,16 +1,21 @@
 module MotionHybrid
   module Releasable
 
-    def view_will_disappear(animated)
-      @should_release = !nav_bar? || !navigationController.viewControllers.include?(self)
+    def will_disappear
+      @should_release = nav_bar? && !navigationController.viewControllers.include?(self)
     end
 
-    def view_did_disappear(animated)
-      if @should_release
+    def on_disappear
+      release_from_memory if @should_release
+    end
+
+    private
+
+      def release_from_memory
+        PM.logger.debug "Releasing #{self}"
         webview.removeFromSuperview
         webview.release
       end
-    end
 
   end
 end

data/lib/motion-hybrid/concerns/updatable.rb

@@ -1,38 +1,39 @@
 module MotionHybrid
   module Updatable
 
-    private
+    def reload!
+      stop
+      stop_transitions
+      reload
+    end
 
     def reload_dependents
       @needs_reload = false
-      dependents.map(&:stop)
-      dependents.map(&:reload)
+      dependents.map(&:reload!)
     end
 
-    # Inefficient, but will do for now
-    def dependents
-      #dependents = all_views - [self]
-      #dependents = dependents | parent_screens
-      #dependents
-      parent_screens
-    end
+    private
 
-    def all_views
-      app_delegate.window.rootViewController.viewControllers.map(&:viewControllers).flatten
-    end
+      def dependents
+        parent_screens
+      end
 
-    def needs_reload?
-      @needs_reload
-    end
+      def all_views
+        app_delegate.window.rootViewController.viewControllers.map(&:viewControllers).flatten
+      end
 
-    def parent_screens
-      parent_screens = []
-      screen = self
-      while screen = screen.parent_screen
-        parent_screens << screen
+      def needs_reload?
+        @needs_reload
+      end
+
+      def parent_screens
+        parent_screens = []
+        screen = self
+        while screen = screen.parent_screen
+          parent_screens << screen
+        end
+        parent_screens
       end
-      parent_screens
-    end
 
   end
 end

data/lib/motion-hybrid/models/bridge.rb

@@ -18,21 +18,21 @@ module MotionHybrid
 
     private
 
-    def bridge_hash
-      @bridge_hash ||= Dish BW::JSON.parse(bridge_json)
-    end
+      def bridge_hash
+        @bridge_hash ||= Dish BW::JSON.parse(bridge_json)
+      end
 
-    def bridge_json
-      js_api('getParams()').presence || '{}'
-    end
+      def bridge_json
+        js_api('getParams()').presence || '{}'
+      end
 
-    def method_missing(method)
-      bridge_hash.send(method)
-    end
+      def method_missing(method)
+        bridge_hash.send(method)
+      end
 
-    def js_api(command)
-      @screen.evaluate("MotionHybrid.#{command};").to_s
-    end
+      def js_api(command)
+        @screen.evaluate("MotionHybrid.#{command};").to_s
+      end
 
   end
 end

data/lib/motion-hybrid/models/request.rb

@@ -25,5 +25,9 @@ module MotionHybrid
       @type
     end
 
+    def to_s
+      "#{http_method} #{url}"
+    end
+
   end
 end

data/lib/motion-hybrid/models/router.rb

@@ -7,15 +7,19 @@ module MotionHybrid
 
     def process(request)
       routes.find do |route|
-        route.matches?(request) && @screen.instance_exec(request, &route.block)
+        route.matches?(request) && @screen.instance_exec(request, external?(request), &route.block)
       end
     end
 
     private
 
-    def routes
-      @screen.class.routes
-    end
+      def external?(request)
+        !request.url.include?(@screen.root_url)
+      end
+
+      def routes
+        @screen.class.routes
+      end
 
   end
 end

data/lib/motion-hybrid/version.rb

@@ -1,3 +1,3 @@
 module MotionHybrid
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/motion-hybrid/views/toast.rb

@@ -1,24 +1,73 @@
 module MotionHybrid
+  CRToastManager.setDefaultOptions(
+    KCRToastAnimationOutDirectionKey => CRToastAnimationDirectionTop,
+    KCRToastTextAlignmentKey => NSTextAlignmentLeft,
+    KCRToastSubtitleTextAlignmentKey => NSTextAlignmentLeft,
+    KCRToastNotificationTypeKey => CRToastTypeNavigationBar,
+    KCRToastSubtitleFontKey => UIFont.systemFontOfSize(14)
+  )
+
   class Toast
-    TEXT_COLOR = '#3c763d'.to_color
-    BACKGROUND_COLOR = '#dff0d8'.to_color
-    def initialize(title, subtitle = nil)
-      options = {
-        'kCRToastTextKey' => title,
-        'kCRToastFontKey' => UIFont.systemFontOfSize(18),
-        'kCRToastTextColorKey' => TEXT_COLOR,
-        'kCRToastBackgroundColorKey' => BACKGROUND_COLOR,
-        'kCRToastSubtitleFontKey' => UIFont.systemFontOfSize(13),
-        'kCRToastSubtitleTextColorKey' => TEXT_COLOR,
-        'kCRToastTextAlignmentKey' => NSTextAlignmentLeft,
-        'kCRToastSubtitleTextAlignmentKey' => NSTextAlignmentLeft,
-        'kCRToastNotificationTypeKey' => CRToastTypeNavigationBar,
-        'kCRToastImageKey' => Icon.new(:check, 20, color: TEXT_COLOR)
-      }
-
-      options.merge!('kCRToastFontKey' => UIFont.boldSystemFontOfSize(17), 'kCRToastSubtitleTextKey' => subtitle, 'kCRToastTimeIntervalKey' => 5) if subtitle.present?
-
-      CRToastManager.showNotificationWithOptions options, completionBlock: nil
+    attr_reader :title, :options, :responders
+
+    def initialize(title, options = {})
+      @title, @options = title, options
+      @responders = [CRToastInteractionResponder.interactionResponderWithInteractionType(CRToastInteractionTypeSwipeUp, automaticallyDismiss: true, block: nil)]
+    end
+
+    def show(&block)
+      responders << CRToastInteractionResponder.interactionResponderWithInteractionType(CRToastInteractionTypeTapOnce, automaticallyDismiss: true, block: -> (i) { block.call }) if block_given?
+      CRToastManager.showNotificationWithOptions(kcr_options, completionBlock: nil)
+    end
+
+    def text_color
+      '#333'.to_color
+    end
+
+    def background_color
+      '#ffffff'.to_color
+    end
+
+    def image
+      if options[:image_url]
+        image_data = NSData.dataWithContentsOfURL(NSURL.URLWithString(options[:image_url]))
+        retinafy UIImage.imageWithData(image_data)
+      end
+    end
+
+    private
+
+      def retinafy(image)
+        UIImage.imageWithCGImage(image.CGImage, scale: 2, orientation: image.imageOrientation)
+      end
+
+      def kcr_options
+        {
+          KCRToastTextKey => title,
+          KCRToastSubtitleTextKey => options[:subtitle].presence,
+          KCRToastTextColorKey => text_color,
+          KCRToastBackgroundColorKey => background_color,
+          KCRToastSubtitleTextColorKey => text_color,
+          KCRToastImageKey => image,
+          KCRToastFontKey => options[:subtitle].present? ? UIFont.boldSystemFontOfSize(13) : UIFont.systemFontOfSize(18),
+          KCRToastTimeIntervalKey => options[:subtitle].present? ? 5 : nil,
+          KCRToastInteractionRespondersKey => responders
+        }
+      end
+  end
+
+  class Flash < Toast
+    def text_color
+      '#3c763d'.to_color
+    end
+
+    def background_color
+      '#dff0d8'.to_color
+    end
+
+    def image
+      Icon.new(:check, 20, color: text_color)
     end
   end
+
 end

data/lib/resources/jquery.motion-hybrid.coffee

@@ -17,14 +17,17 @@ class window.MotionHybrid
     { title: flash.find('h3').text() || flash.text().trim(), subtitle: flash.find('p').text() } if flash.length
 
   parseButton = (button) ->
-    { id: button.attr('id'), options: button.children().map(-> this.innerText).get(), icon: button.data('icon') } if button.length
+    { id: button.attr('id'), options: button.children().map(-> this.innerText).get(), icon: button.data('icon'), if: button.data('if'), label: button.text().trim() } if button.length
 
   @clicked: (target, childIndex) ->
     target = $("##{target}")
-    target = target.children() if childIndex
-    target.get(childIndex || 0).click()
+    target = target.children().eq(childIndex) if childIndex
+    window.location = target.attr('href') # want to simulate real click but target.get(0).click() sometimes needs to be fired twice to work..?
 
-if document.readyState == 'complete'
-  document.location.href = 'motionhybrid://ready'
-else
-  jQuery -> document.location.href = 'motionhybrid://ready'
+  @waitForJqueryAndDom: ->
+    if window.$
+      jQuery -> document.location.href = 'motionhybrid://ready'
+    else
+      setTimeout MotionHybrid.waitForJqueryAndDom, 100
+
+MotionHybrid.waitForJqueryAndDom()

data/lib/resources/jquery.motion-hybrid.js

@@ -32,11 +32,12 @@
       if (button.length) {
         return {
           id: button.attr('id'),
-          link: button.attr('href'),
           options: button.children().map(function() {
             return this.innerText;
           }).get(),
-          icon: button.data('icon')
+          icon: button.data('icon'),
+          "if": button.data('if'),
+          label: button.text().trim()
         };
       }
     };
@@ -44,21 +45,25 @@
     MotionHybrid.clicked = function(target, childIndex) {
       target = $("#" + target);
       if (childIndex) {
-        target = target.children();
+        target = target.children().eq(childIndex);
+      }
+      return window.location = target.attr('href');
+    };
+
+    MotionHybrid.waitForJqueryAndDom = function() {
+      if (window.$) {
+        return jQuery(function() {
+          return document.location.href = 'motionhybrid://ready';
+        });
+      } else {
+        return setTimeout(MotionHybrid.waitForJqueryAndDom, 100);
       }
-      return target.get(childIndex || 0).click();
     };
 
     return MotionHybrid;
 
   })();
 
-  if (document.readyState === 'complete') {
-    document.location.href = 'motionhybrid://ready';
-  } else {
-    jQuery(function() {
-      return document.location.href = 'motionhybrid://ready';
-    });
-  }
+  MotionHybrid.waitForJqueryAndDom();
 
 }).call(this);

data/resources/web/index_2.html

@@ -13,6 +13,7 @@
   <body>
     <div id="motion_hybrid_bridge">
       <h1>Page 2</h1>
+      <h2>Yes it is</h2>
       <div id="nav_bar_right_button" data-icon='trash-o'>
         <a href="#">Cancel</a>
         <a href="#">Delete</a>
@@ -22,6 +23,9 @@
 
     <div class="content-padded">
       This is page 2
+      <form action="index.html" method="post" accept-charset="utf-8">
+        <input type="submit" name="Post"  />
+      </form>
     </div>
   </body>
 </html>

data/spec/unit/navigatable_spec.rb

@@ -0,0 +1,30 @@
+module MotionHybrid
+  describe Navigatable do
+    describe '.path_for' do
+      it "should parse path correctly for localhost" do
+        MotionHybrid::Screen.path_for('http://localhost:3000/chats').should == '/chats'
+      end
+    end
+
+    describe '.route' do
+      class MyScreen < Screen
+        attr_accessor :external
+        route /.*/ do |request, external|
+          self.external = external
+        end
+      end
+
+      it "determines whether request is external or not" do
+        MyScreen.root_url = 'http://mysite.com'
+        screen = MyScreen.new
+        internal_request = NSURLRequest.requestWithURL NSURL.URLWithString('http://mysite.com/users/')
+        external_request = NSURLRequest.requestWithURL NSURL.URLWithString('http://theirsite.com/users/')
+
+        screen.on_request(internal_request, UIWebViewNavigationTypeLinkClicked)
+        screen.external.should == false
+        screen.on_request(external_request, UIWebViewNavigationTypeLinkClicked)
+        screen.external.should == true
+      end
+    end
+  end
+end

data/vendor/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - CRToast (0.0.5)
+  - CRToast (0.0.7)
   - FontAwesomeKit (2.1.5):
     - FontAwesomeKit/Core
     - FontAwesomeKit/FontAwesome
@@ -19,15 +19,19 @@ PODS:
   - SpinKit (1.0.1)
 
 DEPENDENCIES:
-  - CRToast (< 0.0.6)
+  - CRToast (from `git@github.com:cruffenach/CRToast.git`)
   - FontAwesomeKit
   - MBProgressHUD
   - SpinKit
 
+EXTERNAL SOURCES:
+  CRToast:
+    :git: git@github.com:cruffenach/CRToast.git
+
 SPEC CHECKSUMS:
-  CRToast: 5be332fb9f4bcfd3023b6f10324ed9738c35cb96
-  FontAwesomeKit: 7d935e100337d503bdaefde2ea16be740b81ed13
-  MBProgressHUD: 2bbc6f470111daf7f3eaa4eb12b8cbf01c4c0622
-  SpinKit: c7490233be81d8daf41da05dc463351423658aad
+  CRToast: da11d94a05b1351a87bb26cbf8f25e80ed2e7115
+  FontAwesomeKit: 2e37bec52edbb8f8044a487734ba63eb320a2665
+  MBProgressHUD: c356980b0cd097f19acec959b49dca5eb8ec31be
+  SpinKit: 563a00196a87d789b16e3592265f0dfa9c3fb9db
 
-COCOAPODS: 0.29.0
+COCOAPODS: 0.33.1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-hybrid
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Jens Balvig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-01 00:00:00.000000000 Z
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bubble-wrap
@@ -212,7 +212,8 @@ files:
 - resources/web/ratchet-theme-ios.css
 - resources/web/ratchet.css
 - resources/web/refreshable.html
-- spec/basic_routes_spec.rb
+- spec/functional/basic_routes_spec.rb
+- spec/unit/navigatable_spec.rb
 - vendor/Podfile.lock
 homepage: https://github.com/balvig/motion-hybrid
 licenses:
@@ -239,4 +240,5 @@ signing_key:
 specification_version: 4
 summary: RubyMotion framework for easily making hybrid webview-centric iOS apps
 test_files:
-- spec/basic_routes_spec.rb
+- spec/functional/basic_routes_spec.rb
+- spec/unit/navigatable_spec.rb