gelf 1.0.0 → 1.0.2

data/CHANGELOG

@@ -1,3 +1,6 @@
+1.0.1, 2010-11-29:
+ - fix bug in chunking.
+
 1.0.0, 2010-11-10:
  - initial stable version;
  - deprecated Gelf class is still there.

data/Rakefile

@@ -2,6 +2,7 @@ require 'rubygems'
 require 'rake'
 
 begin
+  gem 'jeweler', '1.4.0'
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "gelf"

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.2

data/gelf.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gelf}
-  s.version = "1.0.0"
+  s.version = "1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexey Palazhchenko", "Lennart Koopmann"]
-  s.date = %q{2010-11-12}
+  s.date = %q{2010-11-29}
   s.description = %q{Suports plain-text, GELF messages and exceptions.}
   s.email = %q{lennart@socketfeed.com}
   s.extra_rdoc_files = [
@@ -38,8 +38,8 @@ Gem::Specification.new do |s|
   s.summary = %q{Library to send GELF messages to Graylog2 logging server}
   s.test_files = [
     "test/helper.rb",
-     "test/test_notifier.rb",
-     "test/test_deprecations.rb"
+     "test/test_deprecations.rb",
+     "test/test_notifier.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/gelf/notifier.rb

@@ -107,8 +107,7 @@ module GELF
     end
 
     def chunk_data(data, msg_id, sequence_number, sequence_count)
-      # [30, 15].pack('CC') => "\036\017"
-      return "\036\017" + msg_id + [sequence_number, sequence_count].pack('nn') + data.map(&:chr).join
+      return "\036\017" + msg_id + [sequence_number, sequence_count, *data].pack('nnC*')
     end
 
     def detect_this_host

data/test/test_notifier.rb

@@ -126,5 +126,22 @@ class TestNotifier < Test::Unit::TestCase
       @notifier.expects(:notify!).with(instance_of(ArgumentError))
       assert_nothing_raised { @notifier.notify(:no_short_message => 'too bad') }
     end
+
+    should "chunk data" do
+      UDPSocket.any_instance.stubs(:send)
+      srand(1) # for stable tests
+      data = (0..3000).map { RANDOM_DATA[rand(RANDOM_DATA.count)] }.join
+      datagrams = @notifier.__send__(:do_notify, {'short_message' => data, 'host' => 'localhost'})
+      assert_equal 2, datagrams.count
+      datagrams.each_index do |i|
+        datagram = datagrams[i]
+        assert datagram[0..1] == "\x1e\x0f"
+        # datagram[2..33] is a message id
+        assert_equal 0, datagram[34].ord
+        assert_equal i, datagram[35].ord
+        assert_equal 0, datagram[36].ord
+        assert_equal datagrams.count, datagram[37].ord
+      end
+    end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Alexey Palazhchenko
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-12 00:00:00 +01:00
+date: 2010-11-29 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -114,5 +114,5 @@ specification_version: 3
 summary: Library to send GELF messages to Graylog2 logging server
 test_files: 
 - test/helper.rb
-- test/test_notifier.rb
 - test/test_deprecations.rb
+- test/test_notifier.rb