yell-adapters-gelf 0.9.0 → 0.11.0

data/Gemfile

@@ -2,3 +2,11 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in yell-adapters-gelf.gemspec
 gemspec
+
+group :development, :test do
+  gem "rake"
+
+  gem "rspec"
+  gem "rr"
+end
+

data/lib/yell/adapters/gelf.rb

@@ -61,18 +61,19 @@ module Yell #:nodoc:
       write do |event|
         # https://github.com/Graylog2/graylog2-docs/wiki/GELF
         _datagrams = datagrams(
-          'version'       => '1.0',
-
-          'facility'      => facility,
-          'level'         => Severities[event.level],
-          'short_message' => event.message,
-          'timestamp'     => event.time.to_f,
-          'host'          => event.hostname,
-
-          'file'          => event.file,
-          'line'          => event.line,
-          '_method'       => event.method,
-          '_pid'          => event.pid
+          {
+            'version'       => '1.0',
+
+            'facility'      => facility,
+            'level'         => Severities[event.level],
+            'timestamp'     => event.time.to_f,
+            'host'          => event.hostname,
+
+            'file'          => event.file,
+            'line'          => event.line,
+            '_method'       => event.method,
+            '_pid'          => event.pid
+          }.merge( format(event.message) ).merge( format(event.options) )
         )
 
         sender.send( *_datagrams )
@@ -135,6 +136,18 @@ module Yell #:nodoc:
         _datagrams
       end
 
+      def format( message )
+        case message
+          when Hash
+            message
+          when Exception
+            { "short_message" => "#{message.class}: #{message.message}" }.tap do |m|
+              m.merge!( "long_message" => message.backtrace.join("\n") ) if message.backtrace
+            end
+          else { "short_message" => message.to_s }
+        end
+      end
+
       def uid
         @uid += 1
       end

data/spec/yell/adapters/gelf_spec.rb

@@ -162,6 +162,47 @@ describe Yell::Adapters::Gelf do
       it "should receive :pid" do
         mock.proxy( adapter ).datagrams( hash_including('_pid' => event.pid) )
       end
+
+      context "given a Hash" do
+        let( :event ) { Yell::Event.new( 1, 'short_message' => 'Hello World', '_custom_field' => 'Custom Field' ) }
+
+        it "should receive :short_message" do
+          mock.proxy( adapter ).datagrams( hash_including('short_message' => 'Hello World') )
+        end
+
+        it "should receive :_custom_field" do
+          mock.proxy( adapter ).datagrams( hash_including('_custom_field' => 'Custom Field') )
+        end
+      end
+
+      context "given an Exception" do
+        let( :exception ) { StandardError.new 'This is an error' }
+        let( :event ) { Yell::Event.new( 1, exception ) }
+
+        before do
+          mock( exception ).backtrace.times(any_times) { [:back, :trace] }
+        end
+
+        it "should receive :short_message" do
+          mock.proxy( adapter ).datagrams( hash_including('short_message' => "#{exception.class}: #{exception.message}") )
+        end
+
+        it "should receive :long_message" do
+          mock.proxy( adapter ).datagrams( hash_including('long_message' => "back\ntrace") )
+        end
+      end
+
+      context "given a Yell::Event with :options" do
+        let( :event ) { Yell::Event.new( 1, 'Hello World', "_custom_field" => 'Custom Field' ) }
+
+        it "should receive :short_message" do
+          mock.proxy( adapter ).datagrams( hash_including('short_message' => 'Hello World') )
+        end
+
+        it "should receive :_custom_field" do
+          mock.proxy( adapter ).datagrams( hash_including('_custom_field' => 'Custom Field') )
+        end
+      end
     end
   end
 

data/yell-adapters-gelf.gemspec

@@ -1,11 +1,10 @@
 # -*- encoding: utf-8 -*-
 
 $:.push File.expand_path("../lib", __FILE__)
-require "yell/adapters/gelf/version"
 
 Gem::Specification.new do |s|
   s.name        = "yell-adapters-gelf"
-  s.version     = Yell::Adapters::Gelf::VERSION
+  s.version     = "0.11.0"
   s.authors     = ["Rudolf Schmidt"]
 
   s.homepage    = "http://rubygems.org/gems/yell"
@@ -15,14 +14,12 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "yell"
 
   s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.executables   = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
+
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency "yell", "0.9.0"
+  s.add_runtime_dependency "yell", "~> 0.11.0"
   s.add_runtime_dependency "json"
-
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "rr"
 end
 

metadata

@@ -1,122 +1,87 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: yell-adapters-gelf
-version: !ruby/object:Gem::Version
-  version: 0.9.0
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.11.0
 platform: ruby
-authors:
-- Rudolf Schmidt
+authors: 
+  - Rudolf Schmidt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-10 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: yell
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rr
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+
+date: 2012-05-23 00:00:00 Z
+dependencies: 
+  - !ruby/object:Gem::Dependency 
+    name: yell
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 0.11.0
+    type: :runtime
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: json
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :runtime
+    version_requirements: *id002
 description: Graylog2 adapter for Yell
 email: 
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
-- .gitignore
-- .travis.yml
-- Gemfile
-- LICENSE.txt
-- README.md
-- Rakefile
-- lib/yell-adapters-gelf.rb
-- lib/yell/adapters/gelf.rb
-- lib/yell/adapters/gelf/version.rb
-- spec/spec_helper.rb
-- spec/yell/adapters/gelf_spec.rb
-- yell-adapters-gelf.gemspec
+
+files: 
+  - .gitignore
+  - .travis.yml
+  - Gemfile
+  - LICENSE.txt
+  - README.md
+  - Rakefile
+  - lib/yell-adapters-gelf.rb
+  - lib/yell/adapters/gelf.rb
+  - spec/spec_helper.rb
+  - spec/yell/adapters/gelf_spec.rb
+  - yell-adapters-gelf.gemspec
 homepage: http://rubygems.org/gems/yell
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement
+
+require_paths: 
+  - lib
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
+
 rubyforge_project: yell
-rubygems_version: 1.8.23
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Yell - Your Extensible Logging Library
-test_files:
-- spec/spec_helper.rb
-- spec/yell/adapters/gelf_spec.rb
+test_files: 
+  - spec/spec_helper.rb
+  - spec/yell/adapters/gelf_spec.rb
+has_rdoc: 

data/lib/yell/adapters/gelf/version.rb

@@ -1,13 +0,0 @@
-# encoding: utf-8
-
-module Yell #:nodoc:
-  module Adapters #:nodoc:
-
-    class Gelf
-      VERSION = "0.9.0"
-
-    end
-
-  end
-end
-