redmine_airbrake_backend 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4627e9e6862c801b73cf31178ff43d50ba40fae
-  data.tar.gz: 0205349f0793115c48e62bdfd85401903ff94421
+  metadata.gz: 7fced1efea4d537b27f9a4a741aaf307a22718bf
+  data.tar.gz: dcbedce9d1f9abdcd109ae1cec7c15b4f33702c5
 SHA512:
-  metadata.gz: 8f50e28e27bb16e93c8d1dbf56c24f0d049d7c7e9133f70170d47536c9e0eadd0c2c359c372dc7497c52f2d7d64d95ab47ca302fec5899d42e69566b03d1f844
-  data.tar.gz: 5d086483a614240d063d1cd04617b4aa71733bc731ead73051499011ddced147ce72af47a691fc4cbabdee62e835c4f093b976defe7ea2a962ef1e227d1c3e3f
+  metadata.gz: 5431defd44ddd91e10b3b052a93ca98afea49629a45612f2e7d15242baa3e76d4d4b69268084d71dddfad80559d48a461fdaacff36734f940c2ab7caec32a3c9
+  data.tar.gz: c4195a878a5fd1fba3e90eddfa1ffb44e314122d587c854bcd594ecccc986a93b6089a4e43521e39773a6232347c81d1f0990bcbbe769f3958c5036edc473c95

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog
 
-## Unreleased
+## 1.0.1 (2016-01-25)
+### Fixes
+  - Add space to comma separated key-value list in description tables
+  - Exclude notifier information from context table
+
+## 1.0.0 (2016-01-23)
 ### Changes
   - Add support for new v3 JSON notices
   - Add support for new v3 JSON iOS reports

data/README.md

@@ -33,6 +33,7 @@ Please see http://www.redmine.org/projects/redmine/wiki/Plugins for installation
 4. Check if the custom fields are assigned to the trackers you want to use with airbrake
 5. Enable the project module (Airbrake) in your project settings (don't forget to add at least the Airbrake notice ID custom field to your project if it is not a global field)
 6. Configure additional defaults under the settings tab per project (Airbrake)
+6. Check if the user used for airbrake has a role with the _Airbrake_ permission
 
 ## Client configuration
 

data/app/controllers/airbrake_controller.rb

@@ -8,6 +8,7 @@ class AirbrakeController < ::ApplicationController
 
   skip_before_action :verify_authenticity_token
 
+  prepend_before_action :load_records
   prepend_before_action :parse_key
   prepend_before_action :find_project
   before_action :set_environment
@@ -27,15 +28,20 @@ class AirbrakeController < ::ApplicationController
     @key = JSON.parse(params[:key]).symbolize_keys #rescue nil
 
     # API key
-    raise InvalidRequest.new('No or invalid API key') if @key.blank? || @key[:key].blank?
+    invalid_request!('No or invalid API key') if @key.blank? || @key[:key].blank?
     params[:key] = @key[:key]
 
+    # Type
+    @type = @key[:type] || (params[:context][:language].split('/', 2).first.downcase rescue nil)
+  end
+
+  def load_records
     # Tracker
     @tracker = record_for(@project.trackers, :tracker)
-    raise InvalidRequest.new('No or invalid tracker') if @tracker.blank?
+    invalid_request!('No or invalid tracker') if @tracker.blank?
 
     # Notice ID field
-    raise InvalidRequest.new('Custom field for notice hash not available on selected tracker') if @tracker.custom_fields.find_by(id: notice_hash_field.id).blank?
+    invalid_request!('Custom field for notice hash not available on selected tracker') if @tracker.custom_fields.find_by(id: notice_hash_field.id).blank?
 
     # Category
     @category = record_for(@project.issue_categories, :category)
@@ -48,13 +54,14 @@ class AirbrakeController < ::ApplicationController
 
     # Repository
     @repository = @project.repositories.find_by(identifier: (@key[:repository] || ''))
-
-    # Type
-    @type = @key[:type] || (params[:context][:language].split('/', 2).first.downcase rescue nil)
   end
 
   def set_environment
-    @environment = params[:context][:environment].presence rescue nil
+    @environment ||= params[:context][:environment].presence rescue nil
+  end
+
+  def invalid_request!(message)
+    raise InvalidRequest.new(message)
   end
 
   def render_bad_request(error)
@@ -63,6 +70,17 @@ class AirbrakeController < ::ApplicationController
     render text: error.message, status: :bad_request
   end
 
+  def render_airbrake_response
+    if @issue.present?
+      render json: {
+        id:  (CustomValue.find_by(customized_type: Issue.name, customized_id: @issue.id, custom_field_id: notice_hash_field.id).value rescue nil),
+        url: issue_url(@issue)
+      }
+    else
+      render json: {}
+    end
+  end
+
   def record_for(on, key, fields = [:id, :name])
     fields.each do |field|
       val = on.find_by(field => @key[key])

data/app/controllers/airbrake_notice_controller.rb

@@ -4,8 +4,14 @@ class AirbrakeNoticeController < ::AirbrakeController
 
   # Handle airbrake notices
   def notices
-    @issue = nil
+    create_issues
 
+    render_airbrake_response
+  end
+
+  private
+
+  def create_issues
     params[:errors].each do |e|
       error = RedmineAirbrakeBackend::Error.new(e)
 
@@ -17,14 +23,5 @@ class AirbrakeNoticeController < ::AirbrakeController
 
       @issue ||= issue if issue.save
     end
-
-    if @issue.present?
-      render json: {
-        id:  (CustomValue.find_by(customized_type: Issue.name, customized_id: @issue.id, custom_field_id: notice_hash_field.id).value rescue nil),
-        url: issue_url(@issue)
-      }
-    else
-      render json: {}
-    end
   end
 end

data/app/controllers/airbrake_report_controller.rb

@@ -7,6 +7,14 @@ class AirbrakeReportController < ::AirbrakeController
 
   # Handle airbrake iOS reports
   def ios_reports
+    create_issue
+
+    render_airbrake_response
+  end
+
+  private
+
+  def create_issue
     error = RedmineAirbrakeBackend::IosReport.new(params[:report])
 
     @issue = find_or_initialize_issue(error)
@@ -15,15 +23,6 @@ class AirbrakeReportController < ::AirbrakeController
 
     reopen_issue(@issue, error) if @issue.persisted? && @issue.status.is_closed? && reopen_issue?
 
-    unless @issue.save
-      render json: {}
-
-      return
-    end
-
-    render json: {
-      id:  (CustomValue.find_by(customized_type: Issue.name, customized_id: @issue.id, custom_field_id: notice_hash_field.id).value rescue nil),
-      url: issue_url(@issue)
-    }
+    @issue = nil unless @issue.save
   end
 end

data/app/helpers/airbrake_helper.rb

@@ -8,7 +8,7 @@ module AirbrakeHelper
       if value.is_a?(String)
         lines << "|@#{key}@|@#{value}@|"
       elsif value.is_a?(Hash)
-        lines << "|@#{key}@|@#{value.map { |k, v| "#{k}: #{v}"}.join(',')}@|"
+        lines << "|@#{key}@|@#{value.map { |k, v| "#{k}: #{v}"}.join(', ')}@|"
       end
     end
     lines.join("\n")

data/app/views/airbrake/issue_description/default.erb

@@ -33,7 +33,7 @@ h2. Session
 <% if params[:context].present? %>
 h2. Context
 
-<%= format_table(params[:context].reject { |k, v| [:notifier].include?(k) }) %>
+<%= format_table(params[:context].reject { |k, v| ['notifier'].include?(k) }) %>
 <% end %>
 
 

data/lib/redmine_airbrake_backend/error.rb

@@ -25,7 +25,7 @@ module RedmineAirbrakeBackend
       @subject = generate_subject
 
       # Attachments
-      @attachments = data[:attachments].presence || []
+      @attachments = (data[:attachments].presence || []).compact
 
       # Application
       @application = data[:application].presence

data/lib/redmine_airbrake_backend/ios_report.rb

@@ -25,51 +25,19 @@ module RedmineAirbrakeBackend
       data.split("\n").each do |line|
         header_finished = true if line =~ /^(Application Specific Information|Last Exception Backtrace|Thread \d+( Crashed)?):$/
 
-        unless header_finished
-          key, value = line.split(':', 2).map { |s| s.strip }
-
-          next if key.blank? || value.blank?
-
-          case key
-          when 'Exception Type'
-            error[:type] = value
-          when 'Exception Codes'
-            error[:message] = value
-          when 'Incident Identifier'
-            indicent_identifier = value
-          when 'Identifier'
-            error[:application][:name] = value
-          when 'Version'
-            error[:application][:version] = value
-          end
-        end
+        indicent_identifier = parse_header_line(line, error) unless header_finished
 
         if next_line_is_message
           next_line_is_message = false
 
-          error[:message] = line
-
-          if line =~ /^\*\*\* Terminating app due to uncaught exception '([^']+)', reason: '\*\*\* (.*)'$/
-            error[:type]    = Regexp.last_match(1)
-            error[:message] = Regexp.last_match(2)
-          else
-            error[:message] = line
-          end
+          parse_message(line, error)
         end
 
         crashed_thread = false if line =~ /^Thread \d+:$/
 
-        if crashed_thread
-          if line =~ /^(\d+)\s+([^\s]+)\s+(0x[0-9a-f]+)\s+(.+) \+ (\d+)$/
-            error[:backtrace] << {
-              file:     Regexp.last_match(2),
-              function: Regexp.last_match(4),
-              line:     Regexp.last_match(5)
-            }
-          end
-        end
+        error[:backtrace] << parse_backtrace_element(line) if crashed_thread
 
-        crashed_thread = true if error[:backtrace].blank? && line =~ /^(Last Exception Backtrace|Thread \d+ Crashed):$/
+        crashed_thread = true if error[:backtrace].compact.blank? && line =~ /^(Last Exception Backtrace|Thread \d+ Crashed):$/
 
         next_line_is_message = true if line =~ /^Application Specific Information:$/
       end
@@ -83,5 +51,49 @@ module RedmineAirbrakeBackend
 
       error
     end
+
+    def self.parse_header_line(line, error)
+      key, value = line.split(':', 2).map { |s| s.strip }
+
+      next if key.blank? || value.blank?
+
+      case key
+      when 'Exception Type'
+        error[:type] = value
+      when 'Exception Codes'
+        error[:message] = value
+      when 'Incident Identifier'
+        return value
+      when 'Identifier'
+        error[:application][:name] = value
+      when 'Version'
+        error[:application][:version] = value
+      end
+
+      nil
+    end
+
+    def self.parse_message(line, error)
+      error[:message] = line
+
+      if line =~ /^\*\*\* Terminating app due to uncaught exception '([^']+)', reason: '\*\*\* (.*)'$/
+        error[:type]    = Regexp.last_match(1)
+        error[:message] = Regexp.last_match(2)
+      else
+        error[:message] = line
+      end
+    end
+
+    def self.parse_backtrace_element(line)
+      if line =~ /^(\d+)\s+([^\s]+)\s+(0x[0-9a-f]+)\s+(.+) \+ (\d+)$/
+        {
+          file:     Regexp.last_match(2),
+          function: Regexp.last_match(4),
+          line:     Regexp.last_match(5)
+        }
+      else
+        nil
+      end
+    end
   end
 end

data/lib/redmine_airbrake_backend/version.rb

@@ -1,4 +1,4 @@
 module RedmineAirbrakeBackend
   # Version of this gem
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_airbrake_backend
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Florian Schwab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-23 00:00:00.000000000 Z
+date: 2016-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails