yogi_berra 0.0.15 → 0.1.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MmQ2Y2I5NjhiYTY0Yzk3MzEyMTYwNDQ5MzRmNTMyOTg4MTgxYmM1Nw==
+  data.tar.gz: !binary |-
+    M2Y0NTBjZmYwMmE3ZWVjZDc1MDA1YmFkMWUyYTdmOTBlYTE5M2QyNw==
+SHA512:
+  metadata.gz: !binary |-
+    MTg0ZGJjOWJlODgwYTZmMzgyNDZiYTdiMjIzMzUyYzNjNzY1NDIwZTBkODRj
+    MWIyODU1MWNhNWIwNzAwY2JlMjMwM2QzOGYzNDEyYjdmZWNmZjhiNTFmNGFh
+    NWY2MWE0OTIwMmVjYzU0NDI4OTg0ZDZkN2I4MjdiZDQzOTNiYjY=
+  data.tar.gz: !binary |-
+    MmUyN2Q5ZjNlMjEyMDIyMmU0NjY1OTEwOGFjYWIwY2ViMGQzNTU1ZDlmMDky
+    YTJiYjE1M2ZhMzk4ZGIxZGJjNWE0MTdmMWM1YTIwYjAwMTJjNmViMzcyMDk1
+    MGEzZWFlM2Q1OWM1MGVkMzIwNTlhZTVkZTZjODllNzdjODZlNTA=

data/README.md

@@ -45,7 +45,7 @@ Use `YogiBerra::Catcher.load_db_settings("location_to_some_yaml_file.yml")` to l
 
 Finally store a rescued exception:
 
-    YogiBerra::Catcher.quick_connection
+    YogiBerra::Catcher.connect
     begin
       raise Exception
     rescue => raised

data/lib/yogi_berra/catcher.rb

@@ -42,46 +42,47 @@ module YogiBerra
         end
       end
 
-      def db_client(host, port, replica_set = nil)
+      def fork_database
+        host = @@settings["host"]
+        port = @@settings["port"]
+        database = @@settings["database"]
+        username = @@settings["username"]
+        password = @@settings["password"]
+        replica_set = @@settings["replica_set"]
+
         # :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, :connect_timeout => 5)
-        else
-          @@mongo_client = Mongo::MongoClient.new(host, port, :w => 0, :connect_timeout => 5)
+        Thread.new do
+          begin
+            if replica_set
+              @@mongo_client = Mongo::MongoReplicaSetClient.new(replica_set, :w => 0, :connect_timeout => 10)
+            else
+              @@mongo_client = Mongo::MongoClient.new(host, port, :w => 0, :connect_timeout => 10)
+            end
+          rescue Timeout::Error => timeout_error
+            YogiBerra::Logger.log("Couldn't connect to the mongo database timeout on host: #{host} port: #{port}.\n #{timeout_error.inspect}", :error)
+            retry
+          rescue => error
+            YogiBerra::Logger.log("Couldn't connect to the mongo database on host: #{host} port: #{port}.\n #{error.inspect}", :error)
+            retry
+          end
+
+          @@connection = @@mongo_client[database]
+          if username && password
+            begin
+              @@connection.authenticate(username, password)
+            rescue
+              YogiBerra::Logger.log("Couldn't authenticate with user #{username} to mongo database on host: #{host} port: #{port} database: #{database}.", :warn)
+            end
+          end
         end
-      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
 
-      def quick_connection(load_settings = false)
+      def connect(load_settings = false)
         load_db_settings if load_settings
 
         if @@settings
-          host = @@settings["host"]
-          port = @@settings["port"]
-          database = @@settings["database"]
-          username = @@settings["username"]
-          password = @@settings["password"]
-          replica_set = @@settings["replica_set"]
-          client = db_client(host, port, replica_set)
-          if client
-            @@connection = client[database]
-            if @@connection && username && password
-              begin
-                @@connection.authenticate(username, password)
-              rescue
-                YogiBerra::Logger.log("Couldn't authenticate with user #{username} to mongo database on host: #{host} port: #{port} database: #{database}.", :warn)
-              end
-            end
-          else
-            YogiBerra::Logger.log("Couldn't connect to the mongo database on host: #{host} port: #{port}.", :error)
-          end
+          fork_database
         else
           YogiBerra::Logger.log("Couldn't load the yogi.yml file.", :error) if load_settings
         end

data/lib/yogi_berra/exception_middleware.rb

@@ -2,14 +2,13 @@ module YogiBerra
   class ExceptionMiddleware
     def initialize(app)
       @app = app
-      YogiBerra::Catcher.quick_connection(true)
+      YogiBerra::Catcher.connect(true)
     end
 
     def call(env)
       begin
         path_parameters = env['action_controller.request.path_parameters'] || {}
         query_hash      = env['rack.request.query_hash'] || {}
-        response = dup._call(env)
         environment = {
           :session => env['rack.session'],
           :params => path_parameters.merge(query_hash),
@@ -19,6 +18,7 @@ module YogiBerra
           :server_address => env['SERVER_ADDR'],
           :remote_address => env['REMOTE_ADDR']
         }
+        response = dup._call(env)
       rescue Exception => raised
         YogiBerra.exceptionize(raised, environment)
         raise raised

data/lib/yogi_berra/rails.rb

@@ -25,5 +25,5 @@ module YogiBerra
   end
 end
 
-YogiBerra::Catcher.quick_connection(true)
+YogiBerra::Catcher.connect(true)
 YogiBerra.initialize

data/lib/yogi_berra/version.rb

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

data/spec/fixtures/test.yml

@@ -7,4 +7,4 @@ test:
   <<: *defaults
   database: yogi_berra
   host: localhost
-  port: 27017
+  port: 22222

data/spec/spec_helper.rb

@@ -2,8 +2,6 @@ SPEC_FOLDER = File.dirname(__FILE__)
 require 'yogi_berra'
 require 'rspec/mocks'
 
-# Helper methods
-# Creates RunTimeError
 def build_exception
   raise Exception
 rescue Exception => caught_exception
@@ -20,25 +18,30 @@ def build_session
   }
 end
 
-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')
+def mock_mongo(opts)
+  mongo_client = double('mongo client')
+  mongo_connection = double('mongo connection')
+
+  if opts[:mongo_client_stub]
     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
+    mongo_client.should_receive(:[]) { mongo_connection }
+  end
+
+  if opts[:authenticate_stub] == :error
+    mongo_connection.should_receive(:authenticate).and_raise
+  else
+    mongo_connection.should_receive(:authenticate)
   end
+
+  if opts[:connection_stub]
+    mongo_connection.should_receive(:[]) { mongo_connection }
+    mongo_connection.should_receive(:insert)
+  end
+end
+
+def mock_yogi_fork_database
+  client = YogiBerra::Catcher.fork_database.join
+  YogiBerra::Catcher.should_receive(:fork_database) { client }
 end
 
 def reset_if_rails

data/spec/yogi_berra_catcher_spec.rb

@@ -24,39 +24,33 @@ describe YogiBerra::Catcher do
     Object.send(:remove_const, :Rails)
   end
 
-  it "should grab a connection using the settings file" do
-    mock_mongo_client(:client_should => true)
-    connection = nil
+  it "should try to grab a connection using the settings file" do
+    mock_mongo(:mongo_client_stub => true)
     YogiBerra::Catcher.load_db_settings(@test_yaml)
-    connection = YogiBerra::Catcher.quick_connection
-    connection.should_not == nil
+    mock_yogi_fork_database
+    lambda { YogiBerra::Catcher.connect }.should_not raise_error
+    YogiBerra::Catcher.connection.should_not == nil
   end
 
   it "should grab a connection to mongodb" do
-    mock_mongo_client(:auth => false)
+    mock_mongo(:mongo_client_stub => true)
     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
+    mock_yogi_fork_database
+    YogiBerra::Catcher.connect
+    YogiBerra::Catcher.mongo_client.should_not == nil
   end
 
   it "should grab a connection and authenticate" do
-    mock_mongo_client(:client_should => true)
+    mock_mongo(:mongo_client_stub => true)
     YogiBerra::Catcher.load_db_settings(@test_yaml)
-    connection = YogiBerra::Catcher.quick_connection
-    connection.should_not == nil
+    mock_yogi_fork_database
+    lambda { YogiBerra::Catcher.connect }.should_not raise_error
   end
 
   it "should grab a connection and fail to authenticate" do
-    mock_mongo_client(:client_should => true, :auth => :error)
+    mock_mongo(:mongo_client_stub => true, :authenticate_stub => :error)
     YogiBerra::Catcher.load_db_settings(@test_yaml)
-    connection = YogiBerra::Catcher.quick_connection
-    connection.should_not == nil
+    mock_yogi_fork_database
+    lambda { YogiBerra::Catcher.connect }.should_not raise_error
   end
 end

data/spec/yogi_berra_data_spec.rb

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

data/spec/yogi_berra_exception_middleware_spec.rb

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

metadata

@@ -1,112 +1,92 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: yogi_berra
-version: !ruby/object:Gem::Version 
-  hash: 1
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 15
-  version: 0.0.15
+version: !ruby/object:Gem::Version
+  version: 0.1.0
 platform: ruby
-authors: 
+authors:
 - Kevin Earl Krauss
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-12-09 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-12-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 71
-        segments: 
-        - 10
-        - 0
-        - 4
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 10.0.4
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 2
-        - 13
-        - 0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        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: *id002
-- !ruby/object:Gem::Dependency 
-  name: bson
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 1
-        - 8
-        - 3
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.13.0
+- !ruby/object:Gem::Dependency
+  name: bson
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 1.8.3
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: bson_ext
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 1
-        - 8
-        - 3
+  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
         version: 1.8.3
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: mongo
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 1
-        - 8
-        - 3
+  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
         version: 1.8.3
   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!
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.8.3
+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
@@ -131,41 +111,31 @@ 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 
-  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"
+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'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 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