redmine_airbrake_backend 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78d324b14146a054ed7f62573df24493843ebccc846a1a8936348fff51228098
-  data.tar.gz: 6225ac96f31412e899d0ab2f06e869f22761d4af19583dda20cdfefc1e00d416
+  metadata.gz: 37936f35cac6d9858dd65014e0e9592a794990c08990b4b7918ae5cab3c92c8e
+  data.tar.gz: 42e2e65994e3302da7e71cd910aac5fefb6ac6d4bbf0f22b091fa1cb2e796894
 SHA512:
-  metadata.gz: 366e346434ea2a82047ff0d1a7c6314ff2782e5e4056cdf3f2563e2ebfe0f958265d727a1e87dd47eddb001c61b3d832dd3fa20ee4e6f8eb9973e2aba3a59801
-  data.tar.gz: abb59d8c978611fa973c20a3de001904a1bfade5c30d910739ad2285cccc7a024a0e0951e57f4fb1da429d9fae0d2b61ebcb16c6fab24f94a97cd40fd763e18a
+  metadata.gz: fb04ff49d11b6471db9c9f33fd4882344847dabbaa3ba0708087aa6d4d74cd97516f8ce8392e0064eb3a6304c01af86d8e86c09e550664e815eb168c1247bbaa
+  data.tar.gz: 6d461674d8bc48dc7b22ae4ea1da383ab903b115ec0661843aad58805f98de7ebfb7c171c5840190f53823d8355e44bea25b8608f3be1a85a13c2a6dd1310b73

data/.gitlab-ci.yml

@@ -1,5 +1,6 @@
 stages:
   - build
+  - test
   - codequality
   - security
 
@@ -7,17 +8,25 @@ build:
   stage: build
   image: ruby:2.5
   script:
-    - gem install bundler --no-ri --no-rdoc
+    - gem install bundler --no-document
     - bundle update
   artifacts:
     paths:
       - Gemfile.lock
 
+test:
+  stage: test
+  image: ruby:2.5
+  script:
+    - gem install bundler --no-document
+    - bundle update
+    - rake test
+
 rubocop:
   stage: codequality
   image: ruby:2.5
   script:
-    - gem install rubocop --no-ri --no-rdoc
+    - gem install rubocop --no-document
     - rubocop
 
 dependency_scanning:

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.2.3 (2019-01-27)
+### Fixes
+  - Fix reopen of issues
+
 ## 1.2.2 (2018-11-03)
 ### Fixes
   - Fix finding repository if no filename is for backtrace element

data/app/controllers/concerns/airbrake_issue_finding.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+# Handling for creating / updating issues
+module AirbrakeIssueFinding
+  extend ActiveSupport::Concern
+  include AirbrakeAttachments
+
+  private
+
+  # Load or initialize issue by project, tracker and airbrake hash or similarity
+  def find_or_initialize_issue(notice)
+    find_issue_by_airbrake_id(notice) || initialize_issue(notice)
+  end
+
+  def find_issue_by_airbrake_id(notice)
+    issue_ids = CustomValue
+                .where(customized_type: Issue.name, custom_field_id: notice_hash_field.id, value: notice.id)
+                .pluck(:customized_id)
+
+    Issue.find_by(id: issue_ids, project_id: @project.id, tracker_id: @tracker.id)
+  end
+
+  def initialize_issue(notice)
+    issue = Issue.new(
+      subject:     notice.subject,
+      project:     @project,
+      tracker:     @tracker,
+      author:      User.current,
+      category:    @category,
+      priority:    @priority,
+      description: render_description(notice),
+      assigned_to: @assignee
+    )
+
+    add_attachments_to_issue(issue, notice)
+
+    issue
+  end
+end

data/app/controllers/concerns/airbrake_issue_handling.rb

@@ -5,6 +5,7 @@ require 'tempfile'
 # Handling for creating / updating issues
 module AirbrakeIssueHandling
   extend ActiveSupport::Concern
+  include AirbrakeIssueFinding
   include AirbrakeAttachments
 
   private
@@ -30,36 +31,6 @@ module AirbrakeIssueHandling
     @issue = nil unless @issue.save
   end
 
-  # Load or initialize issue by project, tracker and airbrake hash
-  def find_or_initialize_issue(notice)
-    issue_ids = CustomValue
-                .where(customized_type: Issue.name, custom_field_id: notice_hash_field.id, value: notice.id)
-                .pluck(:customized_id)
-
-    issue = Issue.find_by(id: issue_ids, project_id: @project.id, tracker_id: @tracker.id)
-
-    return issue if issue.present?
-
-    initialize_issue(notice)
-  end
-
-  def initialize_issue(notice)
-    issue = Issue.new(
-      subject:     notice.subject,
-      project:     @project,
-      tracker:     @tracker,
-      author:      User.current,
-      category:    @category,
-      priority:    @priority,
-      description: render_description(notice),
-      assigned_to: @assignee
-    )
-
-    add_attachments_to_issue(issue, notice)
-
-    issue
-  end
-
   def update_occurrences(issue, custom_field_values)
     return if occurrences_field.blank?
 
@@ -97,8 +68,8 @@ module AirbrakeIssueHandling
   def reopen_issue(issue, notice)
     return if notice.environment_name.blank?
 
-    desc = "*Issue reopened after occurring again in _#{notice.environment_name}_ environment.*"
-    desc << "\n\n#{render_description(notice)}" if issue_reopen_repeat_description?
+    desc  = "*Issue reopened after occurring again in _#{notice.environment_name}_ environment.*"
+    desc += "\n\n#{render_description(notice)}" if issue_reopen_repeat_description?
 
     issue.status = issue.tracker.default_status
 

data/lib/redmine_airbrake_backend.rb

@@ -11,4 +11,8 @@ module RedmineAirbrakeBackend
   def self.filter_hex_values(value)
     value.gsub(/0x[0-9a-f]+/, '')
   end
+
+  def self.filter(value)
+    filter_hex_values(value)
+  end
 end

data/lib/redmine_airbrake_backend/backtrace_element.rb

@@ -32,7 +32,7 @@ module RedmineAirbrakeBackend
              .downcase
              .gsub(/([\d_]+$)?/, '') # ruby blocks
 
-      RedmineAirbrakeBackend.filter_hex_values(name)
+      RedmineAirbrakeBackend.filter(name)
     end
   end
 end

data/lib/redmine_airbrake_backend/error.rb

@@ -26,9 +26,9 @@ module RedmineAirbrakeBackend
 
     def generate_id
       h = []
-      h << RedmineAirbrakeBackend.filter_hex_values(@type)
-      h << RedmineAirbrakeBackend.filter_hex_values(@message)
-      h += @backtrace.map(&:checksum).compact
+      h << RedmineAirbrakeBackend.filter(@type)
+      h << RedmineAirbrakeBackend.filter(@message)
+      h += @backtrace.map(&:checksum)
 
       Digest::MD5.hexdigest(h.compact.join("\n"))
     end

data/lib/redmine_airbrake_backend/version.rb

@@ -2,5 +2,5 @@
 
 module RedmineAirbrakeBackend
   # Version of this gem
-  VERSION = '1.2.2'
+  VERSION = '1.2.3'
 end

data/redmine_airbrake_backend.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://gitlab.com/ydkn/redmine_airbrake_backend'
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+  spec.files         = `git ls-files`.split("\n")
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 

data/test/test_helper.rb

@@ -1 +1,6 @@
-require File.expand_path('./test/test_helper')
+ENV['RAILS_ENV'] ||= 'test'
+
+require 'rails'
+require 'rails/test_help'
+
+Bundler.require(*Rails.groups)

data/test/unit/notice_test.rb

@@ -1,52 +1,72 @@
-require File.expand_path('../test_helper', __dir__)
+require_relative '../test_helper'
 
-class NoticeTest < ActiveSupport::TestCase
-  test 'parse' do
-    api_key = {
-      api_key: 'foobar',
-      project: 'foo'
-    }.to_json
-    xml_data = <<-EOS
-      <?xml version="1.0" encoding="UTF-8"?>
-      <notice version="2.4">
-        <api-key>#{api_key}</api-key>
-        <notifier>
-          <name>Airbrake Notifier</name>
-          <version>3.1.6</version>
-          <url>http://api.airbrake.io</url>
-        </notifier>
-        <error>
-          <class>RuntimeError</class>
-          <message>RuntimeError: I've made a huge mistake</message>
-          <backtrace>
-            <line method="public" file="/testapp/app/models/user.rb" number="53"/>
-            <line method="index" file="/testapp/app/controllers/users_controller.rb" number="14"/>
-          </backtrace>
-        </error>
-        <request>
-          <url>http://example.com</url>
-          <component/>
-          <action/>
-          <cgi-data>
-            <var key="SERVER_NAME">example.org</var>
-            <var key="HTTP_USER_AGENT">Mozilla</var>
-          </cgi-data>
-        </request>
-        <server-environment>
-          <project-root>/testapp</project-root>
-          <environment-name>production</environment-name>
-          <app-version>1.0.0</app-version>
-        </server-environment>
-      </notice>
-    EOS
+require 'redmine_airbrake_backend/notice'
 
-    notice = RedmineAirbrakeBackend::Notice.parse(prepare_xml(xml_data))
-    assert notice
-  end
+class NoticeTest < ActiveSupport::TestCase
+  test 'parse notice request' do
+    params = {
+      "errors" => [{
+        "type" => "OpenURI::HTTPError",
+        "message" => "404 Not Found",
+        "backtrace" => [{
+          "file" => "/usr/local/lib/ruby/2.5.0/open-uri.rb",
+          "line" => 377,
+          "function" => "open_http"
+        }, {
+          "file" => "/usr/local/lib/ruby/2.5.0/open-uri.rb",
+          "line" => 755,
+          "function" => "buffer_open"
+        }, {
+          "file" => "/GEM_ROOT/gems/activesupport-5.2.1/lib/active_support/dependencies.rb",
+          "line" => 287,
+          "function" => "block in require"
+        }, {
+          "file" => "/GEM_ROOT/gems/activesupport-5.2.1/lib/active_support/dependencies.rb",
+          "line" => 253,
+          "function" => "load_dependency"
+        }, {
+          "file" => "/GEM_ROOT/gems/activesupport-5.2.1/lib/active_support/dependencies.rb",
+          "line" => 287,
+          "function" => "require"
+        }, {
+          "file" => "bin/rails",
+          "line" => 4,
+          "function" => "<main>"
+        }]
+      }],
+      "context" => {
+        "rootDirectory" => "/app",
+        "environment" => "production",
+        "hostname" => "foobar.fail",
+        "severity" => "error",
+        "os" => "x86_64-linux-musl",
+        "language" => "ruby/2.5.3",
+        "notifier" => { "name" => "airbrake-ruby", "version" => "2.12.0" },
+        "component" => "MyComponent",
+        "action" => "MyAction"
+      },
+      "environment" => {
+        "program_name" => "bin/rails"
+      },
+      "session" => {},
+      "params" => {
+        "foo" => "bar",
+        "locale" => "en"
+      },
+      "project_id" => "1"
+    }.with_indifferent_access
 
-  private
+    notice = RedmineAirbrakeBackend::Notice.new(
+      errors:      params[:errors].map { |e| RedmineAirbrakeBackend::Error.new(e) },
+      params:      params[:params],
+      session:     params[:session],
+      context:     params[:context],
+      environment: params[:environment]
+    )
 
-  def prepare_xml(xml_data)
-    xml_data.split("\n").map { |l| l.strip }.join('')
+    assert_equal(1, notice.errors.length)
+    assert_equal('OpenURI::HTTPError', notice.errors.first.type)
+    assert_equal('404 Not Found', notice.errors.first.message)
+    assert_equal('a16abb78bf4b40460258c72cdc971ca0', notice.id)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_airbrake_backend
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Florian Schwab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-03 00:00:00.000000000 Z
+date: 2019-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -86,6 +86,7 @@ files:
 - app/controllers/airbrake_project_settings_controller.rb
 - app/controllers/airbrake_report_controller.rb
 - app/controllers/concerns/airbrake_attachments.rb
+- app/controllers/concerns/airbrake_issue_finding.rb
 - app/controllers/concerns/airbrake_issue_handling.rb
 - app/controllers/concerns/airbrake_rendering.rb
 - app/helpers/airbrake_helper.rb
@@ -135,8 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: This plugin provides the necessary API to use Redmine as a Airbrake backend