RubyApp 0.0.22 → 0.0.23

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    RubyApp (0.0.22)
+    RubyApp (0.0.23)
       BlueCloth
       chronic
       chronic_duration

data/lib/ruby_app/element.rb

@@ -26,9 +26,14 @@ module RubyApp
 
       attr_reader :now, :source
 
-      def initialize(data)
-        @now = Time.parse(data['now'])
-        @source = RubyApp::Element.get_element(data['source_id'])
+      def initialize(data = nil)
+        if data
+          @now = Time.parse(data['now'])
+          @source = RubyApp::Element.get_element(data['source_id'])
+        else
+          @now = Time.now
+          @source = nil
+        end
         @statements = []
       end
 
@@ -83,7 +88,8 @@ module RubyApp
       def to_hash
         {
           '_class' => self.class.to_s,
-          'source_id' => @source.element_id,
+          'now' => @now,
+          'source_id' => @source ? @source.element_id : nil,
           'statements' => @statements
         }
       end
@@ -96,8 +102,8 @@ module RubyApp
 
     class ExceptionEvent < RubyApp::Element::Event
 
-      def initialize(data, exception)
-        super(data)
+      def initialize(exception)
+        super()
         self.alert(exception.message)
       end
 

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

@@ -6,12 +6,12 @@
       this.interval = #{self.interval * 1000};
       this._interval = 0;
       this.sendEvent = function(event) {
+        event.session_id = '#{RubyApp::Session.session_id}';
         event.now = new Date().toString();
         response = $.post(location.href, event);
         response
           .success( function(event) {
             $.each(event.statements, function(index, statement) {
-              // alert(statement);
               eval(statement);
             } );
           } )
@@ -99,7 +99,7 @@
       if ( RubyApp.interval > 0 ) {
         window.clearInterval(RubyApp._interval);
       }
-      RubyApp.sendEvent({_class:'RubyApp::Elements::Page::UnloadedEvent', source_id:$('html').attr('id')});
+      // RubyApp.sendEvent({_class:'RubyApp::Elements::Page::UnloadedEvent', source_id:$('html').attr('id')});
     });
 
 = yield

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

@@ -18,7 +18,7 @@ module RubyApp
           end
 
           def render(format)
-            raise self.translate.exception
+            raise self.translate.exception if format == :html
             super(format)
           end
 

data/lib/ruby_app/exceptions/base/base_exception.rb

@@ -0,0 +1,21 @@
+module RubyApp
+
+  module Exceptions
+
+    module Base
+      require 'ruby_app/mixins/translate_mixin'
+
+      class BaseException < Exception
+        extend RubyApp::Mixins::TranslateMixin
+
+        def initialize(message)
+          super(message)
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/lib/ruby_app/exceptions/session_invalid_exception.rb

@@ -0,0 +1,19 @@
+module RubyApp
+
+  module Exceptions
+    require 'ruby_app/exceptions/base/base_exception'
+
+    class SessionInvalidException < RubyApp::Exceptions::Base::BaseException
+
+      attr_reader :session_id
+
+      def initialize(session_id)
+        super(RubyApp::Exceptions::SessionInvalidException.translate.message)
+        @session_id = session_id
+      end
+
+    end
+
+  end
+
+end

data/lib/ruby_app/log.rb

@@ -11,7 +11,9 @@ module RubyApp
       self.error('-' * 80)
       self.error("exception=#{exception.class.inspect} #{exception.message}")
       self.error('-' * 80)
-      self.error(exception.backtrace.join("\n"))
+      exception.backtrace.each do |line|
+        self.error(line)
+      end
       self.error('-' * 80)
     end
 

data/lib/ruby_app/rack/route.rb

@@ -11,9 +11,11 @@ module RubyApp
     require 'ruby_app/elements/exception_element'
     require 'ruby_app/elements/pages/exception_page'
     require 'ruby_app/elements/pages/quit_page'
+    require 'ruby_app/exceptions/session_invalid_exception'
     require 'ruby_app/log'
     require 'ruby_app/mixins/route_mixin'
     require 'ruby_app/request'
+    require 'ruby_app/session'
 
     class Route
       extend RubyApp::Mixins::RouteMixin
@@ -83,20 +85,26 @@ module RubyApp
 
       route(RubyApp::Mixins::RouteMixin::POST, /.*/) do |method, path|
         RubyApp::Log.debug("#{self}.post(...) method=#{method.inspect} path=#{path.inspect} POST=#{RubyApp::Request.POST.inspect}")
+        RubyApp::Log.debug("#{self}.post(...) RubyApp::Session.session_id=#{RubyApp::Session.session_id}")
         begin
-          event = RubyApp::Element::Event.from_hash(RubyApp::Request.POST)
-          event.process!
-          [
-            200,
-            { 'content-type' => 'application/json' },
-            [ Yajl::Encoder.new.encode(event.to_hash) ]
-          ]
+          if RubyApp::Session.session_id == RubyApp::Request.POST['session_id']
+            event = RubyApp::Element::Event.from_hash(RubyApp::Request.POST)
+            event.process!
+            [
+              200,
+              { 'content-type' => 'application/json' },
+              [ Yajl::Encoder.new.encode(event.to_hash) ]
+            ]
+          else
+            raise RubyApp::Exceptions::SessionInvalidException.new(RubyApp::Request.POST['session_id'])
+          end
+
         rescue Exception => exception
           RubyApp::Log.exception(exception)
           [
             200,
             { 'content-type' => 'application/json' },
-            [ Yajl::Encoder.new.encode(RubyApp::Element::ExceptionEvent.new(RubyApp::Request.POST, exception).to_hash) ]
+            [ Yajl::Encoder.new.encode(RubyApp::Element::ExceptionEvent.new(exception).to_hash) ]
           ]
         end
       end

data/lib/ruby_app/session.rb

@@ -1,5 +1,6 @@
 module RubyApp
   require 'ruby_app/application'
+  require 'ruby_app/log'
   require 'ruby_app/mixins/configure_mixin'
   require 'ruby_app/mixins/delegate_mixin'
   require 'ruby_app/mixins/translate_mixin'
@@ -21,15 +22,19 @@ module RubyApp
 
     end
 
-    attr_reader :pages
+    attr_reader :session_id, :pages
     attr_accessor :identity, :data
 
-    def initialize(page = nil)
-      require 'ruby_app/elements/pages/default_page'
-      @pages = [ page || RubyApp::Elements::Pages::DefaultPage.new ]
+    def initialize(session_id, page = nil)
+      @session_id = session_id
+      @pages = []
       @dialogs = []
       @identity = nil
       @data = {}
+
+      require 'ruby_app/elements/pages/default_page'
+      @pages.push(page || RubyApp::Elements::Pages::DefaultPage.new)
+
     end
 
     def [](key)
@@ -70,7 +75,8 @@ module RubyApp
     end
 
     def self.create!
-      Thread.current[:_session] = RubyApp::Request.session[:_session] ||= RubyApp::Application.options.session_class.new
+      RubyApp::Request.session[:_initialize] = true
+      Thread.current[:_session] = RubyApp::Request.session[:_session] ||= RubyApp::Application.options.session_class.new(RubyApp::Request.env['rack.session.options'] ? RubyApp::Request.env['rack.session.options'][:id] : nil)
       if block_given?
         begin
           yield

data/lib/ruby_app/translations/en.yml

@@ -194,3 +194,6 @@ ruby_app:
             [Quit](do_quit) the session.
       quit_page:
         title: Quit
+  exceptions:
+    session_invalid_exception:
+      message: The session is invalid or has expired.  Refresh the page and try again.

data/lib/ruby_app/version.rb

@@ -1,4 +1,4 @@
 module RubyApp
-  VERSION = "0.0.22"
+  VERSION = "0.0.23"
   ROOT    = File.expand_path(File.dirname(__FILE__))
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: RubyApp
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 0
   - 0
-  - 22
-  version: 0.0.22
+  - 23
+  version: 0.0.23
 platform: ruby
 authors: 
 - Frank G. Ficnar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-09 00:00:00 Z
+date: 2011-12-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -498,6 +498,8 @@ files:
 - lib/ruby_app/elements/pages/test_pages/test_page.html.haml
 - lib/ruby_app/elements/pages/test_pages/test_page.js.haml
 - lib/ruby_app/elements/pages/test_pages/test_page.rb
+- lib/ruby_app/exceptions/base/base_exception.rb
+- lib/ruby_app/exceptions/session_invalid_exception.rb
 - lib/ruby_app/language.rb
 - lib/ruby_app/log.rb
 - lib/ruby_app/mixins/configure_mixin.rb