gelf 1.1.1 → 1.1.3

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.3

data/gelf.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gelf}
-  s.version = "1.1.1"
+  s.version = "1.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aleksey Palazhchenko", "Lennart Koopmann"]

data/lib/gelf/notifier.rb

@@ -72,7 +72,6 @@ module GELF
     # - string-like object (anything which responds to +to_s+) with optional hash-like object:
     #    notify!('Plain olde text message', :scribe => 'AlekSi')
     # Resulted fields are merged with +default_options+, the latter will never overwrite the former.
-    # This method will raise +ArgumentError+ if arguments are wrong. Consider using notify instead.
     def notify!(*args)
       notify_with_level!(nil, *args)
     end
@@ -144,8 +143,8 @@ module GELF
         frame = stack.shift
       end while frame.include?(LIB_GELF_PATTERN)
       match = CALLER_REGEXP.match(frame)
-      @hash['file'] = match[1]
-      @hash['line'] = match[2].to_i
+      @hash['file'] = match[1] if @hash['file'] == nil
+      @hash['line'] = match[2].to_i if @hash['line'] == nil
     end
 
     def set_timestamp

data/test/test_notifier.rb

@@ -87,10 +87,6 @@ class TestNotifier < Test::Unit::TestCase
         assert !hash.has_key?(:short_message)
       end
 
-      should "not overwrite keys on convert" do
-        assert_raise(ArgumentError) { @notifier.__send__(:extract_hash, :short_message => :message1, 'short_message' => 'message2') }
-      end
-
       should "use default_options" do
         @notifier.default_options = {:foo => 'bar', 'short_message' => 'will be hidden by explicit argument', 'host' => 'some_host'}
         hash = @notifier.__send__(:extract_hash, { 'version' => '1.0', 'short_message' => 'message' })

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - Aleksey Palazhchenko