fluent-plugin-record-reformer 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7d6ae389089e590c847be0a6f9969cab1e56138
-  data.tar.gz: 69a52f47a536d08d3d317ce8803d761cba44ea97
+  metadata.gz: c27a9bd39e4b37a91f5cfaa52afa8fe63b759cd4
+  data.tar.gz: f7847b8ad017df0871c32dc82ca5a87949080bc6
 SHA512:
-  metadata.gz: f4bb261c67b3842003d83b54729a3b0e453b09f8d6a3efce0f741acebe0d8b569e644898bc634bb20ea3440fe815c456c48a0e0a495abe3109ce8523ce734830
-  data.tar.gz: bb9f7cce04fc9ea24db7e25a6ed9d882824328433b1a99ce427a00b1c90260d1751dc4ca2661ecfbc73aebb7b4d89dbd7253a0c7c20013c3bbd53a887e073529
+  metadata.gz: 7ad34f1d7fa04e2393c5513bf1821c53572eb4d5de13635bdb00d0aea408996301c59e19ecdb48f0d1640c421d2c88c0b378ba997ce641f0d5feaced6e05cae6
+  data.tar.gz: 3ec3479c687ad1fadb9a0f08ac67225a2c4668440b8b647f3e60a6edb10d44b39a2e5f4a2bf85724a93cfc08642da798a5fe911ed7b10f384fa34460a99f4be2

data/.gitignore

@@ -10,3 +10,4 @@ doc/*
 tmp/*
 coverage
 .yardoc
+pkg/

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.0.2 (2013/08/07)
+
+Enhancement:
+
+* Increase possible placeholders more such as `method`. 
+
 ## 0.0.1  (2013/05/02)
 
 First release

data/README.md

@@ -1,6 +1,8 @@
-# fluent-plugin-record-reformer [![Build Status](https://secure.travis-ci.org/sonots/fluent-plugin-record-reformer.png?branch=master)](http://travis-ci.org/sonots/fluent-plugin-record-reformer) [![Dependency Status](https://gemnasium.com/sonots/fluent-plugin-record-reformer.png)](https://gemnasium.com/sonots/fluent-plugin-record-reformer) [![Coverage Status](https://coveralls.io/repos/sonots/fluent-plugin-record-reformer/badge.png?branch=master)](https://coveralls.io/r/sonots/fluent-plugin-record-reformer)
+# fluent-plugin-record-reformer
 
-Add or replace fields of a event record
+[![Build Status](https://secure.travis-ci.org/sonots/fluent-plugin-record-reformer.png?branch=master)](http://travis-ci.org/sonots/fluent-plugin-record-reformer) [![Dependency Status](https://gemnasium.com/sonots/fluent-plugin-record-reformer.png)](https://gemnasium.com/sonots/fluent-plugin-record-reformer)
+
+Fluentd pluging to add or replace fields of a event record
 
 ## Installation
 
@@ -10,6 +12,8 @@ Use RubyGems:
 
 ## Configuration
 
+Example:
+
     <match foo.**>
       type record_reformer
       output_tag reformed
@@ -35,7 +39,7 @@ reformed {
   "time":"2013-05-01T01:13:14Z",
   "message":"your_hostname bar hello world!",
   "foo":"bar"
- }
+}
 ```
 
 ### Placeholders
@@ -57,9 +61,13 @@ It is also possible to write a ruby code in placeholders, so you may write some
 * ${time.strftime('%Y-%m-%dT%H:%M:%S%z')}
 * ${tags.last}  
 
+## Notice
+
+Please note that this plugin enables to execute any ruby codes. Do not allow anyone to write fluentd configuration from outside of your system by security reasons.
+
 ## Relatives
 
-* [fluent-plugin-record-modifier](https://github.com/repeatedly/fluent-plugin-record-modifier)
+* inspired by [fluent-plugin-record-modifier](https://github.com/repeatedly/fluent-plugin-record-modifier)
 
 ## ChangeLog
 

data/fluent-plugin-record-reformer.gemspec

@@ -3,12 +3,13 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name        = "fluent-plugin-record-reformer"
-  gem.version     = "0.0.1"
+  gem.version     = "0.0.2"
   gem.authors     = ["Naotoshi Seo"]
   gem.email       = "sonots@gmail.com"
   gem.homepage    = "https://github.com/sonots/fluent-plugin-record-reformer"
   gem.description = "Output filter plugin for reforming each event record"
   gem.summary     = gem.description
+  gem.licenses    = ["MIT"]
   gem.has_rdoc    = false
 
   gem.files       = `git ls-files`.split("\n")
@@ -20,5 +21,4 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "pry"
-  gem.add_development_dependency 'coveralls'
 end

data/lib/fluent/plugin/out_record_reformer.rb

@@ -24,23 +24,32 @@ module Fluent
     def emit(tag, es, chain)
       tags = tag.split('.')
       es.each { |time, record|
-        Engine.emit(@output_tag, time, expand_record(record, tag, tags, time))
+        Engine.emit(@output_tag, time, replace_record(record, tag, tags, Time.at(time)))
       }
       chain.next
+    rescue => e
+      $log.warn e.message
+      $log.warn e.backtrace.join(', ')
     end
 
     private
 
-    def expand_record(record, tag, tags, time)
-      time = Time.at(time)
+    def replace_record(record, tag, tags, time)
       @map.each_pair { |k, v|
-        record[k] = expand(v, record, tag, tags, time)
+        record[k] = expand_placeholder(v, record, tag, tags, time)
       }
       record
     end
 
-    def expand(str, record, tag, tags, time)
-      struct = OpenStruct.new(record)
+    # 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)
+      struct = UndefOpenStruct.new(record)
       struct.tag  = tag
       struct.tags = tags
       struct.time = time
@@ -48,5 +57,11 @@ module Fluent
       str = str.gsub(/\$\{([^}]+)\}/, '#{\1}') # ${..} => #{..}
       eval "\"#{str}\"", struct.instance_eval { binding }
     end
+
+    class UndefOpenStruct < OpenStruct
+      (Object.instance_methods).each do |m|
+        undef_method m unless m.to_s =~ /^__|respond_to_missing\?|object_id|public_methods|instance_eval|method_missing|define_singleton_method|respond_to\?|new_ostruct_member/
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -4,9 +4,6 @@ require 'bundler'
 Bundler.setup(:default, :test)
 Bundler.require(:default, :test)
 
-require 'coveralls'
-Coveralls.wear!
-
 require 'fluent/test'
 require 'rspec'
 require 'pry'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-record-reformer
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-02 00:00:00.000000000 Z
+date: 2013-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -66,27 +66,12 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Output filter plugin for reforming each event record
 email: sonots@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .coveralls.yml
 - .gitignore
 - .rspec
 - .travis.yml
@@ -100,7 +85,8 @@ files:
 - spec/out_record_expander_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/sonots/fluent-plugin-record-reformer
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -118,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: Output filter plugin for reforming each event record

data/.coveralls.yml

@@ -1 +0,0 @@
-repo_token: i4DJCtdksuIwhBck1tukIjzKoMCxWIIvQ