fluent-plugin-http-pull 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1480636da1bab4f88742d01d09a28689dc23f4f
-  data.tar.gz: 6684def2381874b18aebf9e0b882d8d478f7413b
+  metadata.gz: 6e3619cf826d85851de1718106ba6184f72f1bc2
+  data.tar.gz: 4ecc716ba91a880d13c7ce3ca021f678c8c20243
 SHA512:
-  metadata.gz: 741429737da8ed091713200ee6f59bfd8716070680715cade5c36959a1b7962fc7310bfdc2413873115baa7820b993b58165bbbae86e948707a5b79b90c52921
-  data.tar.gz: c765d56d66a4b2bad85d30919f497eccf3a180038ca1122a59e0d96ecfa9f0a8016607c039d79b14175a3e3dfae3c44b92203b861bc16a280dc0481735079e56
+  metadata.gz: cca5ffc95191262f47ceca1207477415f44f233ccec6f2b2befd7ed5104a93c6758df4ce970e107be2f99ec88d46b2f7196de9a94ea2549a1e2def87a41520bd
+  data.tar.gz: b60ee55a581523bc46564d6f63fc5c901f48f98e9d319fdf7fb19dd3dce0fb65a98062f780c12873cfca44f0b4399e1832ec0942645e4c1f139df84cdf843294

data/.gitignore

@@ -5,3 +5,4 @@ Gemfile.lock
 coverage/**/*
 *.gem
 *.log
+.ruby-version

data/.travis.yml

@@ -6,5 +6,5 @@ rvm:
 gemfile:
  - Gemfile
 
-script: bundle exec rake test
+script: bundle exec rake test TESTOPTS=-v
 sudo: false

data/README.md

@@ -120,6 +120,10 @@ The tag of the event.
 
 The url of remote server.
 
+### agent (string) (optional, default: fluent-plugin-http-pull)
+
+The user agent string of request.
+
 ### interval (time) (required)
 
 The interval time between periodic request.

data/appveyor.yml

@@ -10,7 +10,7 @@ install:
 build: off
 
 test_script:
-  - bundle exec rake test
+  - bundle exec rake test TESTOPTS=-v
 
 branches:
   only:

data/fluent-plugin-http-pull.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = "fluent-plugin-http-pull"
-  spec.version = "0.6.1"
+  spec.version = "0.7.0"
   spec.authors = ["filepang"]
   spec.email   = ["filepang@gmail.com"]
 

data/lib/fluent/plugin/in_http_pull.rb

@@ -35,6 +35,9 @@ module Fluent
       desc 'The interval time between periodic request'
       config_param :interval, :time
 
+      desc 'The user agent string of request'
+      config_param :agent, :string, default: "fluent-plugin-http-pull"
+
       desc 'status_only'
       config_param :status_only, :bool, default: false
 
@@ -72,7 +75,8 @@ module Fluent
 
         @parser = parser_create unless @status_only
         @_request_headers = {
-          "Content-Type" => "application/x-www-form-urlencoded"
+          "Content-Type" => "application/x-www-form-urlencoded",
+          "User-Agent" => @agent
         }.merge(@request_headers.map do |section|
           header = section["header"]
           value = section["value"]

data/test/plugin/test_in_http_pull.rb

@@ -3,18 +3,7 @@ require "fluent/plugin/in_http_pull.rb"
 
 require 'ostruct'
 
-class HttpPullInputTest < Test::Unit::TestCase
-  @stub_server = nil
-
-  setup do
-    @stub_server = StubServer.new
-    @stub_server.start
-  end
-
-  teardown do
-    @stub_server.shutdown
-  end
-
+class HttpPullInputTestDefaultOptions < Test::Unit::TestCase
   sub_test_case "default value of each options" do
     TEST_DEFAULT_VALUE_CONFIG = %[
       tag test
@@ -65,557 +54,12 @@ class HttpPullInputTest < Test::Unit::TestCase
 
       assert_equal(:get, d.instance.http_method)
     end
-  end
-
-  sub_test_case "success case" do
-    TEST_INTERVAL_3_CONFIG = %[
-      tag test
-      url http://127.0.0.1:3939
-
-      interval 3s
-      format none
-      status_only true
-    ]
-
-    TEST_INTERVAL_5_CONFIG = %[
-      tag test
-      url http://127.0.0.1:3939
-
-      interval 5s
-      format json
-    ]
-
-    TEST_INTERVAL_3_REDIRECT_CONFIG = %[
-      tag test
-      url http://127.0.0.1:3939/redirect
-
-      interval 3s
-      format json
-    ]
-
-    test 'interval 3 with status_only' do
-      d = create_driver TEST_INTERVAL_3_CONFIG
-      assert_equal("test", d.instance.tag)
-      assert_equal(3, d.instance.interval)
-
-      d.run(timeout: 8) do
-        sleep 7
-      end
-      assert_equal(2, d.events.size)
-
-      d.events.each do |tag, time, record|
-        assert_equal("test", tag)
-
-        assert_equal({"url"=>"http://127.0.0.1:3939","status"=>200}, record)
-        assert(time.is_a?(Fluent::EventTime))
-      end
-    end
-
-    test 'interval 5' do
-      d = create_driver TEST_INTERVAL_5_CONFIG
-      assert_equal("test", d.instance.tag)
-      assert_equal(5, d.instance.interval)
-
-      d.run(timeout: 12) do
-        sleep 11
-      end
-      assert_equal(2, d.events.size)
-
-      d.events.each do |tag, time, record|
-        assert_equal("test", tag)
-
-        assert_equal({"url"=>"http://127.0.0.1:3939","status"=>200, "message"=>{"status"=>"OK"}}, record)
-        assert(time.is_a?(Fluent::EventTime))
-      end
-    end
-
-    test 'interval 3 with redirect' do
-      d = create_driver TEST_INTERVAL_3_REDIRECT_CONFIG
-      assert_equal("test", d.instance.tag)
-      assert_equal(3, d.instance.interval)
-
-      d.run(timeout: 8) do
-        sleep 7
-      end
-      assert_equal(2, d.events.size)
-
-      d.events.each do |tag, time, record|
-        assert_equal("test", tag)
-
-        assert_equal({"url"=>"http://127.0.0.1:3939/redirect","status"=>200, "message"=>{"status"=>"OK"}}, record)
-        assert(time.is_a?(Fluent::EventTime))
-      end
-    end
-  end
-
-  sub_test_case "fail when not 200 OK" do
-    TEST_404_INTERVAL_3_CONFIG = %[
-      tag test
-      url http://127.0.0.1:3939/not_exist
-
-      interval 3s
-      format none
-      status_only true
-    ]
-
-    TEST_500_INTERVAL_3_CONFIG = %[
-      tag test
-      url http://127.0.0.1:3939/internal_error
-
-      interval 3s
-      format none
-      status_only true
-    ]
-
-    test '404' do
-      d = create_driver TEST_404_INTERVAL_3_CONFIG
-      assert_equal("test", d.instance.tag)
-      assert_equal(3, d.instance.interval)
-
-      d.run(timeout: 8) do
-        sleep 7
-      end
-      assert_equal(2, d.events.size)
-
-      d.events.each do |tag, time, record|
-        assert_equal("test", tag)
-
-        assert_equal("http://127.0.0.1:3939/not_exist", record["url"])
-        assert(time.is_a?(Fluent::EventTime))
-
-        assert_equal(404, record["status"])
-        assert_not_nil(record["error"])
-      end
-    end
-
-    test '500' do
-      d = create_driver TEST_500_INTERVAL_3_CONFIG
-      assert_equal("test", d.instance.tag)
-      assert_equal(3, d.instance.interval)
-
-      d.run(timeout: 8) do
-        sleep 7
-      end
-      assert_equal(2, d.events.size)
-
-      d.events.each do |tag, time, record|
-        assert_equal("test", tag)
-
-        assert_equal("http://127.0.0.1:3939/internal_error", record["url"])
-        assert(time.is_a?(Fluent::EventTime))
-
-        assert_equal(500, record["status"])
-        assert_not_nil(record["error"])
-      end
-    end
-  end
-
-  sub_test_case "fail when remote down" do
-    TEST_REFUSED_CONFIG = %[
-      tag test
-      url http://127.0.0.1:5927
-      interval 1s
-
-      format json
-    ]
-    test "connection refused by remote" do
-      d = create_driver TEST_REFUSED_CONFIG
-      assert_equal("test", d.instance.tag)
-
-      d.run(timeout: 4) do
-        sleep 3
-      end
-
-      assert_equal(3, d.events.size)
-      d.events.each do |tag, time, record|
-        assert_equal("test", tag)
-
-        assert_equal("http://127.0.0.1:5927", record["url"])
-        assert(time.is_a?(Fluent::EventTime))
-
-        assert_equal(0, record["status"])
-        assert_not_nil(record["error"])
-      end
-    end
-  end
-
-  sub_test_case "fail when remote timeout" do
-    TEST_TIMEOUT_FAIL_CONFIG = %[
-      tag test
-      url http://127.0.0.1:3939/timeout
-      timeout 2s
-
-      interval 3s
-      format json
-    ]
-
-    test "timeout" do
-      d = create_driver TEST_TIMEOUT_FAIL_CONFIG
-      assert_equal("test", d.instance.tag)
-      assert_equal(2, d.instance.timeout)
-
-      d.run(timeout: 8) do
-        sleep 7
-      end
-      assert_equal(2, d.events.size)
-
-      d.events.each do |tag, time, record|
-        assert_equal("test", tag)
-
-        assert_equal("http://127.0.0.1:3939/timeout", record["url"])
-        assert(time.is_a?(Fluent::EventTime))
-
-        assert_equal(0, record["status"])
-        assert_not_nil(record["error"])
-      end
-    end
-  end
-
-  sub_test_case "remote is prtected by basic auth" do
-    TEST_AUTH_SUCCESS_CONFIG = %[
-      tag test
-      url http://127.0.0.1:3939/protected
-      timeout 2s
-      user HatsuneMiku
-      password 3939
-
-      interval 3s
-      format json
-    ]
-
-    TEST_AUTH_FAIL_CONFIG = %[
-      tag test
-      url http://127.0.0.1:3939/protected
-      timeout 2s
-      user HatsuneMiku
-      password wrong_password
-
-      interval 3s
-      format json
-    ]
-
-    TEST_AUTH_FAIL_NOT_GIVEN_CONFIG = %[
-      tag test
-      url http://127.0.0.1:3939/protected
-      timeout 2s
-
-      interval 3s
-      format json
-    ]
-
-    test 'interval 3 with corrent password' do
-      d = create_driver TEST_AUTH_SUCCESS_CONFIG
-      assert_equal("test", d.instance.tag)
-      assert_equal(3, d.instance.interval)
-
-      d.run(timeout: 8) do
-        sleep 7
-      end
-      assert_equal(2, d.events.size)
-
-      d.events.each do |tag, time, record|
-        assert_equal("test", tag)
-
-        assert_equal({"url"=>"http://127.0.0.1:3939/protected","status"=>200, "message"=>{"status"=>"OK"}}, record)
-        assert(time.is_a?(Fluent::EventTime))
-      end
-    end
-
-    test 'interval 3 with wrong password' do
-      d = create_driver TEST_AUTH_FAIL_CONFIG
-      assert_equal("test", d.instance.tag)
-      assert_equal(3, d.instance.interval)
-
-      d.run(timeout: 8) do
-        sleep 7
-      end
-      assert_equal(2, d.events.size)
-
-      d.events.each do |tag, time, record|
-        assert_equal("test", tag)
-
-        assert_equal("http://127.0.0.1:3939/protected", record["url"])
-        assert(time.is_a?(Fluent::EventTime))
-
-        assert_equal(401, record["status"])
-        assert_not_nil(record["error"])
-      end
-    end
-
-    test 'interval 3 without auth info' do
-      d = create_driver TEST_AUTH_FAIL_CONFIG
-      assert_equal("test", d.instance.tag)
-      assert_equal(3, d.instance.interval)
-
-      d.run(timeout: 8) do
-        sleep 7
-      end
-      assert_equal(2, d.events.size)
-
-      d.events.each do |tag, time, record|
-        assert_equal("test", tag)
-
-        assert_equal("http://127.0.0.1:3939/protected", record["url"])
-        assert(time.is_a?(Fluent::EventTime))
-
-        assert_equal(401, record["status"])
-        assert_not_nil(record["error"])
-      end
-    end
-  end
-
-  sub_test_case "success case behind proxy" do
-    TEST_INTERVAL_3_PROXY_CONFIG = %[
-      tag test
-      url http://127.0.0.1:3939
-      proxy http://127.0.0.1:4040
-
-      interval 3s
-      format none
-      status_only true
-    ]
-
-    TEST_INTERVAL_3_REDIRECT_PROXY_CONFIG = %[
-      tag test
-      url http://127.0.0.1:3939/redirect
-      proxy http://127.0.0.1:4040
-
-      interval 3s
-      format json
-    ]
-
-    TEST_AUTH_SUCCESS_PROXY_CONFIG = %[
-      tag test
-      url http://127.0.0.1:3939/protected
-      proxy http://127.0.0.1:4040
-      timeout 2s
-      user HatsuneMiku
-      password 3939
-
-      interval 3s
-      format json
-    ]
-
-    setup do
-      @proxy_server = StubProxy.new
-      @proxy_server.start
-    end
-
-    teardown do
-      @proxy_server.shutdown
-    end
-
-    test 'interval 3 with status_only' do
-      d = create_driver TEST_INTERVAL_3_PROXY_CONFIG
-      assert_equal("test", d.instance.tag)
-      assert_equal(3, d.instance.interval)
-
-      d.run(timeout: 8) do
-        sleep 7
-      end
-      assert_equal(2, d.events.size)
-
-      d.events.each do |tag, time, record|
-        assert_equal("test", tag)
-
-        assert_equal({"url"=>"http://127.0.0.1:3939","status"=>200}, record)
-        assert(time.is_a?(Fluent::EventTime))
-      end
-    end
-
-    test 'interval 3 with redirect' do
-      d = create_driver TEST_INTERVAL_3_REDIRECT_PROXY_CONFIG
-      assert_equal("test", d.instance.tag)
-      assert_equal(3, d.instance.interval)
-
-      d.run(timeout: 8) do
-        sleep 7
-      end
-      assert_equal(2, d.events.size)
-
-      d.events.each do |tag, time, record|
-        assert_equal("test", tag)
-
-        assert_equal({"url"=>"http://127.0.0.1:3939/redirect","status"=>200, "message"=>{"status"=>"OK"}}, record)
-        assert(time.is_a?(Fluent::EventTime))
-      end
-    end
-
-    test 'interval 3 with corrent password' do
-      d = create_driver TEST_AUTH_SUCCESS_PROXY_CONFIG
-      assert_equal("test", d.instance.tag)
-      assert_equal(3, d.instance.interval)
-
-      d.run(timeout: 8) do
-        sleep 7
-      end
-      assert_equal(2, d.events.size)
-
-      d.events.each do |tag, time, record|
-        assert_equal("test", tag)
-
-        assert_equal({"url"=>"http://127.0.0.1:3939/protected","status"=>200, "message"=>{"status"=>"OK"}}, record)
-        assert(time.is_a?(Fluent::EventTime))
-      end
-    end
-  end
-
-  sub_test_case "capture response header" do
-    TEST_INTERVAL_3_RES_HEADER_CONFIG = %[
-      tag test
-      url http://127.0.0.1:3939
-
-      interval 3s
-      format json
-
-      <response_header>
-        header Content-Type
-      </response_header>
-    ]
-
-    TEST_INTERVAL_3_RES_MULTI_HEADER_CONFIG = %[
-      tag test
-      url http://127.0.0.1:3939
-
-      interval 3s
-      format json
-
-      <response_header>
-        header Content-Type
-      </response_header>
-
-      <response_header>
-        header Content-Length
-      </response_header>
-    ]
-
-    test 'interval 3 with single header' do
-      d = create_driver TEST_INTERVAL_3_RES_HEADER_CONFIG
-      assert_equal("test", d.instance.tag)
-      assert_equal(3, d.instance.interval)
-
-      d.run(timeout: 8) do
-        sleep 7
-      end
-      assert_equal(2, d.events.size)
-
-      d.events.each do |tag, time, record|
-        assert_equal("test", tag)
-
-        assert_equal({"url"=>"http://127.0.0.1:3939","status"=>200,"message"=>{"status"=>"OK"},"header"=>{"Content-Type"=>"application/json"}}, record)
-        assert(time.is_a?(Fluent::EventTime))
-      end
-    end
-
-    test 'interval 3 with multiple header' do
-      d = create_driver TEST_INTERVAL_3_RES_MULTI_HEADER_CONFIG
-      assert_equal("test", d.instance.tag)
-      assert_equal(3, d.instance.interval)
-
-      d.run(timeout: 8) do
-        sleep 7
-      end
-      assert_equal(2, d.events.size)
-
-      d.events.each do |tag, time, record|
-        assert_equal("test", tag)
-
-        assert_equal({"url"=>"http://127.0.0.1:3939","status"=>200,"message"=>{"status"=>"OK"},"header"=>{"Content-Type"=>"application/json","Content-Length"=>"18"}}, record)
-        assert(time.is_a?(Fluent::EventTime))
-      end
-    end
-  end
-
-  sub_test_case "custom request header" do
-    TEST_INTERVAL_3_CUSTOM_HEADER_CONFIG = %[
-      tag test
-      url http://127.0.0.1:3939/custom_header
-
-      interval 3s
-      format json
-
-      <request_header>
-        header HATSUNE-MIKU
-        value 3939
-      </request_header>
-
-      <response_header>
-        header HATSUNE-MIKU
-      </response_header>
-    ]
-
-    test 'interval 3 with single header' do
-      d = create_driver TEST_INTERVAL_3_CUSTOM_HEADER_CONFIG
-      assert_equal("test", d.instance.tag)
-      assert_equal(3, d.instance.interval)
-
-      d.run(timeout: 8) do
-        sleep 7
-      end
-      assert_equal(2, d.events.size)
-
-      d.events.each do |tag, time, record|
-        assert_equal("test", tag)
-
-        assert_equal({"url"=>"http://127.0.0.1:3939/custom_header","status"=>200,"message"=>{"status"=>"OK"},"header"=>{"HATSUNE-MIKU"=>"3939"}}, record)
-        assert(time.is_a?(Fluent::EventTime))
-      end
-    end
-  end
-
-  sub_test_case "request method" do
-    TEST_INTERVAL_3_POST = %[
-      tag test
-      url http://127.0.0.1:3939/method_post
-
-      interval 3s
-      format json
-      http_method post
-    ]
-
-    TEST_INTERVAL_3_DELETE = %[
-      tag test
-      url http://127.0.0.1:3939/method_delete
-
-      interval 3s
-      format json
-      http_method delete
-    ]
-
-    test 'interval 3 with :post' do
-      d = create_driver TEST_INTERVAL_3_POST
-      assert_equal("test", d.instance.tag)
-      assert_equal(3, d.instance.interval)
-
-      d.run(timeout: 8) do
-        sleep 7
-      end
-      assert_equal(2, d.events.size)
-
-      d.events.each do |tag, time, record|
-        assert_equal("test", tag)
-
-        assert_equal({"url"=>"http://127.0.0.1:3939/method_post","status"=>200, "message"=>{"status"=>"OK"}}, record)
-        assert(time.is_a?(Fluent::EventTime))
-      end
-    end
 
-    test 'interval 3 with :delete' do
-      d = create_driver TEST_INTERVAL_3_DELETE
+    test 'agent' do
+      d = create_driver TEST_DEFAULT_VALUE_CONFIG
       assert_equal("test", d.instance.tag)
-      assert_equal(3, d.instance.interval)
-
-      d.run(timeout: 8) do
-        sleep 7
-      end
-      assert_equal(2, d.events.size)
-
-      d.events.each do |tag, time, record|
-        assert_equal("test", tag)
 
-        assert_equal({"url"=>"http://127.0.0.1:3939/method_delete","status"=>200, "message"=>{"status"=>"OK"}}, record)
-        assert(time.is_a?(Fluent::EventTime))
-      end
+      assert_equal("fluent-plugin-http-pull", d.instance.agent)
     end
   end
 

data/test/plugin/test_in_http_pull_auth.rb

@@ -0,0 +1,116 @@
+require "helper"
+require "fluent/plugin/in_http_pull.rb"
+
+require 'ostruct'
+
+class HttpPullInputTestAuth < Test::Unit::TestCase
+  @stub_server = nil
+
+  setup do
+    @stub_server = StubServer.new
+    @stub_server.start
+  end
+
+  teardown do
+    @stub_server.shutdown
+  end
+
+  sub_test_case "remote is prtected by basic auth" do
+    TEST_AUTH_SUCCESS_CONFIG = %[
+      tag test
+      url http://127.0.0.1:3939/protected
+      timeout 2s
+      user HatsuneMiku
+      password 3939
+
+      interval 3s
+      format json
+    ]
+
+    TEST_AUTH_FAIL_CONFIG = %[
+      tag test
+      url http://127.0.0.1:3939/protected
+      timeout 2s
+      user HatsuneMiku
+      password wrong_password
+
+      interval 3s
+      format json
+    ]
+
+    TEST_AUTH_FAIL_NOT_GIVEN_CONFIG = %[
+      tag test
+      url http://127.0.0.1:3939/protected
+      timeout 2s
+
+      interval 3s
+      format json
+    ]
+
+    test 'interval 3 with corrent password' do
+      d = create_driver TEST_AUTH_SUCCESS_CONFIG
+      assert_equal("test", d.instance.tag)
+      assert_equal(3, d.instance.interval)
+
+      d.run(timeout: 8) do
+        sleep 7
+      end
+      assert_equal(2, d.events.size)
+
+      d.events.each do |tag, time, record|
+        assert_equal("test", tag)
+
+        assert_equal({"url"=>"http://127.0.0.1:3939/protected","status"=>200, "message"=>{"status"=>"OK"}}, record)
+        assert(time.is_a?(Fluent::EventTime))
+      end
+    end
+
+    test 'interval 3 with wrong password' do
+      d = create_driver TEST_AUTH_FAIL_CONFIG
+      assert_equal("test", d.instance.tag)
+      assert_equal(3, d.instance.interval)
+
+      d.run(timeout: 8) do
+        sleep 7
+      end
+      assert_equal(2, d.events.size)
+
+      d.events.each do |tag, time, record|
+        assert_equal("test", tag)
+
+        assert_equal("http://127.0.0.1:3939/protected", record["url"])
+        assert(time.is_a?(Fluent::EventTime))
+
+        assert_equal(401, record["status"])
+        assert_not_nil(record["error"])
+      end
+    end
+
+    test 'interval 3 without auth info' do
+      d = create_driver TEST_AUTH_FAIL_CONFIG
+      assert_equal("test", d.instance.tag)
+      assert_equal(3, d.instance.interval)
+
+      d.run(timeout: 8) do
+        sleep 7
+      end
+      assert_equal(2, d.events.size)
+
+      d.events.each do |tag, time, record|
+        assert_equal("test", tag)
+
+        assert_equal("http://127.0.0.1:3939/protected", record["url"])
+        assert(time.is_a?(Fluent::EventTime))
+
+        assert_equal(401, record["status"])
+        assert_not_nil(record["error"])
+      end
+    end
+  end
+
+  private
+
+  def create_driver(conf)
+    Fluent::Test::Driver::Input.new(Fluent::Plugin::HttpPullInput).configure(conf)
+  end
+end

data/test/plugin/test_in_http_pull_basic.rb

@@ -0,0 +1,227 @@
+require "helper"
+require "fluent/plugin/in_http_pull.rb"
+
+require 'ostruct'
+
+class HttpPullInputTestBasic < Test::Unit::TestCase
+  @stub_server = nil
+
+  setup do
+    @stub_server = StubServer.new
+    @stub_server.start
+  end
+
+  teardown do
+    @stub_server.shutdown
+  end
+
+  sub_test_case "success case" do
+    TEST_INTERVAL_3_CONFIG = %[
+      tag test
+      url http://127.0.0.1:3939
+
+      interval 3s
+      format none
+      status_only true
+    ]
+
+    TEST_INTERVAL_5_CONFIG = %[
+      tag test
+      url http://127.0.0.1:3939
+
+      interval 5s
+      format json
+    ]
+
+    TEST_INTERVAL_3_REDIRECT_CONFIG = %[
+      tag test
+      url http://127.0.0.1:3939/redirect
+
+      interval 3s
+      format json
+    ]
+
+    test 'interval 3 with status_only' do
+      d = create_driver TEST_INTERVAL_3_CONFIG
+      assert_equal("test", d.instance.tag)
+      assert_equal(3, d.instance.interval)
+
+      d.run(timeout: 8) do
+        sleep 7
+      end
+      assert_equal(2, d.events.size)
+
+      d.events.each do |tag, time, record|
+        assert_equal("test", tag)
+
+        assert_equal({"url"=>"http://127.0.0.1:3939","status"=>200}, record)
+        assert(time.is_a?(Fluent::EventTime))
+      end
+    end
+
+    test 'interval 5' do
+      d = create_driver TEST_INTERVAL_5_CONFIG
+      assert_equal("test", d.instance.tag)
+      assert_equal(5, d.instance.interval)
+
+      d.run(timeout: 12) do
+        sleep 11
+      end
+      assert_equal(2, d.events.size)
+
+      d.events.each do |tag, time, record|
+        assert_equal("test", tag)
+
+        assert_equal({"url"=>"http://127.0.0.1:3939","status"=>200, "message"=>{"status"=>"OK"}}, record)
+        assert(time.is_a?(Fluent::EventTime))
+      end
+    end
+
+    test 'interval 3 with redirect' do
+      d = create_driver TEST_INTERVAL_3_REDIRECT_CONFIG
+      assert_equal("test", d.instance.tag)
+      assert_equal(3, d.instance.interval)
+
+      d.run(timeout: 8) do
+        sleep 7
+      end
+      assert_equal(2, d.events.size)
+
+      d.events.each do |tag, time, record|
+        assert_equal("test", tag)
+
+        assert_equal({"url"=>"http://127.0.0.1:3939/redirect","status"=>200, "message"=>{"status"=>"OK"}}, record)
+        assert(time.is_a?(Fluent::EventTime))
+      end
+    end
+  end
+
+  sub_test_case "fail when not 200 OK" do
+    TEST_404_INTERVAL_3_CONFIG = %[
+      tag test
+      url http://127.0.0.1:3939/not_exist
+
+      interval 3s
+      format none
+      status_only true
+    ]
+
+    TEST_500_INTERVAL_3_CONFIG = %[
+      tag test
+      url http://127.0.0.1:3939/internal_error
+
+      interval 3s
+      format none
+      status_only true
+    ]
+
+    test '404' do
+      d = create_driver TEST_404_INTERVAL_3_CONFIG
+      assert_equal("test", d.instance.tag)
+      assert_equal(3, d.instance.interval)
+
+      d.run(timeout: 8) do
+        sleep 7
+      end
+      assert_equal(2, d.events.size)
+
+      d.events.each do |tag, time, record|
+        assert_equal("test", tag)
+
+        assert_equal("http://127.0.0.1:3939/not_exist", record["url"])
+        assert(time.is_a?(Fluent::EventTime))
+
+        assert_equal(404, record["status"])
+        assert_not_nil(record["error"])
+      end
+    end
+
+    test '500' do
+      d = create_driver TEST_500_INTERVAL_3_CONFIG
+      assert_equal("test", d.instance.tag)
+      assert_equal(3, d.instance.interval)
+
+      d.run(timeout: 8) do
+        sleep 7
+      end
+      assert_equal(2, d.events.size)
+
+      d.events.each do |tag, time, record|
+        assert_equal("test", tag)
+
+        assert_equal("http://127.0.0.1:3939/internal_error", record["url"])
+        assert(time.is_a?(Fluent::EventTime))
+
+        assert_equal(500, record["status"])
+        assert_not_nil(record["error"])
+      end
+    end
+  end
+
+  sub_test_case "fail when remote down" do
+    TEST_REFUSED_CONFIG = %[
+      tag test
+      url http://127.0.0.1:5927
+      interval 1s
+
+      format json
+    ]
+    test "connection refused by remote" do
+      d = create_driver TEST_REFUSED_CONFIG
+      assert_equal("test", d.instance.tag)
+
+      d.run(timeout: 4) do
+        sleep 3
+      end
+
+      assert_equal(3, d.events.size)
+      d.events.each do |tag, time, record|
+        assert_equal("test", tag)
+
+        assert_equal("http://127.0.0.1:5927", record["url"])
+        assert(time.is_a?(Fluent::EventTime))
+
+        assert_equal(0, record["status"])
+        assert_not_nil(record["error"])
+      end
+    end
+  end
+
+  sub_test_case "fail when remote timeout" do
+    TEST_TIMEOUT_FAIL_CONFIG = %[
+      tag test
+      url http://127.0.0.1:3939/timeout
+      timeout 2s
+
+      interval 3s
+      format json
+    ]
+
+    test "timeout" do
+      d = create_driver TEST_TIMEOUT_FAIL_CONFIG
+      assert_equal("test", d.instance.tag)
+      assert_equal(2, d.instance.timeout)
+
+      d.run(timeout: 8) do
+        sleep 7
+      end
+      assert_equal(2, d.events.size)
+
+      d.events.each do |tag, time, record|
+        assert_equal("test", tag)
+
+        assert_equal("http://127.0.0.1:3939/timeout", record["url"])
+        assert(time.is_a?(Fluent::EventTime))
+
+        assert_equal(0, record["status"])
+        assert_not_nil(record["error"])
+      end
+    end
+  end
+
+  private
+
+  def create_driver(conf)
+    Fluent::Test::Driver::Input.new(Fluent::Plugin::HttpPullInput).configure(conf)
+  end
+end

data/test/plugin/test_in_http_pull_http_header.rb

@@ -0,0 +1,126 @@
+require "helper"
+require "fluent/plugin/in_http_pull.rb"
+
+require 'ostruct'
+
+class HttpPullInputTestHttpHeader < Test::Unit::TestCase
+  @stub_server = nil
+
+  setup do
+    @stub_server = StubServer.new
+    @stub_server.start
+  end
+
+  teardown do
+    @stub_server.shutdown
+  end
+
+  sub_test_case "capture response header" do
+    TEST_INTERVAL_3_RES_HEADER_CONFIG = %[
+      tag test
+      url http://127.0.0.1:3939
+
+      interval 3s
+      format json
+
+      <response_header>
+        header Content-Type
+      </response_header>
+    ]
+
+    TEST_INTERVAL_3_RES_MULTI_HEADER_CONFIG = %[
+      tag test
+      url http://127.0.0.1:3939
+
+      interval 3s
+      format json
+
+      <response_header>
+        header Content-Type
+      </response_header>
+
+      <response_header>
+        header Content-Length
+      </response_header>
+    ]
+
+    test 'interval 3 with single header' do
+      d = create_driver TEST_INTERVAL_3_RES_HEADER_CONFIG
+      assert_equal("test", d.instance.tag)
+      assert_equal(3, d.instance.interval)
+
+      d.run(timeout: 8) do
+        sleep 7
+      end
+      assert_equal(2, d.events.size)
+
+      d.events.each do |tag, time, record|
+        assert_equal("test", tag)
+
+        assert_equal({"url"=>"http://127.0.0.1:3939","status"=>200,"message"=>{"status"=>"OK"},"header"=>{"Content-Type"=>"application/json"}}, record)
+        assert(time.is_a?(Fluent::EventTime))
+      end
+    end
+
+    test 'interval 3 with multiple header' do
+      d = create_driver TEST_INTERVAL_3_RES_MULTI_HEADER_CONFIG
+      assert_equal("test", d.instance.tag)
+      assert_equal(3, d.instance.interval)
+
+      d.run(timeout: 8) do
+        sleep 7
+      end
+      assert_equal(2, d.events.size)
+
+      d.events.each do |tag, time, record|
+        assert_equal("test", tag)
+
+        assert_equal({"url"=>"http://127.0.0.1:3939","status"=>200,"message"=>{"status"=>"OK"},"header"=>{"Content-Type"=>"application/json","Content-Length"=>"18"}}, record)
+        assert(time.is_a?(Fluent::EventTime))
+      end
+    end
+  end
+
+  sub_test_case "custom request header" do
+    TEST_INTERVAL_3_CUSTOM_HEADER_CONFIG = %[
+      tag test
+      url http://127.0.0.1:3939/custom_header
+
+      interval 3s
+      format json
+
+      <request_header>
+        header HATSUNE-MIKU
+        value 3939
+      </request_header>
+
+      <response_header>
+        header HATSUNE-MIKU
+      </response_header>
+    ]
+
+    test 'interval 3 with single header' do
+      d = create_driver TEST_INTERVAL_3_CUSTOM_HEADER_CONFIG
+      assert_equal("test", d.instance.tag)
+      assert_equal(3, d.instance.interval)
+
+      d.run(timeout: 8) do
+        sleep 7
+      end
+      assert_equal(2, d.events.size)
+
+      d.events.each do |tag, time, record|
+        assert_equal("test", tag)
+
+        assert_equal({"url"=>"http://127.0.0.1:3939/custom_header","status"=>200,"message"=>{"status"=>"OK"},"header"=>{"HATSUNE-MIKU"=>"3939"}}, record)
+        assert(time.is_a?(Fluent::EventTime))
+      end
+    end
+  end
+
+  private
+
+  def create_driver(conf)
+    Fluent::Test::Driver::Input.new(Fluent::Plugin::HttpPullInput).configure(conf)
+  end
+end

data/test/plugin/test_in_http_pull_proxy.rb

@@ -0,0 +1,119 @@
+require "helper"
+require "fluent/plugin/in_http_pull.rb"
+
+require 'ostruct'
+
+class HttpPullInputTestProxy < Test::Unit::TestCase
+  @stub_server = nil
+
+  setup do
+    @stub_server = StubServer.new
+    @stub_server.start
+  end
+
+  teardown do
+    @stub_server.shutdown
+  end
+
+  sub_test_case "success case behind proxy" do
+    TEST_INTERVAL_3_PROXY_CONFIG = %[
+      tag test
+      url http://127.0.0.1:3939
+      proxy http://127.0.0.1:4040
+
+      interval 3s
+      format none
+      status_only true
+    ]
+
+    TEST_INTERVAL_3_REDIRECT_PROXY_CONFIG = %[
+      tag test
+      url http://127.0.0.1:3939/redirect
+      proxy http://127.0.0.1:4040
+
+      interval 3s
+      format json
+    ]
+
+    TEST_AUTH_SUCCESS_PROXY_CONFIG = %[
+      tag test
+      url http://127.0.0.1:3939/protected
+      proxy http://127.0.0.1:4040
+      timeout 2s
+      user HatsuneMiku
+      password 3939
+
+      interval 3s
+      format json
+    ]
+
+    setup do
+      @proxy_server = StubProxy.new
+      @proxy_server.start
+    end
+
+    teardown do
+      @proxy_server.shutdown
+    end
+
+    test 'interval 3 with status_only' do
+      d = create_driver TEST_INTERVAL_3_PROXY_CONFIG
+      assert_equal("test", d.instance.tag)
+      assert_equal(3, d.instance.interval)
+
+      d.run(timeout: 8) do
+        sleep 7
+      end
+      assert_equal(2, d.events.size)
+
+      d.events.each do |tag, time, record|
+        assert_equal("test", tag)
+
+        assert_equal({"url"=>"http://127.0.0.1:3939","status"=>200}, record)
+        assert(time.is_a?(Fluent::EventTime))
+      end
+    end
+
+    test 'interval 3 with redirect' do
+      d = create_driver TEST_INTERVAL_3_REDIRECT_PROXY_CONFIG
+      assert_equal("test", d.instance.tag)
+      assert_equal(3, d.instance.interval)
+
+      d.run(timeout: 8) do
+        sleep 7
+      end
+      assert_equal(2, d.events.size)
+
+      d.events.each do |tag, time, record|
+        assert_equal("test", tag)
+
+        assert_equal({"url"=>"http://127.0.0.1:3939/redirect","status"=>200, "message"=>{"status"=>"OK"}}, record)
+        assert(time.is_a?(Fluent::EventTime))
+      end
+    end
+
+    test 'interval 3 with corrent password' do
+      d = create_driver TEST_AUTH_SUCCESS_PROXY_CONFIG
+      assert_equal("test", d.instance.tag)
+      assert_equal(3, d.instance.interval)
+
+      d.run(timeout: 8) do
+        sleep 7
+      end
+      assert_equal(2, d.events.size)
+
+      d.events.each do |tag, time, record|
+        assert_equal("test", tag)
+
+        assert_equal({"url"=>"http://127.0.0.1:3939/protected","status"=>200, "message"=>{"status"=>"OK"}}, record)
+        assert(time.is_a?(Fluent::EventTime))
+      end
+    end
+  end
+
+  private
+
+  def create_driver(conf)
+    Fluent::Test::Driver::Input.new(Fluent::Plugin::HttpPullInput).configure(conf)
+  end
+end

data/test/plugin/test_in_http_pull_request_method.rb

@@ -0,0 +1,79 @@
+require "helper"
+require "fluent/plugin/in_http_pull.rb"
+
+require 'ostruct'
+
+class HttpPullInputTestRequestMethod < Test::Unit::TestCase
+  @stub_server = nil
+
+  setup do
+    @stub_server = StubServer.new
+    @stub_server.start
+  end
+
+  teardown do
+    @stub_server.shutdown
+  end
+
+  sub_test_case "request method" do
+    TEST_INTERVAL_3_POST = %[
+      tag test
+      url http://127.0.0.1:3939/method_post
+
+      interval 3s
+      format json
+      http_method post
+    ]
+
+    TEST_INTERVAL_3_DELETE = %[
+      tag test
+      url http://127.0.0.1:3939/method_delete
+
+      interval 3s
+      format json
+      http_method delete
+    ]
+
+    test 'interval 3 with :post' do
+      d = create_driver TEST_INTERVAL_3_POST
+      assert_equal("test", d.instance.tag)
+      assert_equal(3, d.instance.interval)
+
+      d.run(timeout: 8) do
+        sleep 7
+      end
+      assert_equal(2, d.events.size)
+
+      d.events.each do |tag, time, record|
+        assert_equal("test", tag)
+
+        assert_equal({"url"=>"http://127.0.0.1:3939/method_post","status"=>200, "message"=>{"status"=>"OK"}}, record)
+        assert(time.is_a?(Fluent::EventTime))
+      end
+    end
+
+    test 'interval 3 with :delete' do
+      d = create_driver TEST_INTERVAL_3_DELETE
+      assert_equal("test", d.instance.tag)
+      assert_equal(3, d.instance.interval)
+
+      d.run(timeout: 8) do
+        sleep 7
+      end
+      assert_equal(2, d.events.size)
+
+      d.events.each do |tag, time, record|
+        assert_equal("test", tag)
+
+        assert_equal({"url"=>"http://127.0.0.1:3939/method_delete","status"=>200, "message"=>{"status"=>"OK"}}, record)
+        assert(time.is_a?(Fluent::EventTime))
+      end
+    end
+  end
+
+  private
+
+  def create_driver(conf)
+    Fluent::Test::Driver::Input.new(Fluent::Plugin::HttpPullInput).configure(conf)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-http-pull
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - filepang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-03 00:00:00.000000000 Z
+date: 2018-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -147,6 +147,11 @@ files:
 - test/helper/stub_proxy.rb
 - test/helper/stub_server.rb
 - test/plugin/test_in_http_pull.rb
+- test/plugin/test_in_http_pull_auth.rb
+- test/plugin/test_in_http_pull_basic.rb
+- test/plugin/test_in_http_pull_http_header.rb
+- test/plugin/test_in_http_pull_proxy.rb
+- test/plugin/test_in_http_pull_request_method.rb
 homepage: https://github.com/HatsuneMiku3939/fluent-plugin-http-pull
 licenses:
 - Apache-2.0
@@ -167,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: fluent-plugin-http-pull
@@ -176,3 +181,8 @@ test_files:
 - test/helper/stub_proxy.rb
 - test/helper/stub_server.rb
 - test/plugin/test_in_http_pull.rb
+- test/plugin/test_in_http_pull_auth.rb
+- test/plugin/test_in_http_pull_basic.rb
+- test/plugin/test_in_http_pull_http_header.rb
+- test/plugin/test_in_http_pull_proxy.rb
+- test/plugin/test_in_http_pull_request_method.rb