Support API v3

.coveralls.yml

@@ -1 +1 @@
-service_name: travis-ci
+service_name: travis-ci

.gitignore

@@ -1,6 +1,13 @@
 *~
 /pkg/
 /tmp/
-/.bundle/
-/Gemfile.lock
-/coverage/
+*.gemspec
+.gradle/
+/classpath/
+build/
+.idea
+/.settings/
+/.metadata/
+.classpath
+.project
+bin/

.travis.yml

@@ -1,8 +1,5 @@
-language: jruby
-before_install:
-    - rvm get head --auto-dotfiles
-    - rvm install jruby-9.0.1.0
-    - gem install bundler --version 1.10.6
-    - bundle install
+language: java
+jdk:
+  - openjdk7
 script:
-  - bundle exec rake cov
+  - ./gradlew clean checkstyle check jacocoTestReport

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.3.0.1 - 2016-05-11
+- Enabled API v3 and supported OAuth2 beside API Key[#13](https://github.com/treasure-data/embulk-output-mailchimp/pull/13)
+
 ## 0.2.3 - 2016-03-24
 
 - Retry when Mailchimp server return Internal Server Error [#11](https://github.com/treasure-data/embulk-output-mailchimp/pull/11)

README.md

@@ -13,38 +13,33 @@ add e-mail to List in MailChimp.
 
 ## Configuration
 
-- **apikey**: Mailchimp API key (string, required)
-- **list_id**: Mailchimp List id (string, required)
-- **double_optin**: control whether to send an opt-in confirmation email (boolean, default: true)
+- **auth_method**: MailChimp auth method (string, `api_key` or `oauth`, default: `oauth`)
+- **apikey**: MailChimp API key (string, required if `auth_method` is `api_key`)
+- **access_token**: MailChimp access token (string, required if `auth_method` is `oauth`)
+- **list_id**: MailChimp List id (string, required)
 - **update_existing**: control whether to update members that are already subscribed to the list or to return an error (boolean, default: false)
-- **replace_interests**: determine whether we replace the interest groups with the updated groups provided, or we add the provided groups to the member's interest groups (boolean, default: true)
-- **email_column**: column name for email (string, default: 'email')
-- **fname_column**: column name for first name (string, default: 'fname')
-- **lname_column**: column name for last name(string, default: 'lname')
-- **grouping_columns**: column names array for group name(array, default: nil)
+- **merge_fields**: Array for merge fields/ TAG in MailChimp dashboard (array, optional, default: nil)
+- **interest_categories**: Array for group names in MailChimp dashboard(array, default: nil)
+- **double_optin**: Removed in API v3. Using `status` in json request body instead. Subscriber's current status: `subscribed`, `unsubscribed`, `cleaned`, `pending` 
 
 ## Example
 
 ```yaml
 out:
   type: mailchimp
+  auth_method: api_key
   apikey: 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX-XXX'
   list_id: 'XXXXXXXXXX'
-  double_optin: false
   update_existing: false
-  replace_interests: true
-  email_column: 'e-mail'
-  fname_column: 'first name'
-  lname_column: 'lname'
-  grouping_columns:
-  - group_1
-  - group_2
+  merge_fields:
+  - FNAME
+  - LNAME
+  - WEB
+  interest_categories:
+  - Donating
+  - Events
 ```
 
-## Mailchimp Client
-
-use https://bitbucket.org/mailchimp/mailchimp-api-ruby .
-
 ## Build
 
 ```

build.gradle

@@ -0,0 +1,124 @@
+plugins {
+    id "com.jfrog.bintray" version "1.7.3"
+    id "com.github.jruby-gradle.base" version "0.1.5"
+    id "java"
+    id "checkstyle"
+    id "jacoco"
+}
+import com.github.jrubygradle.JRubyExec
+repositories {
+    mavenCentral()
+    jcenter()
+    // TODO(dmikurube): Remove this after embulk-base-restclient goes to jcenter.
+    maven {
+        url "https://dl.bintray.com/embulk-base-restclient/maven"
+    }
+}
+configurations {
+    provided
+}
+
+version = "0.3.0.1"
+
+sourceCompatibility = 1.7
+targetCompatibility = 1.7
+
+dependencies {
+    compile  "org.embulk:embulk-core:0.8.15"
+    provided "org.embulk:embulk-core:0.8.15"
+    compile  "org.embulk.base.restclient:embulk-base-restclient:0.5.0"
+    compile  "org.embulk.base.restclient:embulk-util-retryhelper-jetty92:0.5.0"
+    // compile "YOUR_JAR_DEPENDENCY_GROUP:YOUR_JAR_DEPENDENCY_MODULE:YOUR_JAR_DEPENDENCY_VERSION"
+
+    testCompile "junit:junit:4.+"
+    testCompile "org.embulk:embulk-core:0.8.15:tests"
+    testCompile "org.embulk:embulk-test:0.8.15"
+    testCompile "org.embulk:embulk-standards:0.8.15"
+    testCompile "org.mockito:mockito-core:2.+"
+}
+
+test {
+    jvmArgs "-XX:MaxPermSize=128M"
+    // Set the timezone for testing somewhere other than my machine to increase the chances of catching timezone bugs
+    systemProperty 'user.timezone', 'PST'
+    testLogging {
+        events "passed", "skipped", "failed"
+    }
+}
+
+task classpath(type: Copy, dependsOn: ["jar"]) {
+    doFirst { file("classpath").deleteDir() }
+    from (configurations.runtime - configurations.provided + files(jar.archivePath))
+    into "classpath"
+}
+clean { delete "classpath" }
+
+checkstyle {
+    configFile = file("${project.rootDir}/config/checkstyle/checkstyle.xml")
+    toolVersion = '6.14.1'
+}
+checkstyleMain {
+    configFile = file("${project.rootDir}/config/checkstyle/default.xml")
+    ignoreFailures = true
+}
+checkstyleTest {
+    configFile = file("${project.rootDir}/config/checkstyle/default.xml")
+    ignoreFailures = true
+}
+task checkstyle(type: Checkstyle) {
+    classpath = sourceSets.main.output + sourceSets.test.output
+    source = sourceSets.main.allJava + sourceSets.test.allJava
+}
+
+task gem(type: JRubyExec, dependsOn: ["gemspec", "classpath"]) {
+    jrubyArgs "-rrubygems/gem_runner", "-eGem::GemRunner.new.run(ARGV)", "build"
+    script "${project.name}.gemspec"
+    doLast { ant.move(file: "${project.name}-${project.version}.gem", todir: "pkg") }
+}
+
+task gemPush(type: JRubyExec, dependsOn: ["gem"]) {
+    jrubyArgs "-rrubygems/gem_runner", "-eGem::GemRunner.new.run(ARGV)", "push"
+    script "pkg/${project.name}-${project.version}.gem"
+}
+
+task "package"(dependsOn: ["gemspec", "classpath"]) << {
+    println "> Build succeeded."
+    println "> You can run embulk with '-L ${file(".").absolutePath}' argument."
+}
+
+jacocoTestReport {
+    group = "Reporting"
+    reports {
+        xml.enabled false
+        csv.enabled false
+        html.destination "${buildDir}/reports/coverage"
+    }
+}
+
+task gemspec {
+    ext.gemspecFile = file("${project.name}.gemspec")
+    inputs.file "build.gradle"
+    outputs.file gemspecFile
+    doLast { gemspecFile.write($/
+Gem::Specification.new do |spec|
+  spec.name          = "${project.name}"
+  spec.version       = "${project.version}"
+  spec.authors       = "Thang Nguyen"
+  spec.summary       = %[Mailchimp output plugin for Embulk]
+  spec.description   = %[Dumps records to MailChimp.]
+  spec.email         = ["thang@treasure-data.com"]
+  spec.licenses      = ["Apache-2.0"]
+  spec.homepage      = "https://github.com/treasure-data/embulk-output-mailchimp"
+
+  spec.files         = `git ls-files`.split("\n") + Dir["classpath/*.jar"]
+  spec.test_files    = spec.files.grep(%r"^(test|spec)/")
+  spec.require_paths = ["lib"]
+
+  #spec.add_dependency 'YOUR_GEM_DEPENDENCY', ['~> YOUR_GEM_DEPENDENCY_VERSION']
+  spec.add_development_dependency 'bundler', ['~> 1.0']
+  spec.add_development_dependency 'rake', ['>= 10.0']
+end
+/$)
+    }
+}
+clean { delete "${project.name}.gemspec" }

ci/travis_mailchimp.yml

@@ -0,0 +1,5 @@
+type: mailchimp
+auth_method: api_key
+apikey: xxxxxxxxxxxxxxxxxxx
+access_token: xxxxxxxxxxxxxxxxxxx
+list_id: xxxxxxxxxxxxxxxxxxx

circle.yml

@@ -0,0 +1,16 @@
+machine:
+  java:
+    version: openjdk7
+  environment:
+    TERM: "dumb"
+    EMBULK_OUTPUT_MAILCHIMP_TEST_CONFIG: "${HOME}/${TRAVIS_BUILD_DIR}/ci/travis_mailchimp.yml"
+
+test:
+  override:
+    - ./gradlew clean checkstyle check jacocoTestReport
+  post:
+    - cp -R build/reports/* $CIRCLE_ARTIFACTS
+
+notify:
+  webhooks:
+    - url: https://td-beda.herokuapp.com/circleci_callback