errplane 0.0.3 → 0.0.4

data/lib/errplane/black_box.rb

@@ -10,7 +10,10 @@ module Errplane
       {
         :time => Time.now.to_i,
         :message => @exception.message,
-        :backtrace => @exception.backtrace
+        :backtrace => @exception.backtrace,
+        :message => exception.message,
+        :backtrace => exception.backtrace,
+        :exception_class => exception.class.to_s
       }.to_json
     end
   end

data/lib/errplane/configuration.rb

@@ -8,22 +8,27 @@ module Errplane
     attr_accessor :rails_environment
     attr_accessor :rails_root
     attr_accessor :framework
+    attr_accessor :framework_version
+    attr_accessor :language
+    attr_accessor :language_version
     attr_accessor :ignored_exceptions
     attr_accessor :ignored_environments
 
-    DEFAULT_API_HOST = "api.errplane.com"
-    DEFAULT_IGNORED_EXCEPTIONS = %w{ActiveRecord::RecordNotFound
-                                    ActionController::RoutingError}
-    DEFAULT_IGNORED_ENVIRONMENTS = %w{development test cucumber selenium}
+    DEFAULTS = {
+      :api_host => "api.errplane.com",
+      :ignored_exceptions => %w{ActiveRecord::RecordNotFound
+                                ActionController::RoutingError},
+      :ignored_environments => %w{development test cucumber selenium}
+    }
 
     def initialize
-      @api_host = DEFAULT_API_HOST
-      @ignored_exceptions = DEFAULT_IGNORED_EXCEPTIONS.dup
-      @ignored_environments = DEFAULT_IGNORED_ENVIRONMENTS.dup
+      @api_host = DEFAULTS[:api_host]
+      @ignored_exceptions = DEFAULTS[:ignored_exceptions].dup
+      @ignored_environments = DEFAULTS[:ignored_environments].dup
     end
 
     def ignore_current_environment?
-      return self.ignored_environments.include?(self.rails_environment)
+      self.ignored_environments.include?(self.rails_environment)
     end
   end
 end

data/lib/errplane/rack.rb

@@ -8,8 +8,8 @@ module Errplane
       begin
         response = @app.call(env)
       rescue => e
-        Errplane.transmit_to_api(e)
-        raise
+        Errplane.transmit_to_api(e, env)
+        raise(e)
       end
 
       response

data/lib/errplane/rails/middleware/hijack_render_exception.rb

@@ -6,9 +6,10 @@ module Errplane
           base.send(:alias_method_chain,:render_exception,:errplane)
         end
 
-        def render_exception_with_errplane(env,exception)
-          Errplane.transmit_to_api(exception)
-          render_exception_without_errplane(env,exception)
+        def render_exception_with_errplane(env, e)
+          controller = env['action_controller.instance']
+          Errplane.transmit_to_api(e, env)
+          render_exception_without_errplane(env, e)
         end
       end
     end

data/lib/errplane/railtie.rb

@@ -15,7 +15,18 @@ module Errplane
         config.logger            ||= ::Rails.logger
         config.rails_environment ||= ::Rails.env
         config.rails_root        ||= ::Rails.root
+<<<<<<< HEAD
         config.framework           = "Rails #{::Rails::VERSION::STRING}"
+=======
+<<<<<<< HEAD
+        config.framework           = "Rails #{::Rails::VERSION::STRING}"
+=======
+        config.framework           = "Rails"
+        config.framework_version   = ::Rails::VERSION::STRING
+        config.language            = "Ruby"
+        config.language_version    = RUBY_VERSION
+>>>>>>> Add more configurability and some initial Sinatra support. Also add some Rails logging for debugging purposes.
+>>>>>>> Add more configurability and some initial Sinatra support. Also add some Rails logging for debugging purposes.
       end
 
       if defined?(::ActionDispatch::DebugExceptions)

data/lib/errplane/sinatra.rb

@@ -0,0 +1,12 @@
+# Errplane.configure(true) do |config|
+  # config.logger            ||= ::Sinatra.logger
+  # config.rails_environment ||= ::Sinatra.environment
+  # config.rails_root        ||= ::Sinatra.root
+  # config.framework           = "Sinatra"
+  # config.framework_version   = ::Sinatra::VERSION
+# end
+
+error do
+  Errplane.transmit_to_api(request.env['sinatra.error'], request.env)
+  raise request.env['sinatra.error']
+end

data/lib/errplane/transmitter.rb

@@ -8,14 +8,14 @@ module Errplane
       data = black_box.to_json
       response = begin
                    url = "/api/v1/applications/#{Errplane.configuration.application_id}/exceptions/#{Errplane.configuration.rails_environment}?api_key=#{Errplane.configuration.api_key}"
-                   ::Rails.logger.info(url)
-                   http.post("/api/v1/applications/#{Errplane.configuration.application_id}/exceptions/#{Errplane.configuration.rails_environment}?api_key=#{Errplane.configuration.api_key}", data)
+                   ::Rails.logger.info("\nURL: #{url}")
+                   ::Rails.logger.info("\nData: #{data.inspect}")
+                   response = http.post(url, data)
+                   ::Rails.logger.info("\nException Response: #{response.inspect}")
+                   response
                  rescue Exception => e
-                   e
+                   # e
                  end
-      ::Rails.logger.info("Exception Data: #{data}")
-      ::Rails.logger.info("Exception Body: #{response.body}")
-      ::Rails.logger.info("Exception Response: #{response.inspect}")
 
       case response
       when Net::HTTPSuccess

data/lib/errplane/version.rb

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

data/lib/errplane.rb

@@ -16,7 +16,8 @@ require "errplane/configuration"
 require "errplane/transmitter"
 require "errplane/rack"
 
-require "errplane/railtie" #if defined?(Rails)
+require "errplane/railtie" #if defined? Rails::Railtie
+require "errplane/sinatra" if defined? Sinatra::Request
 
 module Errplane
   class << self
@@ -32,27 +33,34 @@ module Errplane
       @configuration ||= Configuration.new
     end
 
-    def transmit_to_api(exception)
-      transmitter.relay(assemble_black_box_for(exception)) unless ignorable_exception?(exception)
+    def transmit_to_api(e, env)
+      begin
+      ::Rails.logger.info("\nTransmitter: #{transmitter.inspect}")
+      ::Rails.logger.info("\nBlack Box: #{assemble_black_box_for(e).inspect}")
+      ::Rails.logger.info("\nIgnorable Exception? #{ignorable_exception?(e)}")
+      transmitter.relay(assemble_black_box_for(e)) unless ignorable_exception?(e)
+      rescue
+        configuration.logger.info("[Errplane] Something went terribly wrong. Exception failed to take off.")
+      end
     end
 
-    def ignorable_exception?(exception)
-      configuration.ignore_current_environment? || configuration.ignored_exceptions.include?(exception.class.to_s)
+    def ignorable_exception?(e)
+      configuration.ignore_current_environment? || configuration.ignored_exceptions.include?(e.class.to_s)
     end
 
     private
-    def assemble_black_box_for(exception, options = {})
-      exception = unwrap_exception(exception)
+    def assemble_black_box_for(e, options = {})
+      exception = unwrap_exception(e)
       black_box = BlackBox.new(exception: exception)
     end
 
-    def unwrap_exception(exception)
-      if exception.respond_to?(:original_exception)
-        exception.original_exception
-      elsif exception.respond_to?(:continued_exception)
-        exception.continued_exception
+    def unwrap_exception(e)
+      if e.respond_to?(:original_exception)
+        e.original_exception
+      elsif e.respond_to?(:continued_exception)
+        e.continued_exception
       else
-        exception
+        e
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: errplane
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-10 00:00:00.000000000 Z
+date: 2012-06-15 00:00:00.000000000 Z
 dependencies: []
 description: This gem provides exception reporting with Errplane for Rails 3.x applications.
 email:
@@ -31,6 +31,7 @@ files:
 - lib/errplane/rack.rb
 - lib/errplane/rails/middleware/hijack_render_exception.rb
 - lib/errplane/railtie.rb
+- lib/errplane/sinatra.rb
 - lib/errplane/transmitter.rb
 - lib/errplane/version.rb
 - lib/rails/generators/errplane/errplane_generator.rb