mongodb_logger 0.4.2 → 0.5.0

data/.gitignore

@@ -4,6 +4,7 @@
 .config
 .yardoc
 .project
+*.log
 Gemfile.lock
 InstalledFiles
 _yardoc
@@ -18,4 +19,4 @@ test/version_tmp
 test/log/*.log
 tmp
 .DS_Store
-test/Gemfile_tests.lock
+gemfiles/*.lock

data/.rvmrc

@@ -1 +1 @@
-rvm ruby-1.9.3-p374@mongodb_logger_gems --create
+rvm ruby-2.0.0-p0@mongodb_logger_gems --create

data/.travis.yml

@@ -1,15 +1,17 @@
 language: ruby
 before_install:
-  - gem install bundler --pre
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
-script: "sh -c 'test/test.sh'"
+before_script:
+  - bundle exec rake appraisal:install
 services:
   - mongodb
 rvm:
   - 1.9.2
   - 1.9.3
+  - 2.0.0
   - jruby-19mode
+  - rbx-19mode
   - ruby-head
   - jruby-head
 notifications:
@@ -18,8 +20,7 @@ branches:
   only:
     - master
     - development
-    - adapters
 matrix:
   allow_failures:
     - rvm: ruby-head
-    - rvm: jruby-head
+    - rvm: jruby-head

data/Appraisals

@@ -0,0 +1,9 @@
+appraise "rails31" do
+  gem "rails", "~> 3.1.11"
+  gem "mongodb_logger", :path => "../"
+end
+
+appraise "rails32" do
+  gem "rails", "~> 3.2.12"
+  gem "mongodb_logger", :path => "../"
+end

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+## v0.5.0
+
+* Moved to new rspec and cucumber testing, fixed testing in travis
+* Added migration task for changed capped collection size ([#49](https://github.com/le0pard/mongodb_logger/issues/49))
+* Moved some part of web ui on mustache templates (now no need load info from server for right info tab)
+* Change dependency from json to multi\_json gem
+* Fix js problems on web page
+* Cleanup and DRY the code
+
+## v0.4.2
+
+* Fix problem with session keys (keys with dots is invalid for BSON)
+
+## v0.4.1
+
+* One gem for jruby and MRI
+
 ## v0.4.0
 
 * Support adapters: mongo and moped
@@ -7,7 +24,7 @@
 
 ## v0.3.3
 
-* Mount assets separately or compile it by rake task 
+* Mount assets separately or compile it by rake task
 * Capistrano recipe for compiling assets
 
 ## v0.3.2
@@ -54,7 +71,7 @@
 
 ## v0.2.2
 
-* Fix set custom collection in config and add tests on it 
+* Fix set custom collection in config and add tests on it
 
 ## v0.2.1
 
@@ -62,4 +79,4 @@
 
 ## v0.2.0
 
-* Public release
+* Public release

data/README.md

@@ -1,19 +1,23 @@
-# MongodbLogger [![Build Status](https://secure.travis-ci.org/le0pard/mongodb_logger.png)](http://travis-ci.org/le0pard/mongodb_logger)
+# MongodbLogger
+[![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 3, which log all requests of you application into MongoDB database. 
+MongodbLogger is a alternative logger for Rails, which log all requests of you application into MongoDB database.
 It:
 
-* simple to integrate into existing Rails 3 application;
+* simple to integrate into existing Rails application;
 * allow to store all logs from web cluster into one scalable storage - MongoDB;
 * flexible schema of MongoDB allow to store and search any information from logs;
 * web panel allow filter logs, build graphs using MapReduce by information from logs;
 
-## Rails 3 support
+## Rails support
 
-Please note the latest version is compatible with rails 3.1.x or newer. 
+Please note the latest version is compatible with rails 3.1.x or newer.
 
 For rails 3.0.x latest version 0.2.8.
 
+Doesn't support the Rails version below 3.
+
 ## Installation
 
 1. Add the following to your Gemfile then refresh your dependencies by executing "bundle install" (or just simple "bundle"):
@@ -24,15 +28,15 @@ For rails 3.0.x latest version 0.2.8.
 
         gem "mongo"
         gem "bson_ext"
-        
-  or 
+
+  or
 
         gem "moped"
 
 1. Add the following line to your ApplicationController:
 
         include MongodbLogger::Base
-        
+
 1. For use with Heroku you need to prevent the rails\_log\_stdout plugin from being added by Heroku:
 
         mkdir vendor/plugins/rails_log_stdout
@@ -69,7 +73,7 @@ For rails 3.0.x latest version 0.2.8.
           host: localhost
           port: 27017
           replica_set: true
-          
+
    Also you can use "url" parameter for setup connection to mongodb:
 
         development:
@@ -78,7 +82,7 @@ For rails 3.0.x latest version 0.2.8.
 
 
 1. For using with MongoDB Replica Set (more info you can read by this link [http://www.mongodb.org/display/DOCS/Replica+Sets](http://www.mongodb.org/display/DOCS/Replica+Sets)). In config set list of [host, port] in key "hosts":
-   
+
         development:
           database: my_app
           capsize: <%= 10.megabytes %>
@@ -88,30 +92,30 @@ For rails 3.0.x latest version 0.2.8.
             - - 127.0.0.1
               - 27018
             - - 127.0.0.1
-              - 27019    
+              - 27019
 
 1. For assets pipeline you can generate all js/css file into folder by rake task:
 
         rake mongodb_logger:assets:compile[public/assets]
-        
+
 ## Assets pipeline
-        
+
 For capistrano possible compile assets by receipt. Add this to config/deploy.rb:
 
     require 'mongodb_logger/capistrano'
     set :mongodb_logger_assets_dir, "public/assets" # where to put mongodb assets
     after 'deploy:update_code', 'mongodb_logger:precompile'
-        
+
 Also you can serve assets from rails app. You need just mount it separately:
-        
+
     mount MongodbLogger::Server.new, :at => "/mongodb", :as => :mongodb
     mount MongodbLogger::Assets.instance, :at => "/mongodb/assets", :as => :mongodb_assets # assets
-  
-  
+
+
 ## Usage
 
 After success instalation of gem, a new MongoDB document (record) will be created for each request on your application,
-by default will record the following information: Runtime, IP Address, Request Time, Controller, Method, 
+by default will record the following information: Runtime, IP Address, Request Time, Controller, Method,
 Action, Params, Application Name and All messages sent to the logger. The structure of the MongoDB document looks like this:
 
     {
@@ -151,48 +155,67 @@ For send email or do something on exception you can add callback:
         # do something with this data, for example - send email (better - by background job)
       end
     end
-  
+
 In this callback send record without "\_id", because logger not wait for insert response from MongoDB.
 
+## Migrate to another size of capped collection
+
+If you need change capper collection size, you should change the "capsize" key in mongodb\_config and run this task for migration:
+
+    rake mongodb_logger:migrate
+
+## Rack Middleware
+
+If you want use MongodbLogger in Rack app which is mounted to your Rails app, you can try to use rack middleware:
+
+    use MongodbLogger::RackMiddleware
+
+## Rails::Engine
+
+If you want use MongodbLogger with some of Rails::Engine, you can do this (example for Spree):
+
+    Spree::BaseController.send :include, MongodbLogger::Base
+    Spree::Admin::BaseController.send :include, MongodbLogger::Base # for admin
+
 ## The Front End
 
-To setup web interface in you Rails application, first of all create autoload file in you Rails application 
- 
+To setup web interface in you Rails application, first of all create autoload file in you Rails application
+
 File: you\_rails\_app/config/initializers/mongodb\_logger.rb (example)
-      
+
     require 'mongodb_logger/server' # required
     # this secure you web interface by basic auth, but you can skip this, if you no need this
     MongodbLogger::Server.use Rack::Auth::Basic do |username, password|
         [username, password] == ['admin', 'password']
     end
- 
+
 and just mount MongodbLogger::Server in rails routes:
 
 File: you\_rails\_app/config/routes.rb
-      
+
     mount MongodbLogger::Server.new, :at => "/mongodb"
-      
+
 Now you can see web interface by url "http://localhost:3000/mongodb"
 
 If you've installed MongodbLogger as a gem and want running the front end without Rails application, you can do it by this command:
 
     mongodb_logger_web config.yml
-    
+
 where config.yml is config, similar to config of Rails apps, but without Rails.env. Example:
-    
+
     database: app_logs_dev
     host: localhost
     port: 27017
     collection: development_log # set for see development logs
-    
+
 parameter "collection" should be set, if your set custom for your Rails application or start this front end not for production
-enviroment (by default taken "production\_log" collection, in Rails application gem generate "#{Rails.env}\_log" collection, 
+enviroment (by default taken "production\_log" collection, in Rails application gem generate "#{Rails.env}\_log" collection,
 if it is not defined in config).
 
 It's a thin layer around rackup so it's configurable as well:
 
     mongodb_logger_web config.yml -p 8282
-      
+
 ###  Passenger, Unicorn, Thin, etc.
 
 Using Passenger, Unicorn, Thin, etc? MongodbLogger ships with a `config.ru` you can use. See  guide:
@@ -207,17 +230,17 @@ Don't forget setup MONGODBLOGGERCONFIG env variable, which provide information a
     MONGODBLOGGERCONFIG=examples/server_config.yml unicorn
 
 ##  Demo Application with MongodbLogger
-  
+
 Demo: [http://demo-mongodb-logger.catware.org/](http://demo-mongodb-logger.catware.org/)
-  
+
 Demo Sources: [https://github.com/le0pard/mongodb_logger_example_heroku](https://github.com/le0pard/mongodb_logger_example_heroku)
-  
+
 
 ## Querying via the Rails console
 
   And now, for a couple quick examples on getting ahold of this log data...
   First, here's how to get a handle on the MongoDB from within a Rails console:
-      
+
     >> db = Rails.logger.mongo_adapter.connection
     => #<Mongo::DB:0x007fdc7c65adc8 @name="monkey_logs_dev" ... >
     >> collection = Rails.logger.mongo_adapter.collection
@@ -242,7 +265,7 @@ Demo Sources: [https://github.com/le0pard/mongodb_logger_example_heroku](https:/
   Find all requests with an exception that contains "RoutingError" in the message or stack trace:
 
     >> collection.find({"messages.error" => /RoutingError/})
-      
+
   Find all requests with errors:
 
     >> collection.find({"is_exception" => true})

data/Rakefile

@@ -5,132 +5,69 @@ require 'bundler'
 Bundler.require
 require 'rake'
 require 'rake/testtask'
-require 'cucumber'
-require 'cucumber/rake/task'
-
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+require 'appraisal'
+require 'rspec/core/rake_task'
+begin
+  require 'cucumber/rake/task'
+rescue LoadError
+  $stderr.puts "Please install cucumber: `gem install cucumber`"
+  exit 1
+end
 
 #########################################
 ### TESTS
 #########################################
 
-desc 'Default: run unit tests.'
-task :default => [:test]
-#task :default => [:test, "cucumber:rails:all"]
+desc 'Default: run tests'
+task :default => [:spec, "mongodb_logger:tests"]
+
+namespace :mongodb_logger do
+  task :tests do
+    exec 'rake appraisal cucumber '\
+    '&& FEATURE=features/mongodb_logger_web.feature rake cucumber '\
+  end
+end
+desc "run specs"
+task :spec do
+  RSpec::Core::RakeTask.new
+end
 
 desc "Clean out the tmp directory"
 task :clean do
-  exec "rm -rf tmp"
+  exec "rm -rf tmp/*"
 end
 
-desc 'Test unit.'
+desc 'Test unit'
 Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
+  test.libs << 'lib'
   test.test_files = ['test/unit/mongodb_logger_test.rb']
   test.verbose = true
 end
 
 namespace :test do
-
   desc "Run replica set tests (not for CI)"
   Rake::TestTask.new(:replica_set) do |test|
-    test.libs << 'lib' << 'test'
+    test.libs << 'lib'
     test.pattern = 'test/unit/mongodb_logger_replica_test.rb'
     test.verbose = true
   end
-  
 end
 
+def cucumber_opts
+  opts = "--tags ~@wip --format progress "
 
-GEM_ROOT = File.dirname(__FILE__).freeze
-LOCAL_GEM_ROOT = File.join(GEM_ROOT, 'tmp', 'local_gems').freeze
-
-if ENV['CI']
-  # for ci testing only major rails versions
-  if 'java' == RUBY_PLATFORM
-    RAILS_VERSIONS = ['3.1.6', '3.2.9']
-  else
-    RAILS_VERSIONS = ['3.1.6', '3.2.9']
-  end     
-else
-  RAILS_VERSIONS = IO.read('SUPPORTED_RAILS_VERSIONS').strip.split("\n")
-end
+  opts << ENV["FEATURE"] and return if ENV["FEATURE"]
 
-
-LOCAL_GEMS = [['sqlite3', nil], ['shoulda', nil], ["rspec", nil], ["mocha", nil], ["cucumber", nil], ["bundler", "1.0.21"]] + 
-RAILS_VERSIONS.collect { |version| ['rails', version] }
-
-desc "Vendor test gems: Run this once to prepare your test environment"
-task :vendor_test_gems do
-  old_gem_path = ENV['GEM_PATH']
-  old_gem_home = ENV['GEM_HOME']
-  ENV['GEM_PATH'] = LOCAL_GEM_ROOT
-  ENV['GEM_HOME'] = LOCAL_GEM_ROOT
-  LOCAL_GEMS.each do |gem_name, version|
-    gem_file_pattern = [gem_name, version || '*'].compact.join('-')
-    version_option = version ? "-v #{version}" : ''
-    pattern = File.join(LOCAL_GEM_ROOT, 'gems', "#{gem_file_pattern}")
-    existing = Dir.glob(pattern).first
-    unless existing
-      command = "gem install -i #{LOCAL_GEM_ROOT} --no-ri --no-rdoc --backtrace #{version_option} #{gem_name}"
-      puts "Vendoring #{gem_file_pattern}..."
-      unless system("#{command} 2>&1")
-        puts "Command failed: #{command}"
-        exit(1)
-      end
-    end
+  case ENV["BUNDLE_GEMFILE"]
+  when /rails/
+    opts << "features/rails.feature"
   end
-  ENV['GEM_PATH'] = old_gem_path
-  ENV['GEM_HOME'] = old_gem_home
 end
 
 Cucumber::Rake::Task.new(:cucumber) do |t|
   t.fork = true
-  t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'progress')]
-end
-
-task :cucumber => [:vendor_test_gems]
-
-def run_rails_cucumbr_task(version, additional_cucumber_args)
-  puts "Testing Rails #{version}"
-  if version.empty?
-    raise "No Rails version specified - make sure ENV['RAILS_VERSION'] is set, e.g. with `rake cucumber:rails:all`"
-  end
-  ENV['RAILS_VERSION'] = version
-  system("cucumber --format #{ENV['CUCUMBER_FORMAT'] || 'progress'} #{additional_cucumber_args} features/rails.feature")
-end
-
-def define_rails_cucumber_tasks(additional_cucumber_args = '')
-  namespace :rails do
-    RAILS_VERSIONS.each do |version|
-      desc "Test integration of the gem with Rails #{version}"
-      task version => [:vendor_test_gems] do
-        exit 1 unless run_rails_cucumbr_task(version, additional_cucumber_args)
-      end
-    end
-
-    desc "Test integration of the gem with all Rails versions"
-    task :all do
-      results = RAILS_VERSIONS.map do |version|
-        run_rails_cucumbr_task(version, additional_cucumber_args)
-      end
-
-      exit 1 unless results.all?
-    end
-  end
-end
-
-def define_web_cucumber_tasks(additional_cucumber_args = '')
-  desc "Test web of the gem"
-  task :web do
-    puts "Testing Web"
-    system("cucumber --format #{ENV['CUCUMBER_FORMAT'] || 'progress'} #{additional_cucumber_args} features/mongodb_logger_web.feature")
-  end
-end
-
-namespace :cucumber do
-  define_rails_cucumber_tasks
-  define_web_cucumber_tasks
+  t.cucumber_opts = cucumber_opts
 end
 
 begin