RubyApp 0.0.8 → 0.0.9

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

@@ -91,7 +91,7 @@
       if ( RubyApp.interval > 0 ) {
         window.clearInterval(RubyApp._interval);
       }
-      RubyApp.sendEvent({_class:'RubyApp::Elements::Page::ReleasedEvent', source_id:$('html').attr('id')});
+      RubyApp.sendEvent({_class:'RubyApp::Elements::Page::UnloadedEvent', source_id:$('html').attr('id')});
     });
 
 = yield

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

@@ -29,7 +29,7 @@ module RubyApp
 
         end
 
-        class ReleasedEvent < RubyApp::Element::Event
+        class UnloadedEvent < RubyApp::Element::Event
 
           def initialize(data)
             super(data)
@@ -43,7 +43,7 @@ module RubyApp
 
         event :loaded
         event :triggered
-        event :released
+        event :unloaded
 
         def initialize
           super
@@ -55,7 +55,7 @@ module RubyApp
           def on_event(event)
             on_loaded(event) if event.is_a?(RubyApp::Elements::Base::BasePage::LoadedEvent)
             on_triggered(event) if event.is_a?(RubyApp::Elements::Base::BasePage::TriggeredEvent)
-            on_released(event) if event.is_a?(RubyApp::Elements::Base::BasePage::ReleasedEvent)
+            on_unloaded(event) if event.is_a?(RubyApp::Elements::Base::BasePage::UnloadedEvent)
             super(event)
           end
 
@@ -67,8 +67,8 @@ module RubyApp
             triggered(event)
           end
 
-          def on_released(event)
-            released(event)
+          def on_unloaded(event)
+            unloaded(event)
           end
 
       end

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

@@ -4,7 +4,7 @@
     $(document).ready(function() {
       $("ul.list > li.item > a.item").live('click', function(event) {
         event.preventDefault();
-        RubyApp.sendEvent({_class:'RubyApp::Elements::List::SelectedEvent', source_id:$(this).parent().parent().attr('id'), index:$(this).attr('index')});
+        RubyApp.sendEvent({_class:'RubyApp::Elements::List::ClickedEvent', source_id:$(this).parent().parent().attr('id'), index:$(this).attr('index')});
       });
     });
 = yield

data/lib/ruby_app/elements/list.rb

@@ -10,7 +10,7 @@ module RubyApp
 
     class List < RubyApp::Element
 
-      class SelectedEvent < RubyApp::Element::Event
+      class ClickedEvent < RubyApp::Element::Event
 
         attr_reader :index, :item
 
@@ -30,7 +30,7 @@ module RubyApp
 
       attr_accessor :items
 
-      event :selected
+      event :clicked
 
       def initialize
         super
@@ -40,12 +40,12 @@ module RubyApp
       protected
 
         def on_event(event)
-          on_selected(event) if event.is_a?(RubyApp::Elements::List::SelectedEvent)
+          on_clicked(event) if event.is_a?(RubyApp::Elements::List::ClickedEvent)
           super(event)
         end
 
-        def on_selected(event)
-          selected(event)
+        def on_clicked(event)
+          clicked(event)
         end
 
     end

data/lib/ruby_app/elements/lists/select.js.haml

@@ -4,7 +4,7 @@
     $(document).ready(function() {
       $("ul.select > li.item > a.item").live('click', function(event) {
         event.preventDefault();
-        RubyApp.sendEvent({_class:'RubyApp::Elements::List::SelectedEvent', source_id:$(this).parent().parent().attr('id'), index:$(this).attr('index')});
+        RubyApp.sendEvent({_class:'RubyApp::Elements::List::ClickedEvent', source_id:$(this).parent().parent().attr('id'), index:$(this).attr('index')});
       });
     });
 = yield

data/lib/ruby_app/elements/lists/select.rb

@@ -13,8 +13,6 @@ module RubyApp
 
         attr_accessor :selected_index, :selected_item
 
-        event :selected
-
         def initialize
           super
         end
@@ -31,7 +29,7 @@ module RubyApp
 
         protected
 
-          def on_selected(event)
+          def on_clicked(event)
             @selected_index = event.index
             @selected_item = event.item
             event.update_element(self)

data/lib/ruby_app/elements/markdown.js.haml

@@ -4,7 +4,7 @@
     $(document).ready(function() {
       $('div.markdown a').live('click', function(event) {
         event.preventDefault();
-        RubyApp.sendEvent({_class:'RubyApp::Elements::Markdown::NavigatedEvent', source_id:$(this).parents('div.markdown').attr('id'), name:$(this).attr('href')});
+        RubyApp.sendEvent({_class:'RubyApp::Elements::Markdown::ClickedEvent', source_id:$(this).parents('div.markdown').attr('id'), name:$(this).attr('href')});
       });
     });
 = yield

data/lib/ruby_app/elements/markdown.rb

@@ -10,7 +10,7 @@ module RubyApp
 
     class Markdown < RubyApp::Element
 
-      class NavigatedEvent < RubyApp::Element::Event
+      class ClickedEvent < RubyApp::Element::Event
 
         attr_reader :name
 
@@ -27,7 +27,7 @@ module RubyApp
 
       template_path(:all, File.dirname(__FILE__))
 
-      event :navigated
+      event :clicked
 
       def initialize
         super
@@ -36,12 +36,12 @@ module RubyApp
       protected
 
         def on_event(event)
-          on_navigated(event) if event.is_a?(RubyApp::Elements::Markdown::NavigatedEvent)
+          on_clicked(event) if event.is_a?(RubyApp::Elements::Markdown::ClickedEvent)
           super(event)
         end
 
-        def on_navigated(event)
-          navigated(event)
+        def on_clicked(event)
+          clicked(event)
         end
 
     end

data/lib/ruby_app/elements/navigation/base/base_breadcrumbs.js.haml

@@ -4,7 +4,7 @@
     $(document).ready(function() {
       $("div.breadcrumbs a").click(function(event) {
         event.preventDefault();
-        RubyApp.sendEvent({_class:'RubyApp::Elements::Navigation::Breadcrumbs::NavigatedEvent', source_id:$(this).parent().attr('id'), page_id:$(this).attr('page_id')});
+        RubyApp.sendEvent({_class:'RubyApp::Elements::Navigation::Breadcrumbs::ClickedEvent', source_id:$(this).parent().attr('id'), page_id:$(this).attr('page_id')});
       });
     });
 = yield

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

@@ -14,7 +14,7 @@ module RubyApp
 
         class BaseBreadcrumbs < RubyApp::Element
 
-          class NavigatedEvent < RubyApp::Element::Event
+          class ClickedEvent < RubyApp::Element::Event
 
             attr_reader :page
 
@@ -38,11 +38,11 @@ module RubyApp
           protected
 
             def on_event(event)
-              on_navigated(event) if event.is_a?(RubyApp::Elements::Navigation::Base::BaseBreadcrumbs::NavigatedEvent)
+              on_clicked(event) if event.is_a?(RubyApp::Elements::Navigation::Base::BaseBreadcrumbs::ClickedEvent)
               super(event)
             end
 
-            def on_navigated(event)
+            def on_clicked(event)
               RubyApp::Session.pages.slice!(RubyApp::Session.pages.index(event.page) + 1, RubyApp::Session.pages.length - ( RubyApp::Session.pages.index(event.page) + 1 ))
               event.refresh
             end

data/lib/ruby_app/elements/navigation/page_link.js.haml

@@ -4,7 +4,7 @@
     $(document).ready(function() {
       $("span.link a.page").click(function(event) {
         event.preventDefault();
-        RubyApp.sendEvent({_class:'RubyApp::Elements::Navigation::PageLink::NavigatedEvent', source_id:$(this).parent().attr('id'), page:$(this).attr('page')});
+        RubyApp.sendEvent({_class:'RubyApp::Elements::Navigation::PageLink::ClickedEvent', source_id:$(this).parent().attr('id'), page:$(this).attr('page')});
       });
     });
 = yield

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

@@ -7,7 +7,7 @@ module RubyApp
 
       class PageLink < RubyApp::Element
 
-        class NavigatedEvent < RubyApp::Element::Event
+        class ClickedEvent < RubyApp::Element::Event
 
           attr_reader :page
 
@@ -38,11 +38,11 @@ module RubyApp
         protected
 
           def on_event(event)
-            on_navigated(event) if event.is_a?(RubyApp::Elements::Navigation::PageLink::NavigatedEvent)
+            on_clicked(event) if event.is_a?(RubyApp::Elements::Navigation::PageLink::ClickedEvent)
             super(event)
           end
 
-          def on_navigated(event)
+          def on_clicked(event)
             RubyApp::Session.pages.push(event.page.new)
             event.refresh
           end

data/lib/ruby_app/elements/navigation/page_menu.js.haml

@@ -4,7 +4,7 @@
     $(document).ready(function() {
       $("div.menu a.page").click(function(event) {
         event.preventDefault();
-        RubyApp.sendEvent({_class:'RubyApp::Elements::Navigation::PageMenu::NavigatedEvent', source_id:$(this).parent().parent().attr('id'), page:$(this).attr('page')});
+        RubyApp.sendEvent({_class:'RubyApp::Elements::Navigation::PageMenu::ClickedEvent', source_id:$(this).parent().parent().attr('id'), page:$(this).attr('page')});
       });
     });
 = yield

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

@@ -7,7 +7,7 @@ module RubyApp
 
       class PageMenu < RubyApp::Element
 
-        class NavigatedEvent < RubyApp::Element::Event
+        class ClickedEvent < RubyApp::Element::Event
 
           attr_reader :page
 
@@ -38,11 +38,11 @@ module RubyApp
         protected
 
           def on_event(event)
-            on_navigated(event) if event.is_a?(RubyApp::Elements::Navigation::PageMenu::NavigatedEvent)
+            on_clicked(event) if event.is_a?(RubyApp::Elements::Navigation::PageMenu::ClickedEvent)
             super(event)
           end
 
-          def on_navigated(event)
+          def on_clicked(event)
             RubyApp::Session.pages.pop
             RubyApp::Session.pages.push(event.page.new)
             event.refresh

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

@@ -2,7 +2,6 @@ require 'rubygems'
 require 'bundler/setup'
 
 require 'openid'
-require 'openid/store/filesystem'
 
 module RubyApp
 
@@ -28,7 +27,8 @@ module RubyApp
               self.loaded do |element, event|
                 RubyApp::Session.show(event, RubyApp::Elements::Dialogs::BusyDialog.new(RubyApp::Elements::Pages::Authentication::OpenID::AuthenticationPage.translate.busy_dialog.message)) do |_event|
                   if RubyApp::Request.query.empty?
-                    @consumer = ::OpenID::Consumer.new(RubyApp::Session.data, ::OpenID::Store::Filesystem.new(File.dirname(__FILE__)))
+                    @consumer = ::OpenID::Consumer.new(RubyApp::Session.data, nil)
+                    RubyApp::Log.debug("#{self.class}#loaded identifier=#{identifier.inspect}")
                     request = @consumer.begin(identifier)
                     self.process_request(request)
                     _event.go(request.redirect_url(RubyApp::Request.url, RubyApp::Request.url))

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

@@ -25,7 +25,7 @@ module RubyApp
 
             def process_request(request)
               ax_request = ::OpenID::AX::FetchRequest.new
-              ax_request.add(::OpenID::AX::AttrInfo.new(self.configuration.attributes.email, 'Email', true))
+              ax_request.add(::OpenID::AX::AttrInfo.new(self.configure.attributes.email, 'Email', true))
               request.add_extension(ax_request)
             end
 
@@ -33,7 +33,7 @@ module RubyApp
               ax_response = ::OpenID::AX::FetchResponse.from_success_response(response)
               if ax_response
                 self.create_identity_from_url(response.identity_url,
-                                              :email => ax_response.data[self.configuration.attributes.email].first)
+                                              :email => ax_response.data[self.configure.attributes.email].first)
               else
                 super(response)
               end

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

@@ -13,7 +13,7 @@ module RubyApp
 
             template_path(:all, File.dirname(__FILE__))
 
-            def initialize(identifier = self.configuration.identifier)
+            def initialize(identifier = self.configure.identifier)
               super(identifier)
             end
 

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

@@ -13,7 +13,7 @@ module RubyApp
 
             template_path(:all, File.dirname(__FILE__))
 
-            def initialize(identifier = self.configuration.identifier)
+            def initialize(identifier = self.configure.identifier)
               super(identifier)
             end
 

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

@@ -13,7 +13,7 @@ module RubyApp
 
             template_path(:all, File.dirname(__FILE__))
 
-            def initialize(identifier = self.configuration.identifier)
+            def initialize(identifier = self.configure.identifier)
               super(identifier)
             end
 

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

@@ -15,7 +15,7 @@ module RubyApp
           super
 
           @markdown = RubyApp::Elements::Markdown.new
-          @markdown.navigated do |element, event|
+          @markdown.clicked do |element, event|
             case event.name
               when 'go_test'
                 RubyApp::Session.pages.push(RubyApp::Elements::Pages::TestPages::DefaultTestPage.new)

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

@@ -1,6 +1,4 @@
 - self.content_for(:title) do
-  /
-    #{__FILE__}
   = @exception.class
 - self.content_for(:body) do
   /

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

@@ -14,12 +14,12 @@ module RubyApp
           super
 
           @markdown = RubyApp::Elements::Markdown.new
-          @markdown.navigated do |element, event|
+          @markdown.clicked do |element, event|
             case event.name
               when 'do_load_theme_mobile'
                 require 'ruby_app/themes/mobile'
               when 'do_reload_translations'
-                RubyApp::Language.reload
+                RubyApp::Language.reload!
               when 'do_quit'
                 RubyApp::Session.quit
             end

data/lib/ruby_app/elements/pages/test_pages/button_test_page.css.haml

@@ -0,0 +1,3 @@
+= RubyApp::Elements::Button.render(:css)
+= RubyApp::Elements::Markdown.render(:css)
+= yield

data/lib/ruby_app/elements/pages/test_pages/button_test_page.html.haml

@@ -0,0 +1,7 @@
+- self.content_for(:content) do
+  /
+    #{__FILE__}
+  = @markdown.render(:html) do |element|
+    - element.content_for(:body, self.translate.content.body)
+  = @button.render(:html) do |element|
+    - element.content_for(:body, self.translate.button.body)

data/lib/ruby_app/elements/pages/test_pages/button_test_page.js.haml

@@ -0,0 +1,3 @@
+= RubyApp::Elements::Button.render(:js)
+= RubyApp::Elements::Markdown.render(:js)
+= yield

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

@@ -0,0 +1,39 @@
+module RubyApp
+
+  module Elements
+
+    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'
+
+        class ButtonTestPage < RubyApp::Elements::Pages::BlankPage
+
+          template_path(:all, File.dirname(__FILE__))
+
+          def initialize
+            super
+
+            @markdown = RubyApp::Elements::Markdown.new
+
+            @button = RubyApp::Elements::Button.new
+            @button.clicked do |element, event|
+              RubyApp::Session.pages.push(RubyApp::Elements::Pages::TestPages::LinkedTestPage.new)
+              event.refresh
+            end
+
+          end
+
+        end
+
+      end
+
+    end
+
+  end
+
+end

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

@@ -12,9 +12,14 @@ module RubyApp
         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/exception_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'
 
         class DefaultTestPage < RubyApp::Elements::Pages::BlankPage
@@ -25,21 +30,9 @@ module RubyApp
             super
 
             @markdown = RubyApp::Elements::Markdown.new
-            @markdown.navigated do |element, event|
-              case event.name
-              when 'go_google_authentication'
-                RubyApp::Session.pages.push(RubyApp::Elements::Pages::Authentication::OpenID::GoogleAuthenticationPage.new()) #'https://www.google.com/accounts/o8/id')) #'http://pip.verisignlabs.com'
-                event.refresh
-              when 'go_my_open_id_authentication'
-                RubyApp::Session.pages.push(RubyApp::Elements::Pages::Authentication::OpenID::MyOpenIDAuthenticationPage.new()) #'https://www.google.com/accounts/o8/id'))
-                event.refresh
-              when 'go_yahoo_authentication'
-                RubyApp::Session.pages.push(RubyApp::Elements::Pages::Authentication::OpenID::YahooAuthenticationPage.new()) #'https://www.google.com/accounts/o8/id'))
-                event.refresh
-              else
-                RubyApp::Session.pages.push(eval(event.name).new)
-                event.refresh
-              end
+            @markdown.clicked do |element, event|
+              RubyApp::Session.pages.push(eval(event.name).new)
+              event.refresh
             end
 
           end