fluent-plugin-record-reformer 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f559864ef660d47eddb8014db068e4bde4ada84
-  data.tar.gz: d386239a2519be28502c088d5943ac6fa40a8271
+  metadata.gz: 6cb811fb3f7274893d0f871c070fa298b0f9c138
+  data.tar.gz: 504bb732f1e60a2bc98f80b44a78294de6770627
 SHA512:
-  metadata.gz: f4803fe2a264683ad621602819a4e646afcd94b3a22a7263344a3278df4bd8240dd41bee86b566437c831afbf7b864f69ef8beeaf62295d6967c4e01c9bf7a57
-  data.tar.gz: 96de88d6872141f4804c168baa526767be7cb49ab2ea14389bad1d5255bee9508b872c7c906f5e17e74023bc95303d48eaea0ea518729e3f8daf4642cf17b3b2
+  metadata.gz: 29c43c2e9b76b18de8c5744219814a1a9ca4babfa1f332c88d84c7b1db2e89fe38a57e4f78fc6c8a320cacb4ab88542174a05728f997a913857bc0603511d0b5
+  data.tar.gz: b6a984d357f3a1f74221284a3982265001a01338c6c3667b60d1ad1d7455270553e46345351172510c7d4d6775409daf59dda35fbd686b4bbcee80b22c903455

data/.gitignore

@@ -11,3 +11,4 @@ tmp/*
 coverage
 .yardoc
 pkg/
+.ruby-version

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.1.1 (2013/11/21)
+
+Changes:
+
+* change the name of `tags` placeholder to `tag_parts`. `tags` is still available for old version compatibility, though
+
 ## 0.1.0 (2013/09/09)
 
 Enhancement:

data/Gemfile

@@ -1,4 +1,3 @@
 source "http://rubygems.org"
 
-gem 'simplecov', git: 'https://github.com/colszowka/simplecov.git'
 gemspec

data/README.md

@@ -21,7 +21,7 @@ Example:
       hostname ${hostname}
       tag ${tag}
       time ${time.strftime('%Y-%m-%dT%H:%M:%S%z')}
-      message ${hostname} ${tags.last} ${message}
+      message ${hostname} ${tag_parts.last} ${message}
     </match>
 
 Assume following input is coming:
@@ -55,13 +55,15 @@ shall be available. In addition, following placeholders are reserved:
 
 * ${hostname} hostname
 * ${tag} input tag
-* ${tags} input tag splitted by '.'
+* ${tags} input tag splitted by '.' (obsolete. use tag_parts)
+* ${tag_parts} input tag splitted by '.'
 * ${time} time of the event
 
 It is also possible to write a ruby code in placeholders, so you may write some codes as
 
 * ${time.strftime('%Y-%m-%dT%H:%M:%S%z')}
-* ${tags.last}  
+* ${tag_parts[0]}
+* ${tag_parts.last}
 
 ## Notice
 

data/fluent-plugin-record-reformer.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name        = "fluent-plugin-record-reformer"
-  gem.version     = "0.1.0"
+  gem.version     = "0.1.1"
   gem.authors     = ["Naotoshi Seo"]
   gem.email       = "sonots@gmail.com"
   gem.homepage    = "https://github.com/sonots/fluent-plugin-record-reformer"

data/lib/fluent/plugin/out_record_reformer.rb

@@ -30,11 +30,11 @@ module Fluent
     end
 
     def emit(tag, es, chain)
-      tags = tag.split('.')
+      tag_parts = tag.split('.')
       es.each { |time, record|
         t_time = Time.at(time)
-        output_tag = expand_placeholder(@output_tag, record, tag, tags, t_time)
-        Engine.emit(output_tag, time, replace_record(record, tag, tags, t_time))
+        output_tag = expand_placeholder(@output_tag, record, tag, tag_parts, t_time)
+        Engine.emit(output_tag, time, replace_record(record, tag, tag_parts, t_time))
       }
       chain.next
     rescue => e
@@ -44,24 +44,24 @@ module Fluent
 
     private
 
-    def replace_record(record, tag, tags, time)
+    def replace_record(record, tag, tag_parts, time)
       @map.each_pair { |k, v|
-        record[k] = expand_placeholder(v, record, tag, tags, time)
+        record[k] = expand_placeholder(v, record, tag, tag_parts, time)
       }
       record
     end
 
     # Replace placeholders in a string
     #
-    # @param [String] str    the string to be replaced
-    # @param [Hash]   record the record, one of information
-    # @param [String] tag    one of information
-    # @param [Array]  tags   one of information
-    # @param [Time]   time   one of information
-    def expand_placeholder(str, record, tag, tags, time)
+    # @param [String] str         the string to be replaced
+    # @param [Hash]   record      the record, one of information
+    # @param [String] tag         the tag
+    # @param [Array]  tag_parts   the tag parts (tag splitted by .)
+    # @param [Time]   time        the time
+    def expand_placeholder(str, record, tag, tag_parts, time)
       struct = UndefOpenStruct.new(record)
       struct.tag  = tag
-      struct.tags = tags
+      struct.tags = struct.tag_parts = tag_parts # tags is for old version compatibility
       struct.time = time
       struct.hostname = @hostname
       str = str.gsub(/\$\{([^}]+)\}/, '#{\1}') # ${..} => #{..}

data/spec/out_record_reformer_spec.rb

@@ -10,10 +10,10 @@ describe Fluent::RecordReformerOutput do
     hostname ${hostname}
     tag ${tag}
     time ${time.strftime('%S')}
-    message ${hostname} ${tags.last} ${message}
+    message ${hostname} ${tag_parts.last} ${message}
   ]
   let(:tag) { 'test.tag' }
-  let(:tags) { tag.split('.') }
+  let(:tag_parts) { tag.split('.') }
   let(:hostname) { Socket.gethostname.chomp }
   let(:driver) { Fluent::Test::OutputTestDriver.new(Fluent::RecordReformerOutput, tag).configure(config) }
 
@@ -36,24 +36,44 @@ describe Fluent::RecordReformerOutput do
       end
     end
 
-    let(:config) { CONFIG }
-    before do
-      Fluent::Engine.stub(:now).and_return(time)
-      Fluent::Engine.should_receive(:emit).with("reformed.#{tag}", time.to_i, {
-        'foo' => 'bar',
-        'hostname' => hostname,
-        'tag' => tag,
-        'time' => time.strftime('%S'),
-        'message' => "#{hostname} #{tags.last} 1",
-      })
-      Fluent::Engine.should_receive(:emit).with("reformed.#{tag}", time.to_i, {
-        'foo' => 'bar',
-        'hostname' => hostname,
-        'tag' => tag,
-        'time' => time.strftime('%S'),
-        'message' => "#{hostname} #{tags.last} 2",
-      })
+    context 'typical usage' do
+      let(:config) { CONFIG }
+      before do
+        Fluent::Engine.stub(:now).and_return(time)
+        Fluent::Engine.should_receive(:emit).with("reformed.#{tag}", time.to_i, {
+          'foo' => 'bar',
+          'hostname' => hostname,
+          'tag' => tag,
+          'time' => time.strftime('%S'),
+          'message' => "#{hostname} #{tag_parts.last} 1",
+        })
+        Fluent::Engine.should_receive(:emit).with("reformed.#{tag}", time.to_i, {
+          'foo' => 'bar',
+          'hostname' => hostname,
+          'tag' => tag,
+          'time' => time.strftime('%S'),
+          'message' => "#{hostname} #{tag_parts.last} 2",
+        })
+      end
+      it { emit }
+    end
+
+    context 'support old ${tags} placeholder' do
+      let(:config) { %[
+        type reformed
+        output_tag reformed.${tag}
+
+        message ${tags[1]}
+      ]}
+
+      before do
+        Fluent::Engine.stub(:now).and_return(time)
+        Fluent::Engine.should_receive(:emit).twice.with("reformed.#{tag}", time.to_i, {
+          'foo' => 'bar',
+          'message' => "#{tag_parts[1]}",
+        })
+      end
+      it { emit }
     end
-    it { emit }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-record-reformer
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-09 00:00:00.000000000 Z
+date: 2013-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Output filter plugin for reforming each event record