RubyApp 0.2.7 → 0.2.8

data/lib/ruby_app/exceptions/session_invalid_exception.rb

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

data/lib/ruby_app/log.rb

@@ -17,39 +17,38 @@ module RubyApp
     class Formatter < ::Logger::Formatter
 
       def call(severity, time, application, message)
-        return "#{severity} | #{time.strftime('%Y-%m-%d %H:%M:%S %Z')} | #{Socket.gethostname} | #{RubyApp::Session.exists? ? RubyApp::Session.session_id : '-'} | #{RubyApp::Session.exists? && RubyApp::Session.identity ? RubyApp::Session.identity.url : '-'} | #{message}\n"
+        return "#{severity.ljust(5, ' ')} | #{time.strftime('%Y-%m-%d %H:%M:%S %Z')} | #{Socket.gethostname} | #{RubyApp::Session.exists? ? RubyApp::Session.session_id : '-'} | #{RubyApp::Session.exists? && RubyApp::Session.identity ? RubyApp::Session.identity.url : '-'} | #{message}\n"
       end
 
     end
 
-    def duration(message)
+    def duration(severity, message)
       start = Time.now
       begin
-        return yield if block_given?
+        return yield
       ensure
-        self.debug("#{message} #{Time.now - start}s")
+        self.log(severity, "#{message} #{Time.now - start}s")
       end
     end
 
-    def memory(message)
+    def memory(severity, message)
       begin
-        return yield if block_given?
+        return yield
       ensure
         GC.start
         count = ObjectSpace.each_object { |item| }
-        self.debug("#{message}  count=#{count}")
-        self.debug("#{message} memory=#{`ps -o rss= -p #{$$}`.to_i}")
+        self.log(severity, "#{message} count=#{count}")
       end
     end
 
-    def exception(exception)
-      self.error('-' * 80)
-      self.error("exception=#{exception.class.inspect} #{exception.message}")
-      self.error('-' * 80)
+    def exception(severity, exception)
+      self.log(severity, '-' * 80)
+      self.log(severity, "exception=#{exception.class.inspect} #{exception.message}")
+      self.log(severity, '-' * 80)
       exception.backtrace.each do |line|
-        self.error(line)
+        self.log(severity, line)
       end
-      self.error('-' * 80)
+      self.log(severity, '-' * 80)
     end
 
     def self.prefix(object, method)

data/lib/ruby_app/mixins.rb

@@ -1,3 +1,7 @@
+require 'ruby_app/mixins/array_extension'
+require 'ruby_app/mixins/class_extension'
+require 'ruby_app/mixins/string_extension'
+
 require 'ruby_app/mixins/configuration_mixin'
 require 'ruby_app/mixins/delegate_mixin'
 require 'ruby_app/mixins/hash_mixin'

data/lib/ruby_app/mixins/array_extension.rb

@@ -0,0 +1,19 @@
+module RubyApp
+
+  module Mixins
+
+    module ArrayExtension
+
+      def second_last
+        self.length > 1 ?  self[self.length - 2] : nil
+      end
+
+    end
+
+  end
+
+end
+
+class Array
+  include RubyApp::Mixins::ArrayExtension
+end

data/lib/ruby_app/mixins/class_extension.rb

@@ -0,0 +1,19 @@
+module RubyApp
+
+  module Mixins
+
+    module ClassExtension
+
+      def short_name
+        return self.to_s.split('::').last
+      end
+
+    end
+
+  end
+
+end
+
+class Class
+  include RubyApp::Mixins::ClassExtension
+end

data/lib/ruby_app/mixins/render_mixin.rb

@@ -10,19 +10,16 @@ module RubyApp
     module RenderMixin
       require 'ruby_app'
 
-      def cache(format)
-        return self.is_a?(Class) ? self.get_cache(format) : self.class.get_cache(format)
+      def get_templates(format)
+        return self.is_a?(Class) ? super(format) : self.class.get_templates(format)
       end
 
-      def templates(format)
-        return self.is_a?(Class) ? self.get_templates(format) : self.class.get_templates(format)
+      def get_default_template
+        return self.is_a?(Class) ? super : self.class.get_default_template
       end
 
-      def rendered?(file)
-        unless RubyApp::Response.rendered?(file)
-          yield
-          RubyApp::Response.rendered(file)
-        end
+      def get_cache(format)
+        return self.is_a?(Class) ? super(format) : self.class.get_cache(format)
       end
 
       def content_for(format, name, value = nil, &block)
@@ -31,7 +28,7 @@ module RubyApp
 
       def render(format)
 
-        templates = self.templates(format)
+        templates = self.get_templates(format)
 
         unless templates.empty?
 
@@ -40,6 +37,12 @@ module RubyApp
           yield(self) if block_given?
 
           templates.each_with_index do |template, index|
+
+            if RubyApp::Response.rendered?(self, template)
+              template = self.get_default_template
+              templates[index] = template
+            end
+
             content = Haml::Engine.new(File.read(template), :filename => template).render(self) do |*arguments|
               if arguments.empty?
                 index == 0 ? nil : RubyApp::Response.get_content(self, format, templates[index - 1])
@@ -52,7 +55,10 @@ module RubyApp
                 end
               end
             end
+
+            RubyApp::Response.rendered(self, template)
             RubyApp::Response.content_for(self, format, template, content)
+
           end
 
           return RubyApp::Response.get_content(self, format, templates.last)

data/lib/ruby_app/mixins/string_extension.rb

@@ -0,0 +1,19 @@
+module RubyApp
+
+  module Mixins
+
+    module StringExtension
+
+      def to_b
+        return self =~ /(true|t|yes|y|on)/ ? true : false
+      end
+
+    end
+
+  end
+
+end
+
+class String
+  include RubyApp::Mixins::StringExtension
+end

data/lib/ruby_app/mixins/template_mixin.haml

@@ -0,0 +1 @@
+= yield

data/lib/ruby_app/mixins/template_mixin.rb

@@ -4,7 +4,7 @@ module RubyApp
 
     module TemplateMixin
 
-      def template_name
+      def get_template_name
         name = self.to_s.split('::').last
         name.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
         name.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
@@ -13,7 +13,7 @@ module RubyApp
       end
 
       def template_path(format, path)
-        (@_template_path ||= {})[format] = File.directory?(path) ? "#{File.join(path, self.template_name)}.*.haml" : path
+        (@_template_path ||= {})[format] = File.directory?(path) ? "#{File.join(path, self.get_template_name)}.*.haml" : path
       end
 
       def exclude_parent_template?(format)
@@ -28,6 +28,10 @@ module RubyApp
         return (@_template_path[format] || @_template_path[:all]).gsub(/\*/,format.to_s)
       end
 
+      def get_default_template
+        return File.join(File.dirname(__FILE__), %w[template_mixin.haml])
+      end
+
       def get_templates(format)
         template = self.get_template(format)
         return (File.exists?(template) ? [template] : []).concat((!self.exclude_parent_template?(format) && self.superclass.respond_to?(:get_templates) ) ? self.superclass.get_templates(format) : [])

data/lib/ruby_app/rack/application.rb

@@ -17,7 +17,7 @@ module RubyApp
         begin
           return @application.call(environment)
         rescue Exception => exception
-          RubyApp::Log.exception(exception)
+          RubyApp::Log.exception(RubyApp::Log::ERROR, exception)
           raise exception
         end
       end

data/lib/ruby_app/rack/duration.rb

@@ -10,7 +10,7 @@ module RubyApp
       end
 
       def call(environment)
-        RubyApp::Log.duration(RubyApp::Log.prefix(self, __method__)) do
+        RubyApp::Log.duration(RubyApp::Log::DEBUG, RubyApp::Log.prefix(self, __method__)) do
           return @application.call(environment)
         end
       end

data/lib/ruby_app/rack/memory.rb

@@ -10,7 +10,7 @@ module RubyApp
       end
 
       def call(environment)
-        RubyApp::Log.memory(RubyApp::Log.prefix(self, __method__)) do
+        RubyApp::Log.memory(RubyApp::Log::DEBUG, RubyApp::Log.prefix(self, __method__)) do
           return @application.call(environment)
         end
       end

data/lib/ruby_app/rack/request.rb

@@ -12,11 +12,14 @@ module RubyApp
       def call(environment)
         RubyApp::Request.create!(environment)
         begin
-          #environment.each do |name, value|
-          #  RubyApp::Log.debug("#{RubyApp::Log.prefix(self, __method__)} environment[#{name.inspect}]=#{value.inspect}")
+          #RubyApp::Request.environment.each do |name, value|
+          #  RubyApp::Log.debug("#{RubyApp::Log.prefix(self, __method__)} RubyApp::Request.environment[#{name.inspect}]=#{value.inspect}")
           #end
           #RubyApp::Log.debug("#{RubyApp::Log.prefix(self, __method__)} RubyApp::Request.request_method=#{RubyApp::Request.request_method.inspect}")
           #RubyApp::Log.debug("#{RubyApp::Log.prefix(self, __method__)} RubyApp::Request.path=#{RubyApp::Request.path.inspect}")
+          #RubyApp::Request.query.each do |name, value|
+          #  RubyApp::Log.debug("#{RubyApp::Log.prefix(self, __method__)} RubyApp::Request.query[#{name.inspect}]=#{value.inspect}")
+          #end
           return @application.call(environment)
         ensure
           RubyApp::Request.destroy!

data/lib/ruby_app/rack/route.rb

@@ -18,30 +18,47 @@ module RubyApp
       end
 
       route(RubyApp::Mixins::RouteMixin::GET, /\/quit/) do |method, path|
-        RubyApp::Log.debug("GET  /quit")
-        RubyApp::Session.quit!
-        RubyApp::Response['Content-Type'] = 'text/html'
-        RubyApp::Response.write(RubyApp::Elements::Pages::QuitPage.new.render(:html))
+        begin
+          RubyApp::Log.duration(RubyApp::Log::INFO, "GET    /quit") do
+            RubyApp::Session.quit!
+            unless RubyApp::Request.query['go']
+              RubyApp::Response['Content-Type'] = 'text/html'
+              RubyApp::Response.write(RubyApp::Elements::Mobile::Documents::QuitDocument.new.render(:html))
+            else
+              RubyApp::Response.redirect(RubyApp::Request.query['go'])
+            end
+          end
+        rescue Exception => exception
+          RubyApp::Log.exception(RubyApp::Log::ERROR, exception)
+          raise
+        end
       end
 
       route(RubyApp::Mixins::RouteMixin::GET, /\/elements\/([^\.]+)\.([^\.\?]+)/) do |method, path, element_id, format|
-        RubyApp::Response['Content-Type'] = RubyApp::Element.get_content_type(format)
         begin
           element = RubyApp::Element.get_element(element_id)
-          RubyApp::Log.duration("GET  #{element.class} #{format}") do
-            RubyApp::Response.write(element.render(format.to_sym))
+          RubyApp::Log.duration(RubyApp::Log::INFO, "GET    #{element.class} #{format}") do
+            RubyApp::Response['Content-Type'] = RubyApp::Response.get_content_type(format)
+            RubyApp::Response.write_from_cache(element, format.to_sym)
+            #RubyApp::Response.write(element.render(format.to_sym))
           end
         rescue Exception => exception
-          RubyApp::Response.write(RubyApp::Elements::ExceptionElement.new(exception).render(format.to_sym))
+          RubyApp::Log.exception(RubyApp::Log::ERROR, exception)
+          raise
         end
       end
 
       route(RubyApp::Mixins::RouteMixin::GET, /\.([^\.\?]+)/) do |method, path, format|
-        RubyApp::Response['Content-Type'] = RubyApp::Element.get_content_type(format)
-        page = RubyApp::Session.pages.last
-        RubyApp::Log.duration("GET  #{page.class} #{format}") do
-          RubyApp::Response.write_from_cache(page, format.to_sym)
-          #RubyApp::Response.write(page.render(format.to_sym))
+        begin
+          document = RubyApp::Session.document
+          RubyApp::Log.duration(RubyApp::Log::INFO, "GET    #{document.class} #{format}") do
+            RubyApp::Response['Content-Type'] = RubyApp::Response.get_content_type(format)
+            RubyApp::Response.write_from_cache(document, format.to_sym)
+            #RubyApp::Response.write(document.render(format.to_sym))
+          end
+        rescue Exception => exception
+          RubyApp::Log.exception(RubyApp::Log::ERROR, exception)
+          raise
         end
       end
 
@@ -50,14 +67,21 @@ module RubyApp
       end
 
       route(RubyApp::Mixins::RouteMixin::POST, /.*/) do |method, path|
-        RubyApp::Response['Content-Type'] = 'application/json'
         begin
+          #RubyApp::Request.POST.each do |name, value|
+          #  unless ['_class'].include?(name)
+          #    RubyApp::Log.debug("POST  #{name.to_sym.inspect}=#{value.inspect}")
+          #  end
+          #end
           event = RubyApp::Element::Event.from_hash(RubyApp::Request.POST)
-          RubyApp::Log.duration("POST #{event.class}") do
-            event.process!
+          RubyApp::Log.duration(RubyApp::Log::INFO, "POST   #{event.class}") do
+            RubyApp::Session.process_event!(event)
+            RubyApp::Response['Content-Type'] = 'application/json'
             RubyApp::Response.write(Yajl::Encoder.new.encode(event.to_hash))
           end
         rescue Exception => exception
+          RubyApp::Log.exception(RubyApp::Log::ERROR, exception)
+          RubyApp::Response['Content-Type'] = 'application/json'
           RubyApp::Response.write(Yajl::Encoder.new.encode(RubyApp::Element::ExceptionEvent.new(exception).to_hash))
         end
       end

data/lib/ruby_app/rack/session.rb

@@ -10,7 +10,7 @@ module RubyApp
       end
 
       def call(environment)
-        RubyApp::Session.load!(RubyApp::Request.cookies['_session'])
+        RubyApp::Session.load!(RubyApp::Request.cookies['_session'], RubyApp::Request.query['script'])
         begin
           #RubyApp::Log.debug("#{RubyApp::Log.prefix(self, __method__)} RubyApp::Session.session_id=#{RubyApp::Session.session_id.inspect}")
           #RubyApp::Log.debug("#{RubyApp::Log.prefix(self, __method__)} RubyApp::Session.expires=#{RubyApp::Session.expires.inspect}")

data/lib/ruby_app/request.rb

@@ -24,10 +24,6 @@ module RubyApp
       self.params
     end
 
-    def quit?
-      self.path =~ /\/quit/
-    end
-
     def self.get
       Thread.current[:_request]
     end

data/lib/ruby_app/response.rb

@@ -2,6 +2,7 @@ require 'rubygems'
 require 'bundler/setup'
 
 require 'facets/string/interpolate'
+require 'mime/types'
 require 'rack'
 
 module RubyApp
@@ -11,12 +12,12 @@ module RubyApp
     extend RubyApp::Mixins::DelegateMixin
     extend RubyApp::Mixins::ConfigurationMixin
 
-    def rendered?(template)
-      return @rendered.key?(template)
+    def rendered?(element, template)
+      return element.is_a?(Class) && @templates.include?(template)
     end
 
-    def rendered(template)
-      @rendered[template] = true
+    def rendered(element, template)
+      @templates.push(template) if element.is_a?(Class) unless @templates.include?(template)
     end
 
     def content_for(element, format, name, value = nil, &block)
@@ -31,7 +32,7 @@ module RubyApp
 
     def write_from_cache(element, format)
       if RubyApp::Response.configuration.cache.formats.include?(format)
-        cache = element.cache(format)
+        cache = element.get_cache(format)
         if RubyApp::Response.configuration.cache.read? && File.exists?(cache)
           #RubyApp::Log.debug("#{RubyApp::Log.prefix(self, __method__)} READ  #{cache.inspect}")
           self.write(File.read(cache))
@@ -64,12 +65,16 @@ module RubyApp
       Thread.current[:_response] = nil
     end
 
+    def self.get_content_type(format)
+      return ( mime_type = MIME::Types.type_for(format)[0] ) ? mime_type.content_type : 'text/plain'
+    end
+
     private
 
       def initialize
         super
         self['Cache-Control'] = 'no-cache'
-        @rendered = {}
+        @templates = []
         @content = {}
       end