From 388ee8a0abf8796fcd0dd959d5fc076f3462dd2b Mon Sep 17 00:00:00 2001
From: Wiibaa <philippeweber57@yahoo.fr>
Date: Wed, 11 Sep 2013 14:38:29 +0200
Subject: [PATCH 1/2] Restore class method from_json, as event is no more an
 included class

---
 lib/logstash/event.rb | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/lib/logstash/event.rb b/lib/logstash/event.rb
index d3d27420c..d3c151da8 100644
--- a/lib/logstash/event.rb
+++ b/lib/logstash/event.rb
@@ -57,18 +57,10 @@ class LogStash::Event
     data["@version"] = "1" if !@data.include?("@version")
   end # def initialize
 
-  # Add class methods on inclusion.
   public
-  def self.included(klass)
-    klass.extend(ClassMethods)
-  end # def included
-
-  module ClassMethods
-    public
-    def from_json(json)
-      return self.new(JSON.parse(json))
-    end # def from_json
-  end
+  def self.from_json(json)
+    return self.new(JSON.parse(json))
+  end # def from_json
 
   public
   def cancel

From edded01ab8cb1f69a072ca67b186ffe054223ccd Mon Sep 17 00:00:00 2001
From: Wiibaa <philippeweber57@yahoo.fr>
Date: Wed, 11 Sep 2013 14:39:14 +0200
Subject: [PATCH 2/2] Repair outputs/file test + add use of zcat command to
 cover LOGSTASH-997

---
 spec/outputs/file.rb | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/spec/outputs/file.rb b/spec/outputs/file.rb
index a7dea813f..e132565ec 100644
--- a/spec/outputs/file.rb
+++ b/spec/outputs/file.rb
@@ -29,7 +29,7 @@ describe LogStash::Outputs::File do
       # Now check all events for order and correctness.
       File.foreach(tmp_file) do |line|
         event = LogStash::Event.from_json(line)
-        insist {event.message} == "hello world"
+        insist {event["message"]} == "hello world"
         insist {event["sequence"]} == line_num
         line_num += 1
       end
@@ -62,7 +62,17 @@ describe LogStash::Outputs::File do
       # Now check all events for order and correctness.
       Zlib::GzipReader.new(File.open(tmp_file)).each_line do |line|
         event = LogStash::Event.from_json(line)
-        insist {event.message} == "hello world"
+        insist {event["message"]} == "hello world"
+        insist {event["sequence"]} == line_num
+        line_num += 1
+      end
+      insist {line_num} == event_count
+
+      #LOGSTASH-997 confirm usage of zcat command on file
+      line_num = 0
+      `zcat #{tmp_file.path()}`.split("\n").each do |line|
+        event = LogStash::Event.from_json(line)
+        insist {event["message"]} == "hello world"
         insist {event["sequence"]} == line_num
         line_num += 1
       end