mongodb_logger 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7463e7411319454a836c0d10ee7725c6d71fe02
-  data.tar.gz: b12df4c637b7ef4e9860789cf2bbd3ba6d79b2b6
+  metadata.gz: 373211262f8835058278de0843ac944ee26590e1
+  data.tar.gz: 7a30efb9fbdd8a10a72e53f4996ba5183e15f007
 SHA512:
-  metadata.gz: b88448aeb56f96356ded3c87f1881e734a862e52f5cbd7d95db5a27b2187f8673845993051d367939b46e1737fc443dde90abea297f2725457839fe9c457cfc8
-  data.tar.gz: 5461c6c9af82e8fd914b596a7aebcc3b81e6827b6d44ab0edc5af0e83f077b73f09ccfe5666eb0e0f21472ba120756639101859f8ce5ef7bce0bcd9cdc1176df
+  metadata.gz: 7f5c5e7db9bf4caf28889c1fc893e9877fbc17e2d59274b9acdb9380b38149eeb586b0fa6096c91597ce748e45a516e57db454ed5609cf8d3f063bc8da3dde1f
+  data.tar.gz: a105c6b07ac2aee5d907a4ce8b4d89366bd5d0aaa88a0859a4af85f8408e01053429a2ae4339ba76d7e5eb396201a33461c996aa63fd5ed3870e1238d37c4439

data/.ruby-version

@@ -1 +1 @@
-2.1.1
+2.2.0

data/.travis.yml

@@ -1,25 +1,34 @@
 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.3
-  - 2.0.0
-  - 2.1.0
+  - 2.0
+  - 2.1
+  - 2.2
   - jruby-19mode
   - ruby-head
   - jruby-head
+
+sudo: false
+
 notifications:
   email: false
+
 branches:
   only:
     - master
     - development
+
 matrix:
   allow_failures:
     - rvm: jruby-19mode

data/Appraisals

@@ -1,17 +1,9 @@
-appraise "rails31" do
-  gem "rails", "~> 3.1.12"
-end
-
-appraise "rails32" do
-  gem "rails", "~> 3.2.14"
-end
-
-appraise "rails40" do
-  gem "rails", "~> 4.0.2"
-  gem "minitest", "~> 4.0"
+appraise "rails41" do
+  gem "rails", "~> 4.1.8"
+  gem "rspec-rails", ">= 3.0"
 end
 
-appraise "rails41" do
-  gem "rails", "4.1.0.rc1"
-  gem "minitest", ">= 4.0"
+appraise "rails42" do
+  gem "rails", "~> 4.2.0"
+  gem "rspec-rails", ">= 3.0"
 end

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## master
 
+## 0.6.5
+
+* Support new Rails 4.2 and Ruby 2.2.x
+* Remove support Rails 3.x
+
 ## 0.6.4
 
 * Fixed for moped gem < 2

data/README.md

@@ -1,6 +1,7 @@
 # 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)
+
+[![Build Status](https://travis-ci.org/le0pard/mongodb_logger.svg?branch=master)](https://travis-ci.org/le0pard/mongodb_logger)
+[![Code Climate](https://codeclimate.com/github/le0pard/mongodb_logger/badges/gpa.svg)](https://codeclimate.com/github/le0pard/mongodb_logger)
 
 MongodbLogger is a alternative logger for Rails or Rack based app, which log all requests of you application into MongoDB database.
 It:
@@ -59,6 +60,8 @@ Doesn't support the Rails version below 3.
             capsize: <%= 10.megabytes %>   # default: 250MB
             host: localhost                # default: localhost
             port: 27017                    # default: 27017
+            username: null                 # default: null, username for MongoDB Auth
+            password: null                 # default: null, password for MongoDB Auth
             replica_set: true              # default: false - Adds retries for ConnectionFailure during voting for replica set master
             write_options:                 # default: {w: 0, wtimeout: 200} - write options for inserts (w - wait for insert to propagate to "w" numbers of nodes)
               w: 0
@@ -79,7 +82,7 @@ Doesn't support the Rails version below 3.
    Also you can use "url" parameter for setup connection to mongodb:
 
         development:
-          url: mongodb://localhost:27017/my_app
+          url: mongodb://username:password@localhost:27017/my_app
           capsize: <%= 10.megabytes %>
 
 

data/features/support/rails.rb

@@ -24,18 +24,10 @@ module RailsHelpers
     controller_filename = File.join(rails_root, 'app', 'controllers', "application_controller.rb")
   end
 
-  def rails3?
-    rails_version =~ /^3/
-  end
-
   def rails_root
     LOCAL_RAILS_ROOT
   end
 
-  def rails_uses_rack?
-    rails3? || rails_version =~ /^2\.3/
-  end
-
   def rails_version
     @rails_version ||= begin
       if ENV["RAILS_VERSION"]
@@ -61,14 +53,6 @@ module RailsHelpers
     rails_version =~ /^2\.[123]/
   end
 
-  def rails_supports_initializers?
-    rails3? || rails_version =~ /^2\./
-  end
-
-  def rails_finds_generators_in_gems?
-    rails3? || rails_version =~ /^2\./
-  end
-
   def version_string
     ENV['RAILS_VERSION'] || `tail -n 1 SUPPORTED_RAILS_VERSIONS` # use latest version if ENV["RAILS_VERSION"] is undefined
   end

data/gemfiles/rails41.gemfile

@@ -2,7 +2,7 @@
 
 source "http://rubygems.org"
 
-gem "rails", "4.1.0.rc1"
-gem "minitest", ">= 4.0"
+gem "rails", "~> 4.1.8"
+gem "rspec-rails", ">= 3.0"
 
 gemspec :path=>"../"

data/gemfiles/rails42.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 4.2.0"
+gem "rspec-rails", ">= 3.0"
+
+gemspec :path=>"../"

data/lib/mongodb_logger/initializer_mixin.rb

@@ -3,10 +3,6 @@ require 'mongodb_logger/rails_logger'
 module MongodbLogger
   module InitializerMixin
 
-    def rails3(minor = 0)
-      3 == Rails::VERSION::MAJOR && minor == Rails::VERSION::MINOR
-    end
-
     def create_logger(config)
       path = config.paths['log'].first
       level = RailsLogger.const_get(config.log_level.to_s.upcase)
@@ -14,7 +10,6 @@ module MongodbLogger
       # 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 = RailsLogger.new(STDERR)

data/lib/mongodb_logger/logger.rb

@@ -1,4 +1,5 @@
 require 'erb'
+require 'yaml'
 require 'uri'
 require 'active_support'
 require 'active_support/core_ext'
@@ -95,7 +96,7 @@ module MongodbLogger
     end
 
     def disable_file_logging?
-      @db_configuration.fetch(:disable_file_logging, false)
+      @db_configuration && @db_configuration.fetch(:disable_file_logging, false)
     end
 
     def configure
@@ -159,7 +160,7 @@ module MongodbLogger
 
     def read_config_from_file(config_file)
       if File.file? config_file
-        config = YAML.load(ERB.new(File.new(config_file).read).result)[app_env]
+        config = ::YAML.load(ERB.new(File.new(config_file).read).result)[app_env]
         config = config['mongodb_logger'] if config && config.has_key?('mongodb_logger')
         return config unless config.blank?
       end

data/lib/mongodb_logger/version.rb

@@ -1,3 +1,3 @@
 module MongodbLogger
-  VERSION = "0.6.4"
+  VERSION = "0.6.5"
 end

data/mongodb_logger.gemspec

@@ -14,8 +14,8 @@ Gem::Specification.new do |gem|
   gem.rdoc_options      = ["--charset=UTF-8"]
   gem.licenses          = ["MIT"]
 
-  gem.add_development_dependency "rspec", "~> 2.14.1"
-  gem.add_development_dependency "rspec-rails", "~> 2.14.1"
+  gem.add_development_dependency "rspec", ">= 3"
+  gem.add_development_dependency "rspec-rails", ">= 3"
   gem.add_development_dependency "cucumber", "~> 1.3.10"
   gem.add_development_dependency "cucumber-rails", "~> 1.4.0"
   gem.add_development_dependency "capybara", '~> 2.2.1'
@@ -23,11 +23,11 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "aruba", "~> 0.5.4"
   # for tests deps
   gem.add_development_dependency "coffee-script", "~> 2.2"
-  gem.add_development_dependency "mongo", "~> 1.9"
+  gem.add_development_dependency "mongo", "~> 1.10"
   #gem.add_development_dependency "moped", "2.0.0.beta6"
 
   gem.add_dependency "rake",            "~> 10.0"
-  gem.add_dependency "multi_json",      "~> 1.8"
+  gem.add_dependency "multi_json",      ">= 1.8"
   gem.add_dependency "activesupport",   ">= 3.1.0"
   gem.add_dependency "sprockets",       ">= 2.0.0"
   gem.add_dependency "sinatra",         ">= 1.3"

data/spec/mongodb_logger_spec.rb

@@ -11,8 +11,8 @@ describe MongodbLogger::Logger do
 
   context "in instantiation" do
     before do
-      described_class.any_instance.stub(:internal_initialize).and_return(nil)
-      described_class.any_instance.stub(:disable_file_logging?).and_return(false)
+      allow_any_instance_of(described_class).to receive(:internal_initialize).and_return(nil)
+      allow_any_instance_of(described_class).to receive(:disable_file_logging?).and_return(false)
       @mongodb_logger = described_class.new
     end
 
@@ -41,7 +41,7 @@ describe MongodbLogger::Logger do
 
       it "authenticated by url" do
         @mongodb_logger.send(:connect)
-        expect(@mongodb_logger.mongo_adapter.authenticated?).to be_true
+        expect(@mongodb_logger.mongo_adapter.authenticated?).to be_truthy
         expect(@mongodb_logger.db_configuration['database']).to eq("system_log")
         expect(@mongodb_logger.db_configuration[:database]).to eq("system_log")
       end
@@ -61,7 +61,7 @@ describe MongodbLogger::Logger do
 
       it "authenticate with the credentials in the configuration" do
         @mongodb_logger.send(:connect)
-        expect(@mongodb_logger.mongo_adapter.authenticated?).to be_true
+        expect(@mongodb_logger.mongo_adapter.authenticated?).to be_truthy
       end
     end
 
@@ -103,12 +103,12 @@ describe MongodbLogger::Logger do
       end
 
       it "not authenticate" do
-        expect(@mongo_adapter.authenticated?).to be_false
+        expect(@mongo_adapter.authenticated?).to be_falsey
       end
 
       it "create a capped collection in the database with the configured size" do
         @mongodb_logger.send(:check_for_collection)
-        expect(@mongo_adapter.connection.collection_names.include?(@mongo_adapter.configuration['collection'])).to be_true
+        expect(@mongo_adapter.connection.collection_names.include?(@mongo_adapter.configuration['collection'])).to be_truthy
         # new capped collections are X MB + 5888 bytes, but don't be too strict in case that changes
         expect(@mongo_adapter.collection_stats[:storageSize]).to be < MongodbLogger::Logger::DEFAULT_COLLECTION_SIZE + 1.megabyte
       end
@@ -156,7 +156,7 @@ describe MongodbLogger::Logger do
       end
 
       it "detect logging is colorized" do
-        expect(@mongodb_logger.send(:logging_colorized?)).to be_true
+        expect(@mongodb_logger.send(:logging_colorized?)).to be_truthy
       end
 
       should_contain_one_log_record

data/spec/rails_spec/controllers/tests_controller_spec_rails.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe TestsController do
+describe TestsController, type: :controller do
   before :each do
     @mongodb_logger = Rails.logger
     @mongo_adapter = @mongodb_logger.mongo_adapter

data/spec/rails_spec/spec_helper_rails.rb

@@ -1,8 +1,8 @@
+require 'rubygems'
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../../config/environment", __FILE__)
 require 'rspec/rails'
-require 'rspec/autorun'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
@@ -10,4 +10,8 @@ Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
 
 RSpec.configure do |config|
 
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+
 end

data/spec/support/rails.rb

@@ -5,7 +5,7 @@ end
 
 class Rails
   module VERSION
-    MAJOR = 3
+    MAJOR = 4
   end
 
   def self.env

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: mongodb_logger
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Alexey Vasiliev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -154,14 +154,14 @@ dependencies:
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
@@ -329,10 +329,8 @@ files:
 - features/support/aruba.rb
 - features/support/env.rb
 - features/support/rails.rb
-- gemfiles/rails31.gemfile
-- gemfiles/rails32.gemfile
-- gemfiles/rails40.gemfile
 - gemfiles/rails41.gemfile
+- gemfiles/rails42.gemfile
 - lib/mongodb_logger.rb
 - lib/mongodb_logger/adapters.rb
 - lib/mongodb_logger/adapters/base.rb
@@ -423,7 +421,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: MongoDB logger for Rails

data/gemfiles/rails31.gemfile

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

data/gemfiles/rails32.gemfile

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

data/gemfiles/rails40.gemfile

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