redmine_airbrake_backend 1.2.1 → 1.2.2

data/lib/redmine_airbrake_backend/notice.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'redmine_airbrake_backend/error'
 
 module RedmineAirbrakeBackend
@@ -7,32 +9,18 @@ module RedmineAirbrakeBackend
     attr_reader :errors, :params, :session, :context, :environment, :application, :attachments
 
     def initialize(options)
-      # Errors
-      @errors = options[:errors].compact
-
-      # Params
-      @params = options[:params]
-
-      # Session
-      @session = options[:session]
+      # Set instance variables from options
+      instance_variables_from_options(options, %i[errors params session environment application])
+      instance_variables_from_options(options, %i[attachments], ensure_array: true)
 
       # Context
-      @context = options[:context].reject { |k, v| ['notifier'].include?(k) }
-
-      # Environment
-      @environment = options[:environment]
-
-      # Application
-      @application = options[:application]
-
-      # Attachments
-      @attachments = (options[:attachments].presence || []).compact
+      @context = context_from_options(options)
 
       # Environment name
-      @environment_name = options[:context][:environment].presence rescue nil
+      @environment_name = environment_name_from_options(options)
 
       # Type
-      @type = options[:type] || (options[:context][:language].split('/', 2).first.downcase rescue nil)
+      @type = type_from_options(options)
 
       # Error ID
       @id = generate_id
@@ -43,21 +31,49 @@ module RedmineAirbrakeBackend
 
     private
 
+    def instance_variables_from_options(options, keys, opts = {})
+      keys.each do |key|
+        value = options[key]
+
+        value = value.compact if value.is_a?(Array) || value.is_a?(Hash)
+        value = Array(value)  if opts[:ensure_array]
+
+        instance_variable_set("@#{key}", value)
+      end
+    end
+
+    def context_from_options(options)
+      options[:context].reject { |k, _| ['notifier'].include?(k) }
+    end
+
+    def environment_name_from_options(options)
+      return nil if options[:context].blank?
+
+      options[:context][:environment].presence
+    end
+
+    def type_from_options(options)
+      return options[:type] if options[:type].present?
+
+      return nil if options[:context].blank? || options[:context][:language].blank?
+
+      options[:context][:language].strip.split('/', 2).first.downcase
+    end
+
     def generate_id
       Digest::MD5.hexdigest(@errors.map(&:id).join("\n"))
     end
 
     def generate_subject
       error = @errors.first
-      s     = ''
 
-      if error.type.blank? || error.message.starts_with?("#{error.type}:")
-        s = "[#{@id[0..7]}] #{error.message}"
-      else
-        s = "[#{@id[0..7]}] #{error.type}: #{error.message}"
-      end
+      subject = if error.type.blank? || error.message.starts_with?("#{error.type}:")
+                  "[#{@id[0..7]}] #{error.message}"
+                else
+                  "[#{@id[0..7]}] #{error.type}: #{error.message}"
+                end
 
-      s[0..254].strip
+      subject[0..254].strip
     end
   end
 end

data/lib/redmine_airbrake_backend/patches/issue_category.rb

@@ -1,11 +1,16 @@
+# frozen_string_literal: true
+
 require 'active_support/concern'
 
-module RedmineAirbrakeBackend::Patches
-  module IssueCategory
-    extend ActiveSupport::Concern
+module RedmineAirbrakeBackend
+  module Patches
+    # Patches for IssueCategory
+    module IssueCategory
+      extend ActiveSupport::Concern
 
-    included do
-      has_many :airbrake_project_settings, foreign_key: :category_id, dependent: :nullify
+      included do
+        has_many :airbrake_project_settings, foreign_key: :category_id, dependent: :nullify
+      end
     end
   end
 end

data/lib/redmine_airbrake_backend/patches/issue_priority.rb

@@ -1,11 +1,16 @@
+# frozen_string_literal: true
+
 require 'active_support/concern'
 
-module RedmineAirbrakeBackend::Patches
-  module IssuePriority
-    extend ActiveSupport::Concern
+module RedmineAirbrakeBackend
+  module Patches
+    # Patches for IssuePriority
+    module IssuePriority
+      extend ActiveSupport::Concern
 
-    included do
-      has_many :airbrake_project_settings, dependent: :nullify
+      included do
+        has_many :airbrake_project_settings, dependent: :nullify
+      end
     end
   end
 end

data/lib/redmine_airbrake_backend/patches/project.rb

@@ -1,11 +1,16 @@
+# frozen_string_literal: true
+
 require 'active_support/concern'
 
-module RedmineAirbrakeBackend::Patches
-  module Project
-    extend ActiveSupport::Concern
+module RedmineAirbrakeBackend
+  module Patches
+    # Patches for Project
+    module Project
+      extend ActiveSupport::Concern
 
-    included do
-      has_one :airbrake_settings, class_name: AirbrakeProjectSetting.name, dependent: :destroy
+      included do
+        has_one :airbrake_settings, class_name: AirbrakeProjectSetting.name, dependent: :destroy
+      end
     end
   end
 end

data/lib/redmine_airbrake_backend/patches/projects_helper.rb

@@ -1,25 +1,30 @@
+# frozen_string_literal: true
+
 require 'active_support/concern'
 
-module RedmineAirbrakeBackend::Patches
-  module ProjectsHelper
-    extend ActiveSupport::Concern
+module RedmineAirbrakeBackend
+  module Patches
+    # Patches for ProjectsHelper
+    module ProjectsHelper
+      extend ActiveSupport::Concern
 
-    included do
-      alias_method_chain :project_settings_tabs, :airbrake_backend_tab
-    end
+      included do
+        alias_method_chain :project_settings_tabs, :airbrake_backend_tab
+      end
 
-    # add airbrake tab to project settings
-    def project_settings_tabs_with_airbrake_backend_tab
-      tabs = project_settings_tabs_without_airbrake_backend_tab
+      # add airbrake tab to project settings
+      def project_settings_tabs_with_airbrake_backend_tab
+        tabs = project_settings_tabs_without_airbrake_backend_tab
 
-      tabs.push(
+        tabs.push(
           name:    'airbrake',
           action:  :manage_airbrake,
           partial: 'projects/settings/airbrake',
           label:   :project_module_airbrake
         )
 
-      tabs.select { |tab| User.current.allowed_to?(tab[:action], @project) }
+        tabs.select { |tab| User.current.allowed_to?(tab[:action], @project) }
+      end
     end
   end
 end

data/lib/redmine_airbrake_backend/patches/tracker.rb

@@ -1,11 +1,16 @@
+# frozen_string_literal: true
+
 require 'active_support/concern'
 
-module RedmineAirbrakeBackend::Patches
-  module Tracker
-    extend ActiveSupport::Concern
+module RedmineAirbrakeBackend
+  module Patches
+    # Patches for Tracker
+    module Tracker
+      extend ActiveSupport::Concern
 
-    included do
-      has_many :airbrake_project_settings, dependent: :nullify
+      included do
+        has_many :airbrake_project_settings, dependent: :nullify
+      end
     end
   end
 end

data/lib/redmine_airbrake_backend/version.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 module RedmineAirbrakeBackend
   # Version of this gem
-  VERSION = '1.2.1'
+  VERSION = '1.2.2'
 end

data/lib/tasks/test.rake

@@ -1,30 +1,32 @@
+# frozen_string_literal: true
+
 namespace :redmine do
   namespace :airbrake_backend do
     desc 'Runs the plugin tests.'
     task :test do
-      Rake::Task["redmine:airbrake_backend:test:units"].invoke
-      Rake::Task["redmine:airbrake_backend:test:functionals"].invoke
-      Rake::Task["redmine:airbrake_backend:test:integration"].invoke
+      Rake::Task['redmine:airbrake_backend:test:units'].invoke
+      Rake::Task['redmine:airbrake_backend:test:functionals'].invoke
+      Rake::Task['redmine:airbrake_backend:test:integration'].invoke
     end
 
     namespace :test do
       desc 'Runs the plugin unit tests.'
-      Rake::TestTask.new :units => "db:test:prepare" do |t|
-        t.libs << "test"
+      Rake::TestTask.new units: 'db:test:prepare' do |t|
+        t.libs << 'test'
         t.verbose = true
         t.pattern = "#{RedmineAirbrakeBackend.directory}/test/unit/**/*_test.rb"
       end
 
       desc 'Runs the plugin functional tests.'
-      Rake::TestTask.new :functionals => "db:test:prepare" do |t|
-        t.libs << "test"
+      Rake::TestTask.new functionals: 'db:test:prepare' do |t|
+        t.libs << 'test'
         t.verbose = true
         t.pattern = "#{RedmineAirbrakeBackend.directory}/test/functional/**/*_test.rb"
       end
 
       desc 'Runs the plugin integration tests.'
-      Rake::TestTask.new :integration => "db:test:prepare" do |t|
-        t.libs << "test"
+      Rake::TestTask.new integration: 'db:test:prepare' do |t|
+        t.libs << 'test'
         t.verbose = true
         t.pattern = "#{RedmineAirbrakeBackend.directory}/test/integration/**/*_test.rb"
       end

data/redmine_airbrake_backend.gemspec

@@ -1,19 +1,22 @@
-# coding: utf-8
-$LOAD_PATH.push File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
 
 require 'redmine_airbrake_backend/version'
 
 Gem::Specification.new do |spec|
+  spec.required_ruby_version = '>= 2.4.0'
+
   spec.name          = 'redmine_airbrake_backend'
   spec.version       = RedmineAirbrakeBackend::VERSION
   spec.authors       = ['Florian Schwab']
   spec.email         = ['me@ydkn.de']
-  spec.description   = %q(Plugin which adds Airbrake support to Redmine)
-  spec.summary       = %q(This plugin provides the necessary API to use Redmine as a Airbrake backend)
-  spec.homepage      = 'https://github.com/ydkn/redmine_airbrake_backend'
+  spec.description   = 'Plugin which adds Airbrake support to Redmine'
+  spec.summary       = 'This plugin provides the necessary API to use Redmine as a Airbrake backend'
+  spec.homepage      = 'https://gitlab.com/ydkn/redmine_airbrake_backend'
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
@@ -21,4 +24,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rubocop'
 end

data/test/unit/notice_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper', __FILE__)
+require File.expand_path('../test_helper', __dir__)
 
 class NoticeTest < ActiveSupport::TestCase
   test 'parse' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_airbrake_backend
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Florian Schwab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-29 00:00:00.000000000 Z
+date: 2018-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Plugin which adds Airbrake support to Redmine
 email:
 - me@ydkn.de
@@ -60,6 +74,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".gitlab-ci.yml"
+- ".rubocop.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -69,6 +85,9 @@ files:
 - app/controllers/airbrake_notice_controller.rb
 - app/controllers/airbrake_project_settings_controller.rb
 - app/controllers/airbrake_report_controller.rb
+- app/controllers/concerns/airbrake_attachments.rb
+- app/controllers/concerns/airbrake_issue_handling.rb
+- app/controllers/concerns/airbrake_rendering.rb
 - app/helpers/airbrake_helper.rb
 - app/models/airbrake_project_setting.rb
 - app/views/airbrake/issue_description/_section.erb
@@ -97,7 +116,7 @@ files:
 - redmine_airbrake_backend.gemspec
 - test/test_helper.rb
 - test/unit/notice_test.rb
-homepage: https://github.com/ydkn/redmine_airbrake_backend
+homepage: https://gitlab.com/ydkn/redmine_airbrake_backend
 licenses:
 - MIT
 metadata: {}
@@ -109,7 +128,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -117,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: This plugin provides the necessary API to use Redmine as a Airbrake backend