mongodb_logger 0.3.1-jruby → 0.3.2-jruby

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## v0.3.2
+
+* Initialize a connection to MongoDB using the MongoDB URI spec
+* Fix logger.info/warn/error for Rails 3.2.x
+
+## v0.3.1
+
+* Fix broken images in if using assets pipeline
+
+## v0.3.0
+
+* Added assets pipeline support
+
 ## v0.2.8
 
 * Added callback on exception

data/README.md

@@ -58,7 +58,12 @@ 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:
+          url: mongodb://localhost:27017/my_app
+          capsize: <%= 10.megabytes %>
 
 
 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":

data/Rakefile

@@ -77,9 +77,9 @@ 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.3', '3.2.5']
+    RAILS_VERSIONS = ['3.1.6', '3.2.6']
   else
-    RAILS_VERSIONS = ['3.1.3', '3.2.5']
+    RAILS_VERSIONS = ['3.1.6', '3.2.6']
   end     
 else
   RAILS_VERSIONS = IO.read('SUPPORTED_RAILS_VERSIONS').strip.split("\n")

data/SUPPORTED_RAILS_VERSIONS

@@ -2,8 +2,12 @@
 3.1.1
 3.1.2
 3.1.3
+3.1.4
+3.1.5
+3.1.6
 3.2.0
 3.2.1
 3.2.2
 3.2.3
-3.2.5
+3.2.5
+3.2.6

data/lib/mongodb_logger/logger.rb

@@ -1,7 +1,9 @@
 require 'erb'
+require 'uri'
 require 'mongo'
 require 'active_support'
 require 'active_support/core_ext'
+require 'active_support/core_ext/logger'
 require 'action_dispatch/http/upload'
 require 'mongodb_logger/replica_set_helper'
 
@@ -18,19 +20,17 @@ module MongodbLogger
 
     def initialize(options={})
       path = options[:path] || File.join(Rails.root, "log/#{Rails.env}.log")
-      level = options[:level] || DEBUG
+      @level = options[:level] || DEBUG
       internal_initialize
     rescue => e
       # should use a config block for this
       Rails.env.production? ? (raise e) : (puts "MongodbLogger WARNING: Using BufferedLogger due to exception: " + e.message)
     ensure
       if disable_file_logging?
-        @level          = level
-        @buffer         = {}
-        @auto_flushing  = 1
-        @guard          = Mutex.new
+        @log            = ::Logger.new(STDOUT)
+        @log.level      = @level
       else
-        super(path, level)
+        super(path, @level)
       end
     end
 
@@ -155,6 +155,8 @@ module MongodbLogger
           conn = Mongo::ReplSetConnection.new(*(@db_configuration['hosts'] <<
             {:connect => true, :pool_timeout => 6}))
           @db_configuration['replica_set'] = true
+        elsif @db_configuration['url']
+          conn = Mongo::Connection.from_uri(@db_configuration['url'])
         else
           conn = Mongo::Connection.new(@db_configuration['host'],
                                        @db_configuration['port'],
@@ -166,11 +168,17 @@ module MongodbLogger
       end
 
       def connect
-        @mongo_connection ||= mongo_connection_object.db(@db_configuration['database'])
-        if @db_configuration['username'] && @db_configuration['password']
-          # the driver stores credentials in case reconnection is required
-          @authenticated = @mongo_connection.authenticate(@db_configuration['username'],
+        if @db_configuration['url']
+          uri = URI.parse(@db_configuration['url'])
+          @mongo_connection ||= mongo_connection_object.db(uri.path.gsub(/^\//, ''))
+          @authenticated = true
+        else
+          @mongo_connection ||= mongo_connection_object.db(@db_configuration['database'])
+          if @db_configuration['username'] && @db_configuration['password']
+            # the driver stores credentials in case reconnection is required
+            @authenticated = @mongo_connection.authenticate(@db_configuration['username'],
                                                           @db_configuration['password'])
+          end
         end
       end
 

data/lib/mongodb_logger/version.rb

@@ -1,3 +1,3 @@
 module MongodbLogger
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/test/config/samples/database_with_url.yml

@@ -0,0 +1,7 @@
+test:
+  adapter: sqlite3
+  database: db/test.sqlite3
+  pool: 5
+  timeout: 5000
+  mongodb_logger:
+    url: mongodb://localhost:27017/system_log

data/test/test_helper.rb

@@ -23,6 +23,7 @@ class Test::Unit::TestCase
   SAMPLE_CONFIG_DIR = File.join(CONFIG_DIR, "samples")
   DEFAULT_CONFIG = "database.yml"
   DEFAULT_CONFIG_WITH_AUTH = "database_with_auth.yml"
+  DEFAULT_CONFIG_WITH_URL = "database_with_url.yml"
   DEFAULT_CONFIG_WITH_COLLECTION = "database_with_collection.yml"
   DEFAULT_CONFIG_WITH_NO_FILE_LOGGING = "database_no_file_logging.yml"
   MONGOID_CONFIG = "mongoid.yml"

data/test/unit/mongodb_logger_test.rb

@@ -46,6 +46,19 @@ class MongodbLogger::LoggerTest < Test::Unit::TestCase
           teardown_for_config(MONGOID_CONFIG)
         end
       end
+      
+      context "upon connecting with url settings" do
+        setup do
+          setup_for_config(DEFAULT_CONFIG_WITH_URL, DEFAULT_CONFIG)
+        end
+
+        should "connect with the url" do
+          @mongodb_logger.send(:connect)
+          assert @mongodb_logger.authenticated?
+          assert_equal "system_log", @mongodb_logger.mongo_connection.name
+          assert_equal ["localhost", 27017], @mongodb_logger.mongo_connection.connection.primary
+        end
+      end
 
       # this test will work without the --auth mongod arg
       context "upon connecting with authentication settings" do
@@ -243,11 +256,8 @@ class MongodbLogger::LoggerTest < Test::Unit::TestCase
         MongodbLogger::Logger.new
       end
 
-      should "set buffer" do
-        assert_equal({}, MongodbLogger::Logger.new.instance_variable_get(:@buffer))
-      end
-      should "set guard" do
-        assert MongodbLogger::Logger.new.instance_variable_get(:@guard).is_a?(Mutex)
+      should "set log" do
+        assert MongodbLogger::Logger.new.instance_variable_get(:@log).is_a?(Logger)
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongodb_logger
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: jruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-10 00:00:00.000000000 Z
+date: 2012-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jasmine
-  requirement: &70209029461980 !ruby/object:Gem::Requirement
+  requirement: &70271130312520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70209029461980
+  version_requirements: *70271130312520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70209029461240 !ruby/object:Gem::Requirement
+  requirement: &70271130311520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70209029461240
+  version_requirements: *70271130311520
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70209029460720 !ruby/object:Gem::Requirement
+  requirement: &70271130310840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *70209029460720
+  version_requirements: *70271130310840
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70209029460160 !ruby/object:Gem::Requirement
+  requirement: &70271130310140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.10.0
   type: :development
   prerelease: false
-  version_requirements: *70209029460160
+  version_requirements: *70271130310140
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70209029459560 !ruby/object:Gem::Requirement
+  requirement: &70271130309580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.1.2
   type: :development
   prerelease: false
-  version_requirements: *70209029459560
+  version_requirements: *70271130309580
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70209029458980 !ruby/object:Gem::Requirement
+  requirement: &70271130308820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.1.2
   type: :development
   prerelease: false
-  version_requirements: *70209029458980
+  version_requirements: *70271130308820
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &70209029458380 !ruby/object:Gem::Requirement
+  requirement: &70271130308200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *70209029458380
+  version_requirements: *70271130308200
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70209029457280 !ruby/object:Gem::Requirement
+  requirement: &70271130307480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *70209029457280
+  version_requirements: *70271130307480
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &70209029456360 !ruby/object:Gem::Requirement
+  requirement: &70271130306820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70209029456360
+  version_requirements: *70271130306820
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70209029455480 !ruby/object:Gem::Requirement
+  requirement: &70271130306220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70209029455480
+  version_requirements: *70271130306220
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70209029454520 !ruby/object:Gem::Requirement
+  requirement: &70271130305520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70209029454520
+  version_requirements: *70271130305520
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70209029453680 !ruby/object:Gem::Requirement
+  requirement: &70271130304580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70209029453680
+  version_requirements: *70271130304580
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70209029452760 !ruby/object:Gem::Requirement
+  requirement: &70271130303940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70209029452760
+  version_requirements: *70271130303940
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &70209029452040 !ruby/object:Gem::Requirement
+  requirement: &70271130303300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70209029452040
+  version_requirements: *70271130303300
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &70209029451060 !ruby/object:Gem::Requirement
+  requirement: &70271130302400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +175,10 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70209029451060
+  version_requirements: *70271130302400
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70209029450360 !ruby/object:Gem::Requirement
+  requirement: &70271130301800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70209029450360
+  version_requirements: *70271130301800
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &70209029449500 !ruby/object:Gem::Requirement
+  requirement: &70271130301000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
         version: 2.6.6
   type: :runtime
   prerelease: false
-  version_requirements: *70209029449500
+  version_requirements: *70271130301000
 - !ruby/object:Gem::Dependency
   name: vegas
-  requirement: &70209029448800 !ruby/object:Gem::Requirement
+  requirement: &70271130300280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -208,7 +208,7 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70209029448800
+  version_requirements: *70271130300280
 description: MongoDB logger for Rails 3
 email:
 - leopard.not.a@gmail.com
@@ -330,6 +330,7 @@ files:
 - test/config/samples/database_replica_set.yml
 - test/config/samples/database_with_auth.yml
 - test/config/samples/database_with_collection.yml
+- test/config/samples/database_with_url.yml
 - test/config/samples/mongodb_logger.yml
 - test/config/samples/mongoid.yml
 - test/config/samples/server_config.yml
@@ -388,6 +389,7 @@ test_files:
 - test/config/samples/database_replica_set.yml
 - test/config/samples/database_with_auth.yml
 - test/config/samples/database_with_collection.yml
+- test/config/samples/database_with_url.yml
 - test/config/samples/mongodb_logger.yml
 - test/config/samples/mongoid.yml
 - test/config/samples/server_config.yml