ahoy_email 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d467aa7543e2d533c9e235ddb1fd5d3a1df4ed3
-  data.tar.gz: 8574de8778ca3bd872e9c086d71e16e359851393
+  metadata.gz: 896fbfeee3ad98de6957deb50df361b61ba3d7a5
+  data.tar.gz: 42a4024bee8e9d3628795ba5637ebaf605bc0fad
 SHA512:
-  metadata.gz: 065864eae9303b91f59f5b3e86169c5e630866061dae2721683883f97e0b6cc9ec4ee40b565ca97e63aaa65600f9bff42b495a554521f234b1e88dcbdce34f63
-  data.tar.gz: baa96b0f8099d081ff591701ffd10395eb991cff4fefe7e88197f7412d4d33cdfc56ab25a48ae891f56aa2c8a6b61f05be7dcab2ae1aaf4ae5fe8e251a20c416
+  metadata.gz: 6cfcc41e31deee1f91e43cd0cf9b1b5305e472e497be81d08eb87fc764fcfc7b8425e3bdbfc4ef3f00bf3898e56de98d6c1128b88550dde436248b47089eb115
+  data.tar.gz: dd28e360cda8635058214b7282b59131bc73f4885fed85fe5be0bc73e2467252386f4e5c103238cb34e931a71a22f1f18dd704da227b6c6e0241885e5f372518

data/.travis.yml

@@ -0,0 +1,17 @@
+language: ruby
+rvm:
+  - 2.3.0
+sudo: false
+script: RUBYOPT=W0 bundle exec rake test
+before_script:
+  - gem install bundler
+notifications:
+  email:
+    on_success: never
+    on_failure: change
+gemfile:
+  - 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.4.0
+
+- Fixed `belongs_to` error in Rails 5
+- Include `safely_block` gem without polluting global namespace
+
 ## 0.3.2
 
 - Fixed deprecation warning for Rails 5

data/Gemfile

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

data/README.md

@@ -14,6 +14,8 @@ Works with any email service.
 
 :fire: To track visits and events, check out [Ahoy](https://github.com/ankane/ahoy)
 
+[![Build Status](https://travis-ci.org/ankane/ahoy_email.svg?branch=master)](https://travis-ci.org/ankane/ahoy_email)
+
 ## Installation
 
 Add this line to your application’s Gemfile:

data/ahoy_email.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "rails"
   spec.add_runtime_dependency "addressable"
   spec.add_runtime_dependency "nokogiri"
-  spec.add_runtime_dependency "safely_block"
+  spec.add_runtime_dependency "safely_block", ">= 0.1.1"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"

data/app/models/ahoy/message.rb

@@ -2,6 +2,6 @@ module Ahoy
   class Message < ActiveRecord::Base
     self.table_name = "ahoy_messages"
 
-    belongs_to :user, polymorphic: true
+    belongs_to :user, AhoyEmail.belongs_to.merge(polymorphic: true)
   end
 end

data/lib/ahoy_email.rb

@@ -4,14 +4,14 @@ require "rails"
 require "nokogiri"
 require "addressable/uri"
 require "openssl"
-require "safely_block"
+require "safely/core"
 require "ahoy_email/processor"
 require "ahoy_email/interceptor"
 require "ahoy_email/mailer"
 require "ahoy_email/engine"
 
 module AhoyEmail
-  mattr_accessor :secret_token, :options, :subscribers
+  mattr_accessor :secret_token, :options, :subscribers, :belongs_to
 
   self.options = {
     message: true,
@@ -30,6 +30,8 @@ module AhoyEmail
 
   self.subscribers = []
 
+  self.belongs_to = {}
+
   def self.track(options)
     self.options = self.options.merge(options)
   end

data/lib/ahoy_email/engine.rb

@@ -3,6 +3,7 @@ module AhoyEmail
     initializer "ahoy_email" do |app|
       secrets = app.respond_to?(:secrets) ? app.secrets : app.config
       AhoyEmail.secret_token ||= secrets.respond_to?(:secret_key_base) ? secrets.secret_key_base : secrets.secret_token
+      AhoyEmail.belongs_to = {optional: true} if Rails::VERSION::MAJOR >= 5
     end
   end
 end

data/lib/ahoy_email/processor.rb

@@ -10,7 +10,7 @@ module AhoyEmail
     end
 
     def process
-      safely do
+      Safely.safely do
         action_name = mailer.action_name.to_sym
         if options[:message] && (!options[:only] || options[:only].include?(action_name)) && !options[:except].to_a.include?(action_name)
           @ahoy_message = AhoyEmail.message_model.new
@@ -31,14 +31,14 @@ module AhoyEmail
 
           ahoy_message.assign_attributes(options[:extra] || {})
 
-          ahoy_message.save
+          ahoy_message.save!
           message["Ahoy-Message-Id"] = ahoy_message.id.to_s
         end
       end
     end
 
     def track_send
-      safely do
+      Safely.safely do
         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

data/lib/ahoy_email/version.rb

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

data/test/gemfiles/actionmailer42.gemfile

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

data/test/test_helper.rb

@@ -10,3 +10,5 @@ Combustion.path = "test/internal"
 Combustion.initialize! :all
 
 ActionMailer::Base.delivery_method = :test
+
+ActiveRecord::Base.belongs_to_required_by_default = true if ActiveRecord::VERSION::MAJOR >= 5

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ahoy_email
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-28 00:00:00.000000000 Z
+date: 2016-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -144,6 +144,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -164,6 +165,7 @@ files:
 - test/gemfiles/actionmailer32.gemfile
 - test/gemfiles/actionmailer40.gemfile
 - test/gemfiles/actionmailer41.gemfile
+- test/gemfiles/actionmailer42.gemfile
 - test/internal/config/database.yml
 - test/internal/config/routes.rb
 - test/internal/db/schema.rb
@@ -189,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Simple, powerful email tracking for Rails
@@ -197,9 +199,9 @@ test_files:
 - test/gemfiles/actionmailer32.gemfile
 - test/gemfiles/actionmailer40.gemfile
 - test/gemfiles/actionmailer41.gemfile
+- test/gemfiles/actionmailer42.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: