embulk-input-marketo_extended 0.6.18 → 0.6.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12599394a20752769173478de83e784ad9789281
-  data.tar.gz: 92e3492011dfcc74354acc6c0a4cb070e62c2b21
+  metadata.gz: 152da149f01fe6b8ddc0e0c7c991294a14f0d49f
+  data.tar.gz: 8697dca8af570c05a81dc37e848ae0ad471795b8
 SHA512:
-  metadata.gz: 7e902baac51f0a1fb9fafab08e540bb5acbaa7be69948204b3272b32cb187da3aef3d9572492a965fe692c8e99b7860a66b002c640db5661c4ebb590bae1b1b7
-  data.tar.gz: 368d67fa4e00d86cc94bbbdec1a23a68d197cfa91afe28c6bcdea77a54cd14ca261855eae0f0ca255932bcf47a63c7abf5dfc46274e59ab8f38f65b3949da5e5
+  metadata.gz: 0f359173dd7a773a5f4901ea417c19c6e816bae5f69e4a9c1ca8600b0a97b778ce567fdb02daecd1ecf85ed44e33f2537739b33a411e3c6416e84f1b5af10bd6
+  data.tar.gz: f94e31e1b2696c34c2076fc1af79d91fa2c8e6266f27b3f4c284c4b29a973b1f54eec5758520d40ffc4d59aa0672e3139e0900ff5b9523f50670575b3179c516

data/README.md

@@ -1,11 +1,9 @@
-[![Build Status](https://travis-ci.org/treasure-data/embulk-input-marketo.svg?branch=master)](https://travis-ci.org/treasure-data/embulk-input-marketo)
-[![Code Climate](https://codeclimate.com/github/treasure-data/embulk-input-marketo/badges/gpa.svg)](https://codeclimate.com/github/treasure-data/embulk-input-marketo)
-[![Test Coverage](https://codeclimate.com/github/treasure-data/embulk-input-marketo/badges/coverage.svg)](https://codeclimate.com/github/treasure-data/embulk-input-marketo/coverage)
-[![Gem Version](https://badge.fury.io/rb/embulk-input-marketo.svg)](http://badge.fury.io/rb/embulk-input-marketo)
+[![Gem Version](https://badge.fury.io/rb/embulk-input-marketo.svg)](http://badge.fury.io/rb/embulk-input-marketo_extended)
 
-# Marketo input plugin for Embulk
+# Marketo_extended input plugin for Embulk
 
-embulk-input-marketo is the gem preparing Embulk input plugins for [Marketo](http://www.marketo.com/).
+embulk-input-marketo_extended is the gem preparing Embulk input plugins for [Marketo](http://www.marketo.com/).
+This is a forked repo from treasure-data/embulk-input-marketo and it is mainly extended how csv parsing is done.
 
 - Lead(lead)
 - Activity log(activity)
@@ -28,7 +26,7 @@ Required Embulk version >= 0.8.33 (since 0.6.0).
 ## Install
 
 ```
-$ embulk gem install embulk-input-marketo
+$ embulk gem install embulk-input-marketo_extended
 ```
 
 ## Configuration

data/build.gradle

@@ -16,15 +16,18 @@ repositories {
 configurations {
     provided
 }
-version = "0.6.18"
+version = "0.6.24"
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
 
+
 dependencies {
+
     compile  "org.embulk:embulk-core:0.8.+"
     provided "org.embulk:embulk-core:0.8.+"
     compile  "org.embulk.base.restclient:embulk-base-restclient:0.5.3"
     compile  "org.embulk.base.restclient:embulk-util-retryhelper-jetty92:0.5.3"
+    compile "commons-io:commons-io:2.8.0"
     testCompile "junit:junit:4.+"
     testCompile "org.embulk:embulk-core:0.8.+:tests"
     testCompile "org.embulk:embulk-test:0.8.+"

data/src/main/java/org/embulk/input/marketo/CsvTokenizer.java

@@ -210,7 +210,15 @@ public class CsvTokenizer
             }
         }
     }
+    private char peekNextNextChar() {
+        Preconditions.checkState(line != null, "peekNextNextChar is called after end of file");
 
+        if (linePos + 1 >= line.length()) {
+            return END_OF_LINE;
+        } else {
+            return line.charAt(linePos + 1);
+        }
+    }
     public boolean hasNextColumn()
     {
         return recordState == RecordState.NOT_END;
@@ -218,6 +226,7 @@ public class CsvTokenizer
 
     public String nextColumn()
     {
+        String quotesInQuotedFields = "ACCEPT_STRAY_QUOTES_ASSUMING_NO_DELIMITERS_IN_FIELDS2";
         if (!hasNextColumn()) {
             throw new TooFewColumnsException("Too few columns");
         }
@@ -370,18 +379,34 @@ public class CsvTokenizer
                     }
                     else if (isQuote(c)) {
                         char next = peekNextChar();
-                        if (isQuote(next)) { // escaped quote
+                        final char nextNext = peekNextNextChar();
+                        Exec.getLogger(CsvTokenizer.class).info("Character is {}. Next: {}, NextNext:{}", c,next,nextNext);
+                        if (isQuote(next)
+                                && (quotesInQuotedFields != "ACCEPT_STRAY_QUOTES_ASSUMING_NO_DELIMITERS_IN_FIELDS"
+                                || (!isDelimiter(nextNext) && !isEndOfLine(nextNext)))) {
+                            // Escaped by preceding it with another quote.
+                            // A quote just before a delimiter or an end of line is recognized as a functional quote,
+                            // not just as a non-escaped stray "quote character" included the field, even if
+                            // ACCEPT_STRAY_QUOTES_ASSUMING_NO_DELIMITERS_IN_FIELDS is specified.
                             quotedValue.append(line.substring(valueStartPos, linePos));
                             valueStartPos = ++linePos;
-                        }
-                        else {
+                        } else if (quotesInQuotedFields == "ACCEPT_STRAY_QUOTES_ASSUMING_NO_DELIMITERS_IN_FIELDS"
+                                && !(isDelimiter(next) || isEndOfLine(next))) {
+                            // A non-escaped stray "quote character" in the field is processed as a regular character
+                            // if ACCEPT_STRAY_QUOTES_ASSUMING_NO_DELIMITERS_IN_FIELDS is specified,
+                            if ((linePos - valueStartPos) + quotedValue.length() > maxQuotedSizeLimit) {
+                                throw new QuotedSizeLimitExceededException("The size of the quoted value exceeds the limit size (" + maxQuotedSizeLimit + ")");
+                            }
+                        } else {
                             quotedValue.append(line.substring(valueStartPos, linePos - 1));
+                            Exec.getLogger(CsvTokenizer.class).info("Current column state is {}. Quoted Value : {}", columnState, quotedValue);
                             columnState = ColumnState.AFTER_QUOTED_VALUE;
                         }
                     }
                     else if (isEscape(c)) {  // isQuote must be checked first in case of quote == escape
                         // In RFC 4180, CSV's escape char is '\"'. But '\\' is often used.
                         char next = peekNextChar();
+                        Exec.getLogger(CsvTokenizer.class).info("Esc Character is {}. Next: {}, column state{}", c,next, columnState);
                         if (isEndOfLine(c)) {
                             // escape end of line. TODO assuming multi-line quoted value without newline?
                             quotedValue.append(line.substring(valueStartPos, linePos));
@@ -391,7 +416,7 @@ public class CsvTokenizer
                             }
                             valueStartPos = 0;
                         }
-                        else if (isQuote(next) || isEscape(next)) { // escaped quote
+                        else if ( isEscape(next)) { // escaped quote
                             quotedValue.append(line.substring(valueStartPos, linePos - 1));
                             quotedValue.append(next);
                             valueStartPos = ++linePos;
@@ -406,6 +431,7 @@ public class CsvTokenizer
                     break;
 
                 case AFTER_QUOTED_VALUE:
+
                     if (isDelimiter(c)) {
                         if (delimiterFollowingString == null) {
                             return quotedValue.toString();

data/src/main/java/org/embulk/input/marketo/MarketoService.java

@@ -16,7 +16,7 @@ public interface MarketoService
 
     File extractLead(Date startTime, Date endTime, List<String> extractedFields, String filterField, int pollingTimeIntervalSecond, int bulkJobTimeoutSecond);
 
-    File extractAllActivity(List<Integer> activityTypeIds, Date startTime, Date endTime, int pollingTimeIntervalSecond, int bulkJobTimeoutSecond);
+    File extractAllActivity(List<Integer> activityTypeIds, Date startTime, Date endTime, int pollingTimeIntervalSecond, int bulkJobTimeoutSecond, String landingZone);
 
     Iterable<ObjectNode> getAllListLead(List<String> extractFields);
 

data/src/main/java/org/embulk/input/marketo/MarketoServiceImpl.java

@@ -11,14 +11,21 @@ import org.embulk.input.marketo.rest.RecordPagingIterable;
 import org.embulk.spi.DataException;
 import org.embulk.spi.Exec;
 import org.slf4j.Logger;
+import java.io.IOException;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import org.apache.commons.io.FileUtils;
 import java.util.Date;
 import java.util.List;
+import java.time.format.DateTimeFormatter;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+
+//import com.amazonaws.services.s3.AmazonS3;
 
 /**
  * Created by tai.khuu on 9/6/17.
@@ -35,6 +42,12 @@ public class MarketoServiceImpl implements MarketoService
 
     private MarketoRestClient marketoRestClient;
 
+    private static Date startTime;
+
+    private DateFormat dateFormat = new SimpleDateFormat("dd-MM-yyyy");
+
+//    private AmazonS3 s3;
+
     public MarketoServiceImpl(MarketoRestClient marketoRestClient)
     {
         this.marketoRestClient = marketoRestClient;
@@ -43,6 +56,7 @@ public class MarketoServiceImpl implements MarketoService
     @Override
     public File extractLead(final Date startTime, Date endTime, List<String> extractedFields, String filterField, int pollingTimeIntervalSecond, final int bulkJobTimeoutSecond)
     {
+
         final String exportID = marketoRestClient.createLeadBulkExtract(startTime, endTime, extractedFields, filterField);
         marketoRestClient.startLeadBulkExtract(exportID);
         try {
@@ -83,9 +97,59 @@ public class MarketoServiceImpl implements MarketoService
         return total;
     }
 
+//    public boolean exists(String bucketName, String key) {
+//        try {
+//            fullObject = s3Client.getObject(new GetObjectRequest(bucketName, key));
+//            System.out.println("s3 object Content-Type: " + fullObject.getObjectMetadata().getContentType());
+//            return fullObject;
+//        } catch(AmazonServiceException e) {
+//            return false;
+//        }
+//        return true;
+//    }
+//    public String getBucket(String s3_key){
+//        if(s3_key.lenght()) {
+//            return s3_key.split('/')[0];
+//        }
+//    }
+//
+//    public String getKey(String s3_key){
+//        if(s3_key.lenght()) {
+//            String [] key_parts = s3_key.split('/');
+//            String key = "";
+//            for (String k: key_parts){
+//                key = key + "/" + k ;
+//            }
+//            return s3_key.split('/')[0];
+//        }
+//    }
+
     @Override
-    public File extractAllActivity(List<Integer> activityTypeIds, Date startTime, Date endTime, int pollingTimeIntervalSecond, int bulkJobTimeoutSecond)
+    public File extractAllActivity(List<Integer> activityTypeIds, Date startTime, Date endTime, int pollingTimeIntervalSecond, int bulkJobTimeoutSecond, String landingZoneFile)
     {
+        String tempFile = "/tmp/marketo_" + this.dateFormat.format(startTime) +".csv";
+        this.startTime = startTime;
+
+        try{
+            if (landingZoneFile.length()>0){
+                LOGGER.info("Let's check for temp File = {}", tempFile);
+                File f = new File(tempFile);
+                if (f.exists() && f.isFile() && f.canRead()){
+                    return f;
+                }
+//                //  Lets read and return csv file from s3
+//                s3_object =  get_s3_object(getBucket(landingZoneFile), getKey(landingZoneFile));
+//                if(s3_object){
+//                    return s3_object.getObjectContent();
+//                }
+
+            }
+        }
+        catch (Exception e){
+            System.out.println("Exception on retrieving from landing zone");
+            System.out.println("Let's continue normal execution.");
+        }
+
         final String exportID = marketoRestClient.createActivityExtract(activityTypeIds, startTime, endTime);
         marketoRestClient.startActitvityBulkExtract(exportID);
         try {
@@ -104,9 +168,13 @@ public class MarketoServiceImpl implements MarketoService
             }
         });
     }
+
+
     private File downloadBulkExtract(Function<BulkExtractRangeHeader, InputStream> getBulkExtractfunction)
     {
+
         final File tempFile = Exec.getTempFileSpace().createTempFile(DEFAULT_FILE_FORMAT);
+
         long startByte = 0;
         int resumeTime = 0;
         while (resumeTime < MAX_RESUME_TIME) {
@@ -114,6 +182,17 @@ public class MarketoServiceImpl implements MarketoService
             InputStream bulkExtractResult = getBulkExtractfunction.apply(bulkExtractRangeHeader);
             try {
                 saveExtractedFile(bulkExtractResult, tempFile);
+                if (this.startTime != null){
+                    String destinationFileName = "/tmp/marketo_" + this.dateFormat.format(this.startTime) +".csv";
+                    final File destination = new File(destinationFileName);
+                    try{
+                        FileUtils.copyFile(tempFile, destination);
+                        LOGGER.info("Save activities in file: "+destinationFileName);
+                    }
+                    catch (IOException e){
+                        LOGGER.error("Exception when copying to file destination {}\nException:{}",destination.getPath(),e );
+                    }
+                }
                 return tempFile;
             }
             catch (DownloadBulkExtractException e) {

data/src/main/java/org/embulk/input/marketo/delegate/ActivityBulkExtractInputPlugin.java

@@ -143,7 +143,7 @@ public class ActivityBulkExtractInputPlugin extends MarketoBaseBulkExtractInputP
     protected InputStream getExtractedStream(MarketoService service, PluginTask task, DateTime fromDate, DateTime toDate)
     {
         try {
-            return new FileInputStream(service.extractAllActivity(task.getActTypeIds(), fromDate.toDate(), toDate.toDate(), task.getPollingIntervalSecond(), task.getBulkJobTimeoutSecond()));
+            return new FileInputStream(service.extractAllActivity(task.getActTypeIds(), fromDate.toDate(), toDate.toDate(), task.getPollingIntervalSecond(), task.getBulkJobTimeoutSecond(), task.getLandingPath()));
         }
         catch (FileNotFoundException e) {
             throw new RuntimeException("Exception when trying to extract activity", e);

data/src/main/java/org/embulk/input/marketo/delegate/MarketoBaseBulkExtractInputPlugin.java

@@ -34,6 +34,7 @@ import org.embulk.spi.util.InputStreamFileInput;
 import org.embulk.spi.util.LineDecoder;
 import org.joda.time.DateTime;
 import org.msgpack.value.Value;
+import org.slf4j.Logger;
 
 import java.io.InputStream;
 import java.text.DateFormat;
@@ -64,6 +65,10 @@ public abstract class MarketoBaseBulkExtractInputPlugin<T extends MarketoBaseBul
         @ConfigDefault("1")
         Integer getFetchDays();
 
+        @Config("landing_zone")
+        @ConfigDefault("")
+        String getLandingPath();
+
         @Config("latest_fetch_time")
         @ConfigDefault("null")
         Optional<Long> getLatestFetchTime();
@@ -169,6 +174,18 @@ public abstract class MarketoBaseBulkExtractInputPlugin<T extends MarketoBaseBul
                 int imported = 0;
                 while (csvRecords.hasNext()) {
                     Map<String, String> csvRecord = csvRecords.next();
+                    if(csvRecord.containsKey("attributes")) {
+                        System.out.println("Attributes Before");
+                        System.out.println(csvRecord.get("attributes"));
+//
+//                        csvRecord.put("attributes", csvRecord.get("attributes").replace("\\\"\"","\\\""));
+//                        System.out.println("Attributes After");
+//                        System.out.println(csvRecord.get("attributes"));
+//                    }
+
+//                    for (Map.Entry<String, String> entry : csvRecord.entrySet()) {
+//                        System.out.println(entry.getKey() + ":" + entry.getValue().toString());
+                    }
                     ObjectNode objectNode = MarketoUtils.OBJECT_MAPPER.valueToTree(csvRecord);
                     recordImporter.importRecord(new AllStringJacksonServiceRecord(objectNode), pageBuilder);
                     imported = imported + 1;
@@ -357,6 +374,7 @@ public abstract class MarketoBaseBulkExtractInputPlugin<T extends MarketoBaseBul
             if (hasNext()) {
                 MarketoUtils.DateRange next = dateRangeIterator.next();
                 InputStream extractedStream = getExtractedStream(marketoService, task, next.fromDate, next.toDate);
+
                 currentLineDecoder = new LineDecoder(new InputStreamFileInput(task.getBufferAllocator(), extractedStream), task);
                 return currentLineDecoder;
             }
@@ -372,6 +390,7 @@ public abstract class MarketoBaseBulkExtractInputPlugin<T extends MarketoBaseBul
 
     private class CsvRecordIterator implements Iterator<Map<String, String>>
     {
+        private  final Logger LOGGER = Exec.getLogger(CsvRecordIterator.class);
         private CsvTokenizer tokenizer;
 
         private List<String> headers;
@@ -395,6 +414,7 @@ public abstract class MarketoBaseBulkExtractInputPlugin<T extends MarketoBaseBul
         {
             if (currentCsvRecord == null) {
                 currentCsvRecord = getNextCSVRecord();
+
             }
             return currentCsvRecord != null;
         }
@@ -427,6 +447,10 @@ public abstract class MarketoBaseBulkExtractInputPlugin<T extends MarketoBaseBul
             try {
                 int i = 0;
                 while (tokenizer.hasNextColumn()) {
+                    if (i == headers.size()){
+                        LOGGER.info("We have reached last column. {}", tokenizer.nextColumnOrNull());
+                        break;
+                    }
                     kvMap.put(headers.get(i), tokenizer.nextColumnOrNull());
                     i++;
                 }

data/src/test/java/org/embulk/input/marketo/delegate/ActivityBulkExtractInputPluginTest.java

@@ -108,16 +108,22 @@ public class ActivityBulkExtractInputPluginTest
         Mockito.when(mockMarketoRestclient.createActivityExtract(any(List.class), any(Date.class), any(Date.class))).thenReturn(exportId1).thenReturn(exportId2).thenReturn(null);
         Mockito.when(mockMarketoRestclient.getActivitiesBulkExtractResult(Mockito.eq(exportId1), any(BulkExtractRangeHeader.class))).thenReturn(this.getClass().getResourceAsStream("/fixtures/activity_extract1.csv"));
         Mockito.when(mockMarketoRestclient.getActivitiesBulkExtractResult(Mockito.eq(exportId2), any(BulkExtractRangeHeader.class))).thenReturn(this.getClass().getResourceAsStream("/fixtures/activity_extract2.csv"));
+        System.out.println("*************");
         ServiceResponseMapper<? extends ValueLocator> mapper = activityBulkExtractInputPlugin.buildServiceResponseMapper(task);
+        System.out.println("-----------------");
         activityBulkExtractInputPlugin.validateInputTask(task);
+        System.out.println("Before ingestion");
         TaskReport taskReport = activityBulkExtractInputPlugin.ingestServiceData(task, mapper.createRecordImporter(), 1, pageBuilder);
+        System.out.println("After ingestion");
         ArgumentCaptor<String> argumentCaptor = ArgumentCaptor.forClass(String.class);
         Column marketoGUID = mapper.getEmbulkSchema().lookupColumn("marketoGUID");
         Mockito.verify(pageBuilder, Mockito.times(55)).setString(Mockito.eq(marketoGUID), argumentCaptor.capture());
         Mockito.verify(mockMarketoRestclient, Mockito.times(1)).startActitvityBulkExtract(Mockito.eq(exportId1));
+        System.out.println("Start Extraction");
         Mockito.verify(mockMarketoRestclient, Mockito.times(1)).waitActitvityExportJobComplete(Mockito.eq(exportId1), Mockito.eq(task.getPollingIntervalSecond()), Mockito.eq(task.getBulkJobTimeoutSecond()));
         Mockito.verify(mockMarketoRestclient, Mockito.times(1)).startActitvityBulkExtract(Mockito.eq(exportId2));
         Mockito.verify(mockMarketoRestclient, Mockito.times(1)).waitActitvityExportJobComplete(Mockito.eq(exportId2), Mockito.eq(task.getPollingIntervalSecond()), Mockito.eq(task.getBulkJobTimeoutSecond()));
+        System.out.println("Finished Extraction");
         Mockito.verify(mockMarketoRestclient, Mockito.times(1)).createActivityExtract(activityTypeIds, startDate.toDate(), startDate.plusDays(30).toDate());
         DateTime startDate2 = startDate.plusDays(30).plusSeconds(1);
         Mockito.verify(mockMarketoRestclient, Mockito.times(1)).createActivityExtract(activityTypeIds, startDate2.toDate(), startDate.plusDays(task.getFetchDays()).toDate());

data/src/test/resources/fixtures/activity_extract1.csv

@@ -32,4 +32,6 @@ marketoGUID,leadId,activityDate,activityTypeId,campaignId,primaryAttributeValueI
 558711,102449,2017-09-08T16:39:14Z,12,null,102449,null,"{""Source Type"":""List import"",""List Name"":""Bill Import Test"",""Created Date"":""2017-09-08""}"
 558712,102450,2017-09-08T16:39:14Z,12,null,102450,null,"{""Source Type"":""List import"",""List Name"":""Bill Import Test"",""Created Date"":""2017-09-08""}"
 558713,102451,2017-09-08T16:39:14Z,12,null,102451,null,"{""Source Type"":""List import"",""List Name"":""Bill Import Test"",""Created Date"":""2017-09-08""}"
-558714,102452,2017-09-08T16:39:14Z,12,null,102452,null,"{""Source Type"":""List import"",""List Name"":""Bill Import Test"",""Created Date"":""2017-09-08""}"
+558714,102452,2017-09-08T16:39:14Z,12,null,102452,null,"{""Source Type"":""List import"",""List Name"":""Bill Import Test"",""Created Date"":""2017-09-08""}"
+558714,102452,2017-09-08T16:39:14Z,12,null,102452,null,"{""Campaign Run ID"":""85184"",""Client IP Address"":""98.167.134.95"",""Query Parameters"":""mkt_unsubscribe=1&mkt_tok=eyJpIjoiTTJWbFlUTTRZakEyT1dZeCIsInQiOiJ3MzVGMnZmblJZSWt1bmZ1dHoyaVZWcnhReEtKR2tSbkdUMHYwbVRPZXcvTHhVS3BRbGhaWnkrSldRaTNINnR4UWNVaVBFLzN4anlaMGlHSDE4MW40bXdlbUMrdVZmNGpSekl1S1BmNmtCcTFZaXJVZjhqOXQxT0NBdVFxQkpwayJ9"",""Referrer URL"":""https://pages.upwork.com/UnsubscribePage.html?mkt_unsubscribe=1&mkt_tok=eyJpIjoiTTJWbFlUTTRZakEyT1dZeCIsInQiOiJ3MzVGMnZmblJZSWt1bmZ1dHoyaVZWcnhReEtKR2tSbkdUMHYwbVRPZXcvTHhVS3BRbGhaWnkrSldRaTNINnR4UWNVaVBFLzN4anlaMGlHSDE4MW40bXdlbUMrdVZmNGpSekl1S1BmNmtCcTFZaXJVZjhqOXQxT0NBdVFxQkpwayJ9"",""User Agent"":""Mozilla/5.0 (iPad; CPU OS 14_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/86.0.4240.93 Mobile/15E148 Safari/604.1"",""Webpage ID"":4646125,""Webform ID"":""2548"",""Form Fields"":""a:18:{s:6:\""module\"";s:11:\""leadCapture\"";s:6:\""action\"";s:5:\""save2\"";s:12:\""Unsubscribed\"";s:3:\""Yes\"";s:11:\""resubscribe\"";s:0:\""\"";s:6:\""formid\"";s:4:\""2548\"";s:4:\""lpId\"";s:4:\""7518\"";s:5:\""subId\"";s:2:\""13\"";s:10:\""munchkinId\"";s:11:\""518-RKL-392\"";s:5:\""lpurl\"";s:66:\""//pages.upwork.com/UnsubscribePage.html?cr={creative}&kw={keyword}\"";s:2:\""cr\"";s:0:\""\"";s:2:\""kw\"";s:0:\""\"";s:1:\""q\"";s:0:\""\"";s:8:\""_mkt_trk\"";s:56:\""id:518-RKL-392&token:_mch-upwork.com-1604320852930-29224\"";s:7:\""formVid\"";s:4:\""2548\"";s:7:\""mkt_tok\"";s:212:\""eyJpIjoiTTJWbFlUTTRZakEyT1dZeCIsInQiOiJ3MzVGMnZmblJZSWt1bmZ1dHoyaVZWcnhReEtKR2tSbkdUMHYwbVRPZXcvTHhVS3BRbGhaWnkrSldRaTNINnR4UWNVaVBFLzN4anlaMGlHSDE4MW40bXdlbUMrdVZmNGpSekl1S1BmNmtCcTFZaXJVZjhqOXQxT0NBdVFxQkpwayJ9\"";s:13:\""_mktoReferrer\"";s:284:\""https://pages.upwork.com/UnsubscribePage.html?mkt_unsubscribe=1&mkt_tok=eyJpIjoiTTJWbFlUTTRZakEyT1dZeCIsInQiOiJ3MzVGMnZmblJZSWt1bmZ1dHoyaVZWcnhReEtKR2tSbkdUMHYwbVRPZXcvTHhVS3BRbGhaWnkrSldRaTNINnR4UWNVaVBFLzN4anlaMGlHSDE4MW40bXdlbUMrdVZmNGpSekl1S1BmNmtCcTFZaXJVZjhqOXQxT0NBdVFxQkpwayJ9\"";s:14:\""checksumFields\"";s:106:\""Unsubscribed,resubscribe,formid,lpId,subId,munchkinId,lpurl,cr,kw,q,_mkt_trk,formVid,mkt_tok,_mktoReferrer\"";s:8:\""checksum\"";s:64:\""4cec0015c824c862f776c0301f6be5ffa7a5738ae450a7a3a8a57c8ca353e88a\"";}""}"
+1587928704,53599804,2020-11-02T12:40:58Z,9,17390,24173,2020-10-29 Executive Summary #2.Email,"{""Campaign Run ID"":""85184"",""Client IP Address"":""98.167.134.95"",""Query Parameters"":""mkt_unsubscribe=1&mkt_tok=eyJpIjoiTTJWbFlUTTRZakEyT1dZeCIsInQiOiJ3MzVGMnZmblJZSWt1bmZ1dHoyaVZWcnhReEtKR2tSbkdUMHYwbVRPZXcvTHhVS3BRbGhaWnkrSldRaTNINnR4UWNVaVBFLzN4anlaMGlHSDE4MW40bXdlbUMrdVZmNGpSekl1S1BmNmtCcTFZaXJVZjhqOXQxT0NBdVFxQkpwayJ9"",""Referrer URL"":""https://pages.upwork.com/UnsubscribePage.html?mkt_unsubscribe=1&mkt_tok=eyJpIjoiTTJWbFlUTTRZakEyT1dZeCIsInQiOiJ3MzVGMnZmblJZSWt1bmZ1dHoyaVZWcnhReEtKR2tSbkdUMHYwbVRPZXcvTHhVS3BRbGhaWnkrSldRaTNINnR4UWNVaVBFLzN4anlaMGlHSDE4MW40bXdlbUMrdVZmNGpSekl1S1BmNmtCcTFZaXJVZjhqOXQxT0NBdVFxQkpwayJ9"",""User Agent"":""Mozilla/5.0 (iPad; CPU OS 14_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/86.0.4240.93 Mobile/15E148 Safari/604.1"",""Webpage ID"":4646125,""Webform ID"":""2548"",""Form Fields"":""a:18:{s:6:\""module\"";s:11:\""leadCapture\"";s:6:\""action\"";s:5:\""save2\"";s:12:\""Unsubscribed\"";s:3:\""Yes\"";s:11:\""resubscribe\"";s:0:\""\"";s:6:\""formid\"";s:4:\""2548\"";s:4:\""lpId\"";s:4:\""7518\"";s:5:\""subId\"";s:2:\""13\"";s:10:\""munchkinId\"";s:11:\""518-RKL-392\"";s:5:\""lpurl\"";s:66:\""//pages.upwork.com/UnsubscribePage.html?cr={creative}&kw={keyword}\"";s:2:\""cr\"";s:0:\""\"";s:2:\""kw\"";s:0:\""\"";s:1:\""q\"";s:0:\""\"";s:8:\""_mkt_trk\"";s:56:\""id:518-RKL-392&token:_mch-upwork.com-1604320852930-29224\"";s:7:\""formVid\"";s:4:\""2548\"";s:7:\""mkt_tok\"";s:212:\""eyJpIjoiTTJWbFlUTTRZakEyT1dZeCIsInQiOiJ3MzVGMnZmblJZSWt1bmZ1dHoyaVZWcnhReEtKR2tSbkdUMHYwbVRPZXcvTHhVS3BRbGhaWnkrSldRaTNINnR4UWNVaVBFLzN4anlaMGlHSDE4MW40bXdlbUMrdVZmNGpSekl1S1BmNmtCcTFZaXJVZjhqOXQxT0NBdVFxQkpwayJ9\"";s:13:\""_mktoReferrer\"";s:284:\""https://pages.upwork.com/UnsubscribePage.html?mkt_unsubscribe=1&mkt_tok=eyJpIjoiTTJWbFlUTTRZakEyT1dZeCIsInQiOiJ3MzVGMnZmblJZSWt1bmZ1dHoyaVZWcnhReEtKR2tSbkdUMHYwbVRPZXcvTHhVS3BRbGhaWnkrSldRaTNINnR4UWNVaVBFLzN4anlaMGlHSDE4MW40bXdlbUMrdVZmNGpSekl1S1BmNmtCcTFZaXJVZjhqOXQxT0NBdVFxQkpwayJ9\"";s:14:\""checksumFields\"";s:106:\""Unsubscribed,resubscribe,formid,lpId,subId,munchkinId,lpurl,cr,kw,q,_mkt_trk,formVid,mkt_tok,_mktoReferrer\"";s:8:\""checksum\"";s:64:\""4cec0015c824c862f776c0301f6be5ffa7a5738ae450a7a3a8a57c8ca353e88a\"";}""}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-marketo_extended
 version: !ruby/object:Gem::Version
-  version: 0.6.18
+  version: 0.6.24
 platform: ruby
 authors:
 - uu59
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-30 00:00:00.000000000 Z
+date: 2020-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -138,8 +138,9 @@ files:
 - src/test/resources/fixtures/lists_response.json
 - src/test/resources/fixtures/program_response.json
 - classpath/jetty-io-9.2.14.v20151106.jar
+- classpath/commons-io-2.8.0.jar
 - classpath/jetty-util-9.2.14.v20151106.jar
-- classpath/embulk-input-marketo_extended-0.6.18.jar
+- classpath/embulk-input-marketo_extended-0.6.24.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