mongo_request_logger 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77639396cad58e5a076a1bfb8faf2814140c79a3
-  data.tar.gz: 04ef4b8af39a09990dd78a6d88648cae5f881902
+  metadata.gz: a1a7c2d660f9091c18bab904f5c7adf9c7481dfd
+  data.tar.gz: 756f66c113e76c516016dc068de35e6c81bf3f0e
 SHA512:
-  metadata.gz: 27db8433c868c7cf729afefb4418ca3dd90905c735e608cff97946c3f23098b7cd5ff158dcd77ce2dfa93a1c9a8d47f7f342d9ac60ec2ebca2a18fbe9ec58805
-  data.tar.gz: c60ac9125d39a8c98a43974f9ede24093904c90c3ec9a4c049114154d96c2d11ac3d3ced27f10af0f900648b41bb1c92394054196c2b10b6f521d34f8f435658
+  metadata.gz: 7248658d11b915dd320dc65104c20b238b4f64f1f496925f9e9ed7abe2aeaba2a2efc504d82380a98289e4d44cd6209ee7b3899730a4526d967167719b7257ee
+  data.tar.gz: a66e533c523a2c78ba07f2faac8442fa7e6e82940f6597d8d56da426fa1b8246148c8cc7ac28a4c95bb7342fc2ea28b399c844004cf57171f8be2cc9ce1eee3e

data/.ruby-version

@@ -0,0 +1 @@
+2.2.0

data/.travis.yml

@@ -1,18 +1,21 @@
 language: ruby
 script: "bundle exec rspec"
+branches:
+  except:
+    - /^v[0-9]/
 env:
   - CI=true
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1.1
+  - 2.2.0
 
 gemfile:
-  - gemfiles/sinatra1.3.gemfile
+  - gemfiles/rails4.2.gemfile
   - gemfiles/sinatra1.4.gemfile
 
 services:
   - mongodb
 notifications:
   recipients:
-    - ralf@embarkmobile.com
+    - ralf@journeyapps.com

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.5.0
+
+*Backwards incompatible!*
+
+* Support Rails 4, Mongoid 4 and Moped 2. Older versions of these, including ActiveSupport, is not supported anymore.
+
 ## 0.4.0
 
 *Backwards incompatible!*
@@ -28,7 +34,7 @@
 
 ## 0.2.4
 
-* Improved hanlding of logger when not configured for an environment.
+* Improved handling of logger when not configured for an environment.
 
 ## 0.2.3
 

data/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
-gem 'moped', '~> 1.5'
-gem 'mongoid', '~> 3.0'
+gem 'moped', '~> 2.0'
+gem 'mongoid', '~> 4.0'
 gem 'rspec'
 gem 'sinatra', '~> 1.4.0'
 

data/README.md

@@ -6,10 +6,10 @@ Log requests in a structured format to MongoDB.
 
 Add this line to your application's Gemfile:
 
-    gem 'mongoid', '~> 3.0'
+    gem 'mongoid', '~> 4.0'
     gem 'mongo_request_logger'
 
-## Usage with Rails
+## Usage with Rails 4
 
 Add a `logger` session to your Mongoid config, `config/mongoid.yml`. An additional option
 `capsize` must be provided.

data/gemfiles/{sinatra1.3.gemfile → rails4.2.gemfile}

@@ -1,10 +1,11 @@
 source 'https://rubygems.org'
 
-gem 'moped', '~> 1.5'
-gem 'mongoid', '~> 3.0'
+gem 'moped', '~> 2.0'
+gem 'mongoid', '~> 4.0'
 gem 'rspec'
-gem 'rails', '~> 3.2.10'
+gem 'rails', '~> 4.2'
 gem 'sinatra', '~> 1.3.2'
+gem 'actionpack-xml_parser'
 
 # Specify your gem's dependencies in mongo_request_logger.gemspec
 gemspec path: '../'

data/gemfiles/sinatra1.4.gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
-gem 'moped', '~> 1.5'
-gem 'mongoid', '~> 3.0'
+gem 'moped', '~> 2.0'
+gem 'mongoid', '~> 4.0'
 gem 'rspec'
 gem 'sinatra', '~> 1.4.0'
 

data/lib/mongo_request_logger.rb

@@ -1,4 +1,4 @@
-require 'mongo_request_logger/ext/buffered_logger'
+require 'mongo_request_logger/ext/activesupport_logger'
 require 'mongo_request_logger/ext/logger'
 require 'mongo_request_logger/logger'
 require 'mongo_request_logger/version'

data/lib/mongo_request_logger/adapters/moped.rb

@@ -1,6 +1,8 @@
 # Adapted from https://github.com/le0pard/mongodb_logger/
+require 'moped'
 
 require 'mongo_request_logger/adapters/base'
+require 'mongo_request_logger/ext/moped_session'
 
 module MongoRequestLogger
   module Adapters
@@ -34,7 +36,7 @@ module MongoRequestLogger
       end
 
       def insert_log_record(record)
-        record[:_id] = ::Moped::BSON::ObjectId.new
+        record[:_id] = ::BSON::ObjectId.new
         @connection.with(safe: false)[collection_name].insert(record)
       end
 
@@ -51,7 +53,7 @@ module MongoRequestLogger
       end
 
       def find_by_id(id)
-        @collection.find("_id" => ::Moped::BSON::ObjectId.from_string(id)).first
+        @collection.find("_id" => ::BSON::ObjectId.from_string(id)).first
       end
 
       def clear!

data/lib/mongo_request_logger/ext/activesupport_logger.rb

@@ -0,0 +1,4 @@
+require 'active_support/logger'
+require 'mongo_request_logger/logger_extensions'
+
+ActiveSupport::Logger.send(:include, MongoRequestLogger::LoggerExtensions)

data/lib/mongo_request_logger/ext/moped_session.rb

@@ -0,0 +1,5 @@
+require 'moped'
+require 'moped/session'
+
+# We use an additional :capsize option in the config.
+Moped::Session.send(:option, :capsize).allow(Optionable.any(Integer))

data/lib/mongo_request_logger/logger.rb

@@ -1,8 +1,8 @@
-require 'active_support/buffered_logger'
-require 'mongo_request_logger/ext/buffered_logger'
+require 'active_support/logger'
+require 'mongo_request_logger/ext/activesupport_logger'
 
 module MongoRequestLogger
-  class Logger < ActiveSupport::BufferedLogger
+  class Logger < ActiveSupport::Logger
     attr_reader :adapter
 
     def initialize(adapter, file, level=DEBUG)
@@ -89,7 +89,19 @@ module MongoRequestLogger
     end
 
     def add(severity, message = nil, progname = nil, &block)
+      severity ||= UNKNOWN
+
       unless level > severity
+        if message.nil?
+          if block_given?
+            message = yield
+          else
+            message = progname
+          end
+        end
+
+        raise "FOO" if message.nil?
+
         time = Time.now.strftime "%H:%M:%S.%L"
         prefix = "#{time} [#{level_to_s(severity)}] "
         #if ActiveRecord::Base.colorize_logging
@@ -97,7 +109,7 @@ module MongoRequestLogger
         #  @mongo_record[:messages] << prefix + message.gsub(/(\e(\[([\d;]*[mz]?))?)?/, '').strip rescue nil
         #else
         @mongo_record[:messages] ||= []
-        @mongo_record[:messages] << prefix + message
+        @mongo_record[:messages] << "#{prefix}#{message}"
         #end
       end
 

data/lib/mongo_request_logger/rack.rb

@@ -37,7 +37,7 @@ module MongoRequestLogger
             return @app.call(env)
           end
         end
-        # TODO: filter parameters
+
         # KLUDGE: this will cause parameter parsing to happen twice: once here, once later on in Rails.
         # Or maybe it's automatically cached in env?
         logger.log_request do

data/lib/mongo_request_logger/railtie.rb

@@ -1,4 +1,4 @@
-if (defined? Rails) && Rails.version =~ /^3\./
+if defined? Rails
   require 'mongo_request_logger'
 
   require 'rails'

data/lib/mongo_request_logger/version.rb

@@ -1,3 +1,3 @@
 module MongoRequestLogger
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/mongo_request_logger.gemspec

@@ -20,5 +20,5 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'sinatra', '>= 1.3.2'
   gem.add_dependency 'sinatra-contrib'
-  gem.add_dependency 'activesupport', '~> 3.0'
+  gem.add_dependency 'activesupport', '~> 4.0'
 end

data/spec/dummy/application.rb

@@ -1,6 +1,7 @@
 require 'rails'
 require 'action_controller/railtie'
-
+require 'action_dispatch/xml_params_parser'
+require 'mongo_request_logger/viewer'
 
 class Dummy < Rails::Application
   config.root = File.dirname(__FILE__)
@@ -8,6 +9,9 @@ class Dummy < Rails::Application
   # Rails needs these keys, but they don't really have to be secret for our tests
   config.session_store :cookie_store, key: '****************************************'
   config.secret_token = '****************************************'
+  config.secret_key_base = '****************************************'
+
+  config.middleware.insert_after ActionDispatch::ParamsParser, ActionDispatch::XmlParamsParser
 
   # Our routes
   routes.draw do
@@ -33,5 +37,9 @@ end
 
 # Not sure how to make Rails automatically run the railtie with a dummy app, so we do it manually.
 # In a proper Rails app we don't need this.
+
+config_file = Rails.root.join("config", "mongoid.yml")
+::Mongoid.load!(config_file)
+
 require 'mongo_request_logger/railtie'
 MongoRequestLogger::Railtie.setup(Rails.application)

data/spec/dummy/config/mongoid.yml

@@ -0,0 +1,13 @@
+test:
+  sessions:
+    default:
+      database: request_logger_test_dummy
+      hosts:
+        - localhost:27017
+    logger:
+      database: request_logger_test
+      hosts:
+        - localhost:27017
+      options:
+        capsize: 10  # megabytes
+

data/spec/rails_spec.rb

@@ -78,11 +78,11 @@ begin
     it "should handle broken post JSON content" do
       data = "This is not JSON"
       post '/', {}, {input: data, "CONTENT_TYPE" => 'application/json'}
-      last_response.status.should == 500
+      last_response.status.should == 400
 
       result = adapter.query({}).first
       result['path'].should == '/'
-      result['response'].should == 500  # Why is it 500?
+      result['response'].should == 500  # FIXME: We don't detect the response code correctly.
       result['request_method'].should == 'POST'
       result['content_type'].should == 'application/json'
       result['content_length'].should == data.length
@@ -92,11 +92,11 @@ begin
     it "should handle broken post XML content" do
       data = "This is not XML"
       post '/', {}, {input: data, "CONTENT_TYPE" => 'application/xml'}
-      last_response.status.should == 500
+      last_response.status.should == 400
 
       result = adapter.query({}).first
       result['path'].should == '/'
-      result['response'].should == 500  # Why is it 500?
+      result['response'].should == 500  # FIXME: We don't detect the response code correctly.
       result['request_method'].should == 'POST'
       result['content_type'].should == 'application/xml'
       result['content_length'].should == data.length

data/spec/spec_helper.rb

@@ -1,13 +1,6 @@
 require 'rspec'
 require 'rack/test'
 
-if ENV['COVERAGE']
-  require 'simplecov'
-  SimpleCov.start do
-    add_filter '/spec/'
-  end
-end
-
 begin
   require 'rails'
 rescue LoadError
@@ -20,13 +13,9 @@ if defined? Rails
   RAILS_ROOT = File.join(File.dirname(__FILE__), 'spec/dummy')
 end
 
-# Require all files, so they show up in coverage
-Dir['lib/**/*.rb'].each do |file|
-  path = /lib\/(.*)\.rb/.match(file)[1]
-  require path
-end
-
-
 RSpec.configure do |conf|
   conf.include Rack::Test::Methods
+
+  # We're still using the old syntax for now
+  conf.expect_with(:rspec) { |c| c.syntax = :should }
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: mongo_request_logger
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Embark Mobile
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2015-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 description: Request logger for Rack apps
 email:
 - info@embarkmobile.com
@@ -59,8 +59,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".ruby-version"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -371,14 +372,15 @@ files:
 - angular/test/unit/filtersSpec.js
 - angular/test/unit/servicesSpec.js
 - config.ru
-- gemfiles/sinatra1.3.gemfile
+- gemfiles/rails4.2.gemfile
 - gemfiles/sinatra1.4.gemfile
 - lib/mongo_request_logger.rb
 - lib/mongo_request_logger/adapters/base.rb
 - lib/mongo_request_logger/adapters/moped.rb
 - lib/mongo_request_logger/backtrace_cleaner.rb
-- lib/mongo_request_logger/ext/buffered_logger.rb
+- lib/mongo_request_logger/ext/activesupport_logger.rb
 - lib/mongo_request_logger/ext/logger.rb
+- lib/mongo_request_logger/ext/moped_session.rb
 - lib/mongo_request_logger/log_message.rb
 - lib/mongo_request_logger/logged_job.rb
 - lib/mongo_request_logger/logger.rb
@@ -390,7 +392,7 @@ files:
 - lib/mongo_request_logger/viewer.rb
 - mongo_request_logger.gemspec
 - spec/dummy/application.rb
-- spec/dummy/config/logger.yml
+- spec/dummy/config/mongoid.yml
 - spec/dummy/log/.gitkeep
 - spec/moped_logger_spec.rb
 - spec/query_spec.rb
@@ -412,23 +414,23 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Structured logger and log viewer for Rack (including Rails) requests
 test_files:
 - spec/dummy/application.rb
-- spec/dummy/config/logger.yml
+- spec/dummy/config/mongoid.yml
 - spec/dummy/log/.gitkeep
 - spec/moped_logger_spec.rb
 - spec/query_spec.rb

data/lib/mongo_request_logger/ext/buffered_logger.rb

@@ -1,6 +0,0 @@
-require 'active_support/buffered_logger'
-require 'mongo_request_logger/logger_extensions'
-
-class ActiveSupport::BufferedLogger
-  include MongoRequestLogger::LoggerExtensions
-end

data/spec/dummy/config/logger.yml

@@ -1,5 +0,0 @@
-test:
-  host: localhost
-  database: request_logger_test
-  capsize: 10  # megabytes
-