ahoy_email 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69eb9c77891a37c75ef7f7683211c90159cbb8aefd64fa14a0b1b35d2e16d0eb
-  data.tar.gz: a937ba8e9362d1c2551f5c193b9a3bbf1b4132f3df9ddb77f3f838f633fb2f07
+  metadata.gz: 12cfd52040334d8582ee01785c46c290d9a8e125d79ea5a5cddabed3d26ed144
+  data.tar.gz: db924f04d522c4bb9fd488fb34533349b231148170de637fff11ca34c6c18b36
 SHA512:
-  metadata.gz: 4b12c970be432d7db95fdb8eaade5766f69fc7826a94f41474ba5c2a35da1ea85b6317f83250cb1c8f41c7fe876028b1377958709d2c84ff9bd303926ac8ab5a
-  data.tar.gz: 96dcc647ee3777e27b14d7628025d96ea92efce7160d36da0b066b72d9dc5aac8196008699a93673d81d0fdcb909aa69874b349dffdbaf0e32e4d7511a32df5a
+  metadata.gz: ba35f76f9d5bb2d52972ab648179e710c16eeda09bc51b4f91aff083bad354ec5dd6b8c98985b913efbf40c9e3215a3111e2a45978c647cf2fa8d9bd96519925
+  data.tar.gz: 1247bc81b9cc52a43ec480640c4c94989cfcf7ac4c0868c5c5cdeb0d85da013f93e9bc61993f78d94a8191819e6b7c76d6593f84d70203ed329793debbf7df2a

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.0.2 (2021-03-14)
+
+- Added support for Mongoid to database subscriber
+
 ## 2.0.1 (2021-03-08)
 
 - Added database subscriber

data/lib/ahoy_email/database_subscriber.rb

@@ -10,9 +10,16 @@ module AhoyEmail
 
     def stats(campaign)
       sends = Ahoy::Message.where(campaign: campaign).count
-      result = Ahoy::Click.where(campaign: campaign).select("COUNT(*) AS clicks, COUNT(DISTINCT token) AS unique_clicks").to_a[0]
-      clicks = result.clicks
-      unique_clicks = result.unique_clicks
+
+      if defined?(ActiveRecord) && Ahoy::Click < ActiveRecord::Base
+        result = Ahoy::Click.where(campaign: campaign).select("COUNT(*) AS clicks, COUNT(DISTINCT token) AS unique_clicks").to_a[0]
+        clicks = result.clicks
+        unique_clicks = result.unique_clicks
+      else
+        clicks = Ahoy::Click.where(campaign: campaign).count
+        # TODO use aggregation framework
+        unique_clicks = Ahoy::Click.where(campaign: campaign).distinct(:token).count
+      end
 
       if sends > 0 || clicks > 0
         {
@@ -25,7 +32,11 @@ module AhoyEmail
     end
 
     def campaigns
-      Ahoy::Message.where.not(campaign: nil).distinct.pluck(:campaign)
+      if defined?(ActiveRecord) && Ahoy::Message < ActiveRecord::Base
+        Ahoy::Message.where.not(campaign: nil).distinct.pluck(:campaign)
+      else
+        Ahoy::Message.where(campaign: {"$ne" => nil}).distinct(:campaign)
+      end
     end
   end
 end

data/lib/ahoy_email/version.rb

@@ -1,3 +1,3 @@
 module AhoyEmail
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

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

@@ -0,0 +1,15 @@
+require "rails/generators"
+
+module Ahoy
+  module Generators
+    module Clicks
+      class MongoidGenerator < Rails::Generators::Base
+        source_root File.join(__dir__, "templates")
+
+        def copy_templates
+          template "mongoid.rb", "app/models/ahoy/click.rb"
+        end
+      end
+    end
+  end
+end

data/lib/generators/ahoy/clicks/templates/mongoid.rb.tt

@@ -0,0 +1,8 @@
+class Ahoy::Click
+  include Mongoid::Document
+
+  field :campaign, type: String
+  field :token, type: String
+
+  index({campaign: 1})
+end

data/lib/generators/ahoy/clicks_generator.rb

@@ -4,7 +4,33 @@ module Ahoy
   module Generators
     class ClicksGenerator < Rails::Generators::Base
       def copy_templates
-        invoke "ahoy:clicks:activerecord"
+        activerecord = defined?(ActiveRecord)
+        mongoid = defined?(Mongoid)
+
+        selection =
+          if activerecord && mongoid
+            puts <<-MSG
+
+Which data store would you like to use?
+ 1. Active Record (default)
+ 2. Mongoid
+            MSG
+
+            ask(">")
+          elsif activerecord
+            "1"
+          else
+            "2"
+          end
+
+        case selection
+        when "", "1"
+          invoke "ahoy:clicks:activerecord"
+        when "2"
+          invoke "ahoy:clicks:mongoid"
+        else
+          abort "Error: must enter a number [1-2]"
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ahoy_email
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-08 00:00:00.000000000 Z
+date: 2021-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -92,7 +92,9 @@ files:
 - lib/ahoy_email/utils.rb
 - lib/ahoy_email/version.rb
 - lib/generators/ahoy/clicks/activerecord_generator.rb
+- lib/generators/ahoy/clicks/mongoid_generator.rb
 - lib/generators/ahoy/clicks/templates/migration.rb.tt
+- lib/generators/ahoy/clicks/templates/mongoid.rb.tt
 - lib/generators/ahoy/clicks_generator.rb
 - lib/generators/ahoy/messages/activerecord_generator.rb
 - lib/generators/ahoy/messages/mongoid_generator.rb