mongodb_logger 0.5.2 → 0.6.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 869d1bd5bc8d527263e521641148dc69847554d6
+  data.tar.gz: 63e6c1baac19db2e51eb55ca34130aad515356b8
+SHA512:
+  metadata.gz: 7157cd077d0fecf0f876205e24765f6b2782a6a8c037610d0612fb5645fddf2e8df0557415d8c2e5ec10c215e050a1d86aa4c97cac07bc0019ecda7a3ab2d1d2
+  data.tar.gz: d00d4192fadef0a24f053f4f81fa7f8ac6a7d1c28d54d0e6c3f4617095d6db1d796a281e1a7fb5479493be2cf5997044caf62a3a6b453c5d4b8795deb663e975

data/.travis.yml

@@ -2,12 +2,12 @@ language: ruby
 before_install:
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
+  - gem install bundler --pre
 before_script:
   - bundle exec rake appraisal:install
 services:
   - mongodb
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
   - jruby-19mode

data/Appraisals

@@ -6,4 +6,10 @@ end
 appraise "rails32" do
   gem "rails", "~> 3.2.12"
   gem "mongodb_logger", :path => "../"
+end
+
+appraise "rails40" do
+  gem "rails", "4.0.0"
+  gem "minitest", "~> 4.0"
+  gem "mongodb_logger", :path => "../"
 end

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## master
+
+## 0.6.0
+
+* Support Rails 4
+* config as hash with indifferent access
+
 ## 0.5.2
 
 * Use new mongo API

data/README.md

@@ -144,7 +144,7 @@ Beyond that, if you want to add extra information to the base of the document (l
 you can just call the Rails.logger.add\_metadata method on your logger like so (for example from a before\_filter):
 
     # make sure we're using the MongodbLogger in this environment
-    Rails.logger.add_metadata(:user_id => @current_user.id) if Rails.logger.respond_to?(:add_metadata)
+    Rails.logger.add_metadata(user_id: @current_user.id) if Rails.logger.respond_to?(:add_metadata)
 
 ## Callback on exceptions
 

data/bin/mongodb_logger_web

@@ -9,7 +9,7 @@ end
 require 'mongodb_logger/server'
 
 Vegas::Runner.new(MongodbLogger::Server, 'mongodb_logger_web', {
-  :before_run => lambda {|v|
+  before_run: lambda {|v|
     config_file = (ENV['MONGODBLOGGERCONFIG'] || v.args.first)
     if config_file
       MongodbLogger::ServerConfig.set_config(config_file)

data/features/step_definitions/mongodb_logger_web_steps.rb

@@ -23,12 +23,12 @@ Given /^homepage$/ do
 end
 
 Then /^I should see text that no logs in system$/ do
-  page.has_selector?('div', :text => 'No logs found, try to filter out the other parameters', :visible => true)
+  page.has_selector?('div', text: 'No logs found, try to filter out the other parameters', visible: true)
 end
 
 Given /^I should see start tail button$/ do
-  page.has_link?('tailLogsLink', :visible => true)
-  page.has_link?('tailLogsStopLink', :visible => false)
+  page.has_link?('tailLogsLink', visible: true)
+  page.has_link?('tailLogsStopLink', visible: false)
 end
 
 When /^I click on start tail button$/ do
@@ -36,12 +36,12 @@ When /^I click on start tail button$/ do
 end
 
 Then /^I should see stop tails button$/ do
-  page.has_link?('tailLogsLink', :visible => false)
-  page.has_link?('tailLogsStopLink', :visible => true)
+  page.has_link?('tailLogsLink', visible: false)
+  page.has_link?('tailLogsStopLink', visible: true)
 end
 
 Then /^box with time of last log tail$/ do
-  page.has_selector?('span#tailLogsTime', :visible => true)
+  page.has_selector?('span#tailLogsTime', visible: true)
 end
 
 When /^I click on stop tail button$/ do

data/features/step_definitions/rails_application_steps.rb

@@ -53,6 +53,10 @@ When /^I have copy tests_controller_spec$/ do
   test_file = File.join(PROJECT_ROOT, 'spec', 'rails_spec', 'controllers', 'tests_controller_spec_rails.rb')
   target = File.join(rails_root, 'spec', 'controllers', 'tests_controller_spec.rb')
   FileUtils.cp(test_file, target)
+  # init log file
+  logfile = File.join(rails_root, 'log', 'test.log')
+  FileUtils.touch(logfile)
+  FileUtils.chmod(0666, logfile)
 end
 
 When /^I have set up tests controllers$/ do
@@ -71,8 +75,8 @@ class TestsController < ApplicationController
   LOG_USER_ID = 12345
 
   def index
-    logger.debug LOG_MESSAGE
-    logger.add_metadata(:application_name_again => Rails.root.basename.to_s, :user_id => LOG_USER_ID)
+    logger.info LOG_MESSAGE
+    logger.add_metadata(application_name_again: Rails.root.basename.to_s, user_id: LOG_USER_ID)
     render text: "index"
   end
 

data/gemfiles/rails40.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "4.0.0"
+gem "minitest", "~> 4.0"
+gem "mongodb_logger", :path=>"../"
+
+gemspec :path=>"../"

data/lib/mongodb_logger.rb

@@ -14,9 +14,9 @@ module MongodbLogger
 
     def self.included(base)
       base.class_eval do
-        begin
+        if defined?(around_action)
           around_action :enable_mongodb_logger
-        rescue
+        else
           around_filter :enable_mongodb_logger
         end
       end
@@ -26,19 +26,19 @@ module MongodbLogger
       return yield unless Rails.logger.respond_to?(:mongoize)
       f_session = (request.respond_to?(:session) ? request.session : session)
       Rails.logger.mongoize({
-        :method         => request.method,
-        :action         => action_name,
-        :controller     => controller_name,
-        :path           => request.path,
-        :url            => request.url,
-        :params         => (request.respond_to?(:filtered_parameters) ? request.filtered_parameters : params),
-        :session        => mongo_fix_session_keys(f_session),
-        :ip             => request.remote_ip
+        method:         request.method,
+        action:         action_name,
+        controller:     controller_name,
+        path:           request.path,
+        url:            request.url,
+        params:         (request.respond_to?(:filtered_parameters) ? request.filtered_parameters : params),
+        session:        mongo_fix_session_keys(f_session),
+        ip:             request.remote_ip
       }) { yield }
     end
     # session keys can be with dots. It is invalid keys for BSON
     def mongo_fix_session_keys(session = {})
-      new_session = {}
+      new_session = Hash.new
       session.each do |i, j|
         new_session[i.gsub(/\./i, "|")] = j.inspect
       end if session

data/lib/mongodb_logger/adapters/base.rb

@@ -5,7 +5,7 @@ module MongodbLogger
       attr_reader :configuration, :connection, :connection_type, :collection, :authenticated
 
       def collection_name
-        @configuration['collection']
+        @configuration[:collection]
       end
 
       def authenticated?
@@ -14,12 +14,12 @@ module MongodbLogger
 
       def check_for_collection
         # setup the capped collection if it doesn't already exist
-        create_collection unless @connection.collection_names.include?(@configuration['collection'])
-        @collection = @connection[@configuration['collection']]
+        create_collection unless @connection.collection_names.include?(@configuration[:collection])
+        @collection = @connection[@configuration[:collection]]
       end
 
       def rename_collection_command(admin_session, to, drop_target = false)
-        admin_session.command({ renameCollection: "#{@configuration['database']}.#{collection_name}", to: "#{@configuration['database']}.#{to}", dropTarget: drop_target })
+        admin_session.command({ renameCollection: "#{@configuration[:database]}.#{collection_name}", to: "#{@configuration[:database]}.#{to}", dropTarget: drop_target })
       end
 
       def reset_collection
@@ -31,12 +31,12 @@ module MongodbLogger
 
       def collection_stats_hash(stats)
         {
-          :is_capped => (stats["capped"] && ([1, true].include?(stats["capped"]))),
-          :count => stats["count"].to_i,
-          :size => stats["size"].to_f,
-          :storageSize => stats["storageSize"].to_f,
-          :db_name => @configuration["database"],
-          :collection => collection_name
+          is_capped: (stats["capped"] && ([1, true].include?(stats["capped"]))),
+          count: stats["count"].to_i,
+          size: stats["size"].to_f,
+          storageSize: stats["storageSize"].to_f,
+          db_name: @configuration["database"],
+          collection: collection_name
         }
       end
 

data/lib/mongodb_logger/adapters/mongo.rb

@@ -5,24 +5,24 @@ module MongodbLogger
       def initialize(options = {})
         @authenticated = false
         @configuration = options
-        if @configuration['url']
-          uri = URI.parse(@configuration['url'])
-          @configuration['database'] = uri.path.gsub(/^\//, '')
-          @connection ||= mongo_connection_object.db(@configuration['database'])
+        if @configuration[:url]
+          uri = URI.parse(@configuration[:url])
+          @configuration[:database] = uri.path.gsub(/^\//, '')
+          @connection ||= mongo_connection_object.db(@configuration[:database])
           @authenticated = true
         else
-          @connection ||= mongo_connection_object.db(@configuration['database'])
-          if @configuration['username'] && @configuration['password']
+          @connection ||= mongo_connection_object.db(@configuration[:database])
+          if @configuration[:username] && @configuration[:password]
             # the driver stores credentials in case reconnection is required
-            @authenticated = @connection.authenticate(@configuration['username'],
-                                                          @configuration['password'])
+            @authenticated = @connection.authenticate(@configuration[:username],
+                                                          @configuration[:password])
           end
         end
       end
 
       def create_collection
         @connection.create_collection(collection_name,
-          {:capped => true, :size => @configuration['capsize'].to_i})
+          { capped: true, size: @configuration[:capsize].to_i })
       end
 
       def insert_log_record(record, options = {})
@@ -57,34 +57,34 @@ module MongodbLogger
           end
           logs.reverse!
         else
-          log = @collection.find_one({}, {:sort => ['$natural', -1]})
+          log = @collection.find_one({}, { sort: ['$natural', -1] })
           log_last_id = log["_id"].to_s unless log.blank?
         end
         {
-          :log_last_id => log_last_id,
-          :time => Time.now.strftime("%F %T"),
-          :logs => logs
+          log_last_id: log_last_id,
+          time: Time.now.strftime("%F %T"),
+          logs: logs
         }
       end
 
       def calculate_mapreduce(map, reduce, params = {})
-        @collection.map_reduce(map, reduce, {:query => params[:conditions], :sort => ['$natural', -1], :out => {:inline => true}, :raw => true}).find()
+        @collection.map_reduce(map, reduce, { query: params[:conditions], sort: ['$natural', -1], out: { inline: true }, raw: true }).find()
       end
 
       private
 
       def mongo_connection_object
-        if @configuration['hosts']
-          conn = ::Mongo::MongoReplicaSetClient.new(@configuration['hosts'],
-            :pool_timeout => 6, :ssl => @configuration['ssl'])
-          @configuration['replica_set'] = true
-        elsif @configuration['url']
-          conn = ::Mongo::MongoClient.from_uri(@configuration['url'])
+        if @configuration[:hosts]
+          conn = ::Mongo::MongoReplicaSetClient.new(@configuration[:hosts],
+            pool_timeout: 6, ssl: @configuration[:ssl])
+          @configuration[:replica_set] = true
+        elsif @configuration[:url]
+          conn = ::Mongo::MongoClient.from_uri(@configuration[:url])
         else
-          conn = ::Mongo::MongoClient.new(@configuration['host'],
-                                       @configuration['port'],
-                                       :pool_timeout => 6,
-                                       :ssl => @configuration['ssl'])
+          conn = ::Mongo::MongoClient.new(@configuration[:host],
+                                       @configuration[:port],
+                                       pool_timeout: 6,
+                                       ssl: @configuration[:ssl])
         end
         @connection_type = conn.class
         conn

data/lib/mongodb_logger/adapters/moped.rb

@@ -4,25 +4,25 @@ module MongodbLogger
 
       def initialize(options = {})
         @configuration = options
-        if @configuration['url']
-          uri = URI.parse(@configuration['url'])
-          @configuration['database'] = uri.path.gsub(/^\//, '')
+        if @configuration[:url]
+          uri = URI.parse(@configuration[:url])
+          @configuration[:database] = uri.path.gsub(/^\//, '')
           @connection ||= mongo_connection_object
-          @connection.use @configuration['database']
+          @connection.use @configuration[:database]
           @authenticated = true
         else
           @connection ||= mongo_connection_object
-          @connection.use @configuration['database']
-          if @configuration['username'] && @configuration['password']
+          @connection.use @configuration[:database]
+          if @configuration[:username] && @configuration[:password]
             # the driver stores credentials in case reconnection is required
-            @authenticated = @connection.login(@configuration['username'],
-                                                          @configuration['password'])
+            @authenticated = @connection.login(@configuration[:username],
+                                                          @configuration[:password])
           end
         end
       end
 
       def create_collection
-        @connection.command(create: collection_name, capped: true, size:  @configuration['capsize'].to_i)
+        @connection.command(create: collection_name, capped: true, size:  @configuration[:capsize].to_i)
       end
 
       def insert_log_record(record, options = {})
@@ -64,9 +64,9 @@ module MongodbLogger
           log_last_id = log["_id"].to_s unless log.blank?
         end
         {
-          :log_last_id => log_last_id,
-          :time => Time.now.strftime("%F %T"),
-          :logs => logs
+          log_last_id: log_last_id,
+          time: Time.now.strftime("%F %T"),
+          logs: logs
         }
       end
 
@@ -84,13 +84,13 @@ module MongodbLogger
       private
 
       def mongo_connection_object
-        if @configuration['hosts']
-          conn = ::Moped::Session.new(@configuration['hosts'].map{|(host,port)| "#{host}:#{port}"}, :timeout => 6, :ssl => @configuration['ssl'])
+        if @configuration[:hosts]
+          conn = ::Moped::Session.new(@configuration[:hosts].map{|(host,port)| "#{host}:#{port}"}, timeout: 6, ssl: @configuration[:ssl])
           @configuration['replica_set'] = true
-        elsif @configuration['url']
-          conn = ::Moped::Session.connect(@configuration['url'])
+        elsif @configuration[:url]
+          conn = ::Moped::Session.connect(@configuration[:url])
         else
-          conn = ::Moped::Session.new(["#{@configuration['host']}:#{@configuration['port']}"], :timeout => 6, :ssl => @configuration['ssl'])
+          conn = ::Moped::Session.new(["#{@configuration[:host]}:#{@configuration[:port]}"], timeout: 6, ssl: @configuration[:ssl])
         end
         @connection_type = conn.class
         conn

data/lib/mongodb_logger/capistrano.rb

@@ -1,8 +1,7 @@
 Capistrano::Configuration.instance.load do
   _cset :mongodb_logger_asset_env, "RAILS_GROUPS=assets"
-  _cset :mongodb_logger_assets_role, [:app]
   _cset :mongodb_logger_assets_dir, "public/assets"
-
+  _cset :mongodb_logger_assets_role, [:app]
   _cset :mongodb_logger_db_role, [:app]
 
   namespace :mongodb_logger do
@@ -10,14 +9,14 @@ Capistrano::Configuration.instance.load do
     desc <<-DESC
       Run the asset precompilation rake task. 
     DESC
-    task :precompile, :roles => mongodb_logger_assets_role, :except => { :no_release => true } do
+    task :precompile, roles: mongodb_logger_assets_role, except: { no_release: true } do
       run "cd #{latest_release} && #{rake} RAILS_ENV=#{rails_env} #{mongodb_logger_asset_env} mongodb_logger:assets:compile[#{mongodb_logger_assets_dir}]"
     end
 
     desc <<-DESC
       Run collection migrate rake task.
     DESC
-    task :migrate, :roles => mongodb_logger_db_role, :except => { :no_release => true } do
+    task :migrate, roles: mongodb_logger_db_role, except: { no_release: true } do
       run "cd #{latest_release} && #{rake} RAILS_ENV=#{rails_env} mongodb_logger:migrate"
     end
   end

data/lib/mongodb_logger/initializer_mixin.rb

@@ -1,3 +1,5 @@
+require 'mongodb_logger/rails_logger'
+
 module MongodbLogger
   module InitializerMixin
 
@@ -7,16 +9,16 @@ module MongodbLogger
 
     def create_logger(config)
       path = config.paths['log'].first
-      level = ActiveSupport::BufferedLogger.const_get(config.log_level.to_s.upcase)
-      logger = MongodbLogger::Logger.new(:path => path, :level => level)
+      level = RailsLogger.const_get(config.log_level.to_s.upcase)
+      logger = MongodbLogger::Logger.new(path, level)
       # decorating with TaggedLogging
       logger = MongodbLogger::TaggedLogger.new(logger) if defined?(ActiveSupport::TaggedLogging)
       logger.level = level
       logger.auto_flushing = false if Rails.env.production? && rails3(1)
       logger
     rescue StandardError => e
-      logger = ActiveSupport::BufferedLogger.new(STDERR)
-      logger.level = ActiveSupport::BufferedLogger::WARN
+      logger = RailsLogger.new(STDERR)
+      logger.level = RailsLogger::WARN
       logger.warn(
         "MongodbLogger Initializer Error: Unable to access log file. Please ensure that #{path} exists and is chmod 0666. " +
         "The log level has been raised to WARN and the output directed to STDERR until the problem is fixed." + "\n" +

data/lib/mongodb_logger/logger.rb

@@ -2,13 +2,13 @@ require 'erb'
 require 'uri'
 require 'active_support'
 require 'active_support/core_ext'
-require 'active_support/core_ext/logger'
 require 'action_dispatch/http/upload'
+require 'mongodb_logger/rails_logger'
 require 'mongodb_logger/adapters'
 require 'mongodb_logger/replica_set_helper'
 
 module MongodbLogger
-  class Logger < ActiveSupport::BufferedLogger
+  class Logger < RailsLogger
     include ReplicaSetHelper
 
     DEFAULT_COLLECTION_SIZE = 250.megabytes
@@ -23,9 +23,9 @@ module MongodbLogger
 
     attr_reader :db_configuration, :mongo_adapter
 
-    def initialize(options = {})
-      path = options[:path] || File.join(Rails.root, "log/#{Rails.env}.log")
-      @level = options[:level] || DEBUG
+    def initialize(path = nil, level = DEBUG)
+      path ||= File.join(Rails.root, "log/#{Rails.env}.log")
+      @level = level
       internal_initialize
     rescue => e
       # should use a config block for this
@@ -51,9 +51,10 @@ module MongodbLogger
 
     def add(severity, message = nil, progname = nil, &block)
       $stdout.puts(message) if ENV['HEROKU_RACK'] # log in stdout on Heroku
-      if @level && @level <= severity && message.present? && @mongo_record.present?
+      if @level && @level <= severity && (message.present? || progname.present?) && @mongo_record.present?
         # do not modify the original message used by the buffered logger
-        msg = logging_colorized? ? message.to_s.gsub(/(\e(\[([\d;]*[mz]?))?)?/, '').strip : message
+        msg = (message ? message : progname)
+        msg = logging_colorized? ? msg.to_s.gsub(/(\e(\[([\d;]*[mz]?))?)?/, '').strip : msg
         @mongo_record[:messages][LOG_LEVEL_SYM[severity]] << msg
       end
       # may modify the original message
@@ -62,14 +63,14 @@ module MongodbLogger
 
     def mongoize(options = {})
       @mongo_record = options.merge({
-        :messages => Hash.new { |hash, key| hash[key] = Array.new },
-        :request_time => Time.now.getutc,
-        :application_name => @db_configuration['application_name']
+        messages: Hash.new { |hash, key| hash[key] = Array.new },
+        request_time: Time.now.getutc,
+        application_name: @db_configuration['application_name']
       })
 
       runtime = Benchmark.measure{ yield }.real if block_given?
     rescue Exception => e
-      add(3, e.message.to_s + "\n" + e.backtrace.join("\n"))
+      add(3, "#{e.message}\n#{e.backtrace.join("\n")}")
       # log exceptions
       @mongo_record[:is_exception] = true
       # Reraise the exception for anyone else who cares
@@ -103,23 +104,23 @@ module MongodbLogger
       end
 
       def disable_file_logging?
-        @db_configuration.fetch('disable_file_logging', false)
+        @db_configuration.fetch(:disable_file_logging, false)
       end
 
       def configure
         default_capsize = DEFAULT_COLLECTION_SIZE
         @db_configuration = {
-          'host' => 'localhost',
-          'port' => 27017,
-          'capsize' => default_capsize,
-          'ssl' => false}.merge(resolve_config)
-        @db_configuration['collection'] ||= defined?(Rails) ? "#{Rails.env}_log" : "production_log"
-        @db_configuration['application_name'] ||= resolve_application_name
-        @db_configuration['write_options'] ||= { w: 0, wtimeout: 200 }
-
-        @insert_block = @db_configuration.has_key?('replica_set') && @db_configuration['replica_set'] ?
-          lambda { rescue_connection_failure{ insert_log_record(@db_configuration['write_options']) } } :
-          lambda { insert_log_record(@db_configuration['write_options']) }
+          host: 'localhost',
+          port: 27017,
+          capsize: default_capsize,
+          ssl: false}.merge(resolve_config).with_indifferent_access
+        @db_configuration[:collection] ||= defined?(Rails) ? "#{Rails.env}_log" : "production_log"
+        @db_configuration[:application_name] ||= resolve_application_name
+        @db_configuration[:write_options] ||= { w: 0, wtimeout: 200 }
+
+        @insert_block = @db_configuration.has_key?(:replica_set) && @db_configuration[:replica_set] ?
+          lambda { rescue_connection_failure{ insert_log_record(@db_configuration[:write_options]) } } :
+          lambda { insert_log_record(@db_configuration[:write_options]) }
       end
 
       def resolve_application_name
@@ -140,6 +141,9 @@ module MongodbLogger
       end
 
       def find_adapter
+        return Adapers::Mongo if defined?(::Mongo)
+        return Adapers::Moped if defined?(::Moped)
+
         ADAPTERS.each do |(library, adapter)|
           begin
             require library
@@ -193,7 +197,7 @@ module MongodbLogger
           when Array
             data.map{ |v| nice_serialize_object(v) }
           when ActionDispatch::Http::UploadedFile, Rack::Test::UploadedFile # uploaded files
-            hvalues = {
+            {
               original_filename: data.original_filename,
               content_type: data.content_type
             }

data/lib/mongodb_logger/rack_middleware.rb

@@ -8,13 +8,15 @@ module MongodbLogger
     def call(env)
       request = ::Rack::Request.new env
       path = request.path.split('/')
-      log_attrs = {:method    => request.request_method,
-                :action     => path[2..-1].join('/'),
-                :controller => path[1],
-                :path       => request.path,
-                :url        => request.url,
-                :params     => request.params,
-                :ip         => env['REMOTE_ADDR']  }
+      log_attrs = {
+        method:     request.request_method,
+        action:     path[2..-1].join('/'),
+        controller: path[1],
+        path:       request.path,
+        url:        request.url,
+        params:     request.params,
+        ip:         env['REMOTE_ADDR']  
+      }
 
       Rails.logger.mongoize(log_attrs) do
         return @app.call(env)

data/lib/mongodb_logger/rails_logger.rb

@@ -0,0 +1,7 @@
+module MongodbLogger
+  if defined?(ActiveSupport::Logger)
+    class RailsLogger < ActiveSupport::Logger; end
+  else
+    class RailsLogger < ActiveSupport::BufferedLogger; end
+  end
+end

data/lib/mongodb_logger/railtie.rb

@@ -3,9 +3,8 @@ module MongodbLogger
   class Railtie < Rails::Railtie
     include MongodbLogger::InitializerMixin
 
-    initializer :initialize_mongodb_logger, :before => :initialize_logger do
-      app_config = Rails.application.config
-      Rails.logger = config.logger = create_logger(app_config)
+    initializer :initialize_mongodb_logger, before: :initialize_logger do
+      Rails.logger = config.logger = create_logger(Rails.application.config)
     end
 
     rake_tasks do

data/lib/mongodb_logger/server.rb

@@ -43,18 +43,18 @@ module MongodbLogger
         @mongo_adapter = (ServerConfig.mongo_adapter ? ServerConfig.mongo_adapter : Rails.logger.mongo_adapter)
         @collection_stats = @mongo_adapter.collection_stats
       rescue => e
-        erb :error, {:layout => false}, :error => "Can't connect to MongoDB!"
+        erb :error, { layout: false }, error: "Can't connect to MongoDB!"
         return false
       end
 
-      cache_control :private, :must_revalidate, :max_age => 0
+      cache_control :private, :must_revalidate, max_age: 0
     end
 
     def show(page, layout = true)
       begin
-        erb page.to_sym, {:layout => layout}
+        erb page.to_sym, { layout: layout }
       rescue => e
-        erb :error, { :layout => false }, :error => "Error in view. Debug: #{e.inspect}"
+        erb :error, { layout: false }, error: "Error in view. Debug: #{e.inspect}"
       end
     end
 
@@ -63,7 +63,7 @@ module MongodbLogger
     end
 
     error do
-      erb :error, { :layout => false }, :error => 'Sorry there was a nasty error. Maybe no connection to MongoDB. Debug: ' + env['sinatra.error'].inspect + '<br />' + env.inspect
+      erb :error, { layout: false }, error: 'Sorry there was a nasty error. Maybe no connection to MongoDB. Debug: ' + env['sinatra.error'].inspect + '<br />' + env.inspect
     end
 
   end

data/lib/mongodb_logger/server_config.rb

@@ -16,7 +16,7 @@ module MongodbLogger
     class << self
       def set_config(config_path)
         ENV['MONGODBLOGGERCONFIG'] = config_path
-        @logger = ServerLogger.new(path: "server.log")
+        @logger = ServerLogger.new("server.log")
         @logger.mongo_adapter
       end
 

data/lib/mongodb_logger/tagged_logger.rb

@@ -1,9 +1,20 @@
 module MongodbLogger
-  class TaggedLogger < ActiveSupport::TaggedLogging
-    delegate :mongoize, :add_metadata, to: :base_logger
+  # rails 3
+  if ActiveSupport::TaggedLogging.instance_of?(::Class)
+    class TaggedLogger < ActiveSupport::TaggedLogging
+      delegate :mongoize, :add_metadata, to: :mongo_logger
 
-    def base_logger
-      @logger
+      def mongo_logger
+        @logger
+      end
+    end
+  # rails 4
+  else
+    # module TaggedLogger
+    module TaggedLogger
+      def self.new(logger)
+        ActiveSupport::TaggedLogging.new(logger)
+      end
     end
   end
 end

data/lib/mongodb_logger/utils/migrate.rb

@@ -40,7 +40,7 @@ module MongodbLogger
       class MongoMigrateLogger < MongodbLogger::Logger
         def initialize(config = {})
           @static_config = config
-          super(path: "/dev/null")
+          super("/dev/null")
         end
 
         private

data/lib/mongodb_logger/version.rb

@@ -1,3 +1,3 @@
 module MongodbLogger
-  VERSION = "0.5.2"
+  VERSION = "0.6.0"
 end

data/spec/mongodb_logger_spec.rb

@@ -43,6 +43,7 @@ describe MongodbLogger::Logger do
         @mongodb_logger.send(:connect)
         @mongodb_logger.mongo_adapter.authenticated?.should be_true
         @mongodb_logger.db_configuration['database'].should == "system_log"
+        @mongodb_logger.db_configuration[:database].should == "system_log"
       end
     end
 
@@ -78,6 +79,13 @@ describe MongodbLogger::Logger do
         @mongo_adapter.configuration['ssl'].should == false
       end
 
+      it "set the default host, port, ssl and capsize if not configured in sym keys" do
+        @mongo_adapter.configuration[:host].should == 'localhost'
+        @mongo_adapter.configuration[:port].should == 27017
+        @mongo_adapter.configuration[:capsize].should == MongodbLogger::Logger::DEFAULT_COLLECTION_SIZE
+        @mongo_adapter.configuration[:ssl].should == false
+      end
+
       it "set the mongo collection name depending on the Rails environment" do
          @mongo_adapter.collection_name.should == "#{Rails.env}_log"
       end
@@ -117,6 +125,7 @@ describe MongodbLogger::Logger do
 
       it "be true" do
         @mongodb_logger.db_configuration['ssl'].should == true
+        @mongodb_logger.db_configuration[:ssl].should == true
       end
     end
 
@@ -243,7 +252,7 @@ describe MongodbLogger::Logger do
     context "after instantiation" do
       context "upon insertion of a log record" do
         before do
-          @mongodb_logger = MongodbLogger::Logger.new(path: @log_file)
+          @mongodb_logger = MongodbLogger::Logger.new(@log_file)
           log_to_mongo("Test")
         end
 

data/spec/rails_spec/controllers/tests_controller_spec_rails.rb

@@ -17,7 +17,7 @@ describe TestsController do
 
     it "renders the index text" do
       get :index
-      response.should render_template(text: "index")
+      response.body.should == "index"
     end
 
     it "log a single record" do
@@ -31,10 +31,10 @@ describe TestsController do
       get :index
       record = @collection.find.first
       record.should_not be_nil
-      record["messages"]["debug"].should_not be_nil
-      record["messages"]["debug"].should be_a(Array)
-      record["messages"]["debug"].size.should == 1
-      record["messages"]["debug"].first.should == described_class::LOG_MESSAGE
+      record["messages"]["info"].should_not be_nil
+      record["messages"]["info"].should be_a(Array)
+      record["messages"]["info"].size.should == 1
+      record["messages"]["info"].first.should == described_class::LOG_MESSAGE
     end
 
     it "write request method" do

data/spec/support/mongodb_logger_helper.rb

@@ -49,7 +49,9 @@ module MongodbLogger::SpecHelper
 
   def common_mongodb_logger_setup(options = {}, config = DEFAULT_CONFIG)
     cp_config(config, DEFAULT_CONFIG)
-    @mongodb_logger = MongodbLogger::Logger.new(options)
+    level = (options[:level] || MongodbLogger::Logger::DEBUG)
+    @mongodb_logger = MongodbLogger::Logger.new(nil, level)
+    @mongodb_logger.level = level
     @mongo_adapter = @mongodb_logger.mongo_adapter
     @mongo_adapter.reset_collection
   end
@@ -68,7 +70,7 @@ module MongodbLogger::SpecHelper
   end
 
   def log_params_to_mongo(msg)
-    @mongodb_logger.mongoize({:params => msg})
+    @mongodb_logger.mongoize({params: msg})
   end
 
   def log_exception_to_mongo(msg)

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: mongodb_logger
 version: !ruby/object:Gem::Version
-  version: 0.5.2
-  prerelease: 
+  version: 0.6.0
 platform: ruby
 authors:
 - Alexey Vasiliev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-16 00:00:00.000000000 Z
+date: 2013-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -158,7 +139,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: jasmine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -166,7 +146,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -174,7 +153,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -182,7 +160,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -190,7 +167,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -198,7 +174,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -206,7 +181,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -214,7 +188,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -222,7 +195,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: moped
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -230,7 +202,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -238,7 +209,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -246,7 +216,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -254,7 +223,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -262,7 +230,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -270,7 +237,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -278,7 +244,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -286,7 +251,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -294,7 +258,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -302,7 +265,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -310,7 +272,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -318,7 +279,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -326,7 +286,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -334,7 +293,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -342,7 +300,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -350,7 +307,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -358,7 +314,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -366,7 +321,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: vegas
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -374,7 +328,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -462,6 +415,7 @@ files:
 - features/support/rails.rb
 - gemfiles/rails31.gemfile
 - gemfiles/rails32.gemfile
+- gemfiles/rails40.gemfile
 - lib/mongodb_logger.rb
 - lib/mongodb_logger/adapters.rb
 - lib/mongodb_logger/adapters/base.rb
@@ -473,6 +427,7 @@ files:
 - lib/mongodb_logger/initializer_mixin.rb
 - lib/mongodb_logger/logger.rb
 - lib/mongodb_logger/rack_middleware.rb
+- lib/mongodb_logger/rails_logger.rb
 - lib/mongodb_logger/railtie.rb
 - lib/mongodb_logger/replica_set_helper.rb
 - lib/mongodb_logger/server.rb
@@ -537,34 +492,27 @@ files:
 - tasks/mongodb_logger.rake
 homepage: http://mongodb-logger.catware.org
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1758663782148875802
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1758663782148875802
 requirements: []
 rubyforge_project: mongodb_logger
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: MongoDB logger for Rails
 test_files:
 - features/mongodb_logger_web.feature