ahoy_email 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49c170ba212ecf55a91229da66bd709ae46845d3
-  data.tar.gz: 5c63a301d6ec6cb0d2f711a0398b3d0655eb2262
+  metadata.gz: 98b36aef95156ff7e1938250d562849b11099b18
+  data.tar.gz: 9b268aac653efb5427ccf133dabbd37418d3815a
 SHA512:
-  metadata.gz: 5be291db638905583b8417f1a402083ae5c3d675b76acdc7a1115400510e2b9685ecbdea94d5ce6952daba528d4fff98e69650d95408e435aff6358ebe666439
-  data.tar.gz: 1f39a60bc2ec8a69c3584b0cbaa2888e5e055272d973f448aefa49dc7bb70d2c653dabccc15a7fdea01fed5cf493bba8b8f215918886acd6889d2a45fcb57a90
+  metadata.gz: 126c5fd727f97a61f9a84e99ba8a4fa12b587dc76ba4d21ad1d998ff57bc3f93f963292053b5fad70b4c4a0b90be0017c6978a7a63de3ef7c8ce15504221211b
+  data.tar.gz: 979d1310f3b909296202075e000ec7ca3f3ca8e409934534919ced80bc14dc9b5673219acd862c53fedaeba82c0dd2789d29f8a929e951c8f5ec94db16c63e14

data/.gitignore

@@ -3,7 +3,7 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
+*.lock
 InstalledFiles
 _yardoc
 coverage

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.3.1
+
+- Fixed deprecation warnings
+- Fixed `stack level too deep` error
+
 ## 0.3.0
 
 - Added safely for error reporting

data/app/controllers/ahoy/messages_controller.rb

@@ -20,7 +20,7 @@ module Ahoy
       url = params[:url].to_s
       signature = OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new("sha1"), AhoyEmail.secret_token, url)
       publish :click, url: params[:url]
-      if secure_compare(params[:signature], signature)
+      if secure_compare(params[:signature].to_s, signature)
         redirect_to url
       else
         redirect_to main_app.root_url

data/config/routes.rb

@@ -1,5 +1,7 @@
 Rails.application.routes.draw do
-  mount AhoyEmail::Engine => "/ahoy"
+  unless respond_to?(:has_named_route?) && has_named_route?("ahoy_email_engine")
+    mount AhoyEmail::Engine => "/ahoy"
+  end
 end
 
 AhoyEmail::Engine.routes.draw do

data/lib/ahoy_email/mailer.rb

@@ -2,11 +2,11 @@ module AhoyEmail
   module Mailer
     def self.included(base)
       base.extend ClassMethods
+      base.prepend InstanceMethods
       base.class_eval do
         attr_accessor :ahoy_options
         class_attribute :ahoy_options
         self.ahoy_options = {}
-        alias_method_chain :mail, :ahoy
       end
     end
 
@@ -16,17 +16,19 @@ module AhoyEmail
       end
     end
 
-    def track(options = {})
-      self.ahoy_options = (ahoy_options || {}).merge(message: true).merge(options)
-    end
+    module InstanceMethods
+      def track(options = {})
+        self.ahoy_options = (ahoy_options || {}).merge(message: true).merge(options)
+      end
 
-    def mail_with_ahoy(headers = {}, &block)
-      # this mimics what original method does
-      return message if @_mail_was_called && headers.blank? && !block
+      def mail(headers = {}, &block)
+        # this mimics what original method does
+        return message if @_mail_was_called && headers.blank? && !block
 
-      message = mail_without_ahoy(headers, &block)
-      AhoyEmail::Processor.new(message, self).process
-      message
+        message = super
+        AhoyEmail::Processor.new(message, self).process
+        message
+      end
     end
   end
 end

data/lib/ahoy_email/processor.rb

@@ -39,7 +39,7 @@ module AhoyEmail
 
     def track_send
       safely do
-        if (message_id = message["Ahoy-Message-Id"])
+        if (message_id = message["Ahoy-Message-Id"]) && message.perform_deliveries
           ahoy_message = AhoyEmail.message_model.where(id: message_id.to_s).first
           if ahoy_message
             ahoy_message.sent_at = Time.now

data/lib/ahoy_email/version.rb

@@ -1,3 +1,3 @@
 module AhoyEmail
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/test/gemfiles/actionmailer32.gemfile

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

data/test/gemfiles/actionmailer40.gemfile

@@ -0,0 +1,6 @@
+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

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

data/test/mailer_test.rb

@@ -1,7 +1,8 @@
 require_relative "test_helper"
 
 class UserMailer < ActionMailer::Base
-  after_action :prevent_delivery_to_guests, only: [:welcome2]
+  default from: "from@example.com"
+  after_action :prevent_delivery_to_guests, only: [:welcome2] if Rails.version >= "4.0.0"
 
   def welcome
     mail to: "test@example.org", subject: "Hello", body: "World"
@@ -11,6 +12,11 @@ class UserMailer < ActionMailer::Base
     mail to: "test@example.org", subject: "Hello", body: "World"
   end
 
+  def welcome3
+    track message: false
+    mail to: "test@example.org", subject: "Hello", body: "World"
+  end
+
   private
 
   def prevent_delivery_to_guests
@@ -29,11 +35,19 @@ class MailerTest < Minitest::Test
 
   def test_prevent_delivery
     assert_message :welcome2
+    if Rails.version >= "4.0.0"
+      assert_nil Ahoy::Message.first.sent_at
+    end
+  end
+
+  def test_no_message
+    UserMailer.welcome3.to
+    assert_equal 0, Ahoy::Message.count
   end
 
   def assert_message(method)
     message = UserMailer.send(method)
-    message.to # trigger creation
+    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

data/test/test_helper.rb

@@ -4,5 +4,9 @@ require "minitest/autorun"
 require "minitest/pride"
 require "combustion"
 
+Minitest::Test = Minitest::Unit::TestCase unless defined?(Minitest::Test)
+
 Combustion.path = "test/internal"
 Combustion.initialize! :all
+
+ActionMailer::Base.delivery_method = :test

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ahoy_email
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-17 00:00:00.000000000 Z
+date: 2016-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -161,6 +161,9 @@ 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/internal/config/database.yml
 - test/internal/config/routes.rb
 - test/internal/db/schema.rb
@@ -186,13 +189,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.1
 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/internal/config/database.yml
 - test/internal/config/routes.rb
 - test/internal/db/schema.rb
 - test/mailer_test.rb
 - test/test_helper.rb
+has_rdoc: