ses_blacklist_rails 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: '09601f9eab1ead0944d98bc02ee11dea6da748bf'
-  data.tar.gz: 517f916e0fb9db37869962bb4fcd884fcac8661a
+SHA256:
+  metadata.gz: edb8ab1818899ae5e658327dc9be87f5bbaa4f15352ad5f13bbf9434664be564
+  data.tar.gz: a772e98108ee7a1f51c504889c158c77da6b87f733188e06c2908866b732ad51
 SHA512:
-  metadata.gz: 64cf46c009bf30d8c5b74ee0ebea4dd76c0d6a0d92eb869c81c0a83e98b85408d2c77768b1fc63aa095d21360a7c7d4b99fefa5032f4bcb6b8bfd263e341d60d
-  data.tar.gz: 29a2f7391433c47d482020c67404d8258adab93f305cdc89ce9129e451ad79f4db009ace69fd6ef3dcfe6a7c90817a513ffb9950f0eda0f450ca54d8c82b9d83
+  metadata.gz: 8a23f0d10a8820dee53455928f25ba41ba07fb9a950efee9c2bc3a92a87fa0704ad3f2f71e69f93a04558e1a4979b80a31fdf7a3c07d37bd7f8d18c38cde3928
+  data.tar.gz: 8e4f09724df8d274bee1d9633fab5eda0caee77049805c4db0f96c7604dbb496b02a3df705db8fec532571bc51d1384f52e56b42f6aabeba0eae141e11102f63

data/README.md

@@ -23,7 +23,7 @@ $ bundle exec rails g ses_blacklist_rails:install
 ```ruby
 SesBlacklistRails.configure do |config|
   config.send_bounce = false
-  config.send_compliant = false
+  config.send_complaint = false
   config.default_address = 'some_address@sample.com'
 end
 ```

data/app/models/ses_blacklist_rails/notification.rb

@@ -8,5 +8,15 @@ module SesBlacklistRails
       delivery: 2,
       other: 9
     }
+    
+    class << self
+      def validate_bounce
+        @validate_bounce ||= ->(email) { self.bounce.where(email: email).any? }
+      end
+
+      def validate_complaint
+        @validate_complaint ||= ->(email) { self.complaint.where(email: email).any? }
+      end
+    end
   end
 end

data/lib/generators/templates/ses_blacklist_rails.rb

@@ -1,5 +1,5 @@
 SesBlacklistRails.configure do |config|
   config.send_bounce = false
-  config.send_compliant = false
+  config.send_complaint = false
   config.default_address = 'some_address@sample.com'
 end

data/lib/ses_blacklist_rails.rb

@@ -1,12 +1,19 @@
+require 'ses_blacklist_rails/action_mail_interceptor'
 require 'ses_blacklist_rails/config'
 require 'ses_blacklist_rails/engine'
 
 module SesBlacklistRails # :nodoc:
-  def self.configure(*)
-    yield config
-  end
+  class << self
+    def configure(*)
+      yield config
+    end
+
+    def config
+      @config ||= SesBlacklistRails::Config.new
+    end
 
-  def self.config
-    @config ||= SesBlacklistRails::Config.new
+    delegate :send_bounce,     to: :config
+    delegate :send_complaint,  to: :config
+    delegate :default_address, to: :config
   end
 end

data/lib/ses_blacklist_rails/action_mail_interceptor.rb

@@ -8,32 +8,33 @@ module SesBlacklistRails
       private
 
       def validate!(message)
-        unless SesBlacklistRails.send_bounce
-          validate_bounce = ->(email) { SesBlacklistRails::Notification.bounce.find_by(email: email) }
-          message.to.reject!(validate_bounce)
-          message.cc.reject!(validate_bounce)
-          message.bcc.reject!(validate_bounce)
-        end
-
-        unless SesBlacklistRails.send_compliant
-          validate_compliant = ->(email) { SesBlacklistRails::Notification.compliant.find_by(email: email) }
-          message.to.reject!(validate_compliant)
-          message.cc.reject!(validate_compliant)
-          message.bcc.reject!(validate_compliant)
-        end
+        sanitize_destination!(
+          message,
+          SesBlacklistRails::Notification.validate_bounce
+        ) unless SesBlacklistRails.send_bounce
+        sanitize_destination!(
+          message,
+          SesBlacklistRails::Notification.validate_complaint
+        ) unless SesBlacklistRails.send_complaint
 
         defualt_address!(message) if message.to.blank?
         message
       end
 
       def defualt_address!(message)
-        if SesBlacklistRails::Notification.default_address.blank?
+        if SesBlacklistRails.default_address.blank?
           message.perform_deliveries = false
         else
-          message.to << SesBlacklistRails::Notification.default_address
+          message.to = [SesBlacklistRails.default_address]
         end
         message
       end
+
+      def sanitize_destination!(message, validation)
+        message.to = message.to&.reject! &validation
+        message.cc = message.cc&.reject! &validation
+        message.bcc = message.bcc&.reject! &validation
+      end
     end
   end
 end

data/lib/ses_blacklist_rails/config.rb

@@ -6,7 +6,7 @@ module SesBlacklistRails
       false
     end
 
-    config_accessor :send_compliant do
+    config_accessor :send_complaint do
       false
     end
 

data/lib/ses_blacklist_rails/version.rb

@@ -1,3 +1,3 @@
 module SesBlacklistRails
-  VERSION = '0.1.3'.freeze
+  VERSION = '0.1.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ses_blacklist_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - mrdShinse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-21 00:00:00.000000000 Z
+date: 2018-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: AWS SES blacklist for Rails applications.