ahoy_email 2.1.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5533583685af32099af8100fe872c8dd146b1b3539d373ba99c12774745c24f
-  data.tar.gz: d4aa807926b5e0d70421c75dbc507ddd1ffeb7856c9c1706c71d4a6ff922dd38
+  metadata.gz: 9c664f526e52ac8f97cf3d5fe5b154ab6396e3f5c8db3d42c7c76022df9e0b35
+  data.tar.gz: 063f9ac13bebe763ff2e33677e68bebd75f46837c5e63b920208e2547725a2a9
 SHA512:
-  metadata.gz: 81ce556e09096d9ffbddcecbfd512023ff86f5acee6a8327634f37fe054d9b1547706b92d7de812c8932fe79257cef380976e0a8101467085d45865dfe45f967
-  data.tar.gz: 830f93a92a24c1d5a338bcf48555df6684e227c07da331b47b8362698f1f928b0282364d13d6533f4d8dfb46b75fa615b60f807b334e6d77c5dfab9fc05dfcd2
+  metadata.gz: 1d7556134bb052f06eea6755f668cdd7c4eb5355dcbe46098894ff6b5ed8735b4c20b240378bafebb9b03b9c2525cf4e7b79e9a0fa240bf1a86289b8c0eb2c2b
+  data.tar.gz: b576323d7768c3c0872afecbbfa35a7ce12b1d8df9a6dc9877d96e691e1d4675a60ef590e00705be8c245a543dc151249504ba511a96d6bbf37ead17afcf6666

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 2.2.0 (2023-07-02)
+
+- Removed support for Ruby < 3 and Rails < 6.1
+
+## 2.1.3 (2022-06-12)
+
+- Updated messages generator for Lockbox 1.0
+- Fixed deprecation warning with Redis 4.6+
+
 ## 2.1.2 (2022-02-09)
 
 - Fixed external redirects with Rails 7

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2021 Andrew Kane
+Copyright (c) 2014-2023 Andrew Kane
 
 MIT License
 

data/README.md

@@ -2,8 +2,6 @@
 
 First-party email analytics for Rails
 
-**Ahoy Email 2.0 was recently released** - see [how to upgrade](#upgrading)
-
 :fire: For web and native app analytics, check out [Ahoy](https://github.com/ankane/ahoy)
 
 :bullettrain_side: To manage unsubscribes, check out [Mailkick](https://github.com/ankane/mailkick)
@@ -15,7 +13,7 @@ First-party email analytics for Rails
 Add this line to your application’s Gemfile:
 
 ```ruby
-gem 'ahoy_email'
+gem "ahoy_email"
 ```
 
 ## Getting Started
@@ -108,7 +106,7 @@ user.messages
 Add extra data to messages. Create a migration like:
 
 ```ruby
-class AddCouponIdToAhoyMessages < ActiveRecord::Migration[6.1]
+class AddCouponIdToAhoyMessages < ActiveRecord::Migration[7.0]
   def change
     add_column :ahoy_messages, :coupon_id, :integer
   end
@@ -230,7 +228,7 @@ AhoyEmail.api = true
 Add this line to your application’s Gemfile:
 
 ```ruby
-gem 'redis'
+gem "redis"
 ```
 
 And create `config/initializers/ahoy_email.rb` with:

data/lib/ahoy_email/redis_subscriber.rb

@@ -9,17 +9,17 @@ module AhoyEmail
 
     def track_send(event)
       campaign_prefix = campaign_key(event[:campaign])
-      redis.pipelined do
-        redis.incr("#{campaign_prefix}:sends")
-        redis.sadd(campaigns_key, event[:campaign])
+      pipelined do |pipeline|
+        pipeline.incr("#{campaign_prefix}:sends")
+        pipeline.sadd(campaigns_key, event[:campaign])
       end
     end
 
     def track_click(event)
       campaign_prefix = campaign_key(event[:campaign])
-      redis.pipelined do
-        redis.incr("#{campaign_prefix}:clicks")
-        redis.pfadd("#{campaign_prefix}:unique_clicks", event[:token])
+      pipelined do |pipeline|
+        pipeline.incr("#{campaign_prefix}:clicks")
+        pipeline.pfadd("#{campaign_prefix}:unique_clicks", event[:token])
       end
     end
 
@@ -62,10 +62,10 @@ module AhoyEmail
       unique_clicks = nil
 
       campaign_prefix = campaign_key(campaign)
-      redis.pipelined do
-        sends = redis.get("#{campaign_prefix}:sends")
-        clicks = redis.get("#{campaign_prefix}:clicks")
-        unique_clicks = redis.pfcount("#{campaign_prefix}:unique_clicks")
+      pipelined do |pipeline|
+        sends = pipeline.get("#{campaign_prefix}:sends")
+        clicks = pipeline.get("#{campaign_prefix}:clicks")
+        unique_clicks = pipeline.pfcount("#{campaign_prefix}:unique_clicks")
       end
 
       {
@@ -75,5 +75,17 @@ module AhoyEmail
         ctr: 100 * unique_clicks.value / sends.value.to_f
       }
     end
+
+    def pipelined
+      if Redis::VERSION.to_f >= 4.6
+        redis.pipelined do |pipeline|
+          yield pipeline
+        end
+      else
+        redis.pipelined do
+          yield redis
+        end
+      end
+    end
   end
 end

data/lib/ahoy_email/version.rb

@@ -1,3 +1,3 @@
 module AhoyEmail
-  VERSION = "2.1.2"
+  VERSION = "2.2.0"
 end

data/lib/ahoy_email.rb

@@ -8,20 +8,20 @@ require "safely/core"
 require "openssl"
 
 # modules
-require "ahoy_email/processor"
-require "ahoy_email/tracker"
-require "ahoy_email/observer"
-require "ahoy_email/mailer"
-require "ahoy_email/utils"
-require "ahoy_email/version"
+require_relative "ahoy_email/processor"
+require_relative "ahoy_email/tracker"
+require_relative "ahoy_email/observer"
+require_relative "ahoy_email/mailer"
+require_relative "ahoy_email/utils"
+require_relative "ahoy_email/version"
 
 # subscribers
-require "ahoy_email/database_subscriber"
-require "ahoy_email/message_subscriber"
-require "ahoy_email/redis_subscriber"
+require_relative "ahoy_email/database_subscriber"
+require_relative "ahoy_email/message_subscriber"
+require_relative "ahoy_email/redis_subscriber"
 
 # integrations
-require "ahoy_email/engine" if defined?(Rails)
+require_relative "ahoy_email/engine" if defined?(Rails)
 
 module AhoyEmail
   mattr_accessor :secret_token, :default_options, :subscribers, :invalid_redirect_url, :track_method, :api, :preserve_callbacks, :save_token

data/lib/generators/ahoy/messages/activerecord_generator.rb

@@ -19,7 +19,7 @@ module Ahoy
         def copy_template
           case encryption
           when "lockbox"
-            template "model_lockbox.rb", "app/models/ahoy/message.rb"
+            template "model_lockbox.rb", "app/models/ahoy/message.rb", lockbox_method: lockbox_method
           when "activerecord"
             template "model_activerecord.rb", "app/models/ahoy/message.rb"
           end
@@ -55,6 +55,14 @@ module Ahoy
             abort "Error: encryption must be lockbox, activerecord, or none"
           end
         end
+
+        def lockbox_method
+          if defined?(Lockbox::VERSION) && Lockbox::VERSION.to_i < 1
+            "encrypts"
+          else
+            "has_encrypted"
+          end
+        end
       end
     end
   end

data/lib/generators/ahoy/messages/mongoid_generator.rb

@@ -13,7 +13,7 @@ module Ahoy
         def copy_templates
           case encryption
           when "lockbox"
-            template "mongoid_lockbox.rb", "app/models/ahoy/message.rb"
+            template "mongoid_lockbox.rb", "app/models/ahoy/message.rb", lockbox_method: lockbox_method
           else
             template "mongoid.rb", "app/models/ahoy/message.rb"
           end
@@ -35,6 +35,14 @@ module Ahoy
             abort "Error: encryption must be lockbox or none"
           end
         end
+
+        def lockbox_method
+          if defined?(Lockbox::VERSION) && Lockbox::VERSION.to_i < 1
+            "encrypts"
+          else
+            "has_encrypted"
+          end
+        end
       end
     end
   end

data/lib/generators/ahoy/messages/templates/model_lockbox.rb.tt

@@ -3,6 +3,6 @@ class Ahoy::Message < ActiveRecord::Base
 
   belongs_to :user, polymorphic: true, optional: true
 
-  encrypts :to
+  <%= lockbox_method %> :to
   blind_index :to
 end

data/lib/generators/ahoy/messages/templates/mongoid_lockbox.rb.tt

@@ -11,6 +11,6 @@ class Ahoy::Message
 
   index({to_bidx: 1})
 
-  encrypts :to
+  <%= lockbox_method %> :to
   blind_index :to
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ahoy_email
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-10 00:00:00.000000000 Z
+date: 2023-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: '0.4'
 description:
 email: andrew@ankane.org
 executables: []
@@ -116,14 +116,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: First-party email analytics for Rails