RubyApp 0.0.91 → 0.2.0

data/lib/ruby_app/mixins/translate_mixin.rb

@@ -3,7 +3,7 @@ module RubyApp
   module Mixins
 
     module TranslateMixin
-      require 'ruby_app/language'
+      require 'ruby_app'
 
       def translate
 
@@ -25,7 +25,7 @@ module RubyApp
       end
 
       def localize(*parameters)
-        RubyApp::Language.l(*parameters)
+        return RubyApp::Language.l(*parameters)
       end
 
     end

data/lib/ruby_app/rack.rb

@@ -0,0 +1,8 @@
+require 'ruby_app/rack/application'
+require 'ruby_app/rack/duration'
+require 'ruby_app/rack/language'
+require 'ruby_app/rack/memory'
+require 'ruby_app/rack/request'
+require 'ruby_app/rack/response'
+require 'ruby_app/rack/session'
+require 'ruby_app/rack/route'

data/lib/ruby_app/rack/application.rb

@@ -1,20 +1,24 @@
 module RubyApp
 
   module Rack
-    require 'ruby_app/application'
-    require 'ruby_app/log'
-    require 'ruby_app/request'
+    require 'ruby_app'
 
     class Application
 
       def initialize(application, options = {})
         @application = application
-        RubyApp::Application.create!(options)
+        RubyApp::Configuration.load!(options[:configuration_paths])
+        RubyApp::Log.open!
+        RubyApp::Application.create!
+        RubyApp::Session.start_thread!
       end
 
       def call(environment)
-        RubyApp::Request.create!(environment) do
+        begin
           return @application.call(environment)
+        rescue Exception => exception
+          RubyApp::Log.exception(exception)
+          raise exception
         end
       end
 

data/lib/ruby_app/rack/duration.rb

@@ -0,0 +1,22 @@
+module RubyApp
+
+  module Rack
+    require 'ruby_app'
+
+    class Duration
+
+      def initialize(application)
+        @application = application
+      end
+
+      def call(environment)
+        RubyApp::Log.duration(RubyApp::Log.prefix(self, __method__)) do
+          return @application.call(environment)
+        end
+      end
+
+    end
+
+  end
+
+end

data/lib/ruby_app/rack/language.rb

@@ -0,0 +1,26 @@
+module RubyApp
+
+  module Rack
+    require 'ruby_app'
+
+    class Language
+
+      def initialize(application)
+        @application = application
+      end
+
+      def call(environment)
+        RubyApp::Language.load!(RubyApp::Request.language)
+        begin
+          #RubyApp::Log.debug("#{RubyApp::Log.prefix(self, __method__)} RubyApp::Language.locale.code=#{RubyApp::Language.locale.code.inspect}")
+          return @application.call(environment)
+        ensure
+          RubyApp::Language.unload!
+        end
+      end
+
+    end
+
+  end
+
+end

data/lib/ruby_app/rack/memory.rb

@@ -0,0 +1,22 @@
+module RubyApp
+
+  module Rack
+    require 'ruby_app'
+
+    class Memory
+
+      def initialize(application)
+        @application = application
+      end
+
+      def call(environment)
+        RubyApp::Log.memory(RubyApp::Log.prefix(self, __method__)) do
+          return @application.call(environment)
+        end
+      end
+
+    end
+
+  end
+
+end

data/lib/ruby_app/rack/request.rb

@@ -0,0 +1,27 @@
+module RubyApp
+
+  module Rack
+
+    class Request
+      require 'ruby_app'
+
+      def initialize(application)
+        @application = application
+      end
+
+      def call(environment)
+        RubyApp::Request.create!(environment)
+        begin
+          #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}")
+          return @application.call(environment)
+        ensure
+          RubyApp::Request.destroy!
+        end
+      end
+
+    end
+
+  end
+
+end

data/lib/ruby_app/rack/response.rb

@@ -0,0 +1,26 @@
+module RubyApp
+
+  module Rack
+
+    class Response
+      require 'ruby_app'
+
+      def initialize(application)
+        @application = application
+      end
+
+      def call(environment)
+        RubyApp::Response.create!
+        begin
+          @application.call(environment)
+          return RubyApp::Response.finish
+        ensure
+          RubyApp::Response.destroy!
+        end
+      end
+
+    end
+
+  end
+
+end

data/lib/ruby_app/rack/route.rb

@@ -1,129 +1,66 @@
 require 'rubygems'
 require 'bundler/setup'
 
-require 'mime/types'
 require 'yajl'
 
 module RubyApp
 
   module Rack
-    require 'ruby_app/element'
-    require 'ruby_app/elements/exception_element'
-    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'
+    require 'ruby_app'
+    require 'ruby_app/elements'
+    require 'ruby_app/mixins'
 
     class Route
       extend RubyApp::Mixins::RouteMixin
 
       def call(environment)
-        self.class.do_route(RubyApp::Request.request_method, RubyApp::Request.path)
+        RubyApp::Rack::Route.do_route(RubyApp::Request.request_method, RubyApp::Request.path)
       end
 
       route(RubyApp::Mixins::RouteMixin::GET, /\/quit/) do |method, path|
-        begin
-          [
-            200,
-            {
-                'Cache-Control' => 'no-cache',
-                'Content-Type' => 'text/html'
-            },
-            [ RubyApp::Elements::Pages::QuitPage.new.render(:html) ]
-          ]
-        rescue Exception => exception
-          RubyApp::Log.exception(exception)
-          raise exception
-        end
+        RubyApp::Log.debug("#{RubyApp::Session.session_id} GET  /quit")
+        RubyApp::Session.quit!
+        RubyApp::Response['Content-Type'] = 'text/html'
+        RubyApp::Response.write(RubyApp::Elements::Pages::QuitPage.new.render(:html))
       end
 
       route(RubyApp::Mixins::RouteMixin::GET, /\/elements\/([^\.]+)\.([^\.\?]+)/) do |method, path, element_id, format|
+        RubyApp::Response['Content-Type'] = RubyApp::Element.get_content_type(format)
         begin
-          [
-            200,
-            {
-              'Cache-Control' => 'no-cache',
-              'Content-Type' => RubyApp::Rack::Route.get_content_type(format)
-            },
-            [ RubyApp::Element.get_element(element_id).render(format.to_sym) ]
-          ]
+          element = RubyApp::Element.get_element(element_id)
+          RubyApp::Log.duration("#{RubyApp::Session.session_id} GET  #{element.class} #{format}") do
+            RubyApp::Response.write(element.render(format.to_sym))
+          end
         rescue Exception => exception
-          RubyApp::Log.exception(exception)
-          [
-            200,
-            {
-              'Cache-Control' => 'no-cache',
-              'Content-Type' => RubyApp::Rack::Route.get_content_type(format)
-            },
-            [ RubyApp::Elements::ExceptionElement.new(exception).render(format.to_sym) ]
-          ]
+          RubyApp::Response.write(RubyApp::Elements::ExceptionElement.new(exception).render(format.to_sym))
         end
       end
 
       route(RubyApp::Mixins::RouteMixin::GET, /\.([^\.\?]+)/) do |method, path, format|
-        begin
-          [
-            200,
-            {
-              'Cache-Control' => 'no-cache',
-              'Content-Type' => RubyApp::Rack::Route.get_content_type(format)
-            },
-            [
-              RubyApp::Log.duration("#{self}.route method=#{method.inspect} path=#{path.inspect} format=#{format.to_sym.inspect} RubyApp::Session.pages.last=#{RubyApp::Session.pages.last.class}") do
-                RubyApp::Session.pages.last.render(format.to_sym)
-              end
-            ]
-          ]
-        rescue Exception => exception
-          RubyApp::Log.exception(exception)
-          raise exception
+        RubyApp::Response['Content-Type'] = RubyApp::Element.get_content_type(format)
+        page = RubyApp::Session.pages.last
+        RubyApp::Log.duration("#{RubyApp::Session.session_id} GET  #{page.class} #{format}") do
+          RubyApp::Response.write(page.render(format.to_sym))
         end
       end
 
       route(RubyApp::Mixins::RouteMixin::GET, /.*/) do |method, path|
-        RubyApp::Log.debug("#{self}.route method=#{method.inspect} path=#{path.inspect}")
-        do_route(RubyApp::Mixins::RouteMixin::GET, '/.html')
+        RubyApp::Rack::Route.do_route(RubyApp::Mixins::RouteMixin::GET, '/.html')
       end
 
       route(RubyApp::Mixins::RouteMixin::POST, /.*/) do |method, path|
+        RubyApp::Response['Content-Type'] = 'application/json'
         begin
-          if RubyApp::Session.session_id == RubyApp::Request.POST['session_id']
-            event = RubyApp::Element::Event.from_hash(RubyApp::Request.POST)
+          event = RubyApp::Element::Event.from_hash(RubyApp::Request.POST)
+          RubyApp::Log.duration("#{RubyApp::Session.session_id} POST #{event.class}") do
             event.process!
-            [
-              200,
-              {
-                'Cache-Control' => 'no-cache',
-                'Content-Type' => 'application/json'
-              },
-              [
-                RubyApp::Log.duration("#{self}.route method=#{method.inspect} path=#{path.inspect} POST['_class']=#{RubyApp::Request.POST['_class']}") do
-                  Yajl::Encoder.new.encode(event.to_hash)
-                end
-              ]
-            ]
-          else
-            raise RubyApp::Exceptions::SessionInvalidException.new(RubyApp::Request.POST['session_id'])
+            RubyApp::Response.write(Yajl::Encoder.new.encode(event.to_hash))
           end
         rescue Exception => exception
-          RubyApp::Log.exception(exception)
-          [
-            200,
-            {
-              'Cache-Control' => 'no-cache',
-              'Content-Type' => 'application/json'
-            },
-            [ Yajl::Encoder.new.encode(RubyApp::Element::ExceptionEvent.new(exception).to_hash) ]
-          ]
+          RubyApp::Response.write(Yajl::Encoder.new.encode(RubyApp::Element::ExceptionEvent.new(exception).to_hash))
         end
       end
 
-      def self.get_content_type(format)
-        ( mime_type = MIME::Types.type_for(format)[0] ) ? mime_type.content_type : 'text/plain'
-      end
-
     end
 
   end

data/lib/ruby_app/rack/session.rb

@@ -0,0 +1,31 @@
+module RubyApp
+
+  module Rack
+
+    class Session
+      require 'ruby_app'
+
+      def initialize(application)
+        @application = application
+      end
+
+      def call(environment)
+        RubyApp::Session.load!(RubyApp::Request.cookies['_session'])
+        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}")
+          #RubyApp::Log.debug("#{RubyApp::Log.prefix(self, __method__)}                    (now)=#{Time.now.inspect}")
+          RubyApp::Response.set_cookie('_session', { :value    => RubyApp::Session.session_id,
+                                                     :expires  => RubyApp::Session.expires,
+                                                     :path     => '/'})
+          return @application.call(environment)
+        ensure
+          RubyApp::Session.unload!
+        end
+      end
+
+    end
+
+  end
+
+end

data/lib/ruby_app/request.rb

@@ -1,22 +1,17 @@
 require 'rubygems'
 require 'bundler/setup'
 
-require 'facets/string/interpolate'
 require 'rack'
 
 module RubyApp
-  require 'ruby_app/application'
-  require 'ruby_app/language'
-  require 'ruby_app/mixins/delegate_mixin'
-  require 'ruby_app/mixins/render_mixin'
-  require 'ruby_app/session'
+  require 'ruby_app/mixins'
 
   class Request < ::Rack::Request
     extend RubyApp::Mixins::DelegateMixin
 
     def language
       self.fullpath =~ /^\/([^\/\?]+)/
-      $1 || RubyApp::Application.options.default_language
+      return $1
     end
 
     def query
@@ -27,26 +22,8 @@ module RubyApp
       self.params
     end
 
-    def rendered?(template)
-      @rendered.key?(template)
-    end
-
-    def rendered(template)
-      @rendered[template] = true
-    end
-
-    def content_for(element, name, value = nil, &block)
-      @content[element] ||= {}
-      @content[element][name] = block_given? ? block : String.interpolate { value }
-    end
-
-    def get_content(element, name)
-      @content[element] ||= {}
-      return @content[element][name]
-    end
-
-    def clear_content(element)
-      @content[element] ||= {}
+    def quit?
+      self.path =~ /\/quit/
     end
 
     def self.get
@@ -55,32 +32,6 @@ module RubyApp
 
     def self.create!(environment = RubyApp::Application.environment)
       Thread.current[:_request] = RubyApp::Request.new(environment)
-
-      if block_given?
-        begin
-          RubyApp::Language.load! do
-            RubyApp::Session.create! do
-              return yield
-            end
-          end
-        ensure
-          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!
@@ -91,8 +42,6 @@ module RubyApp
 
       def initialize(environment)
         super(environment)
-        @rendered = {}
-        @content = {}
       end
 
   end