RubyApp 0.0.91 → 0.2.0

data/lib/ruby_app/element.rb

@@ -3,13 +3,12 @@ require 'bundler/setup'
 
 require 'haml'
 require 'json'
+require 'mime/types'
 require 'ruby-event'
 
 module RubyApp
-  require 'ruby_app/mixins/configuration_mixin'
-  require 'ruby_app/mixins/render_mixin'
-  require 'ruby_app/mixins/template_mixin'
-  require 'ruby_app/mixins/translate_mixin'
+  require 'ruby_app/exceptions'
+  require 'ruby_app/mixins'
 
   class Element
     extend RubyApp::Mixins::ConfigurationMixin
@@ -25,13 +24,15 @@ module RubyApp
     class Event
       extend RubyApp::Mixins::TranslateMixin
 
-      attr_reader :now, :source
+      attr_reader :session_id, :now, :source
 
       def initialize(data = nil)
         if data
+          @session_id = data['session_id']
           @now = Time.parse(data['now'])
           @source = RubyApp::Element.get_element(data['source_id'])
         else
+          @session_id = nil
           @now = Time.now
           @source = nil
         end
@@ -43,6 +44,7 @@ module RubyApp
       end
 
       def process!
+        raise RubyApp::Exceptions::SessionInvalidException.new(RubyApp::Request.POST['session_id']) unless self.session_id == RubyApp::Session.session_id
         source.send(:on_event, self)
       end
 
@@ -59,7 +61,7 @@ module RubyApp
       end
 
       def confirm_refresh(message)
-        execute("RubyApp.confirm_refresh(#{message.to_json});")
+        execute("RubyApp.confirmRefresh(#{message.to_json});")
       end
 
       def show_dialog(dialog)
@@ -140,6 +142,10 @@ module RubyApp
       "id_#{object_id}"
     end
 
+    def self.get_content_type(format)
+      ( mime_type = MIME::Types.type_for(format)[0] ) ? mime_type.content_type : 'text/plain'
+    end
+
     def self.get_element(element_id)
       element_id =~ /(-?\d+)/
       ObjectSpace._id2ref($1.to_i)

data/lib/ruby_app/elements.rb

@@ -0,0 +1,50 @@
+require 'ruby_app/element'
+require 'ruby_app/elements/base/base_dialog'
+require 'ruby_app/elements/base/base_mail'
+require 'ruby_app/elements/base/base_page'
+require 'ruby_app/elements/button'
+require 'ruby_app/elements/calendars/base/base_month'
+require 'ruby_app/elements/calendars/month'
+require 'ruby_app/elements/click'
+require 'ruby_app/elements/dialog'
+require 'ruby_app/elements/dialogs/acknowledgement_dialog'
+require 'ruby_app/elements/dialogs/base/base_close_dialog'
+require 'ruby_app/elements/dialogs/base/base_ok_dialog'
+require 'ruby_app/elements/dialogs/base/base_yes_no_dialog'
+require 'ruby_app/elements/dialogs/calendars/month_dialog'
+require 'ruby_app/elements/dialogs/blank_dialog'
+require 'ruby_app/elements/dialogs/close_dialog'
+require 'ruby_app/elements/dialogs/confirmation_dialog'
+require 'ruby_app/elements/dialogs/exception_dialog'
+require 'ruby_app/elements/dialogs/message_dialog'
+require 'ruby_app/elements/dialogs/ok_dialog'
+require 'ruby_app/elements/dialogs/yes_no_dialog'
+require 'ruby_app/elements/exception_element'
+require 'ruby_app/elements/input'
+require 'ruby_app/elements/inputs/duration_input'
+require 'ruby_app/elements/inputs/email_input'
+require 'ruby_app/elements/inputs/multiline_input'
+require 'ruby_app/elements/inputs/toggle_input'
+require 'ruby_app/elements/link'
+require 'ruby_app/elements/list'
+require 'ruby_app/elements/lists/select'
+require 'ruby_app/elements/mail'
+require 'ruby_app/elements/markdown'
+require 'ruby_app/elements/navigation/back_button'
+require 'ruby_app/elements/navigation/base/base_breadcrumbs'
+require 'ruby_app/elements/navigation/breadcrumbs'
+require 'ruby_app/elements/navigation/page_link'
+require 'ruby_app/elements/page'
+require 'ruby_app/elements/pages/authentication/open_id/authentication_page'
+require 'ruby_app/elements/pages/authentication/open_id/ax_authentication_page'
+require 'ruby_app/elements/pages/authentication/open_id/base/base_authentication_page'
+require 'ruby_app/elements/pages/authentication/open_id/email_authentication_page'
+require 'ruby_app/elements/pages/authentication/open_id/google_authentication_page'
+require 'ruby_app/elements/pages/authentication/open_id/my_open_id_authentication_page'
+require 'ruby_app/elements/pages/authentication/open_id/sreg_authentication_page'
+require 'ruby_app/elements/pages/authentication/open_id/yahoo_authentication_page'
+require 'ruby_app/elements/pages/base/base_blank_page'
+require 'ruby_app/elements/pages/blank_page'
+require 'ruby_app/elements/pages/default_page'
+require 'ruby_app/elements/pages/quit_page'
+require 'ruby_app/elements/pages/settings_page'

data/lib/ruby_app/elements/base/base_mail.rb

@@ -3,9 +3,9 @@ module RubyApp
   module Elements
 
     module Base
+      require 'ruby_app'
       require 'ruby_app/element'
-      require 'ruby_app/language'
-      require 'ruby_app/mixins/hash_mixin'
+      require 'ruby_app/mixins'
 
       class BaseMail < RubyApp::Element
         include RubyApp::Mixins::HashMixin

data/lib/ruby_app/elements/base/base_page.html.haml

@@ -32,7 +32,7 @@
       %meta{:name => name, :content => value}
     /
       (other)
-    %meta{:name => :event_error_message, :content => RubyApp::Elements::Base::BasePage.translate.event_error_message}
+    %meta{:name => :_event_error_message, :content => RubyApp::Elements::Base::BasePage.translate._event_error_message}
   %body
     %div.body
       = yield :body

data/lib/ruby_app/elements/base/base_page.js.haml

@@ -54,8 +54,8 @@
             } )
             .error( function(request, message, exception) {
               RubyApp.log('RubyApp.queueEvent ERROR event.class=' + event._class + ' wait=' + wait);
-              if ($.parseJSON(RubyApp.getData('event_error', 'true')) == true)
-                RubyApp.confirm_refresh(RubyApp.getData('event_error_message', null));
+              if ($.parseJSON(RubyApp.getData('_event_error', 'true')) == true)
+                RubyApp.confirmRefresh(RubyApp.getData('_event_error_message', null));
             } )
             .complete( function() {
               RubyApp.log('RubyApp.queueEvent COMPLETE event.class=' + event._class + ' wait=' + wait);
@@ -71,7 +71,7 @@
         $(window).clearQueue();
         location.assign(location.href);
       },
-      this.confirm_refresh = function(message) {
+      this.confirmRefresh = function(message) {
         if (confirm(message))
         {
           RubyApp.refresh();

data/lib/ruby_app/elements/base/base_page.rb

@@ -8,9 +8,9 @@ module RubyApp
   module Elements
 
     module Base
+      require 'ruby_app'
       require 'ruby_app/element'
-      require 'ruby_app/language'
-      require 'ruby_app/mixins/hash_mixin'
+      require 'ruby_app/mixins'
 
       class BasePage < RubyApp::Element
         include RubyApp::Mixins::HashMixin

data/lib/ruby_app/elements/dialogs/base/base_ok_dialog.rb

@@ -6,7 +6,6 @@ module RubyApp
 
       module Base
         require 'ruby_app/elements/dialogs/blank_dialog'
-        require 'ruby_app/elements/link'
 
         class BaseOkDialog < RubyApp::Elements::Dialogs::BlankDialog
 

data/lib/ruby_app/elements/dialogs/blank_dialog.rb

@@ -3,7 +3,7 @@ module RubyApp
   module Elements
 
     module Dialogs
-      require 'ruby_app/elements/dialog'
+      require 'ruby_app/elements'
 
       class BlankDialog < RubyApp::Elements::Dialog
 

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

@@ -3,9 +3,8 @@ module RubyApp
   module Elements
 
     module Dialogs
+      require 'ruby_app'
       require 'ruby_app/elements/dialogs/close_dialog'
-      require 'ruby_app/log'
-      require 'ruby_app/session'
 
       class ExceptionDialog < RubyApp::Elements::Dialogs::CloseDialog
 

data/lib/ruby_app/elements/navigation/back_button.rb

@@ -3,8 +3,8 @@ module RubyApp
   module Elements
 
     module Navigation
+      require 'ruby_app'
       require 'ruby_app/elements/button'
-      require 'ruby_app/session'
 
       class BackButton < RubyApp::Elements::Button
 

data/lib/ruby_app/elements/navigation/base/base_breadcrumbs.rb

@@ -10,6 +10,7 @@ module RubyApp
     module Navigation
 
       module Base
+        require 'ruby_app'
         require 'ruby_app/element'
 
         class BaseBreadcrumbs < RubyApp::Element

data/lib/ruby_app/elements/navigation/page_link.rb

@@ -3,6 +3,7 @@ module RubyApp
   module Elements
 
     module Navigation
+      require 'ruby_app'
       require 'ruby_app/element'
 
       class PageLink < RubyApp::Element

data/lib/ruby_app/elements/pages/authentication/open_id/ax_authentication_page.rb

@@ -12,8 +12,8 @@ module RubyApp
       module Authentication
 
         module OpenId
+          require 'ruby_app'
           require 'ruby_app/elements/pages/authentication/open_id/email_authentication_page'
-          require 'ruby_app/session'
 
           class AxAuthenticationPage < RubyApp::Elements::Pages::Authentication::OpenId::EmailAuthenticationPage
 

data/lib/ruby_app/elements/pages/authentication/open_id/base/base_authentication_page.rb

@@ -14,10 +14,8 @@ module RubyApp
         module OpenId
 
           module Base
+            require 'ruby_app'
             require 'ruby_app/elements/page'
-            require 'ruby_app/log'
-            require 'ruby_app/request'
-            require 'ruby_app/session'
 
             class BaseAuthenticationPage < RubyApp::Elements::Page
 

data/lib/ruby_app/elements/pages/authentication/open_id/email_authentication_page.rb

@@ -7,8 +7,8 @@ module RubyApp
       module Authentication
 
         module OpenId
+          require 'ruby_app'
           require 'ruby_app/elements/pages/authentication/open_id/authentication_page'
-          require 'ruby_app/session'
 
           class EmailAuthenticationPage < RubyApp::Elements::Pages::Authentication::OpenId::AuthenticationPage
 

data/lib/ruby_app/elements/pages/authentication/open_id/sreg_authentication_page.rb

@@ -12,8 +12,8 @@ module RubyApp
       module Authentication
 
         module OpenId
+          require 'ruby_app'
           require 'ruby_app/elements/pages/authentication/open_id/email_authentication_page'
-          require 'ruby_app/session'
 
           class SregAuthenticationPage < RubyApp::Elements::Pages::Authentication::OpenId::EmailAuthenticationPage
 

data/lib/ruby_app/elements/pages/base/base_blank_page.rb

@@ -19,7 +19,6 @@ module RubyApp
             @breadcrumbs = RubyApp::Elements::Navigation::Breadcrumbs.new
 
             require 'ruby_app/elements/pages/settings_page'
-
             @settings = RubyApp::Elements::Navigation::PageLink.new
             @settings.page = RubyApp::Elements::Pages::SettingsPage
 

data/lib/ruby_app/elements/pages/default_page.rb

@@ -3,9 +3,9 @@ module RubyApp
   module Elements
 
     module Pages
+      require 'ruby_app'
       require 'ruby_app/elements/markdown'
       require 'ruby_app/elements/pages/blank_page'
-      require 'ruby_app/elements/pages/test_pages/default_test_page'
 
       class DefaultPage < RubyApp::Elements::Pages::BlankPage
 
@@ -22,6 +22,7 @@ module RubyApp
           @markdown.clicked do |element, event|
             case event.name
               when 'go_test'
+                require 'ruby_app/elements/pages/test_pages'
                 RubyApp::Session.pages.push(RubyApp::Elements::Pages::TestPages::DefaultTestPage.new)
                 event.refresh
             end

data/lib/ruby_app/elements/pages/quit_page.html.haml

@@ -5,6 +5,3 @@
   %head
     %title
       = yield(:title) || self.translate.title
-  %body
-    :javascript
-       location.assign('/');

data/lib/ruby_app/elements/pages/quit_page.rb

@@ -4,7 +4,6 @@ module RubyApp
 
     module Pages
       require 'ruby_app/elements/page'
-      require 'ruby_app/session'
 
       class QuitPage < RubyApp::Elements::Page
 
@@ -13,7 +12,6 @@ module RubyApp
 
         def initialize
           super
-          RubyApp::Session.quit
         end
 
       end

data/lib/ruby_app/elements/pages/settings_page.rb

@@ -3,6 +3,7 @@ module RubyApp
   module Elements
 
     module Pages
+      require 'ruby_app'
       require 'ruby_app/elements/markdown'
       require 'ruby_app/elements/pages/blank_page'
 
@@ -21,7 +22,7 @@ module RubyApp
               when 'do_reload_translations'
                 RubyApp::Language.reload!
               when 'do_quit'
-                RubyApp::Session.quit
+                RubyApp::Session.quit!
             end
             event.refresh
           end

data/lib/ruby_app/elements/pages/test_pages.rb

@@ -0,0 +1,9 @@
+require 'ruby_app/elements/pages/test_pages/button_test_page'
+require 'ruby_app/elements/pages/test_pages/default_test_page'
+require 'ruby_app/elements/pages/test_pages/dialog_test_page'
+require 'ruby_app/elements/pages/test_pages/input_test_page'
+require 'ruby_app/elements/pages/test_pages/link_test_page'
+require 'ruby_app/elements/pages/test_pages/linked_test_page'
+require 'ruby_app/elements/pages/test_pages/list_test_page'
+require 'ruby_app/elements/pages/test_pages/markdown_test_page'
+require 'ruby_app/elements/pages/test_pages/test_page'

data/lib/ruby_app/elements/pages/test_pages/button_test_page.rb

@@ -5,11 +5,8 @@ module RubyApp
     module Pages
 
       module TestPages
-        require 'ruby_app/elements/button'
-        require 'ruby_app/elements/markdown'
-        require 'ruby_app/elements/pages/blank_page'
-        require 'ruby_app/elements/pages/test_pages/linked_test_page'
-        require 'ruby_app/session'
+        require 'ruby_app'
+        require 'ruby_app/elements'
 
         class ButtonTestPage < RubyApp::Elements::Pages::BlankPage
 
@@ -22,6 +19,7 @@ module RubyApp
 
             @button = RubyApp::Elements::Button.new
             @button.clicked do |element, event|
+              require 'ruby_app/elements/pages/test_pages/linked_test_page'
               RubyApp::Session.pages.push(RubyApp::Elements::Pages::TestPages::LinkedTestPage.new)
               event.refresh
             end

data/lib/ruby_app/elements/pages/test_pages/default_test_page.rb

@@ -5,20 +5,8 @@ module RubyApp
     module Pages
 
       module TestPages
-        require 'ruby_app/elements/dialogs/exception_dialog'
-        require 'ruby_app/elements/markdown'
-        require 'ruby_app/elements/pages/authentication/open_id/google_authentication_page'
-        require 'ruby_app/elements/pages/authentication/open_id/my_open_id_authentication_page'
-        require 'ruby_app/elements/pages/authentication/open_id/yahoo_authentication_page'
-        require 'ruby_app/elements/pages/blank_page'
-        require 'ruby_app/elements/pages/test_pages/button_test_page'
-        require 'ruby_app/elements/pages/test_pages/dialog_test_page'
-        require 'ruby_app/elements/pages/test_pages/input_test_page'
-        require 'ruby_app/elements/pages/test_pages/link_test_page'
-        require 'ruby_app/elements/pages/test_pages/list_test_page'
-        require 'ruby_app/elements/pages/test_pages/markdown_test_page'
-        require 'ruby_app/elements/pages/test_pages/test_page'
-        require 'ruby_app/session'
+        require 'ruby_app'
+        require 'ruby_app/elements'
 
         class DefaultTestPage < RubyApp::Elements::Pages::BlankPage
 
@@ -29,7 +17,14 @@ module RubyApp
 
             @markdown = RubyApp::Elements::Markdown.new
             @markdown.clicked do |element, event|
-              RubyApp::Session.pages.push(eval(event.name).new)
+              require 'ruby_app/elements/pages/test_pages/button_test_page'
+              require 'ruby_app/elements/pages/test_pages/dialog_test_page'
+              require 'ruby_app/elements/pages/test_pages/input_test_page'
+              require 'ruby_app/elements/pages/test_pages/link_test_page'
+              require 'ruby_app/elements/pages/test_pages/list_test_page'
+              require 'ruby_app/elements/pages/test_pages/markdown_test_page'
+              require 'ruby_app/elements/pages/test_pages/test_page'
+              RubyApp::Session.pages.push(Kernel.eval(event.name).new)
               event.refresh
             end
 

data/lib/ruby_app/elements/pages/test_pages/dialog_test_page.rb

@@ -5,14 +5,8 @@ module RubyApp
     module Pages
 
       module TestPages
-        require 'ruby_app/elements/markdown'
-        require 'ruby_app/elements/dialogs/calendars/month_dialog'
-        require 'ruby_app/elements/dialogs/acknowledgement_dialog'
-        require 'ruby_app/elements/dialogs/confirmation_dialog'
-        require 'ruby_app/elements/dialogs/exception_dialog'
-        require 'ruby_app/elements/dialogs/message_dialog'
-        require 'ruby_app/elements/pages/blank_page'
-        require 'ruby_app/session'
+        require 'ruby_app'
+        require 'ruby_app/elements'
 
         class DialogTestPage < RubyApp::Elements::Pages::BlankPage
 

data/lib/ruby_app/elements/pages/test_pages/input_test_page.rb

@@ -5,15 +5,8 @@ module RubyApp
     module Pages
 
       module TestPages
-        require 'ruby_app/elements/dialogs/message_dialog'
-        require 'ruby_app/elements/markdown'
-        require 'ruby_app/elements/input'
-        require 'ruby_app/elements/inputs/duration_input'
-        require 'ruby_app/elements/inputs/email_input'
-        require 'ruby_app/elements/inputs/multiline_input'
-        require 'ruby_app/elements/inputs/toggle_input'
-        require 'ruby_app/elements/pages/blank_page'
-        require 'ruby_app/session'
+        require 'ruby_app'
+        require 'ruby_app/elements'
 
         class InputTestPage < RubyApp::Elements::Pages::BlankPage