mongodb_logger 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ae987b579d29c9e088ea907aa2679494a1df53c
-  data.tar.gz: a63a152e8ccf5ee8711bfcdfa199b95c9d59ad4c
+  metadata.gz: 48c3b365b540c0fdf70f0e4526fb83bd7730a85a
+  data.tar.gz: 3bbb2a8c14841e2adefa225549b959fd52914105
 SHA512:
-  metadata.gz: b165d24c972e92d8f9924c979b2ca58d888bfd5f23ea229b60f1c2007df80f959e872eb51d518e210a1f577d60f05ac59e2ed5191254100644698df46a5e2126
-  data.tar.gz: 66224465afd039b229111975c3199c79536df085dd0a56bc94e9835f08363448425c4dadb3e7d29c31e838119f6598e253e5b7ebc5a3a376260227aeed3fee54
+  metadata.gz: 9760b107a220bb5ddf047ba3e811173fc2775aaf7c6cb8966914ba7a3f202fac05326ffe9427efef78c93e42ab99a2f8004fc4923bdd7d0924556d6c87d3f610
+  data.tar.gz: e961c5158423d113e0b09b2d099bf67a8e67d969a0235cf65b587608eb54753d4fbc5727cd1b6cbfbd3043d64609b34bebd0a79d42de1214342760636a1b7c76

data/.gitignore

@@ -2,6 +2,7 @@
 *.rbc
 .bundle
 .config
+.idea
 .yardoc
 .project
 *.log

data/.ruby-version

@@ -1 +1 @@
-2.0.0
+2.1.1

data/.travis.yml

@@ -2,7 +2,6 @@ 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:
@@ -10,16 +9,10 @@ services:
 rvm:
   - 1.9.3
   - 2.0.0
-  - jruby-19mode
-  - ruby-head
-  - jruby-head
+  - 2.1.0
 notifications:
   email: false
 branches:
   only:
     - master
     - development
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-head

data/Appraisals

@@ -1,15 +1,17 @@
 appraise "rails31" do
   gem "rails", "~> 3.1.12"
-  gem "mongodb_logger", :path => "../"
 end
 
 appraise "rails32" do
   gem "rails", "~> 3.2.14"
-  gem "mongodb_logger", :path => "../"
 end
 
 appraise "rails40" do
-  gem "rails", "4.0.0"
+  gem "rails", "~> 4.0.2"
   gem "minitest", "~> 4.0"
-  gem "mongodb_logger", :path => "../"
+end
+
+appraise "rails41" do
+  gem "rails", "4.1.0.rc1"
+  gem "minitest", ">= 4.0"
 end

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 ## master
 
+
+## 0.6.3
+
+* Allows a user to override the request_ip method (#56)
+* Better support Sinatra apps (#60)
+* Support moped 2.0.0.beta8
+* Support Rails 4.1.0.rc1
+* Removed unused actionpack
+
+## 0.6.2
+
 * Disable gem by option disable = false.
 
 ## 0.6.1

data/README.md

@@ -2,7 +2,7 @@
 [![Build Status](https://travis-ci.org/le0pard/mongodb_logger.png)](https://travis-ci.org/le0pard/mongodb_logger)
 [![Code Climate](https://codeclimate.com/github/le0pard/mongodb_logger.png)](https://codeclimate.com/github/le0pard/mongodb_logger)
 
-MongodbLogger is a alternative logger for Rails, which log all requests of you application into MongoDB database.
+MongodbLogger is a alternative logger for Rails or Rack based app, which log all requests of you application into MongoDB database.
 It:
 
 * simple to integrate into existing Rails application;
@@ -42,7 +42,7 @@ Doesn't support the Rails version below 3.
         mkdir vendor/plugins/rails_log_stdout
         touch vendor/plugins/rails_log_stdout/.gitkeep
 
-   For Rails 4 just remove from Gemfile "rails_12factor" rubygem.
+   For Rails 4 just remove from Gemfile "rails_12factor" gem.
 
 1. Add MongodbLogger settings to database.yml for each environment in which you want to use the MongodbLogger. The MongodbLogger will also
    look for a separate mongodb\_logger.yml or mongoid.yml (if you are using mongoid) before looking in database.yml.

data/Rakefile

@@ -2,7 +2,8 @@
 require 'rubygems'
 require 'bundler'
 
-Bundler.require
+Bundler.require(:default)
+
 require 'rake'
 require 'rake/testtask'
 require 'bundler/gem_tasks'
@@ -69,12 +70,3 @@ Cucumber::Rake::Task.new(:cucumber) do |t|
   t.fork = true
   t.cucumber_opts = cucumber_opts
 end
-
-begin
-  require 'jasmine'
-  load 'jasmine/tasks/jasmine.rake'
-rescue LoadError
-  task :jasmine do
-    abort "Jasmine is not available. In order to run jasmine, you must: (sudo) gem install jasmine"
-  end
-end

data/app/assets/javascripts/logs.js.coffee

@@ -12,15 +12,10 @@ root.MongodbLoggerMain =
     $(document).ajaxStart => $('#ajaxLoader').show()
     $(document).ajaxStop => $('#ajaxLoader').hide()
     # tail logs buttons
-    $(document).on 'click', '#tailLogsLink', (event) =>
-      event.preventDefault()
-      MongodbLoggerMain.tailLogsUrl = $(event.currentTarget).data('url')
-      $('#tailLogsBlock').addClass('started')
-      MongodbLoggerMain.tailLogs(null)
-    $(document).on 'click', '#tailLogsStopLink', (event) =>
-      event.preventDefault()
-      MongodbLoggerMain.tailLogStarted = false
-      $('#tailLogsBlock').removeClass('started')
+    $(document).on 'click', '#filterLogsLink', (event) =>
+      @showFilters(event)
+    $(document).on 'click', '#filterLogsStopLink', (event) =>
+      @hideFilters(event)
     # log info click
     $(document).on 'click', '.log_info', (event) =>
       event.preventDefault()
@@ -30,9 +25,7 @@ root.MongodbLoggerMain =
       $('#logInfo').html(MustacheTemplates["logs/info"]({ log: element.data('info') }))
     # filter tougle
     $(document).on 'click', 'div.filter_toggle', (event) =>
-      event.preventDefault()
-      $('div.filter').slideToggle()
-      $('div.filter_toggle span.arrow-down').toggleClass('rotate')
+      @toggleFilters(event)
     # additional filters
     $(document).on 'click', '#addMoreFilter', (event) =>
       event.preventDefault()
@@ -90,8 +83,23 @@ root.MongodbLoggerMain =
         when 40 # down
           MongodbLoggerMain.moveByLogs('down')
     # init pjax
-    this.initPjax()
-    this.initOnPages()
+    @initPjax()
+    @initOnPages()
+  showFilters: (e) ->
+    e.preventDefault()
+    $('div.filter').slideDown()
+    $('div.filter_toggle span.arrow-down').addClass('rotate')
+    $('#filterLogsBlock').addClass('started')
+  hideFilters: (e) ->
+    e.preventDefault()
+    $('div.filter').slideUp()
+    $('div.filter_toggle span.arrow-down').removeClass('rotate')
+    $('#filterLogsBlock').removeClass('started')
+  toggleFilters: (e) ->
+    if $('div.filter_toggle span.arrow-down').hasClass('rotate')
+      @hideFilters(e)
+    else
+      @showFilters(e)
   initPjax: ->
     # pjax
     $(document).pjax('a[data-pjax]', '#mainPjax')
@@ -124,29 +132,6 @@ root.MongodbLoggerMain =
         else
           $("#logInfo").stop().animate
             marginTop: 0
-  # tail logs function
-  tailLogs: (logLastId = null) ->
-    url = MongodbLoggerMain.tailLogsUrl
-    if logLastId? and logLastId.length
-      url = "#{MongodbLoggerMain.tailLogsUrl}/#{logLastId}"
-    else
-      MongodbLoggerMain.tailLogStarted = true
-    return false unless MongodbLoggerMain.tailLogStarted
-    $.ajax
-      url: url
-      dataType: "json"
-      success: (data) ->
-        if data.time
-          $('#tailLogsTime').text(data.time)
-          if data.log_last_id?
-            logLastId = data.log_last_id
-          if data.content? && data.content.length > 0
-            elements = $(data.content)
-            elements.addClass('newlog')
-            $('#logsList tr:first').after(elements).effect("highlight", {}, 1000)
-          if data.collection_stats && $("#collection_stats").length > 0
-            $("#collection_stats").html(data.collection_stats)
-        setTimeout((-> MongodbLoggerMain.tailLogs(logLastId)), 2000) if MongodbLoggerMain.tailLogStarted
   # move using keys by logs
   moveByLogs: (direction) ->
     if $('#logsList').length and $('#logsList').find('tr.current').length
@@ -189,6 +174,5 @@ root.MongodbLoggerMain =
     elemTop = $(elem).offset().top
     elemBottom = elemTop + $(elem).height()
     return ((docViewTop < elemTop) && (docViewBottom > elemBottom))
-
-$ ->
-  MongodbLoggerMain.init()
+# init
+$ -> MongodbLoggerMain.init()

data/app/assets/stylesheets/library.css.erb

@@ -144,7 +144,7 @@ code {
     background: -ms-linear-gradient(top,  rgba(238,238,238,1) 0%,rgba(211,211,211,1) 100%);
     background: linear-gradient(top,  rgba(238,238,238,1) 0%,rgba(211,211,211,1) 100%);
     filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eeeeee', endColorstr='#d3d3d3',GradientType=0 );
-    
+
 }
 
 .logs-time {
@@ -162,11 +162,11 @@ code {
 }
 
 
-#tailLogsBlock.started .info, #tailLogsBlock .initial {
+#filterLogsBlock.started .info, #filterLogsBlock .initial {
   display: inline-block;
 }
 
-#tailLogsBlock .info, #tailLogsBlock.started .initial {
+#filterLogsBlock .info, #filterLogsBlock.started .initial {
   display: none;
 }
 
@@ -204,7 +204,7 @@ li.message_tab {
     padding: 0 20px;
     height: 30px;
     line-height: 30px;
-    font-size: 14px;    
+    font-size: 14px;
     border-right: 1px solid #bbb;
     border-top: 0;
     color: #333;
@@ -219,7 +219,7 @@ li.message_tab {
     background: -ms-linear-gradient(top,  rgba(255,255,255,0.62) 0%,rgba(23,146,212,0.5) 100%);
     background: linear-gradient(top,  rgba(255,255,255,0.62) 0%,rgba(23,146,212,0.5) 100%);
     filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#9effffff', endColorstr='#801792d4',GradientType=0 );
-    
+
 }
 
 .message_tabs li.active {
@@ -285,7 +285,7 @@ a[target="_blank"] {
     background: -ms-linear-gradient(top,  rgba(191,210,85,1) 0%,rgba(142,185,42,1) 50%,rgba(114,170,0,1) 51%,rgba(158,203,45,1) 100%);
     background: linear-gradient(top,  rgba(191,210,85,1) 0%,rgba(142,185,42,1) 50%,rgba(114,170,0,1) 51%,rgba(158,203,45,1) 100%);
     filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#bfd255', endColorstr='#9ecb2d',GradientType=0 );
-    
+
 }
 
 .size {

data/config.ru

@@ -6,10 +6,10 @@ require 'mongodb_logger/server'
 
 # Set the MONGODBLOGGERCONFIG env variable
 # config file you want loaded on boot.
-if ENV['MONGODBLOGGERCONFIG'] && ::File.exists?(::File.expand_path(ENV['MONGODBLOGGERCONFIG']))
+if ENV['MONGODBLOGGERCONFIG'] && ::File.file?(::File.expand_path(ENV['MONGODBLOGGERCONFIG']))
   MongodbLogger::ServerConfig.set_config(::File.expand_path(ENV['MONGODBLOGGERCONFIG']))
   use Rack::ShowExceptions
-  
+
   map '/assets' do
     run MongodbLogger::Assets.instance
   end

data/features/mongodb_logger_web.feature

@@ -1,14 +1,13 @@
 Feature: Install MongodbLogger Web and test it
-  
+
   Scenario: Main page
     Given homepage
     Then I should see text that no logs in system
-    
-  Scenario: Tail logs button
+
+  Scenario: Filter logs button
     Given homepage
-    And I should see start tail button
-    When I click on start tail button
-    Then I should see stop tails button
-    And box with time of last log tail
-    When I click on stop tail button
-    Then I should see start tail button
+    And I should see show filter button
+    When I click on show filter button
+    Then I should see hide filter button
+    When I click on hide filter button
+    Then I should see show filter button

data/features/step_definitions/mongodb_logger_web_steps.rb

@@ -26,25 +26,21 @@ 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)
 end
 
-Given /^I should see start tail button$/ do
-  page.has_link?('tailLogsLink', visible: true)
-  page.has_link?('tailLogsStopLink', visible: false)
+Given /^I should see show filter button$/ do
+  page.has_link?('filterLogsLink', visible: true)
+  page.has_link?('filterLogsStopLink', visible: false)
 end
 
-When /^I click on start tail button$/ do
-  click_link('tailLogsLink')
+When /^I click on show filter button$/ do
+  click_link('filterLogsLink')
 end
 
-Then /^I should see stop tails button$/ do
-  page.has_link?('tailLogsLink', visible: false)
-  page.has_link?('tailLogsStopLink', visible: true)
+Then /^I should see hide filter button$/ do
+  page.has_link?('filterLogsLink', visible: false)
+  page.has_link?('filterLogsStopLink', visible: true)
 end
 
-Then /^box with time of last log tail$/ do
-  page.has_selector?('span#tailLogsTime', visible: true)
-end
-
-When /^I click on stop tail button$/ do
-  click_link('tailLogsStopLink')
+When /^I click on hide filter button$/ do
+  click_link('filterLogsStopLink')
 end
 

data/gemfiles/rails31.gemfile

@@ -3,6 +3,5 @@
 source "http://rubygems.org"
 
 gem "rails", "~> 3.1.12"
-gem "mongodb_logger", :path=>"../"
 
 gemspec :path=>"../"

data/gemfiles/rails32.gemfile

@@ -3,6 +3,5 @@
 source "http://rubygems.org"
 
 gem "rails", "~> 3.2.14"
-gem "mongodb_logger", :path=>"../"
 
 gemspec :path=>"../"

data/gemfiles/rails40.gemfile

@@ -2,8 +2,7 @@
 
 source "http://rubygems.org"
 
-gem "rails", "4.0.0"
+gem "rails", "~> 4.0.2"
 gem "minitest", "~> 4.0"
-gem "mongodb_logger", :path=>"../"
 
 gemspec :path=>"../"

data/gemfiles/rails41.gemfile

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

data/lib/mongodb_logger/adapters/base.rb

@@ -19,7 +19,7 @@ module MongodbLogger
       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

data/lib/mongodb_logger/adapters/mongo.rb

@@ -26,6 +26,7 @@ module MongodbLogger
       end
 
       def insert_log_record(record, options = {})
+        record[:_id] = ::BSON::ObjectId.new
         @collection.insert(record, options[:write_options])
       end
 
@@ -39,32 +40,11 @@ module MongodbLogger
 
       # filter
       def filter_by_conditions(filter)
-        @collection.find(filter.get_mongo_conditions).sort('$natural', -1).limit(filter.get_mongo_limit)
+        @collection.find(filter.get_mongo_conditions).limit(filter.get_mongo_limit).sort('$natural', -1)
       end
 
       def find_by_id(id)
-        @collection.find_one(::BSON::ObjectId(id))
-      end
-
-      def tail_log_from_params(params = {})
-        logs = []
-        last_id = nil
-        if params[:log_last_id] && !params[:log_last_id].blank?
-          log_last_id = params[:log_last_id]
-          @collection.find({'_id' => { '$gt' => ::BSON::ObjectId(log_last_id) }}).sort('$natural', -1).each do |log|
-            logs << log
-            log_last_id = log["_id"].to_s
-          end
-          logs.reverse!
-        else
-          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
-        }
+        @collection.find_one(::BSON::ObjectId.from_string(id))
       end
 
       def calculate_mapreduce(map, reduce, params = {})

data/lib/mongodb_logger/adapters/moped.rb

@@ -26,8 +26,8 @@ module MongodbLogger
       end
 
       def insert_log_record(record, options = {})
-        record[:_id] = ::Moped::BSON::ObjectId.new
-        @connection.with(safe: options[:write_options])[collection_name].insert(record)
+        record[:_id] = ::BSON::ObjectId.new
+        @connection.with(write: options[:write_options])[collection_name].insert(record)
       end
 
       def collection_stats
@@ -42,32 +42,11 @@ module MongodbLogger
 
       # filter
       def filter_by_conditions(filter)
-        @collection.find(filter.get_mongo_conditions).sort('$natural' => -1).limit(filter.get_mongo_limit)
+        @collection.find(filter.get_mongo_conditions).limit(filter.get_mongo_limit).sort('$natural' => -1)
       end
 
       def find_by_id(id)
-        @collection.find("_id" => ::Moped::BSON::ObjectId.from_string(id)).first
-      end
-
-      def tail_log_from_params(params = {})
-        logs = []
-        last_id = nil
-        if params[:log_last_id] && !params[:log_last_id].blank?
-          log_last_id = params[:log_last_id]
-          @collection.find({'_id' => { '$gt' => ::Moped::BSON::ObjectId.from_string(log_last_id) }}).sort('$natural' => -1).each do |log|
-            logs << log
-            log_last_id = log["_id"].to_s
-          end
-          logs.reverse!
-        else
-          log = @collection.find.sort('$natural' => -1).first
-          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
-        }
+        @collection.find("_id" => ::BSON::ObjectId.from_string(id)).first
       end
 
       def calculate_mapreduce(map, reduce, params = {})