ndr_error 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddda046dd4b73629785aa7cd51d72348ca08c302
-  data.tar.gz: 181739df73555edf394803a07140889732154e4f
+  metadata.gz: 18c4994bc7ec7b91eb2c3a2d60a6db73cbc054d8
+  data.tar.gz: a9b52f7802cd09c0468154a3598c904b7a12cf82
 SHA512:
-  metadata.gz: d860f1e9cde5543eb53ee3e22236e781c91c2933abfc1a693560545e5cf5d0a74cbc961c3bb2113ed22ada2d7dc4d1688fcd46828b2e921ff3a45cc603d076d6
-  data.tar.gz: 30eb0b7d57d45f4827b85db658dd8bb01d54dd6f592bcbc632f833020e22a45d2573c9b012875d50c595bb73cbe0c42e75df6af29cf07be8d886aab86a6e20dd
+  metadata.gz: 21698703d3cd2e149b9826420b074f1bfce832da87d22519fca7f801eafebd5a1f5cdaa9819b96683c54bbcf62cb716c7b9dc5ce751cfd4f4545ebb14edeebc2
+  data.tar.gz: 8e9c013e9fb0e5e17bc96011281e0358937820c5d3b72c901bd2a09592a75f16d4becc27288baa93efebe1f6aa6a084bdf2950a60488f8e3ad6f0b1074682608

data/app/assets/stylesheets/ndr_error/bootstrap/_bootstrap-sprockets.scss

@@ -0,0 +1,13 @@
+@function twbs-font-path($path) {
+  @return font-path($path);
+}
+
+@function twbs-image-path($path) {
+  @return image-path($path);
+}
+
+// Use the above functions where required:
+$bootstrap-sass-asset-helper: true;
+
+// Look for fonts in the ndr_error namespace:
+$icon-font-path: 'ndr_error/bootstrap/';

data/app/assets/stylesheets/ndr_error/bootstrap/_glyphicons.scss

@@ -1,7 +1,3 @@
-//= depend_on "bootstrap/glyphicons-halflings-regular.eot"
-//= depend_on "bootstrap/glyphicons-halflings-regular.svg"
-//= depend_on "bootstrap/glyphicons-halflings-regular.ttf"
-//= depend_on "bootstrap/glyphicons-halflings-regular.woff"
 //
 // Glyphicons for Bootstrap
 //

data/app/assets/stylesheets/ndr_error/bootstrap/_variables.scss

@@ -1,7 +1,3 @@
-// a flag to toggle asset pipeline / compass integration
-// defaults to true if twbs-font-path function is present (no function => twbs-font-path('') parsed as string == right side)
-// in Sass 3.3 this can be improved with: function-exists(twbs-font-path)
-$bootstrap-sass-asset-helper: (twbs-font-path("") != unquote('twbs-font-path("")')) !default;
 //
 // Variables
 // --------------------------------------------------

data/app/assets/stylesheets/ndr_error/bootstrap/bootstrap.scss

@@ -1,3 +1,6 @@
+// First thing: Ensure asset pipeline compatibility:
+@import "bootstrap-sprockets.scss";
+
 // Core variables and mixins
 @import "variables";
 @import "mixins";

data/app/controllers/ndr_error/errors_controller.rb

@@ -14,17 +14,13 @@ module NdrError
     end
 
     def show
-      @error =
-        if (id = params[:log_id])
-          @fingerprint.error_logs.find(id)
-        else
-          @fingerprint.error_logs.first
-        end
+      logs   = @fingerprint.error_logs.not_deleted
+      @error = (id = params[:log_id]) ? logs.find_by(error_logid: id) : logs.first
 
-      return unless @error.nil?
-
-      flash[:error] = 'No matching Logs exist for that Fingerprint!'
-      redirect_to error_fingerprints_url(q: @fingerprint.to_param)
+      if @error.nil?
+        flash[:error] = 'No matching Logs exist for that Fingerprint!'
+        redirect_to error_fingerprints_url(q: @fingerprint.to_param)
+      end
     end
 
     def edit

data/app/helpers/ndr_error/errors_helper.rb

@@ -3,7 +3,7 @@ module NdrError
   module ErrorsHelper
     def search_matches(string, keywords)
       return string if keywords.blank?
-      highlight(string, keywords, highlighter: '<strong class="text-danger">\1</strong>')
+      highlight(string.to_s, keywords, highlighter: '<strong class="text-danger">\1</strong>')
     end
 
     def highlighted_trace_for(error)
@@ -81,7 +81,7 @@ module NdrError
     def previous_button_for(error)
       css = 'btn btn-default'
       css << ' disabled' if error.nil?
-      text = glyphicon_tag('chevron-left') + h('previous occurrence')
+      text = glyphicon_tag('chevron-left') + h('Previous Occurrence')
       path = error.nil? ? '#' : error_fingerprint_path(error.error_fingerprint, log_id: error)
 
       link_to(text, path, class: css)
@@ -90,7 +90,7 @@ module NdrError
     def next_button_for(error)
       css = 'btn btn-default'
       css << ' disabled' if error.nil?
-      text = h('next occurrence') + glyphicon_tag('chevron-right')
+      text = h('Next Occurrence') + glyphicon_tag('chevron-right')
       path = error.nil? ? '#' : error_fingerprint_path(error.error_fingerprint, log_id: error)
 
       link_to(text, path, class: css)

data/app/models/ndr_error/fingerprint.rb

@@ -7,15 +7,16 @@ module NdrError
     self.primary_key = 'error_fingerprintid'
 
     has_many :error_logs,
+             -> { latest_first },
              autosave:    true,
              class_name:  'NdrError::Log',
              foreign_key: 'error_fingerprintid'
 
     validate :ensure_ticket_url_matched_a_supplied_format
 
-    default_scope do
+    scope :latest_first, lambda {
       order("#{table_name}.updated_at DESC, #{table_name}.error_fingerprintid DESC")
-    end
+    }
 
     def self.filter_by_keywords(keywords)
       md5_match = keywords.map do |part|
@@ -73,7 +74,7 @@ module NdrError
     # have been loaded by rails internally
     # and won't have default scoping applied.
     def first_occurrence
-      @_first ||= error_logs.reload.last
+      error_logs.last
     end
 
     # Returns the record corresponding to the
@@ -82,7 +83,7 @@ module NdrError
     # have been loaded by rails internally
     # and won't have default scoping applied.
     def latest_occurrence
-      @_latest ||= error_logs.reload.first
+      error_logs.first
     end
   end
 end

data/app/models/ndr_error/log.rb

@@ -19,10 +19,10 @@ module NdrError
                class_name:  'NdrError::Fingerprint',
                foreign_key: 'error_fingerprintid'
 
-    default_scope do
-      scope = where("(status is null) or (status not like 'deleted%')")
-      scope.order('created_at DESC, error_logid DESC')
-    end
+    scope :deleted,     -> { where("status like 'deleted%'") }
+    scope :not_deleted, -> { where("(status is null) or (status not like 'deleted%')") }
+
+    scope :latest_first, -> { order('created_at DESC, error_logid DESC') }
 
     validates :error_fingerprintid, presence: true
     validates :description, presence: true
@@ -50,21 +50,12 @@ module NdrError
       where(name_match)
     end
 
-    # Make explicit when circumventing the default scope
-    def self.including_deleted_logs(&block)
-      unscoped(&block)
-    end
-
     # Deletes all those errors that have been flagged for
     # deletion and whose soft-delete grace period has ended.
     #
     # Returns true if any records were deleted.
     def self.perform_cleanup!
-      records = including_deleted_logs do
-        where("status like 'deleted%'")
-      end
-
-      destroys = records.map do |record|
+      destroys = deleted.map do |record|
         stamp_string = record.status.sub(/^[^\d]+/, '')
         record.destroy if Time.zone.parse(stamp_string) < NdrError.log_grace_period.ago
       end
@@ -75,7 +66,7 @@ module NdrError
     # Finds gets all errors that share an MD5 hash
     # (including _error_).
     def self.similar_to(error)
-      error.error_fingerprint.error_logs
+      error.error_fingerprint.error_logs.not_deleted
     end
 
     # Gets similar errors.

data/app/views/layouts/ndr_error/ndr_error.html.erb

@@ -26,7 +26,7 @@
 </div>
 
 <div class="container">
-  <div class="row">
+  <div>
     <% if flash[:notice] %>
       <div class="alert alert-info"><%= flash[:notice] %></div>
     <% end %>

data/app/views/ndr_error/errors/show.html.erb

@@ -1,4 +1,4 @@
-<div class="container">
+<div>
   <div class="pull-right">
     <div class="btn-group">
       <%= ticket_link_for(@fingerprint) if @fingerprint.ticket_url.present? %>
@@ -14,7 +14,7 @@
 
       <div class="btn-group">
         <a class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#">
-          <%= pluralize(@error.similar_errors.length, 'similar error') %> stored
+          <%= pluralize(@error.similar_errors.length, 'Similar Error') %> Stored
           <span class="caret"></span>
         </a>
         <ul class="dropdown-menu">

data/db/migrate/20150918162403_create_error_fingerprints.rb

@@ -1,5 +1,5 @@
 # Adds complete ERROR_FINGERPRINT table to schema
-class CreateErrorFingerprints < ActiveRecord::Migration
+class CreateErrorFingerprints < NdrError.migration_class
   def change
     create_table :error_fingerprints, id: false do |t|
       t.string :error_fingerprintid, primary_key: true

data/db/migrate/20150918162612_create_error_logs.rb

@@ -1,5 +1,5 @@
 # Adds partial ERROR_LOG table to schema (see README).
-class CreateErrorLogs < ActiveRecord::Migration
+class CreateErrorLogs < NdrError.migration_class
   def change
     create_table :error_logs, id: false do |t|
       t.string :error_logid, primary_key: true

data/lib/ndr_error/finder.rb

@@ -2,14 +2,14 @@ module NdrError
   # Module to help with searching through fingerprints / logs.
   module Finder
     def search(keywords)
-      scope = Fingerprint.includes(:error_logs)
+      scope = Fingerprint.latest_first
       return scope unless keywords && keywords.any?
 
       # Fetch the collection of fingerprint matches:
       records = scope.filter_by_keywords(keywords).to_a
 
       # Add to that fingerprints with log records that matched the search:
-      log_print_ids = Log.filter_by_keywords(keywords).pluck(:error_fingerprintid)
+      log_print_ids = Log.not_deleted.filter_by_keywords(keywords).pluck(:error_fingerprintid)
       records.concat scope.find(log_print_ids)
 
       order(records)

data/lib/ndr_error/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 # Contains the version of NdrError. Sourced by the gemspec.
 module NdrError
-  VERSION = '1.1.2'.freeze
+  VERSION = '1.1.3'.freeze
 end

data/lib/ndr_error.rb

@@ -89,4 +89,12 @@ module NdrError
   def self.table_name_prefix
     'error_'
   end
+
+  # Rails 5 uses versioned migrations (required as of 5.1). This helper method returns an
+  # appropriate migration superclass for the Rails version of the host application. Note that the
+  # 4.2 compatability layer is targetted since all the bundled migrations were written prior to
+  # Rails 5.
+  def self.migration_class
+    Rails::VERSION::MAJOR < 5 ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_error
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-10 00:00:00.000000000 Z
+date: 2017-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -19,7 +19,7 @@ dependencies:
         version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
@@ -189,6 +189,7 @@ files:
 - app/assets/javascripts/ndr_error/ndr_error.js
 - app/assets/stylesheets/ndr_error/bootstrap/_alerts.scss
 - app/assets/stylesheets/ndr_error/bootstrap/_badges.scss
+- app/assets/stylesheets/ndr_error/bootstrap/_bootstrap-sprockets.scss
 - app/assets/stylesheets/ndr_error/bootstrap/_breadcrumbs.scss
 - app/assets/stylesheets/ndr_error/bootstrap/_button-groups.scss
 - app/assets/stylesheets/ndr_error/bootstrap/_buttons.scss
@@ -301,7 +302,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Rails exception logging