motion-hybrid 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a5debbc27413f3816739686e3725174437fb193
-  data.tar.gz: c39c42c2fc5cf0a45e7e434e7760c7307d9984bf
+  metadata.gz: 1166d97948ca1aab9c9d25fd3ad29a7246a9765c
+  data.tar.gz: 1354f01d5146006199177ca31b5085dcb2c80a80
 SHA512:
-  metadata.gz: c8a7379aa14f3b508daa08db838c0034af3608ee8ad4f2f4a2c2ebcd0122b61081a8a457f20ae8557e8d3e554c601ef6119901832460e13e68521f151811565f
-  data.tar.gz: b50b94de5d4897d29b46b5e34e7bdf9d07f8d56488d80bfc9e20862baf9a4ebe37a4a262b4dc36ef17c29849bc00c5f644c8ba530cb95df67208a5e414c6f07e
+  metadata.gz: 6e023a1082b61452efc640041812eb0f6736e627b5df879153731f008e3275881239c54ee6440c9bc6480e4887c5f44bf07d011e6c2a21dc8e569f4c06aeb025
+  data.tar.gz: 53cdaa93fe775e2c046405c44a0cb9016cbeac3a3775b59d232fbac0f393482d853763ed2fd25dd194829dda83f57f8d397a2c9f49e3b5b5bcfeafea4949976b

data/README.md

@@ -29,17 +29,13 @@ class BaseScreen < MotionHybrid::Screen
 end
 ```
 
-Instantiate one or more screens and set their paths:
+Instantiate a screen and set the initial path:
 
 ```ruby
 # app/app_delegate.rb
 class AppDelegate < PM::Delegate
   def on_load(app, options)
-    BaseScreen.sync_sessions do
-      @screen_1 = BaseScreen.new(nav_bar: true, path: '/balvig', tab_bar: { title: 'Balvig', icon: :users })
-      @screen_2 = BaseScreen.new(nav_bar: true, path: '/rubymotion', tab-bar: { title: 'Rubymotion', icon: :gear })
-      open_tab_bar @screen_1, @screen_2
-    end
+    open BaseScreen.new(nav_bar: true, path: '/balvig'
   end
 end
 ```
@@ -121,10 +117,10 @@ class BaseScreen < MotionHybrid::Screen
   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
+    App.delegate.register_for_push_notifications :badge, :sound, :alert
   end
 end
 ```

data/app/app_delegate.rb

@@ -1,11 +1,6 @@
 class AppDelegate < PM::Delegate
   def on_load(app, options)
     return true if App.environment == 'test'
-
-    BaseScreen.sync_sessions do
-      @screen_1 = BaseScreen.new(nav_bar: true, path: '/index.html', tab_bar: { title: 'Welcome', icon: :users })
-      @screen_2 = BaseScreen.new(nav_bar: true, path: '/refreshable.html', tab_bar: { title: 'Refreshable', icon: :cog })
-      open_tab_bar @screen_1, @screen_2
-    end
+    open BaseScreen.new(nav_bar: true, path: '/index.html')
   end
 end

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

@@ -4,6 +4,12 @@ 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
@@ -26,7 +32,7 @@ module MotionHybrid
 
       # Modals are closed if they encounter the url from which they were spawned from
       route /.*/ do |request|
-        close_screen if presented_from?(request.url)
+        close if presented_from?(request.url)
       end
 
     end

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

@@ -41,20 +41,46 @@ module MotionHybrid
     end
 
     def set_buttons
-      set_nav_bar_left_button nil, system_item: UIBarButtonSystemItemStop, action: 'close_screen' if bridge.nav_bar_left_button.present?
-      set_nav_bar_right_button Icon.new(:cog, 18), action: 'on_nav_bar_right_button_click' if bridge.nav_bar_right_button.present?
+      set_button :left, bridge.nav_bar_buttons.left
+      set_button :right, bridge.nav_bar_buttons.right
     end
 
-    def on_nav_bar_right_button_click
-      if bridge.nav_bar_right_button.link
-        bridge.click(:nav_bar_right_button)
-      else
-        UIActionSheet.alert nil, buttons: bridge.nav_bar_right_button.options do |pressed, index|
-          bridge.click_child(:nav_bar_right_button, index)
+    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 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
     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
+      end
+    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 set_refresher
       if bridge.refreshable && !refresher
         self.refresher = UIRefreshControl.alloc.init

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

@@ -41,27 +41,26 @@ module MotionHybrid
       @url = current_url
       load_bridge
       reload_dependents if needs_reload?
-      end_transitions
+      stop_transitions
     end
 
     def load_failed(error)
       unless [102, -999].include?(error.code) #http://stackoverflow.com/questions/19487330/failed-to-load-webpage-error-nsurlerrordomain-error-999
-        end_transitions
-        show_error(error)
+        stop_transitions
+        on_error(error) if respond_to?(:on_error)
+        PM.logger.warn error
       end
     end
 
-    def close_screen
-      reload_dependents if needs_reload?
-      super
-    end
-
     def reset!
-      dismissViewControllerAnimated(false, completion: nil)
-      navigation_controller.popToRootViewControllerAnimated(false)
+      return_to_root
       load_initial_url
     end
 
+    def return_to_root
+      close_nav_screen(animated: false) if nav_bar?
+    end
+
     def on_request(nsurlrequest, type)
       process_request Request.new(nsurlrequest, type)
     end
@@ -71,10 +70,16 @@ module MotionHybrid
       process_request Request.new(self.class.request_for(new_path), UIWebViewNavigationTypeLinkClicked)
     end
 
+    # overrides Promotion method to set more sensible timeout default
+    def open_url(url)
+      url = url.is_a?(NSURL) ? url : NSURL.URLWithString(url)
+      request = NSURLRequest.requestWithURL(url, cachePolicy: NSURLRequestUseProtocolCachePolicy, timeoutInterval: 20)
+      web.loadRequest request
+    end
+
     private
 
     def process_request(request)
-      return dom_loaded && false if request.url == 'motionhybrid://ready'
       @needs_reload = true if request.http_method != 'GET'
 
       if router.process(request)
@@ -89,7 +94,9 @@ module MotionHybrid
       view_options = options.slice!(:hide_tab_bar)
       options[:modal] = view_options[:modal]
       view_options.reverse_merge!(url: url, modal: modal?, transition_style: transition_style)
-      open self.class.new(view_options), options
+      new_view = self.class.new(view_options)
+      open(new_view, options)
+      new_view
     end
 
     def load_initial_url
@@ -104,15 +111,7 @@ module MotionHybrid
       @router ||= Router.new(self)
     end
 
-    def show_error(error)
-      PM.logger.warn error
-      BW::UIAlertView.default(title: 'Could not connect', message: error.localizedDescription, buttons: ['Cancel', 'Try Again']) do |alert|
-        reset! if alert.clicked_button.index > 0
-      end.show
-    end
-
     module ClassMethods
-
       def url_for(path)
         "#{root_url}#{path}"
       end
@@ -132,6 +131,5 @@ module MotionHybrid
         end
       end
     end
-
   end
 end

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

@@ -0,0 +1,16 @@
+module MotionHybrid
+  module Releasable
+
+    def view_will_disappear(animated)
+      @should_release = !nav_bar? || !navigationController.viewControllers.include?(self)
+    end
+
+    def view_did_disappear(animated)
+      if @should_release
+        webview.removeFromSuperview
+        webview.release
+      end
+    end
+
+  end
+end

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

@@ -37,7 +37,7 @@ module MotionHybrid
     end
 
     def set_tab_bar_options
-      set_tab_bar_item title: @tab_bar[:title], icon: Icon.new(@tab_bar[:icon], 25) if @tab_bar
+      set_tab_bar_item title: @tab_bar[:title], icon: Icon.new(@tab_bar[:icon], 24) if @tab_bar
     end
 
     def remove_back_button_label

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

@@ -16,7 +16,7 @@ module MotionHybrid
       webview.scrollView.fade_out(duration: 0.2, opacity: 0.5)
     end
 
-    def end_transitions
+    def stop_transitions
       @loading = false
       refresher.endRefreshing if refresher
       spinner.hide

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

@@ -11,9 +11,10 @@ module MotionHybrid
 
     # Inefficient, but will do for now
     def dependents
-      dependents = all_views - [self]
-      dependents = dependents | [parent_screen] if parent_screen
-      dependents
+      #dependents = all_views - [self]
+      #dependents = dependents | parent_screens
+      #dependents
+      parent_screens
     end
 
     def all_views
@@ -24,5 +25,14 @@ module MotionHybrid
       @needs_reload
     end
 
+    def parent_screens
+      parent_screens = []
+      screen = self
+      while screen = screen.parent_screen
+        parent_screens << screen
+      end
+      parent_screens
+    end
+
   end
 end

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

@@ -12,9 +12,8 @@ module MotionHybrid
       js_api("clicked('#{target}')")
     end
 
-    def click_child(parent, child_index)
-      child_index = remap_index(child_index)
-      js_api("clicked('#{parent}', #{child_index})") if child_index > 0
+    def click_child(target, index)
+      js_api("clicked('#{target}', #{index})") if index > 0
     end
 
     private
@@ -31,15 +30,6 @@ module MotionHybrid
       bridge_hash.send(method)
     end
 
-    #  iOS button order and actual order of buttons on screen are not the same
-    def remap_index(index)
-      if index == nav_bar_right_button.options.length - 1
-        0
-      else
-        index + 1
-      end
-    end
-
     def js_api(command)
       @screen.evaluate("MotionHybrid.#{command};").to_s
     end

data/lib/motion-hybrid/screens/screen.rb

@@ -5,6 +5,7 @@ module MotionHybrid
     include Navigatable
     include BasicRoutes
     include Presentable
+    include Releasable
     include Styleable
     include Syncable
     include Transitionable

data/lib/motion-hybrid/version.rb

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

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

@@ -1,6 +1,7 @@
 module MotionHybrid
   class Icon
     def self.new(name, size, options = {})
+      name = name.underscore.camelize(:lower) # f.ex trash-o becomes trashO
       icon = FAKFontAwesome.send("#{name}IconWithSize", size)
       icon.addAttribute(NSForegroundColorAttributeName, value: options[:color]) if options[:color]
       icon.imageWithSize(CGSizeMake(size, size))

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

@@ -24,7 +24,7 @@ module MotionHybrid
     end
 
     def spin_animation
-      spin_animation = RTSpinKitView.alloc.initWithStyle(RTSpinKitViewStyleBounce, color: '#323667'.to_color) # TODO: Style from CSS
+      spin_animation = RTSpinKitView.alloc.initWithStyle(RTSpinKitViewStyleWanderingCubes, color: '#323667'.to_color) # TODO: Style from CSS
       spin_animation.startAnimating
       spin_animation
     end

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

@@ -5,17 +5,18 @@ module MotionHybrid
     def initialize(title, subtitle = nil)
       options = {
         'kCRToastTextKey' => title,
-        'kCRToastFontKey' => UIFont.boldSystemFontOfSize(15),
+        'kCRToastFontKey' => UIFont.systemFontOfSize(18),
         'kCRToastTextColorKey' => TEXT_COLOR,
         'kCRToastBackgroundColorKey' => BACKGROUND_COLOR,
-        'kCRToastSubtitleFontKey' => UIFont.boldSystemFontOfSize(15),
+        'kCRToastSubtitleFontKey' => UIFont.systemFontOfSize(13),
         'kCRToastSubtitleTextColorKey' => TEXT_COLOR,
         'kCRToastTextAlignmentKey' => NSTextAlignmentLeft,
         'kCRToastSubtitleTextAlignmentKey' => NSTextAlignmentLeft,
-        'kCRToastNotificationTypeKey' => CRToastTypeNavigationBar
+        'kCRToastNotificationTypeKey' => CRToastTypeNavigationBar,
+        'kCRToastImageKey' => Icon.new(:check, 20, color: TEXT_COLOR)
       }
 
-      options.merge!('kCRToastFontKey' => UIFont.systemFontOfSize(13), 'kCRToastSubtitleTextKey' => subtitle, 'kCRToastTimeIntervalKey' => 3) if subtitle.present?
+      options.merge!('kCRToastFontKey' => UIFont.boldSystemFontOfSize(17), 'kCRToastSubtitleTextKey' => subtitle, 'kCRToastTimeIntervalKey' => 5) if subtitle.present?
 
       CRToastManager.showNotificationWithOptions options, completionBlock: nil
     end

data/lib/motion-hybrid.rb

@@ -6,7 +6,6 @@ require 'motion-support'
 require 'ProMotion'
 require 'sugarcube-classic'
 
-
 Motion::Require.all(Dir.glob(File.expand_path('../motion-hybrid/**/*.rb', __FILE__)))
 
 Motion::Project::App.setup do |app|

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

@@ -5,20 +5,20 @@ class window.MotionHybrid
     params = {}
     params.title = bridge.find('h1').text()
     params.subtitle = bridge.find('h2').text()
-    params.nav_bar_left_button = parseButton bridge.find('#nav_bar_left_button')
-    params.nav_bar_right_button = parseButton bridge.find('#nav_bar_right_button')
     params.flash = parseFlash bridge.find('.flash')
+    params.nav_bar_buttons = {}
+    params.nav_bar_buttons.left = parseButton bridge.find('#nav_bar_left_button')
+    params.nav_bar_buttons.right = parseButton bridge.find('#nav_bar_right_button')
 
     params.refreshable = $('[data-refreshable]').length > 0
-
     JSON.stringify params
 
-  parseButton = (button) ->
-    { link: button.attr('href'), options: button.children().map(-> this.innerText).get() } if button.length
-
   parseFlash = (flash) ->
     { 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
+
   @clicked: (target, childIndex) ->
     target = $("##{target}")
     target = target.children() if childIndex

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

@@ -11,29 +11,32 @@
       params = {};
       params.title = bridge.find('h1').text();
       params.subtitle = bridge.find('h2').text();
-      params.nav_bar_left_button = parseButton(bridge.find('#nav_bar_left_button'));
-      params.nav_bar_right_button = parseButton(bridge.find('#nav_bar_right_button'));
       params.flash = parseFlash(bridge.find('.flash'));
+      params.nav_bar_buttons = {};
+      params.nav_bar_buttons.left = parseButton(bridge.find('#nav_bar_left_button'));
+      params.nav_bar_buttons.right = parseButton(bridge.find('#nav_bar_right_button'));
       params.refreshable = $('[data-refreshable]').length > 0;
       return JSON.stringify(params);
     };
 
-    parseButton = function(button) {
-      if (button.length) {
+    parseFlash = function(flash) {
+      if (flash.length) {
         return {
-          link: button.attr('href'),
-          options: button.children().map(function() {
-            return this.innerText;
-          }).get()
+          title: flash.find('h3').text() || flash.text().trim(),
+          subtitle: flash.find('p').text()
         };
       }
     };
 
-    parseFlash = function(flash) {
-      if (flash.length) {
+    parseButton = function(button) {
+      if (button.length) {
         return {
-          title: flash.find('h3').text() || flash.text().trim(),
-          subtitle: flash.find('p').text()
+          id: button.attr('id'),
+          link: button.attr('href'),
+          options: button.children().map(function() {
+            return this.innerText;
+          }).get(),
+          icon: button.data('icon')
         };
       }
     };

data/motion-hybrid.gemspec

@@ -26,8 +26,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'ProMotion'
   spec.add_dependency 'sugarcube'
 
-  spec.add_development_dependency "bundler", "~> 1.5"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency 'bundler', '~> 1.5'
+  spec.add_development_dependency 'rake'
   spec.add_development_dependency 'motion-redgreen'
   spec.add_development_dependency 'webstub'
 end

data/resources/web/index.html

@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-
     <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no, target-densityDpi=device-dpi" />
     <link href="default.css" media="all" rel="stylesheet" />
     <link href="ratchet.css" media="all" rel="stylesheet" />

data/resources/web/index_2.html

@@ -13,7 +13,7 @@
   <body>
     <div id="motion_hybrid_bridge">
       <h1>Page 2</h1>
-      <div id="nav_bar_right_button">
+      <div id="nav_bar_right_button" data-icon='trash-o'>
         <a href="#">Cancel</a>
         <a href="#">Delete</a>
         <a href="index_3.html#self">Page with alert</a>

data/spec/basic_routes_spec.rb

@@ -61,20 +61,6 @@ describe 'MotionHybrid::BasicRoutes' do
     end
   end
 
-  #it "#hide_tab_bar link" do
-    #stub_request(:get, "http://github.com/").to_return(body: '<a href="/page_2#hide_tab_bar" id="link">To page 2</a>')
-    #stub_request(:get, "http://github.com/page_2#hide_tab_bar").to_return(body: 'This is page 2')
-
-    #wait 0.6 do
-      #@screen.evaluate('document.getElementById("link").click();')
-      #wait 0.6 do
-        #@screen.navigationController.viewControllers.count.should == 2
-        #@screen.navigationController.viewControllers.last.html.include?('This is page 2').should == true
-      #end
-    #end
-  #end
-  #
-  #
   def current_view
     top_view = @screen.navigationController.topViewController
     top_view.presentedViewController.nil? ? top_view : top_view.presentedViewController.viewControllers.last

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-hybrid
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Jens Balvig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bubble-wrap
@@ -183,6 +183,7 @@ files:
 - lib/motion-hybrid/concerns/bridgeable.rb
 - lib/motion-hybrid/concerns/navigatable.rb
 - lib/motion-hybrid/concerns/presentable.rb
+- lib/motion-hybrid/concerns/releasable.rb
 - lib/motion-hybrid/concerns/styleable.rb
 - lib/motion-hybrid/concerns/syncable.rb
 - lib/motion-hybrid/concerns/transitionable.rb