zikrash 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e257f0cad9d388747cf86751e1fb7f782c25bcf
-  data.tar.gz: 343ccb4f8eab9d7aa372fefff0d0adb311e40aeb
+  metadata.gz: 1633cedc122a23b501f7672101e8ada0e5360b40
+  data.tar.gz: c54c679dd0ea343dcc934d956069434dbf9ecd2e
 SHA512:
-  metadata.gz: 84f929a55afa83eb49a9f02fc00c863d01af5e43373c9e1cf68564359c899fe834ee1460fab1e2a1a82e604595ad341fa8715ca7e912652f3d7fb870457d6108
-  data.tar.gz: d1158f703f269f69fd510c23320e1834a8808ff3c5ecc2759388b9389ef4c15e3851a045a29d522ed1bf3c3148fb37314fda6f1b29628f70c9b1a885c5409f70
+  metadata.gz: 4b93325305e123f2fdb06499c9f9b69f8b8d50c628cd413563745c7b1acdeee70a56227f5fcf19e306c79fe0a6c68fc2f17e50c877e3fec9edae76f46030e47c
+  data.tar.gz: 14aab70dd552af60963216ed21c997994f403874f852b940f1dcea868ddddb7f370b38aad9480f87bb42f4c88f65f3e827c6cf6b16827b0a633cbccfe4d3b064

data/lib/zikrash/code_extractor.rb

@@ -6,7 +6,7 @@ module Zikrash
     attr_accessor :line_number
 
     def initialize(backtrace_line)
-      self.file_location = backtrace_line.split(':')[0].to_s
+      self.file_location = "#{Rails.root}/#{backtrace_line.split(':')[0]}"
       self.line_number = backtrace_line.split(':')[1].to_i
       self
     end

data/lib/zikrash/exception_info.rb

@@ -3,8 +3,7 @@ module Zikrash
     attr_accessor :exception_class
     attr_accessor :message
     attr_accessor :full_backtrace
-    attr_accessor :location
-    attr_accessor :relevant_code
+    attr_accessor :application_backtrace
 
     def initialize(exception)
       return false unless (exception.respond_to?(:message) && exception.respond_to?(:backtrace))
@@ -12,19 +11,35 @@ module Zikrash
       self.exception_class = exception.is_a?(Class) ? exception.to_s : exception.class.to_s
       self.message = exception.message
       self.full_backtrace = exception.backtrace
-      self.location = exception.backtrace.first
-      self.relevant_code = CodeExtractor.new(exception.backtrace.first).result
+      self.application_backtrace = Rails.backtrace_cleaner.clean(exception.backtrace)
+
       self
     end
 
     def data
+      all_backtrace, relevant_code = backtrace_with_relevant_code
       {
           class: exception_class,
           message: message,
-          full_backtrace: full_backtrace,
-          location: location,
+          location: application_backtrace.first,
+          full_backtrace: all_backtrace,
           relevant_code: relevant_code
       }
     end
+
+    private
+
+    def backtrace_with_relevant_code
+      relevant_code = {}
+      all_backtrace = Rails.backtrace_cleaner.clean(full_backtrace, :all_trace)
+
+      all_backtrace.each_with_index do |backtrace_line, index|
+        if application_backtrace.include?(backtrace_line)
+          relevant_code[index.to_s] = CodeExtractor.new(backtrace_line).result
+        end
+      end
+
+      [all_backtrace, relevant_code]
+    end
   end
 end

data/lib/zikrash/version.rb

@@ -1,3 +1,3 @@
 module Zikrash
-  VERSION = '1.0.1'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zikrash
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Ervinas Gisleris
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-14 00:00:00.000000000 Z
+date: 2018-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler