yogi_berra 0.0.14 → 0.0.15

data/lib/yogi_berra/action_controller_catcher.rb

@@ -39,6 +39,5 @@ module YogiBerra
       error_id = YogiBerra.exceptionize(exception, environment)
       request.env['yogi_berra.error_id'] = error_id
     end
-
   end
 end

data/lib/yogi_berra/catcher.rb

@@ -1,6 +1,7 @@
 require 'mongo'
 require 'facets'
 require 'yaml'
+require 'timeout'
 
 module YogiBerra
   class Catcher
@@ -44,12 +45,16 @@ module YogiBerra
       def db_client(host, port, replica_set = nil)
         # :w => 0 set the default write concern to 0, this allows writes to be non-blocking
         # by not waiting for a response from mongodb
+        # :connect_timeout set to 5 will only wait 5 seconds failing to connect
         if replica_set
-          @@mongo_client = Mongo::MongoReplicaSetClient.new(replica_set, :w => 0)
+          @@mongo_client = Mongo::MongoReplicaSetClient.new(replica_set, :w => 0, :connect_timeout => 5)
         else
-          @@mongo_client = Mongo::MongoClient.new(host, port, :w => 0)
+          @@mongo_client = Mongo::MongoClient.new(host, port, :w => 0, :connect_timeout => 5)
         end
-      rescue
+      rescue Timeout::Error => error
+        YogiBerra::Logger.log("Couldn't connect to the mongo database timeout on host: #{host} port: #{port}.\n #{error}", :error)
+        nil
+      rescue => error
         YogiBerra::Logger.log("Couldn't connect to the mongo database on host: #{host} port: #{port}.", :error)
         nil
       end

data/lib/yogi_berra/version.rb

@@ -1,3 +1,3 @@
 module YogiBerra
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

data/spec/spec_helper.rb

@@ -20,17 +20,25 @@ def build_session
   }
 end
 
-def mock_mongo_client(client_should = false, connection_should = false, auth = true)
-  mongo_client = double('mongo client')
-  mongo_connection = double('mongo connection')
-  Mongo::MongoClient.should_receive(:new) { mongo_client }
-  mongo_client.should_receive(:[]) { mongo_connection } if client_should
-  mongo_connection.should_receive(:authenticate) if auth
-  if connection_should
-    mongo_connection.should_receive(:[]) { mongo_connection }
-    mongo_connection.should_receive(:insert)
+def mock_mongo_client(opts)
+  if opts[:timeout]
+    Timeout.should_receive(:timeout).and_raise(Timeout::Error)
+  else
+    mongo_client = double('mongo client')
+    mongo_connection = double('mongo connection')
+    Mongo::MongoClient.should_receive(:new) { mongo_client }
+    mongo_client.should_receive(:[]) { mongo_connection } if opts[:client_should]
+    if opts[:auth] == :error
+      mongo_connection.should_receive(:authenticate).and_raise
+    elsif opts[:auth].nil? || opts[:auth]
+      mongo_connection.should_receive(:authenticate)
+    end
+
+    if opts[:connection_should]
+      mongo_connection.should_receive(:[]) { mongo_connection }
+      mongo_connection.should_receive(:insert)
+    end
   end
-  mongo_connection
 end
 
 def reset_if_rails

data/spec/yogi_berra_catcher_spec.rb

@@ -25,7 +25,7 @@ describe YogiBerra::Catcher do
   end
 
   it "should grab a connection using the settings file" do
-    mock_mongo_client(true)
+    mock_mongo_client(:client_should => true)
     connection = nil
     YogiBerra::Catcher.load_db_settings(@test_yaml)
     connection = YogiBerra::Catcher.quick_connection
@@ -33,10 +33,30 @@ describe YogiBerra::Catcher do
   end
 
   it "should grab a connection to mongodb" do
-    mock_mongo_client(false, false, false)
-    yaml = nil
-    yaml = YogiBerra::Catcher.load_db_settings(@test_yaml)
+    mock_mongo_client(:auth => false)
+    YogiBerra::Catcher.load_db_settings(@test_yaml)
     db_client = YogiBerra::Catcher.db_client(YogiBerra::Catcher.settings["host"], YogiBerra::Catcher.settings["port"])
     db_client.should_not == nil
   end
+
+  it "should grab a connection and fail to connect after 5 seconds" do
+    mock_mongo_client(:timeout => true)
+    YogiBerra::Catcher.load_db_settings(@test_yaml)
+    client = YogiBerra::Catcher.db_client(YogiBerra::Catcher.settings["host"], YogiBerra::Catcher.settings["port"])
+    client.should == nil
+  end
+
+  it "should grab a connection and authenticate" do
+    mock_mongo_client(:client_should => true)
+    YogiBerra::Catcher.load_db_settings(@test_yaml)
+    connection = YogiBerra::Catcher.quick_connection
+    connection.should_not == nil
+  end
+
+  it "should grab a connection and fail to authenticate" do
+    mock_mongo_client(:client_should => true, :auth => :error)
+    YogiBerra::Catcher.load_db_settings(@test_yaml)
+    connection = YogiBerra::Catcher.quick_connection
+    connection.should_not == nil
+  end
 end

data/spec/yogi_berra_data_spec.rb

@@ -8,7 +8,7 @@ describe YogiBerra::Data do
 
   it "should store an exception" do
     exception = build_exception
-    mock_mongo_client(true, true)
+    mock_mongo_client(:client_should => true, :connection_should => true)
     YogiBerra::Catcher.quick_connection
     YogiBerra::Data.store!(exception)
   end

data/spec/yogi_berra_exception_middleware_spec.rb

@@ -7,7 +7,7 @@ describe YogiBerra::ExceptionMiddleware do
   end
 
   it "should call the upstream app with the environment" do
-    mock_mongo_client(true)
+    mock_mongo_client(:client_should => true)
     environment = { 'key' => 'value' }
     app = lambda { |env| ['response', {}, env] }
     stack = YogiBerra::ExceptionMiddleware.new(app)
@@ -20,7 +20,7 @@ describe YogiBerra::ExceptionMiddleware do
   end
 
   it "deliver an exception raised while calling an upstream app" do
-    mock_mongo_client(true, true)
+    mock_mongo_client(:client_should => true, :connection_should => true)
     exception = build_exception
     environment = { 'key' => 'value' }
     app = lambda do |env|
@@ -36,7 +36,7 @@ describe YogiBerra::ExceptionMiddleware do
   end
 
   it "should deliver an exception in rack.exception" do
-    mock_mongo_client(true, true)
+    mock_mongo_client(:client_should => true, :connection_should => true)
     exception = build_exception
     environment = { 'key' => 'value' }
 

metadata

@@ -1,92 +1,112 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: yogi_berra
-version: !ruby/object:Gem::Version
-  version: 0.0.14
+version: !ruby/object:Gem::Version 
+  hash: 1
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 15
+  version: 0.0.15
 platform: ruby
-authors:
+authors: 
 - Kevin Earl Krauss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-01 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-12-09 00:00:00 -08:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 10.0.4
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 71
+        segments: 
+        - 10
+        - 0
+        - 4
         version: 10.0.4
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.13.0
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 2
+        - 13
+        - 0
         version: 2.13.0
-- !ruby/object:Gem::Dependency
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: bson
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.8.3
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.8.3
-- !ruby/object:Gem::Dependency
-  name: bson_ext
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 1
+        - 8
+        - 3
         version: 1.8.3
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: bson_ext
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.8.3
-- !ruby/object:Gem::Dependency
-  name: mongo
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 1
+        - 8
+        - 3
         version: 1.8.3
   type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: mongo
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 1
+        - 8
+        - 3
         version: 1.8.3
-description: If the world were perfect, it wouldn't be. So you need the best error
-  catcher of all time!
+  type: :runtime
+  version_requirements: *id005
+description: If the world were perfect, it wouldn't be. So you need the best error catcher of all time!
 email: earlkrauss@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - lib/facets.rb
 - lib/yogi_berra/action_controller_catcher.rb
 - lib/yogi_berra/backtrace.rb
@@ -111,31 +131,41 @@ files:
 - spec/yogi_berra_data_spec.rb
 - spec/yogi_berra_exception_middleware_spec.rb
 - spec/yogi_berra_logger_spec.rb
+has_rdoc: true
 homepage: http://github.com/earlonrails/yogi_berra
-licenses:
+licenses: 
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+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'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 1.3.7
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Catches errors in your rails app and doesn't get in the way.
-test_files:
+test_files: 
 - spec/fixtures/config/yogi.yml
 - spec/fixtures/rails.rb
 - spec/fixtures/test.yml

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NDllMDIyZTlmZjdiOGFkZDY3MWFmMGNlZTc5NTBjNmRiMTNiNWJmNQ==
-  data.tar.gz: !binary |-
-    ZTcyMDg3Njc1YzAzYWExMGMwNDAzMDAzYWU2MjBmMTEyMDhhMGVkYg==
-SHA512:
-  metadata.gz: !binary |-
-    MjRjYjgwZmFkMDU5ODY2OGI4YWE0MjlkZDU4ZThiNmVmOTRhZDI3Yzg2ZDk0
-    NGE3NTU1YmUzMDQ1NTNhY2ZmYzlkOThjMzQ1MjYyNmMyZDA2NWIwMjk0MWZm
-    ZmQ1YzhmNGYwNjg3ZWRlZmNiZGQ1YzE0YzU4YzlhNTc5NDY4OWM=
-  data.tar.gz: !binary |-
-    NTU5MGY2MTNkNDhlM2VkZTgzNmRjMzcwY2RhMzk5MDAzNDM2NWU3MDRhZmE0
-    ZDU0ODhmZWZkYWEyMDNkMTdhZTZlMmViYTM3MzFlZWE3ODMwNDhkZTVjMWEy
-    NzEwMjQ3ZDhkNWM0MWQxMzcyZDQyMzgzMTcwZTc5Yzg5YTQ1Yzc=