embulk-input-http 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3064560ca6c74c5dd45192601f60be97baecbd9
-  data.tar.gz: 90c0938ad61f88f669f1953adda9fddaf42ce7e2
+  metadata.gz: 913d001d72650ad4679b8096fe04f54a937f7926
+  data.tar.gz: 9af3fe59316a75a451a96469f58412ae769c07e1
 SHA512:
-  metadata.gz: 7f05f57578d98069719c77d922d2a4ff9d1379890c3ebaabfff23ecb4637bd619042f981f39ec1025cd5106e48e4caefd670191e9418fbb48ea5aabf268166da
-  data.tar.gz: f13f0abb999c3293ec484318aa4c57f4e2281a3dd98aa458029fd775969f236263831b23c931c63bf29ca57c25f1d49cb01e5f683ac4725439ee2cb971b0cbc5
+  metadata.gz: 948497dd6ec01d497b478730a4bb22a53a2c3ed1e35ce50ae9d24c3284e8655cd1f7ceab19555e7b4fb538ad80e0199590781a31866b4b0925fbec02ea5414d0
+  data.tar.gz: 3e5d676d85d6c070f29a33a9dbe7795569b6538e05cc3d8c79bf10299492631d006236fc48622c78d49ab0b8a4d203d2e8c90a4cc221033f45c1eced4856d5a0

data/README.md

@@ -32,6 +32,7 @@ in:
 - **params**: pair of name/value to specify query parameter (optional)
 - **method**: http method, get is used by default (optional)
 - **user_agent**: the usrr agent to specify request header (optional)
+- **request_headers**: the extra request headers as key-value (optional)
 - **charset**: charset to specify request header (optional, utf-8 is used by default)
 - **basic_auth**: username/password for basic authentication (optional)
 - **open_timeout**: timeout msec to open connection (optional, 2000 is used by default)
@@ -90,6 +91,7 @@ in:
     - {name: method, value: getStations}
     - {name: x, value: 135.0}
     - {name: y, value: "{35,34,33,32,31}.0", expand: true}
+　request_headers: {X-Some-Key1: some-value1, X-Some-key2: some-value2}
   parser:
     type: json
     root: $.response.station
@@ -129,7 +131,6 @@ in:
 
 ## TODO
 - HTTP-proxy
-- Custom hedaers
 - Guess
 
 ## Patch

data/build.gradle

@@ -13,7 +13,7 @@ configurations {
     provided
 }
 
-version = "0.0.11"
+version = "0.0.12"
 
 sourceCompatibility = 1.7
 targetCompatibility = 1.7

data/example/json-example.yml

@@ -6,13 +6,14 @@ in:
   params:
     - {name: method, value: getStations}
     - {name: x, value: 135.0}
-    - {name: y, value: "{35,34,33,32,31}.0", expand: true}
-    - {name: z, values: ["a", "b", "c"], expand: true}
+    - {name: y, value: "{35,34,33,32,31}.0", expand: 1}
+    - {name: z, values: ["a", "b", "c"], expand: 1}
   method: get
   user_agent: example_json
   charset: utf8
-  interval_includes_response_time: yes
   request_interval: 600
+  interval_includes_response_time: 1
+  request_headers: {X-Some-Key1: some-value1, X-Some-key2: some-value2}
   parser:
     type: none
 

data/settings.gradle

@@ -0,0 +1 @@
+rootProject.name = 'embulk-input-http'

data/src/main/java/org/embulk/input/HttpInputPlugin.java

@@ -34,6 +34,7 @@ import java.io.UnsupportedEncodingException;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 public class HttpInputPlugin implements FileInputPlugin {
 
@@ -89,6 +90,11 @@ public class HttpInputPlugin implements FileInputPlugin {
         @ConfigDefault("null")
         public Optional<BasicAuthConfig> getBasicAuth();
 
+        @Config("request_headers")
+        @ConfigDefault("{}")
+        public Map<String, String> getRequestHeaders();
+
+
         @ConfigInject
         public BufferAllocator getBufferAllocator();
 
@@ -227,6 +233,9 @@ public class HttpInputPlugin implements FileInputPlugin {
         headers.add(new BasicHeader("Accept-Encoding", "gzip, deflate"));
         headers.add(new BasicHeader("Accept-Language", "en-us,en;q=0.5"));
         headers.add(new BasicHeader("User-Agent", task.getUserAgent()));
+        for (Map.Entry<String,String> entry : task.getRequestHeaders().entrySet()) {
+            headers.add(new BasicHeader(entry.getKey(), entry.getValue()));
+        }
         return headers;
     }
 

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-http
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Takuma kanari
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-11-07 00:00:00.000000000 Z
+date: 2017-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+  name: bundler
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '10.0'
+  name: rake
   prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '10.0'
 description: Fetch data via http
 email:
 - chemtrails.t@gmail.com
@@ -57,6 +57,7 @@ files:
 - gradlew
 - gradlew.bat
 - lib/embulk/input/http.rb
+- settings.gradle
 - src/main/java/org/embulk/input/BasicAuthConfig.java
 - src/main/java/org/embulk/input/HttpInputPlugin.java
 - src/main/java/org/embulk/input/ParamsConfig.java
@@ -67,7 +68,7 @@ files:
 - src/test/java/org/embulk/input/TestQueryConfig.java
 - classpath/commons-codec-1.9.jar
 - classpath/commons-logging-1.2.jar
-- classpath/embulk-input-http-0.0.11.jar
+- classpath/embulk-input-http-0.0.12.jar
 - classpath/httpclient-4.4.jar
 - classpath/httpcore-4.4.jar
 homepage: https://github.com/takumakanari/embulk-input-http