fluent-plugin-jabber 0.3.0 → 0.4.0

data/README.md

@@ -52,12 +52,6 @@ See source for details.
       jabber_warnings_log true
     </match>
 
-### Message format
-
-    {"body": "String for output"}
-
-If 'body' field not set, the plugin raises error.
-
 ## Contributing
 
 1. Fork it
@@ -68,6 +62,10 @@ If 'body' field not set, the plugin raises error.
 
 ## Changes
 
+### 0.4.0
+
+* Add filter: uri_component
+
 ### 0.3.0
 
 * Add filter: br

data/fluent-plugin-jabber.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-jabber"
-  gem.version       = "0.3.0"
+  gem.version       = "0.4.0"
   gem.authors       = ["todesking"]
   gem.email         = ["discommunicative@gmail.com"]
   gem.summary       = %q{Fluentd output plugin for XMPP(Jabber) protocol}

data/lib/fluent/plugin/out_jabber.rb

@@ -5,6 +5,8 @@ require 'fluent/output'
 require 'xmpp4r'
 require 'xmpp4r/muc'
 
+require 'uri'
+
 require 'pit'
 
 # Deal with Fluentd's Encoding.default_internal = 'ASCII_8BIT'.
@@ -98,6 +100,9 @@ class Fluent::JabberOutput < Fluent::Output
         data = escape_xhtml(data) if need_escape
       when 'br'
         data = escape_xhtml(data).gsub(/\n/, '<br />')
+      when 'uri_component'
+        data = URI.escape(data, Regexp.union(URI::UNSAFE, /[?&=+]/))
+        data = escape_xhtml(data) if need_escape
       else
         raise "Unknown filter: #{filter}"
       end

data/spec/out_jabber_spec.rb

@@ -144,6 +144,12 @@ describe Fluent::JabberOutput do
         subject.format_with('${a|br}', 0, {'a'=>"<>\n"}, false).should == "&lt;&gt;<br />"
       end
     end
+    context '|u' do
+      it 'should escape params for uri_component' do
+        subject.format_with('${a|uri_component}', 0, {'a'=>'hoge'}, false).should == "hoge"
+        subject.format_with('${a|uri_component}', 0, {'a'=>'/?a=b+c&'}, false).should == "/%3Fa%3Db%2Bc%26"
+      end
+    end
   end
 
   context 'xhtml_format' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-jabber
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-02 00:00:00.000000000 Z
+date: 2013-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -109,9 +109,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: Fluentd output plugin for XMPP(Jabber) protocol
 test_files:
 - spec/out_jabber_spec.rb
+has_rdoc: