Merge pull request #633 from wiibaa/spec-output-file

Correct test case spec/output/file.rb

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)
+  def self.from_json(json)
-    klass.extend(ClassMethods)
+    return self.new(JSON.parse(json))
-  end # def included
+  end # def from_json
-
-  module ClassMethods
-    public
-    def from_json(json)
-      return self.new(JSON.parse(json))
-    end # def from_json
-  end
 
   public
   def cancel

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