exception_notification_server 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b1a9b32025e7310064da7e1af6dd5b89a7be29b
-  data.tar.gz: e60b53ecc73a96ae53f430aeac97c76f530d95d0
+  metadata.gz: ff6c4b7d7d6d97d6904d24ee91605c7e5c14b2b6
+  data.tar.gz: db3b49e19a0f56b3c96ad6a6360bf7e73c87600a
 SHA512:
-  metadata.gz: e30a714c2c40b7f0c443176fd5df8b019786793b3b51e2ef9863082697d297ecd1648c68f07bf002cdc3baaf0b4bef600067a4fea27f55647c5475c3981fd5fc
-  data.tar.gz: 52eaf7c726a26ebf863f63875f4c8c211d22a6c0b3cacbd3b9941eaab497a4bee183cee7491737186866fb9762cbcfbbc383847967e79aee9198197d2fceb0b5
+  metadata.gz: 49d28e04e01f321f6d40c0325bd4f9846b965f58a1264e484cdd4438544692e64b11e9990c4eb563cb21bd2c48dbc19374c3f268a78bc5bbbddda1163cfd8857
+  data.tar.gz: 933ace4582c0c80ddbd9597728c92c9248542b21200d12e0e5f859339800fa6d29ffbf7663914e72d113a4e76dbef4383ac7e107c1a5bbb80765b2a99ba4203a

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/app/assets/javascripts/exception_notification_server/pages/notifications.js.coffee

@@ -1,3 +1,17 @@
+@initialize_links = ->
+  $('.actions a').on 'click', (e)->
+    e.preventDefault()
+    e.stopPropagation()
+    ids = $("input[type='checkbox'][name='ids[]']").serializeArray().map((item)-> item.value)
+    return if ids.length == 0
+    $.ajax
+      url: $(this).attr('href')
+      type: $(this).data('ajax-method') || 'put'
+      dataType: 'json'
+      data:
+        ids: ids
+      success: ->
+        $('.filter form').trigger('submit.rails')
 $ ->
   $('body.notifications_show').each ->
     options =
@@ -11,5 +25,9 @@ $ ->
       xaxis:
         mode: 'time',
         timeformat: "%m/%d/%y",
-        tickSize: [7, "day"],
+        tickSize: [7, 'day'],
     $('.graph').plot([$('.graph').data('values')], options)
+  $('body.notifications_index').each ->
+    initialize_links()
+    $(document).on 'change', "input[type='checkbox'][name='ids-select-all']", ->
+      $("input[type='checkbox'][name='ids[]']").prop('checked', $(this).prop('checked'))

data/app/controllers/exception_notification_server/notifications_controller.rb

@@ -4,11 +4,11 @@ module ExceptionNotificationServer
                                  password: ExceptionNotificationServer.configuration.password, only: :create
     respond_to :html, :json, :js
 
-    before_filter :load_notification, only: [:show, :update, :investigate, :fix, :renew]
+    before_filter :load_notification, only: [:show, :update]
     skip_before_filter :redirect_to_root, only: [:create]
 
     def index
-      params[:env] ||= Rails.env
+      params[:env] ||= 'all'
       params[:status] ||= :new
       @notifications = Notification.base_notifications(params[:status])
                        .application(params[:application])
@@ -18,7 +18,6 @@ module ExceptionNotificationServer
                        .group('"exception_notification_server_notifications"."id"')
                        .order('count(ensn.id) DESC')
                        .paginate(page: params[:page], per_page: 10)
-      # .where('last month')
       respond_with @notifications
     end
 
@@ -35,29 +34,24 @@ module ExceptionNotificationServer
     end
 
     def update
-      @notification.send("update#{'_recursive' if params[:recursive]}", notification_params_update)
+      update_notification(@notification, notification_params_update, params[:recursive])
       respond_with @notification
     end
 
     def investigate
-      params[:recursive] = true
-      params[:notification] ||= {}
-      params[:notification][:status] = :investigating
-      update
+      notifications_actions { |notification| update_notification(notification, { status: :investigating }, true) }
     end
 
     def fix
-      params[:recursive] = true
-      params[:notification] ||= {}
-      params[:notification][:status] = :fixed
-      update
+      notifications_actions { |notification| update_notification(notification, { status: :fixed }, true) }
     end
 
     def renew
-      params[:recursive] = true
-      params[:notification] ||= {}
-      params[:notification][:status] = :new
-      update
+      notifications_actions { |notification| update_notification(notification, { status: :new }, true) }
+    end
+
+    def destroy
+      notifications_actions(&:destroy_recursive)
     end
 
     protected
@@ -93,5 +87,17 @@ module ExceptionNotificationServer
     def notification_params_update
       params.require(:notification).permit!
     end
+
+    def update_notification(notification, notification_params = notification_params_update, recursive = true)
+      notification.send("update#{'_recursive_all' if recursive}", notification_params)
+      notification.remove_data if recursive && notification_params[:status] == :fixed
+      notification.recover_data if recursive && notification_params[:status] == :new && notification.status == 'fixed'
+    end
+
+    def notifications_actions(&block)
+      notications = Notification.where(id: params[:ids] || params[:id])
+      notications.each(&block)
+      params[:id] && notications.first ? respond_with(notications.first) : respond_with({}, location: root_path)
+    end
   end
 end

data/app/helpers/exception_notification_server/application_helper.rb

@@ -18,7 +18,7 @@ module ExceptionNotificationServer
     end
 
     def environment_options(options)
-      default_environment = %w(production staging development test)
+      default_environment = %w(all production staging development test)
       options_for_select((default_environment + Notification.group(:env).pluck(:env)).uniq.map { |env| [env.humanize, env] }, options[:selected])
     end
 

data/app/models/exception_notification_server/notification.rb

@@ -15,7 +15,7 @@ module ExceptionNotificationServer
       scope "#{status}_notifications", -> { where(status: status) }
     end
     scope :application, ->(application = nil) { application.present? ? where(application: application) : all }
-    scope :env, ->(env = nil) { where(env: env || Rails.env) }
+    scope :env, ->(env = nil) { env == 'all' ? all : where(env: env || Rails.env) }
 
     before_create do
       self.status = :new
@@ -45,10 +45,29 @@ module ExceptionNotificationServer
     end
 
     def update_recursive(updates)
-      base_id = parent_id || id
+      Notification.where(parent_id: base_id).update_all(updates) if base_id.present?
+    end
+
+    def update_recursive_all(updates)
       Notification.where(arel_table[:id].eq(base_id).or(arel_table[:parent_id].eq(base_id))).update_all(updates) if base_id.present?
     end
 
+    # Those 4 fields can contain a lot of information (like 0.22mb), so we wanna decrease it by removing this info from children notification.
+    # I think it is enough to have this info in base notification.
+    def remove_data
+      update_recursive(data: nil, request: nil, session: nil, environment: nil)
+    end
+
+    # We recover information from base notification. Better solution is just use base info but i wanna divide notifications.
+    def recover_data
+      base_notification = Notification.find(base_id)
+      update_recursive(data: base_notification.data, request: base_notification.request, session: base_notification.session, environment: base_notification.environment)
+    end
+
+    def destroy_recursive
+      Notification.where(arel_table[:id].eq(base_id).or(arel_table[:parent_id].eq(base_id))).delete_all if base_id.present?
+    end
+
     protected
 
     def graph_data(from)
@@ -65,5 +84,9 @@ module ExceptionNotificationServer
     def gen_exception_hash
       Digest::SHA1.hexdigest("#{application}#{exception_class}#{exception_message}#{backtrace.to_s.gsub(rails_root, '')}")
     end
+
+    def base_id
+      parent_id || id
+    end
   end
 end

data/app/views/exception_notification_server/notifications/_notifications.html.haml

@@ -2,10 +2,13 @@
   count = local_assigns.fetch :count, true
   last_time = local_assigns.fetch :last_time, true
   env = local_assigns.fetch :env, false
+  checkbox = local_assigns.fetch :checkbox, false
 %table
   %thead
     %tr
       %th
+      - if checkbox
+        %th= check_box_tag 'ids-select-all', 'select-all'
       %th.hide-md Class
       %th Message
       %th.hide-md.hide-lg{style: 'width: 100px'} Server
@@ -22,6 +25,8 @@
     - notifications.each do |notification|
       %tr
         %td= link_to notification.id, notification_path(notification)
+        - if checkbox
+          %td= check_box_tag 'ids[]', notification.id
         %td.hide-md= link_to notification.exception_class, notification_path(notification)
         %td= link_to notification.exception_message, notification_path(notification)
         %td.hide-md.hide-lg= link_to notification.server, notification_path(notification)

data/app/views/exception_notification_server/notifications/index.html.haml

@@ -3,5 +3,10 @@
     = select_tag :status, status_options(selected: params[:status]), onchange: '$(this.form).trigger(\'submit.rails\')'
     = select_tag :application, application_options(selected: params[:application]), prompt: 'All', onchange: '$(this.form).trigger(\'submit.rails\')'
     = select_tag :env, environment_options(selected: params[:env]), onchange: '$(this.form).trigger(\'submit.rails\')'
-= render partial: 'exception_notification_server/notifications/notifications', object: @notifications, as: :notifications
+.actions
+  = link_to 'Investigate', investigate_notifications_path, data: {ajax_method: :put}
+  = link_to 'Fix', fix_notifications_path, data: {ajax_method: :put}
+  = link_to 'Renew', renew_notifications_path, data: {ajax_method: :put}
+  = link_to 'Destroy', notifications_path, data: {ajax_method: :delete}
+= render partial: 'exception_notification_server/notifications/notifications', object: @notifications, as: :notifications, locals: {env: true, checkbox: true}
 = will_paginate @notifications, remote: true

data/app/views/exception_notification_server/notifications/index.js.haml

@@ -1,2 +1,3 @@
-$('body > .content').html("#{escape_javascript( render file: 'exception_notification_server/notifications/index', layout: false, formats: [:html] )}");
+$('body > .content').html("#{escape_javascript( render file: 'exception_notification_server/notifications/index', layout: false, formats: [:html], locals: {env: true, checkbox: true} )}");
 initialize_sparkline();
+initialize_links();

data/app/views/exception_notification_server/notifications/show.html.haml

@@ -2,6 +2,7 @@
   = link_to 'Investigate', investigate_notification_path, data: {method: :put} if @notification.status.to_sym == :new
   = link_to 'Fix', fix_notification_path, data: {method: :put} if @notification.status.to_sym == :investigating
   = link_to 'Renew', renew_notification_path, data: {method: :put} if @notification.status.to_sym == :fixed
+  = link_to 'Destroy', notification_path, data: {method: :delete}
 .graphic
   %h3 Last 3 month count:
   .graph{data: {values: @notification.similar_count_flot.to_json}}

data/config/routes.rb

@@ -1,10 +1,16 @@
 ExceptionNotificationServer::Engine.routes.draw do
-  resources :notifications, only: [:index, :create, :show, :update] do
+  resources :notifications, only: [:index, :create, :show, :update, :destroy] do
     member do
       put :investigate
       put :fix
       put :renew
     end
+    collection do
+      put :investigate
+      put :fix
+      put :renew
+      delete :destroy
+    end
   end
   root to: 'notifications#index'
 end

data/exception_notification_server.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
   s.require_paths = ['lib']
   s.authors = ['Anatoliy Varanitsa']
-  s.date = '2015-10-15'
+  s.date = '2015-10-19'
   s.description = 'Gem that receive errors from exception_notification gem and show it grouped on pages'
   s.email = 'Prizrack13@mail.ru'
   s.extra_rdoc_files = [

data/lib/exception_notification_server/version.rb

@@ -1,3 +1,3 @@
 module ExceptionNotificationServer
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/readme.md

@@ -1,5 +1,60 @@
-gem install exception_notification_server
+# Exception Notification Server
 
+**THIS README IS FOR THE MASTER BRANCH AND REFLECTS THE WORK CURRENTLY EXISTING ON THE MASTER BRANCH. IF YOU ARE WISHING TO USE A NON-MASTER BRANCH OF EXCEPTION NOTIFICATION, PLEASE CONSULT THAT BRANCH'S README AND NOT THIS ONE.**
+
+-
+
+The Exception Notification Server gem provides a engine for receiving notifications from Exception Notification gem (webhook-notifier).
+
+
+## Requirements
+
+* Ruby 1.9.2 or greater
+* Rails 4.1 or greater.
+
+For previous releases, please checkout [this](#versions).
+
+
+## Getting Started
+
+Add the following line to your application's Gemfile:
+
+```ruby
 gem 'exception_notification_server'
+```
 
+Run 
 rails g exception_notification_server:install
+
+This command generates an initialize file (`config/initializers/exception_notification_server.rb`) where you can customize your configurations, migration and add routes.
+
+### Webhook notifier
+
+This notifier ships notifications over the HTTP protocol.
+
+#### Usage
+
+Just add the [HTTParty](https://github.com/jnunemaker/httparty) gem to your `Gemfile`:
+
+```ruby
+gem 'httparty'
+```
+
+To configure it, you need to set the `url` option, like this:
+
+```ruby
+ExceptionNotification.configure do |config|
+  config.add_notifier :webhook, {
+      url: 'http://domain.com:5555/notifier/notifications.json',
+      verify: false,
+      basic_auth: {
+        username: 'username',
+        password: 'password'
+      },
+      body: {
+        application: 'application_name',
+        env: Rails.env
+      }
+    }
+end
+```

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: exception_notification_server
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Anatoliy Varanitsa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-15 00:00:00.000000000 Z
+date: 2015-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails