redmine_airbrake_backend 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5926fca2b10cfdf572494c9891adc633b583bbdb
-  data.tar.gz: 0dc91282b47937a48254ff1e3da0fbd4b555c0be
+  metadata.gz: 3e6852a17538390388bc5c1520c1b3c2eabf0b89
+  data.tar.gz: bd290d4558c8b9e30ef701345bc19c6d146b4637
 SHA512:
-  metadata.gz: 58cfc22082b4c0098a5c756d915401fe334a3346c55541038b21fcd500978f5646ab7627234b5eb882f00561df2bbc28569de2b3c2976d1708c31857a59036ad
-  data.tar.gz: 71de8ff6c61f7894afbafb4a763cef7402651beaac638f0756839a140fdc877c0ba7f6cc0466b5f39883b39460472ddd1531d968a37599b2aaaf772bd5c589ff
+  metadata.gz: 53fe81a2ff23a5d751e0877b3289667a26120574e23c7f128af98b3c1ab609d7ddc7eff83227bdb412b36251c58bf5d91b840704f9c5808968d124fee249fdf6
+  data.tar.gz: 21143a051e41b0da6f87ee20f14ffa5dad949c7cefa7a60e304a89183e651f6f771d0fcc37866516813a1ff95d291480a97d22d89ce7eb37d86f7e33be79c4ae

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.1.1 (2016-05-18)
+### Fixes
+  - Add missing foreign_key option on issue category has many relation. Caused error on removing issue category
+
 ## 1.1.0 (2016-01-29)
 ### Fixes
   - Handle new ruby lambda backtrace syntax

data/app/controllers/airbrake_controller.rb

@@ -1,17 +1,21 @@
 require 'tempfile'
 require 'redmine_airbrake_backend/notice'
 
-
 # Controller with airbrake related stuff
 class AirbrakeController < ::ApplicationController
   class InvalidRequest < StandardError; end
 
   skip_before_action :verify_authenticity_token
 
-  prepend_before_action :load_records
   prepend_before_action :parse_key
   prepend_before_action :find_project
+
   before_action :authorize
+  before_action :find_tracker
+  before_action :find_category
+  before_action :find_priority
+  before_action :find_assignee
+  before_action :find_repository
 
   after_action :cleanup_tempfiles
 
@@ -24,31 +28,34 @@ class AirbrakeController < ::ApplicationController
   end
 
   def parse_key
-    @key = JSON.parse(params[:key]).symbolize_keys rescue nil
+    @key = JSON.parse(params[:key]).with_indifferent_access rescue nil
 
     # API key
     invalid_request!('No or invalid API key') if @key.blank? || @key[:key].blank?
     params[:key] = @key[:key]
   end
 
-  def load_records
-    # Tracker
+  def find_tracker
     @tracker = record_for(@project.trackers, :tracker)
     invalid_request!('No or invalid tracker') if @tracker.blank?
 
-    # Notice ID field
+    # Check notice ID field
     invalid_request!('Custom field for notice hash not available on selected tracker') if @tracker.custom_fields.find_by(id: notice_hash_field.id).blank?
+  end
 
-    # Category
+  def find_category
     @category = record_for(@project.issue_categories, :category)
+  end
 
-    # Priority
+  def find_priority
     @priority = record_for(IssuePriority, :priority) || IssuePriority.default
+  end
 
-    # Assignee
+  def find_assignee
     @assignee = record_for(@project.users, :assignee, [:id, :login])
+  end
 
-    # Repository
+  def find_repository
     @repository = @project.repositories.find_by(identifier: (@key[:repository] || ''))
   end
 

data/app/controllers/airbrake_project_settings_controller.rb

@@ -6,13 +6,7 @@ class AirbrakeProjectSettingsController < ::ApplicationController
   menu_item :settings
 
   def update
-    @airbrake_project_setting.tracker_id                = params[:airbrake_project_setting][:tracker_id]
-    @airbrake_project_setting.category_id               = params[:airbrake_project_setting][:category_id]
-    @airbrake_project_setting.priority_id               = params[:airbrake_project_setting][:priority_id]
-    @airbrake_project_setting.reopen_regexp             = params[:airbrake_project_setting][:reopen_regexp]
-    @airbrake_project_setting.reopen_repeat_description = params[:airbrake_project_setting][:reopen_repeat_description]
-
-    if @airbrake_project_setting.save
+    if @airbrake_project_setting.update(airbrake_project_setting_params)
       flash[:notice] = l(:notice_successful_update)
     end
 
@@ -29,4 +23,8 @@ class AirbrakeProjectSettingsController < ::ApplicationController
     @airbrake_project_setting = @project.airbrake_settings || AirbrakeProjectSetting.new
     @airbrake_project_setting.project = @project
   end
+
+  def airbrake_project_setting_params
+    params.require(:airbrake_project_setting).permit(:tracker_id, :category_id, :priority_id, :reopen_regexp, :reopen_repeat_description)
+  end
 end

data/app/controllers/airbrake_report_controller.rb

@@ -1,6 +1,5 @@
 require 'redmine_airbrake_backend/ios_report'
 
-
 # Controller for airbrake reports
 class AirbrakeReportController < ::AirbrakeController
   accept_api_auth :ios_reports

data/app/helpers/airbrake_helper.rb

@@ -18,7 +18,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
 
@@ -55,6 +55,10 @@ module AirbrakeHelper
     markup + " in ??<notextile>#{element.function}</notextile>??"
   end
 
+  def airbrake_render_section(data, section)
+    render partial: 'airbrake/issue_description/section', locals: { data: data, section: section }
+  end
+
   private
 
   def airbrake_repository_for_backtrace_element(element)

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

@@ -0,0 +1,3 @@
+h2. <%= section %>
+
+<%= airbrake_format_table(data) %>

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

@@ -17,29 +17,13 @@ h2. Application:
 <% end %>
 
 
-<% if notice.params.present? %>
-h2. Parameters:
-
-<%= airbrake_format_table(notice.params) %>
-<% end %>
-
-
-<% if notice.session.present? %>
-h2. Session
-
-<%= airbrake_format_table(notice.session) %>
-<% end %>
+<%= airbrake_render_section(notice.params, 'Parameters') %>
 
 
-<% if notice.context.present? %>
-h2. Context
+<%= airbrake_render_section(notice.session, 'Session') %>
 
-<%= airbrake_format_table(notice.context) %>
-<% end %>
 
+<%= airbrake_render_section(notice.context, 'Context') %>
 
-<% if notice.environment.present? %>
-h2. Environment
 
-<%= airbrake_format_table(notice.environment) %>
-<% end %>
+<%= airbrake_render_section(notice.environment, 'Environment') %>

data/lib/redmine_airbrake_backend/backtrace_element.rb

@@ -1,6 +1,5 @@
 require 'digest/md5'
 
-
 module RedmineAirbrakeBackend
   # Backtrace element received by airbrake
   class BacktraceElement

data/lib/redmine_airbrake_backend/error.rb

@@ -1,7 +1,6 @@
 require 'digest/md5'
 require 'redmine_airbrake_backend/backtrace_element'
 
-
 module RedmineAirbrakeBackend
   # Error received by airbrake
   class Error

data/lib/redmine_airbrake_backend/ios_report.rb

@@ -1,6 +1,5 @@
 require 'redmine_airbrake_backend/notice'
 
-
 module RedmineAirbrakeBackend
   # iOS Report received by airbrake
   class IosReport < Notice

data/lib/redmine_airbrake_backend/notice.rb

@@ -1,6 +1,5 @@
 require 'redmine_airbrake_backend/error'
 
-
 module RedmineAirbrakeBackend
   # Notice received by airbrake
   class Notice

data/lib/redmine_airbrake_backend/patches/issue_category.rb

@@ -5,7 +5,7 @@ module RedmineAirbrakeBackend::Patches
     extend ActiveSupport::Concern
 
     included do
-      has_many :airbrake_project_settings, dependent: :nullify
+      has_many :airbrake_project_settings, foreign_key: :category_id, dependent: :nullify
     end
   end
 end

data/lib/redmine_airbrake_backend/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_airbrake_backend
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Florian Schwab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2016-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -71,6 +71,7 @@ files:
 - app/controllers/airbrake_report_controller.rb
 - app/helpers/airbrake_helper.rb
 - app/models/airbrake_project_setting.rb
+- app/views/airbrake/issue_description/_section.erb
 - app/views/airbrake/issue_description/default.erb
 - app/views/projects/settings/_airbrake.html.erb
 - app/views/settings/_airbrake.html.erb