bunyan 0.2.1 → 0.2.2

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+Version 0.2.2
+=============
+* No longer pass messages to the collection if a Mongo connection could not be established
+* Bunyan now uses the new bson_ext c extension, per version 0.20.0 of the ruby driver
+
 Version 0.2.1
 =============
 * Bunyan now fails silently when a connection error occurs

data/Gemfile

@@ -1,5 +1,5 @@
-gem 'mongo',      '>= 0.19'
-gem 'mongo_ext',  '>= 0.19'
+gem 'bson_ext',   '>= 0.20.1'
+gem 'mongo',      '>= 0.20'
 
 group :test do
   gem 'rspec', '>= 1.3.0'

data/README.md

@@ -56,7 +56,8 @@ More
 
 TODO
 ====
-* Fail silently if no mongo server running
+* <del>Fail silently if no mongo server running</del>
 * Ability to limit bunyan to only run in certain environments
 * Add middleware client for easy drop-in to rails/rack apps
+* Add ability to connect to a remote mongo server
 * <del>Ability to configure size of capped collection</del>

data/Rakefile

@@ -7,8 +7,8 @@ begin
     gemspec.email = "ajsharp@gmail.com"
     gemspec.homepage = "http://github.com/ajsharp/bunyan"
     gemspec.authors = ["Alex Sharp"]
-    gemspec.add_dependency 'mongo',     '>= 0.19'
-    gemspec.add_dependency 'mongo_ext', '>= 0.19'
+    gemspec.add_dependency 'mongo',     '>= 0.20.1'
+    gemspec.add_dependency 'bson_ext', '>= 0.20.1'
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/bunyan.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bunyan}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex Sharp"]
-  s.date = %q{2010-04-06}
+  s.date = %q{2010-04-10}
   s.description = %q{Bunyan is a thin ruby wrapper around a MongoDB capped collection, created with high-performance, flexible logging in mind.}
   s.email = %q{ajsharp@gmail.com}
   s.extra_rdoc_files = [
@@ -48,15 +48,15 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mongo>, [">= 0.19"])
-      s.add_runtime_dependency(%q<mongo_ext>, [">= 0.19"])
+      s.add_runtime_dependency(%q<mongo>, [">= 0.20.1"])
+      s.add_runtime_dependency(%q<bson_ext>, [">= 0.20.1"])
     else
-      s.add_dependency(%q<mongo>, [">= 0.19"])
-      s.add_dependency(%q<mongo_ext>, [">= 0.19"])
+      s.add_dependency(%q<mongo>, [">= 0.20.1"])
+      s.add_dependency(%q<bson_ext>, [">= 0.20.1"])
     end
   else
-    s.add_dependency(%q<mongo>, [">= 0.19"])
-    s.add_dependency(%q<mongo_ext>, [">= 0.19"])
+    s.add_dependency(%q<mongo>, [">= 0.20.1"])
+    s.add_dependency(%q<bson_ext>, [">= 0.20.1"])
   end
 end
 

data/lib/bunyan.rb

@@ -38,7 +38,8 @@ module Bunyan
     end
 
     def disabled?
-      !!config.disabled
+      # @TODO: Refactor this. Yuck.
+      config.nil? || (!config.nil? && config.disabled?)
     end
 
     def method_missing(method, *args, &block)
@@ -61,7 +62,9 @@ module Bunyan
           @connection = @db.connection
           @collection = retrieve_or_initialize_collection(config.collection)
         rescue Mongo::ConnectionFailure => ex
-          @disabled = true
+          # @TODO: I don't like how I'm overloading @config.disabled
+          # for user disabling and error disabling
+          @config.disabled = true
           $stderr.puts 'An error occured trying to connect to MongoDB!'
         end
       end

data/lib/bunyan/config.rb

@@ -35,6 +35,10 @@ module Bunyan
       end
       alias_method :disabled=, :disabled
 
+      def disabled?
+        !!@disabled
+      end
+
       # default size is 50 megabytes
       def size(new_size = nil)
         new_size.nil? ? @size : @size = new_size

data/spec/bunyan_spec.rb

@@ -46,7 +46,7 @@ describe 'when a mongod instance is not running' do
       c.database   'doesnt_matter'
       c.collection 'b/c mongod isnt running'
     end
-    Bunyan::Logger.instance.instance_variable_get(:@disabled).should == true
+    Bunyan::Logger.should be_disabled
   end
 end
 
@@ -138,11 +138,12 @@ describe 'when bunyan is disabled' do
   end
 end
 
+# @NOTE: Some of these tests rely on other tests not modifying the mongo
+# config object. This is not good, though much harder to achieve per-example
+# independence when testing a singleton object.
 describe 'when bunyan is not configured' do
   it 'should not try to send messages to mongo' do
-    Bunyan::Logger.instance.stub!(:configured?).and_return(false)
-    Bunyan::Logger.should_not be_configured
-    Bunyan::Logger.should_not be_disabled
+    Bunyan::Logger.instance.stub!(:config).and_return(nil)
     %w(insert count find).each do |command|
       Bunyan::Logger.collection.should_not_receive(command)
       Bunyan::Logger.send command
@@ -150,3 +151,4 @@ describe 'when bunyan is not configured' do
   end
 end
 
+

data/spec/config_spec.rb

@@ -96,3 +96,23 @@ describe 'bunyan logger configuration' do
   end
 end
 
+describe Bunyan::Logger::Config, "#disabled?" do
+  before :each do
+    @config = Bunyan::Logger::Config.new
+  end
+
+  it 'should be false if @disabled is nil' do
+    @config.disabled = nil
+    @config.should_not be_disabled
+  end
+
+  it 'should be true if @disabled is true' do
+    @config.disabled = true
+    @config.should be_disabled
+  end
+
+  it 'should be false if @isabled is false' do
+    @config.disabled = false
+    @config.should_not be_disabled
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Alex Sharp
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-06 00:00:00 -07:00
+date: 2010-04-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,13 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 19
-        version: "0.19"
+        - 20
+        - 1
+        version: 0.20.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: mongo_ext
+  name: bson_ext
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
@@ -39,8 +40,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 19
-        version: "0.19"
+        - 20
+        - 1
+        version: 0.20.1
   type: :runtime
   version_requirements: *id002
 description: Bunyan is a thin ruby wrapper around a MongoDB capped collection, created with high-performance, flexible logging in mind.