yeller_ruby 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69148c3deef072819ef088784bbab18ba78499ff
-  data.tar.gz: dcb6d17d8c297cc968ea8915f562200498af1003
+  metadata.gz: 698ad55a6a18513724ff97a0896585191a3a579f
+  data.tar.gz: bb09b021ef217c667c2b5978563c852e76d6cc78
 SHA512:
-  metadata.gz: 1a5e13ea29a5fb9b3385f50201fe2776d8ca105b5f75ce4b0a589e176a24e339c21caa0015330bf7215e1a1ef9f4618a5ee39749efc3308cc5efd45b1aa1cd90
-  data.tar.gz: a63d64093d5e56edc5b773829e1024edc835fac1341bd213991c78b393323e9f65e8bb92e08cad52198b548b6b9d907f4c2cb7acd2bb1ecdd6462e69ef9bd63e
+  metadata.gz: 75f14d12c0b974cf5ce2d8263156f82c23670f1b1c18a7ccf5d2d5ffc075f440054f1662bae8cc85fae934e6caf844249a04cbb56625c26ee492a6a3e6e319d5
+  data.tar.gz: 649cd6159cca96897695bf596a191116cc1ddf455d955b58c90db6c35d0d8808504819d4ae6c56f01311b84a497564c84fb05b9f9b085e4a7bf5d7e53cd76a4d

data/lib/yeller/backtrace_filter.rb

@@ -0,0 +1,21 @@
+module Yeller
+  class BacktraceFilter
+    attr_reader :filters
+    def initialize(filters)
+      @filters = filters
+    end
+
+    def filter(trace)
+      trace.map do |frame|
+        [filter_filename(frame[0]), frame[1], frame[2]]
+      end
+    end
+
+    def filter_filename(filename)
+      filters.each do |filter|
+        filename.gsub!(filter[0], filter[1])
+      end
+      filename
+    end
+  end
+end

data/lib/yeller/client.rb

@@ -1,15 +1,18 @@
 module Yeller
   class Client
-    def initialize(servers, token, startup_params, error_handler)
+    attr_reader :backtrace_filter
+
+    def initialize(servers, token, startup_params, backtrace_filter, error_handler)
       @servers = servers
       @last_server = rand(servers.size)
       @startup_params = startup_params
       @token = token
       @error_handler = error_handler
+      @backtrace_filter = backtrace_filter
     end
 
     def report(exception, options={})
-      hash = ExceptionFormatter.format(exception, options)
+      hash = ExceptionFormatter.format(exception, backtrace_filter, options)
       serialized = JSON.dump(@startup_params.merge(hash))
       report_with_roundtrip(serialized, 0)
     end

data/lib/yeller/configuration.rb

@@ -2,6 +2,7 @@ require_relative 'server'
 
 module Yeller
   class Configuration
+    attr_reader :token, :servers, :startup_params, :error_handler, :project_root
     DEFAULT_SERVERS = [
       Yeller::SecureServer.new("collector1.yellerapp.com", 443),
       Yeller::SecureServer.new("collector2.yellerapp.com", 443),
@@ -30,6 +31,17 @@ module Yeller
       @servers << Yeller::Server.new(host, port)
     end
 
+    def backtrace_filters
+      filters = []
+      if defined?(Gem)
+        Gem.path.each do |gem_path|
+          filters << [gem_path, 'GEM_ROOT']
+        end
+      end
+      filters << [project_root, 'PROJECT_ROOT']
+      filters
+    end
+
     def environment=(new_environment)
       @startup_params[:"application-environment"] = new_environment
     end
@@ -38,28 +50,33 @@ module Yeller
       @startup_params[:host] = new_host
     end
 
-    def token=(token)
-      @token = token
-    end
-
-    def token
-      @token
+    def project_root=(new_project_root)
+      @project_root = new_project_root
     end
 
-    def servers
-      @servers
+    def project_root
+      return @project_root if @project_root
+      if defined?(::Rails)
+        if ::Rails.respond_to?(:root)
+          ::Rails.root.to_s
+        elsif defined?(::RAILS_ROOT)
+          ::RAILS_ROOT
+        end
+      else
+        Dir.pwd
+      end
     end
 
-    def startup_params
-      @startup_params
-    end
-
-    def error_handler
-      @error_handler
+    def token=(token)
+      @token = token
     end
 
     def error_handler=(new_error_handler)
       @error_handler = new_error_handler
     end
+
+    def project_root=(new_project_root)
+      @project_root = new_project_root
+    end
   end
 end

data/lib/yeller/exception_formatter.rb

@@ -2,17 +2,26 @@ module Yeller
   class ExceptionFormatter
     BACKTRACE_FORMAT = %r{^((?:[a-zA-Z]:)?[^:]+):(\d+)(?::in `([^']+)')?$}.freeze
 
-    def self.format(exception, options={})
-      new(exception, options).to_hash
+
+    class IdentityBacktraceFilter
+      def filter(trace)
+        trace
+      end
     end
 
-    attr_reader :type, :options
+    def self.format(exception, backtrace_filter=IdentityBacktraceFilter.new, options={})
+      new(exception, backtrace_filter, options).to_hash
+    end
 
-    def initialize(exception, options)
+    attr_reader :type, :options, :backtrace_filter
+
+    def initialize(exception, backtrace_filter, options)
       @type = exception.class.name
       @message = exception.message
       @backtrace = exception.backtrace
       @options = options
+
+      @backtrace_filter = backtrace_filter
     end
 
     def message
@@ -23,10 +32,11 @@ module Yeller
     def formatted_backtrace
       return [] unless @backtrace
 
-      @backtrace.map do |line|
+      original_trace = @backtrace.map do |line|
         _, file, number, method = line.match(BACKTRACE_FORMAT).to_a
         [file, number, method]
       end
+      backtrace_filter.filter(original_trace)
     end
 
     def to_hash

data/lib/yeller/rack.rb

@@ -25,16 +25,14 @@ module Yeller
     end
 
     def self.rescue_rack_exception(exception, env)
-      ::Rails.logger.info("sending exception to yeller")
       request = ::Rack::Request.new(env)
       Yeller::Rack.report(
         exception,
         :url => request.url,
         :custom_data => {
-        :params => request.params,
-        :session => env.fetch('rack.session', {}),
+          :params => request.params,
+          :session => env.fetch('rack.session', {}),
       })
-      ::Rails.logger.info("sent exception to yeller")
     end
   end
 end

data/lib/yeller/rails.rb

@@ -19,11 +19,19 @@ module Yeller
 
       protected
       def render_exception_with_yeller(env, exception)
-        ::Rails.logger.info("yeller: caught exception")
-        Yeller::Rack.rescue_rack_exception(exception, env)
+        controller = env['action_controller.instance']
+        params = controller.send(:params)
+        request = ::Rack::Request.new(env)
+        Yeller::Rack.report(
+          exception,
+          :url => request.url,
+          :location => "#{controller.class.to_s}##{params[:action]}",
+          :custom_data => {
+            :params => params,
+            :session => env.fetch('rack.session', {})
+          })
+
         render_exception_without_yeller(env, exception)
-      rescue Exception => e
-        ::Rails.logger.info("exception whilst handling exception: #{e} #{e.class} #{e.backtrace.join("\n")}")
       end
     end
 
@@ -32,11 +40,6 @@ module Yeller
         app.config.middleware.insert 0, "Yeller::Rack"
       end
 
-      initializer "yeller.action_controller" do
-        ActiveSupport.on_load :action_controller do
-        end
-      end
-
       config.after_initialize do
         if defined?(::ActionDispatch::DebugExceptions)
           ::ActionDispatch::DebugExceptions.send(:include, Yeller::Rails::ActionControllerCatchingHooks)

data/lib/yeller/version.rb

@@ -1,3 +1,3 @@
 module Yeller
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/yeller.rb

@@ -1,6 +1,7 @@
 require 'net/http'
 require 'yajl/json_gem'
 
+require_relative 'yeller/backtrace_filter'
 require_relative 'yeller/client'
 require_relative 'yeller/configuration'
 require_relative 'yeller/exception_formatter'
@@ -21,6 +22,7 @@ module Yeller
       config.servers,
       config.token,
       Yeller::StartupParams.defaults(config.startup_params),
+      Yeller::BacktraceFilter.new(config.backtrace_filters),
       config.error_handler
     )
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yeller_ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Tom Crayford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-04 00:00:00.000000000 Z
+date: 2014-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -60,6 +60,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/yeller.rb
+- lib/yeller/backtrace_filter.rb
 - lib/yeller/client.rb
 - lib/yeller/configuration.rb
 - lib/yeller/exception_formatter.rb