mongodb_logger 0.2.6-jruby → 0.2.7-jruby

data/.gitignore

@@ -15,6 +15,6 @@ rdoc
 spec/reports
 test/tmp
 test/version_tmp
-test/log
+test/log/*.log
 tmp
 .DS_Store

data/.rvmrc

@@ -1 +1 @@
-rvm ruby-1.9.3-p0@mongodb_logger_gems --create
+rvm ruby-1.9.3-p125@mongodb_logger_gems --create

data/.travis.yml

@@ -1,14 +1,15 @@
 before_script:
   - "sh -e /etc/init.d/xvfb start"
 script: "sh -c 'export DISPLAY=:99.0 && test/test.sh'"
+language: ruby
 rvm:
   - 1.8.7
 #  - ree
   - 1.9.2
   - 1.9.3
   - ruby-head
-#  - jruby-18mode
-#  - jruby-19mode
+  - jruby
+#  - jruby-head
 notifications:
   email: false
 branches:

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v0.2.7
+
+* Fixed error trace for ruby 1.9.2
+* Update gems dependency
+
 ## v0.2.6
 
 * Replica Set set in config by key 'hosts'

data/Rakefile

@@ -10,9 +10,8 @@ end
 
 #require "bundler/gem_tasks"
 require 'bundler/gem_helper'
-Bundler::GemHelper.install_tasks(:name => 'mongodb_logger.java')
 Bundler::GemHelper.install_tasks(:name => 'mongodb_logger')
-
+Bundler::GemHelper.install_tasks(:name => 'mongodb_logger.java')
 
 #########################################
 ### Help tasks
@@ -77,7 +76,11 @@ LOCAL_GEM_ROOT = File.join(GEM_ROOT, 'tmp', 'local_gems').freeze
 
 if ENV['CI']
   # for ci testing only major rails versions
-  RAILS_VERSIONS = ['3.0.11', '3.1.3', '3.2.0'] 
+  if 'java' == RUBY_PLATFORM
+    RAILS_VERSIONS = ['3.0.11', '3.1.3']
+  else
+    RAILS_VERSIONS = ['3.0.11', '3.1.3', '3.2.2']
+  end     
 else
   RAILS_VERSIONS = IO.read('SUPPORTED_RAILS_VERSIONS').strip.split("\n")
 end

data/SUPPORTED_RAILS_VERSIONS

@@ -14,4 +14,6 @@
 3.1.1
 3.1.2
 3.1.3
-3.2.0
+3.2.0
+3.2.1
+3.2.2

data/features/step_definitions/rails_application_steps.rb

@@ -1,7 +1,11 @@
 require 'active_support/core_ext/string/inflections'
 
 Given /^I have built and installed the "([^\"]*)" gem$/ do |gem_name|
-  @terminal.build_and_install_gem(File.join(PROJECT_ROOT, "#{gem_name}.gemspec"))
+  if 'java' == RUBY_PLATFORM
+    @terminal.build_and_install_gem(File.join(PROJECT_ROOT, "#{gem_name}.java.gemspec"))
+  else
+    @terminal.build_and_install_gem(File.join(PROJECT_ROOT, "#{gem_name}.gemspec"))
+  end
 end
 
 When /^I generate a new Rails application$/ do
@@ -35,7 +39,14 @@ When /^I setup mongodb_logger tests$/ do
 end
 
 When /^I setup all gems for rails$/ do
-  bundle_gem("therubyracer", nil) if rails31?
+  if !rails30?
+    if 'java' == RUBY_PLATFORM
+      bundle_gem("therubyrhino", nil)
+      bundle_gem("jruby-openssl", nil)
+    else
+      bundle_gem("therubyracer", nil)
+    end
+  end
   step %{I run "bundle install"}
   @terminal.status.exitstatus.should == 0
 end

data/lib/mongodb_logger/initializer_mixin.rb

@@ -1,15 +1,15 @@
 module MongodbLogger
   module InitializerMixin
     
-    def rails30?
-      3 == Rails::VERSION::MAJOR && 0 == Rails::VERSION::MINOR
+    def rails3(minor = 0)
+      3 == Rails::VERSION::MAJOR && minor == Rails::VERSION::MINOR
     end
     
     def create_logger(config)
-      path = rails30? ? config.paths.log.to_a.first : config.paths['log'].first
+      path = rails3(0) ? config.paths.log.to_a.first : config.paths['log'].first
       level = ActiveSupport::BufferedLogger.const_get(config.log_level.to_s.upcase)
       logger = MongodbLogger::Logger.new(:path => path, :level => level)
-      logger.auto_flushing = false if Rails.env.production?
+      logger.auto_flushing = false if Rails.env.production? && (rails3(0) || rails3(1))
       logger
     rescue StandardError => e
       logger = ActiveSupport::BufferedLogger.new(STDERR)

data/lib/mongodb_logger/logger.rb

@@ -41,10 +41,11 @@ module MongodbLogger
         else
           raise ArgumentError, ":#{key} is a reserved key for the mongodb logger. Please choose a different key"
         end
-      end
+      end if @mongo_record
     end
 
     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?
         # do not modify the original message used by the buffered logger
         msg = logging_colorized? ? message.to_s.gsub(/(\e(\[([\d;]*[mz]?))?)?/, '').strip : message
@@ -71,7 +72,7 @@ module MongodbLogger
 
       runtime = Benchmark.measure{ yield }.real if block_given?
     rescue Exception => e
-      add(3, e.message + "\n" + e.backtrace.join("\n"))
+      add(3, e.message.to_s + "\n" + e.backtrace.join("\n"))
       # log exceptions
       @mongo_record[:is_exception] = true
       # Reraise the exception for anyone else who cares
@@ -105,7 +106,7 @@ module MongodbLogger
         connect
         check_for_collection
       end
-      
+
       def disable_file_logging?
         @db_configuration.fetch('disable_file_logging', false)
       end
@@ -149,7 +150,7 @@ module MongodbLogger
 
       def mongo_connection_object
         if @db_configuration['hosts']
-          conn = Mongo::ReplSetConnection.new(*(@db_configuration['hosts'] << 
+          conn = Mongo::ReplSetConnection.new(*(@db_configuration['hosts'] <<
             {:auto_reconnect => true, :pool_timeout => 6}))
           @db_configuration['replica_set'] = true
         else
@@ -190,7 +191,7 @@ module MongodbLogger
         # Cache it since these ActiveRecord attributes are assigned after logger initialization occurs in Rails boot
         @colorized ||= Object.const_defined?(:ActiveRecord) && ActiveRecord::LogSubscriber.colorize_logging
       end
-      
+
       # try to serialyze data by each key and found invalid object
       def nice_serialize(rec)
         if msgs = rec[:messages]
@@ -204,7 +205,7 @@ module MongodbLogger
           end
         end
       end
-      
+
       def nice_serialize_object(data)
         case data
           when NilClass, String, Fixnum, Bignum, Float, TrueClass, FalseClass, Time, Regexp, Symbol

data/lib/mongodb_logger/version.rb

@@ -1,3 +1,3 @@
 module MongodbLogger
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

data/mongodb_logger.gemspec

@@ -22,8 +22,8 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "therubyracer",    ">= 0.9.9"
   
   gem.add_runtime_dependency "rake",            "~> 0.9.0"
-  gem.add_runtime_dependency "mongo",           "~> 1.5.2"
-  gem.add_runtime_dependency "bson_ext",        "~> 1.5.2"
+  gem.add_runtime_dependency "mongo",           "~> 1.6.1"
+  gem.add_runtime_dependency "bson_ext",        "~> 1.6.1"
   gem.add_runtime_dependency "i18n",            ">= 0.4.1"
   gem.add_runtime_dependency "json",            "~> 1.6.1"
   gem.add_runtime_dependency "activesupport",   ">= 3.0.0"

data/mongodb_logger.java.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "uglifier",        ">= 1.2.0"
   
   gem.add_runtime_dependency "rake",            "~> 0.9.0"
-  gem.add_runtime_dependency "mongo",           "~> 1.5.2"
+  gem.add_runtime_dependency "mongo",           "~> 1.6.1"
   gem.add_runtime_dependency "i18n",            ">= 0.4.1"
   gem.add_runtime_dependency "json",            "~> 1.6.1"
   gem.add_runtime_dependency "activesupport",   ">= 3.0.0"

data/test/test.sh

@@ -2,5 +2,5 @@
 rake vendor_test_gems && \
 rake test && \
 rake cucumber:web && \
-rake jasmine:ci && \
+#rake jasmine:ci && \
 rake cucumber:rails:all

data/test/unit/mongodb_logger_test.rb

@@ -233,7 +233,7 @@ class MongodbLogger::LoggerTest < Test::Unit::TestCase
         end
 
         should "not log the record to a file" do
-          assert_equal '', open(@log_file).read
+          assert_equal '', open(@log_file.to_s).read
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongodb_logger
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
   prerelease: 
 platform: jruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-24 00:00:00.000000000 Z
+date: 2012-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jasmine
-  requirement: &70220925219680 !ruby/object:Gem::Requirement
+  requirement: &70285483189080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70220925219680
+  version_requirements: *70285483189080
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70220925218620 !ruby/object:Gem::Requirement
+  requirement: &70285483188340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70220925218620
+  version_requirements: *70285483188340
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70220925218160 !ruby/object:Gem::Requirement
+  requirement: &70285483187580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *70220925218160
+  version_requirements: *70285483187580
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70220925215640 !ruby/object:Gem::Requirement
+  requirement: &70285483186840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.10.0
   type: :development
   prerelease: false
-  version_requirements: *70220925215640
+  version_requirements: *70285483186840
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70220925215180 !ruby/object:Gem::Requirement
+  requirement: &70285483186180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.1.2
   type: :development
   prerelease: false
-  version_requirements: *70220925215180
+  version_requirements: *70285483186180
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70220925214700 !ruby/object:Gem::Requirement
+  requirement: &70285483185520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.1.2
   type: :development
   prerelease: false
-  version_requirements: *70220925214700
+  version_requirements: *70285483185520
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &70220925214240 !ruby/object:Gem::Requirement
+  requirement: &70285483184740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 2.2.0
   type: :development
   prerelease: false
-  version_requirements: *70220925214240
+  version_requirements: *70285483184740
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &70220925213780 !ruby/object:Gem::Requirement
+  requirement: &70285483184040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *70220925213780
+  version_requirements: *70285483184040
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70220925213320 !ruby/object:Gem::Requirement
+  requirement: &70285483183340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,21 +109,21 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *70220925213320
+  version_requirements: *70285483183340
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &70220925212860 !ruby/object:Gem::Requirement
+  requirement: &70285483182840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70220925212860
+  version_requirements: *70285483182840
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70220925212400 !ruby/object:Gem::Requirement
+  requirement: &70285483182300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70220925212400
+  version_requirements: *70285483182300
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70220925211940 !ruby/object:Gem::Requirement
+  requirement: &70285483181660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70220925211940
+  version_requirements: *70285483181660
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70220925211480 !ruby/object:Gem::Requirement
+  requirement: &70285483205260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70220925211480
+  version_requirements: *70285483205260
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70220925211020 !ruby/object:Gem::Requirement
+  requirement: &70285483204440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70220925211020
+  version_requirements: *70285483204440
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70220925210500 !ruby/object:Gem::Requirement
+  requirement: &70285483203280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70220925210500
+  version_requirements: *70285483203280
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &70220925209940 !ruby/object:Gem::Requirement
+  requirement: &70285483201800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: 2.6.6
   type: :runtime
   prerelease: false
-  version_requirements: *70220925209940
+  version_requirements: *70285483201800
 - !ruby/object:Gem::Dependency
   name: vegas
-  requirement: &70220925209440 !ruby/object:Gem::Requirement
+  requirement: &70285483201020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,7 +197,7 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70220925209440
+  version_requirements: *70285483201020
 description: MongoDB logger for Rails 3
 email:
 - leopard.not.a@gmail.com
@@ -316,6 +316,7 @@ files:
 - test/config/samples/mongodb_logger.yml
 - test/config/samples/mongoid.yml
 - test/config/samples/server_config.yml
+- test/log/.gitkeep
 - test/rails.rb
 - test/rails/app/controllers/order_controller.rb
 - test/rails/test/functional/order_controller_test.rb
@@ -346,7 +347,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: mongodb_logger
-rubygems_version: 1.8.10
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: MongoDB logger for Rails 3
@@ -372,6 +373,7 @@ test_files:
 - test/config/samples/mongodb_logger.yml
 - test/config/samples/mongoid.yml
 - test/config/samples/server_config.yml
+- test/log/.gitkeep
 - test/rails.rb
 - test/rails/app/controllers/order_controller.rb
 - test/rails/test/functional/order_controller_test.rb