yogi_berra 0.1.1 → 0.1.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDFmMzdiZTAwNDVjMDA3M2U2YWJiNzQxOWQ5N2RmOTJkNjFjNjE3YQ==
+    Y2IwMzU1NmVjNzlkYzIxYjFjYjIwZGE4YjhhMTg5YWVjZTIyMTg3OQ==
   data.tar.gz: !binary |-
-    ZDI1NTA3MDEwOGQ5ZmFjN2E5OGQ4NzNjY2YyNDliNTRmYzFkM2IxNw==
+    MTRhMmVjNTY1NGVkNjhmZTRjYjQ5NzVjMmU1YTgyZTliZWNkNmU5Ng==
 SHA512:
   metadata.gz: !binary |-
-    NTQyNTkxYTI1Nzg3NjQ2NmI3MjI0NTFmY2FjZDMzMDc1NWY5NzM2Y2E2Njk2
-    NzJmMGQzNDQyNzI4NzYxODRhZDEyY2M3ZTNiN2ZhMDEzNmQyNmI2NTc2Yzcw
-    N2RlM2JhYTI2NDhkZTY3ZTJiYTY4Y2IxMDRlODc2MDVlNjU3MmE=
+    MTk4NTY2NjVmYjc5OTdjNjU1M2IwZDU2ODUyOTUzOTY2ZmEzMTE5ZTQ3NDYw
+    ZGE0MWMzY2QxOGI4MmIwMjNkOTgxM2U3ZTYxZmViMzlmZGQ0ZmU1OWYzOGY5
+    YmVmMDBkOTMwOWY5OWM1YTc1OTkzOGVmNDNhZmI5YzdmNzY3NzE=
   data.tar.gz: !binary |-
-    YWVmMDg2MDhlNjI3ZjZmZjQ4MjZjZDZhNTMxMWJkOGJjOGRlOGU4ZmZhZDRk
-    YmZjNGQ0MDdjMGY0MzViZGNkNDUyNTM3ZjM0NTdlMmQ1Y2U4MGFmMDJkNWY0
-    MGNlYWNlMWU1NDllY2E1YWZlZThjMzJmNjIyNGVkNjg3ZWQzNjE=
+    MTQxOGE5ZjI1ZGZiZjU2MzExZTA2YTA0NmYxNDc5NWQ5NTkxNDZmYjAwYTk1
+    YWU4NWMwMmEzMDJmY2MxZTBjY2JmMWU3MmRhOWZkNDlkOGM5MjIzY2MzODM1
+    YWM5MGVjZDhjNjU3YmE4MjNlNDVjOWYxOTA4MjEzNzNhNWE0ZDc=

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/earlonrails/yogi_berra.png?branch=master)](https://travis-ci.org/earlonrails/yogi_berra)
+
 Yogi Berra
 ==========
 

data/lib/yogi_berra/catcher.rb

@@ -12,11 +12,12 @@ module YogiBerra
       def load_db_settings(config_file = nil)
         if config_file
           database_config = config_file
-        elsif defined?(Rails)
-          database_config = "#{Rails.root}/config/yogi.yml"
+        elsif defined?(::Rails)
+          database_config = Rails.root ? "#{Rails.root}/config/yogi.yml" : "config/yogi.yml"
         else
           YogiBerra::Logger.log("No config file specified!", :error)
         end
+
         if database_config
           begin
             File.open(database_config, 'r') do |f|
@@ -64,6 +65,7 @@ module YogiBerra
             retry
           rescue => error
             YogiBerra::Logger.log("Couldn't connect to the mongo database on host: #{host} port: #{port}.\n #{error.inspect}", :error)
+            sleep 1
             retry
           end
 

data/lib/yogi_berra/engine.rb

@@ -1,5 +1,6 @@
 module YogiBerra
-  class Engine < Rails::Engine
+  class Engine < ::Rails::Engine
+    YogiBerra::Catcher.connect(true)
     config.app_middleware.use "YogiBerra::ExceptionMiddleware"
   end
 end

data/lib/yogi_berra/exception_middleware.rb

@@ -2,11 +2,12 @@ module YogiBerra
   class ExceptionMiddleware
     def initialize(app)
       @app = app
-      YogiBerra::Catcher.connect(true)
     end
 
     def call(env)
       begin
+        response = @app.call(env)
+      rescue Exception => raised
         path_parameters = env['action_controller.request.path_parameters'] || {}
         query_hash      = env['rack.request.query_hash'] || {}
         environment = {
@@ -19,8 +20,7 @@ module YogiBerra
           :controller => env['action_controller.instance'],
           :remote_address => env['REMOTE_ADDR']
         }
-        response = dup._call(env)
-      rescue Exception => raised
+
         YogiBerra.exceptionize(raised, environment)
         raise raised
       end
@@ -31,14 +31,8 @@ module YogiBerra
       response
     end
 
-    def _call(env)
-      @status, @headers, @response = @app.call(env)
-      [@status, @headers, self]
-    end
-
     def each(&block)
       @response.each(&block)
     end
-
   end
 end

data/lib/yogi_berra/logger.rb

@@ -2,7 +2,7 @@ module YogiBerra
   class Logger
     def self.log(log_string, level = :info)
       message = "[YogiBerra #{level.to_s.capitalize}] #{log_string}"
-      if defined?(Rails)
+      if defined?(Rails) && Rails.logger
         Rails.logger.send(level, message)
       else
         $stderr.puts(message)

data/lib/yogi_berra/version.rb

@@ -1,3 +1,3 @@
 module YogiBerra
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

data/spec/fixtures/rails.rb

@@ -9,4 +9,4 @@ class Rails
   end
 end
 
-ENV['RAILS_ENV'] = "test"
+ENV['RAILS_ENV'] = "test"

data/spec/spec_helper.rb

@@ -23,25 +23,25 @@ def mock_mongo(opts)
   mongo_connection = double('mongo connection')
 
   if opts[:mongo_client_stub]
-    Mongo::MongoClient.should_receive(:new) { mongo_client }
-    mongo_client.should_receive(:[]) { mongo_connection }
+    Mongo::MongoClient.should_receive(:new).at_least(1).times { mongo_client }
+    mongo_client.should_receive(:[]).at_least(1).times { mongo_connection }
   end
 
   if opts[:authenticate_stub] == :error
-    mongo_connection.should_receive(:authenticate).and_raise
+    mongo_connection.should_receive(:authenticate).at_least(1).times.and_raise
   else
-    mongo_connection.should_receive(:authenticate)
+    mongo_connection.should_receive(:authenticate).at_least(1).times
   end
 
   if opts[:connection_stub]
-    mongo_connection.should_receive(:[]) { mongo_connection }
-    mongo_connection.should_receive(:insert)
+    mongo_connection.should_receive(:[]).at_least(1).times { mongo_connection }
+    mongo_connection.should_receive(:insert).at_least(1).times
   end
 end
 
 def mock_yogi_fork_database
   client = YogiBerra::Catcher.fork_database.join
-  YogiBerra::Catcher.should_receive(:fork_database) { client }
+  YogiBerra::Catcher.should_receive(:fork_database).at_least(1).times { client }
 end
 
 def reset_if_rails

data/spec/yogi_berra_exception_middleware_spec.rb

@@ -2,25 +2,28 @@ require 'spec_helper'
 
 describe YogiBerra::ExceptionMiddleware do
   before(:each) do
-    YogiBerra::Logger.stub(:log)
-    load "#{SPEC_FOLDER}/fixtures/rails.rb"
+    @test_yaml = "#{SPEC_FOLDER}/fixtures/test.yml"
+     YogiBerra::Catcher.load_db_settings(@test_yaml)
   end
 
   it "should call the upstream app with the environment" do
+    # YogiBerra::Logger.stub(:log)
     mock_mongo(:mongo_client_stub => true)
     mock_yogi_fork_database
     environment = { 'key' => 'value' }
     app = lambda { |env| ['response', {}, env] }
+
+    YogiBerra::Catcher.connect
     stack = YogiBerra::ExceptionMiddleware.new(app)
 
     response = stack.call(environment)
-
     response[0].should == 'response'
     response[1].should == {}
-    response[2].instance_variable_get("@response").should == { 'key' => 'value' }
+    response[2].should == { 'key' => 'value' }
   end
 
   it "deliver an exception raised while calling an upstream app" do
+    YogiBerra::Logger.stub(:log)
     mock_mongo(:mongo_client_stub => true, :connection_stub => true)
     mock_yogi_fork_database
     exception = build_exception
@@ -29,6 +32,7 @@ describe YogiBerra::ExceptionMiddleware do
       raise exception
     end
 
+    YogiBerra::Catcher.connect
     begin
       stack = YogiBerra::ExceptionMiddleware.new(app)
       stack.call(environment)
@@ -38,6 +42,7 @@ describe YogiBerra::ExceptionMiddleware do
   end
 
   it "should deliver an exception in rack.exception" do
+    # YogiBerra::Logger.stub(:log)
     mock_mongo(:mongo_client_stub => true, :connection_stub => true)
     mock_yogi_fork_database
     exception = build_exception
@@ -48,12 +53,39 @@ describe YogiBerra::ExceptionMiddleware do
       env['rack.exception'] = exception
       response
     end
+    YogiBerra::Catcher.connect
+    stack = YogiBerra::ExceptionMiddleware.new(app)
+
+    actual_response = stack.call(environment)
+    actual_response[0].should == 200
+    actual_response[1].should == {}
+    actual_response[2].should == ["okay"]
+  end
+
+  it "log only once on app initialization and then be quiet" do
+    YogiBerra::Logger.should_receive(:log).exactly(1).times
+    mock_mongo(:mongo_client_stub => true, :connection_stub => true, :authenticate_stub => :error)
+    mock_yogi_fork_database
+    exception = build_exception
+    environment = { 'key' => 'value' }
+
+    response = [200, {}, ['okay']]
+    app = lambda do |env|
+      env['rack.exception'] = exception
+      response
+    end
+
+    YogiBerra::Catcher.connect
     stack = YogiBerra::ExceptionMiddleware.new(app)
 
     actual_response = stack.call(environment)
+    actual_response[0].should == 200
+    actual_response[1].should == {}
+    actual_response[2].should == ["okay"]
 
+    actual_response = stack.call(environment)
     actual_response[0].should == 200
     actual_response[1].should == {}
-    actual_response[2].instance_variable_get("@response").should == ["okay"]
+    actual_response[2].should == ["okay"]
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yogi_berra
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Kevin Earl Krauss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-12 00:00:00.000000000 Z
+date: 2013-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake