RubyApp 0.2.1 → 0.2.2

data/Gemfile.lock

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

data/lib/ruby_app/log.rb

@@ -6,12 +6,21 @@ require 'fileutils'
 require 'logger'
 
 module RubyApp
+  require 'ruby_app'
   require 'ruby_app/mixins'
 
   class Log < ::Logger
     extend RubyApp::Mixins::ConfigurationMixin
     extend RubyApp::Mixins::DelegateMixin
 
+    class Formatter < ::Logger::Formatter
+
+      def call(severity, time, application, message)
+        return "#{severity} | #{time.strftime('%Y-%m-%d %H:%M:%S %Z')} | #{RubyApp::Session.exists? ? RubyApp::Session.session_id : '-'} | #{RubyApp::Session.exists? && RubyApp::Session.identity ? RubyApp::Session.identity.url : '-'} | #{message}\n"
+      end
+
+    end
+
     def duration(message)
       start = Time.now
       begin
@@ -69,6 +78,7 @@ module RubyApp
 
       def initialize(path)
         super(path)
+        self.formatter = RubyApp::Log::Formatter.new
       end
 
   end

data/lib/ruby_app/mixins/delegate_mixin.rb

@@ -4,6 +4,10 @@ module RubyApp
 
     module DelegateMixin
 
+      def exists?
+        return self.get != nil
+      end
+
       def method_missing(name, *arguments, &block)
         return self.get.send(name, *arguments, &block)
       end

data/lib/ruby_app/rack/route.rb

@@ -18,7 +18,7 @@ module RubyApp
       end
 
       route(RubyApp::Mixins::RouteMixin::GET, /\/quit/) do |method, path|
-        RubyApp::Log.debug("#{RubyApp::Session.session_id} GET  /quit")
+        RubyApp::Log.debug("GET  /quit")
         RubyApp::Session.quit!
         RubyApp::Response['Content-Type'] = 'text/html'
         RubyApp::Response.write(RubyApp::Elements::Pages::QuitPage.new.render(:html))
@@ -28,7 +28,7 @@ module RubyApp
         RubyApp::Response['Content-Type'] = RubyApp::Element.get_content_type(format)
         begin
           element = RubyApp::Element.get_element(element_id)
-          RubyApp::Log.duration("#{RubyApp::Session.session_id} GET  #{element.class} #{format}") do
+          RubyApp::Log.duration("GET  #{element.class} #{format}") do
             RubyApp::Response.write(element.render(format.to_sym))
           end
         rescue Exception => exception
@@ -39,7 +39,7 @@ module RubyApp
       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("#{RubyApp::Session.session_id} GET  #{page.class} #{format}") do
+        RubyApp::Log.duration("GET  #{page.class} #{format}") do
           RubyApp::Response.write(page.render(format.to_sym))
         end
       end
@@ -52,7 +52,7 @@ module RubyApp
         RubyApp::Response['Content-Type'] = 'application/json'
         begin
           event = RubyApp::Element::Event.from_hash(RubyApp::Request.POST)
-          RubyApp::Log.duration("#{RubyApp::Session.session_id} POST #{event.class}") do
+          RubyApp::Log.duration("POST #{event.class}") do
             event.process!
             RubyApp::Response.write(Yajl::Encoder.new.encode(event.to_hash))
           end

data/lib/ruby_app/version.rb

@@ -1,4 +1,4 @@
 module RubyApp
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
   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: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Frank G. Ficnar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-21 00:00:00 Z
+date: 2012-03-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement