mailkick 0.4.0 → 1.0.1

data/lib/mailkick/service/postmark.rb

@@ -0,0 +1,41 @@
+# https://github.com/wildbit/postmark-gem
+
+module Mailkick
+  class Service
+    class Postmark < Mailkick::Service
+      REASONS_MAP = {
+        "SpamNotification" => "spam",
+        "SpamComplaint" => "spam",
+        "Unsubscribe" => "unsubscribe",
+      }
+
+      def initialize(options = {})
+        @client = ::Postmark::ApiClient.new(options[:api_key] || ENV["POSTMARK_API_KEY"])
+      end
+
+      def opt_outs
+        bounces
+      end
+
+      def bounces
+        fetch(@client.bounces)
+      end
+
+      def self.discoverable?
+        !!(defined?(::Postmark) && ENV["POSTMARK_API_KEY"])
+      end
+
+      protected
+
+      def fetch(response)
+        response.map do |record|
+          {
+            email: record[:email],
+            time: ActiveSupport::TimeZone["UTC"].parse(record[:bounced_at]),
+            reason: REASONS_MAP.fetch(record[:type], "bounce")
+          }
+        end
+      end
+    end
+  end
+end

data/lib/mailkick/service/sendgrid.rb

@@ -2,7 +2,7 @@
 
 module Mailkick
   class Service
-    class Sendgrid < Mailkick::Service
+    class SendGrid < Mailkick::Service
       def initialize(options = {})
         @api_user = options[:api_user] || ENV["SENDGRID_USERNAME"]
         @api_key = options[:api_key] || ENV["SENDGRID_PASSWORD"]
@@ -41,5 +41,8 @@ module Mailkick
         end
       end
     end
+
+    # backwards compatibility
+    Sendgrid = SendGrid
   end
 end

data/lib/mailkick/service/sendgrid_v2.rb

@@ -0,0 +1,52 @@
+# https://github.com/sendgrid/sendgrid-ruby
+
+module Mailkick
+  class Service
+    class SendGridV2 < Mailkick::Service
+      def initialize(options = {})
+        @api_key = options[:api_key] || ENV["SENDGRID_API_KEY"]
+      end
+
+      def opt_outs
+        unsubscribes + spam_reports + bounces
+      end
+
+      def unsubscribes
+        fetch(client.suppression.unsubscribes, "unsubscribe")
+      end
+
+      def spam_reports
+        fetch(client.suppression.spam_reports, "spam")
+      end
+
+      def bounces
+        fetch(client.suppression.bounces, "bounce")
+      end
+
+      def self.discoverable?
+        !!(defined?(::SendGrid::API) && ENV["SENDGRID_API_KEY"])
+      end
+
+      protected
+
+      def client
+        @client ||= ::SendGrid::API.new(api_key: @api_key).client
+      end
+
+      def fetch(query, reason)
+        # TODO paginate
+        response = query.get
+
+        raise "Bad status code: #{response.status_code}" if response.status_code.to_i != 200
+
+        response.parsed_body.map do |record|
+          {
+            email: record[:email],
+            time: Time.at(record[:created]),
+            reason: reason
+          }
+        end
+      end
+    end
+  end
+end

data/lib/mailkick/url_helper.rb

@@ -0,0 +1,8 @@
+module Mailkick
+  module UrlHelper
+    def mailkick_unsubscribe_url(subscriber, list, **options)
+      token = Mailkick.generate_token(subscriber, list)
+      mailkick.unsubscribe_subscription_url(token, **options)
+    end
+  end
+end

data/lib/mailkick/version.rb

@@ -1,3 +1,3 @@
 module Mailkick
-  VERSION = "0.4.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mailkick
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Andrew Kane
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-16 00:00:00.000000000 Z
+date: 2021-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,156 +16,16 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: gibbon
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2'
-- !ruby/object:Gem::Dependency
-  name: mailgun-ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mandrill-api
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sendgrid_toolkit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: combustion
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-description: 
-email: andrew@chartkick.com
+        version: '5.2'
+description:
+email: andrew@ankane.org
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -174,8 +34,8 @@ files:
 - LICENSE.txt
 - README.md
 - app/controllers/mailkick/subscriptions_controller.rb
-- app/helpers/mailkick/url_helper.rb
 - app/models/mailkick/opt_out.rb
+- app/models/mailkick/subscription.rb
 - app/views/mailkick/subscriptions/show.html.erb
 - config/routes.rb
 - lib/generators/mailkick/install_generator.rb
@@ -183,18 +43,23 @@ files:
 - lib/generators/mailkick/views_generator.rb
 - lib/mailkick.rb
 - lib/mailkick/engine.rb
+- lib/mailkick/legacy.rb
 - lib/mailkick/model.rb
 - lib/mailkick/service.rb
+- lib/mailkick/service/aws_ses.rb
 - lib/mailkick/service/mailchimp.rb
 - lib/mailkick/service/mailgun.rb
 - lib/mailkick/service/mandrill.rb
+- lib/mailkick/service/postmark.rb
 - lib/mailkick/service/sendgrid.rb
+- lib/mailkick/service/sendgrid_v2.rb
+- lib/mailkick/url_helper.rb
 - lib/mailkick/version.rb
 homepage: https://github.com/ankane/mailkick
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -202,15 +67,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
-summary: Email subscriptions made easy
+summary: Email subscriptions for Rails
 test_files: []

data/app/helpers/mailkick/url_helper.rb

@@ -1,15 +0,0 @@
-module Mailkick
-  module UrlHelper
-    def mailkick_unsubscribe_url(email: nil, user: nil, list: nil, **options)
-      email ||= controller.try(:message).try(:to).try(:first)
-
-      Mailkick::Engine.routes.url_helpers.url_for(
-        (ActionMailer::Base.default_url_options || {}).merge(options).merge(
-          controller: "mailkick/subscriptions",
-          action: "unsubscribe",
-          id: Mailkick.generate_token(email, user: user, list: list)
-        )
-      )
-    end
-  end
-end