daioikachan 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f5aaa06960399af8c0db1b659792fbe07b64e8b
-  data.tar.gz: 3d719dd5b2d8fb8d587a6253e97495847240386b
+  metadata.gz: c78f4bd1547342b095bc02952b999849adea8af0
+  data.tar.gz: f153c9627506286d977d77b436cedc27d5cf1c83
 SHA512:
-  metadata.gz: af6e9a5b261f683988c5287ffd7009219ee32731d8113de0b8a19460028c5cc15d60b470972a28ef94266bb1e927f18845ecebc1fda8ae01bb36d7b9eec4ee26
-  data.tar.gz: 9b970c33412b8524e5a3422293e8939875056c5c4def588f3091d404c39c957307b796a5d032cf5c0b58d522ef2471f06de00394e731825637472286b38f3af5
+  metadata.gz: 8279164a4f7f8ba7a9ec3fda48b0428ee4cebe01bb53b76d172d4e4f9aba15aae4654c04f833db848f30376b6a5fbb15bbe8e955682e32f495dd0da7f37c2465
+  data.tar.gz: 0d959a59d2bbacffe1f717c578225fcbd70c525897ab76128ae967fa4d22fef9f17948a1296731d615083a2200d617e35ed5d3944b764f9108cb99412533a4ef

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.0.4 (2015/03/30)
+
+Enhancements:
+
+* Support `multipart/form-data` as ikachan does
+
 # 0.0.3 (2015/03/25)
 
 Changes:

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/daioikachan.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency "fluent-plugin-irc", ">= 0.0.7"
   gem.add_dependency "fluent-plugin-slack", ">= 0.5.0"
   gem.add_development_dependency "rake"
+  gem.add_development_dependency "test-unit"
 end

data/lib/fluent/plugin/in_daioikachan.rb

@@ -46,6 +46,7 @@ module Fluent
     end
 
     def on_request(env)
+      log.debug { "in_daioikachan: #{env.to_s}" }
       @app.run(env)
     end
 
@@ -73,8 +74,13 @@ module Fluent
         # req = Rack::Request.new(env)
         method = env['REQUEST_METHOD'.freeze] # req.method
         path   = URI.parse(env['REQUEST_URI'.freeze]).path # req.path
-        body   = env['rack.input'].read # req.body.read
-        params = Rack::Utils.parse_query(body)
+        # Rack::Request.new should take care of this, but it did not
+        if env['CONTENT_TYPE'.freeze].start_with?('multipart/form-data'.freeze)
+          params = Rack::Multipart.parse_multipart(env)
+        else
+          body   = env['rack.input'].read # req.body.read
+          params = Rack::Utils.parse_query(body)
+        end
 
         begin
           if method == 'POST'

data/test/plugin/test_in_daioikachan.rb

@@ -18,6 +18,28 @@ class DaioikachanInputTest < Test::Unit::TestCase
     http.request(req)
   end
 
+  def post_multipart(path, params, header = {}, ssl = false)
+    http = Net::HTTP.new("127.0.0.1", PORT)
+    if ssl
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    end
+    req = Net::HTTP::Post.new(path, header)
+    req.set_content_type("multipart/form-data; boundary=myboundary")
+
+    body = ""
+    params.each do |key, val|
+      body.concat("--myboundary\r\n")
+      body.concat("content-disposition: form-data; name=\"#{key}\";\r\n")
+      body.concat("\r\n")
+      body.concat("#{val}\r\n")
+    end
+    body.concat("--myboundary--\r\n")
+    req.body = body
+
+    http.request(req)
+  end
+
   def setup
     Fluent::Test.setup
   end
@@ -102,4 +124,22 @@ class DaioikachanInputTest < Test::Unit::TestCase
       assert_equal "200", res.code
     end
   end
+
+
+  def test_multipart
+    d = create_driver
+
+    time = Time.parse("2011-01-02 13:14:15 UTC").to_i
+    Fluent::Engine.now = time
+
+    d.expect_emit "privmsg.channel", time, {"command" => "privmsg", "channel" => "channel", "message" => "message"}
+
+    d.run do
+      d.expected_emits.each {|tag, time, record|
+        res = post_multipart("/privmsg", {command: "privmsg", channel: "channel", message: "message"})
+        puts res.body
+        assert_equal "200", res.code
+      }
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daioikachan
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-25 00:00:00.000000000 Z
+date: 2015-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  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: Ikachan compatible interface with multiple backends (IRC, Slack, etc)
 email: sonots@gmail.com
 executables: