mongodb_logger 0.1.4 → 0.1.5

data/lib/mongodb_logger/server/views/show_log.erb

@@ -1,9 +1,8 @@
-<div class="topline">
-  <%= partial(:"shared/tabs") %>
-</div> <!-- topline -->
+<%= partial(:"shared/top_panel") %>
+
 <div class="unit-right">
   <div class="pam">
-    <a href="<%=h url_path("overview") %>">Back</a>
+    <a href="<%=h url_path("overview") %>" data-pjax='#main_pjax'>Back</a>
   </div> <!-- pam -->            
 </div> <!-- unit-right -->
 <h1 class="pam">Log #<%=h @log['_id'] %></h1>
@@ -13,7 +12,7 @@
       <span class="pale">Url:</span>
     </div> <!-- unit -->
     <div class="unit size4of5">
-      <%=h @log['url'] %>
+      <a href="<%=h @log['url']%>" target="_blank"><%=h @log['url']%></a>
     </div> <!-- unit -->
   </li>
   <li class="outer pvs phm">
@@ -32,12 +31,30 @@
       <%=h @log['action'] %>
     </div> <!-- unit -->
   </li>
+  <li class="outer pvs phm">
+    <div class="unit size1of5">
+      <span class="pale">Method:</span>
+    </div> <!-- unit -->
+    <div class="unit size4of5">
+      <%=h @log['method'] %>
+    </div> <!-- unit -->
+  </li>
   <li class="outer pvs phm">
     <div class="unit size1of5">
       <span class="pale">IP:</span>
     </div> <!-- unit -->
     <div class="unit size4of5">
-      <%=h @log['ip'] %>
+      <a href="http://www.infosniper.net/index.php?ip_address=<%=h @log['ip'] %>&map_source=1&overview_map=1&lang=1&map_type=1&zoom_level=7" target="_blank">
+        <%=h @log['ip'] %>
+      </a>
+    </div> <!-- unit -->
+  </li>
+  <li class="outer pvs phm">
+    <div class="unit size1of5">
+      <span class="pale">Request Time:</span>
+    </div> <!-- unit -->
+    <div class="unit size4of5">
+      <%=h @log['request_time'] %>
     </div> <!-- unit -->
   </li>
   <li class="outer pvs phm">
@@ -50,30 +67,29 @@
   </li>
   <li class="outer pvs phm">
     <div class="unit size1of5">
-      <span class="pale">Params:</span>
+      <span class="pale">Application Name:</span>
     </div> <!-- unit -->
     <div class="unit size4of5">
-      <code><%=h @log['params'] %></code>
+      <%=h @log['application_name'] %>
     </div> <!-- unit -->
   </li>
-  <% unless @log['messages']['error'].blank? %>
   <li class="outer pvs phm">
     <div class="unit size1of5">
-      <span class="pale">Error message:</span>
+      <span class="pale">Path:</span>
     </div> <!-- unit -->
     <div class="unit size4of5">
-      <code><%=h @log['messages']['error'].join("\n") %></code>
+      <%=h @log['path'] %>
     </div> <!-- unit -->
   </li>
-  <% end %>
-  <% unless @log['messages']['info'].blank? %>
   <li class="outer pvs phm">
     <div class="unit size1of5">
-      <span class="pale">Info message:</span>
+      <span class="pale">Params:</span>
     </div> <!-- unit -->
     <div class="unit size4of5">
-      <code><%=h @log['messages']['info'].join("\n") %></code>
+      <pre><code><%= pretty_hash(@log['params']) %></code></pre>
     </div> <!-- unit -->
   </li>
+  <% if @log['messages'] && !@log['messages'].blank? && @log['messages'].is_a?(Hash) %>
+    <%= partial(:"shared/message_tabs", :object => @log['messages']) %>
   <% end %>
 </ul>

data/lib/mongodb_logger/server.rb

@@ -5,6 +5,8 @@ require 'active_support'
 
 require 'mongodb_logger/server/view_helpers'
 require 'mongodb_logger/server/partials'
+require 'mongodb_logger/server/content_for'
+require 'mongodb_logger/server/model/additional_filter'
 require 'mongodb_logger/server/model/filter'
 require 'mongodb_logger/server_config'
 
@@ -16,6 +18,7 @@ module MongodbLogger
   class Server < Sinatra::Base
     helpers Sinatra::ViewHelpers
     helpers Sinatra::Partials
+    helpers Sinatra::ContentFor
     
     dir = File.dirname(File.expand_path(__FILE__))
 
@@ -36,6 +39,10 @@ module MongodbLogger
       def current_page
         url_path request.path_info.sub('/','')
       end
+      
+      def class_if_current(path = '')
+        'class="active"' if current_page[0, path.size] == path
+      end
 
       def url_path(*path_parts)
         [ path_prefix, path_parts ].join("/").squeeze('/')
@@ -57,6 +64,7 @@ module MongodbLogger
           @db = Rails.logger.mongo_connection
           @collection = @db[Rails.logger.mongo_collection_name]
         end
+        @collection_stats = @collection.stats
       rescue => e
         erb :error, {:layout => false}, :error => "Can't connect to MongoDB!"
         return false
@@ -80,9 +88,9 @@ module MongodbLogger
 
     %w( overview ).each do |page|
       get "/#{page}/?" do
-        @filter = MongodbLogger::ServerModel::Filter.new(params[:filter])
+        @filter = ServerModel::Filter.new(params[:filter])
         @logs = @collection.find(@filter.get_mongo_conditions).sort('$natural', -1).limit(@filter.get_mongo_limit)
-        show page
+        show page, !request.xhr?
       end
     end
     
@@ -100,7 +108,7 @@ module MongodbLogger
         count = @collection.count
       end
       content_type :json
-      { :count => count, :time => Time.now.getutc, :content => buffer.join("\n") }.to_json
+      { :count => count, :time => Time.now.strftime("%F %T"), :content => buffer.join("\n") }.to_json
     end
     
     get "/log/:id" do
@@ -113,6 +121,12 @@ module MongodbLogger
       partial(:"shared/log_info", :object => @log)
     end
     
+     get "/add_filter/?" do
+        @filter = ServerModel::Filter.new(nil)
+        @filter_more = ServerModel::AdditionalFilter.new(nil, @filter)
+        partial(:"shared/dynamic_filter", :object => @filter_more)
+      end
+    
     error do
       erb :error, {:layout => false}, :error => 'Sorry there was a nasty error. Maybe no connection to MongoDB. Debug: ' + env['sinatra.error'].inspect
     end

data/lib/mongodb_logger/version.rb

@@ -1,3 +1,3 @@
 module MongodbLogger
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/mongodb_logger.gemspec

@@ -18,15 +18,15 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "coffee-script",   "~> 2.2.0"
   gem.add_development_dependency "therubyracer",    "~> 0.9.9"
   
-  gem.add_dependency "rake",            "~> 0.9.0"
-  gem.add_dependency "mongo",           "~> 1.4.0"
-  gem.add_dependency "bson_ext",        "~> 1.4.0"
-  gem.add_dependency "i18n",            ">= 0.4.1"
-  gem.add_dependency "json",            "~> 1.6.1"
-  gem.add_dependency "activesupport",   ">= 3.0.0"
-  gem.add_dependency "sinatra",         ">= 1.2.0"
-  gem.add_dependency "erubis",          ">= 2.6.6"
-  gem.add_dependency "vegas",           "~> 0.1.2"
+  gem.add_runtime_dependency "rake",            "~> 0.9.0"
+  gem.add_runtime_dependency "mongo",           "~> 1.4.0"
+  gem.add_runtime_dependency "bson_ext",        "~> 1.4.0"
+  gem.add_runtime_dependency "i18n",            ">= 0.4.1"
+  gem.add_runtime_dependency "json",            "~> 1.6.1"
+  gem.add_runtime_dependency "activesupport",   ">= 3.0.0"
+  gem.add_runtime_dependency "sinatra",         ">= 1.2.0"
+  gem.add_runtime_dependency "erubis",          ">= 2.6.6"
+  gem.add_runtime_dependency "vegas",           "~> 0.1.2"
 
   gem.rubyforge_project = "mongodb_logger"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongodb_logger
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-18 00:00:00.000000000 Z
+date: 2011-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70210136683320 !ruby/object:Gem::Requirement
+  requirement: &70339442790260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70210136683320
+  version_requirements: *70339442790260
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70210136682260 !ruby/object:Gem::Requirement
+  requirement: &70339442789460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *70210136682260
+  version_requirements: *70339442789460
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70210136694180 !ruby/object:Gem::Requirement
+  requirement: &70339442788580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.10.0
   type: :development
   prerelease: false
-  version_requirements: *70210136694180
+  version_requirements: *70339442788580
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70210136690800 !ruby/object:Gem::Requirement
+  requirement: &70339442785620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.2
   type: :development
   prerelease: false
-  version_requirements: *70210136690800
+  version_requirements: *70339442785620
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &70210136703780 !ruby/object:Gem::Requirement
+  requirement: &70339442785000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.2.0
   type: :development
   prerelease: false
-  version_requirements: *70210136703780
+  version_requirements: *70339442785000
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &70210136702180 !ruby/object:Gem::Requirement
+  requirement: &70339442784420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.9.9
   type: :development
   prerelease: false
-  version_requirements: *70210136702180
+  version_requirements: *70339442784420
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70210136700400 !ruby/object:Gem::Requirement
+  requirement: &70339442783460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *70210136700400
+  version_requirements: *70339442783460
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &70210136697660 !ruby/object:Gem::Requirement
+  requirement: &70339442798940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70210136697660
+  version_requirements: *70339442798940
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70210136709800 !ruby/object:Gem::Requirement
+  requirement: &70339442796820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70210136709800
+  version_requirements: *70339442796820
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70210136706260 !ruby/object:Gem::Requirement
+  requirement: &70339442795640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70210136706260
+  version_requirements: *70339442795640
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70210136716060 !ruby/object:Gem::Requirement
+  requirement: &70339442794960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70210136716060
+  version_requirements: *70339442794960
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70210136728180 !ruby/object:Gem::Requirement
+  requirement: &70339442794060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70210136728180
+  version_requirements: *70339442794060
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70210136726940 !ruby/object:Gem::Requirement
+  requirement: &70339442793380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70210136726940
+  version_requirements: *70339442793380
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &70210136725780 !ruby/object:Gem::Requirement
+  requirement: &70339442792680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: 2.6.6
   type: :runtime
   prerelease: false
-  version_requirements: *70210136725780
+  version_requirements: *70339442792680
 - !ruby/object:Gem::Dependency
   name: vegas
-  requirement: &70210136724300 !ruby/object:Gem::Requirement
+  requirement: &70339442791960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,7 +175,7 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70210136724300
+  version_requirements: *70339442791960
 description: MongoDB logger for Rails 3
 email:
 - leopard.not.a@gmail.com
@@ -209,10 +209,14 @@ files:
 - lib/mongodb_logger/railtie.rb
 - lib/mongodb_logger/replica_set_helper.rb
 - lib/mongodb_logger/server.rb
-- lib/mongodb_logger/server/coffee/application.coffee
+- lib/mongodb_logger/server/coffee/logs.coffee
+- lib/mongodb_logger/server/content_for.rb
+- lib/mongodb_logger/server/model/additional_filter.rb
 - lib/mongodb_logger/server/model/filter.rb
 - lib/mongodb_logger/server/partials.rb
 - lib/mongodb_logger/server/public/images/arrow-down.png
+- lib/mongodb_logger/server/public/images/date.png
+- lib/mongodb_logger/server/public/images/external.png
 - lib/mongodb_logger/server/public/images/failure.png
 - lib/mongodb_logger/server/public/images/logo.png
 - lib/mongodb_logger/server/public/images/newlog.png
@@ -221,15 +225,18 @@ files:
 - lib/mongodb_logger/server/public/images/spinner2.gif
 - lib/mongodb_logger/server/public/images/stop-icon.png
 - lib/mongodb_logger/server/public/images/success.png
-- lib/mongodb_logger/server/public/javascripts/application.js
-- lib/mongodb_logger/server/public/javascripts/jquery-1.7.min.js
-- lib/mongodb_logger/server/public/javascripts/jquery-ui-1.8.16.effects.min.js
+- lib/mongodb_logger/server/public/javascripts/logs.js
+- lib/mongodb_logger/server/public/javascripts/vendors/highlight.pack.js
+- lib/mongodb_logger/server/public/javascripts/vendors/jquery-1.7.min.js
+- lib/mongodb_logger/server/public/javascripts/vendors/jquery-ui-1.8.16.effects.min.js
+- lib/mongodb_logger/server/public/javascripts/vendors/jquery.pjax.js
 - lib/mongodb_logger/server/public/stylesheets/all.css
 - lib/mongodb_logger/server/public/stylesheets/grids.css
 - lib/mongodb_logger/server/public/stylesheets/group-buttons.css
 - lib/mongodb_logger/server/public/stylesheets/group-forms.css
 - lib/mongodb_logger/server/public/stylesheets/group-headers.css
 - lib/mongodb_logger/server/public/stylesheets/group-tables.css
+- lib/mongodb_logger/server/public/stylesheets/highlight/zenburn.css
 - lib/mongodb_logger/server/public/stylesheets/layout.css
 - lib/mongodb_logger/server/public/stylesheets/library.css
 - lib/mongodb_logger/server/public/stylesheets/reset.css
@@ -238,9 +245,13 @@ files:
 - lib/mongodb_logger/server/views/error.erb
 - lib/mongodb_logger/server/views/layout.erb
 - lib/mongodb_logger/server/views/overview.erb
+- lib/mongodb_logger/server/views/shared/_dynamic_filter.erb
 - lib/mongodb_logger/server/views/shared/_log.erb
 - lib/mongodb_logger/server/views/shared/_log_info.erb
+- lib/mongodb_logger/server/views/shared/_message_tabs.erb
 - lib/mongodb_logger/server/views/shared/_tabs.erb
+- lib/mongodb_logger/server/views/shared/_tail_panel.erb
+- lib/mongodb_logger/server/views/shared/_top_panel.erb
 - lib/mongodb_logger/server/views/show_log.erb
 - lib/mongodb_logger/server_config.rb
 - lib/mongodb_logger/version.rb