airbrake 6.1.1 → 6.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3089af4a27a2927bde27aee7442572c52d8b7d8
-  data.tar.gz: 00bd2a9ccffb9fd2d2a6c99e9bb91d326c952a65
+  metadata.gz: e691790e6c6e5e3fc0e48e508f65d25a8a51fb73
+  data.tar.gz: a92941a7772a033da11f09a5351bc38383034534
 SHA512:
-  metadata.gz: ffed529a186f28ab380f39ee241983dbcf2a726af8b9d88757868c5f3682e913000141551a1223d5e14d96f3666686f69128321899116018c84d3fc3874e633a
-  data.tar.gz: eb7948c62ffb6b8076c22e564269f24e220530669c3ceb7e82551506035c75a9c2d6b040614d128007fa35ac8449ef56813d367454511c650086ca45f03162ef
+  metadata.gz: 52c5176e4e358427b5ebdc83d95a1a0811f06328ac41763b33f5095288f9c0d40b0405137c7b6b3e26934856d155ffcb087c8bc704f9cc4cfa52ca9e7460edec
+  data.tar.gz: fdc6d93eda79c5f9f5b4eb971582c1d88724fe6c812145949c87781813917d662087cccbbee58abfd04fe1a89315cb6ed87b40d8674c063eba453b265e24d0d6

data/lib/airbrake/logger.rb

@@ -1,4 +1,5 @@
 require 'logger'
+require 'delegate'
 
 module Airbrake
   ##

data/lib/airbrake/rack/context_filter.rb

@@ -29,6 +29,7 @@ module Airbrake
         context = notice[:context]
 
         context[:url] = request.url
+        context[:userAddr] = request.ip
         context[:userAgent] = request.user_agent
 
         add_framework_version(context)

data/lib/airbrake/rack/user.rb

@@ -50,7 +50,11 @@ module Airbrake
       private
 
       def try_to_get(key)
-        String(@user.__send__(key)) if @user.respond_to?(key)
+        return unless @user.respond_to?(key)
+        # try methods with no arguments or with variable number of arguments,
+        # where none of them are required
+        return unless @user.method(key).arity.between?(-1, 0)
+        String(@user.__send__(key))
       end
 
       def full_name

data/lib/airbrake/version.rb

@@ -2,5 +2,5 @@
 # We use Semantic Versioning v2.0.0
 # More information: http://semver.org/
 module Airbrake
-  AIRBRAKE_VERSION = '6.1.1'.freeze
+  AIRBRAKE_VERSION = '6.1.2'.freeze
 end

data/spec/unit/rack/context_filter_spec.rb

@@ -44,6 +44,28 @@ RSpec.describe Airbrake::Rack::ContextFilter do
     end
   end
 
+  context "when visitor address is present" do
+    let(:opts) do
+      { 'REMOTE_ADDR' => '1.2.3.4' }
+    end
+
+    it "adds userAddr to the context" do
+      subject.call(notice)
+      expect(notice[:context][:userAddr]).to eq('1.2.3.4')
+    end
+  end
+
+  context "when visitor is behind a proxy or load balancer" do
+    let(:opts) do
+      { 'HTTP_X_FORWARDED_FOR' => '8.8.8.8, 9.9.9.9' }
+    end
+
+    it "adds userAddr to the context" do
+      subject.call(notice)
+      expect(notice[:context][:userAddr]).to eq('9.9.9.9')
+    end
+  end
+
   context "when controller is present" do
     let(:controller) do
       double.tap do |ctrl|

data/spec/unit/rack/user_spec.rb

@@ -189,5 +189,34 @@ RSpec.describe Airbrake::Rack::User do
         expect(user_data).to be_empty
       end
     end
+
+    context "when Rack user's field expects a parameter" do
+      let(:user_data) do
+        described_class.new(
+          Class.new do
+            def name(required_param)
+              "my name is #{required_param}"
+            end
+
+            def id(required_param, *optional_params)
+              "id is #{required_param} #{optional_params.inspect}"
+            end
+
+            def username(*optional_params)
+              "username is #{optional_params.inspect}"
+            end
+          end.new
+        ).as_json
+      end
+
+      it "does not call the method if it has required parameters" do
+        expect(user_data[:user]).not_to include(:id)
+        expect(user_data[:user]).not_to include(:name)
+      end
+
+      it "calls the method if it has a variable number of optional parameters" do
+        expect(user_data[:user]).to include(:username)
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: airbrake
 version: !ruby/object:Gem::Version
-  version: 6.1.1
+  version: 6.1.2
 platform: ruby
 authors:
 - Airbrake Technologies, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-23 00:00:00.000000000 Z
+date: 2017-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airbrake-ruby