rails_info 0.0.3 → 0.0.4

data/app/assets/stylesheets/rails_info/bootstrap_and_overrides.css.less

@@ -61,3 +61,7 @@ code {
 //
 // Example:
 // @linkColor: #ff0000;
+
+#log_rails_root {
+  width: auto;
+}

data/app/presenters/rails_info/logs/server/action_presenter.rb

@@ -13,7 +13,7 @@ class RailsInfo::Logs::Server::ActionPresenter < ::RailsInfo::Presenter
     html += content_tag(:div, class: 'tabs', id: "tabs-#{@index}") do
       raw(navigation) + raw(body) 
     end
-    
+
     html
   end
   
@@ -24,7 +24,7 @@ class RailsInfo::Logs::Server::ActionPresenter < ::RailsInfo::Presenter
       @tab_index = 0
       
       elements = ''
-      
+
       @tabs_data.keys.select{|tab_key| tab_key.present?}.each do |tab_key| 
         elements += content_tag :li, link_to(tab_key, "#tabs-#{@index}-#{@tab_index}")
         @tab_index += 1
@@ -46,9 +46,17 @@ class RailsInfo::Logs::Server::ActionPresenter < ::RailsInfo::Presenter
   
   def tab(tab_key)
     @content = @tabs_data[tab_key]
-      
+    
     content_tag :div, class: 'tabs', id: "tabs-#{@index}-#{@tab_index}" do
-      raw @content.is_a?(Hash) ? sub_tabs : sub_content_tab
+      html = if tab_key == 'Request'
+        raw render partial: 'rails_info/logs/server/request', locals: { content: @content }
+      else
+        raw @content.is_a?(Hash) ? sub_tabs : sub_content_tab
+      end
+      
+      @tab_index += 1
+      
+      html
     end
   end
   
@@ -65,12 +73,11 @@ class RailsInfo::Logs::Server::ActionPresenter < ::RailsInfo::Presenter
   def sub_content_tab
     content_tag :div, style: 'max-height:400px; width:100%; overflow: auto' do
       if @content.is_a?(Array) 
-        @content.map!{|c| CGI.escapeHTML(c) }.join('<br/><br/>')
+        @content.map!{|c| CGI.escapeHTML(c) }
+        @content = @content.join('<br/><br/>')
       else
         @content = CGI.escapeHTML(@content) 
       end
-      
-      @tab_index += 1
  
       raw @content
     end
@@ -99,7 +106,7 @@ class RailsInfo::Logs::Server::ActionPresenter < ::RailsInfo::Presenter
       
       html += content_tag :div, class: 'tabs', id: "tabs-#{@index}-#{@tab_index}-#{sub_tab_index}" do
         sub_tab_index += 1
-        @tab_index += 1
+        
         raw render partial: 'rails_info/logs/server/table', locals: { sub_content: sub_content }
       end
     end

data/app/presenters/rails_info/logs/server_presenter.rb

@@ -7,7 +7,7 @@ class RailsInfo::Logs::ServerPresenter < ::RailsInfo::Presenter
   
   def accordion
     @action_index = 0
-    
+
     content_tag :div, id: 'actions', class: 'accordions' do
       html = ''
       
@@ -25,8 +25,7 @@ class RailsInfo::Logs::ServerPresenter < ::RailsInfo::Presenter
   
   def write_tabs
     content_tag :div, class: 'tabs', id: 'writes' do
-      write_navigation
-      write_body
+      raw(write_navigation) + raw(write_body)
     end
   end
   
@@ -34,24 +33,31 @@ class RailsInfo::Logs::ServerPresenter < ::RailsInfo::Presenter
     tab_index = 0
     
     content_tag :ul do
+      elements = ''
+      
       @rails_info_log.writes.each do |table_name,data|
-        li = content_tag :li, link_to(table_name, "writes-#{tab_index}")
+        elements += content_tag :li, link_to(table_name, "#writes-#{tab_index}")
         
         tab_index += 1
-        
-        li
       end
+      
+      raw elements
     end
   end
   
   def write_body
     tab_index = 0
     
+    html = ''
+    
     @rails_info_log.writes.each do |table_name,data|
-      content_tag :div, class: 'tabs', id: "writes-#{tab_index}" do
-        tab_index += 1
-        render partial: 'table', locals: { sub_content: data }
+      html += content_tag :div, id: "writes-#{tab_index}" do
+        raw render partial: 'rails_info/logs/server/table', locals: { sub_content: data }
       end
+      
+      tab_index += 1
     end
+    
+    html
   end
 end

data/app/presenters/rails_info/logs/test/rspec_presenter.rb

@@ -8,7 +8,7 @@ class RailsInfo::Logs::Test::RspecPresenter < ::RailsInfo::Presenter
   end
   
   def summary
-    text = ["#{@rails_info_log.hash.keys.length} files"]
+    text = ["#{@rails_info_log.number_of_files} files"]
     text << @rails_info_log.summary unless @rails_info_log.summary.blank?
     
     content_tag :p, text.join(', ')
@@ -17,19 +17,23 @@ class RailsInfo::Logs::Test::RspecPresenter < ::RailsInfo::Presenter
   def accordion
     @index = 0
     
-    content_tag :div, id: 'files', class: 'accordions' do
-      html = ''
+    if @rails_info_log.hash.is_a?(Hash)
+      content_tag :div, id: 'files', class: 'accordions' do
+        html = ''
       
-      @rails_info_log.hash.each do |file, examples|
-        file_presenter = ::RailsInfo::Logs::Test::Rspec::FilePresenter.new(
-          @subject, name: "#{file} (#{examples.length})", 
-          tabs_data: examples, index: @index, rails_root: @rails_info_log.rails_root
-        )
-        @index += 1
-        html += raw file_presenter.tabs
+        @rails_info_log.hash.each do |file, examples|
+          file_presenter = ::RailsInfo::Logs::Test::Rspec::FilePresenter.new(
+            @subject, name: "#{file} (#{examples.length})", 
+            tabs_data: examples, index: @index, rails_root: @rails_info_log.rails_root
+          )
+          @index += 1
+          html += raw file_presenter.tabs
+        end  
+        
+        raw html
       end  
-      
-      raw html
-    end  
+    else
+      content_tag :pre, @rails_info_log.hash.join("\n")
+    end
   end
 end

data/app/views/layouts/_layout.html.erb

@@ -2,6 +2,8 @@
 <html>
 <head>
   <title>Rails Info</title>
+  <meta charset='utf-8'>
+  <meta content='text/html; charset=utf-8' http-equiv='Content-Type'>
   <%= stylesheet_link_tag rails_info_stylesheet, media: 'all' %>
   <%= javascript_include_tag 'rails_info/application' %>
   <%= csrf_meta_tags %>

data/app/views/rails_info/logs/server/_request.html.erb

@@ -0,0 +1,18 @@
+<div>
+  <div>
+    <strong>Route:</strong> <%= content['Route']%> | 
+    <strong>Format:</strong> <%= content['Format']%>
+  </div>
+<% if content['Parameters'].present? %>
+  <hr/>
+  <fieldset>
+    <legend><strong>Parameters</strong>
+    <div>
+      <%= render partial: 'rails_info/logs/server/table', locals: { 
+          sub_content: { 'columns' => content['Parameters'].keys, 'rows' => [content['Parameters']] } 
+        }
+      %>
+    </div>
+  </fieldset>
+<% end %>
+</div>

data/app/views/rails_info/logs/server/_table.html.erb

@@ -1,7 +1,9 @@
 <div style="max-height:400px; width:100%; overflow: auto">
-  <table>
+  <table class="table table-striped">
     <thead>
-      <th><%= raw sub_content['columns'].uniq.join('</th><th>') %></th>
+      <tr>
+        <th><%= raw sub_content['columns'].uniq.join('</th><th>') %></th>
+      </tr>
     </thead>
     <tbody>
       <% sub_content['rows'].each do |row| %>

data/app/views/rails_info/logs/server/new.html.erb

@@ -1,8 +1,3 @@
-<style type="text/css">
-.ui-widget {
-    font-size: xx-small;
-}
-</style>
 <% form_tag rails_info_server_log_path do %>
   <%= check_box_tag 'debug' %> debug? 
   <p>
@@ -15,5 +10,15 @@
     <%= submit_tag 'submit' %>
   </p>
 <% end %>
+<ul class="nav nav-tabs nav-stacked">
+  <li><a name="top" href="#">1 ) Actions</a></li>
+  <li><a href="#writes">2 ) Writes</a></li>
+</ul>
+<hr/>
+<h3><a href="#top">1 ) Actions</a></h3>
+<hr/>
 <%= raw @rails_info_log.accordion %>
+<hr/>
+<h3><a name="writes" href="#top">2 ) Writes</a></h3>
+<hr/>
 <%= raw @rails_info_log.write_tabs %>

data/app/views/rails_info/logs/test/rspec/new.html.erb

@@ -2,7 +2,7 @@
   <p>
   <%= check_box_tag 'debug' %> debug? &nbsp;&nbsp;  
   <%= label_tag 'log[rails_root]', raw('<strong>Rails root:</strong>') %> 
-  <%= text_field_tag 'log[rails_root]', (params['log']['rails_root'] rescue "#{Rails.root}/"), size: 50 %> &nbsp;&nbsp;  
+  <%= text_field_tag 'log[rails_root]', (params['log']['rails_root'] rescue "#{Rails.root}/"), size: 75 %> &nbsp;&nbsp;  
   <%= submit_tag 'submit' %>
   </p>
 <% end %>

data/lib/rails_info/logs/server.rb

@@ -7,6 +7,7 @@ class RailsInfo::Logs::Server
     path = options[:log][:path] || "#{Rails.root}/log/"
     env = options[:log][:env] || Rails.env
     @body = options[:log][:body] 
+    @start_after_last_shutdown = options[:log][:start_after_last_shutdown] || true
     
     unless @body
       file_path = "#{path}#{env}.log"
@@ -31,114 +32,67 @@ class RailsInfo::Logs::Server
   private
   
   def process
-    @start_after_last_shutdown = true
-    @body = @body.split("\n").map(&:strip)
+    @body = @body.split("\n").map{|l| l.gsub(/\e/, '')}.map(&:strip)
 
     reset_log
-    
-    group_by_action = false
-
-    @body.each do |line|
-      if line.match('Processing') && line.match('#') && line.match(/\[/)  && line.match(/\]/)
-        # rails 2
-        group_by_action = true
-      elsif line.match('Started') && line.match(' for ') && line.match(' at ') && line.split(' ').length == 9
-        # rails 3
-        group_by_action = true
-      elsif line.match('Processing by') && line.match('#') && line.match(' as ') && line.split(' ').length == 5
-        # rails 3
-        group_by_action = true
-      end
-    end
-
-    unless group_by_action
-      @action = 'no_action_grouping'
-      @log[@action] ||= { 'Parameters' => '', 'WRITE' => {}, 'READ' => [], 'views' => [], 'misc' => [], 'errors' => []}
-    end
+    group_by_action?
     
     @body.each do |line|
       process_line(line)
+      @last_action = @action
     end
 
-    @log.each do |action,tabs|
-      tabs.each do |tab,content|
-        @log[action].delete(tab) if @log[action][tab].blank?
-      end
-    end
-
-    @log.each do |action,tabs|
-      tabs.each do |tab,content|
-        next unless tab == 'WRITE'
-
-        # define WHERE column as last one
-        content.each do |table_name,data|
-          @log[action][tab][table_name]['columns'] << 'WHERE'
-        end
+    delete_empty_tabs
+    set_where_column_as_last_one_in_write_tab
+  end
+  
+  def reset_log
+    @log, @action_indexes, @route, @action, @format, @last_action = {}, {}, '', '', '', ''
+  end
+  
+  def group_by_action?
+    group_by_action = false
 
+    @body.each do |line|
+      if line.match('Processing by') && line.match('#') && line.match(' as ') && line.split(' ').length == 5
+        # rails 3
+        group_by_action = true      
+      #elsif line.match('Processing') && line.match('#') && line.match(/\[/)  && line.match(/\]/)
+      # rails 2
+      #  group_by_action = true
+      #elsif line.match('Started') && line.match(' for ') && line.match(' at ') && line.split(' ').length == 9
+      # rails 3
+      #  group_by_action = true
         break
       end
     end
 
-    @writes.each do |table_name,data|
-      @writes[table_name]['columns'] << 'WHERE'
+    unless group_by_action
+      @action = 'no_action_grouping'
+      @log[@action] ||= { 'Request' => {}, 'WRITE' => {}, 'READ' => [], 'views' => [], 'misc' => [], 'errors' => []}
     end
   end
   
-  def reset_log
-    @log, @action_indexes, @action, @last_action = {}, {}, "", ""
-  end
-
   # TODO: process test.log which don't have action grouping, too
   # TODO: look if newrelic & Co. already does that but are only doing it for the last action
   # TODO: parse stack traces by grouping the lines by file and than method, generate a pseudo web sequence diagram code for files as participants and their methods
   # TODO: integrate a code snippet for each line of the stack trace like brakeman & co. do
   # TODO: extend rails stack trace output by code snippets
   def process_line(line)
-    if line.match('Ctrl-C to shutdown server') && @start_after_last_shutdown
-      reset_log
-    elsif line.match('Processing') && line.match('#') && line.match(/\[/)  && line.match(/\]/)
-      # rails 2 start of action
-      # Processing Clickworker::DashboardsController#show (for 127.0.0.1 at 2011-08-26 12:22:58) [GET]
-      @action = line.split(' ')[1]
-
-      init_log_action
-    #elsif line.match('Started') && line.match(' for ') && line.match(' at ') && line.split(' ').length == 9
-      # rails 3 start of action
-      # Started GET "/orders/815?truncate_length=1000" for 127.0.0.1 at 2011-10-04 19:58:44 +0200
-    elsif line.match('Processing by') && line.match('#') && line.match(' as ') && line.split(' ').length == 5
-      # rails 3 start of action
-      # Processing by OrdersController#show as HTML
-      @action = line.split(' ')[2]
-      
-      init_log_action
-    elsif @action.blank?
-    elsif line.match('Parameters:') && line.match('{') && line.match('}')
-      line = line.split(' ')
-      line.pop
-      @log[@action]['Parameters'] = line.join(' ').strip
-    elsif line.match('INSERT INTO') || line.match('UPDATE')
-      table_name = table_name_from_line(line)
-      
-      data = line.match('INSERT INTO') ? process_insert(line) : process_update(table_name, line)
-      
-      # TaskTemplate Create (0.2ms)   INSERT INTO `task_templates` (`slug`, `name`, `created_at`, `product_id`, `updated_at`, `customer_id`, `state`) VALUES('the code', 'a customer name', '2011-08-26 10:22:54', 2, '2011-08-26 10:22:54', 1002, 'draft')
-      #
-      # InputDataItem Update (0.3ms)   UPDATE `data_items` SET `input` = '<opt>\n <input>\n <__dynamic_form__>\n <df_create>\n <the_input></the_input>\n <the_output>Output field 1</the_output>\n </df_create>\n </__dynamic_form__>\n </input>\n</opt>\n', `updated_at` = '2011-08-26 10:22:55' WHERE `id` = 5485
-      
-
-      @log[@action]['WRITE'][table_name] ||= { 'columns' => ['id'], 'rows' => [] }
-      @writes[table_name] ||= { 'columns' => ['id'], 'rows' => [] }
-      
-      @log[@action]['WRITE'][table_name]['columns'] = @log[@action]['WRITE'][table_name]['columns'].concat(data.keys).uniq
-      @writes[table_name]['columns'] = @writes[table_name]['columns'].concat(data.keys).uniq
-      @log[@action]['WRITE'][table_name]['rows'] << data
-      @writes[table_name]['rows'] << data
-    elsif (line.match('Load') && line.match('SELECT')) || (line.match('CACHE') && line.match('\(') && line.match('ms\)'))
-      line = line.split(')')
-      line.shift
-      @log[@action]['READ'] ||= []
-      @log[@action]['READ'] << line.join(')').strip
-    elsif line.match('Rendered') && line.match('\(') && line.match('ms\)')
+    return if line.blank?
+    
+    reset_log and return if line.match('Ctrl-C to shutdown server') && @start_after_last_shutdown
+    
+    parse_route(line) and return
+    parse_action(line) and return
+    
+    return if @action.blank?
+    
+    parse_request(line) and return
+    parse_read(line) and return
+    parse_write(line) and return
+    
+    if line.match('Rendered') && line.match('\(') && line.match('ms\)')
       @log[@action]['Views'] ||= []
       line = line.split('Rendered')
       line.shift
@@ -154,21 +108,123 @@ class RailsInfo::Logs::Server
     else
       @log[@action]['misc'] << line
     end
-
-    @last_action = @action
   end
   
-  def table_name_from_line(line)
-    line = line.split(')')
-    line.shift
-    line = line.join(')')
+  def delete_empty_tabs
+    @log.each do |action,tabs|
+      tabs.each do |tab,content|
+        @log[action].delete(tab) if @log[action][tab].blank?
+      end
+    end
+  end
+  
+  def set_where_column_as_last_one_in_write_tab
+    @log.select{|a,t| t['WRITE'].is_a?(Hash) }.each do |action,tabs|
+      tabs['WRITE'].each do |table_name,data|
+        @log[action]['WRITE'][table_name]['columns'] << 'WHERE'
+      end
+    end
+    
+    @writes.each {|table_name,data| @writes[table_name]['columns'] << 'WHERE' }
+  end
+  
+  def parse_route(line)
+    reg_exp = /^Started(.{1,})for/
+    
+    return false unless line.match(reg_exp)
+    
+    @route = line.match(reg_exp)[1].strip
+    
+    true
+  end
+  
+  def parse_action(line)
+    reg_exp = /^Processing by {1}(.{1,}) {1}as {1}(.{1,})$/
+    
+    return false unless line.match(reg_exp)
+    
+    @action = line.match(reg_exp)[1].strip
+    @format = line.match(reg_exp)[2].strip
+    
+    init_log_action unless @action.blank?
+    
+    true
+  end
+  
+  def parse_request(line)
+    reg_exp = /^Parameters:( ){1}(\{(.)+\}$)/
+    
+    if line.match(reg_exp)
+      @log[@action]['Request']['Parameters'] = eval(line.match(reg_exp)[2]) rescue line
+      
+      true
+    else
+      false
+    end
+  end
+  
+  def parse_read(line)
+    reg_exp_begin = '\[([0-9]+)m( {2}|)(SELECT.+)'
+    
+    #[1mCommunity Load (0.5ms)  SELECT `communities`.* FROM `communities` WHERE `communities`.`id` = 2 LIMIT 1   
+    reg_exp1 = "#{reg_exp_begin}(\\[)"
+    
+    #[1mCACHE (0.0ms)  SELECT `communities`.* FROM `communities` WHERE `communities`.`deleted` = 0 AND `communities`.`slug` = 'bronze' LIMIT 1
+    reg_exp2 = "#{reg_exp_begin}$"
+    
+    reg_exp = if line.match(reg_exp1)
+      reg_exp1
+    elsif line.match(reg_exp2)
+      reg_exp2
+    else
+      nil
+    end
+    
+    return false unless reg_exp
+    
+    @log[@action]['READ'] ||= [] 
+    @log[@action]['READ'] << line.match(reg_exp)[3].strip
+    
+    true
+  end
+  
+  def parse_write(line)
+    reg_exp = /([0-9]+)m( ){2}((INSERT INTO|UPDATE|DELETE FROM)(.)+)$/
+    
+    return false unless line.match(reg_exp)
+    
+    table_name = line.match(/(INSERT INTO|UPDATE|DELETE FROM) {1}`([a-zA-Z0-9_]+)`/)[2]
+    
+    data = {}
+    
+    if line.match(/([0-9]+)m( ){2}INSERT INTO( ){1}`(.{1,})`( ){1}(.)+$/)
+      data = process_insert(line)
+    elsif line.match(/([0-9]+)m( ){2}UPDATE( ){1}`(.{1,})`( ){1}(.)+$/)
+      data = process_update(table_name, line)
+    elsif line.match(/([0-9]+)m( ){2}DELETE FROM( ){1}`(.{1,})`( ){1}(.)+$/)
+      data = process_delete(table_name, line)
+    else
+      raise NotImplementedError
+    end
+    
+    # TaskTemplate Create (0.2ms)   INSERT INTO `task_templates` (`slug`, `name`, `created_at`, `product_id`, `updated_at`, `customer_id`, `state`) VALUES('the code', 'a customer name', '2011-08-26 10:22:54', 2, '2011-08-26 10:22:54', 1002, 'draft')
+    #
+    # InputDataItem Update (0.3ms)   UPDATE `data_items` SET `input` = '<opt>\n <input>\n <__dynamic_form__>\n <df_create>\n <the_input></the_input>\n <the_output>Output field 1</the_output>\n </df_create>\n </__dynamic_form__>\n </input>\n</opt>\n', `updated_at` = '2011-08-26 10:22:55' WHERE `id` = 5485
+    
 
-    line = line.split('`')
-    line[1]
+    @log[@action]['WRITE'][table_name] ||= { 'columns' => ['-action-', 'id'], 'rows' => [] }
+    @writes[table_name] ||= { 'columns' => ['-action-', 'id'], 'rows' => [] }
+    
+    @log[@action]['WRITE'][table_name]['columns'] = @log[@action]['WRITE'][table_name]['columns'].concat(data.keys).uniq
+    @writes[table_name]['columns'] = @writes[table_name]['columns'].concat(data.keys).uniq
+    @log[@action]['WRITE'][table_name]['rows'] << data
+    @writes[table_name]['rows'] << data
+    
+    true
   end
   
   def process_insert(line)
-    data = {}
+    data = {'-action-' => 'INSERT'}
     
     columns = line.match(/\(`(.)+\)(( |)VALUES)/)[0].split('VALUES').first.strip.gsub('`', '')[1..-2].split(',').map(&:strip)
 
@@ -191,18 +247,17 @@ class RailsInfo::Logs::Server
   end
   
   def process_update(table_name, line)
-    data = {}
+    data = {'-action-' => 'UPDATE'}
+    
+    #  "`editable` = 0, `updated_at` = '2012-07-09 16:33:31'"
+    data_string = line.match(/SET (.+) WHERE/)[1].strip
+    conditions = line.match(/WHERE(.+)$/)[1].strip
+    
+    data_string = data_string.gsub(/(', `|, `)/, "||||").gsub(/(` = '|` = )/, "=").gsub(/(`|')/, '').split('||||')
     
-    # SET `input` = '<opt>\n <input>\n <__dynamic_form__>\n <df_create>\n <the_input></the_input>\n <the_output>Output field 1</the_output>\n </df_create>\n </__dynamic_form__>\n </input>\n</opt>\n', `updated_at` = '2011-08-26 10:22:55' WHERE `id` = 5485
-    line = line.split('WHERE')
-    data_string = line.first
-    conditions = line.last
-    data_string = data_string.split(' '); data_string.shift; data_string = data_string.join(' ')
-    data_string = data_string.gsub("', `", "||||").gsub(", `", '||||').gsub("` = '", "=").split('||||')
-
     data_string.each do |data_element|
       data_element = data_element.split('=')
-      data[data_element.shift.gsub('`', '').strip] = data_element.join('=')
+      data[data_element.shift.strip] = data_element.join('=')
     end
 
     if conditions.match("`#{table_name}`.`id` = ([0-9]+)")
@@ -216,6 +271,23 @@ class RailsInfo::Logs::Server
     data
   end
     
+  def process_delete(table_name, line)
+    data = {'-action-' => 'DELETE'}
+    
+    # ... WHERE `id` = 5485
+    conditions = line.split('WHERE').last
+
+    if conditions.match("`#{table_name}`.`id` = ([0-9]+)")
+      data['id'] = conditions.match("`#{table_name}`.`id` = ([0-9]+)")[0].split('=').last.strip
+    elsif conditions.match(/`id` = ([0-9]+)/)
+      data['id'] = conditions.match(/`id` = ([0-9]+)/)[0].split('=').last.strip
+    end
+
+    data['WHERE'] = conditions
+    
+    data
+  end  
+    
   def init_log_action
     if @action_indexes.has_key?(@action)
       @action_indexes[@action] = @action_indexes[@action] + 1
@@ -225,6 +297,6 @@ class RailsInfo::Logs::Server
 
     @action = "#{@action} ##{@action_indexes[@action]}"
 
-    @log[@action] ||= { 'Parameters' => '', 'WRITE' => {}, 'READ' => [], 'views' => [], 'misc' => [], 'errors' => []}
+    @log[@action] ||= { 'Request' => {'Route' => @route, 'Format' => @format}, 'WRITE' => {}, 'READ' => [], 'views' => [], 'misc' => [], 'errors' => []}
   end
 end

data/lib/rails_info/logs/test/rspec.rb

@@ -26,7 +26,11 @@ class RailsInfo::Logs::Test::Rspec
   end
   
   def hash
-    @log
+    @log.keys.any? ? @log : (@body || [''])
+  end
+  
+  def number_of_files 
+    hash.is_a?(Hash) ? hash.keys.length : 0
   end
   
   def rails_root
@@ -97,6 +101,9 @@ class RailsInfo::Logs::Test::Rspec
         stack_trace << line
       end
     end
+    
+    # free memory if log could be read otherwise keep text in memory to show instead
+    @body = nil if @log.keys.any?
   end
   
   def add_entry(example, failure_code, exception_class, exception_message, stack_trace, after_stack_trace_entry = nil)
@@ -131,9 +138,10 @@ class RailsInfo::Logs::Test::Rspec
     end
     
     if @log[file_name].has_key?(example)
-      raise NotImplementedError.new(
-        "RSpec file #{file_name} not expected to have more than 1 example named #{example.inspect}"
-      )
+      # TODO: increment example tab count in this case
+      #raise NotImplementedError.new(
+      #  "RSpec file #{file_name} not expected to have more than 1 example named #{example.inspect}"
+      #)
     end
 
     @log[file_name][example] = {

data/lib/rails_info/version.rb

@@ -1,3 +1,3 @@
 module RailsInfo
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/lib/rails_info/logs/server_spec.rb

@@ -7,8 +7,8 @@ require 'rails_info/logs'
 require 'rails_info/logs/server'
 
 describe RailsInfo::Logs::Server do
-  before do
-    body = "Started POST \"/users/bronze\" for 127.0.0.1 at 2012-07-05 19:33:44 +0200
+=begin
+ Started POST \"/users/bronze\" for 127.0.0.1 at 2012-07-05 19:33:44 +0200
 Creating scope :visible. Overwriting existing method Reaction.visible.
   Processing by DeviseCustomized::RegistrationsController#create as HTML
   Parameters: {\"utf8\"=>'', \"authenticity_token\"=>\"k4xMIcuqMThMsdlbsVJ7GFgzNDw/HgGGp1ldElFULoY=\", \"user\"=>{\"screen_name\"=>\"mgawlista\", \"email\"=>\"gawlista@googlemail.com\", \"password\"=>\"[FILTERED]\", \"password_confirmation\"=>\"[FILTERED]\"}, \"community_id\"=>\"bronze\"}
@@ -20,31 +20,139 @@ Rendered devise/shared/_header.html.erb (70.4ms)
   Community Load (0.5ms)  SELECT `communities`.* FROM `communities` WHERE `communities`.`id` = 2 LIMIT 1
 Redirected to http://localhost:3000/bronze
   SOLR Request (45541.1ms)  [ path=#<RSolr::Client:0x007fbf26dc8b28> parameters={data: <?xml version=\"1.0\" encoding=\"UTF-8\"?><commit/>, headers: {\"Content-Type\"=>\"text/xml\"}, method: post, params: {:wt=>:ruby}, query: wt=ruby, path: update, uri: http://localhost:8982/solr/update?wt=ruby} ]
-Completed 302 Found in 125493ms"
-  end
-  
+Completed 302 Found in 125493ms 
+=end  
   describe '#process' do
-    context 'just read' do
-      it 'principally works' do
-        body = "Started POST \"/users/bronze\" for 127.0.0.1 at 2012-07-05 19:33:44 +0200
+    describe '#parse_request' do
+      subject {
+        ::RailsInfo::Logs::Server.new(
+          log: { 
+            body: "Started POST \"/users/bronze\" for 127.0.0.1 at 2012-07-05 19:33:44 +0200
 Processing by DeviseCustomized::RegistrationsController#create as HTML
+Parameters: {\"authenticity_token\"=>\"k4xMIcuqMThMsdlbsVJ7GFgzNDw/HgGGp1ldElFULoY=\", \"user\"=>{\"screen_name\"=>\"mgawlista\"}}
+            " 
+          }
+        )
+      }
+      
+      it 'parses request correctly' do
+        subject.hash.should == {
+          'DeviseCustomized::RegistrationsController#create #1' => {
+            'Request' => {
+              'Route' => "POST \"/users/bronze\"",
+              'Format' => 'HTML',
+              'Parameters' => {"authenticity_token"=>"k4xMIcuqMThMsdlbsVJ7GFgzNDw/HgGGp1ldElFULoY=", "user"=>{"screen_name"=>"mgawlista"}},
+            }
+          }
+        }
+      end
+    end
+    
+    describe '#parse_read' do
+      context 'line ending LIMIT 1' do
+        subject {
+          ::RailsInfo::Logs::Server.new(
+            log: { 
+              body: "Processing by DeviseCustomized::RegistrationsController#create as HTML
 [1mCACHE (0.0ms)  SELECT `communities`.* FROM `communities` WHERE `communities`.`deleted` = 0 AND `communities`.`slug` = 'bronze' LIMIT 1
-        "
-        @rails_info_log = ::RailsInfo::Logs::Server.new(log: { body: body })
-        
-        raise @rails_info_log.hash.inspect
+              " 
+            }
+          )
+        }
         
-        @rails_info_log.hash.should == {
-          'DeviseCustomized::RegistrationsController#create #1' => {
-            'READ' => [
-              "SELECT `communities`.* FROM `communities` WHERE `communities`.`deleted` = 0 AND `communities`.`slug` = 'bronze' LIMIT 1'",
-            ], 
-            'misc' => [
-              'Processing by DeviseCustomized::RegistrationsController#create as HTML'
-            ]
+        it 'will be parsed correctly' do
+          subject.hash.should == {
+            'DeviseCustomized::RegistrationsController#create #1' => {
+              'Request' => { 'Route' => '', 'Format' => 'HTML' },
+              'READ' => [
+                "SELECT `communities`.* FROM `communities` WHERE `communities`.`deleted` = 0 AND `communities`.`slug` = 'bronze' LIMIT 1",
+              ]
+            }
           }
+        end
+      end
+      
+      context 'line ending LIMIT 1[.' do
+        subject {
+          ::RailsInfo::Logs::Server.new(
+            log: { 
+              body: "Processing by DeviseCustomized::RegistrationsController#create as HTML
+[1mCommunity Load (0.5ms)  SELECT `communities`.* FROM `communities` WHERE `communities`.`id` = 2 LIMIT 1
+              " 
+            }
+          )
         }
+          
+        it 'will be parsed correctly' do
+          subject.hash.should == {
+            'DeviseCustomized::RegistrationsController#create #1' => {
+              'Request' => { 'Route' => '', 'Format' => 'HTML' },
+              'READ' => [
+                "SELECT `communities`.* FROM `communities` WHERE `communities`.`id` = 2 LIMIT 1",
+              ]
+            }
+          }
+        end
+      end
+    end
+    
+    describe '#process_insert' do
+      subject {
+        ::RailsInfo::Logs::Server.new(
+          log: { 
+            body: "Started POST \"/users/bronze\" for 127.0.0.1 at 2012-07-05 19:33:44 +0200
+Processing by DeviseCustomized::RegistrationsController#create as HTML
+[1mSQL (276.4ms)  INSERT INTO `users` (`city`, `city_permissions`, `confirmation_sent_at`, `confirmation_token`, `confirmed_at`, `created_at`, `current_sign_in_at`, `current_sign_in_ip`, `delete_token`, `deleted`, `developer`, `email`, `encrypted_password`, `facebook`, `facebook_id`, `facebook_permissions`, `failed_attempts`, `forename`, `google_id`, `initial_community_id`, `last_sign_in_at`, `last_sign_in_ip`, `linkedin`, `linkedin_permissions`, `locked_at`, `master`, `name_permissions`, `notification_email`, `password_salt`, `phone`, `phone_permissions`, `photo_content_type`, `photo_file_name`, `photo_file_size`, `photo_updated_at`, `remember_created_at`, `reset_password_sent_at`, `reset_password_token`, `screen_name`, `screen_name_permissions`, `sign_in_count`, `slug`, `street`, `street_permissions`, `surname`, `tagline`, `tagline_permissions`, `twitter`, `twitter_permissions`, `unconfirmed_email`, `unlock_token`, `updated_at`, `url`, `website`, `website_permissions`, `xing`, `xing_permissions`, `zipcode`, `zipcode_permissions`) VALUES (NULL, 0, '2012-07-05 17:33:50', 'xVQj9z8xGm1bzqqJBjUn', NULL, '2012-07-05 17:33:50', NULL, NULL, NULL, 0, NULL, 'gawlista@googlemail.com', '$2a$10$KnrBV6m64g0zqKwUnQRR/exiUN9HtzJCGLSUse.jPTxLp0WQtNec2', NULL, NULL, 0, 0, NULL, NULL, 2, NULL, NULL, NULL, 0, NULL, 0, 0, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'mgawlista', 0, 0, 'mgawlista', NULL, 0, NULL, NULL, 0, NULL, 0, NULL, NULL, '2012-07-05 17:33:50', NULL, NULL, 0, NULL, 0, NULL, 0)
+            " 
+          }
+        )
+      }
+      
+      it 'parses INSERT entries correctly' do
+        action = 'DeviseCustomized::RegistrationsController#create #1'
+        subject.hash[action]['Request'].should == { 'Route' => "POST \"/users/bronze\"", 'Format' => 'HTML' }
+       
+        compare_data(
+          subject.hash[action]['WRITE']['users'],
+          { '-action-' => 'INSERT', 'id' => nil, 'city' => 'NULL', 'WHERE' => nil }
+        )
+      end
+    end
+    
+    describe '#process_update' do
+      subject {
+        ::RailsInfo::Logs::Server.new(
+          log: { 
+            body: "Started POST \"/users/bronze\" for 127.0.0.1 at 2012-07-05 19:33:44 +0200
+Processing by DeviseCustomized::RegistrationsController#create as HTML
+[1m (0.4ms)  UPDATE `feedbacks` SET `editable` = 0, `updated_at` = '2012-07-09 16:33:31' WHERE `feedbacks`.`type` IN ('Question') AND `feedbacks`.`id` = 3
+            "
+          }
+        )
+      }
+      
+      it 'parses UPDATE entries correctly' do
+        action = 'DeviseCustomized::RegistrationsController#create #1'
+        subject.hash[action]['Request'].should == { 'Route' => "POST \"/users/bronze\"", 'Format' => 'HTML' }
+        
+        compare_data(
+          subject.hash[action]['WRITE']['feedbacks'],
+          { 
+            '-action-' => 'UPDATE', 'id' => '3', 'editable' => '0', 'updated_at' => '2012-07-09 16:33:31', 
+            'WHERE' => "`feedbacks`.`type` IN ('Question') AND `feedbacks`.`id` = 3" 
+          }
+        )
       end
     end
   end 
 end
+
+def compare_data(table, data)
+  data.keys.each_index do |current_index|
+    index = data.keys[current_index] == 'WHERE' ? table['columns'].length - 1 : current_index
+    column = data.keys[current_index]
+    table['columns'][index].should == column
+    
+    table['rows'].first[column].should == data[column] unless data[column] == nil
+  end
+end

data/spec/spec_helper_without_rails.rb

@@ -3,6 +3,10 @@ unless defined? Rails
     def self.root
       File.expand_path('dummy', __FILE__)
     end
+    
+    def self.env
+      'test'
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_info
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-06 00:00:00.000000000 Z
+date: 2012-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70253477230800 !ruby/object:Gem::Requirement
+  requirement: &70242337984640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70253477230800
+  version_requirements: *70242337984640
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &70253477230000 !ruby/object:Gem::Requirement
+  requirement: &70242337983580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70253477230000
+  version_requirements: *70242337983580
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &70253477228920 !ruby/object:Gem::Requirement
+  requirement: &70242337982560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70253477228920
+  version_requirements: *70242337982560
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70253477228160 !ruby/object:Gem::Requirement
+  requirement: &70242337981960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70253477228160
+  version_requirements: *70242337981960
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
-  requirement: &70253477227440 !ruby/object:Gem::Requirement
+  requirement: &70242337981320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70253477227440
+  version_requirements: *70242337981320
 - !ruby/object:Gem::Dependency
   name: pygments.rb
-  requirement: &70253477226720 !ruby/object:Gem::Requirement
+  requirement: &70242337980500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70253477226720
+  version_requirements: *70242337980500
 - !ruby/object:Gem::Dependency
   name: twitter-bootstrap-rails
-  requirement: &70253477226040 !ruby/object:Gem::Requirement
+  requirement: &70242337979860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70253477226040
+  version_requirements: *70242337979860
 - !ruby/object:Gem::Dependency
   name: simple-navigation-bootstrap
-  requirement: &70253477225320 !ruby/object:Gem::Requirement
+  requirement: &70242337979280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70253477225320
+  version_requirements: *70242337979280
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &70253477224820 !ruby/object:Gem::Requirement
+  requirement: &70242337978780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70253477224820
+  version_requirements: *70242337978780
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70253477224320 !ruby/object:Gem::Requirement
+  requirement: &70242337978360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70253477224320
+  version_requirements: *70242337978360
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70253477223880 !ruby/object:Gem::Requirement
+  requirement: &70242337977840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70253477223880
+  version_requirements: *70242337977840
 description: Engine for a rails application which extends /rails/info about some information
   resources in development environment.
 email:
@@ -177,6 +177,7 @@ files:
 - app/views/layouts/rails_info.html.erb
 - app/views/layouts/shared/_navigation.html.erb
 - app/views/rails_info/data/index.html.erb
+- app/views/rails_info/logs/server/_request.html.erb
 - app/views/rails_info/logs/server/_table.html.erb
 - app/views/rails_info/logs/server/new.html.erb
 - app/views/rails_info/logs/test/rspec/new.html.erb
@@ -256,7 +257,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 206197979266972554
+      hash: -3145686660104229554
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -265,7 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 206197979266972554
+      hash: -3145686660104229554
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.17