slack-ruby-bot-server-mailchimp 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40656585b497e172f926371881eaf7e72c41fcda402abcf878df85902922f3f5
-  data.tar.gz: c7c09b96b872061811ee730d5ca76100e0f22ed5da25e546f7a6921aef6f953a
+  metadata.gz: 766485616d688854eb10f8e7dc4995688a1b83f8e725f0b9b38c839ef48ad0d5
+  data.tar.gz: 80d3fe4f2c40b21877be9fe875151e1c82ecc490d7421deaf0f3ce53f74afa97
 SHA512:
-  metadata.gz: 359aa967108d4a5761aeffd70250a06854b617092b21369faf63d14262179a82e2df7eafc801f32ece6d94748ab7c95586a54505e12bf1c80630208221592aa5
-  data.tar.gz: b697c374b469e6f18cbd804b2edd60b5045aea3f4ba4698106e78d9cbc32ad6d8c2747be1e15191d553983f7a9dc06d59b77383dbdd29d40db43d89aecb37ecf
+  metadata.gz: da4df2b249a1b0db1389d78f7c0cf5028feca2d5983a93ea862164a0027cffefb78ca24828ecd1d0664addfdcc8ef1b69f437b4e77ff1162199a6e2ac083a6a4
+  data.tar.gz: 97c63866917fba27adc25a762feb21b7770b5a93ee3e032ead37676c69447259f4ca754b3a03b1c76715337d7d98c6e07e14469d5e3e58e1f8a83ad9a8d3abf0

data/.github/workflows/danger.yml

@@ -0,0 +1,21 @@
+name: danger
+on: pull_request
+jobs:
+  danger:
+    name: Dangerfile
+    runs-on: ubuntu-latest
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/Gemfile.danger
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "2.6.2"
+          bundler-cache: true
+      - run: |
+          # Personal access token for dangerpr-bot - public, but base64 encoded to avoid tripping up GitHub
+          TOKEN=$(echo -n Z2hwX0xNQ3VmanBFeTBvYkZVTWh6NVNqVFFBOEUxU25abzBqRUVuaAo= | base64 --decode)
+          DANGER_GITHUB_API_TOKEN=$TOKEN bundle exec danger --verbose

data/.github/workflows/rubocop.yml

@@ -0,0 +1,18 @@
+name: rubocop
+
+on: [push, pull_request]
+
+jobs:
+  rubocop:
+    name: RuboCop
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "2.6.2"
+          bundler-cache: true
+      - name: Run RuboCop
+        run: bundle exec rubocop

data/.github/workflows/test-mongodb.yml

@@ -0,0 +1,35 @@
+---
+name: test-mongodb
+
+on: [push, pull_request]
+
+jobs:
+  test-mongodb:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup Firefox
+        uses: browser-actions/setup-firefox@latest
+        with:
+          firefox-version: "54.0"
+      - name: Download geckodriver
+        uses: browser-actions/setup-geckodriver@latest
+        with:
+          geckodriver-version: "0.18.0"
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "2.6.2"
+      - name: Start MongoDB
+        uses: supercharge/mongodb-github-action@1.7.0
+        with:
+          mongodb-version: "5"
+          mongodb-db: slack-ruby-bot-server-stripe_test
+      - name: Run tests
+        uses: GabrielBB/xvfb-action@v1
+        env:
+          DATABASE_ADAPTER: mongoid
+        with:
+          run: |
+            bundle install
+            bundle exec rake

data/.github/workflows/test-postgresql.yml

@@ -0,0 +1,36 @@
+name: test-postgresql
+
+on: [push, pull_request]
+
+jobs:
+  test-postgresql:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup Firefox
+        uses: browser-actions/setup-firefox@latest
+        with:
+          firefox-version: "54.0"
+      - name: Download geckodriver
+        uses: browser-actions/setup-geckodriver@latest
+        with:
+          geckodriver-version: "0.18.0"
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "2.6.2"
+      - uses: harmon758/postgresql-action@v1
+        with:
+          postgresql version: "14"
+          postgresql db: slack_ruby_bot_server_stripe__test
+          postgresql user: test
+          postgresql password: password
+      - name: Test
+        uses: GabrielBB/xvfb-action@v1
+        env:
+          DATABASE_ADAPTER: activerecord
+          DATABASE_URL: postgres://test:password@127.0.0.1:5432/slack_ruby_bot_server_stripe__test
+        with:
+          run: |
+            bundle install
+            bundle exec rake spec

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 ### Changelog
 
-#### 0.1.0 (2019/3/23)
+#### 0.3.0 (2023/07/26)
+
+* [#4](https://github.com/slack-ruby/slack-ruby-bot-server-mailchimp/pull/4): Replaced Travis-CI with GitHub Actions - [@dblock](https://github.com/dblock).
+* [#3](https://github.com/slack-ruby/slack-ruby-bot-server-mailchimp/pull/3): Fix: invalid logger reference - [@dblock](https://github.com/dblock).
+* Your contribution here.
+
+#### 0.2.0 (2019/04/06)
+
+* [#2](https://github.com/slack-ruby/slack-ruby-bot-server-mailchimp/pull/2): Configuration options `member_tags` and `additional_merge_fields` can now be `Proc` - [@dblock](https://github.com/dblock).
+
+#### 0.1.0 (2019/03/23)
 
 * Initial public release - [@dblock](https://github.com/dblock).

data/CONTRIBUTING.md

@@ -12,7 +12,7 @@ Fork the [project on Github](https://github.com/slack-ruby/slack-ruby-bot-server
 
 ```
 git clone https://github.com/contributor/slack-ruby-bot-server-mailchimp.git
-cd slack-ruby-bot-server
+cd slack-ruby-bot-server-mailchimp
 git remote add upstream https://github.com/slack-ruby/slack-ruby-bot-server-mailchimp.git
 ```
 
@@ -84,7 +84,7 @@ git push origin my-feature-branch
 
 ## Make a Pull Request
 
-Go to https://github.com/contributor/slack-ruby-bot-server and select your feature branch.
+Go to https://github.com/contributor/slack-ruby-bot-server-mailchimp and select your feature branch.
 Click the 'Pull Request' button and fill out the form. Pull requests are usually reviewed within a few days.
 
 ## Rebase

data/Dangerfile

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 danger.import_dangerfile(gem: 'slack-ruby-danger')

data/Gemfile

@@ -3,12 +3,12 @@ source 'https://rubygems.org'
 case ENV['DATABASE_ADAPTER']
 when 'mongoid' then
   gem 'kaminari-mongoid'
-  gem 'mongoid'
+  gem 'mongoid', ENV['MONGOID_VERSION'] || '~> 7.3.0'
   gem 'mongoid-scroll'
 when 'activerecord' then
   gem 'activerecord', '~> 5.0.0'
   gem 'otr-activerecord', '~> 1.2.1'
-  gem 'cursor_pagination' # rubocop:disable Bundler/OrderedGems
+  gem 'pagy_cursor'
   gem 'pg'
 when nil then
   warn "Missing ENV['DATABASE_ADAPTER']."
@@ -30,7 +30,3 @@ group :development, :test do
   gem 'vcr'
   gem 'webmock'
 end
-
-group :test do
-  gem 'slack-ruby-danger', '~> 0.1.0', require: false
-end

data/Gemfile.danger

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+group :test do
+  gem 'danger-toc', '~> 0.2.0', require: false
+  gem 'slack-ruby-danger', '~> 0.2.0', require: false
+end

data/README.md

@@ -2,10 +2,20 @@ Slack Ruby Bot Server Mailchimp Extension
 =========================================
 
 [![Gem Version](https://badge.fury.io/rb/slack-ruby-bot-server-mailchimp.svg)](https://badge.fury.io/rb/slack-ruby-bot-server-mailchimp)
-[![Build Status](https://travis-ci.org/slack-ruby/slack-ruby-bot-server-mailchimp.svg?branch=master)](https://travis-ci.org/slack-ruby/slack-ruby-bot-server-mailchimp)
+[![mongodb](https://github.com/slack-ruby/slack-ruby-bot-server-mailchimp/actions/workflows/test-mongodb.yml/badge.svg)](https://github.com/slack-ruby/slack-ruby-bot-server-mailchimp/actions/workflows/test-mongodb.yml)
+[![postgresql](https://github.com/slack-ruby/slack-ruby-bot-server-mailchimp/actions/workflows/test-postgresql.yml/badge.svg)](https://github.com/slack-ruby/slack-ruby-bot-server-mailchimp/actions/workflows/test-postgresql.yml)
+[![rubocop](https://github.com/slack-ruby/slack-ruby-bot-server-mailchimp/actions/workflows/rubocop.yml/badge.svg)](https://github.com/slack-ruby/slack-ruby-bot-server-mailchimp/actions/workflows/rubocop.yml)
 
 A lifecycle extension to [slack-ruby-bot-server](https://github.com/slack-ruby/slack-ruby-bot-server) that subscribes new bot users to a Mailchimp mailing list.
 
+# Table of Contents
+
+- [Usage](#usage)
+- [Additional Member Tags](#additional-member-tags)
+- [Additional Profile Information](#additional-profile-information)
+- [Double Opt-In](#double-opt-in)
+- [Copyright & License](#copyright--license)
+
 ### Usage
 
 Add 'slack-ruby-bot-server-mailchimp' to Gemfile.
@@ -33,6 +43,12 @@ If your `Team` model responds to `.tags`, those will be attached to new subscrip
 SlackRubyBotServer::Mailchimp.config.member_tags = ['my_bot']
 ```
 
+This can be a function that accepts a team and callback options.
+
+```ruby
+SlackRubyBotServer::Mailchimp.config.member_tags = ->(team, options) { [team.tags] }
+```
+
 ### Additional Profile Information
 
 The default member profile information that appears in Mailchimp under "Profile Information" for each new subscriber contains the user's email address, first and last name from Slack. You can supplement this data with `additional_merge_fields`.
@@ -41,6 +57,12 @@ The default member profile information that appears in Mailchimp under "Profile
 SlackRubyBotServer::Mailchimp.config.additional_merge_fields = { 'BOT' => 'MyBot' }
 ```
 
+This can be a function that accepts a team and callback options.
+
+```ruby
+SlackRubyBotServer::Mailchimp.config.additional_merge_fields = ->(team, options) { { 'TEAM' => team.name } }
+```
+
 ### Double Opt-In
 
 This integration subscribes users with double opt-in by default. Configure `member_status` to disable double opt-in. See [this doc](https://developer.mailchimp.com/documentation/mailchimp/guides/manage-subscribers-with-the-mailchimp-api) for more details.

data/RELEASING.md

@@ -21,18 +21,10 @@ Change "Next" in [CHANGELOG.md](CHANGELOG.md) to the current date.
 
 Remove the line with "Your contribution here.", since there will be no more contributions to this release.
 
-Change `**next**` in the "Stable Release" section in README that warns users that they are reading the documentation for an unreleased version with `**stable**`.
-
-```
-## Stable Release
-
-You're reading the documentation for the **stable** release of slack-ruby-bot-server, 0.2.2. See [UPGRADING](UPGRADING.md) when upgrading from an older version.
-```
-
 Commit your changes.
 
 ```
-git add README.md CHANGELOG.md
+git add CHANGELOG.md
 git commit -m "Preparing for release, 0.2.2."
 git push origin master
 ```
@@ -42,10 +34,10 @@ Release.
 ```
 $ rake release
 
-slack-ruby-bot-server 0.2.2 built to pkg/slack-ruby-bot-server-0.2.2.gem.
+slack-ruby-bot-server-mailchimp 0.2.2 built to pkg/slack-ruby-bot-server-mailchimp-0.2.2.gem.
 Tagged v0.2.2.
 Pushed git commits and tags.
-Pushed slack-ruby-bot-server 0.2.2 to rubygems.org.
+Pushed slack-ruby-bot-server-mailchimp 0.2.2 to rubygems.org.
 ```
 
 ### Prepare for the Next Version
@@ -60,18 +52,10 @@ Add the next release to [CHANGELOG.md](CHANGELOG.md).
 
 Increment the third version number in [lib/slack-ruby-bot-server-mailchimp/version.rb](lib/slack-ruby-bot-server-mailchimp/version.rb).
 
-Undo your change in README about the stable release.
-
-```
-## Stable Release
-
-You're reading the documentation for the **next** release of slack-ruby-bot-server. Please see the documentation for the [last stable release, v0.2.2](https://github.com/slack-ruby/slack-ruby-bot-server-mailchimp/blob/v0.2.2/README.md) unless you're integrating with HEAD. See [UPGRADING](UPGRADING.md) when upgrading from an older version.
-```
-
 Commit your changes.
 
 ```
-git add README.md CHANGELOG.md lib/slack-ruby-bot-server-mailchimp/version.rb
+git add CHANGELOG.md lib/slack-ruby-bot-server-mailchimp/version.rb
 git commit -m "Preparing for next development iteration, 0.2.3."
 git push origin master
 ```

data/lib/slack-ruby-bot-server/mailchimp/lifecycle.rb

@@ -1,4 +1,4 @@
-SlackRubyBotServer::Config.service_class.instance.on :created do |team, _error, _options|
+SlackRubyBotServer::Config.service_class.instance.on :created do |team, _error, options|
   raise 'missing ENV["MAILCHIMP_API_KEY"]' unless SlackRubyBotServer::Mailchimp.config.mailchimp_api_key
   raise 'missing ENV["MAILCHIMP_LIST_ID"]' unless SlackRubyBotServer::Mailchimp.config.mailchimp_list_id
 
@@ -15,6 +15,7 @@ SlackRubyBotServer::Config.service_class.instance.on :created do |team, _error,
 
   # fetch and merge member tags
   tags = SlackRubyBotServer::Mailchimp.config.additional_member_tags
+  tags = tags.call(team, options) if tags.respond_to?(:call)
   tags = (tags + team.tags).uniq if team.respond_to?(:tags)
 
   member = mailchimp_list.members.where(email_address: profile.email).first
@@ -22,13 +23,15 @@ SlackRubyBotServer::Config.service_class.instance.on :created do |team, _error,
     member_tags = member.tags.map { |tag| tag['name'] }.sort
     tags = (member_tags + tags).uniq
     if tags == member_tags
-      SlackRubyBot::Client.logger.debug "Skipping #{profile.email} with identical tags (#{tags.join(', ')}), will not be added to #{SlackRubyBotServer::Mailchimp.config.mailchimp_list_id}, #{team}."
+      SlackRubyBotServer::Service.logger.debug "Skipping #{profile.email} with identical tags (#{tags.join(', ')}), will not be added to #{SlackRubyBotServer::Mailchimp.config.mailchimp_list_id}, #{team}."
       next
     end
   end
 
   # merge fields
-  merge_fields = SlackRubyBotServer::Mailchimp.config.additional_merge_fields.merge(
+  merge_fields = SlackRubyBotServer::Mailchimp.config.additional_merge_fields
+  merge_fields = merge_fields.call(team, options) if merge_fields.respond_to?(:call)
+  merge_fields = merge_fields.merge(
     'FNAME' => profile.first_name.to_s,
     'LNAME' => profile.last_name.to_s
   )
@@ -43,5 +46,5 @@ SlackRubyBotServer::Config.service_class.instance.on :created do |team, _error,
     merge_fields: merge_fields
   )
 
-  SlackRubyBot::Client.logger.info "Subscribed #{profile.email} to #{SlackRubyBotServer::Mailchimp.config.mailchimp_list_id}, #{team}."
+  SlackRubyBotServer::Service.logger.info "Subscribed #{profile.email} to #{SlackRubyBotServer::Mailchimp.config.mailchimp_list_id}, #{team}."
 end

data/lib/slack-ruby-bot-server/mailchimp/version.rb

@@ -1,5 +1,5 @@
 module SlackRubyBotServer
   module Mailchimp
-    VERSION = '0.1.0'.freeze
+    VERSION = '0.3.0'.freeze
   end
 end

data/slack-ruby-bot-server-mailchimp.gemspec

@@ -15,5 +15,5 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'mailchimp_api_v3'
-  spec.add_dependency 'slack-ruby-bot-server', '>= 0.10.0'
+  spec.add_dependency 'slack-ruby-bot-server', '>= 2.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slack-ruby-bot-server-mailchimp
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Daniel Doubrovkine
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-03-24 00:00:00.000000000 Z
+date: 2023-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mailchimp_api_v3
@@ -30,30 +30,34 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
-description: 
+        version: 2.0.1
+description:
 email:
 - dblock@dblock.org
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/danger.yml"
+- ".github/workflows/rubocop.yml"
+- ".github/workflows/test-mongodb.yml"
+- ".github/workflows/test-postgresql.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Dangerfile
 - Gemfile
+- Gemfile.danger
 - LICENSE
 - README.md
 - RELEASING.md
@@ -66,7 +70,7 @@ files:
 homepage: https://github.com/slack-ruby/slack-ruby-bot-server-mailchimp
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -81,9 +85,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Mailchimp extension for slack-ruby-bot-server.
 test_files: []

data/.travis.yml

@@ -1,17 +0,0 @@
-language: ruby
-
-cache: bundler
-
-matrix:
-  include:
-    - rvm: 2.6.2
-      script:
-        - bundle exec danger
-    - rvm: 2.6.2
-      env: DATABASE_ADAPTER=activerecord
-      services:
-        - postgresql
-    - rvm: 2.6.2
-      env: DATABASE_ADAPTER=mongoid
-      services:
-        - mongodb