ahoy_email 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 896fbfeee3ad98de6957deb50df361b61ba3d7a5
-  data.tar.gz: 42a4024bee8e9d3628795ba5637ebaf605bc0fad
+  metadata.gz: a367225c4c07c790df8fe4267f5bf7d230921b0e
+  data.tar.gz: 9360b86e5075df7bf02e427a689c035db77faaf7
 SHA512:
-  metadata.gz: 6cfcc41e31deee1f91e43cd0cf9b1b5305e472e497be81d08eb87fc764fcfc7b8425e3bdbfc4ef3f00bf3898e56de98d6c1128b88550dde436248b47089eb115
-  data.tar.gz: dd28e360cda8635058214b7282b59131bc73f4885fed85fe5be0bc73e2467252386f4e5c103238cb34e931a71a22f1f18dd704da227b6c6e0241885e5f372518
+  metadata.gz: e4c94a2e17739b8400c1cfccf870f3774c131f23c46ffc062e94140156565e9b002b83ebf3fbd440f857353038274bca4139365267756dfcb7b75bdde2d4eb66
+  data.tar.gz: da84e8725823073ae8aa5d7b636fac645786cff90484bd381b5ce8d894d0556764a9bbd2df9649265ff3d4b00ba310a3ad6dd1090fe88d86bccd7e82ea7231bd

data/.travis.yml

@@ -2,7 +2,7 @@ language: ruby
 rvm:
   - 2.3.0
 sudo: false
-script: RUBYOPT=W0 bundle exec rake test
+script: bundle exec rake test
 before_script:
   - gem install bundler
 notifications:
@@ -11,7 +11,5 @@ notifications:
     on_failure: change
 gemfile:
   - Gemfile
+  - test/gemfiles/actionmailer50.gemfile
   - test/gemfiles/actionmailer42.gemfile
-  - test/gemfiles/actionmailer41.gemfile
-  - test/gemfiles/actionmailer40.gemfile
-  - test/gemfiles/actionmailer32.gemfile

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.5.0
+
+- Added support for Rails 5.1
+- Added `invalid_redirect_url`
+
 ## 0.4.0
 
 - Fixed `belongs_to` error in Rails 5

data/Gemfile

@@ -3,4 +3,4 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in ahoy_email.gemspec
 gemspec
 
-gem "actionmailer", "~> 5.0.0"
+gem "actionmailer", "~> 5.1.0"

data/README.md

@@ -81,7 +81,7 @@ Use `track open: false` to skip this.
 
 A redirect is added to links to track clicks in HTML emails.
 
-````
+```
 http://chartkick.com
 ```
 

data/Rakefile

@@ -5,4 +5,5 @@ task default: :test
 Rake::TestTask.new do |t|
   t.libs << "test"
   t.pattern = "test/**/*_test.rb"
+  t.warning = false
 end

data/ahoy_email.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = ">= 2.0.0"
+
   spec.add_runtime_dependency "rails"
   spec.add_runtime_dependency "addressable"
   spec.add_runtime_dependency "nokogiri"

data/app/controllers/ahoy/messages_controller.rb

@@ -27,7 +27,7 @@ module Ahoy
       if secure_compare(params[:signature].to_s, signature)
         redirect_to url
       else
-        redirect_to main_app.root_url
+        redirect_to AhoyEmail.invalid_redirect_url || main_app.root_url
       end
     end
 

data/lib/ahoy_email.rb

@@ -11,7 +11,7 @@ require "ahoy_email/mailer"
 require "ahoy_email/engine"
 
 module AhoyEmail
-  mattr_accessor :secret_token, :options, :subscribers, :belongs_to
+  mattr_accessor :secret_token, :options, :subscribers, :belongs_to, :invalid_redirect_url
 
   self.options = {
     message: true,
@@ -41,7 +41,7 @@ module AhoyEmail
   end
 
   def self.message_model
-    @message_model || Ahoy::Message
+    (defined?(@message_model) && @message_model) || ::Ahoy::Message
   end
 end
 

data/lib/ahoy_email/mailer.rb

@@ -2,7 +2,7 @@ module AhoyEmail
   module Mailer
     def self.included(base)
       base.extend ClassMethods
-      base.prepend InstanceMethods
+      base.send(:prepend, InstanceMethods)
       base.class_eval do
         attr_accessor :ahoy_options
         class_attribute :ahoy_options

data/lib/ahoy_email/processor.rb

@@ -82,7 +82,7 @@ module AhoyEmail
             id: ahoy_message.token,
             format: "gif"
           )
-        pixel = ActionController::Base.helpers.image_tag(url, size: "1x1", alt: nil)
+        pixel = ActionController::Base.helpers.image_tag(url, size: "1x1", alt: "")
 
         # try to add before body tag
         if raw_source.match(regex)
@@ -103,9 +103,10 @@ module AhoyEmail
           next unless trackable?(uri)
           # utm params first
           if options[:utm_params] && !skip_attribute?(link, "utm-params")
-            params = uri.query_values || {}
+            params = uri.query_values(Array) || []
             UTM_PARAMETERS.each do |key|
-              params[key] ||= options[key.to_sym] if options[key.to_sym]
+              next if params.any? { |k, _v| k == key } || !options[key.to_sym]
+              params << [key, options[key.to_sym]]
             end
             uri.query_values = params
             link["href"] = uri.to_s

data/lib/ahoy_email/version.rb

@@ -1,3 +1,3 @@
 module AhoyEmail
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/lib/generators/ahoy_email/install_generator.rb

@@ -22,7 +22,13 @@ module AhoyEmail
       end
 
       def copy_migration
-        migration_template "install.rb", "db/migrate/create_ahoy_messages.rb"
+        migration_template "install.rb", "db/migrate/create_ahoy_messages.rb", migration_version: migration_version
+      end
+
+      def migration_version
+        if ActiveRecord::VERSION::MAJOR >= 5
+          "[#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}]"
+        end
       end
     end
   end

data/lib/generators/ahoy_email/templates/install.rb

@@ -1,4 +1,4 @@
-class <%= migration_class_name %> < ActiveRecord::Migration
+class <%= migration_class_name %> < ActiveRecord::Migration<%= migration_version %>
   def change
     create_table :ahoy_messages do |t|
       t.string :token

data/test/gemfiles/{actionmailer32.gemfile → actionmailer50.gemfile}

@@ -3,4 +3,4 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in ahoy_email.gemspec
 gemspec path: "../../"
 
-gem "actionmailer", "~> 3.2.0"
+gem "actionmailer", "~> 5.0.0"

data/test/mailer_test.rb

@@ -17,11 +17,26 @@ class UserMailer < ActionMailer::Base
     mail to: "test@example.org", subject: "Hello", body: "World"
   end
 
-  private
+  def welcome4
+    html_message('<a href="http://example.org">Hi<a>')
+  end
 
-  def prevent_delivery_to_guests
-    mail.perform_deliveries = false
+  def welcome5
+    html_message('<a href="http://example.org?baz[]=1&amp;baz[]=2">Hi<a>')
   end
+
+  private
+
+    def prevent_delivery_to_guests
+      mail.perform_deliveries = false
+    end
+
+    def html_message(html)
+      track click: false
+      mail to: "test@example.org", subject: "Hello" do |format|
+        format.html { render plain: html }
+      end
+    end
 end
 
 class MailerTest < Minitest::Test
@@ -45,16 +60,32 @@ class MailerTest < Minitest::Test
     assert_equal 0, Ahoy::Message.count
   end
 
-  def assert_message(method)
-    message = UserMailer.send(method)
-    message.respond_to?(:deliver_now) ? message.deliver_now : message.deliver
-    ahoy_message = Ahoy::Message.first
-    assert_equal 1, Ahoy::Message.count
-    assert_equal "test@example.org", ahoy_message.to
-    assert_equal "UserMailer##{method}", ahoy_message.mailer
-    assert_equal "Hello", ahoy_message.subject
-    assert_equal "user_mailer", ahoy_message.utm_source
-    assert_equal "email", ahoy_message.utm_medium
-    assert_equal method.to_s, ahoy_message.utm_campaign
+  def test_utm_params
+    message = UserMailer.welcome4
+    body = message.body.to_s
+    assert_match "utm_campaign=welcome4", body
+    assert_match "utm_medium=email", body
+    assert_match "utm_source=user_mailer", body
+  end
+
+  def test_array_params
+    message = UserMailer.welcome5
+    body = message.body.to_s
+    assert_match "baz%5B%5D=1&amp;baz%5B%5D=2", body
   end
+
+  private
+
+    def assert_message(method)
+      message = UserMailer.send(method)
+      message.respond_to?(:deliver_now) ? message.deliver_now : message.deliver
+      ahoy_message = Ahoy::Message.first
+      assert_equal 1, Ahoy::Message.count
+      assert_equal "test@example.org", ahoy_message.to
+      assert_equal "UserMailer##{method}", ahoy_message.mailer
+      assert_equal "Hello", ahoy_message.subject
+      assert_equal "user_mailer", ahoy_message.utm_source
+      assert_equal "email", ahoy_message.utm_medium
+      assert_equal method.to_s, ahoy_message.utm_campaign
+    end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ahoy_email
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-01 00:00:00.000000000 Z
+date: 2017-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -162,10 +162,8 @@ files:
 - lib/ahoy_email/version.rb
 - lib/generators/ahoy_email/install_generator.rb
 - lib/generators/ahoy_email/templates/install.rb
-- test/gemfiles/actionmailer32.gemfile
-- test/gemfiles/actionmailer40.gemfile
-- test/gemfiles/actionmailer41.gemfile
 - test/gemfiles/actionmailer42.gemfile
+- test/gemfiles/actionmailer50.gemfile
 - test/internal/config/database.yml
 - test/internal/config/routes.rb
 - test/internal/db/schema.rb
@@ -183,7 +181,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -196,10 +194,8 @@ signing_key:
 specification_version: 4
 summary: Simple, powerful email tracking for Rails
 test_files:
-- test/gemfiles/actionmailer32.gemfile
-- test/gemfiles/actionmailer40.gemfile
-- test/gemfiles/actionmailer41.gemfile
 - test/gemfiles/actionmailer42.gemfile
+- test/gemfiles/actionmailer50.gemfile
 - test/internal/config/database.yml
 - test/internal/config/routes.rb
 - test/internal/db/schema.rb

data/test/gemfiles/actionmailer40.gemfile

@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-# Specify your gem's dependencies in ahoy_email.gemspec
-gemspec path: "../../"
-
-gem "actionmailer", "~> 4.0.0"

data/test/gemfiles/actionmailer41.gemfile

@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-# Specify your gem's dependencies in ahoy_email.gemspec
-gemspec path: "../../"
-
-gem "actionmailer", "~> 4.1.0"