RubyApp 0.5.38 → 0.5.39

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    RubyApp (0.5.38)
+    RubyApp (0.5.39)
       BlueCloth
       chronic
       chronic_duration
@@ -29,8 +29,8 @@ GEM
     facets (2.9.3)
     fileutils (0.7)
       rmagick (>= 2.13.1)
-    haml (3.1.4)
-    json (1.6.6)
+    haml (3.1.6)
+    json (1.7.3)
     mime-types (1.18)
     numerizer (0.1.1)
     r18n-core (0.4.14)
@@ -39,7 +39,7 @@ GEM
     rmagick (2.13.1)
     ruby-event (1.0.0)
     ruby-openid (2.1.8)
-    sass (3.1.15)
+    sass (3.1.19)
     term-ansicolor (1.0.7)
     terminal-table (1.4.5)
     yajl-ruby (1.1.0)

data/lib/ruby_app/configuration.yml

@@ -23,7 +23,7 @@ default:
       _class: 'RubyApp::Session'
       expires: 1200
       interval: 15
-      length: 4
+      _length: 10
       scripts:
         enabled: true
         path: '#{RubyApp::ROOT}/scripts'

data/lib/ruby_app/element.rb

@@ -61,6 +61,10 @@ module RubyApp
         self.execute("RubyApp.confirmRefreshBrowser(#{message.to_json});")
       end
 
+      def send_message(element, message = nil)
+        self.execute("RubyApp.sendEvent({_class:'RubyApp::Element::MessagedEvent', source:#{element.element_id.to_json}, message:#{message.to_json}});")
+      end
+
       def show_page(page, options = {})
         options.merge!(:changeHash => false)
         self.execute("RubyApp.showPage(#{page.element_id.to_json}, #{options.to_json});")
@@ -153,6 +157,10 @@ module RubyApp
         self.assert_exists_selector("*:contains('#{text}')")
       end
 
+      def assert_not_exists_text(text)
+        self.assert_not_exists_selector("*:contains('#{text}')")
+      end
+
       def assert_exists_link(text)
         self.assert_exists_selector("a:contains('#{text}')")
       end
@@ -162,6 +170,11 @@ module RubyApp
         self.execute("RubyApp.assertExists(#{_selector.to_json});")
       end
 
+      def assert_not_exists_selector(selector)
+        _selector = ".ui-page-active #{selector}"
+        self.execute("RubyApp.assertNotExists(#{_selector.to_json});")
+      end
+
       def assert_exists_input(text, value = nil)
         self.assert_exists_selector_for("label:contains('#{text}')") unless value
         self.assert_exists_selector_value_for("label:contains('#{text}')", value) if value
@@ -177,12 +190,21 @@ module RubyApp
         self.execute("RubyApp.assertExistsValueFor(#{_selector.to_json}, #{value.to_json});")
       end
 
+      def assert(name, expression = nil)
+        self.execute("RubyApp.assert(#{name.to_json}, #{(expression ? expression : yield).to_json});")
+      end
+
       def log(message)
         self.execute("RubyApp.log(#{message.to_json});")
       end
 
-      def execute(statement)
-        @statements << statement
+      def execute(statement = nil)
+        if statement
+          @statements << statement
+        else
+          yield if block_given?
+          self.execute("RubyApp.sendEvent({_class:'RubyApp::Element::ExecutedEvent', source:$('html').attr('id')});")
+        end
       end
 
       def to_hash
@@ -200,7 +222,7 @@ module RubyApp
 
     end
 
-    class TriggeredEvent < RubyApp::Element::Event
+    class ExecutedEvent < RubyApp::Element::Event
 
       def initialize(data)
         super(data)
@@ -221,6 +243,33 @@ module RubyApp
 
     end
 
+    class MessagedEvent < RubyApp::Element::Event
+
+      attr_reader :message
+
+      def initialize(data)
+        super(data)
+        @message = data['message']
+      end
+
+    end
+
+    class UpdatedEvent < RubyApp::Element::Event
+
+      def initialize(data)
+        super(data)
+      end
+
+    end
+
+    class TriggeredEvent < RubyApp::Element::Event
+
+      def initialize(data)
+        super(data)
+      end
+
+    end
+
     class ExceptionEvent < RubyApp::Element::Event
 
       def initialize(exception)
@@ -235,8 +284,10 @@ module RubyApp
     attr_reader :attributes
 
     event :evented
-    event :triggered
     event :asserted
+    event :messaged
+    event :updated
+    event :triggered
 
     def initialize
       @attributes = {'id' => self.element_id}
@@ -254,20 +305,30 @@ module RubyApp
     protected
 
       def on_event(event)
-        on_triggered(event) if event.is_a?(RubyApp::Element::TriggeredEvent)
         on_asserted(event) if event.is_a?(RubyApp::Element::AssertedEvent)
+        on_messaged(event) if event.is_a?(RubyApp::Element::MessagedEvent)
+        on_updated(event) if event.is_a?(RubyApp::Element::UpdatedEvent)
+        on_triggered(event) if event.is_a?(RubyApp::Element::TriggeredEvent)
         evented(event)
       end
 
-      def on_triggered(event)
-        triggered(event)
-      end
-
       def on_asserted(event)
         raise RubyApp::Exceptions::AssertFailedException.new(event.name) unless event.value
         asserted(event)
       end
 
+      def on_messaged(event)
+        messaged(event)
+      end
+
+      def on_updated(event)
+        updated(event)
+      end
+
+      def on_triggered(event)
+        triggered(event)
+      end
+
   end
 
 end

data/lib/ruby_app/elements/mobile/calendars/month.js.haml

@@ -3,7 +3,7 @@
   $(document).ready( function() {
     $(document).on('tap', 'div.month a.date', function(event) {
       event.preventDefault();
-      RubyApp.queueEvent({_class:'RubyApp::Elements::Mobile::Calendars::Month::ChangedEvent', source:$(this).parents('div.month').attr('id'), value:$(this).attr('data-value')});
+      RubyApp.sendEvent({_class:'RubyApp::Elements::Mobile::Calendars::Month::ChangedEvent', source:$(this).parents('div.month').attr('id'), value:$(this).attr('data-value')});
     });
   });
 = yield

data/lib/ruby_app/elements/mobile/calendars/month.rb

@@ -44,12 +44,12 @@ module RubyApp
             @display = @value
           end
 
-          def move_previous(event)
+          def move_previous!(event)
             @display = @display << 1
             event.update_element(self)
           end
 
-          def move_next(event)
+          def move_next!(event)
             @display = @display >> 1
             event.update_element(self)
           end

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

@@ -3,7 +3,7 @@
   $(document).ready( function() {
     $(document).on('tap', '.click', function(event) {
       event.preventDefault();
-      RubyApp.queueEvent({_class:'RubyApp::Elements::Mobile::Click::ClickedEvent', source:$(this).attr('id')});
+      RubyApp.sendEvent({_class:'RubyApp::Elements::Mobile::Click::ClickedEvent', source:$(this).attr('id')});
     });
   });
 = yield

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

@@ -23,7 +23,7 @@ module RubyApp
 
               @button_link = RubyApp::Elements::Mobile::Button.new
               @button_link.clicked do |element, event|
-                RubyApp::Elements::Mobile::Default::Features::NavigatedPage.new.show(event, :transition => 'slide')
+                RubyApp::Elements::Mobile::Default::Features::NavigatedPage.new.show(event)
               end
 
             end

data/lib/ruby_app/elements/mobile/default/features/calendars/month_page.rb

@@ -26,7 +26,7 @@ module RubyApp
 
                 @month = RubyApp::Elements::Mobile::Calendars::Month.new(Date.today, Date.today << 1)
                 @month.changed do |element, event|
-                  RubyApp::Elements::Mobile::Dialog.show(event, RubyApp::Elements::Mobile::Dialogs::AcknowledgementDialog.new('Month', "You selected day #{@month.value.day}."), :transition => 'pop')
+                  RubyApp::Elements::Mobile::Dialog.show(event, RubyApp::Elements::Mobile::Dialogs::AcknowledgementDialog.new('Month', "You selected day #{@month.value.day}."))
                 end
 
               end

data/lib/ruby_app/elements/mobile/default/features/default_page.css.haml

@@ -3,10 +3,11 @@
 = RubyApp::Elements::Mobile::Default::Features::Calendars::DefaultPage.render(:css)
 = RubyApp::Elements::Mobile::Default::Features::DialogsPage.render(:css)
 = RubyApp::Elements::Mobile::Default::Features::InputsPage.render(:css)
+= RubyApp::Elements::Mobile::Default::Features::ListsPage.render(:css)
+= RubyApp::Elements::Mobile::Default::Features::MessagePage.render(:css)
 = RubyApp::Elements::Mobile::Default::Features::Navigation::DefaultPage.render(:css)
 = RubyApp::Elements::Mobile::Default::Features::SwipePage.render(:css)
 = RubyApp::Elements::Mobile::Default::Features::TriggerPage.render(:css)
-= RubyApp::Elements::Mobile::Default::Features::ListsPage.render(:css)
 = RubyApp::Elements::Mobile::Navigation::PageButton.render(:css)
 = RubyApp::Elements::Mobile::Navigation::BackButton.render(:css)
 = yield

data/lib/ruby_app/elements/mobile/default/features/default_page.html.haml

@@ -19,6 +19,8 @@
         - element.content_for(:html, :link, 'Inputs')
       = @lists_link.render(:html) do |element|
         - element.content_for(:html, :link, 'Lists')
+      = @message_link.render(:html) do |element|
+        - element.content_for(:html, :link, 'Message')
       = @navigation_link.render(:html) do |element|
         - element.content_for(:html, :link, 'Navigation')
       = @swipe_link.render(:html) do |element|

data/lib/ruby_app/elements/mobile/default/features/default_page.js.haml

@@ -3,10 +3,11 @@
 = RubyApp::Elements::Mobile::Default::Features::Calendars::DefaultPage.render(:js)
 = RubyApp::Elements::Mobile::Default::Features::DialogsPage.render(:js)
 = RubyApp::Elements::Mobile::Default::Features::InputsPage.render(:js)
+= RubyApp::Elements::Mobile::Default::Features::ListsPage.render(:js)
+= RubyApp::Elements::Mobile::Default::Features::MessagePage.render(:js)
 = RubyApp::Elements::Mobile::Default::Features::Navigation::DefaultPage.render(:js)
 = RubyApp::Elements::Mobile::Default::Features::SwipePage.render(:js)
 = RubyApp::Elements::Mobile::Default::Features::TriggerPage.render(:js)
-= RubyApp::Elements::Mobile::Default::Features::ListsPage.render(:js)
 = RubyApp::Elements::Mobile::Navigation::PageButton.render(:js)
 = RubyApp::Elements::Mobile::Navigation::BackButton.render(:js)
 = yield

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

@@ -12,10 +12,11 @@ module RubyApp
           require 'ruby_app/elements/mobile/default/features/calendars/default_page'
           require 'ruby_app/elements/mobile/default/features/dialogs_page'
           require 'ruby_app/elements/mobile/default/features/inputs_page'
+          require 'ruby_app/elements/mobile/default/features/lists_page'
+          require 'ruby_app/elements/mobile/default/features/message_page'
           require 'ruby_app/elements/mobile/default/features/navigation/default_page'
           require 'ruby_app/elements/mobile/default/features/swipe_page'
           require 'ruby_app/elements/mobile/default/features/trigger_page'
-          require 'ruby_app/elements/mobile/default/features/lists_page'
           require 'ruby_app/elements/mobile/navigation/back_button'
           require 'ruby_app/elements/mobile/navigation/page_button'
           require 'ruby_app/elements/mobile/page'
@@ -47,6 +48,9 @@ module RubyApp
               @lists_link = RubyApp::Elements::Mobile::Navigation::PageButton.new
               @lists_link.page = RubyApp::Elements::Mobile::Default::Features::ListsPage
 
+              @message_link = RubyApp::Elements::Mobile::Navigation::PageButton.new
+              @message_link.page = RubyApp::Elements::Mobile::Default::Features::MessagePage
+
               @navigation_link = RubyApp::Elements::Mobile::Navigation::PageButton.new
               @navigation_link.page = RubyApp::Elements::Mobile::Default::Features::Navigation::DefaultPage
 

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

@@ -28,27 +28,27 @@ module RubyApp
 
               @acknowledgement_link = RubyApp::Elements::Mobile::Button.new
               @acknowledgement_link.clicked do |element, event|
-                RubyApp::Elements::Mobile::Dialog.show(event, RubyApp::Elements::Mobile::Dialogs::AcknowledgementDialog.new('Acknowledgement', 'Acknowledge this.'), :transition => 'pop')
+                RubyApp::Elements::Mobile::Dialog.show(event, RubyApp::Elements::Mobile::Dialogs::AcknowledgementDialog.new('Acknowledgement', 'Acknowledge this.'))
               end
 
               @confirmation_link = RubyApp::Elements::Mobile::Button.new
               @confirmation_link.clicked do |element, event|
-                RubyApp::Elements::Mobile::Dialog.show(event, RubyApp::Elements::Mobile::Dialogs::ConfirmationDialog.new('Confirmation', 'Do you confirm this?'), :transition => 'pop') do |_event, response|
-                  RubyApp::Elements::Mobile::Dialog.show(_event, RubyApp::Elements::Mobile::Dialogs::AcknowledgementDialog.new('Acknowledgement', "You responded #{response.inspect}."), :transition => 'pop')
+                RubyApp::Elements::Mobile::Dialog.show(event, RubyApp::Elements::Mobile::Dialogs::ConfirmationDialog.new('Confirmation', 'Do you confirm this?')) do |_event, response|
+                  RubyApp::Elements::Mobile::Dialog.show(_event, RubyApp::Elements::Mobile::Dialogs::AcknowledgementDialog.new('Acknowledgement', "You responded #{response.inspect}."))
                 end
               end
 
               @exception_link = RubyApp::Elements::Mobile::Button.new
               @exception_link.clicked do |element, event|
-                RubyApp::Elements::Mobile::Dialogs::ExceptionDialog.show_on_exception(event, :transition => 'pop') do
+                RubyApp::Elements::Mobile::Dialogs::ExceptionDialog.show_on_exception(event) do
                   raise 'This is an exception.'
                 end
               end
 
               @month_link = RubyApp::Elements::Mobile::Button.new
               @month_link.clicked do |element, event|
-                RubyApp::Elements::Mobile::Dialog.show(event, RubyApp::Elements::Mobile::Dialogs::Calendars::MonthDialog.new(event.today, event.today << 1), :transition => 'pop') do |_event, response|
-                  RubyApp::Elements::Mobile::Dialog.show(_event, RubyApp::Elements::Mobile::Dialogs::AcknowledgementDialog.new('Acknowledgement', "You responded day #{response.day}."), :transition => 'pop')
+                RubyApp::Elements::Mobile::Dialog.show(event, RubyApp::Elements::Mobile::Dialogs::Calendars::MonthDialog.new(event.today, event.today << 1)) do |_event, response|
+                  RubyApp::Elements::Mobile::Dialog.show(_event, RubyApp::Elements::Mobile::Dialogs::AcknowledgementDialog.new('Acknowledgement', "You responded day #{response.day}."))
                 end
               end
 

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

@@ -27,32 +27,32 @@ module RubyApp
 
               @simple_input = RubyApp::Elements::Mobile::Input.new
               @simple_input.changed do |element, event|
-                RubyApp::Elements::Mobile::Dialog.show(event, RubyApp::Elements::Mobile::Dialogs::AcknowledgementDialog.new('Simple Input', "You input #{@simple_input.value}."), :transition => 'pop')
+                RubyApp::Elements::Mobile::Dialog.show(event, RubyApp::Elements::Mobile::Dialogs::AcknowledgementDialog.new('Simple Input', "You input #{@simple_input.value}."))
               end
 
               @date_input = RubyApp::Elements::Mobile::Inputs::DateInput.new
               @date_input.changed do |element, event|
-                RubyApp::Elements::Mobile::Dialog.show(event, RubyApp::Elements::Mobile::Dialogs::AcknowledgementDialog.new('Date Input', "You input #{@date_input.value}."), :transition => 'pop')
+                RubyApp::Elements::Mobile::Dialog.show(event, RubyApp::Elements::Mobile::Dialogs::AcknowledgementDialog.new('Date Input', "You input #{@date_input.value}."))
               end
 
               @duration_input = RubyApp::Elements::Mobile::Inputs::DurationInput.new
               @duration_input.changed do |element, event|
-                RubyApp::Elements::Mobile::Dialog.show(event, RubyApp::Elements::Mobile::Dialogs::AcknowledgementDialog.new('Duration Input', "You input #{@duration_input.duration}."), :transition => 'pop')
+                RubyApp::Elements::Mobile::Dialog.show(event, RubyApp::Elements::Mobile::Dialogs::AcknowledgementDialog.new('Duration Input', "You input #{@duration_input.duration}."))
               end
 
               @email_input = RubyApp::Elements::Mobile::Inputs::EmailInput.new
               @email_input.changed do |element, event|
-                RubyApp::Elements::Mobile::Dialog.show(event, RubyApp::Elements::Mobile::Dialogs::AcknowledgementDialog.new('Email Input', "You input #{@email_input.value}."), :transition => 'pop')
+                RubyApp::Elements::Mobile::Dialog.show(event, RubyApp::Elements::Mobile::Dialogs::AcknowledgementDialog.new('Email Input', "You input #{@email_input.value}."))
               end
 
               @multiline_input = RubyApp::Elements::Mobile::Inputs::MultilineInput.new
               @multiline_input.changed do |element, event|
-                RubyApp::Elements::Mobile::Dialog.show(event, RubyApp::Elements::Mobile::Dialogs::AcknowledgementDialog.new('Multiline Input', "You input #{@multiline_input.value}."), :transition => 'pop')
+                RubyApp::Elements::Mobile::Dialog.show(event, RubyApp::Elements::Mobile::Dialogs::AcknowledgementDialog.new('Multiline Input', "You input #{@multiline_input.value}."))
               end
 
               @toggle_input = RubyApp::Elements::Mobile::Inputs::ToggleInput.new
               @toggle_input.changed do |element, event|
-                RubyApp::Elements::Mobile::Dialog.show(event, RubyApp::Elements::Mobile::Dialogs::AcknowledgementDialog.new('Toggle Input', "You input #{@toggle_input.value}."), :transition => 'pop')
+                RubyApp::Elements::Mobile::Dialog.show(event, RubyApp::Elements::Mobile::Dialogs::AcknowledgementDialog.new('Toggle Input', "You input #{@toggle_input.value}."))
               end
 
             end

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

@@ -31,10 +31,10 @@ module RubyApp
                                 'Item 05' ].collect { |item| RubyApp::Elements::Mobile::List::ListSplitItem.new(item) }
 
               @list.item_clicked do |element, event|
-                RubyApp::Elements::Mobile::Dialog.show(event, RubyApp::Elements::Mobile::Dialogs::AcknowledgementDialog.new('List', "You clicked the item #{event.item.item}."), :transition => 'pop')
+                RubyApp::Elements::Mobile::Dialog.show(event, RubyApp::Elements::Mobile::Dialogs::AcknowledgementDialog.new('List', "You clicked the item #{event.item.item}."))
               end
               @list.link_clicked do |element, event|
-                RubyApp::Elements::Mobile::Dialog.show(event, RubyApp::Elements::Mobile::Dialogs::AcknowledgementDialog.new('List', "You clicked the link #{event.item.item}."), :transition => 'pop')
+                RubyApp::Elements::Mobile::Dialog.show(event, RubyApp::Elements::Mobile::Dialogs::AcknowledgementDialog.new('List', "You clicked the link #{event.item.item}."))
               end
 
             end

data/lib/ruby_app/elements/mobile/default/features/message_page.css.haml

@@ -0,0 +1,2 @@
+= RubyApp::Elements::Mobile::Navigation::BackButton.render(:css)
+= yield

data/lib/ruby_app/elements/mobile/default/features/message_page.html.haml

@@ -0,0 +1,9 @@
+- self.content_for(:html, :page) do
+  /
+    #{__FILE__}
+  %div{'data-role' => 'header'}
+    = @back_button.render(:html)
+    %h1
+      Message
+  %div{'data-role' => 'content'}
+    %div.message

data/lib/ruby_app/elements/mobile/default/features/message_page.js.haml

@@ -0,0 +1,2 @@
+= RubyApp::Elements::Mobile::Navigation::BackButton.render(:js)
+= yield

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

@@ -0,0 +1,42 @@
+module RubyApp
+
+  module Elements
+
+    module Mobile
+
+      module Default
+
+        module Features
+          require 'ruby_app/elements/mobile/navigation/back_button'
+          require 'ruby_app/elements/mobile/page'
+
+          class MessagePage < RubyApp::Elements::Mobile::Page
+
+            template_path(:all, File.dirname(__FILE__))
+
+            def initialize
+              super
+
+              @back_button = RubyApp::Elements::Mobile::Navigation::BackButton.new
+
+              self.shown do |element, event|
+                event.send_message(self, "Message")
+              end
+
+              self.messaged do |element, event|
+                event.update_text('div.message', "Messaged at #{RubyApp::Language.locale.strftime(Time.now, RubyApp::Application.configuration.format.date.long)} with message #{event.message ? event.message.inspect : '(none)'}")
+              end
+
+            end
+
+          end
+
+        end
+
+      end
+
+    end
+
+  end
+
+end