mongodb_logger 0.1.5 → 0.1.6

data/SUPPORTED_RAILS_VERSIONS

@@ -9,6 +9,7 @@
 3.0.8
 3.0.9
 3.0.10
+3.0.11
 3.1.0
 3.1.1
 3.1.2

data/lib/mongodb_logger/logger.rb

@@ -21,7 +21,7 @@ module MongodbLogger
       internal_initialize
     rescue => e
       # should use a config block for this
-      Rails.env.production? ? (raise e) : (puts "!!! MongodbLoggerError:  Using BufferedLogger due to exception: " + e.message)
+      Rails.env.production? ? (raise e) : (puts "MongodbLogger WARNING: Using BufferedLogger due to exception: " + e.message)
     ensure
       if disable_file_logging?
         @level          = level

data/lib/mongodb_logger/server/coffee/logs.coffee

@@ -35,6 +35,7 @@ MongodbLoggerJS =
     # filter tougle
     $('div.filter-toggle').live 'click', (event) =>
       $('div.filter').slideToggle()
+      $('div.filter-toggle span.arrow-down').toggleClass('rotate')
       
     # additional filters
     $('#add_more_filter').live 'click', (event) =>
@@ -94,13 +95,13 @@ MongodbLoggerJS =
           $("#log_info").stop().animate
             marginTop: 0
   
-  tail_logs: (count) ->
+  tail_logs: (log_last_id) ->
     url = MongodbLoggerJS.tail_logs_url
-    if count?
-      url = MongodbLoggerJS.tail_logs_url + "/" + count 
+    if log_last_id? && log_last_id.length > 0
+      url = MongodbLoggerJS.tail_logs_url + "/" + log_last_id 
     else
       MongodbLoggerJS.tail_log_started = true
-      count = 0
+      log_last_id = ""
     if MongodbLoggerJS.tail_log_started
       $.ajax
         url: url
@@ -108,14 +109,14 @@ MongodbLoggerJS =
         success: (data) ->
           if data.time
             $('#tail_logs_time').text(data.time)
-            if count != data.count
-              count = data.count
-              if $("#db_collection_count").length > 0
-                $("#db_collection_count").text(count)
-              if data.content? && data.content.length > 0
-                elements = $(data.content)
-                elements.addClass('newlog')
-                $('#logs_list tr:first').after(elements).effect("highlight", {}, 1000)
+            if data.log_last_id?
+              log_last_id = data.log_last_id
+            if data.content? && data.content.length > 0
+              elements = $(data.content)
+              elements.addClass('newlog')
+              $('#logs_list tr:first').after(elements).effect("highlight", {}, 1000)
+            if data.collection_stats && $("#collection_stats").length > 0
+              $("#collection_stats").html(data.collection_stats)
           if MongodbLoggerJS.tail_log_started
-            fcallback = -> MongodbLoggerJS.tail_logs(count)
+            fcallback = -> MongodbLoggerJS.tail_logs(log_last_id)
             setTimeout fcallback, 2000

data/lib/mongodb_logger/server/public/javascripts/logs.js

@@ -42,7 +42,8 @@
         return false;
       });
       $('div.filter-toggle').live('click', function(event) {
-        return $('div.filter').slideToggle();
+        $('div.filter').slideToggle();
+        return $('div.filter-toggle span.arrow-down').toggleClass('rotate');
       });
       $('#add_more_filter').live('click', function(event) {
         var url;
@@ -112,14 +113,14 @@
         });
       }
     },
-    tail_logs: function(count) {
+    tail_logs: function(log_last_id) {
       var url;
       url = MongodbLoggerJS.tail_logs_url;
-      if (count != null) {
-        url = MongodbLoggerJS.tail_logs_url + "/" + count;
+      if ((log_last_id != null) && log_last_id.length > 0) {
+        url = MongodbLoggerJS.tail_logs_url + "/" + log_last_id;
       } else {
         MongodbLoggerJS.tail_log_started = true;
-        count = 0;
+        log_last_id = "";
       }
       if (MongodbLoggerJS.tail_log_started) {
         return $.ajax({
@@ -129,21 +130,19 @@
             var elements, fcallback;
             if (data.time) {
               $('#tail_logs_time').text(data.time);
-              if (count !== data.count) {
-                count = data.count;
-                if ($("#db_collection_count").length > 0) {
-                  $("#db_collection_count").text(count);
-                }
-                if ((data.content != null) && data.content.length > 0) {
-                  elements = $(data.content);
-                  elements.addClass('newlog');
-                  $('#logs_list tr:first').after(elements).effect("highlight", {}, 1000);
-                }
+              if (data.log_last_id != null) log_last_id = data.log_last_id;
+              if ((data.content != null) && data.content.length > 0) {
+                elements = $(data.content);
+                elements.addClass('newlog');
+                $('#logs_list tr:first').after(elements).effect("highlight", {}, 1000);
+              }
+              if (data.collection_stats && $("#collection_stats").length > 0) {
+                $("#collection_stats").html(data.collection_stats);
               }
             }
             if (MongodbLoggerJS.tail_log_started) {
               fcallback = function() {
-                return MongodbLoggerJS.tail_logs(count);
+                return MongodbLoggerJS.tail_logs(log_last_id);
               };
               return setTimeout(fcallback, 2000);
             }

data/lib/mongodb_logger/server/public/stylesheets/library.css

@@ -81,6 +81,10 @@ a:hover, a:active {
     background: url(../images/arrow-down.png) no-repeat 100% 50%;
 }
 
+.arrow-down.rotate {
+    background: url(../images/arrow-up.png) no-repeat 100% 50%;
+}
+
 code {
     display: block;
     overflow: auto;

data/lib/mongodb_logger/server/view_helpers.rb

@@ -85,7 +85,12 @@ module Sinatra::ViewHelpers
     select_tag = []
     select_tag << "<select id='#{object.form_name}_#{name.to_s}' name='#{object.form_name}[#{name.to_s}]' #{attr.join(" ")}>"
     options_array.each do |val|
-      select_tag << "<option value='#{val}' #{"selected='selected'" if value && val.to_s == value}>#{val}</option>"
+      if val.is_a?(Array) && 2 == val.length
+        skey, sval = val[0], val[1]
+      else
+        skey = sval = val
+      end
+      select_tag << "<option value='#{skey}' #{"selected='selected'" if value && skey.to_s == value}>#{sval}</option>"
     end
     select_tag << "</select>"
     select_tag.join("\n")

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

@@ -19,22 +19,9 @@
           <div class="ptxs pls"><strong>DB:</strong> <%=h @db.name %></div>
           <div class="pls"><strong>Collection:</strong> <%=h @collection.name %></div>
         </div> <!-- unit -->
-        <div class="unit size1of3">
-          <div class="pts prs txtR">
-            <span id="db_collection_count" class="log-num"><%=h @collection_stats["count"] %></span></div>
-        </div> <!-- unit -->
-        <% if @collection_stats["capped"] && 1 == @collection_stats["capped"] %>
-        
-        <div class="progress">
-          <span class="size"><%=h number_to_human_size(@collection_stats["size"]) %> of <%=h number_to_human_size(@collection_stats["storageSize"]) %></span>
-          <div class="used" style="width: <%=((@collection_stats["size"].to_f / @collection_stats["storageSize"].to_f) * 100).round%>%"></div>
-        </div> <!-- progress -->
-                  
-        <% else %>
-          <div class="warning"><p>You do not use capped collection for logs. 
-            <a href="http://www.mongodb.org/display/DOCS/Capped+Collections" target="_blank" class="more">More info.</a></p>
-          </div>
-        <% end %>
+        <div id="collection_stats">
+          <%= partial(:"shared/collection_stats", :object => @collection_stats) %>
+        </div>
       </div>
       <a href="<%=h url_path("overview") %>" class="logo" data-pjax='#main_pjax'><img src="<%=u 'images/logo.png'%>" alt="MongoDB Logger"></a> <span class="logger ">logger</span>
     </div> <!-- wrapper -->

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

@@ -1,5 +1,7 @@
-<% content_for :right_top_panel do %>
-  <%= partial(:"shared/tail_panel") %>
+<% if @collection_stats["capped"] && 1 == @collection_stats["capped"] %>
+  <% content_for :right_top_panel do %>
+    <%= partial(:"shared/tail_panel") %>
+  <% end %>
 <% end %>
 
 <%= partial(:"shared/top_panel") %>
@@ -24,7 +26,7 @@
             <div class="unit size1of3">
               <div class="unit size1of2">
                 <div class="prm">
-                  <%= select_tag @filter, :limit, [50, 100, 200, 500, 1000] %>
+                  <%= select_tag @filter, :limit, [[50, "Limits - 50"], [100, "Limits - 100"], [200, "Limits - 200"], [500, "Limits - 500"], [1000, "Limits - 1000"]] %>
                 </div> <!-- prm -->                
               </div> <!-- unit -->   
               <div class="unit size1of2">
@@ -67,7 +69,7 @@
       </form>
       </div> <!-- filter -->
 
-      <div class="filter-toggle"><span class="arrow-down">Filter</span></div>
+      <div class="filter-toggle"><span class="arrow-down <%= 'rotate' unless @filter.get_mongo_conditions.blank? %>">Filter</span></div>
       
       <% if @logs.count > 0 %>
         <table id="logs_list">

data/lib/mongodb_logger/server/views/shared/_collection_stats.erb

@@ -0,0 +1,14 @@
+<div class="unit size1of3">
+  <div class="pts prs txtR">
+    <span class="log-num" title="count of logs"><%=h collection_stats["count"] %></span></div>
+</div> <!-- unit -->
+<% if collection_stats["capped"] && 1 == collection_stats["capped"] %>
+  <div class="progress">
+    <span class="size"><%=h number_to_human_size(collection_stats["size"]) %> of <%=h number_to_human_size(collection_stats["storageSize"]) %></span>
+    <div class="used" style="width: <%=((collection_stats["size"].to_f / collection_stats["storageSize"].to_f) * 100).round%>%"></div>
+  </div> <!-- progress -->
+<% else %>
+  <div class="warning"><p>You do not use capped collection for logs. 
+    <a href="http://www.mongodb.org/display/DOCS/Capped+Collections#CappedCollections-Convertingacollectiontocapped" target="_blank" class="more">More info.</a></p>
+  </div>
+<% end %>

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

@@ -2,7 +2,7 @@
 
 <div class="unit-right">
   <div class="pam">
-    <a href="<%=h url_path("overview") %>" data-pjax='#main_pjax'>Back</a>
+    <a href="<%=h url_path("overview") %>" data-pjax='#main_pjax' class="button small grey">Back</a>
   </div> <!-- pam -->            
 </div> <!-- unit-right -->
 <h1 class="pam">Log #<%=h @log['_id'] %></h1>

data/lib/mongodb_logger/server.rb

@@ -94,30 +94,37 @@ module MongodbLogger
       end
     end
     
-    get "/tail_logs/?:count?" do
+    get "/tail_logs/?:log_last_id?" do
       buffer = []
-      if params[:count]
-        count = params[:count].to_i
-        tail = Mongo::Cursor.new(@collection, :tailable => true, :order => [['$natural', 1]]).skip(count)
-        while log = tail.next_document
+      last_id = nil
+      if params[:log_last_id] && !params[:log_last_id].blank?
+        log_last_id = params[:log_last_id]
+        tail = Mongo::Cursor.new(@collection, :tailable => true, :order => [['$natural', 1]], 
+          :selector => {'_id' => { '$gt' => BSON::ObjectId(log_last_id) }})
+        while log = tail.next
           buffer << partial(:"shared/log", :object => log)
-          count += 1
+          log_last_id = log['_id']
         end
         buffer.reverse!
       else
-        count = @collection.count
+        @log = @collection.find_one(:order => [['$natural', -1]])
+        log_last_id = @log['_id'] unless @log.blank?
       end
+      
       content_type :json
-      { :count => count, :time => Time.now.strftime("%F %T"), :content => buffer.join("\n") }.to_json
+      { :log_last_id => log_last_id, 
+        :time => Time.now.strftime("%F %T"), 
+        :content => buffer.join("\n"), 
+        :collection_stats => partial(:"shared/collection_stats", :object => @collection_stats) }.to_json
     end
     
     get "/log/:id" do
-      @log = @collection.find_one({'_id' => BSON::ObjectId(params[:id])})
+      @log = @collection.find_one(BSON::ObjectId(params[:id]))
       show :show_log, !request.xhr?
     end
     
     get "/log_info/:id" do
-      @log = @collection.find_one({'_id' => BSON::ObjectId(params[:id])})
+      @log = @collection.find_one(BSON::ObjectId(params[:id]))
       partial(:"shared/log_info", :object => @log)
     end
     

data/lib/mongodb_logger/version.rb

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

data/test/rails/test/functional/order_controller_test.rb

@@ -32,18 +32,31 @@ class OrderControllerTest < ActionController::TestCase
     assert_equal OrderController::LOG_USER_ID, @collection.find_one({}, :fields => "user_id")["user_id"]
   end
   
-  test "should log request parameters" do
+  test "should write GET request method" do
     get :index
     log = @collection.find_one()
     http_method = 'GET'
     assert_equal http_method, log['method']
   end
+  
+  test "should write POST request method" do
+    post :create
+    log = @collection.find_one()
+    http_method = 'POST'
+    assert_equal http_method, log['method']
+  end
 
   test "should log exceptions" do
     assert_raise(RuntimeError, OrderController::LOG_MESSAGE) {get :new}
     assert_equal 1, @collection.find_one({"messages.error" => /^#{OrderController::LOG_MESSAGE}/})["messages"]["error"].count
     assert_equal 1, @collection.find_one({"is_exception" => true})["messages"]["error"].count
   end
+  
+  test "should log find by params keys" do
+    some_name = "name"
+    post :create, :activity => {:name =>  some_name}
+    assert_equal 1, @collection.find({"params.activity.name" => some_name}).count
+  end
 
   test "should not log passwords" do
     post :create, :order => {:password => OrderController::LOG_MESSAGE }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongodb_logger
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-25 00:00:00.000000000 Z
+date: 2011-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70339442790260 !ruby/object:Gem::Requirement
+  requirement: &5200940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70339442790260
+  version_requirements: *5200940
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70339442789460 !ruby/object:Gem::Requirement
+  requirement: &5197060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *70339442789460
+  version_requirements: *5197060
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70339442788580 !ruby/object:Gem::Requirement
+  requirement: &5196180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.10.0
   type: :development
   prerelease: false
-  version_requirements: *70339442788580
+  version_requirements: *5196180
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70339442785620 !ruby/object:Gem::Requirement
+  requirement: &4815360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.2
   type: :development
   prerelease: false
-  version_requirements: *70339442785620
+  version_requirements: *4815360
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &70339442785000 !ruby/object:Gem::Requirement
+  requirement: &4813580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.2.0
   type: :development
   prerelease: false
-  version_requirements: *70339442785000
+  version_requirements: *4813580
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &70339442784420 !ruby/object:Gem::Requirement
+  requirement: &4812700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.9.9
   type: :development
   prerelease: false
-  version_requirements: *70339442784420
+  version_requirements: *4812700
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70339442783460 !ruby/object:Gem::Requirement
+  requirement: &4810580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *70339442783460
+  version_requirements: *4810580
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &70339442798940 !ruby/object:Gem::Requirement
+  requirement: &4809660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70339442798940
+  version_requirements: *4809660
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70339442796820 !ruby/object:Gem::Requirement
+  requirement: &4808980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70339442796820
+  version_requirements: *4808980
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70339442795640 !ruby/object:Gem::Requirement
+  requirement: &4808380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70339442795640
+  version_requirements: *4808380
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70339442794960 !ruby/object:Gem::Requirement
+  requirement: &4863320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70339442794960
+  version_requirements: *4863320
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70339442794060 !ruby/object:Gem::Requirement
+  requirement: &4862640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70339442794060
+  version_requirements: *4862640
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70339442793380 !ruby/object:Gem::Requirement
+  requirement: &4861920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70339442793380
+  version_requirements: *4861920
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &70339442792680 !ruby/object:Gem::Requirement
+  requirement: &4861100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: 2.6.6
   type: :runtime
   prerelease: false
-  version_requirements: *70339442792680
+  version_requirements: *4861100
 - !ruby/object:Gem::Dependency
   name: vegas
-  requirement: &70339442791960 !ruby/object:Gem::Requirement
+  requirement: &4860200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,7 +175,7 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70339442791960
+  version_requirements: *4860200
 description: MongoDB logger for Rails 3
 email:
 - leopard.not.a@gmail.com
@@ -215,6 +215,7 @@ files:
 - 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/arrow-up.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
@@ -245,6 +246,7 @@ 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/_collection_stats.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
@@ -297,25 +299,4 @@ rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: MongoDB logger for Rails 3
-test_files:
-- features/rails.feature
-- features/step_definitions/rails_application_steps.rb
-- features/support/env.rb
-- features/support/rails.rb
-- features/support/terminal.rb
-- test/active_record.rb
-- test/config/samples/database.yml
-- test/config/samples/database_no_file_logging.yml
-- test/config/samples/database_replica_set.yml
-- test/config/samples/database_with_auth.yml
-- test/config/samples/mongodb_logger.yml
-- test/config/samples/mongoid.yml
-- test/rails.rb
-- test/rails/app/controllers/order_controller.rb
-- test/rails/test/functional/order_controller_test.rb
-- test/rails/test/test_helper.rb
-- test/shoulda_macros/log_macros.rb
-- test/test.sh
-- test/test_helper.rb
-- test/unit/mongodb_logger_replica_test.rb
-- test/unit/mongodb_logger_test.rb
+test_files: []