jlog-rails 0.0.2 → 0.0.3

data/README.md

@@ -23,6 +23,8 @@ On the client-side:
 Changelog:
 ----------
 
+* 0.0.3
+  * Adding bulk flush in the ajax appender
 * 0.0.2
   * Changed format of output message
   * InstallGenerator now updates application.js
@@ -32,4 +34,4 @@ Changelog:
   * Moved to AjaxController ActionController::Metal
   * Added support for server-side logging of client events with Rails.logger
   * Added AjaxAppender
-  * Initial port of jlog.js
+  * Initial port of jlog.js

data/app/controllers/jlog/ajax_controller.rb

@@ -4,16 +4,19 @@ module Jlog
     include ActionController::Rendering
 
     def append
-      message = params[:message]
-      level_pattern = /^(DEBUG|INFO|WARN|ERROR|FATAL)/
-      level = message.match(level_pattern)[1]
-      message = 'Client ' << message
+      messages = params[:message]
+      messages = [message] unless messages.is_a? Array
+      messages.each do |message|
+        level_pattern = /^(DEBUG|INFO|WARN|ERROR|FATAL)/
+        level = message.match(level_pattern)[1]
+        message = 'Client ' << message
 
-      if ['DEBUG', 'INFO', 'WARN', 'ERROR', 'FATAL'].include? level
-        Rails.logger.send(level.downcase.to_sym, message)
-      else
-        Rails.logger.warn('*** Attempt to log with a nonexistent level ***')
-        Rails.logger.warn(message)
+        if ['DEBUG', 'INFO', 'WARN', 'ERROR', 'FATAL'].include? level
+          Rails.logger.send(level.downcase.to_sym, message)
+        else
+          Rails.logger.warn('*** Attempt to log with a nonexistent level ***')
+          Rails.logger.warn(message)
+        end
       end
 
       render text: 'ok', status: :ok
@@ -21,4 +24,4 @@ module Jlog
 
   end
 
-end
+end

data/jlog-rails.gemspec

@@ -4,11 +4,11 @@ require File.expand_path("lib/jlog/version")
 Gem::Specification.new do |s|
   s.name        = 'jlog-rails'
   s.version     = Jlog::VERSION
-  s.date        = '2012-08-31'
+  s.date        = '2012-10-18'
   s.summary     = "Jlog for Rails"
   s.description = "A lightweight JavaScript logger (for Rails)"
-  s.authors     = ["Alexey Golubev"]
-  s.email       = 'oholubyev@heliostech.hk'
+  s.authors     = ["Helios Technologies Ltd."]
+  s.email       = 'contact@heliostech.fr'
   s.files       = `git ls-files`.split("\n")
   s.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.homepage    = 'http://rubygems.org/gems/jlog-rails'
@@ -16,4 +16,4 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "jlog-rails"
 
   s.add_dependency "jquery-rails"
-end
+end

data/lib/jlog/version.rb

@@ -1,3 +1,3 @@
 module Jlog
-  VERSION = '0.0.2'
-end
+  VERSION = '0.0.3'
+end

data/vendor/assets/javascripts/jlog.js

@@ -26,7 +26,7 @@
 
 /**
 *
-* @remixer Alexey Golubev mailto:oholubyev@heliostech.hk
+* @remixer Helios Technologies Ltd. mailto:contact@heliostech.fr
 *
 **/
 
@@ -125,6 +125,8 @@ JLog.ERROR  = 4;
 JLog.FATAL  = 5;
 JLog.NONE   = 6;
 
+JLog.VERSION = "0.0.3b3";
+
 JLog.prototype.debug = function() {
   if (this.getLevel() <= JLog.DEBUG) {
     this._log("DEBUG", arguments);
@@ -189,13 +191,72 @@ JLog.ConsoleAppender = function() {
 };
 
 JLog.AjaxAppender = function(url) {
-  var _url = url;
+  // Do we make more then 1 call at a time?
+	var waitForResponse = true;
+  // Current buffer of messages
+	var queuedLoggingEvents = [];
+  // Messages which should be sent
+	var queuedRequests = [];
+  // Maximum count of messages sent at a one time
+  var batchSize = 10;
+  // Are we currently sending something
+  var sending = false;
+  // Timeout between sending data
+  var timerInterval = 1000;
+
+  function scheduleSending() {
+    window.setTimeout(sendAllRemaining, timerInterval);
+  }
+
+  function sendRequest(postData, callback) {
+    $.post(url, postData, "json")
+      .complete(function() {
+        if(waitForResponse) sending = false;
+        if (callback) callback(true);
+      });
+  }
+
+  function sendAllRemaining() {
+    if(queuedLoggingEvents.length == 0) return;
+    var eventCopy = queuedLoggingEvents;
+    queuedLoggingEvents = [];
+    queuedRequests.push(eventCopy);
+    sendAll();
+  }
+
+  function preparePostData(data) { return { message:data }; }
+
+  function sendAll() {
+    if(waitForResponse && sending) return;
+    sending = true;
+    var currentRequestBatch;
+    if (waitForResponse) {
+      if (queuedRequests.length > 0) {
+        currentRequestBatch = queuedRequests.shift();
+        sendRequest(preparePostData(currentRequestBatch), sendAll);
+      } else {
+        sending = false;
+        scheduleSending();
+      }
+    } else {
+      // Rattle off all the requests without waiting to see the response
+      while ((currentRequestBatch = queuedRequests.shift())) {
+        sendRequest(preparePostData(currentRequestBatch));
+      }
+      sending = false;
+      scheduleSending();
+    }
+  }
+
+  scheduleSending();
 
   return {
     name: 'AjaxAppender',
 
     log: function(msg) {
-      $.post(_url, {message: msg});
+      queuedLoggingEvents.push(msg);
+      if (queuedLoggingEvents.length >= batchSize) sendAllRemaining();
+      else if(queuedLoggingEvents.length == 1) scheduleSending();
     }
   }
-};
+};

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: jlog-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
-- Alexey Golubev
+- Helios Technologies Ltd.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-31 00:00:00.000000000 Z
+date: 2012-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails
@@ -28,7 +28,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: A lightweight JavaScript logger (for Rails)
-email: oholubyev@heliostech.hk
+email: contact@heliostech.fr
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -67,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: jlog-rails
-rubygems_version: 1.8.22
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Jlog for Rails