asana_exception_notifier 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6324de78b9f41b71b8e8d6384a772719f291decd
-  data.tar.gz: 23c376c63a84ca5d6c9161474b13d17ffae082c6
+  metadata.gz: a86f7ce7e4c4e1f4ff8dc107525100e8fdd0a2ce
+  data.tar.gz: 1c3823e58d70cc8579595e3bab70daf49aa0f652
 SHA512:
-  metadata.gz: f50b8bc0c3eba11770f1689e31db4fc458026fdf7decfe1c796762c6717926d52869add49fe031effa01cc34d9d423cbdf73389d3b5db9289cb369fbe12fbe13
-  data.tar.gz: ba8cd7b6fbd9cad58dbe9223f1879bd20a94e535015acfa7a69c79d71a394d2dacda7dbcb1d1a7706b345736811493dca919e4b6b534535b9e56030b9e2477d6
+  metadata.gz: 51c5bc58e1b873a1fd6472ea0fe311b04fbdb156b08837af45cc0d97f231a0eebf2b0376ac2948e3f9153a4bb4ca6ec8195f40db039dc4c54dbc7abc45230c20
+  data.tar.gz: bd7631649f3843c1e60d937aacc37855ba37485a57a67d8107b4474a6beb6f194bf87b0f7791c5d198f3e9b3cc7e182ac796aafe2d5203a68bf1388ab59719de

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    asana_exception_notifier (0.0.5)
+    asana_exception_notifier (0.0.7)
       activesupport (>= 4.0, < 5)
       em-http-request (~> 1.1, >= 1.1.2)
       eventmachine (~> 1.0, >= 1.0.7)
@@ -172,7 +172,7 @@ DEPENDENCIES
   rake (~> 10.5, >= 10.5)
   redcarpet (~> 3.3, >= 3.3)
   rspec (~> 3.4, >= 3.4)
-  simplecov (~> 0.10, >= 0.10)
+  simplecov (~> 0.11, >= 0.10)
   simplecov-summary (~> 0.0.4, >= 0.0.4)
   yard (~> 0.8, >= 0.8.7)
 

data/examples/sinatra/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../
   specs:
-    asana_exception_notifier (0.0.1)
+    asana_exception_notifier (0.0.7)
       activesupport (>= 4.0, < 5)
       em-http-request (~> 1.1, >= 1.1.2)
       eventmachine (~> 1.0, >= 1.0.7)

data/examples/sinatra/Procfile

@@ -1 +1 @@
-web: bundle exec thin start --port 3000
+web: bundle exec thin start --port ${PORT:-3000} -e ${RACK_ENV:-development}

data/lib/asana_exception_notifier/classes/error_page.rb

@@ -39,20 +39,33 @@ module AsanaExceptionNotifier
 
     def parse_exception_options
       @template_params ||= {
-        server:  Socket.gethostname,
+        basic_info: fetch_basic_info,
         exception: @exception,
         request: @request,
-        environment: @request.respond_to?(:filtered_env) ? @request.filtered_env : @env,
-        rails_root: defined?(Rails) ? Rails.root : nil,
-        process: $PROCESS_ID,
+        env: @request.respond_to?(:filtered_env) ? @request.filtered_env : @env,
         data: (@env.blank? ? {} : @env.fetch(:'exception_notifier.exception_data', {})).merge(@options[:data] || {}),
         exception_data: exception_data,
         exception_service_data: exception_service,
         request_data: setup_env_params,
+        parameters: @request.respond_to?(:filtered_parameters) ? filter_params(@request.filtered_parameters) : filter_params(request_params),
+        session: session.respond_to?(:to_hash) ? session.to_hash : session.to_h,
+        cookies: @request.cookies.to_h
+      }.merge(@options).reject { |_key, value| value.blank? }
+    end
+
+    def session
+      @request.session
+    end
+
+    def fetch_basic_info
+      {
+        server:  Socket.gethostname,
+        rails_root: defined?(Rails) ? Rails.root : nil,
+        process: $PROCESS_ID,
         uname: Sys::Uname.uname,
         timestamp: @timestamp,
         pwd:  File.expand_path($PROGRAM_NAME)
-      }.merge(@options).reject { |_key, value| value.blank? }
+      }
     end
 
     def exception_data
@@ -79,15 +92,12 @@ module AsanaExceptionNotifier
         referrer: @request.referer,
         http_method: action_dispatch? ? @request.method : @request.request_method,
         ip_address:  @request.respond_to?(:remote_ip) ? @request.remote_ip : @request.ip,
-        parameters: @request.respond_to?(:filtered_parameters) ? filter_params(@request.filtered_parameters) : filter_params(request_params),
-        session: @request.session,
-        cookies: @request.cookies,
         user_agent: @request.user_agent
       }
     end
 
     def filter_params(params)
-      AsanaExceptionNotifier::UnsafeFilter.new(params, @options.fetch(:unsafe_options, []))
+      AsanaExceptionNotifier::UnsafeFilter.new(params, @options.fetch(:unsafe_options, [])).arguments
     end
 
     def request_params
@@ -100,32 +110,35 @@ module AsanaExceptionNotifier
       fieldsets.map { |key, _value| link_helper(key.to_s) }.join(' | ')
     end
 
-    def fetch_fieldsets(hash, links = {}, prefix = nil)
-      return unless hash.is_a?(Hash)
-      hash.each do |key, value|
-        if value.is_a?(Hash)
-          fetch_fieldsets(value, links, key)
-        else
-          add_to_links(links, prefix, key: key, value: value)
-        end
-      end
-      links
+    def fieldsets
+      @fieldsets ||= mount_tables_for_fieldsets
+      @fieldsets
     end
 
-    def add_to_links(links, prefix, options = {})
-      expected_value = parse_fieldset_value(options)
-      return unless expected_value.present?
-      prefix_name = set_fieldset_key(links, prefix, 'basic_info')
-      links[prefix_name][options[:key]] = expected_value
+    def mount_tables_for_fieldsets
+      hash = fetch_fieldsets
+      hash.each do |key, value|
+        html = mount_table_for_hash(value)
+        hash[key] = html if html.present?
+      end
+      hash
     end
 
-    def fieldsets
-      @fieldsets ||= fetch_fieldsets(parse_exception_options).except(:env)
+    def fetch_fieldsets(hash = {})
+      @template_params.each_with_parent do |parent, key, value|
+        next if value.blank? || key.blank?
+        parent_name = set_fieldset_key(hash, parent, 'system_info')
+        hash[parent_name][key] = value
+      end
+      hash.keys.map(&:to_s).sort
+      hash
     end
 
     def render_template(template = nil)
       execute_with_rescue do
         current_template = template.present? ? template : @template_path
+        @template_params[:fieldsets] = fieldsets
+        @template_params[:fieldsets_links] = fieldsets_links
         Tilt.new(current_template).render(self, @template_params.stringify_keys)
       end
     end

data/lib/asana_exception_notifier/helpers/application_helper.rb

@@ -124,12 +124,12 @@ module AsanaExceptionNotifier
       File.exist?(path)
     end
 
-    def get_hash_rows(hash, rows = [], prefix = '')
+    def get_hash_rows(hash, rows = [], _prefix = '')
       hash.each do |key, value|
         if value.is_a?(Hash)
-          get_hash_rows(value, rows, key)
+          get_object_rows(value, rows)
         else
-          rows.push(["#{prefix}#{key}".inspect, escape(inspect_value(value).inspect)])
+          rows.push([key.inspect, escape(inspect_value(value).inspect)])
         end
       end
       rows

data/lib/asana_exception_notifier/initializers/hash.rb

@@ -0,0 +1,12 @@
+# override Hash class
+class Hash
+  def each_with_parent(parent = nil, &block)
+    each do |key, value|
+      if value.is_a?(Hash)
+        value.each_with_parent(key, &block)
+      else
+        yield(parent, key, value)
+      end
+    end
+  end
+end

data/lib/asana_exception_notifier/templates/exception_details.html.erb

@@ -26,7 +26,7 @@
       <fieldset class='ajax_exception_notifier_fieldset' id='<%= key %>' style="<%= fieldsets.keys.first != key ? "display:none" : '' %>">
         <legend>Debug Information for <%= key.to_s.camelize %></legend>
         <div>
-          <%= mount_table_for_hash(value) %>
+          <%= value %>
         </div>
       </fieldset>
       <% end %>

data/lib/asana_exception_notifier/templates/notes.text.erb

@@ -11,11 +11,11 @@ Request URI:             <%= request_data[:url] %>
 <% if request_data[:referrer].present? %>
 Referer:                 <%= request_data[:referrer] %>
 <% end %>
-PID:                     <%= process %>
-PWD:                     <%= pwd %>
-Uname:                   <%= uname %>
-Server:                  <%= server %>
-Error time:              <%= timestamp %>
+PID:                     <%= basic_info[:process] %>
+PWD:                     <%= basic_info[:pwd] %>
+Uname:                   <%= basic_info[:uname] %>
+Server:                  <%= basic_info[:server] %>
+Error time:              <%= basic_info[:timestamp] %>
 <% if request_data[:user_agent].present? %>
 User Agent:              <%= request_data[:user_agent] %>
 <% end %>

data/lib/asana_exception_notifier/version.rb

@@ -17,7 +17,7 @@ module AsanaExceptionNotifier
     # minor release version
     MINOR = 0
     # tiny release version
-    TINY = 6
+    TINY = 7
     # prelease version ( set this only if it is a prelease)
     PRE = nil
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asana_exception_notifier
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - bogdanRada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-04 00:00:00.000000000 Z
+date: 2016-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -422,6 +422,7 @@ files:
 - lib/asana_exception_notifier/classes/unsafe_filter.rb
 - lib/asana_exception_notifier/helpers/application_helper.rb
 - lib/asana_exception_notifier/helpers/heredoc_helper.rb
+- lib/asana_exception_notifier/initializers/hash.rb
 - lib/asana_exception_notifier/initializers/zip.rb
 - lib/asana_exception_notifier/request/client.rb
 - lib/asana_exception_notifier/request/core.rb