ahoy_email 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5533583685af32099af8100fe872c8dd146b1b3539d373ba99c12774745c24f
-  data.tar.gz: d4aa807926b5e0d70421c75dbc507ddd1ffeb7856c9c1706c71d4a6ff922dd38
+  metadata.gz: b465af2a0497b6b85237fa5246c4c722d594978e07710f66ec96a9260fb44c98
+  data.tar.gz: 3f5e353adebbc67fbea887d9a8e36f01ba237a04d16431947855c81fc8be1bcd
 SHA512:
-  metadata.gz: 81ce556e09096d9ffbddcecbfd512023ff86f5acee6a8327634f37fe054d9b1547706b92d7de812c8932fe79257cef380976e0a8101467085d45865dfe45f967
-  data.tar.gz: 830f93a92a24c1d5a338bcf48555df6684e227c07da331b47b8362698f1f928b0282364d13d6533f4d8dfb46b75fa615b60f807b334e6d77c5dfab9fc05dfcd2
+  metadata.gz: ead0edcbeda702bd605ea00562addfb65cb321e6797a2fb0e8c1fed640511d8bb5bb2b34a4acfa3bde12447bb0401d0975548661bc867cc7e5c1b5585db01425
+  data.tar.gz: c903baeebe4fbd700a58d9e193094648ccf0a3205e70fd78fb20a84cf09dfaee3f642ef45d78e4a50eb86d287b9d0974e8d33075528eef03702fe311175aa5e1

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 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/README.md

@@ -15,7 +15,7 @@ First-party email analytics for Rails
 Add this line to your application’s Gemfile:
 
 ```ruby
-gem 'ahoy_email'
+gem "ahoy_email"
 ```
 
 ## Getting Started
@@ -230,7 +230,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.1.3"
 end

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.1.3
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-10 00:00:00.000000000 Z
+date: 2022-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: First-party email analytics for Rails