RubyApp 0.0.8 → 0.0.9

data/lib/ruby_app/log.rb

@@ -1,25 +1,35 @@
 require 'logger'
 
 module RubyApp
-  require 'ruby_app/mixins/delegate'
+  require 'ruby_app/application'
+  require 'ruby_app/mixins/delegate_mixin'
 
   class Log < ::Logger
-    extend RubyApp::Mixins::Delegate
+    extend RubyApp::Mixins::DelegateMixin
+
+    def exception(exception)
+      self.error('-' * 80)
+      self.error("exception=#{exception.class.inspect} #{exception.message}")
+      self.error('-' * 80)
+      self.error(exception.backtrace.join("\n"))
+      self.error('-' * 80)
+    end
 
     def self.get
-      @@_logger
+      @@_log
     end
 
-    def self.open(path)
+    def self.open!
+      path = RubyApp::Application.options.log_path
       directory = File.dirname(path)
       Dir.mkdir(directory) unless File.exists?(directory)
-      @@_logger = RubyApp::Log.new(path)
-      @@_logger.debug("#{self}##{__method__} path=#{path.inspect}")
+      @@_log = RubyApp::Log.new(path)
+      @@_log.debug("#{self}##{__method__} path=#{path.inspect}")
     end
 
-    def self.close
-      @@_logger.close
-      @@_logger = nil
+    def self.close!
+      @@_log.close if @@_log
+      @@_log = nil
     end
 
     private

data/lib/ruby_app/mixins/{configuration.rb → configure_mixin.rb}

@@ -2,10 +2,10 @@ module RubyApp
 
   module Mixins
 
-    module Configuration
+    module ConfigureMixin
       require 'ruby_app/configuration'
 
-      def configuration
+      def configure
 
         name = self.is_a?(Class) ? self.to_s : self.class.to_s
         name.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')

data/lib/ruby_app/mixins/{delegate.rb → delegate_mixin.rb}

@@ -2,7 +2,7 @@ module RubyApp
 
   module Mixins
 
-    module Delegate
+    module DelegateMixin
 
       def method_missing(name, *arguments, &block)
         self.get.send(name, *arguments, &block)

data/lib/ruby_app/mixins/{hash.rb → hash_mixin.rb}

@@ -2,7 +2,7 @@ module RubyApp
 
   module Mixins
 
-    module Hash
+    module HashMixin
 
       def method_missing(name, *arguments)
         if name.to_s.match(/(.*)=/)
@@ -17,3 +17,7 @@ module RubyApp
   end
 
 end
+
+class Hash
+  include RubyApp::Mixins::HashMixin
+end

data/lib/ruby_app/mixins/{render.rb → render_mixin.rb}

@@ -8,11 +8,11 @@ module RubyApp
 
   module Mixins
 
-    module Render
+    module RenderMixin
       require 'ruby_app/log'
 
       def rendered?(template)
-        unless Thread.current[:_rendered].key?(template)
+        unless ( Thread.current[:_rendered] ||= {} ).key?(template)
           yield
           Thread.current[:_rendered][template] = ( Thread.current[:_rendered][template] || 0 ) + 1
         end

data/lib/ruby_app/mixins/{route.rb → route_mixin.rb}

@@ -4,10 +4,10 @@ require 'bundler/setup'
 require 'mime/types'
 
 module RubyApp
-  
+
   module Mixins
-  
-    module Route
+
+    module RouteMixin
 
       GET = 'GET'
       POST = 'POST'
@@ -15,7 +15,7 @@ module RubyApp
       def route(method, pattern, &block)
         self.routes << { :method => method, :pattern => pattern, :block => block }
       end
-      
+
       def do_route(method, path)
         self.routes.each do |route|
           if method == route[:method] and path =~ route[:pattern]
@@ -23,7 +23,7 @@ module RubyApp
           end
         end
       end
-      
+
       def routes
         @_routes ||= []
       end

data/lib/ruby_app/mixins/{template.rb → template_mixin.rb}

@@ -1,9 +1,9 @@
 module RubyApp
-  
+
   module Mixins
-    
-    module Template
-      
+
+    module TemplateMixin
+
       def template_name
 
         name = self.to_s.split('::').last
@@ -13,26 +13,26 @@ module RubyApp
         name.downcase
 
       end
-      
+
       def template_path(format, path)
         (@_template_path ||= {})[format] = File.directory?(path) ? "#{File.join(path, self.template_name)}.*.haml" : path
       end
-      
+
       def exclude_parent_template?(format)
         ( @_exclude_parent_template_formats ||= [] ).include?(:all) || @_exclude_parent_template_formats.include?(format)
       end
-      
+
       def exclude_parent_template(*formats)
         @_exclude_parent_template_formats = formats
       end
-      
+
       def get_templates(format)
         templates = Dir.glob((@_template_path[format] || @_template_path[:all] || "#{File.join(File.dirname(__FILE__), self.template_name)}.*.haml").gsub(/\*/,format.to_s))
         ( templates.length > 0 ? [templates.first] : [] ).concat( ( !self.exclude_parent_template?(format) and self.superclass.respond_to?(:get_templates) ) ? self.superclass.get_templates(format) : [] )
       end
-      
+
     end
-    
+
   end
-  
+
 end

data/lib/ruby_app/mixins/{translate.rb → translate_mixin.rb}

@@ -2,7 +2,7 @@ module RubyApp
 
   module Mixins
 
-    module Translate
+    module TranslateMixin
       require 'ruby_app/language'
 
       def translate

data/lib/ruby_app/rack/application.rb

@@ -2,17 +2,17 @@ module RubyApp
 
   module Rack
     require 'ruby_app/application'
-    require 'ruby_app/log'
+    require 'ruby_app/request'
 
     class Application
 
       def initialize(application, options = {})
         @application = application
-        RubyApp::Application.create(options)
+        RubyApp::Application.create!(options)
       end
 
       def call(environment)
-        RubyApp::Application.execute(environment) do
+        RubyApp::Request.create!(environment) do
           return @application.call(environment)
         end
       end

data/lib/ruby_app/rack/route.rb

@@ -12,17 +12,17 @@ module RubyApp
     require 'ruby_app/elements/pages/exception_page'
     require 'ruby_app/elements/pages/quit_page'
     require 'ruby_app/log'
-    require 'ruby_app/mixins/route'
+    require 'ruby_app/mixins/route_mixin'
     require 'ruby_app/request'
 
     class Route
-      extend RubyApp::Mixins::Route
+      extend RubyApp::Mixins::RouteMixin
 
       def call(environment)
         self.class.do_route(RubyApp::Request.request_method, RubyApp::Request.path)
       end
 
-      route(RubyApp::Mixins::Route::GET, /\/quit/) do |method, path|
+      route(RubyApp::Mixins::RouteMixin::GET, /\/quit/) do |method, path|
         RubyApp::Log.debug("#{self}.route method=#{method.inspect} path=#{path.inspect}")
         begin
           [
@@ -31,11 +31,7 @@ module RubyApp
             [ RubyApp::Elements::Pages::QuitPage.new.render(:html) ]
           ]
         rescue Exception => exception
-          RubyApp::Log.error('-' * 80)
-          RubyApp::Log.error("exception=#{exception.class.inspect} #{exception.message}")
-          RubyApp::Log.error('-' * 80)
-          RubyApp::Log.error(exception.backtrace.join("\n"))
-          RubyApp::Log.error('-' * 80)
+          RubyApp::Log.exception(exception)
           [
             200,
             { 'content-type' => 'text/html' },
@@ -44,7 +40,7 @@ module RubyApp
         end
       end
 
-      route(RubyApp::Mixins::Route::GET, /\/elements\/([^\.]+)\.([^\.\?]+)/) do |method, path, element_id, format|
+      route(RubyApp::Mixins::RouteMixin::GET, /\/elements\/([^\.]+)\.([^\.\?]+)/) do |method, path, element_id, format|
         RubyApp::Log.debug("#{self}.route method=#{method.inspect} path=#{path.inspect} element_id=#{element_id.inspect} format=#{format.to_sym.inspect}")
         begin
           [
@@ -53,11 +49,7 @@ module RubyApp
             [ RubyApp::Element.get_element(element_id).render(format.to_sym) ]
           ]
         rescue Exception => exception
-          RubyApp::Log.error('-' * 80)
-          RubyApp::Log.error("exception=#{exception.class.inspect} #{exception.message}")
-          RubyApp::Log.error('-' * 80)
-          RubyApp::Log.error(exception.backtrace.join("\n"))
-          RubyApp::Log.error('-' * 80)
+          RubyApp::Log.exception(exception)
           [
             200,
             { 'content-type' => RubyApp::Rack::Route.get_content_type(format) },
@@ -66,7 +58,7 @@ module RubyApp
         end
       end
 
-      route(RubyApp::Mixins::Route::GET, /\.([^\.\?]+)/) do |method, path, format|
+      route(RubyApp::Mixins::RouteMixin::GET, /\.([^\.\?]+)/) do |method, path, format|
         RubyApp::Log.debug("#{self}.route method=#{method.inspect} path=#{path.inspect} format=#{format.to_sym.inspect}")
         begin
           [
@@ -75,11 +67,7 @@ module RubyApp
             [ RubyApp::Session.pages.last.render(format.to_sym) ]
           ]
         rescue Exception => exception
-          RubyApp::Log.error('-' * 80)
-          RubyApp::Log.error("exception=#{exception.class.inspect} #{exception.message}")
-          RubyApp::Log.error('-' * 80)
-          RubyApp::Log.error(exception.backtrace.join("\n"))
-          RubyApp::Log.error('-' * 80)
+          RubyApp::Log.exception(exception)
           [
             200,
             { 'content-type' => RubyApp::Rack::Route.get_content_type(format) },
@@ -88,31 +76,27 @@ module RubyApp
         end
       end
 
-      route(RubyApp::Mixins::Route::GET, /.*/) do |method, path|
+      route(RubyApp::Mixins::RouteMixin::GET, /.*/) do |method, path|
         RubyApp::Log.debug("#{self}.route method=#{method.inspect} path=#{path.inspect}")
-        do_route(RubyApp::Mixins::Route::GET, '/.html')
+        do_route(RubyApp::Mixins::RouteMixin::GET, '/.html')
       end
 
-      route(RubyApp::Mixins::Route::POST, /.*/) do |method, path|
+      route(RubyApp::Mixins::RouteMixin::POST, /.*/) do |method, path|
         RubyApp::Log.debug("#{self}.post(...) method=#{method.inspect} path=#{path.inspect} POST=#{RubyApp::Request.POST.inspect}")
         begin
           event = RubyApp::Element::Event.from_hash(RubyApp::Request.POST)
-          RubyApp::Session.process(event)
+          event.process!
           [
             200,
             { 'content-type' => 'application/json' },
             [ Yajl::Encoder.new.encode(event.to_hash) ]
           ]
         rescue Exception => exception
-          RubyApp::Log.error('-' * 80)
-          RubyApp::Log.error("exception=#{exception.class.inspect} #{exception.message}")
-          RubyApp::Log.error('-' * 80)
-          RubyApp::Log.error(exception.backtrace.join("\n"))
-          RubyApp::Log.error('-' * 80)
+          RubyApp::Log.exception(exception)
           [
             200,
             { 'content-type' => 'application/json' },
-            [ Yajl::Encoder.new.encode(RubyApp::Element::ExceptionEvent.new(exception).to_hash) ]
+            [ Yajl::Encoder.new.encode(RubyApp::Element::ExceptionEvent.new(RubyApp::Request.POST, exception).to_hash) ]
           ]
         end
       end

data/lib/ruby_app/request.rb

@@ -5,41 +5,64 @@ require 'rack'
 
 module RubyApp
   require 'ruby_app/application'
-  require 'ruby_app/mixins/delegate'
+  require 'ruby_app/language'
+  require 'ruby_app/mixins/delegate_mixin'
+  require 'ruby_app/mixins/render_mixin'
+  require 'ruby_app/session'
 
   class Request < ::Rack::Request
-    extend RubyApp::Mixins::Delegate
+    extend RubyApp::Mixins::DelegateMixin
 
-    def parameters
-      self.params
+    def language
+      self.fullpath =~ /^\/([^\/\?]+)/
+      $1 || RubyApp::Application.options.default_language
     end
 
     def query
       ::Rack::Utils.parse_query(self.query_string)
     end
 
-    def language
-      self.fullpath =~ /^\/([^\/\?]+)/
-      $1
+    def parameters
+      self.params
     end
 
     def self.get
       Thread.current[:_request]
     end
 
-    def self.create(environment)
-      request = RubyApp::Request.new(environment)
-      Thread.current[:_request] = request
+    def self.create!(environment = RubyApp::Application.environment)
+      Thread.current[:_request] = RubyApp::Request.new(environment)
+      Thread.current[:_rendered] = {}
+
       if block_given?
         begin
-          yield request
+          RubyApp::Language.load! do
+            RubyApp::Session.create! do
+              return yield
+            end
+          end
         ensure
-          Thread.current[:_request] = nil
+          self.destroy!
+        end
+      else
+        begin
+          RubyApp::Language.load!
+          begin
+            RubyApp::Session.create!
+          rescue
+            RubyApp::Language.unload!
+            raise
+          end
+        rescue
+          self.destroy!
+          raise
         end
       end
+
     end
 
-    def self.destroy
+    def self.destroy!
+      Thread.current[:_rendered] = nil
       Thread.current[:_request] = nil
     end
 

data/lib/ruby_app/session.rb

@@ -1,18 +1,18 @@
 module RubyApp
-  require 'ruby_app/mixins/configuration'
-  require 'ruby_app/mixins/delegate'
-  require 'ruby_app/mixins/translate'
+  require 'ruby_app/application'
+  require 'ruby_app/mixins/configure_mixin'
+  require 'ruby_app/mixins/delegate_mixin'
+  require 'ruby_app/mixins/translate_mixin'
   require 'ruby_app/request'
 
   class Session
-    extend RubyApp::Mixins::Delegate
-    include RubyApp::Mixins::Hash
-    extend RubyApp::Mixins::Configuration
-    include RubyApp::Mixins::Configuration
-    extend RubyApp::Mixins::Translate
+    extend RubyApp::Mixins::DelegateMixin
+    include RubyApp::Mixins::HashMixin
+    include RubyApp::Mixins::ConfigureMixin
+    extend RubyApp::Mixins::TranslateMixin
 
     class Identity
-      include RubyApp::Mixins::Hash
+      include RubyApp::Mixins::HashMixin
 
       attr_reader :url
 
@@ -27,12 +27,12 @@ module RubyApp
 
     end
 
-    attr_reader :pages, :data
-    attr_accessor :identity
+    attr_reader :pages
+    attr_accessor :identity, :data
 
     def initialize(page = nil)
       require 'ruby_app/elements/pages/default_page'
-      @pages = [page || RubyApp::Elements::Pages::DefaultPage.new]
+      @pages = [ page || RubyApp::Elements::Pages::DefaultPage.new ]
       @dialogs = []
       @identity = nil
       @data = {}
@@ -67,10 +67,6 @@ module RubyApp
 
     end
 
-    def process(event)
-      event.source.send(:on_event, event)
-    end
-
     def quit
       RubyApp::Request.env['rack.session.options'][:drop] = true
     end
@@ -79,20 +75,18 @@ module RubyApp
       Thread.current[:_session]
     end
 
-    def self.create(_class)
-      session = RubyApp::Request.session[:_session] || _class.new
-      RubyApp::Request.session[:_session] = session
-      Thread.current[:_session] = session
+    def self.create!
+      Thread.current[:_session] = RubyApp::Request.session[:_session] ||= RubyApp::Application.options.session_class.new
       if block_given?
         begin
-          yield session
+          yield
         ensure
-          Thread.current[:_session] = nil
+          self.destroy!
         end
       end
     end
 
-    def self.destroy
+    def self.destroy!
       Thread.current[:_session] = nil
     end