embulk-input-http 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c03f483d0ec3c8838d1538940f9a206c0e3b58f8
-  data.tar.gz: 6e1e2d691f5d5acd099f12edb1cf6a3986a190ab
+  metadata.gz: e0fd9d1c50eb1690a68282058341d8dfe47c2706
+  data.tar.gz: e64cca9c2d869cbd0a107331aad8ca91e4187441
 SHA512:
-  metadata.gz: c32fe0519c6d8444291cd7eb552256ae828106c160616490510d780fd1583cb98c482cc7351950dcc733d8e8c7f38aa378619c26a4b51317adffd086abb371c8
-  data.tar.gz: 518387033e044784f908c95e6af973882df9ab68da75066c5eb10b9b07151094c370b44ad9cbb878e3dd92efd907e18ba4ac9b635749bce7be6cf8964234db63
+  metadata.gz: 72182010d6bb889cc86203e466d1cdcf35a64d47e4e38167414b7d204320558e7659aa3c09c0448e679c10a41a6e9884b278e63b545a4271d3b6f10571222760
+  data.tar.gz: cfe7a025c51abc126e4837578815b2139f7c938a0ee41e32f3a5d919589fdb1f03d18c61fa768b299bcd6d2258154dc764ff768c700de6c59c966d14e77bd782

data/README.md

@@ -29,11 +29,11 @@ in:
 
 - **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)
+- **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)
 - **read_timeout**: timeout msec to read content via http (optional, 10000 is used by default)
 - **max_retries**: max number of retry request if failed (optional, 5 is used by default)
@@ -42,15 +42,39 @@ in:
 
 ### Brace expansion style in params
 
-In *params* section, you can specify also multilple params by using **brace expansion style**.
+In *params* section, you can specify also multilple requests by using **values** or **brace expansion style** with set **expand** true.
+
+The configuration using **values** is as below:
 
 ```yaml
-params
+params:
+  - {name: id, values: [5, 4, 3, 2, 1]}
+  - {name: name, values: ["John", "Paul", "George", "Ringo"], expand: true}
+```
+
+Also You can rewrite this configuration by using **brace expansion style** like as follows:
+
+
+```yaml
+params:
   - {name: id, value "{5,4,3,2,1}", expand: true}
   - {name: name, value "{John,Paul,George,Ringo}", expand: true}
 ```
 
-To use this style, you need to set true to parameter *expand*, then all patterns of query will be called in a defferent request.
+Then all patterns of query will be called in a defferent request.
+
+By default, **expand** is false. In this case, all values will be multiple params in one request.
+
+
+### Use basic authentication
+
+You can specify username/password for basic authentication.
+
+```yaml
+basic_auth:
+ - user: MyUser
+ - password: MyPassword
+```
 
 
 ## Example
@@ -103,7 +127,6 @@ in:
 ```
 
 ## TODO
-- BasicAuth
 - HTTP-proxy
 - Custom hedaers
 - Guess

data/build.gradle

@@ -12,7 +12,7 @@ configurations {
     provided
 }
 
-version = "0.0.5"
+version = "0.0.6"
 
 dependencies {
     compile  "org.embulk:embulk-core:0.5.2"

data/example/json-example.yml

@@ -7,6 +7,7 @@ in:
     - {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}
   method: get
   user_agent: example_json
   charset: utf8

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

@@ -0,0 +1,39 @@
+package org.embulk.input;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.base.Objects;
+
+public class BasicAuthConfig {
+
+    private final String user;
+    private final String password;
+
+    @JsonCreator
+    public BasicAuthConfig(
+            @JsonProperty("user") String user,
+            @JsonProperty("password") String password) {
+        this.user = user;
+        this.password = password;
+    }
+
+    @JsonProperty("user")
+    public String getUser() {
+        return user;
+    }
+
+    @JsonProperty("password")
+    public String getPassword() {
+        return password;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(user, password);
+    }
+
+    @Override
+    public String toString() {
+        return String.format("BasicAuthConfig[%s, %s]", getUser(), getPassword());
+    }
+}

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

@@ -2,13 +2,14 @@ package org.embulk.input;
 
 import com.google.common.base.Optional;
 import com.google.common.base.Throwables;
+import com.google.common.collect.Lists;
 import org.apache.http.Header;
 import org.apache.http.HttpException;
 import org.apache.http.HttpResponse;
-import org.apache.http.conn.HttpClientConnectionManager;
-import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
-import org.apache.http.util.EntityUtils;
 import org.apache.http.NameValuePair;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.CredentialsProvider;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.HttpRequestRetryHandler;
 import org.apache.http.client.config.RequestConfig;
@@ -17,6 +18,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.impl.client.BasicCredentialsProvider;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.message.BasicHeader;
 import org.apache.http.message.BasicNameValuePair;
@@ -31,7 +33,6 @@ import org.slf4j.Logger;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.ByteArrayInputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
@@ -76,19 +77,26 @@ public class HttpInputPlugin implements FileInputPlugin {
         @Config("sleep_before_request")
         @ConfigDefault("0")
         public int getSleepBeforeRequest();
+
         public void setSleepBeforeRequest(int sleepBeforeRequest);
 
         @Config("params")
         @ConfigDefault("null")
         public Optional<ParamsConfig> getParams();
 
+        @Config("basic_auth")
+        @ConfigDefault("null")
+        public Optional<BasicAuthConfig> getBasicAuth();
+
         @ConfigInject
         public BufferAllocator getBufferAllocator();
 
-        public List<ParamsConfig> getQueries();
-        public void setQueries(List<ParamsConfig> queries);
+        public List<List<QueryConfig.Query>> getQueries();
+
+        public void setQueries(List<List<QueryConfig.Query>> queries);
 
         public HttpMethod getHttpMethod();
+
         public void setHttpMethod(HttpMethod httpMethod);
     }
 
@@ -103,11 +111,11 @@ public class HttpInputPlugin implements FileInputPlugin {
 
         int numOfThreads = 1;
         if (task.getParams().isPresent()) {
-            List<ParamsConfig> expandedQueries = task.getParams().get().expandQueries();
+            List<List<QueryConfig.Query>> expandedQueries = task.getParams().get().expandQueries();
             task.setQueries(expandedQueries);
             numOfThreads = expandedQueries.size();
         } else {
-            task.setQueries(new ArrayList<ParamsConfig>());
+            task.setQueries(Lists.<List<QueryConfig.Query>>newArrayList());
         }
 
         if (numOfThreads == 1) {
@@ -164,6 +172,11 @@ public class HttpInputPlugin implements FileInputPlugin {
             builder.setRetryHandler(retryHandler);
         }
 
+        if (task.getBasicAuth().isPresent()) {
+            builder.setDefaultCredentialsProvider(makeCredentialsProvider(task.getBasicAuth().get(),
+                    request));
+        }
+
         HttpClient client = builder.build();
 
         if (task.getSleepBeforeRequest() > 0) {
@@ -190,26 +203,39 @@ public class HttpInputPlugin implements FileInputPlugin {
         }
     }
 
+    private CredentialsProvider makeCredentialsProvider(BasicAuthConfig config, HttpRequestBase scopeRequest) {
+        final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+        final AuthScope authScope = new AuthScope(scopeRequest.getURI().getHost(),
+                scopeRequest.getURI().getPort());
+        credentialsProvider.setCredentials(authScope,
+                new UsernamePasswordCredentials(config.getUser(), config.getPassword()));
+        return credentialsProvider;
+    }
+
     private HttpRequestBase makeRequest(PluginTask task, int taskIndex)
             throws URISyntaxException, UnsupportedEncodingException {
-        final ParamsConfig paramsConfig = (task.getQueries().isEmpty()) ?
+        final List<QueryConfig.Query> queries = (task.getQueries().isEmpty()) ?
                 null : task.getQueries().get(taskIndex);
         if (task.getHttpMethod() == HttpMethod.GET) {
             HttpGet request = new HttpGet(task.getUrl());
-            if (paramsConfig != null) {
+            if (queries != null) {
                 URIBuilder builder = new URIBuilder(request.getURI());
-                for (QueryConfig p : paramsConfig.getQueries()) {
-                    builder.addParameter(p.getName(), p.getValue());
+                for (QueryConfig.Query q : queries) {
+                    for (String v : q.getValues()) {
+                        builder.addParameter(q.getName(), v);
+                    }
                 }
                 request.setURI(builder.build());
             }
             return request;
         } else if (task.getHttpMethod() == HttpMethod.POST) {
             HttpPost request = new HttpPost(task.getUrl());
-            if (paramsConfig != null) {
+            if (queries != null) {
                 List<NameValuePair> pairs = new ArrayList<>();
-                for (QueryConfig p : paramsConfig.getQueries()) {
-                    pairs.add(new BasicNameValuePair(p.getName(), p.getValue()));
+                for (QueryConfig.Query q : queries) {
+                    for (String v : q.getValues()) {
+                        pairs.add(new BasicNameValuePair(q.getName(), v));
+                    }
                 }
                 request.setEntity(new UrlEncodedFormEntity(pairs));
             }

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

@@ -21,26 +21,26 @@ public class ParamsConfig {
         return queries;
     }
 
-    public List<ParamsConfig> expandQueries() {
-        List<List<QueryConfig>> base = new ArrayList<>(queries.size());
+    public List<List<QueryConfig.Query>> expandQueries() {
+        List<List<QueryConfig.Query>> base = new ArrayList<>(queries.size());
         for (QueryConfig p : queries) {
             base.add(p.expand());
         }
 
         int productSize = 1;
         int baseSize = base.size();
-        for (int i = 0; i < baseSize; productSize *= base.get(i).size(), i++);
+        for (int i = 0; i < baseSize; productSize *= base.get(i).size(), i++) ;
 
-        List<ParamsConfig> expands = new ArrayList<>(productSize);
-        for(int i = 0; i < productSize; i++) {
+        List<List<QueryConfig.Query>> expands = new ArrayList<>(productSize);
+        for (int i = 0; i < productSize; i++) {
             int j = 1;
-            List<QueryConfig> query = new ArrayList<>();
-            for(List<QueryConfig> list : base) {
-                QueryConfig pc = list.get((i / j) % list.size());
+            List<QueryConfig.Query> query = new ArrayList<>();
+            for (List<QueryConfig.Query> list : base) {
+                QueryConfig.Query pc = list.get((i / j) % list.size());
                 query.add(pc);
                 j *= list.size();
             }
-            expands.add(new ParamsConfig(query));
+            expands.add(query);
         }
 
         return expands;

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

@@ -1,8 +1,9 @@
 package org.embulk.input;
 
-import com.google.common.base.Objects;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.base.Objects;
+import com.google.common.base.Optional;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -10,30 +11,48 @@ import java.util.List;
 public class QueryConfig {
 
     private final String name;
-    private final String value;
+    private final Optional<String> value;
+    private final Optional<List<String>> values;
     private final boolean expand;
 
     @JsonCreator
     public QueryConfig(
             @JsonProperty("name") String name,
-            @JsonProperty("value") String value,
+            @JsonProperty("value") Optional<String> value,
+            @JsonProperty("values") Optional<List<String>> values,
             @JsonProperty("expand") boolean expand) {
         this.name = name;
         this.value = value;
+        this.values = values;
         this.expand = expand;
     }
 
-    public List<QueryConfig> expand() {
-        List<QueryConfig> dest;
-        if (!expand) {
-            dest = new ArrayList<>(1);
-            dest.add(this);
-        } else {
-            List<String> expanded = BraceExpansion.expand(value);
-            dest = new ArrayList<>(expanded.size());
-            for(String s : expanded) {
-                dest.add(new QueryConfig(name, s, false));
+    public List<Query> expand() {
+        List<Query> dest;
+        if (value.isPresent()) {
+            if (expand) {
+                List<String> expanded = BraceExpansion.expand(value.get());
+                dest = new ArrayList<>(expanded.size());
+                for (String s : expanded) {
+                    dest.add(new Query(name, s));
+                }
+            } else {
+                dest = new ArrayList<>(1);
+                dest.add(new Query(name, value.get()));
             }
+        } else if (values.isPresent()) {
+            if (expand) {
+                dest = new ArrayList<>(values.get().size());
+                for (String s : values.get()) {
+                    dest.add(new Query(name, s));
+                }
+            } else {
+                dest = new ArrayList<>(1);
+                final String[] valueArr = values.get().toArray(new String[values.get().size()]);
+                dest.add(new Query(name, valueArr));
+            }
+        } else {
+            throw new IllegalArgumentException("value or values must be specified to 'params'");
         }
         return dest;
     }
@@ -44,7 +63,7 @@ public class QueryConfig {
     }
 
     @JsonProperty("value")
-    public String getValue() {
+    public Optional<String> getValue() {
         return value;
     }
 
@@ -78,6 +97,26 @@ public class QueryConfig {
                 getName(), getValue(), isExpand());
     }
 
+    public static class Query {
+        private final String name;
+        private final String[] values;
+
+        public Query(
+                @JsonProperty("name") String name,
+                @JsonProperty("values") String... values) {
+            this.name = name;
+            this.values = values;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public String[] getValues() {
+            return values;
+        }
+    }
+
     private static class BraceExpansion {
 
         public static List<String> expand(String s) {
@@ -112,7 +151,9 @@ public class QueryConfig {
                 if (suffix.length() > 0) {
                     expandRecursive(prefix + s, suffix, "", dest);
                 } else {
-                    dest.add(String.format("%s%s%s", prefix, s, suffix));
+                    final String out = String.format("%s%s%s", prefix, s, suffix).
+                            replaceAll("[\\\\]{2}", "\\").replaceAll("[\\\\]([,}{])", "$1");
+                    dest.add(out);
                 }
             } else {
                 for (String m : sb.substring(i1 + 1, i2).split("\u0000", -1)) {

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

@@ -31,14 +31,14 @@ public class RetryHandler extends DefaultHttpRequestRetryHandler
     public boolean retryRequest(final IOException exception,
                                 final int executionCount, final HttpContext context)
     {
-        final boolean isRertriable = super.retryRequest(exception, executionCount, context);
-        if (isRertriable) {
+        final boolean isRetriable = super.retryRequest(exception, executionCount, context);
+        if (isRetriable) {
             try {
                 logger.info(String.format("Sleep %d msec before retry", interval));
                 Thread.sleep(interval);
             } catch (InterruptedException e) {}
         }
-        return isRertriable;
+        return isRetriable;
     }
 
 }

data/src/test/java/org/embulk/input/TestParamsConfig.java

@@ -0,0 +1,101 @@
+package org.embulk.input;
+
+import com.google.common.base.Optional;
+import com.google.common.collect.Lists;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+
+public class TestParamsConfig {
+
+    @Test
+    public void testUnexpandQueriesSinglePair() throws Exception {
+        Optional<List<String>> nullValues = Optional.absent();
+        QueryConfig q1 = new QueryConfig("test1", Optional.of("awasome1"), nullValues, false);
+        QueryConfig q2 = new QueryConfig("test2", Optional.of("awasome2"), nullValues, false);
+        ParamsConfig paramsConfig = new ParamsConfig(Lists.newArrayList(q1, q2));
+        List<List<QueryConfig.Query>> dest = paramsConfig.expandQueries();
+        assertEquals(dest.size(), 1);
+        assertEquals(dest.get(0).size(), 2);
+        assertEquals(dest.get(0).get(0).getName(), "test1");
+        assertEquals(dest.get(0).get(0).getValues()[0], "awasome1");
+        assertEquals(dest.get(0).get(1).getName(), "test2");
+        assertEquals(dest.get(0).get(1).getValues()[0], "awasome2");
+    }
+
+    @Test
+    public void testUnexpandQueriesExpandPair() throws Exception {
+        Optional<String> nullValue = Optional.absent();
+        List<String> values1 = Lists.newArrayList("a", "b");
+        List<String> values2 = Lists.newArrayList("c", "d");
+
+        QueryConfig q1 = new QueryConfig("test1", nullValue, Optional.of(values1), false);
+        QueryConfig q2 = new QueryConfig("test2", nullValue, Optional.of(values2), false);
+
+        ParamsConfig paramsConfig = new ParamsConfig(Lists.newArrayList(q1, q2));
+        List<List<QueryConfig.Query>> dest = paramsConfig.expandQueries();
+        assertEquals(dest.size(), 1);
+        assertEquals(dest.get(0).size(), 2);
+        assertEquals(dest.get(0).get(0).getName(), "test1");
+        assertEquals(dest.get(0).get(0).getValues()[0], "a");
+        assertEquals(dest.get(0).get(0).getValues()[1], "b");
+        assertEquals(dest.get(0).get(1).getName(), "test2");
+        assertEquals(dest.get(0).get(1).getValues()[0], "c");
+        assertEquals(dest.get(0).get(1).getValues()[1], "d");
+    }
+
+    @Test
+    public void testExpandQueriesSinglePair() throws Exception {
+        Optional<List<String>> nullValues = Optional.absent();
+        QueryConfig q1 = new QueryConfig("test1", Optional.of("awasome1"), nullValues, true);
+        QueryConfig q2 = new QueryConfig("test2", Optional.of("awasome2"), nullValues, true);
+        ParamsConfig paramsConfig = new ParamsConfig(Lists.newArrayList(q1, q2));
+        List<List<QueryConfig.Query>> dest = paramsConfig.expandQueries();
+        assertEquals(dest.size(), 1);
+        assertEquals(dest.get(0).size(), 2);
+        assertEquals(dest.get(0).get(0).getName(), "test1");
+        assertEquals(dest.get(0).get(0).getValues()[0], "awasome1");
+        assertEquals(dest.get(0).get(1).getName(), "test2");
+        assertEquals(dest.get(0).get(1).getValues()[0], "awasome2");
+    }
+
+    @Test
+    public void testExpandQueriesExpandPair() throws Exception {
+        Optional<String> nullValue = Optional.absent();
+        List<String> values1 = Lists.newArrayList("a", "b");
+        List<String> values2 = Lists.newArrayList("c", "d");
+
+        QueryConfig q1 = new QueryConfig("test1", nullValue, Optional.of(values1), true);
+        QueryConfig q2 = new QueryConfig("test2", nullValue, Optional.of(values2), true);
+
+        ParamsConfig paramsConfig = new ParamsConfig(Lists.newArrayList(q1, q2));
+        List<List<QueryConfig.Query>> dest = paramsConfig.expandQueries();
+        assertEquals(dest.size(), 4);
+
+        assertEquals(dest.get(0).size(), 2);
+        assertEquals(dest.get(0).get(0).getName(), "test1");
+        assertEquals(dest.get(0).get(0).getValues()[0], "a");
+        assertEquals(dest.get(0).get(1).getName(), "test2");
+        assertEquals(dest.get(0).get(1).getValues()[0], "c");
+
+        assertEquals(dest.get(1).size(), 2);
+        assertEquals(dest.get(1).get(0).getName(), "test1");
+        assertEquals(dest.get(1).get(0).getValues()[0], "b");
+        assertEquals(dest.get(1).get(1).getName(), "test2");
+        assertEquals(dest.get(1).get(1).getValues()[0], "c");
+
+        assertEquals(dest.get(2).size(), 2);
+        assertEquals(dest.get(2).get(0).getName(), "test1");
+        assertEquals(dest.get(2).get(0).getValues()[0], "a");
+        assertEquals(dest.get(2).get(1).getName(), "test2");
+        assertEquals(dest.get(2).get(1).getValues()[0], "d");
+
+        assertEquals(dest.get(3).size(), 2);
+        assertEquals(dest.get(3).get(0).getName(), "test1");
+        assertEquals(dest.get(3).get(0).getValues()[0], "b");
+        assertEquals(dest.get(3).get(1).getName(), "test2");
+        assertEquals(dest.get(3).get(1).getValues()[0], "d");
+    }
+}

data/src/test/java/org/embulk/input/TestQueryConfig.java

@@ -0,0 +1,125 @@
+package org.embulk.input;
+
+import com.google.common.base.Optional;
+import com.google.common.collect.Lists;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+
+public class TestQueryConfig {
+
+    @Test
+    public void testUnexpandSingleValue() throws Exception {
+        Optional<List<String>> nullValues = Optional.absent();
+        QueryConfig config = new QueryConfig("test", Optional.of("awesome"), nullValues, false);
+        List<QueryConfig.Query> dest = config.expand();
+        assertEquals(dest.size(), 1);
+        assertEquals(dest.get(0).getName(), "test");
+        assertEquals(dest.get(0).getValues().length, 1);
+        assertEquals(dest.get(0).getValues()[0], "awesome");
+    }
+
+    @Test
+    public void testUnexpandMultiValue() throws Exception {
+        Optional<String> nullValue = Optional.absent();
+        List<String> values = Lists.newArrayList("a", "b", "c");
+        QueryConfig config = new QueryConfig("test", nullValue, Optional.of(values), false);
+        List<QueryConfig.Query> dest = config.expand();
+        assertEquals(dest.size(), 1);
+        assertEquals(dest.get(0).getName(), "test");
+
+        assertEquals(dest.get(0).getValues().length, 3);
+        assertEquals(dest.get(0).getValues()[0], "a");
+        assertEquals(dest.get(0).getValues()[1], "b");
+        assertEquals(dest.get(0).getValues()[2], "c");
+    }
+
+    @Test
+    public void testExpandSingleValue() throws Exception {
+        Optional<List<String>> nullValues = Optional.absent();
+        QueryConfig config = new QueryConfig("test", Optional.of("awesome"), nullValues, true);
+        List<QueryConfig.Query> dest = config.expand();
+        assertEquals(dest.size(), 1);
+        assertEquals(dest.get(0).getName(), "test");
+        assertEquals(dest.get(0).getValues()[0], "awesome");
+    }
+
+    @Test
+    public void testExpandMultiValue() throws Exception {
+        Optional<String> nullValue = Optional.absent();
+        List<String> values = Lists.newArrayList("a", "b", "c");
+        QueryConfig config = new QueryConfig("test", nullValue, Optional.of(values), true);
+        List<QueryConfig.Query> dest = config.expand();
+        assertEquals(dest.size(), 3);
+        assertEquals(dest.get(0).getName(), "test");
+        assertEquals(dest.get(0).getValues().length, 1);
+        assertEquals(dest.get(0).getValues()[0], "a");
+
+        assertEquals(dest.get(1).getValues().length, 1);
+        assertEquals(dest.get(1).getName(), "test");
+        assertEquals(dest.get(1).getValues()[0], "b");
+
+        assertEquals(dest.get(2).getValues().length, 1);
+        assertEquals(dest.get(2).getName(), "test");
+        assertEquals(dest.get(2).getValues()[0], "c");
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testExpandRaisesExceptionWhenBothValuesAreNull() throws Exception {
+        Optional<List<String>> nullValues = Optional.absent();
+        Optional<String> nullValue = Optional.absent();
+        QueryConfig config = new QueryConfig("test", nullValue, nullValues, false);
+        config.expand();
+    }
+
+    @Test
+    public void testUnExpandBrace() throws Exception {
+        Optional<List<String>> nullValues = Optional.absent();
+        QueryConfig config = new QueryConfig("test", Optional.of("{awesome1,awesome2,awesome3}"), nullValues, false);
+        List<QueryConfig.Query> dest = config.expand();
+        assertEquals(dest.size(), 1);
+        assertEquals(dest.get(0).getName(), "test");
+        assertEquals(dest.get(0).getValues().length, 1);
+        assertEquals(dest.get(0).getValues()[0], "{awesome1,awesome2,awesome3}");
+    }
+
+    @Test
+    public void testExpandBrace() throws Exception {
+        Optional<List<String>> nullValues = Optional.absent();
+        QueryConfig config = new QueryConfig("test", Optional.of("{awesome1,awesome2,awesome3}"), nullValues, true);
+        List<QueryConfig.Query> dest = config.expand();
+        assertEquals(dest.size(), 3);
+        assertEquals(dest.get(0).getName(), "test");
+        assertEquals(dest.get(0).getValues().length, 1);
+        assertEquals(dest.get(0).getValues()[0], "awesome1");
+        assertEquals(dest.get(1).getName(), "test");
+
+        assertEquals(dest.get(1).getValues().length, 1);
+        assertEquals(dest.get(1).getValues()[0], "awesome2");
+
+        assertEquals(dest.get(2).getValues().length, 1);
+        assertEquals(dest.get(2).getName(), "test");
+        assertEquals(dest.get(2).getValues()[0], "awesome3");
+    }
+
+    @Test
+    public void testExpandEscapedBrace() throws Exception {
+        Optional<List<String>> nullValues = Optional.absent();
+        QueryConfig config = new QueryConfig("test", Optional.of("{awe\\,some1,awes\\{ome2,awes\\}ome3}"), nullValues, true);
+        List<QueryConfig.Query> dest = config.expand();
+        assertEquals(dest.get(0).getName(), "test");
+        assertEquals(dest.get(0).getValues().length, 1);
+        assertEquals(dest.get(0).getValues()[0], "awe,some1");
+
+        assertEquals(dest.get(1).getName(), "test");
+        assertEquals(dest.get(1).getValues().length, 1);
+        assertEquals(dest.get(1).getValues()[0], "awes{ome2");
+
+        assertEquals(dest.get(2).getName(), "test");
+        assertEquals(dest.get(2).getValues().length, 1);
+        assertEquals(dest.get(2).getValues()[0], "awes}ome3");
+    }
+
+}

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-http
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Takuma kanari
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-12 00:00:00.000000000 Z
+date: 2015-07-13 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
@@ -55,16 +55,19 @@ files:
 - gradlew
 - gradlew.bat
 - lib/embulk/input/http.rb
+- src/main/java/org/embulk/input/BasicAuthConfig.java
 - src/main/java/org/embulk/input/HttpInputPlugin.java
 - src/main/java/org/embulk/input/ParamsConfig.java
 - src/main/java/org/embulk/input/QueryConfig.java
 - src/main/java/org/embulk/input/RetryHandler.java
 - src/test/java/org/embulk/input/TestHttpInputPlugin.java
-- classpath/embulk-input-http-0.0.5.jar
+- src/test/java/org/embulk/input/TestParamsConfig.java
+- src/test/java/org/embulk/input/TestQueryConfig.java
 - classpath/httpclient-4.4.jar
 - classpath/commons-logging-1.2.jar
 - classpath/httpcore-4.4.jar
 - classpath/commons-codec-1.9.jar
+- classpath/embulk-input-http-0.0.6.jar
 homepage: https://github.com/takumakanari/embulk-input-http
 licenses:
 - MIT