embulk-output-mailchimp 0.3.7 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 759406b999c3568dc98133129ecc535decaf2c47
-  data.tar.gz: 0a7cdd2189f9d8ec41b145735b1e210d1b43bcb3
+  metadata.gz: 5fde692362348800dfae66c28a9e2c064ba7d833
+  data.tar.gz: 133cbbbe8899d8601640969cd804334305061210
 SHA512:
-  metadata.gz: ebb5138893246ee2045ab75fde892196896c82f0fad7e3c4bcb8cf393144d48c9d455647b8239a45d23ce66037b3b698070386da10787279e31974f03d55a13f
-  data.tar.gz: 8b6ea7dd8a191f2d6f5dbf5eb27b287d6b90d25fa68fec09f6138050c48bd9652092303316fdb3fbd19091b7f2a8d7f062c6a053f6f247c0ba6112c5dccbba36
+  metadata.gz: aa856a3406ff19159507b877022800cc7455f1c0f1399080510cacf54529c1c09c61dae97328e81f7cbbb4661b69cd97d91856f0e43aa6ee668b148f1631fa96
+  data.tar.gz: 7b273aea4c9ea89d35a3125240aac1ef7165262d437b293a66efc23f124604522a4fbfe8dc52b09225dd3183b4e3ce70447676e11fc5732577f0c4e4f4d01d2f

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.3.9 - 2017-06-09
+- Upgraded version to fix yanked gem file
+
+## 0.3.8 - 2017-06-09
+- Fixed JSON format in MERGE field's type is address [#24](https://github.com/treasure-data/embulk-output-mailchimp/pull/24)
+
 ## 0.3.7 - 2017-06-07
 - Added `ConfigException` while using not exists `list_id` [#23](https://github.com/treasure-data/embulk-output-mailchimp/pull/23)
 

data/build.gradle

@@ -18,7 +18,7 @@ configurations {
     provided
 }
 
-version = "0.3.7"
+version = "0.3.9"
 
 sourceCompatibility = 1.7
 targetCompatibility = 1.7

data/src/main/java/org/embulk/output/mailchimp/MailChimpAbstractRecordBuffer.java

@@ -15,6 +15,7 @@ import org.embulk.base.restclient.jackson.JacksonServiceRecord;
 import org.embulk.base.restclient.record.RecordBuffer;
 import org.embulk.base.restclient.record.ServiceRecord;
 import org.embulk.config.TaskReport;
+import org.embulk.output.mailchimp.model.AddressMergeFieldAttribute;
 import org.embulk.output.mailchimp.model.ErrorResponse;
 import org.embulk.output.mailchimp.model.InterestResponse;
 import org.embulk.output.mailchimp.model.MergeField;
@@ -34,6 +35,7 @@ import java.util.Map;
 
 import static org.embulk.output.mailchimp.helper.MailChimpHelper.containsCaseInsensitive;
 import static org.embulk.output.mailchimp.helper.MailChimpHelper.fromCommaSeparatedString;
+import static org.embulk.output.mailchimp.helper.MailChimpHelper.orderJsonNode;
 import static org.embulk.output.mailchimp.helper.MailChimpHelper.toJsonNode;
 import static org.embulk.output.mailchimp.model.MemberStatus.PENDING;
 import static org.embulk.output.mailchimp.model.MemberStatus.SUBSCRIBED;
@@ -281,7 +283,8 @@ public abstract class MailChimpAbstractRecordBuffer
                                     mergeFields.put(column.getName().toUpperCase(), value);
                                 }
                                 else {
-                                    mergeFields.set(column.getName().toUpperCase(), addressNode);
+                                    mergeFields.set(column.getName().toUpperCase(),
+                                                    orderJsonNode(addressNode, AddressMergeFieldAttribute.values()));
                                 }
                             }
                             else {

data/src/main/java/org/embulk/output/mailchimp/helper/MailChimpHelper.java

@@ -5,11 +5,13 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.base.Function;
 import com.google.common.base.Splitter;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Multimaps;
+import org.embulk.output.mailchimp.model.AddressMergeFieldAttribute;
 
 import javax.annotation.Nullable;
 
@@ -105,4 +107,23 @@ public final class MailChimpHelper
             return JsonNodeFactory.instance.nullNode();
         }
     }
+
+    /**
+     * MailChimp API requires MERGE field's type is address that have to json with keys in order.
+     * {"addr1": "a", "addr2": "a1", "city": "c", "state": "s", "zip": "z", "country": "c"}
+     *
+     * @param originalNode the original node
+     * @param attrsInOrder the keys in order
+     * @return the object node
+     */
+    public static ObjectNode orderJsonNode(final JsonNode originalNode, final AddressMergeFieldAttribute[] attrsInOrder)
+    {
+        ObjectNode orderedNode = JsonNodeFactory.instance.objectNode();
+        for (AddressMergeFieldAttribute attr : attrsInOrder) {
+            orderedNode.put(attr.getName(),
+                            originalNode.findValue(attr.getName()) != null ? originalNode.findValue(attr.getName()).asText() : "");
+        }
+
+        return orderedNode;
+    }
 }

data/src/main/java/org/embulk/output/mailchimp/model/AddressMergeFieldAttribute.java

@@ -0,0 +1,49 @@
+package org.embulk.output.mailchimp.model;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import org.embulk.config.ConfigException;
+
+/**
+ * Created by thangnc on 6/9/17.
+ */
+public enum AddressMergeFieldAttribute
+{
+    ADDR1("addr1"), ADDR2("addr2"), CITY("city"), STATE("state"), ZIP("zip"), COUNTRY("country");
+
+    private String name;
+
+    AddressMergeFieldAttribute(String type)
+    {
+        this.name = type;
+    }
+
+    /**
+     * Gets name.
+     *
+     * @return the name
+     */
+    public String getName()
+    {
+        return name;
+    }
+
+    /**
+     * Find by name method.
+     *
+     * @param name the name
+     * @return the auth method
+     */
+    @JsonCreator
+    public static AddressMergeFieldAttribute findByName(final String name)
+    {
+        for (AddressMergeFieldAttribute method : values()) {
+            if (method.getName().equals(name.toLowerCase())) {
+                return method;
+            }
+        }
+
+        throw new ConfigException(
+                String.format("Unknown attributes '%s'. Supported attributes are [addr1, addr1, state, zip, country]",
+                              name));
+    }
+}

data/src/test/java/org/embulk/output/mailchimp/TestMailChimpHelper.java

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.node.NullNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.collect.Multimap;
 import org.embulk.output.mailchimp.helper.MailChimpHelper;
+import org.embulk.output.mailchimp.model.AddressMergeFieldAttribute;
 import org.junit.Test;
 
 import java.util.ArrayList;
@@ -15,6 +16,7 @@ import java.util.List;
 import static org.embulk.output.mailchimp.helper.MailChimpHelper.containsCaseInsensitive;
 import static org.embulk.output.mailchimp.helper.MailChimpHelper.extractMemberStatus;
 import static org.embulk.output.mailchimp.helper.MailChimpHelper.maskEmail;
+import static org.embulk.output.mailchimp.helper.MailChimpHelper.orderJsonNode;
 import static org.embulk.output.mailchimp.helper.MailChimpHelper.toJsonNode;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
@@ -82,4 +84,15 @@ public class TestMailChimpHelper
     {
         assertEquals("Should be NullNode", NullNode.class, toJsonNode("abc").getClass());
     }
+
+    @Test
+    public void test_orderJsonNode()
+    {
+        String given = "{\"addr1\":\"1234\",\"city\":\"mountain view\",\"country\":\"US\",\"state\":\"CA\",\"zip\":\"95869\"}";
+        AddressMergeFieldAttribute[] attributes = AddressMergeFieldAttribute.values();
+
+        String expect = "{\"addr1\":\"1234\",\"addr2\":\"\",\"city\":\"mountain view\",\"state\":\"CA\",\"zip\":\"95869\",\"country\":\"US\"}";
+        assertEquals("Should be JSON", ObjectNode.class, orderJsonNode(toJsonNode(given), attributes).getClass());
+        assertEquals("Should be match", expect, orderJsonNode(toJsonNode(given), attributes).toString());
+    }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-mailchimp
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.9
 platform: ruby
 authors:
 - Thang Nguyen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-06-07 00:00:00.000000000 Z
+date: 2017-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -67,6 +67,7 @@ files:
 - src/main/java/org/embulk/output/mailchimp/MailChimpOutputPluginDelegate.java
 - src/main/java/org/embulk/output/mailchimp/MailChimpRecordBuffer.java
 - src/main/java/org/embulk/output/mailchimp/helper/MailChimpHelper.java
+- src/main/java/org/embulk/output/mailchimp/model/AddressMergeFieldAttribute.java
 - src/main/java/org/embulk/output/mailchimp/model/AuthMethod.java
 - src/main/java/org/embulk/output/mailchimp/model/CategoriesResponse.java
 - src/main/java/org/embulk/output/mailchimp/model/ErrorResponse.java
@@ -88,7 +89,7 @@ files:
 - test/override_assert_raise.rb
 - test/run-test.rb
 - classpath/embulk-base-restclient-0.5.0.jar
-- classpath/embulk-output-mailchimp-0.3.7.jar
+- classpath/embulk-output-mailchimp-0.3.9.jar
 - classpath/embulk-util-retryhelper-jetty92-0.5.0.jar
 - classpath/jetty-client-9.2.14.v20151106.jar
 - classpath/jetty-http-9.2.14.v20151106.jar