exceptional 2.0.14 → 2.0.15

data/init.rb

@@ -15,10 +15,19 @@ if (defined?(Exceptional::VERSION::STRING) rescue nil) && %w(development test).i
 else
   begin
     Exceptional::Config.load(File.join(RAILS_ROOT, "/config/exceptional.yml"))
-    require File.join('exceptional', 'integration', 'rails')
-    require File.join('exceptional', 'integration', 'dj')
+
+    Exceptional.logger.info("Loading Exceptional for #{Rails::VERSION::STRING}")
+
+    if Rails::VERSION::STRING.to_i > 2 
+      puts "Exceptional Rails 3 Support via Rack"
+      ::Rails.configuration.middleware.insert_after 'ActionDispatch::ShowExceptions', Rack::RailsExceptional      
+    else    
+      require File.join('exceptional', 'integration', 'rails')
+      require File.join('exceptional', 'integration', 'dj')
+    end
   rescue => e
     STDERR.puts "Problem starting Exceptional Plugin. Your app will run as normal."
-    STDERR.puts e
+    Exceptional.logger.error(e.message)
+    Exceptional.logger.error(e.backtrace)
   end
-end
+end

data/install.rb

@@ -1,6 +1,6 @@
 # This is the post install hook for when Exceptional is installed as a plugin.
-require 'ftools'
-
+require 'fileutils'
+  
 # puts IO.read(File.join(File.dirname(__FILE__), 'README'))
 
 config_file = File.expand_path("#{File.dirname(__FILE__)}/../../../config/exceptional.yml")
@@ -15,5 +15,5 @@ else
   puts "For exceptional to work you need to configure your API key."
   puts "  See #{example_config_file}"
   puts "If you don't have an API key, get one at http://getexceptional.com/."
-  File.copy example_config_file, config_file
+  FileUtils.copy example_config_file, config_file
 end

data/lib/exceptional.rb

@@ -9,7 +9,8 @@ require 'exceptional/exception_data'
 require 'exceptional/controller_exception_data'
 require 'exceptional/rack_exception_data'
 require 'exceptional/remote'
-require 'exceptional/integration/rack'
+require 'exceptional/integration/rack'    
+require 'exceptional/integration/rack_rails'
 require 'exceptional/version'
 
 module Exceptional

data/lib/exceptional/controller_exception_data.rb

@@ -12,53 +12,28 @@ module Exceptional
       "rails"
     end
 
-    def extra_stuff
+    def extra_stuff                                                                                               
       return {} if @request.nil?
       {
         'request' => {
-          'url' => "#{@request.protocol}#{@request.host}#{@request.request_uri}",
+          'url' => (@request.respond_to?(:url) ? @request.url : "#{@request.protocol}#{@request.host}#{@request.request_uri}"),
           'controller' => @controller.class.to_s,
-          'action' => @request.parameters['action'],
-          'parameters' => filter_paramaters(@request.parameters),
+          'action' => (@request.respond_to?(:parameters) ? @request.parameters['action'] : @request.params['action']),
+          'parameters' => filter_paramaters(@request.respond_to?(:parameters) ? @request.parameters : @request.params),
           'request_method' => @request.request_method.to_s,
-          'remote_ip' => @request.remote_ip,
+          'remote_ip' => (@request.respond_to?(:remote_ip) ? @request.remote_ip : @request.ip),
           'headers' => extract_http_headers(@request.env),
           'session' => self.class.sanitize_session(@request)
         }
       }
     end
 
-    def filter_paramaters(hash)
+    def filter_paramaters(hash)                                                                                       
       if @controller.respond_to?(:filter_parameters)
         @controller.send(:filter_parameters, hash)
       else
         hash
       end
     end
-
-    def extract_http_headers(env)
-      headers = {}
-      env.select{|k, v| k =~ /^HTTP_/}.each do |name, value|
-        proper_name = name.sub(/^HTTP_/, '').split('_').map{|upper_case| upper_case.capitalize}.join('-')
-        headers[proper_name] = value
-      end
-      unless headers['Cookie'].nil?
-        headers['Cookie'] = headers['Cookie'].sub(/_session=\S+/, '_session=[FILTERED]')
-      end
-      headers
-    end
-
-    def self.sanitize_session(request)
-      session = request.session
-      session_hash = {}
-      session_hash['session_id'] = request.session_options ? request.session_options[:id] : nil
-      session_hash['session_id'] ||= session.respond_to?(:session_id) ? session.session_id : session.instance_variable_get("@session_id")
-      session_hash['data'] = session.respond_to?(:to_hash) ? session.to_hash : session.instance_variable_get("@data") || {}
-      session_hash['session_id'] ||= session_hash['data'][:session_id]
-      session_hash['data'].delete(:session_id)
-      sanitize_hash(session_hash)
-    rescue
-      {}
-    end
   end
 end

data/lib/exceptional/exception_data.rb

@@ -1,7 +1,8 @@
 require 'digest/md5'
 
 module Exceptional
-  class ExceptionData
+  class ExceptionData 
+    
     def initialize(exception, name=nil)
       @exception = exception
       @name = name
@@ -38,7 +39,9 @@ module Exceptional
         begin
           require 'json'
           return to_hash.to_json
-        rescue StandardError
+        rescue StandardError => e                   
+          Exceptional.logger.error(e.message)
+          Exceptional.logger.error(e.backtrace)                    
           raise StandardError.new("You need a json gem/library installed to send errors to Exceptional (Object.to_json not defined). \nInstall json_pure, yajl-ruby, json-jruby, or the c-based json gem")
         end
       end
@@ -67,5 +70,32 @@ module Exceptional
     rescue
       {}
     end
+
+    def extract_http_headers(env)
+      headers = {}
+      env.select{|k, v| k =~ /^HTTP_/}.each do |name, value|
+        proper_name = name.sub(/^HTTP_/, '').split('_').map{|upper_case| upper_case.capitalize}.join('-')
+        headers[proper_name] = value
+      end
+      unless headers['Cookie'].nil?
+        headers['Cookie'] = headers['Cookie'].sub(/_session=\S+/, '_session=[FILTERED]')
+      end
+      headers
+    end  
+  
+    def self.sanitize_session(request)
+      session_hash = {'session_id' => "", 'data' => {}}
+
+      if request.respond_to?(:session)      
+        session = request.session
+        session_hash['session_id'] = request.session_options ? request.session_options[:id] : nil
+        session_hash['session_id'] ||= session.respond_to?(:session_id) ? session.session_id : session.instance_variable_get("@session_id")
+        session_hash['data'] = session.respond_to?(:to_hash) ? session.to_hash : session.instance_variable_get("@data") || {}
+        session_hash['session_id'] ||= session_hash['data'][:session_id]
+        session_hash['data'].delete(:session_id)
+      end
+
+      self.sanitize_hash(session_hash)
+    end  
   end
 end

data/lib/exceptional/integration/rack_rails.rb

@@ -0,0 +1,21 @@
+require 'rubygems'
+require 'rack'
+
+module Rack  
+  class RailsExceptional    
+
+    def initialize(app)
+      @app = app
+    end    
+    
+    def call(env)
+      begin
+        status, headers, body =  @app.call(env)
+      rescue Exception => e                                                               
+        puts ">>>#{env['action_controller.instance']}"
+        ::Exceptional::Catcher.handle_with_controller(e,env['action_controller.instance'], Rack::Request.new(env))
+        raise
+      end
+    end
+  end
+end

data/lib/exceptional/rack_exception_data.rb

@@ -3,7 +3,7 @@ require 'digest/md5'
 module Exceptional
   class RackExceptionData < ExceptionData
     def initialize(exception, environment, request)
-      super(exception)
+      super(exception)                  
       @environment = environment
       @request = request
     end
@@ -16,12 +16,12 @@ module Exceptional
       return {} if @request.nil?
       {
         'request' => {
-          'url' => "#{@request.url}",
+          'url' => "#{@request.url}",                       
           'parameters' => @request.params,
           'request_method' => @request.request_method.to_s,
           'remote_ip' => @request.ip,
-          'headers' => @environment.reject{|k,v| !k.match(/^HTTP_/)},
-          'session' => @request.session
+          'headers' => extract_http_headers(@environment),
+          'session' => self.class.sanitize_session(@request)
         }
       }
     end

data/lib/exceptional/version.rb

@@ -1,3 +1,3 @@
 module Exceptional
-  VERSION = '2.0.14'
+  VERSION = '2.0.15'
 end

data/spec/exceptional/exception_data_spec.rb

@@ -39,7 +39,7 @@ describe Exceptional::ControllerExceptionData, 'when no request/controller/param
     error_hash['exception_class'].should == 'Exceptional::FunkyError'
     error_hash['message'].should == 'some message'
     error_hash['backtrace'].should == 'backtrace'
-    DateTime.parse(error_hash['occurred_at']).should == Time.now
+    DateTime.parse(error_hash['occurred_at']).should == DateTime.now
     client_hash = @hash['client']
     client_hash['name'].should == Exceptional::CLIENT_NAME
     client_hash['version'].should == Exceptional::VERSION

data/spec/exceptional/rack_exception_data_spec.rb

@@ -58,8 +58,8 @@ describe Exceptional::RackExceptionData do
     request_hash['parameters'].should == {"cockle"=>"shell", "bay"=>"cool"} 
     request_hash['request_method'].should == 'GET'
     request_hash['remote_ip'].should == '127.0.0.1'
-    request_hash['headers'].should == {"HTTP_HOST"=>"localhost:9292", "HTTP_ACCEPT"=>"*/*", "HTTP_USER_AGENT"=>"curl/7.19.6 (i386-apple-darwin9.8.0) libcurl/7.19.6 zlib/1.2.3", "HTTP_VERSION"=>"HTTP/1.1"}
-    request_hash['session'].should == {}
+    request_hash['headers'].should == {"Host"=>"localhost:9292", "Accept"=>"*/*", "User-Agent"=>"curl/7.19.6 (i386-apple-darwin9.8.0) libcurl/7.19.6 zlib/1.2.3", "Version"=>"HTTP/1.1"}
+    request_hash['session'].should == {'data' => {}, 'session_id' => ''}
   end
 
   it "should capture client detais" do

data/spec/rails_rack_integration_spec.rb

@@ -0,0 +1,29 @@
+require File.dirname(__FILE__) + '/spec_helper'
+require 'rack/mock'
+
+class ExceptionalTestError < StandardError
+end
+
+describe Rack::RailsExceptional do
+
+  class TestingController < ActionController::Base
+    filter_parameter_logging :password, /credit_card/
+
+    def raises_something
+      raise StandardError
+    end
+  end
+    
+  before(:each) do 
+    @error = ExceptionalTestError.new
+    @app = lambda { |env| raise @error, 'Whoops!' }
+    @env = Rack::MockRequest.env_for("/foo")    
+    @env['action_controller.instance'] = TestingController.new    
+  end
+  
+  it 're-raises errors caught in the middleware' do       
+    rr = Rack::RailsExceptional.new(@app)
+    Exceptional::Catcher.should_receive(:handle_with_controller)
+    lambda { rr.call(@env)}.should raise_error(ExceptionalTestError)    
+  end
+end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: exceptional
 version: !ruby/object:Gem::Version 
-  version: 2.0.14
+  hash: 17
+  prerelease: false
+  segments: 
+  - 2
+  - 0
+  - 15
+  version: 2.0.15
 platform: ruby
 authors: 
 - Contrast
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-11 00:00:00 +01:00
+date: 2010-05-31 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -29,6 +35,7 @@ files:
 - lib/exceptional/exception_data.rb
 - lib/exceptional/integration/dj.rb
 - lib/exceptional/integration/rack.rb
+- lib/exceptional/integration/rack_rails.rb
 - lib/exceptional/integration/rails.rb
 - lib/exceptional/integration/sinatra.rb
 - lib/exceptional/integration/tester.rb
@@ -54,6 +61,7 @@ files:
 - spec/ginger_scenarios.rb
 - spec/rack_integration_spec.rb
 - spec/rails_integration_spec.rb
+- spec/rails_rack_integration_spec.rb
 - spec/spec_helper.rb
 - spec/standalone_spec.rb
 - rails/init.rb
@@ -61,6 +69,7 @@ files:
 - init.rb
 - install.rb
 - exceptional.gemspec
+- bin/exceptional
 has_rdoc: true
 homepage: http://getexceptional.com/
 licenses: []
@@ -71,21 +80,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: 
 - json_pure, json-jruby or json gem required
 rubyforge_project: exceptional
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: getexceptional.com is a hosted service for tracking errors in your Ruby/Rails/Rack apps