embulk-input-http 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ebbbb5d16b7496fb5933d3c9680c7b5d38d133c
-  data.tar.gz: b1c14c5409eea15e7a5c06926585e06308a40c24
+  metadata.gz: d106f68b837bc832cfdc9761b71f7489f89d0adf
+  data.tar.gz: 7a69f451397cd623cf2a813b82180aab8f251f12
 SHA512:
-  metadata.gz: f28897b0bfd4ede1e9e5a5723e4f1ce1d0c1baa676aa2cbe6aac184c8e4c20c936f75f2765eff408a906a52572da183a549cf0bda3f94647e01594ea002affec
-  data.tar.gz: fa75cbab09a61217da184c4694dbbc1b2af824ff7c4147a8c44221a2c4e0fabe9e4e83d9322f4d388bd1968b13aaad753c43b620f31babcbcaa68adc5d8fb45e
+  metadata.gz: 7bbe32a099103303e3dec079292cd268e33478d08f4099ba665df167f38776b7aa0a87083367f1b19979af6df37b5c85c4cc42567d400eb4d3292b4079b388ae
+  data.tar.gz: be742d9cbf99f5ac7530bbafd034e551aa4db83aacd50600f124fd3f0a3ba90145bce7ba8f029c9f48380526b0e295588290cd387ba21429b4f6213c0c23c539

data/.circleci/config.yml

@@ -0,0 +1,31 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: circleci/openjdk:8-jdk
+
+    working_directory: ~/repo
+
+    environment:
+      # Customize the JVM maximum heap limit
+      JVM_OPTS: -Xmx3200m
+      TERM: dumb
+
+    steps:
+      - checkout
+
+      # Download and cache dependencies
+      - restore_cache:
+          keys:
+          - v1-dependencies-{{ checksum "build.gradle" }}
+          - v1-dependencies-
+
+      - run: gradle dependencies
+
+      - save_cache:
+          paths:
+            - ~/.gradle
+          key: v1-dependencies-{{ checksum "build.gradle" }}
+
+      - run: gradle test
+

data/README.md

@@ -1,5 +1,7 @@
 # Embulk::Input::Http
 
+[![CircleCI](https://circleci.com/gh/takumakanari/embulk-input-http.svg?style=svg)](https://circleci.com/gh/takumakanari/embulk-input-http)
+
 Input HTTP plugin for [Embulk](https://github.com/embulk/embulk).
 Fetch data via HTTP.
 
@@ -34,6 +36,7 @@ in:
 - **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)
+- **request_body**: the request body content, enabled if method is post and params are empty (optional)
 - **charset**: charset to specify request header (optional, default: utf8)
 - **basic_auth**: username/password for basic authentication (optional)
 - **open_timeout**: timeout msec to open connection (optional, default: 2000)

data/build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id "com.jfrog.bintray" version "1.1"
-    id "com.github.jruby-gradle.base" version "0.1.5"
+    id "com.github.jruby-gradle.base" version "1.5.0"
     id "java"
     id "checkstyle"
 }
@@ -13,7 +13,7 @@ configurations {
     provided
 }
 
-version = "0.0.19"
+version = "0.0.20"
 
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
@@ -51,23 +51,29 @@ task checkstyle(type: Checkstyle) {
 }
 
 task gem(type: JRubyExec, dependsOn: ["gemspec", "classpath"]) {
-    jrubyArgs "-rrubygems/gem_runner", "-eGem::GemRunner.new.run(ARGV)", "build"
-    script "${project.name}.gemspec"
+    jrubyArgs "-S"
+    script "gem"
+    scriptArgs "build", "${project.name}.gemspec"
     doLast { ant.move(file: "${project.name}-${project.version}.gem", todir: "pkg") }
 }
 
 task gemPush(type: JRubyExec, dependsOn: ["gem"]) {
-    jrubyArgs "-rrubygems/gem_runner", "-eGem::GemRunner.new.run(ARGV)", "push"
-    script "pkg/${project.name}-${project.version}.gem"
+    jrubyArgs "-S"
+    script "gem"
+    scriptArgs "push", "pkg/${project.name}-${project.version}.gem"
 }
 
-task "package"(dependsOn: ["gemspec", "classpath"]) << {
-    println "> Build succeeded."
-    println "> You can run embulk with '-L ${file(".").absolutePath}' argument."
+task "package"(dependsOn: ["gemspec", "classpath"]) {
+    doLast {
+        println "> Build succeeded."
+        println "> You can run embulk with '-L ${file(".").absolutePath}' argument."
+    }
 }
 
 
-task gemspec << { file("${project.name}.gemspec").write($/
+task gemspec {
+    doLast {
+        file("${project.name}.gemspec").write($/
 Gem::Specification.new do |spec|
   spec.name          = "${project.name}"
   spec.version       = "${project.version}"
@@ -85,5 +91,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', ['>= 10.0']
 end
 /$)
+    }
 }
 clean { delete "${project.name}.gemspec" }

data/example/json-example.yml

@@ -13,6 +13,8 @@ in:
   request_interval: 600
   interval_includes_response_time: 1
   request_headers: {X-Some-Key1: some-value1, X-Some-key2: some-value2}
+#  request_body: |
+#    {"field1" : "one", "field2" : 2}
   pager: {from_param: from, to_param: to, pages: 10, step: 100}
 #  input_direct: false
   parser:

data/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Thu Jun 21 15:19:12 JST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

data/src/main/java/org/embulk/input/http/HttpFileInputPlugin.java

@@ -16,6 +16,7 @@ import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.client.methods.HttpRequestBase;
 import org.apache.http.client.utils.URIBuilder;
+import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.message.BasicHeader;
@@ -106,6 +107,10 @@ public class HttpFileInputPlugin implements FileInputPlugin
         @ConfigDefault("null")
         Optional<ParamsOption> getParams();
 
+        @Config("request_body")
+        @ConfigDefault("null")
+        Optional<String> getRequestBody();
+
         @Config("basic_auth")
         @ConfigDefault("null")
         Optional<BasicAuthOption> getBasicAuth();
@@ -268,7 +273,7 @@ public class HttpFileInputPlugin implements FileInputPlugin
             }
             return request;
         }
-        else if (task.getHttpMethod() == HttpMethod.POST) {
+        if (task.getHttpMethod() == HttpMethod.POST) {
             HttpPost request = new HttpPost(task.getUrl());
             if (queries != null) {
                 List<NameValuePair> pairs = new ArrayList<>();
@@ -279,6 +284,10 @@ public class HttpFileInputPlugin implements FileInputPlugin
                 }
                 request.setEntity(new UrlEncodedFormEntity(pairs));
             }
+            else if (task.getRequestBody().isPresent()) {
+                logger.info(new StringEntity(task.getRequestBody().get()).toString());
+                request.setEntity(new StringEntity(task.getRequestBody().get()));
+            }
             return request;
         }
         throw new IllegalArgumentException(String.format("Unsupported http method %s", task.getMethod()));

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-http
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - Takuma kanari
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-06-09 00:00:00.000000000 Z
+date: 2018-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   name: bundler
@@ -21,13 +21,13 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
   name: rake
@@ -35,7 +35,7 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
 description: Fetch data via http
@@ -45,10 +45,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".circleci/config.yml"
+- ".gitignore"
 - LICENSE.txt
 - README.md
 - build.gradle
+- classpath/commons-codec-1.10.jar
+- classpath/commons-io-2.6.jar
+- classpath/commons-logging-1.2.jar
+- classpath/embulk-input-http-0.0.20.jar
+- classpath/httpclient-4.5.5.jar
+- classpath/httpcore-4.4.9.jar
 - config/checkstyle/checkstyle.xml
 - config/checkstyle/default.xml
 - example/json-example.yml
@@ -68,12 +75,6 @@ files:
 - src/test/java/org/embulk/input/http/TestPagerOption.java
 - src/test/java/org/embulk/input/http/TestParamsOption.java
 - src/test/java/org/embulk/input/http/TestQueryOption.java
-- classpath/commons-codec-1.10.jar
-- classpath/commons-io-2.6.jar
-- classpath/commons-logging-1.2.jar
-- classpath/embulk-input-http-0.0.19.jar
-- classpath/httpclient-4.5.5.jar
-- classpath/httpcore-4.4.9.jar
 homepage: https://github.com/takumakanari/embulk-input-http
 licenses:
 - MIT
@@ -84,17 +85,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.6.8
 signing_key:
 specification_version: 4
 summary: Embulk plugin for http input