embulk-input-http 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bc5ae1c890470e5d30b21ced647bd9e85e8a272
-  data.tar.gz: 77c89043f7c45fae6750eb84152053f10ae691a1
+  metadata.gz: 5a5521bcc6ec05740477ee1d0b1a4771057563ce
+  data.tar.gz: dd85ad0a597122ffb6b666ded12d25ba05c8dcb0
 SHA512:
-  metadata.gz: be0f73d6d3e4f33d7dcba51208e32446b5c31c4b4415bc6b415285234ec2982ffbc131a565914605b8d8331a371fd0daf143f4cf23f24a01d604be8dce1999fc
-  data.tar.gz: 44c57e268a4a9e4d0ecc7c8e06f836e62b7f69f2c760306665aba9e714eb7e522b025daabf9c23b34029ba9b5820094bd32c0170203ae78daaa3bb8f4eec57e0
+  metadata.gz: dbb23315e384a59799caaa502af1e6c8f51a0884bc74b2b7ce43eb6f96fff81a9ff1b5958a865054f626eab8c6a623bcf3567d8f83f56334f7099dbb0ab8fe97
+  data.tar.gz: 5f2f1c12f916e9847a4d3dc5a4c1cef760af8fc925b54c11e87d5492870e3ff56a0d01f97d4d9d8a2349713add5e58c2ed633bfde6d5672105f5ab70a4e84340

data/.gitignore

@@ -1,10 +1,8 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
+*~
 /pkg/
-/spec/reports/
 /tmp/
-*.gem
+.gradle/
+/classpath/
+build/
+.idea
+*.iml

data/README.md

@@ -1,7 +1,12 @@
 # Embulk::Input::Http
 
 Input HTTP plugin for [Embulk](https://github.com/embulk/embulk).
-Read content via HTTP and parse/iterate json(or xml) data.
+Fetch data via HTTP.
+
+
+### Big changes in v0.0.4
+
+From `v0.0.4`, *iterate* section is removed, embulk-input-http is must be used with some **parer plugin**.
 
 ## Installation
 
@@ -13,7 +18,7 @@ $ embulk gem install embulk-input-http
 
 ## Usage
 
-Specify in your config.yml file
+Specify in your config.yml file.
 
 ```yaml
 in:
@@ -23,130 +28,87 @@ in:
     - {name: method, value: getStations}
     - {name: x, value: 135.0}
     - {name: y, value: "{30..35}.0", expand: true}
-  schema:
-    - {name: name, type: string}
-    - {name: next, type: string}
-    - {name: prev, type: string}
-    - {name: distance, type: string}
-    - {name: lat, type: double, path: x}
-    - {name: lng, type: double, path: y}
-    - {name: line, type: string}
-    - {name: postal, type: string}
-  iterate: {type: json, path: $.response.station}
   method: get
 ```
 
-- type: specify this plugin as `http`
-- url: base url something like api (required)
-- schema: specify the attribute of table and data type (required)
-- iterate: data type and path to find root data, json/xml is supported for now (required)
-- method: http method, get is used by default (optional)
-- params: pair of name/value to specify query parameter (optional)
-- open_timeout: timeout to open connection (optional, 5 is used by default)
-- read_timeout: timeout to read content via http (optional, 10 is used by default)
-
-### Iterate data
-
-You can specify 2 types to parse result from HTTP api in *iterate* section.
-
-
-#### json
-
-For this type, you need to specify *path* as  [jsonpath](http://goessner.net/articles/JsonPath/).
-
-for example:
+- **type**: specify this plugin as `http`
+- **url**: base url something like api (required)
+- **parser**: parser plugin to parse data in response (required)
+- **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)
+- **charset**: Charset to specify request header (optional, utf-8 is used by default)
+- **open_timeout**: timeout msec to open connection (optional, 2000 is used by default)
+- **read_timeout**: timeout msec to read content via http (optional, 10000 is used by default)
 
-```json
-{
-    "result" : "success",
-    "students" : [
-      { "name" : "John", "age" : 10 },
-      { "name" : "Paul", "age" : 16 },
-      { "name" : "George", "age" : 17 },
-      { "name" : "Ringo", "age" : 18 }
-    ]
-}
-```
-
-You can iterate "students" node by the following condifuration:
 
-    iterate: {type: json, path: $.students}
+### Brace expansion style in params
 
-You can specify jsonpath to also *path* in schema section:
+In *params* section, you can specify also multilple params by using **brace expansion style**.
 
 ```yaml
-schema:
-  - {name: firstName, type: string, path: "names[0]"}
-  - {name: lastName, type: string, path: "names[1]"}
-iterate: {type: json, path: $.students}
-```
-
-Then you can make record from more complicated json like as follows:
-
-```json
-{
-    "result" : "success",
-    "students" : [
-      { "names" : ["John", "Lennon"], "age" : 10 },
-      { "names" : ["Paul", "Maccartney"], "age" : 10 }
-    ]
-}
-```
-
-In this case, names[0] will be firstName of schema and names[1] will be lastName.
-
-
-#### xml
-
-You can parse also xml by specifing **path/to/node** style to *path*.
-
-for example:
-
-
-```xml
-<data>
-  <result>true</result>
-  <students>
-    <student>
-      <name>John</name>
-      <age>10</name>
-    <student>
-    <student>
-      <name>Paul</name>
-      <age>16</name>
-    <student>
-    <student>
-      <name>George</name>
-      <age>17</name>
-    <student>
-    <student>
-      <name>Ringo</name>
-      <age>18</name>
-    <student>
-  </students>
+params
+  - {name: id, value "{5,4,3,2,1}", expand: true}
+  - {name: name, value "{John,Paul,George,Ringo}", expand: true}
 ```
 
-Configuration as below to iterate student node:
+To use this style, you need to set true to parameter *expand*, then all patterns of query will be called in a defferent request.
 
-    iterate: {type: xml, path: data/students/student}
 
-### Brace expansion style in params
+## Example
 
-In *params* section, you can specify also multilple params by using **brace expansion style**.
+### Fetch json via http api
 
 ```yaml
-params
-  - {name: id, value "{1..5}", expand: true}
-  - {name: name, value "{John,Paul,George,Ringo}", expand: true}
+in:
+  type: http
+  url: http://express.heartrails.com/api/json
+  params:
+    - {name: method, value: getStations}
+    - {name: x, value: 135.0}
+    - {name: y, value: "{35,34,33,32,31}.0", expand: true}
+  parser:
+    type: json
+    root: $.response.station
+    schema:
+      - {name: name, type: string}
+      - {name: next, type: string}
+      - {name: prev, type: string}
+      - {name: distance, type: string}
+      - {name: lat, type: double, path: x}
+      - {name: lng, type: double, path: y}
+      - {name: line, type: string}
+      - {name: postal, type: string}
 ```
 
-To use this style, you need to set true to parameter *expand*, then all patterns of query will be called in a defferent request.
+### Fetch csv
 
+```yaml
+in:
+  type: http
+  url: http://192.168.33.10:8085/sample.csv
+    - {name: y, value: "{35,34,33,32,31}.0", expand: true}
+  parser:
+    charset: UTF-8
+    newline: CRLF
+    type: csv
+    delimiter: ','
+    quote: '"'
+    escape: ''
+    skip_header_lines: 1
+    columns:
+    - {name: id, type: long}
+    - {name: account, type: long}
+    - {name: time, type: timestamp, format: '%Y-%m-%d %H:%M:%S'}
+    - {name: purchase, type: timestamp, format: '%Y%m%d'}
+    - {name: comment, type: string}
+```
 
 ## TODO
-- Split input/formatter
 - BasicAuth
 - HTTP-proxy
+- Custom hedaers
+- Guess
 
 ## Patch
 

data/build.gradle

@@ -0,0 +1,55 @@
+plugins {
+    id "com.jfrog.bintray" version "1.1"
+    id "com.github.jruby-gradle.base" version "0.1.5"
+    id "java"
+}
+import com.github.jrubygradle.JRubyExec
+repositories {
+    mavenCentral()
+    jcenter()
+}
+configurations {
+    provided
+}
+
+version = "0.0.4"
+
+dependencies {
+    compile  "org.embulk:embulk-core:0.5.2"
+    compile  "org.apache.httpcomponents:httpclient:4.4"
+    provided "org.embulk:embulk-core:0.5.2"
+    testCompile "junit:junit:4.+"
+}
+
+task classpath(type: Copy, dependsOn: ["jar"]) {
+    doFirst { file("classpath").deleteDir() }
+    from (configurations.runtime - configurations.provided + files(jar.archivePath))
+    into "classpath"
+}
+clean { delete 'classpath' }
+
+task gem(type: JRubyExec, dependsOn: ["build", "gemspec", "classpath"]) {
+    jrubyArgs "-rrubygems/gem_runner", "-eGem::GemRunner.new.run(ARGV)", "build"
+    script "build/gemspec"
+    doLast { ant.move(file: "${project.name}-${project.version}.gem", todir: "pkg") }
+}
+
+task gemspec << { file("build/gemspec").write($/
+Gem::Specification.new do |spec|
+  spec.name          = "${project.name}"
+  spec.version       = "${project.version}"
+  spec.authors       = ["Takuma kanari"]
+  spec.email         = ["chemtrails.t@gmail.com"]
+  spec.summary       = %q{Embulk plugin for http input}
+  spec.description   = %q{Fetch data via http}
+  spec.homepage      = "https://github.com/takumakanari/embulk-input-http"
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files`.split("\n") + Dir["classpath/*.jar"]
+  spec.test_files    = spec.files.grep(%r"^(test|spec)/")
+  spec.require_paths = ["lib"]
+  spec.add_development_dependency 'bundler', ['~> 1.0']
+  spec.add_development_dependency 'rake', ['>= 10.0']
+end
+/$)
+}

data/example/json-example.yml

@@ -1,21 +1,27 @@
 exec: {}
+
 in:
   type: http
   url: http://express.heartrails.com/api/json
   params:
     - {name: method, value: getStations}
     - {name: x, value: 135.0}
-    - {name: y, value: 35.0}
-  schema:
-    - {name: name, type: string}
-    - {name: next, type: string}
-    - {name: prev, type: string}
-    - {name: distance, type: string}
-    - {name: lat, type: double, path: x}
-    - {name: lng, type: double, path: y}
-    - {name: line, type: string}
-    - {name: postal, type: string}
+    - {name: y, value: "{35,34,33,32,31}.0", expand: true}
   method: get
-  iterate: {type: json, path: $.response.station}
+  user_agent: example_json
+  charset: utf8
+  parser:
+    type: json
+    root: $.response.station
+    schema:
+      - {name: name, type: string}
+      - {name: next, type: string}
+      - {name: prev, type: string}
+      - {name: distance, type: string}
+      - {name: lat, type: double, path: x}
+      - {name: lng, type: double, path: y}
+      - {name: line, type: string}
+      - {name: postal, type: string}
+
 out: {type: stdout}
 

data/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Sat Mar 14 12:49:15 JST 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip

data/gradlew

@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

data/gradlew.bat

@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega