mandrill_mailer 1.4.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f49c59c5f497b38f55180880f6f32101ab993cf1
-  data.tar.gz: 041619bafe686899e7f6e63fa4f0aa8b41960ab8
+SHA256:
+  metadata.gz: 440fbc8df529fb6d5818f2a4dc241d23dcabbfc70dc42416145ac587546ac2b5
+  data.tar.gz: 5fd3ce65fd871a8990a4e9a566a513d9b1783771a72d29bdffcbb0eeecd783e9
 SHA512:
-  metadata.gz: e6c7baeff76a0fefb88d27af5452348e52676c28da4c5557a1a3b153f669153231a0118bf058b6c8f4bf0640576ef175c4618def99e2ed1d459b977dfddb81f5
-  data.tar.gz: 42092ee4de2138c8d416dc6d16c9c31ebe98791f85b5aa7ce8dadcb1457ba86927e98f066bd59992cdc343dd39f2258489f55682551a5eab6825c35d43f69c79
+  metadata.gz: a5688e873e80045743da3b417cf5c4d21d877cf8d8c7c32840fb0b9a9e3249638e80a03fc6e2d2b8599b36f959105f8f94825ba8c8530900f999ff53b575898a
+  data.tar.gz: 46dd668deff79e85426447c26049fd77408708abdd658da273bb11a10c8e60622bee3fd6cf536f7972918597e0a0805cd5aa2c8b9df24744a2a77e38f9774412

data/.github/workflows/tests.yml

@@ -0,0 +1,28 @@
+name: build
+on: [push, pull_request]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        os: [ubuntu]
+        ruby:
+          - 2.0
+          - 2.1
+          - 2.2
+          - 2.3
+          - 2.4
+          - 2.5
+          - 2.6
+          - 2.7
+          - 3.0
+    steps: 
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - name: "bundle install"
+      run: bundle install --jobs 4 --retry 3
+    - name: "rspec"
+      run: bundle exec rspec spec/

data/.travis.yml

@@ -2,9 +2,14 @@ language: ruby
 sudo: false
 cache: bundler
 rvm:
-  - 2.0.0-p598
+  - 2.0.0-p648
   - 2.1.0
   - 2.2.0
+  - 2.3.8
+  - 2.4.5
+  - 2.5.3
+  - 2.6.1
+  - 2.7.1
 
 script:
   - bundle exec rspec spec/

data/CHANGELOG.md

@@ -2,6 +2,25 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+# Unreleased
+
+## 1.8.0 - 2021-03-18
+- Support Ruby 3.0.0 [#142](https://github.com/renz45/mandrill_mailer/pull/142) (via @berkos)
+- Allow symbols in vars [#140](https://github.com/renz45/mandrill_mailer/pull/140) (via @raphaelpra)
+
+## 1.7.1 - 2018-10-06
+- Fix rspec matcher: https://github.com/renz45/mandrill_mailer/pull/136
+
+## 1.7.0 - 2018-10-06
+- Switch to mandrillus fork of the mandrill-api gem to allow for newer
+json gem support
+
+## 1.6.0 - 2017-03-23
+- Add support for attaching unencoded content via @brunomperes
+
+## 1.5.0 - 2017-03-20
+- Update offline adapter for testing to be more compatible with Rails 5 via @eric1234
+
 ## 1.4.0 - 2016-04-28
 ### Changed
 - Update deprecated RSpec failure methods in RSpec helpers.

data/README.md

@@ -1,7 +1,6 @@
 # Mandrill Mailer
-[![Build Status](https://travis-ci.org/renz45/mandrill_mailer.svg)](https://travis-ci.org/renz45/mandrill_mailer) [![Gem Version](http://img.shields.io/gem/v/mandrill_mailer.svg)](https://rubygems.org/gems/mandrill_mailer)
-[![Code Climate](http://img.shields.io/codeclimate/github/renz45/mandrill_mailer.svg)](https://codeclimate.com/github/renz45/mandrill_mailer)
-[![Dependencies](http://img.shields.io/gemnasium/renz45/mandrill_mailer.svg)](https://gemnasium.com/renz45/mandrill_mailer) [![Inline Documentation](http://inch-ci.org/github/renz45/mandrill_mailer.svg?branch=master)](http://inch-ci.org/github/renz45/mandrill_mailer)
+[![Build Status](https://img.shields.io/github/workflow/status/renz45/mandrill_mailer/build.svg)](https://github.com/renz45/mandrill_mailer/actions/workflows/tests.yml) [![Gem Version](http://img.shields.io/gem/v/mandrill_mailer.svg)](https://rubygems.org/gems/mandrill_mailer)
+[![Inline Documentation](http://inch-ci.org/github/renz45/mandrill_mailer.svg?branch=master)](http://inch-ci.org/github/renz45/mandrill_mailer)
 
 Inherit the MandrillMailer class in your existing Rails mailers to send transactional emails through Mandrill using their template-based emails.
 
@@ -153,11 +152,13 @@ end
 
    * `:attachments` - An array of file objects with the following keys:
      * `content`: The file contents, this will be encoded into a base64 string internally
+     * `encoded_content` (optional): File content already encoded into base64 string. Overrides `content`
      * `name`: The name of the file
      * `type`: This is the mimetype of the file. Ex. png = image/png, pdf = application/pdf, txt = text/plain etc etc
 
    * `:images` - An array of embedded images to add to the message:
      * `content`: The file contents, this will be encoded into a base64 string internally
+     * `encoded_content` (optional): File content already encoded into base64 string. Overrides `content`
      * `name`: The name of the file
      * `type`: This is the mimetype of the file. Ex. png = image/png, pdf = application/pdf, txt = text/plain etc etc etc
 
@@ -220,7 +221,7 @@ You can send the email by using the familiar syntax:
 
 `InvitationMailer.invite(invitation).deliver_now`
 `InvitationMailer.invite(invitation).deliver_later(wait: 1.hour)`
-For deliver_later, Active Job will need to be configured 
+For deliver_later, Active Job will need to be configured
 
 ## Creating a test method
 When switching over to Mandrill for transactional emails we found that it was hard to setup a mailer in the console to send test emails easily (those darn designers), but really, you don't want to have to setup test objects everytime you want to send a test email. You can set up a testing 'mock' once and then call the `.test` method to send the test email.
@@ -270,7 +271,7 @@ require 'mandrill_mailer/offline'
 And then if you wish you can look at the contents of `MandrillMailer.deliveries` to see whether an email was queued up by your test:
 
 ```ruby
-email = MandrillMailer::deliveries.detect { |mail|
+email = MandrillMailer.deliveries.detect { |mail|
   mail.template_name == 'my-template' &&
   mail.message['to'].any? { |to| to[:email] == 'my@email.com' }
 }
@@ -284,7 +285,7 @@ before :each { MandrillMailer.deliveries.clear }
 ```
 
 ## Using Delayed Job
-The typical Delayed Job mailer syntax won't work with this as of now. Either create a custom job or que the mailer as you would que a method. Take a look at the following examples:
+The typical Delayed Job mailer syntax won't work with this as of now. Either create a custom job or queue the mailer as you would queue a method. Take a look at the following examples:
 
 ```ruby
 def send_hallpass_expired_mailer
@@ -369,11 +370,11 @@ Example that adds multiple bcc recipients:
 MandrillMailer.configure do |config|
   config.interceptor = Proc.new {|params|
 
-    params[:to] =  [
-      params[:to],
-      { email: "bccEmailThatWillBeUsedInAll@emailsSent1.com", name: "name", type: "bcc" },
-      { email: "bccEmailThatWillBeUsedInAll@emailsSent2.com", name: "name", type: "bcc" },
-      { email: "bccEmailThatWillBeUsedInAll@emailsSent3.com", name: "name", type: "bcc" }
+    params["to"] =  [
+      params["to"],
+      { "email" => "bccEmailThatWillBeUsedInAll@emailsSent1.com", "name" => "name", "type" => "bcc" },
+      { "email" => "bccEmailThatWillBeUsedInAll@emailsSent2.com", "name" => "name", "type" => "bcc" },
+      { "email" => "bccEmailThatWillBeUsedInAll@emailsSent3.com", "name" => "name", "type" => "bcc" }
     ].flatten
   }
 end

data/lib/mandrill_mailer/arg_formatter.rb

@@ -11,7 +11,9 @@ module MandrillMailer
         type = attachment[:mimetype] || attachment[:type]
         name = attachment[:filename] || attachment[:name]
         file = attachment[:file] || attachment[:content]
-        {"type" => type, "name" => name, "content" => Base64.encode64(file)}
+        encoded_file = attachment[:encoded_file] || attachment[:encoded_content]
+        next {"type" => type, "name" => name, "content" => encoded_file} if encoded_file
+        next {"type" => type, "name" => name, "content" => Base64.encode64(file)}
       end
     end
 
@@ -23,7 +25,7 @@ module MandrillMailer
     # convert a normal hash into the format mandrill needs
     def self.mandrill_args(args)
       return [] unless args
-      args.map do |k,v|
+      args.stringify_keys.map do |k,v|
         {'name' => k, 'content' => v}
       end
     end

data/lib/mandrill_mailer/core_mailer.rb

@@ -290,11 +290,16 @@ module MandrillMailer
     end
 
     # Makes this class act as a singleton without it actually being a singleton
-    # This keeps the syntax the same as the orginal mailers so we can swap quickly if something
+    # This keeps the syntax the same as the original mailers so we can swap quickly if something
     # goes wrong.
-    def self.method_missing(method, *args)
-      return super unless respond_to?(method)
-      new.method(method).call(*args)
+
+    class << self
+      def method_missing(method, *args, &block)
+        return super unless respond_to?(method)
+        new.method(method).call(*args, &block)
+      end
+
+      ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
     end
 
     def self.respond_to?(method, include_private = false)

data/lib/mandrill_mailer/offline.rb

@@ -26,10 +26,6 @@ module MandrillMailer
   end
 
   class TemplateMailer
-    def deliver
-      deliver_now
-    end
-    
     def deliver_now
       MandrillMailer::Mock.new({
         :template_name    => template_name,
@@ -42,24 +38,9 @@ module MandrillMailer
          MandrillMailer.deliveries << mock
       end
     end
-    def deliver_later
-      MandrillMailer::Mock.new({
-        :template_name    => template_name,
-        :template_content => template_content,
-        :message          => message,
-        :async            => async,
-        :ip_pool          => ip_pool,
-        :send_at          => send_at
-      }).tap do |mock|
-         MandrillMailer.deliveries << mock
-      end
-    end
   end
 
   class MessageMailer
-    def deliver
-      deliver_now
-    end
     def deliver_now
       MandrillMailer::Mock.new({
         :message          => message,
@@ -70,15 +51,5 @@ module MandrillMailer
          MandrillMailer.deliveries << mock
       end
     end
-    def deliver_later
-      MandrillMailer::Mock.new({
-        :message          => message,
-        :async            => async,
-        :ip_pool          => ip_pool,
-        :send_at          => send_at
-      }).tap do |mock|
-         MandrillMailer.deliveries << mock
-      end
-    end
   end
 end

data/lib/mandrill_mailer/rspec_helpers/merge_var_matcher.rb

@@ -30,7 +30,7 @@ RSpec::Matchers.define :have_merge_data do |expected_data|
   MESSAGE
   end
 
-  failure_message do |actual|
+  failure_message_when_negated do |actual|
     <<-MESSAGE.strip_heredoc
     Expected merge variables: #{merge_vars_from(actual).inspect} to not include data: #{expected_data.inspect} but it does.
   MESSAGE

data/lib/mandrill_mailer/version.rb

@@ -1,3 +1,3 @@
 module MandrillMailer
-  VERSION = "1.4.0"
+  VERSION = "1.8.0"
 end

data/mandrill_mailer.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = MandrillMailer::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Adam Rensel"]
-  s.email       = ["adamrensel@codeschool.com"]
+  s.email       = ["adamrensel@gmail.com"]
   s.homepage    = "https://github.com/renz45/mandrill_mailer"
   s.summary     = %q{Transactional Mailer for Mandrill}
   s.description = %q{Transactional Mailer for Mandrill}
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'activesupport'
   s.add_dependency 'actionpack'
   s.add_dependency 'activejob'
-  s.add_runtime_dependency 'mandrill-api', '~> 1.0.9'
+  s.add_runtime_dependency 'mandrillus', '~> 2.0.0'
 
   s.add_development_dependency 'pry'
   s.add_development_dependency 'rspec'

data/spec/arg_formatter_spec.rb

@@ -10,6 +10,13 @@ describe MandrillMailer::ArgFormatter do
       content: "testing some test test file"
     }
   end
+  let(:encoded_api_args) do
+    {
+      type: "some/type",
+      name: 'test',
+      encoded_content: Base64.encode64("testing some test test file")
+    }
+  end
 
   let(:file_args) do
     {
@@ -18,6 +25,13 @@ describe MandrillMailer::ArgFormatter do
       file: "testing some test test file"
     }
   end
+  let(:encoded_file_args) do
+    {
+      mimetype: "some/type",
+      filename: 'test',
+      encoded_file: Base64.encode64("testing some test test file")
+    }
+  end
 
 
   describe 'attachment_args' do
@@ -35,6 +49,16 @@ describe MandrillMailer::ArgFormatter do
           'content' => Base64.encode64("testing some test test file")
         }])
       end
+
+      describe "passing an encoded string" do
+        it "formats the correct attachment data" do
+          expect(formatter.attachment_args([encoded_file_args])).to eq([{
+            'type' => "some/type",
+            'name' => 'test',
+            'content' => Base64.encode64("testing some test test file")
+          }])
+        end
+      end
     end
 
     context "with api syntax" do
@@ -45,6 +69,16 @@ describe MandrillMailer::ArgFormatter do
           'content' => Base64.encode64("testing some test test file")
         }])
       end
+
+      describe "passing an encoded string" do
+        it "formats the correct attachment data" do
+          expect(formatter.attachment_args([encoded_api_args])).to eq([{
+            'type' => "some/type",
+            'name' => 'test',
+            'content' => Base64.encode64("testing some test test file")
+          }])
+        end
+      end
     end
   end
 
@@ -233,4 +267,4 @@ describe MandrillMailer::ArgFormatter do
       end
     end
   end
-end
+end

data/spec/core_mailer_spec.rb

@@ -121,7 +121,7 @@ describe MandrillMailer::CoreMailer do
       expect(new_unique_mailer.message['from_email']).to eq default_from_email
       expect(new_unique_mailer.message['view_content_link']).to eq default_view_content_link
 
-      global_merge_vars = [{ "name" => :foo, "content" => "bar" }]
+      global_merge_vars = [{ "name" => "foo", "content" => "bar" }]
       expect(new_unique_mailer.message['global_merge_vars']).to eq global_merge_vars
     end
 
@@ -179,7 +179,7 @@ describe MandrillMailer::CoreMailer do
 
     context 'Rails is not defined' do
       it 'should raise an exception' do
-        expect{subject}.to raise_error
+        expect{subject}.to raise_error NoMethodError
       end
     end
   end
@@ -212,7 +212,7 @@ describe MandrillMailer::CoreMailer do
 
     context 'Rails does not exist' do
       it 'should raise exception' do
-        expect{ subject }.to raise_error
+        expect{ subject }.to raise_error NoMethodError
       end
     end
   end

data/spec/spec_helper.rb

@@ -8,6 +8,9 @@ require 'pry'
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
+ActiveJob::Base.queue_adapter = :inline
+ActiveJob::Base.logger.level = Logger::WARN
+
 RSpec.configure do |config|
   config.mock_with :rspec
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mandrill_mailer
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Adam Rensel
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-04-28 00:00:00.000000000 Z
+date: 2021-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mandrill-api
+  name: mandrillus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.9
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.9
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -96,11 +96,12 @@ dependencies:
         version: '0'
 description: Transactional Mailer for Mandrill
 email:
-- adamrensel@codeschool.com
+- adamrensel@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/tests.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -137,7 +138,7 @@ homepage: https://github.com/renz45/mandrill_mailer
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -152,9 +153,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Transactional Mailer for Mandrill
 test_files: