fluent-plugin-time_parser 0.0.4 → 0.0.5

data/README.md

@@ -51,7 +51,7 @@ You must add at least one of these params.
 
 ### time_zone
 
-Necessary. time_parser uses the TZInfo (http://tzinfo.rubyforge.org/) library to handle time zones.
+Optional. time_parser uses the TZInfo (http://tzinfo.rubyforge.org/) library to handle time zones.
 
 ### parsed_time_tag, parsed_hour_tag, parsed_date_tag
 

data/fluent-plugin-time_parser.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = 'fluent-plugin-time_parser'
-  gem.version       = '0.0.4'
+  gem.version       = '0.0.5'
   gem.authors       = ['Carlos Donderis', 'Michael H. Oshita']
   gem.email         = ['cdonderis@gmail.com', 'ijinpublic+github@gmail.com']
   gem.homepage      = 'http://github.com/cads/fluent-plugin-time_parser'

data/lib/fluent/plugin/out_time_parser.rb

@@ -7,7 +7,7 @@ module Fluent
     Fluent::Plugin.register_output('time_parser', self)
 
     config_param :key, :string, :default => 'time'
-    config_param :time_zone, :string
+    config_param :time_zone, :string, :default => ''
     config_param :parsed_time_tag, :string, :default => 'parsed_time'
     config_param :parsed_hour_tag, :string, :default => 'parsed_hour'
     config_param :parsed_date_tag, :string, :default => 'parsed_date'
@@ -21,7 +21,6 @@ module Fluent
           !add_tag_suffix
       )
         raise ConfigError, "out_extract_query_params: At least one of remove_tag_prefix/remove_tag_suffix/add_tag_prefix/add_tag_suffix is required to be set."
-        raise ConfigError, "You must specify a time zone" unless time_zone
       end
     end
 
@@ -44,19 +43,22 @@ module Fluent
 
     def filter_record(tag, time, record)
       begin
-        original_time = DateTime.parse(record[key])
-        tz = TZInfo::Timezone.get(time_zone.capitalize)
+        record_time = DateTime.parse(record[key])
 
-        period = tz.period_for_utc(original_time)
-        rational_offset = period.utc_total_offset_rational
+        if time_zone && time_zone != ""
+          tz = TZInfo::Timezone.get(time_zone.capitalize)
 
-        converted_time = tz.utc_to_local(original_time).new_offset(rational_offset) -
-                         period.utc_total_offset_rational
+          period = tz.period_for_utc(record_time)
+          rational_offset = period.utc_total_offset_rational
 
-        date = converted_time.to_date.to_s
-        hour = converted_time.hour.to_s
+          record_time = tz.utc_to_local(record_time).new_offset(rational_offset) -
+                        period.utc_total_offset_rational
 
-        record[parsed_time_tag] = converted_time.to_s
+        end
+        date = record_time.to_date.to_s
+        hour = record_time.hour.to_s
+
+        record[parsed_time_tag] = record_time.to_s
         record[parsed_date_tag] = date
         record[parsed_hour_tag] = hour
 

data/test/plugin/test_out_time_parser.rb

@@ -22,34 +22,35 @@ class TimeParserOutputTest < Test::Unit::TestCase
     d = create_driver(%[
       key            test
       add_tag_prefix extracted.
-      time_zone      Tokyo
+      time_zone      Asia/Tokyo
     ])
     assert_equal 'test', d.instance.key
     assert_equal 'extracted.', d.instance.add_tag_prefix
-    assert_equal 'Tokyo',   d.instance.time_zone
+    assert_equal 'Asia/Tokyo',   d.instance.time_zone
 
     #Default Key
     d = create_driver(%[
       add_tag_prefix extracted.
-      time_zone      Tokyo
+      time_zone      Asia/Tokyo
     ])
     assert_equal 'time', d.instance.key
     assert_equal 'extracted.', d.instance.add_tag_prefix
-    assert_equal 'Tokyo',   d.instance.time_zone
+    assert_equal 'Asia/Tokyo',   d.instance.time_zone
 
     #No Prefix
     assert_raise(Fluent::ConfigError) do
       create_driver(%[
-        time_zone      Tokyo
+        time_zone      Asia/Tokyo
       ])
     end
+
     #No TimeZone
-    assert_raise(Fluent::ConfigError) do
-      create_driver(%[
-        key            test
-        add_tag_prefix extracted.
-      ])
-    end
+    d = create_driver(%[
+      key            test
+      add_tag_prefix extracted.
+    ])
+    assert_equal 'test', d.instance.key
+    assert_equal 'extracted.', d.instance.add_tag_prefix
   end
 
   def test_filter_record

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-time_parser
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Fluentd plugin to parse the time parameter.