daioikachan 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c78f4bd1547342b095bc02952b999849adea8af0
-  data.tar.gz: f153c9627506286d977d77b436cedc27d5cf1c83
+  metadata.gz: 47150b0d6c93fcda75508f92aa41cd335e5f656c
+  data.tar.gz: 107674f0f8f789feb52d7b9a29b453cbd7083e0d
 SHA512:
-  metadata.gz: 8279164a4f7f8ba7a9ec3fda48b0428ee4cebe01bb53b76d172d4e4f9aba15aae4654c04f833db848f30376b6a5fbb15bbe8e955682e32f495dd0da7f37c2465
-  data.tar.gz: 0d959a59d2bbacffe1f717c578225fcbd70c525897ab76128ae967fa4d22fef9f17948a1296731d615083a2200d617e35ed5d3944b764f9108cb99412533a4ef
+  metadata.gz: 06ea59e9cbbf5e86fc1c45f1664bcfd546817cb7fcc73f4721a85b260194c79f76f5cc664e023a56f16c1ff05a53d9abbcaffdc3c8e8759bcfc5d55430bcb5c4
+  data.tar.gz: 4edb9ea8b4a7159ed26f2b823915a62b446cb31ba3548f408fc3b9922beae99a6dbb669688642791ac3307478b78823377ee9d824f665373ca79d599452c4114

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.0.5 (2015/03/30)
+
+Changes:
+
+* Use Rack::Request to handle both `application/x-www-form-urlencoded` and `multipart/form-data`.
+
 # 0.0.4 (2015/03/30)
 
 Enhancements:

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/daioikachan.gemspec

@@ -21,6 +21,9 @@ Gem::Specification.new do |gem|
   gem.add_dependency "puma"
   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"
+  gem.add_development_dependency "pry"
+  gem.add_development_dependency "pry-nav"
 end

data/lib/fluent/plugin/in_daioikachan.rb

@@ -71,20 +71,11 @@ module Fluent
       end
 
       def run(env)
-        # req = Rack::Request.new(env)
-        method = env['REQUEST_METHOD'.freeze] # req.method
-        path   = URI.parse(env['REQUEST_URI'.freeze]).path # req.path
-        # 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
-
+        req = Rack::Request.new(env)
         begin
-          if method == 'POST'
-            case path
+          if req.post?
+            params = req.params
+            case req.path
             when '/notice'
               notice(params)
             when '/privmsg'

data/test/plugin/test_in_daioikachan.rb

@@ -137,7 +137,6 @@ class DaioikachanInputTest < Test::Unit::TestCase
     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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daioikachan
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Naotoshi Seo
@@ -108,6 +108,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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'
+- !ruby/object:Gem::Dependency
+  name: pry-nav
+  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: