yogi_berra 0.0.3 → 0.0.4

data/Gemfile.lock

@@ -3,15 +3,12 @@ PATH
   specs:
     yogi_berra (0.0.3)
       bson (= 1.8.3)
-      bson_ext (= 1.8.3)
       mongo (= 1.8.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
     bson (1.8.3)
-    bson_ext (1.8.3)
-      bson (~> 1.8.3)
     builder (3.2.1)
     diff-lcs (1.2.4)
     mongo (1.8.3)

data/lib/yogi_berra/action_controller_catcher.rb

@@ -37,7 +37,7 @@ module YogiBerra
           :server_address => request.headers['SERVER_ADDR'],
           :remote_address => request.remote_ip
         }
-      error_id = YogiBerra.exceptionize(exception, environment, YogiBerra::Catcher.connection)
+      error_id = YogiBerra.exceptionize(exception, environment)
       request.env['yogi_berra.error_id'] = error_id
     end
 

data/lib/yogi_berra/catcher.rb

@@ -39,7 +39,7 @@ module YogiBerra
       end
 
       def quick_connection
-        load_db_settings
+        load_db_settings unless @@settings
 
         if @@settings
           host = @@settings["host"]

data/lib/yogi_berra/data.rb

@@ -2,23 +2,24 @@ require 'mongo'
 
 module YogiBerra
   class Data
-    def self.store!(exception, environment, client)
+    def self.store!(exception, environment = nil)
       data = parse_exception(exception)
       if environment
         session = environment.delete(:session)
         data[:session] = parse_session(session) if session
         data.merge!(environment)
       end
-      client["caught_exceptions"].insert(data)
+      (YogiBerra::Catcher.connection || YogiBerra::Catcher.quick_connection)["caught_exceptions"].insert(data)
     end
 
     def self.parse_exception(notice)
       data_hash = {
-        :error_class => notice.error_class,
+        :error_class => "#{notice.class}",
         :project => YogiBerra::Catcher.settings["project"],
-        :error_message => notice.error_message
+        :error_message => notice.respond_to?(:error_message) ? notice.error_message : notice.message
       }
-      if notice.backtrace.lines.any?
+      data_hash[:backtraces] = notice.backtrace
+      if notice.backtrace.respond_to?(:lines) && notice.backtrace.lines.any?
         data_hash[:backtraces] = notice.backtrace.lines.collect(&:to_s)
       end
       data_hash[:created_at] = Time.now.utc
@@ -27,7 +28,14 @@ module YogiBerra
 
     def self.parse_session(session)
       session.inject({}) do |result, element|
-        result[element.first] = element.last.respond_to?(:as_json) ? element.last.as_json(:except => ["password"]) : element.last
+        key = element.first
+        value = element.last
+        if value.respond_to?(:as_json)
+          result[key] = value.as_json(:except => ["password"])
+        else
+          value.delete("password")
+          result[key] = value
+        end
         result
       end
     end

data/lib/yogi_berra/exception_middleware.rb

@@ -20,12 +20,12 @@ module YogiBerra
           :remote_address => env['REMOTE_ADDR']
         }
       rescue Exception => raised
-        YogiBerra.exceptionize(raised, environment, YogiBerra::Catcher.connection)
+        YogiBerra.exceptionize(raised, environment)
         raise raised
       end
 
       if env['rack.exception']
-        YogiBerra.exceptionize(raised, environment, YogiBerra::Catcher.connection)
+        YogiBerra.exceptionize(raised, environment)
       end
       response
     end

data/lib/yogi_berra/version.rb

@@ -1,3 +1,3 @@
 module YogiBerra
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/yogi_berra.rb

@@ -18,10 +18,10 @@ module YogiBerra
     # @params exception
     # @params environment
     # @params database
-    def exceptionize(exception, environment, database, opts = {})
+    def exceptionize(exception, environment, opts = {})
       notice = build_notice_for(exception, opts)
-      if database
-        YogiBerra::Data.store!(notice, environment, database)
+      if YogiBerra::Catcher.connection
+        YogiBerra::Data.store!(notice, environment)
       else
         YogiBerra::Logger.log("No database connection!", :error)
       end

data/spec/fixtures/rails.rb

@@ -1,8 +1,8 @@
 # mock rails
-ENV["RAILS_ENV"] = "test"
-
 class Rails
   def self.root
     "#{SPEC_FOLDER}/fixtures"
   end
-end
+end
+
+ENV["RAILS_ENV"] = "test"

data/spec/spec_helper.rb

@@ -1,14 +1,22 @@
-# Load support files
 SPEC_FOLDER = File.dirname(__FILE__)
 require 'yaml'
 require 'yogi_berra'
+require 'rspec/mocks'
 # Helper methods
-
-
 # Creates RunTimeError
 def build_exception
-  raise
-rescue => caught_exception
+  raise Exception
+rescue Exception => caught_exception
   caught_exception
 end
 
+def build_session
+  { "access" =>
+    { "user_id" => 30785,
+      "id" => 605,
+      "password" => "[FILTERED]",
+      "auth_key" => "Baseball is ninety percent mental and the other half is physical."
+    }
+  }
+end
+

data/spec/yogi_berra_catcher_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe YogiBerra do
+  before(:all) do
+    @test_yaml = "#{SPEC_FOLDER}/fixtures/test.yml"
+  end
+
+  before(:each) do
+    YogiBerra::Logger.stub(:log)
+  end
+
+  it "should load a yaml file without rails" do
+    lambda { YogiBerra::Catcher.load_db_settings(@test_yaml) }.should_not raise_error
+    YogiBerra::Catcher.settings.should_not == nil
+    YogiBerra::Catcher.settings["project"].should == "test_yogi_project"
+  end
+
+  it "should load a yaml file with rails" do
+    ENV["YOGI_ENV"] = nil
+    load "#{SPEC_FOLDER}/fixtures/rails.rb"
+    lambda { YogiBerra::Catcher.load_db_settings }.should_not raise_error
+    YogiBerra::Catcher.settings.should_not == nil
+    YogiBerra::Catcher.settings["project"].should == "rails_yogi_project"
+    Object.send(:remove_const, :Rails)
+  end
+
+  it "should grab a connection using the settings file" do
+    connection = nil
+    YogiBerra::Catcher.load_db_settings(@test_yaml)
+    connection = YogiBerra::Catcher.quick_connection
+    connection.should_not == nil
+  end
+
+  it "should grab a connection to mongodb" do
+    yaml = nil
+    yaml = 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
+end

data/spec/yogi_berra_data_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe YogiBerra do
+  before(:each) do
+    YogiBerra::Logger.stub(:log)
+  end
+
+  it "should store an exception" do
+    YogiBerra::Catcher.connection = nil
+    exception = build_exception
+    mongo_client = double('mongo client')
+    mongo_connection = double('mongo connection')
+    Mongo::MongoClient.should_receive(:new) { mongo_client }
+    mongo_client.should_receive(:[]) { mongo_connection }
+    mongo_connection.should_receive(:[]) { mongo_connection }
+    mongo_connection.should_receive(:insert)
+    YogiBerra::Data.store!(exception)
+  end
+
+  it "should parse an exception" do
+    exception = build_exception
+    parsed_data = YogiBerra::Data.parse_exception(exception)
+    parsed_data[:error_class].should == "Exception"
+    parsed_data[:project].should == "test_yogi_project"
+    parsed_data[:error_message].should == "Exception"
+    parsed_data[:backtraces].size.should == 17
+  end
+
+  it "should parse a session" do
+    session = build_session
+    parsed_session = YogiBerra::Data.parse_session(session)
+    parsed_session["password"].should == nil
+    parsed_session["access"]["password"].should == nil
+    parsed_session["access"]["user_id"].should == 30785
+    parsed_session["access"]["id"].should == 605
+    parsed_session["access"]["auth_key"].should == "Baseball is ninety percent mental and the other half is physical."
+  end
+end

data/spec/yogi_berra_logger_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe YogiBerra::Logger do
+
+  it "should call $stderr to log" do
+    $stderr.should_receive(:puts).with("[YogiBerra Info] The future ain't what it used to be.")
+    YogiBerra::Logger.log("The future ain't what it used to be.")
+  end
+
+  it "should call Rails::Logger" do
+    load "#{SPEC_FOLDER}/fixtures/rails.rb"
+    logger = double('logger')
+    Rails.stub(:logger) { logger }
+    logger.should_receive(:info).with("[YogiBerra Info] Half the lies they tell about me aren't true.")
+    YogiBerra::Logger.log("Half the lies they tell about me aren't true.")
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yogi_berra
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -59,22 +59,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.8.3
-- !ruby/object:Gem::Dependency
-  name: bson_ext
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.8.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.8.3
 - !ruby/object:Gem::Dependency
   name: mongo
   requirement: !ruby/object:Gem::Requirement
@@ -123,7 +107,6 @@ files:
 - spec/yogi_berra_data_spec.rb
 - spec/yogi_berra_exception_middleware_spec.rb
 - spec/yogi_berra_logger_spec.rb
-- spec/yogi_berra_spec.rb
 homepage: http://github.com/earlonrails/yogi_berra
 licenses: []
 post_install_message: 
@@ -157,4 +140,3 @@ test_files:
 - spec/yogi_berra_data_spec.rb
 - spec/yogi_berra_exception_middleware_spec.rb
 - spec/yogi_berra_logger_spec.rb
-- spec/yogi_berra_spec.rb

data/spec/yogi_berra_spec.rb

@@ -1,85 +0,0 @@
-require 'spec_helper'
-
-describe YogiBerra do
-  before(:all) do
-    @test_yaml = "#{SPEC_FOLDER}/fixtures/test.yml"
-  end
-
-  before(:each) do
-    YogiBerra::Logger.stub(:log)
-  end
-
-  it "should call the upstream app with the environment" do
-    environment = { 'key' => 'value' }
-    app = lambda { |env| ['response', {}, env] }
-    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' }
-  end
-
-  it "deliver an exception raised while calling an upstream app" do
-    exception = build_exception
-    environment = { 'key' => 'value' }
-    app = lambda do |env|
-      raise exception
-    end
-
-    begin
-      stack = YogiBerra::ExceptionMiddleware.new(app)
-      stack.call(environment)
-    rescue Exception => raised
-      raised.should == exception
-    end
-  end
-
-  it "should deliver an exception in rack.exception" do
-    exception = build_exception
-    environment = { 'key' => 'value' }
-
-    response = [200, {}, ['okay']]
-    app = lambda do |env|
-      env['rack.exception'] = exception
-      response
-    end
-    stack = YogiBerra::ExceptionMiddleware.new(app)
-
-    actual_response = stack.call(environment)
-
-    actual_response[0].should == 200
-    actual_response[1].should == {}
-    actual_response[2].instance_variable_get("@response").should == ["okay"]
-  end
-
-  it "should load a yaml file without rails" do
-    lambda { YogiBerra::Catcher.load_db_settings(@test_yaml) }.should_not raise_error
-    YogiBerra::Catcher.settings.should_not == nil
-    YogiBerra::Catcher.settings["project"].should == "test_yogi_project"
-  end
-
-  it "should load a yaml file with rails" do
-    ENV["YOGI_ENV"] = nil
-    require 'fixtures/rails'
-    lambda { YogiBerra::Catcher.load_db_settings }.should_not raise_error
-    YogiBerra::Catcher.settings.should_not == nil
-    YogiBerra::Catcher.settings["project"].should == "rails_yogi_project"
-    Object.send(:remove_const, :Rails)
-  end
-
-  it "should grab a connection using the settings file" do
-    connection = nil
-    YogiBerra::Catcher.load_db_settings(@test_yaml)
-    connection = YogiBerra::Catcher.quick_connection
-    connection.should_not == nil
-  end
-
-  it "should grab a connection to mongodb" do
-    yaml = nil
-    yaml = 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
-end