RubyApp 0.5.38 → 0.5.39

data/lib/ruby_app/elements/mobile/default/features/swipe_page.rb

@@ -22,7 +22,7 @@ module RubyApp
               @back_button = RubyApp::Elements::Mobile::Navigation::BackButton.new
 
               self.swiped do |element, event|
-                RubyApp::Elements::Mobile::Default::Features::NavigatedPage.new.show(event, :transition => 'slide', :reverse => event.is_a?(RubyApp::Elements::Mobile::Page::SwipedRightEvent) ? true : false)
+                RubyApp::Elements::Mobile::Default::Features::NavigatedPage.new.show(event, :reverse => event.is_a?(RubyApp::Elements::Mobile::Page::SwipedRightEvent) ? true : false)
               end
 
             end

data/lib/ruby_app/elements/mobile/default/features/trigger_page.rb

@@ -20,9 +20,9 @@ module RubyApp
               @back_button = RubyApp::Elements::Mobile::Navigation::BackButton.new
 
               self.shown do |element, event|
-                event.create_trigger(self, 2)
+                event.create_trigger(self, 1)
               end
-              self.before_hidden do |element, event|
+              self.hidden do |element, event|
                 event.destroy_trigger(self)
               end
 

data/lib/ruby_app/elements/mobile/dialog.js.haml

@@ -2,10 +2,10 @@
   // #{__FILE__}
   $(document).ready( function() {
     $(document).on('pageshow', 'div[data-role="dialog"]', function(event) {
-      RubyApp.queueEvent({_class:'RubyApp::Elements::Mobile::Dialog::ShownEvent', source:$(this).attr('id')});
+      RubyApp.sendEvent({_class:'RubyApp::Elements::Mobile::Dialog::ShownEvent', source:$(this).attr('id')});
     });
     $(document).on('pagehide', 'div[data-role="dialog"]', function(event) {
-      RubyApp.queueEvent({_class:'RubyApp::Elements::Mobile::Dialog::HiddenEvent', source:$(this).attr('id')});
+      RubyApp.sendEvent({_class:'RubyApp::Elements::Mobile::Dialog::HiddenEvent', source:$(this).attr('id')});
     });
   });
 = yield

data/lib/ruby_app/elements/mobile/dialog.rb

@@ -19,7 +19,7 @@ module RubyApp
         def self.show(event, dialog, options = {})
           dialog.show(event, options)
           if block_given?
-            dialog.hidden do |element, _event|
+            dialog.removed do |element, _event|
               yield _event, dialog.response
             end
           end

data/lib/ruby_app/elements/mobile/dialogs/acknowledgement_dialog.rb

@@ -22,7 +22,6 @@ module RubyApp
             @ok_link = RubyApp::Elements::Mobile::Dialogs::ResponseDialog::CloseLink.new
             @ok_link.clicked do |element, event|
               @response = true
-              self.hide(event, element.options)
             end
 
           end

data/lib/ruby_app/elements/mobile/dialogs/calendars/month_dialog.rb

@@ -20,6 +20,11 @@ module RubyApp
             def initialize(today = Date.today, value = Date.today)
               super()
 
+              @today_link = RubyApp::Elements::Mobile::Dialogs::ResponseDialog::CloseLink.new
+              @today_link.clicked do |element, event|
+                @response = today
+              end
+
               @month = RubyApp::Elements::Mobile::Calendars::Month.new(today, value)
               @month.changed do |element, event|
                 @response = @month.value
@@ -31,24 +36,18 @@ module RubyApp
                                                'data-iconpos' => 'left',
                                                'data-inline'  => 'true')
               @previous_link.clicked do |element, event|
-                @month.move_previous(event)
+                @month.move_previous!(event)
                 event.update_text('div[data-role="header"] h1', RubyApp::Language.locale.strftime(@month.display, '%b %Y'))
                 event.update_text("##{@previous_link.element_id} span.ui-btn-text", RubyApp::Language.locale.strftime(@month.display << 1, '%b'))
                 event.update_text("##{@next_link.element_id} span.ui-btn-text", RubyApp::Language.locale.strftime(@month.display >> 1, '%b'))
               end
 
-              @today_link = RubyApp::Elements::Mobile::Dialogs::ResponseDialog::CloseLink.new
-              @today_link.clicked do |element, event|
-                @response = today
-                self.hide(event, element.options)
-              end
-
               @next_link = RubyApp::Elements::Mobile::Button.new
               @next_link.attributes.merge!('data-icon'    => 'arrow-r',
                                            'data-iconpos' => 'right',
                                            'data-inline'  => 'true')
               @next_link.clicked do |element, event|
-                @month.move_next(event)
+                @month.move_next!(event)
                 event.update_text('div[data-role="header"] h1', RubyApp::Language.locale.strftime(@month.display, '%b %Y'))
                 event.update_text("##{@previous_link.element_id} span.ui-btn-text", RubyApp::Language.locale.strftime(@month.display << 1, '%b'))
                 event.update_text("##{@next_link.element_id} span.ui-btn-text", RubyApp::Language.locale.strftime(@month.display >> 1, '%b'))

data/lib/ruby_app/elements/mobile/dialogs/confirmation_dialog.rb

@@ -20,13 +20,11 @@ module RubyApp
             @yes_link = RubyApp::Elements::Mobile::Dialogs::ResponseDialog::CloseLink.new
             @yes_link.clicked do |element, event|
               @response = true
-              self.hide(event, element.options)
             end
 
             @no_link = RubyApp::Elements::Mobile::Dialogs::ResponseDialog::CloseLink.new
             @no_link.clicked do |element, event|
               @response = false
-              self.hide(event, element.options)
             end
 
           end

data/lib/ruby_app/elements/mobile/dialogs/exception_dialog.rb

@@ -17,9 +17,6 @@ module RubyApp
             @exception = exception
 
             @close_link = RubyApp::Elements::Mobile::Dialogs::ResponseDialog::CloseLink.new
-            @close_link.clicked do |element, event|
-              self.hide(event, element.options)
-            end
 
           end
 

data/lib/ruby_app/elements/mobile/dialogs/response_dialog.rb

@@ -17,7 +17,7 @@ module RubyApp
             def initialize
               super
               self.attributes.merge!('data-inline' => 'true')
-              self.options.merge!(:transition => 'pop')
+              self.options.merge!(:transition => 'none')
             end
 
           end

data/lib/ruby_app/elements/mobile/document.js.haml

@@ -1,21 +1,23 @@
 :plain
   // #{__FILE__}
   var RubyApp = new function() {
-    this.queueEvent = function(event) {
+    this.sendEvent = function(event) {
+      // RubyApp.log('ENQUEUE event.class=' + event._class);
       event.now = new Date().toString();
       event.session = RubyApp.getData('session', null);
       $(window).queue( function() {
-        RubyApp.log('RubyApp.queueEvent(...)    DEQUEUE event.class=' + event._class);
+        // RubyApp.log('DEQUEUE event.class=' + event._class);
         request = $.ajax({type:'POST', url:location.href, data:event});
         request
           .success( function(event) {
             $.each(event.statements, function(index, statement) {
-              RubyApp.log('RubyApp.queueEvent(...)    EVAL    statement="' + statement + '"')
+              RubyApp.log('EVAL    ' + statement)
               eval(statement);
             } );
+            RubyApp.log('SUCCESS event.class=' + event._class);
           } )
           .error( function(request, message, exception) {
-            RubyApp.log('RubyApp.queueEvent(...)    ERROR   event.class=' + event._class +' message=' + message);
+            RubyApp.log('ERROR   event.class=' + event._class + ' message=' + message);
             RubyApp.confirmRefreshBrowser(RubyApp.getData('error_message', null));
           } )
           .complete( function() {
@@ -24,61 +26,69 @@
       } );
     },
     this.showPage = function(id, options) {
-      $(window).clearQueue();
       if ($('#' + id).length)
         $.mobile.changePage($('#' + id), options);
       else
       {
-        RubyApp.log('RubyApp.showPage(...)      REQUEST id=' + id);
+        // RubyApp.log('ENQUEUE RubyApp.showPage("' + id + '", ...)');
+        $(window).queue( function() {
+          // RubyApp.log('DEQUEUE RubyApp.showPage("' + id + '", ...)');
+          $.mobile.showPageLoadingMsg();
+          request = $.ajax({type:'GET', url:'/' + RubyApp.getData('locale', 'en') + '/elements/' + id + '.html'});
+          request
+            .success( function(content) {
+              $('body').prepend(content);
+              $.mobile.changePage($('#' + id), options);
+              RubyApp.log('SUCCESS RubyApp.showPage("' + id + '", ...)');
+            } )
+            .error( function(request, message, exception) {
+              RubyApp.log('ERROR   RubyApp.showPage("' + id + '", ...) message=' + message);
+              RubyApp.confirmRefreshBrowser(RubyApp.getData('error_message', null));
+            } )
+            .complete( function() {
+              $.mobile.hidePageLoadingMsg();
+              $(window).dequeue();
+            } );
+        } );
+      }
+    },
+    this.removePage = function(id) {
+      $('#' + id).remove();
+    },
+    this.updateElement = function(id) {
+      // RubyApp.log('ENQUEUE RubyApp.updateElement("' + id + '")');
+      $(window).queue( function() {
+        // RubyApp.log('DEQUEUE RubyApp.updateElement("' + id + '")');
         $.mobile.showPageLoadingMsg();
         request = $.ajax({type:'GET', url:'/' + RubyApp.getData('locale', 'en') + '/elements/' + id + '.html'});
         request
           .success( function(content) {
-            $('body').prepend(content);
-            $.mobile.changePage($('#' + id), options);
+            $('#' + id).replaceWith(content);
+            $('#' + id).parent().trigger('create');
+            RubyApp.log('SUCCESS RubyApp.updateElement("' + id + '")');
           } )
           .error( function(request, message, exception) {
-            RubyApp.log('RubyApp.showPage(...)      ERROR  id=' + id +' message=' + message);
+            RubyApp.log('ERROR   RubyApp.updateElement("' + id + '") message=' + message);
             RubyApp.confirmRefreshBrowser(RubyApp.getData('error_message', null));
           } )
           .complete( function() {
             $.mobile.hidePageLoadingMsg();
+            $(window).dequeue();
           } );
-      }
-    },
-    this.removePage = function(id) {
-      $(document).on('pagehide.removePage', '#' + id, function(event) {
-        $(document).off('pagehide.removePage', '#' + id);
-        $(this).remove();
-      });
-    },
-    this.updateElement = function(id) {
-      RubyApp.log('RubyApp.updateElement(...) REQUEST id=' + id);
-      $.mobile.showPageLoadingMsg();
-      request = $.ajax({type:'GET', url:'/' + RubyApp.getData('locale', 'en') + '/elements/' + id + '.html'});
-      request
-        .success( function(content) {
-          $('#' + id).replaceWith(content);
-          $('#' + id).parent().trigger('create');
-        } )
-        .error( function(request, message, exception) {
-          RubyApp.log('RubyApp.showPage(...) ERROR  id=' + id +' message=' + message);
-          RubyApp.confirmRefreshBrowser(RubyApp.getData('error_message', null));
-        } )
-        .complete( function() {
-          $.mobile.hidePageLoadingMsg();
-        } );
+      } );
+      RubyApp.sendEvent({_class:'RubyApp::Element::UpdatedEvent', source:id});
     },
     this.createTrigger = function(id, interval) {
       RubyApp.destroyTrigger(id);
       $('#' + id)[0]._trigger = window.setInterval( function() {
-        RubyApp.queueEvent({_class:'RubyApp::Element::TriggeredEvent', source:id});
+        RubyApp.sendEvent({_class:'RubyApp::Element::TriggeredEvent', source:id});
       }, interval );
     },
     this.destroyTrigger = function(id) {
-      if ($('#' + id)[0]._trigger != undefined) {
+      if ($('#' + id)[0]._trigger) {
         window.clearInterval($('#' + id)[0]._trigger);
         $('#' + id)[0]._trigger = undefined;
+        RubyApp.log('SUCCESS RubyApp.destroyTrigger("' + id + '")');
       }
     },
     this.refreshBrowser = function() {
@@ -131,6 +141,9 @@
     this.assertExists = function(selector) {
       RubyApp.assert('selector=' + selector, $(selector).length > 0);
     },
+    this.assertNotExists = function(selector) {
+      RubyApp.assert('selector=' + selector, $(selector).length <= 0);
+    },
     this.assertExistsFor = function(selector) {
       var _for = $(selector).attr('for');
       RubyApp.assert('selector=' + selector + ', for=' + _for, $('#' + _for).length > 0);
@@ -141,7 +154,7 @@
       RubyApp.assert('selector=' + selector + ', for=' + _for + ', value=' + value, _value == value);
     },
     this.assert = function(name, value) {
-      RubyApp.queueEvent({_class:'RubyApp::Element::AssertedEvent', source:$('html').attr('id'), name:name, value:value});
+      RubyApp.sendEvent({_class:'RubyApp::Element::AssertedEvent', source:$('html').attr('id'), name:name, value:eval(value)});
     },
     this.getData = function(name, _default) {
       var value = $('meta[name="' + name + '"]').attr('content');
@@ -153,9 +166,9 @@
   };
 
   $(window).load(function() {
-    RubyApp.queueEvent({_class:'RubyApp::Elements::Mobile::Document::LoadedEvent', source:$('html').attr('id')});
+    RubyApp.sendEvent({_class:'RubyApp::Elements::Mobile::Document::LoadedEvent', source:$('html').attr('id')});
     if ($('div[data-role="page"]').length)
-      RubyApp.queueEvent({_class:'RubyApp::Elements::Mobile::Page::LoadedEvent', source:$('div[data-role="page"]').filter(':first').attr('id')});
+      RubyApp.sendEvent({_class:'RubyApp::Elements::Mobile::Page::LoadedEvent', source:$('div[data-role="page"]').filter(':first').attr('id')});
   });
 
 = yield

data/lib/ruby_app/elements/mobile/documents/mail_document.rb

@@ -11,6 +11,8 @@ module RubyApp
 
           template_path(:all, File.dirname(__FILE__))
 
+          exclude_parent_template(:all)
+
           def initialize
             super
           end

data/lib/ruby_app/elements/mobile/documents/quit_document.html.haml

@@ -2,3 +2,8 @@
 /
   #{__FILE__}
 %html{self.attributes}
+  %head
+    %script
+      :plain
+        // #{__FILE__}
+        location.assign('/');

data/lib/ruby_app/elements/mobile/input.js.haml

@@ -3,7 +3,7 @@
   $(document).ready( function() {
     $(document).on('change', 'input', function(event) {
       event.preventDefault();
-      RubyApp.queueEvent({_class:'RubyApp::Elements::Mobile::Input::ChangedEvent', source:$(this).attr('id'), value:$(this).val()});
+      RubyApp.sendEvent({_class:'RubyApp::Elements::Mobile::Input::ChangedEvent', source:$(this).attr('id'), value:$(this).val()});
     });
   });
 = yield

data/lib/ruby_app/elements/mobile/inputs/multiline_input.js.haml

@@ -3,7 +3,7 @@
   $(document).ready( function() {
     $(document).on('change', 'textarea', function(event) {
       event.preventDefault();
-      RubyApp.queueEvent({_class:'RubyApp::Elements::Mobile::Inputs::MultilineInput::ChangedEvent', source:$(this).attr('id'), value:$(this).val()});
+      RubyApp.sendEvent({_class:'RubyApp::Elements::Mobile::Inputs::MultilineInput::ChangedEvent', source:$(this).attr('id'), value:$(this).val()});
     });
   });
 = yield

data/lib/ruby_app/elements/mobile/inputs/toggle_input.js.haml

@@ -3,7 +3,7 @@
   $(document).ready( function() {
     $(document).on('change', 'select[data-role="slider"]', function(event) {
       event.preventDefault();
-      RubyApp.queueEvent({_class:'RubyApp::Elements::Mobile::Inputs::ToggleInput::ChangedEvent', source:$(this).attr('id'), value:$(this).val()});
+      RubyApp.sendEvent({_class:'RubyApp::Elements::Mobile::Inputs::ToggleInput::ChangedEvent', source:$(this).attr('id'), value:$(this).val()});
     });
   });
 = yield

data/lib/ruby_app/elements/mobile/list.js.haml

@@ -3,11 +3,11 @@
   $(document).ready( function() {
     $(document).on('tap', 'ul.list > li.item a.item', function(event) {
       event.preventDefault();
-      RubyApp.queueEvent({_class:'RubyApp::Elements::Mobile::List::ItemClickedEvent', source:$(this).parents('ul.list').attr('id'), item:$(this).parents('li.item').attr('id')});
+      RubyApp.sendEvent({_class:'RubyApp::Elements::Mobile::List::ItemClickedEvent', source:$(this).parents('ul.list').attr('id'), item:$(this).parents('li.item').attr('id')});
     });
     $(document).on('tap', 'ul.list > li.item a.link', function(event) {
       event.preventDefault();
-      RubyApp.queueEvent({_class:'RubyApp::Elements::Mobile::List::LinkClickedEvent', source:$(this).parents('ul.list').attr('id'), item:$(this).parents('li.item').attr('id')});
+      RubyApp.sendEvent({_class:'RubyApp::Elements::Mobile::List::LinkClickedEvent', source:$(this).parents('ul.list').attr('id'), item:$(this).parents('li.item').attr('id')});
     });
   });
 = yield

data/lib/ruby_app/elements/mobile/navigation/navigation_link.rb

@@ -19,7 +19,7 @@ module RubyApp
           end
 
           def self.default_options
-            return {:transition => 'slide'}
+            return {:transition => 'none'}
           end
 
         end

data/lib/ruby_app/elements/mobile/page.html.haml

@@ -1,2 +1,2 @@
-%div{self.attributes}
+%div.page{self.attributes}
   = yield :page

data/lib/ruby_app/elements/mobile/page.js.haml

@@ -2,19 +2,16 @@
   // #{__FILE__}
   $(document).ready( function() {
     $(document).on('pageshow', 'div[data-role="page"]', function(event) {
-      RubyApp.queueEvent({_class:'RubyApp::Elements::Mobile::Page::ShownEvent', source:$(this).attr('id')});
-    });
-    $(document).on('pagebeforehide', 'div[data-role="page"]', function(event) {
-      RubyApp.queueEvent({_class:'RubyApp::Elements::Mobile::Page::BeforeHiddenEvent', source:$(this).attr('id')});
+      RubyApp.sendEvent({_class:'RubyApp::Elements::Mobile::Page::ShownEvent', source:$(this).attr('id')});
     });
     $(document).on('pagehide', 'div[data-role="page"]', function(event) {
-      RubyApp.queueEvent({_class:'RubyApp::Elements::Mobile::Page::HiddenEvent', source:$(this).attr('id')});
+      RubyApp.sendEvent({_class:'RubyApp::Elements::Mobile::Page::HiddenEvent', source:$(this).attr('id')});
     });
     $(document).on('swipeleft', 'div[data-role="page"]', function(event) {
-      RubyApp.queueEvent({_class:'RubyApp::Elements::Mobile::Page::SwipedLeftEvent', source:$(this).attr('id')});
+      RubyApp.sendEvent({_class:'RubyApp::Elements::Mobile::Page::SwipedLeftEvent', source:$(this).attr('id')});
     });
     $(document).on('swiperight', 'div[data-role="page"]', function(event) {
-      RubyApp.queueEvent({_class:'RubyApp::Elements::Mobile::Page::SwipedRightEvent', source:$(this).attr('id')});
+      RubyApp.sendEvent({_class:'RubyApp::Elements::Mobile::Page::SwipedRightEvent', source:$(this).attr('id')});
     });
   });
 = yield

data/lib/ruby_app/elements/mobile/page.rb

@@ -28,14 +28,6 @@ module RubyApp
 
         end
 
-        class BeforeHiddenEvent < RubyApp::Element::Event
-
-          def initialize(data)
-            super(data)
-          end
-
-        end
-
         class HiddenEvent < RubyApp::Element::Event
 
           def initialize(data)
@@ -88,9 +80,8 @@ module RubyApp
 
         event :loaded
         event :shown
-        event :before_hidden
         event :hidden
-        event :unloaded
+        event :removed
         event :swiped
 
         def initialize
@@ -100,11 +91,10 @@ module RubyApp
 
         def show(event, options = {})
           RubyApp::Session.document.pages.push(self)
-          event.show_page(self, options)
+          event.show_page(RubyApp::Session.document.pages.last, options)
         end
 
         def hide(event, options = {})
-          event.remove_page(self)
           event.show_page(RubyApp::Session.document.pages.second_last, options)
         end
 
@@ -113,7 +103,6 @@ module RubyApp
           def on_event(event)
             on_loaded(event) if event.is_a?(RubyApp::Elements::Mobile::Page::LoadedEvent)
             on_shown(event) if event.is_a?(RubyApp::Elements::Mobile::Page::ShownEvent)
-            on_before_hidden(event) if event.is_a?(RubyApp::Elements::Mobile::Page::BeforeHiddenEvent)
             on_hidden(event) if event.is_a?(RubyApp::Elements::Mobile::Page::HiddenEvent)
             on_swiped(event) if event.is_a?(RubyApp::Elements::Mobile::Page::SwipedEvent)
             super(event)
@@ -127,16 +116,13 @@ module RubyApp
             shown(event)
           end
 
-          def on_before_hidden(event)
-            before_hidden(event)
-          end
-
           def on_hidden(event)
+            hidden(event)
             if RubyApp::Session.document.pages.last == self
               RubyApp::Session.document.pages.pop
-              unloaded(event)
+              removed(event)
+              event.remove_page(self)
             end
-            hidden(event)
           end
 
           def on_swiped(event)