embulk-output-mailchimp 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 828ea72b349e1c3137c5c827039a24046f0b1094
-  data.tar.gz: 79827b4b52ce3fda14e2ff75fe708a571f5afeca
+  metadata.gz: 263d6be5b427f50337210f1f42e92a9ca85fea18
+  data.tar.gz: 3b798a92f1358a5331f2b19b358c96eda65b5ea6
 SHA512:
-  metadata.gz: ce1545eeac72c8dba741854e98fc0033f0977aaac094b5abcb2fb7c11e0a8b446822148f8c8b99baa9fb4595a2d2a9f25ab3c230456052288f8f229bca6f4f92
-  data.tar.gz: 49a7c2ebca979114062cd4568e40d7661b24cbfa6c60be6f585547b553a81f113409a42fb1c1c4dc8af61fed84ef9e7420ad459622ce6a667b844fdb332ff904
+  metadata.gz: 1aaf3df35727fc7df1bcb609d0e0cba5dbb6242e6469b75cc6307b10cb1ff2e8f11379d2c34f2312148a4c07422426779abe9b25504004c599aafea4fc05c679
+  data.tar.gz: 6b9c2537a67c6168b02d5f1656730972a5732e5f03fdb36cb9e645da4965b78d9b5fbefb8b22e43ae2d9c0254db4fd1f46094a65541d00b2033801df5d78d648

data/.travis.yml

@@ -2,8 +2,7 @@ language: jruby
 before_install:
     - rvm get head --auto-dotfiles
     - rvm install jruby-9.0.1.0
-    - gem install bundler
-    - gem update bundler
+    - gem install bundler --version 1.10.6
     - bundle install
 script:
   - bundle exec rake cov

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+## 0.2.1 - 2016-01-06
+
+- Logging API request/response [#5](https://github.com/treasure-data/embulk-output-mailchimp/pull/5)
+- Default `double_optin` to be `false` [#6](https://github.com/treasure-data/embulk-output-mailchimp/pull/6)
+- Fixed when non-string groups given [#7](https://github.com/treasure-data/embulk-output-mailchimp/pull/7)

data/README.md

@@ -41,6 +41,9 @@ out:
   - group_2
 ```
 
+## Mailchimp Client
+
+use https://bitbucket.org/mailchimp/mailchimp-api-ruby .
 
 ## Build
 

data/embulk-output-mailchimp.gemspec

@@ -1,11 +1,11 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "embulk-output-mailchimp"
-  spec.version       = "0.2.0"
-  spec.authors       = ["takkanm"]
+  spec.version       = "0.2.1"
+  spec.authors       = ["uu59", "takkanm"]
   spec.summary       = "Mailchimp output plugin for Embulk"
   spec.description   = "Dumps records to Mailchimp."
-  spec.email         = ["takkanm@gmail.com"]
+  spec.email         = ["k@uu59.org", "takkanm@gmail.com"]
   spec.licenses      = ["MIT"]
   # TODO set this: spec.homepage      = "https://github.com/takkanm/embulk-output-mailchimp"
 
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'perfect_retry', "~> 0.3"
 
   spec.add_development_dependency 'embulk', ['~> 0.7.9']
-  spec.add_development_dependency 'bundler', ['~> 1.0']
+  spec.add_development_dependency 'bundler', ['~> 1.10.6']
   spec.add_development_dependency 'rake', ['>= 10.0']
   spec.add_development_dependency 'test-unit'
   spec.add_development_dependency 'test-unit-rr'

data/lib/embulk/output/mailchimp.rb

@@ -1,6 +1,8 @@
 require 'mailchimp'
 require 'perfect_retry'
 
+require 'securerandom'
+
 module Embulk
   module Output
 
@@ -30,7 +32,7 @@ module Embulk
         task = {
           apikey:                 config.param("apikey",                 :string),
           list_id:                config.param("list_id",                :string),
-          double_optin:           config.param("double_optin",           :bool,    default: true),
+          double_optin:           config.param("double_optin",           :bool,    default: false),
           update_existing:        config.param("update_existing",        :bool,    default: false),
           replace_interests:      config.param("replace_interests",      :bool,    default: true),
           email_column:           config.param("email_column",           :string,  default: "email"),
@@ -103,11 +105,22 @@ module Embulk
 
       private
 
+      # NOTE we expect row has #{email_column} column.
+      #      expected full data is following columns.
+      #  | #{email_column} | #{fname_column} | #{lname_column} | #{grouping_columns[0]} | #{grouping_columns[1]…|
+      #  |-----------------|-----------------|-----------------|------------------------|-----------------------|
+      #  | hi@example.com  | first_name      | last_name       | music,book             | middle                |
       def add_subscriber(row)
         return unless row[@email_column]
 
         merge_columns = {fname: @fname_column, lname: @lname_column}
 
+        # NOTE merge_vars can add extra infomation.
+        #      https://apidocs.mailchimp.com/api/2.0/lists/merge-vars.php
+        #      embulk-output-mailchimp can add following infomation
+        #        - lname
+        #        - fname
+        #        - interest group
         merge_vars = merge_columns.each_with_object({}) do |(key, col_name), m|
           m[key] = row[col_name] if row[col_name]
         end
@@ -116,11 +129,12 @@ module Embulk
           merge_vars[:groupings] = []
 
           @grouping_columns.each do |group|
-            next if row[group].nil? || row[group] == ''
+            groups = row[group].to_s.split(",")
+            next if groups.empty?
 
             merge_vars[:groupings] << {
               'name'   => group,
-              'groups' => row[group].split(','),
+              'groups' => groups,
             }
           end
         end
@@ -142,13 +156,16 @@ module Embulk
 
       def send_subscribers!
         @retry_manager.with_retry do
-          @client.batch_subscribe_list(
+          request_id = SecureRandom.uuid
+          Embulk.logger.info "[#{request_id}] Request : #{@subscribers.size} items"
+          res = @client.batch_subscribe_list(
             @list_id,
             @subscribers,
             @double_optin,
             @update_existing,
             @replace_interests
           )
+          Embulk.logger.info "[#{request_id}] Result : #{res.to_s}"
         end
       end
     end

data/test/embulk/output/test_mailchimp.rb

@@ -125,6 +125,28 @@ module Embulk
               ]
             )
           end
+
+          def test_grouping_columns_not_string
+            groups_1 = 42
+            groups_2 = 1.3
+
+            mailchimp = create_mailchimp(
+              lname_column: 'lname',
+              fname_column: 'fname',
+              grouping_columns: ['list_group1', 'list_group2']
+            )
+
+            mailchimp.add([['i@example.com', 'lname', 'fname', groups_1, groups_2]])
+            subscriber = mailchimp.instance_variable_get(:@subscribers)[0]
+
+            assert_equal(
+              subscriber[:merge_vars][:groupings],
+              [
+                {'name' => 'list_group1', 'groups' => [groups_1.to_s] },
+                {'name' => 'list_group2', 'groups' => [groups_2.to_s] },
+              ]
+            )
+          end
         end
 
         # NOTE skip until const mocking

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-mailchimp
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
+- uu59
 - takkanm
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2016-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -57,7 +58,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.10.6
   name: bundler
   prerelease: false
   type: :development
@@ -65,7 +66,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.10.6
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -138,6 +139,7 @@ dependencies:
         version: '0'
 description: Dumps records to Mailchimp.
 email:
+- k@uu59.org
 - takkanm@gmail.com
 executables: []
 extensions: []
@@ -147,6 +149,7 @@ files:
 - ".gitignore"
 - ".ruby-version"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md