exception_notification-squash_notifier 0.1.1.1 → 0.1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7ec2b5af8dd752ed7db38ab8986d6ff23840285
-  data.tar.gz: 22931676072bd8c10d45b1c334c597920ace15dc
+  metadata.gz: 1e595cb83373abc990d47bce7578a850bc72398f
+  data.tar.gz: fcb8da7dd0df40d685332efc05ccb160d46b188f
 SHA512:
-  metadata.gz: 7235e19a31f9f636d671cf02a184b82e2092d1076619fd0dcbacfe8729860933dc2329b984db4e7b70cf635600d8f6bcf7659a35d0073dc908ebdf47ee971e5f
-  data.tar.gz: def3e87c18f5eab7ae12fb6d60a9f5753b6e221f6b2e4da6afa3fd8c31ae82e91ee47781a811746988d185bdeb14d1f3e7e7d8e6da954ec849a4ed2254a9657c
+  metadata.gz: 80c6e278a302da807e72f73bc0808b8d9fe87687d1fe1729214a0a2daf27a110b1afabf1e26ece84b8c47bcf64dee5a15448e02a2a25a682e3f9eb11e006ead7
+  data.tar.gz: 7c41ba391581c0009a12b7bcbaa2e05bbb25e3d3e51a8308b0ec5435744bef57c964256b27bc664ed72150c8237ae2ba1690610fa346dc9b7273da5b9bbb19f6

data/exception-notification-squash-notifier.gemspec

@@ -25,6 +25,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov", "~> 0.9"
   spec.add_development_dependency "exception_notification", "~> 4.0"
 
-  spec.add_dependency "activesupport", "~> 3.0"
+  spec.add_development_dependency "rails", ">= 3.0"
+
+  spec.add_dependency "activesupport", ">= 3.0"
   spec.add_dependency "squash_ruby", "~> 2.0"
 end

data/lib/exception_notifier/squash_notifier/rails.rb

@@ -40,19 +40,22 @@ class ExceptionNotifier::SquashNotifier
     data.merge(occurence_data(
       request: request,
       session: parameter_filter.filter(request.session.to_hash),
-      cookies: env['rack.request.cookie_hash'],
+      # cookies: env['rack.request.cookie_hash'],
       rack_env: filtered_env
     ))
   end
 
   private
 
-  def occurence_data(request: nil, session: nil, cookies: {}, rack_env: {})
-    flash_key = defined?(ActionDispatch) ? ActionDispatch::Flash::KEY : 'flash'
+  def occurence_data(request: nil, session: nil, rack_env: {})
+    #TODO: Remove when done:
+    # flash_key = defined?(ActionDispatch) ? ActionDispatch::Flash::KEY : 'flash'
 
     # raw_session_id = request.session['session_id'] || (request.env["rack.session.options"] and request.env["rack.session.options"][:id])
     # session_id = request.ssl? ? "[FILTERED]" : raw_session_id.inspect
 
+    PP.pp session, session_s=""
+
     #NB: If you update this hash, make sure to update TOP_LEVEL_USER_DATA in
     #    squash_ruby/rails.rb
     {
@@ -71,15 +74,15 @@ class ExceptionNotifier::SquashNotifier
       # :controller  ## Rails Controller
       # :action  ## Rails Action
       :params         => request.filtered_parameters,
-      # :session_id     => session_id,
       :session        => session,
-      :flash          => session[flash_key],
-      :cookies        => cookies,
+      # :flash          => session[flash_key],
+      # :cookies        => cookies,
 
       # User Data:
       :host_ip        => request.remote_ip,
       :host_name      => Socket.gethostname,
-      :"rack.env"     => rack_env.to_hash
+      :"rack.env"     => rack_env.to_hash,
+      :"session.to_s" => session_s
     }
   end
 

data/lib/exception_notifier/squash_notifier/version.rb

@@ -1,5 +1,5 @@
 module ExceptionNotifier
   class SquashNotifier
-    VERSION = "0.1.1.1"
+    VERSION = "0.1.1.2"
   end
 end

data/lib/exception_notifier/squash_ruby.rb

@@ -9,7 +9,7 @@ module Squash::Ruby
     private
 
     def client_name
-      'squash'
+      'squash-notifier'
     end
 
     alias :environment_data__original :environment_data

data/lib/exception_notifier/squash_ruby/rails.rb

@@ -9,7 +9,7 @@ module Squash::Ruby
   )
 
   def self.client_name
-    'squash-rails'
+    'squash-notifier-rails'
   end
 
   def self.failsafe_log(tag, message)

data/spec/exception_notifier/squash_ruby_spec.rb

@@ -1,6 +1,10 @@
 require 'spec_helper'
 
 describe Squash::Ruby do
+  it do
+    expect(Squash::Ruby.client_name).to eq('squash')
+  end
+
   describe "with a valid instance" do
     context "with a key-replacement env-var filter" do
       around(:all) do |eg|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exception_notification-squash_notifier
 version: !ruby/object:Gem::Version
-  version: 0.1.1.1
+  version: 0.1.1.2
 platform: ruby
 authors:
 - Will Robertson
@@ -94,18 +94,32 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency