embulk-output-mailchimp 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d462b2519072612b11fffb5c9b1fb8757cbb4bdd
-  data.tar.gz: 16b9f327b2753b7c70b658f8b55f4b0f638da3f9
+  metadata.gz: 92e111dbfbaaee02d87b45d1ae39c2e6dd914d02
+  data.tar.gz: d43b6d2dd64e38d9f7adade36a7150d7797dffbb
 SHA512:
-  metadata.gz: d9df5f728fcb0c1204d94e86e7091666d4c9b879cf5cf88c00080991a252cff2bb6e2c85cd86c4bd72b0a3784ae363fb6ff0569f50672927605b5d0d9d3703d8
-  data.tar.gz: 66e55275124e6eed5d405dd9a9a2b403ea934b06b8d6878d2f412aa5ac36fd4a50a63f90162a9cf11ad7df541f336e52472a0b1cc1e4a292530489d052ad04b3
+  metadata.gz: b964ecead23dffe33f4d7d87c423fccc1dbe8e9a6ade2ee8a74cd97aa7835450b71712a6fda217e856318fde7d4c1255dc38e121b57f4662a203c76a24daf57d
+  data.tar.gz: d9a401164212cb808c217d34ff948eba672bee2105b1ad7f459557d43cf3566e8c75cddd88213526ed33411535d1eca5b557e7da381a3bd21f4b3a84afb2742f

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.3.3 - 2017-05-31
+- Enable multiple values for `interest categories` [#19](https://github.com/treasure-data/embulk-output-mailchimp/pull/19)
+
 ## 0.3.2 - 2017-05-30
 - Rename `interest_categories` to `grouping_columns` to fix backward compatibility [#18](https://github.com/treasure-data/embulk-output-mailchimp/pull/18)
 

data/build.gradle

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

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

@@ -31,6 +31,7 @@ import java.util.List;
 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.model.MemberStatus.PENDING;
 import static org.embulk.output.mailchimp.model.MemberStatus.SUBSCRIBED;
 
@@ -295,17 +296,21 @@ public abstract class MailChimpAbstractRecordBuffer
         ObjectNode interests = JsonNodeFactory.instance.objectNode();
 
         for (String category : task.getGroupingColumns().get()) {
-            String value = input.findValue(category).asText();
+            String inputValue = input.findValue(category).asText();
+            List<String> interestValues = fromCommaSeparatedString(inputValue);
             Map<String, InterestResponse> availableCategories = categories.get(category);
 
             // Only update user-predefined categories if replace interests != true
-            // Otherwise, force update all categories include user-predefined categories
-            if (!task.getReplaceInterests() && availableCategories.get(value) != null) {
-                interests.put(availableCategories.get(value).getId(), true);
-            }
+            if (!task.getReplaceInterests()) {
+                for (String interestValue : interestValues) {
+                    if (availableCategories.get(interestValue) != null) {
+                        interests.put(availableCategories.get(interestValue).getId(), true);
+                    }
+                }
+            } // Otherwise, force update all categories include user-predefined categories
             else if (task.getReplaceInterests()) {
                 for (String availableCategory : availableCategories.keySet()) {
-                    if (availableCategory.equals(value)) {
+                    if (interestValues.contains(availableCategory)) {
                         interests.put(availableCategories.get(availableCategory).getId(), true);
                     }
                     else {

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

@@ -2,6 +2,8 @@ package org.embulk.output.mailchimp.helper;
 
 import com.fasterxml.jackson.databind.JsonNode;
 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;
 
@@ -67,4 +69,16 @@ public final class MailChimpHelper
 
         return Multimaps.index(data, function);
     }
+
+    /**
+     * From comma separated string list.
+     *
+     * @param string the string
+     * @return the list
+     */
+    public static List<String> fromCommaSeparatedString(String string)
+    {
+        Iterable<String> split = Splitter.on(",").omitEmptyStrings().trimResults().split(string);
+        return Lists.newArrayList(split);
+    }
 }

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

@@ -3,6 +3,7 @@ package org.embulk.output.mailchimp;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.google.common.collect.Multimap;
+import org.embulk.output.mailchimp.helper.MailChimpHelper;
 import org.junit.Test;
 
 import java.util.ArrayList;
@@ -12,6 +13,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.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 
 /**
@@ -51,4 +53,14 @@ public class TestMailChimpHelper
         assertEquals("Status should contain keys", true, statusMap.containsKey("subcribed"));
         assertEquals("Status should contain keys", true, statusMap.containsKey("abc"));
     }
+
+    @Test
+    public void test_fromCommaSeparatedString()
+    {
+        String[] expect = new String[]{"Donating", "United State"};
+        List separatedString = MailChimpHelper.fromCommaSeparatedString("Donating,United State");
+
+        assertEquals("Length should match", expect.length, separatedString.size());
+        assertArrayEquals("Should match", expect, separatedString.toArray());
+    }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-mailchimp
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Thang Nguyen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-05-30 00:00:00.000000000 Z
+date: 2017-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -86,7 +86,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.2.jar
+- classpath/embulk-output-mailchimp-0.3.3.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