embulk-output-mailchimp 0.3.23 → 0.3.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f18ee80430139a3e22677d7e18e3fd80eed89665
-  data.tar.gz: 1c3ebcd7abeaae441d926103f0920ca7d5d6ac6d
+  metadata.gz: 7bd2a4db83fe03e54434449187716447a8c7ce7b
+  data.tar.gz: 3b3385ab55f592b937b38a4cfac2f2c5d62ad548
 SHA512:
-  metadata.gz: ae75be9b1e060a13d6f0bcb4dfa71cea026f653832944bbcfd023df5987b819407decfac00fbdb84c8f31431c7c30dfe1dd8f2b16dcfa47f813ada7a93ba8a64
-  data.tar.gz: 960ede6f290226c7f35d3d2554175669e14db0a2ecc8ec89f87a8e2548b63f4438b54651f1e04a5a4122853709473a8a15acbae35e5f9e654cda87a62b062200
+  metadata.gz: 727ddd4c581d69b5b34962d73a3d8a54e2e4365ee98b7ddd13df84b04b6c8222adcc101673056c74c113ba061d654034dd7fea4b4dfe1e48e148ddbeaa2b1c2b
+  data.tar.gz: ecd1e9229bb8015e28eea7a5dbedb70e7997b28fb74d78ab3cdafbf4e2790ff6f7f22a0523ace0e710cf873f4bdf2166db9d59a79ae1b77cd50cd933459c6bcf

data/build.gradle

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

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

@@ -33,9 +33,11 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.TreeMap;
 
+import static java.lang.String.CASE_INSENSITIVE_ORDER;
+import static java.lang.String.format;
 import static org.embulk.output.mailchimp.MailChimpOutputPluginDelegate.PluginTask;
-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;
@@ -206,26 +208,38 @@ public class MailChimpRecordBuffer
 
                 // Update additional merge fields if exist
                 if (task.getMergeFields().isPresent() && !task.getMergeFields().get().isEmpty()) {
-                    for (final Column column : schema.getColumns()) {
-                        if (!"".equals(containsCaseInsensitive(column.getName(), task.getMergeFields().get()))) {
-                            String value = input.hasNonNull(column.getName()) ? input.findValue(column.getName()).asText() : "";
-
-                            // Try to convert to Json from string with the merge field's type is address
-                            if (availableMergeFields.get(column.getName().toLowerCase()).getType()
-                                    .equals(MergeField.MergeFieldType.ADDRESS.getType())) {
-                                JsonNode addressNode = toJsonNode(value);
-                                if (addressNode instanceof NullNode) {
-                                    mergeFields.put(column.getName().toUpperCase(), value);
-                                }
-                                else {
-                                    mergeFields.set(column.getName().toUpperCase(),
-                                                    orderJsonNode(addressNode, AddressMergeFieldAttribute.values()));
-                                }
+                    Map<String, String> columnNameLookup = new TreeMap<>(CASE_INSENSITIVE_ORDER);
+                    for (Column col : schema.getColumns()) {
+                        columnNameLookup.put(col.getName(), col.getName());
+                    }
+                    for (String field : task.getMergeFields().get()) {
+                        if (!columnNameLookup.containsKey(field)) {
+                            LOG.warn(format("Field '%s' is configured on data transfer but cannot be found on any columns.", field));
+                            continue;
+                        }
+                        String columnName = columnNameLookup.get(field);
+                        if (!availableMergeFields.containsKey(columnName.toLowerCase())) {
+                            LOG.warn(format("Field '%s' is configured on data transfer but is not predefined on Mailchimp.", field));
+                            continue;
+                        }
+
+                        String value = input.hasNonNull(columnName) ? input.findValue(columnName).asText() : "";
+
+                        // Try to convert to Json from string with the merge field's type is address
+                        if (availableMergeFields.get(columnName).getType()
+                                .equals(MergeField.MergeFieldType.ADDRESS.getType())) {
+                            JsonNode addressNode = toJsonNode(value);
+                            if (addressNode instanceof NullNode) {
+                                mergeFields.put(columnName.toUpperCase(), value);
                             }
                             else {
-                                mergeFields.put(column.getName().toUpperCase(), value);
+                                mergeFields.set(columnName.toUpperCase(),
+                                        orderJsonNode(addressNode, AddressMergeFieldAttribute.values()));
                             }
                         }
+                        else {
+                            mergeFields.put(columnName.toUpperCase(), value);
+                        }
                     }
                 }
 

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

@@ -45,15 +45,14 @@ public final class MailChimpHelper
      * @param list the list
      * @return the boolean
      */
-    public static String containsCaseInsensitive(final String s, final List<String> list)
+    public static boolean containsCaseInsensitive(final String s, final List<String> list)
     {
         for (String string : list) {
             if (string.equalsIgnoreCase(s)) {
-                return string;
+                return true;
             }
         }
-
-        return "";
+        return false;
     }
 
     /**

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

@@ -20,6 +20,7 @@ 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;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Created by thangnc on 4/26/17.
@@ -37,8 +38,7 @@ public class TestMailChimpHelper
     @Test
     public void test_containsCaseInsensitive_validMergeFields()
     {
-        String expect = "United State";
-        assertEquals("Interest category should match", expect, containsCaseInsensitive("united state",
+        assertTrue("Interest category should match", containsCaseInsensitive("united state",
                                                                                        Arrays.asList("Donating", "United State")));
     }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-mailchimp
 version: !ruby/object:Gem::Version
-  version: 0.3.23
+  version: 0.3.24
 platform: ruby
 authors:
 - Thang Nguyen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-09-11 00:00:00.000000000 Z
+date: 2018-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -88,13 +88,13 @@ files:
 - test/embulk/output/test_mailchimp.rb
 - test/override_assert_raise.rb
 - test/run-test.rb
-- classpath/embulk-base-restclient-0.5.3.jar
-- classpath/embulk-output-mailchimp-0.3.23.jar
-- classpath/embulk-util-retryhelper-jetty92-0.5.3.jar
-- classpath/jetty-client-9.2.14.v20151106.jar
-- classpath/jetty-http-9.2.14.v20151106.jar
 - classpath/jetty-io-9.2.14.v20151106.jar
+- classpath/embulk-output-mailchimp-0.3.24.jar
 - classpath/jetty-util-9.2.14.v20151106.jar
+- classpath/jetty-http-9.2.14.v20151106.jar
+- classpath/jetty-client-9.2.14.v20151106.jar
+- classpath/embulk-base-restclient-0.5.3.jar
+- classpath/embulk-util-retryhelper-jetty92-0.5.3.jar
 homepage: https://github.com/treasure-data/embulk-output-mailchimp
 licenses:
 - MIT