mailkick 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90d458c1e23507be111eeb1e9de2ecfa430bbea1
-  data.tar.gz: bd18b0a3b32a5bd69ad8a73409c5d42bb7c6435e
+  metadata.gz: 1f87170752ac89e4482f6f10211bfcd3c0e12f3d
+  data.tar.gz: 48e44c8d786a2b75fe34bc1d9435932e4fb8b5ec
 SHA512:
-  metadata.gz: 7ccb7874c79601b112b15242802a760d75a97cc16c07ec7b1163fbfd6bfb609b011cf26d6d443ef2edda5ff13850a016ca62073adbff703024dfc52fda776eb9
-  data.tar.gz: fd76e86747549847fcfe4359aba508e575c8b36c7eacba58f254209a012759b34fa34c044aa7c27d22f428fc6ff011f41208511f6d8207067753f5c0aa9d4439
+  metadata.gz: 98fd63a5858b70759ea11bbe64666cdea206744bd3ec6896f7ab8f1e2ea115c80e502923b03f6c171405b7be0cc23f6caed6e4f4c4cf9f3be55a964c02573aa5
+  data.tar.gz: f358a7f4df99d494f267d4c59c5982da6d1d20ee585663e72dae8bf64fd100d064ddbf77f6fbdc386a24cf52c91ad86a73c1d4801448b78333b2ece9c7e7b9dd

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.6
+
+- Fixed error with frozen strings
+
 ## 0.1.5
 
 - Use `safely`

data/Gemfile

@@ -2,3 +2,5 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in mailkick.gemspec
 gemspec
+
+gem "actionmailer"

data/README.md

@@ -195,7 +195,7 @@ More great gems for email
 Change how the user is determined
 
 ```ruby
-Mailkick.user_method = proc {|email| User.where(email: email).first }
+Mailkick.user_method = -> (email) { User.find_by(email: email) }
 ```
 
 Use a different email field

data/Rakefile

@@ -1 +1,8 @@
 require "bundler/gem_tasks"
+require "rake/testtask"
+
+task default: :test
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.pattern = "test/**/*_test.rb"
+end

data/lib/mailkick/model.rb

@@ -1,7 +1,7 @@
 module Mailkick
   module Model
-    def mailkick_user(options = {})
-      email_key = options[:email_key] || :email
+    def mailkick_user(opts = {})
+      email_key = opts[:email_key] || :email
       class_eval do
         scope :opted_out, proc {|options = {}|
           binds = [self.class.name, true]

data/lib/mailkick/processor.rb

@@ -20,7 +20,9 @@ module Mailkick
 
       parts = message.parts.any? ? message.parts : [message]
       parts.each do |part|
-        part.body.raw_source.gsub!(/%7B%7BMAILKICK_TOKEN%7D%7D/, CGI.escape(token))
+        if part.content_type.match(/text\/(html|plain)/)
+          part.body = part.body.decoded.gsub(/%7B%7BMAILKICK_TOKEN%7D%7D/, CGI.escape(token))
+        end
       end
     end
   end

data/lib/mailkick/version.rb

@@ -1,3 +1,3 @@
 module Mailkick
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/lib/mailkick.rb

@@ -1,5 +1,7 @@
-require "mailkick/version"
-require "mailkick/engine"
+require "set"
+require "safely/core"
+require "active_support"
+require "mailkick/engine" if defined?(Rails)
 require "mailkick/processor"
 require "mailkick/mailer"
 require "mailkick/model"
@@ -8,8 +10,7 @@ require "mailkick/service/mailchimp"
 require "mailkick/service/mandrill"
 require "mailkick/service/sendgrid"
 require "mailkick/service/mailgun"
-require "set"
-require "safely/core"
+require "mailkick/version"
 
 module Mailkick
   mattr_accessor :services, :user_method, :secret_token, :mount
@@ -89,5 +90,10 @@ module Mailkick
   end
 end
 
-ActionMailer::Base.send(:prepend, Mailkick::Mailer)
-ActiveRecord::Base.send(:extend, Mailkick::Model) if defined?(ActiveRecord)
+ActiveSupport.on_load(:action_mailer) do
+  prepend Mailkick::Mailer
+end
+
+ActiveSupport.on_load(:active_record) do
+  extend Mailkick::Model
+end

data/mailkick.gemspec

@@ -18,8 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "activesupport"
   spec.add_dependency "safely_block", ">= 0.1.1"
 
-  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "minitest"
 end

data/test/mailkick_test.rb

@@ -0,0 +1,11 @@
+require_relative "test_helper"
+
+class MailkickTest < Minitest::Test
+  def test_unsubscribe_url
+    message = UserMailer.welcome.deliver_now
+    html_body = message.html_part.body.to_s
+    assert_equal "<p>BAhbCUkiFXRlc3RAZXhhbXBsZS5vcmcGOgZFVDAwMA%3D%3D--f435e91ba90e1732d3e999af1f2126dcc8182a5d</p>", html_body
+    text_body = message.text_part.body.to_s
+    assert_equal "Boom: BAhbCUkiFXRlc3RAZXhhbXBsZS5vcmcGOgZFVDAwMA%3D%3D--f435e91ba90e1732d3e999af1f2126dcc8182a5d", text_body
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,22 @@
+require "bundler/setup"
+Bundler.require(:default)
+require "minitest/autorun"
+require "minitest/pride"
+require "logger"
+require "action_mailer"
+
+Minitest::Test = Minitest::Unit::TestCase unless defined?(Minitest::Test)
+ActionMailer::Base.delivery_method = :test
+
+Mailkick.secret_token = "test123"
+
+class UserMailer < ActionMailer::Base
+  default from: "from@example.com"
+
+  def welcome
+    mail to: "test@example.org", subject: "Hello" do |format|
+      format.html { render text: "<p>%7B%7BMAILKICK_TOKEN%7D%7D</p>" }
+      format.text { render text: "Boom: %7B%7BMAILKICK_TOKEN%7D%7D" }
+    end
+  end
+end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: mailkick
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-07 00:00:00.000000000 Z
+date: 2017-01-10 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: safely_block
   requirement: !ruby/object:Gem::Requirement
@@ -28,16 +42,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Email subscriptions made easy
 email:
 - andrew@chartkick.com
@@ -85,6 +113,8 @@ files:
 - lib/mailkick/service/sendgrid.rb
 - lib/mailkick/version.rb
 - mailkick.gemspec
+- test/mailkick_test.rb
+- test/test_helper.rb
 homepage: https://github.com/ankane/mailkick
 licenses:
 - MIT
@@ -105,8 +135,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Email subscriptions made easy
-test_files: []
+test_files:
+- test/mailkick_test.rb
+- test/test_helper.rb