Merge pull request #702 from brianvanburken/refactoring

Legibility improvement on ErrorReport

Merge pull request #702 from brianvanburken/refactoring
Legibility improvement on ErrorReport
Stephen Crosby
2 parents d8135392 bb860a2c
Showing 1 changed file with 24 additions and 24 deletions Show diff stats
app/models/error_report.rb
@@ -15,15 +15,18 @@ require &#39;hoptoad_notifier&#39;
 # * <tt>:notifier</tt> - information to identify the source of the error report
 #
 class ErrorReport
-  attr_reader :error_class, :message, :request, :server_environment, :api_key, :notifier, :user_attributes, :framework
+  attr_reader :error_class, :message, :request, :server_environment, :api_key,
+              :notifier, :user_attributes, :framework, :notice
   cattr_accessor :fingerprint_strategy do
     Fingerprint
   end
   def initialize(xml_or_attributes)
-    @attributes = (xml_or_attributes.is_a?(String) ? Hoptoad.parse_xml!(xml_or_attributes) : xml_or_attributes).with_indifferent_access
-    @attributes.each{|k, v| instance_variable_set(:"@#{k}", v) }
+    @attributes = xml_or_attributes
+    @attributes = Hoptoad.parse_xml!(@attributes) if @attributes.is_a? String
+    @attributes = @attributes.with_indifferent_access
+    @attributes.each { |k, v| instance_variable_set(:"@#{k}", v) }
   end
   def rails_env
@@ -33,30 +36,29 @@ class ErrorReport
   end
   def app
-    @app ||= App.where(:api_key => api_key).first
+    @app ||= App.where(api_key: api_key).first
   end
   def backtrace
-    @normalized_backtrace ||= Backtrace.find_or_create(:raw => @backtrace)
+    @normalized_backtrace ||= Backtrace.find_or_create(raw: @backtrace)
   end
   def generate_notice!
     return unless valid?
     return @notice if @notice
     @notice = Notice.new(
-      :message => message,
-      :error_class => error_class,
-      :backtrace_id => backtrace.id,
-      :request => request,
-      :server_environment => server_environment,
-      :notifier => notifier,
-      :user_attributes => user_attributes,
-      :framework => framework
+      message: message,
+      error_class: error_class,
+      backtrace_id: backtrace.id,
+      request: request,
+      server_environment: server_environment,
+      notifier: notifier,
+      user_attributes: user_attributes,
+      framework: framework
     )
     error.notices << @notice
     @notice
   end
-  attr_reader :notice
   ##
   # Error associate to this error_report
@@ -66,23 +68,22 @@ class ErrorReport
   # @return [ Error ]
   def error
     @error ||= app.find_or_create_err!(
-      :error_class => error_class,
-      :environment => rails_env,
-      :fingerprint => fingerprint
+      error_class: error_class,
+      environment: rails_env,
+      fingerprint: fingerprint
     )
   end
   def valid?
-    !!app
+    app.present?
   end
   def should_keep?
     app_version = server_environment['app-version'] || ''
-    if self.app.current_app_version.present? && ( app_version.length <= 0 || Gem::Version.new(app_version) < Gem::Version.new(self.app.current_app_version) )
-      false
-    else
-      true
-    end
+    current_version = app.current_app_version
+    return true unless current_version.present?
+    return false if app_version.length <= 0
+    Gem::Version.new(app_version) >= Gem::Version.new(current_version)
   end
   private
@@ -90,5 +91,4 @@ class ErrorReport
   def fingerprint
     @fingerprint ||= fingerprint_strategy.generate(notice, api_key)
   end
-
 end