tolliver 1.0.0 → 2.1.2

data/lib/tolliver/services/policies/batch.rb

@@ -0,0 +1,82 @@
+# *****************************************************************************
+# * Copyright (c) 2019 Matěj Outlý
+# *****************************************************************************
+# *
+# * Notification receiver
+# *
+# * Author: Matěj Outlý
+# * Date  : 21. 1. 2016
+# *
+# *****************************************************************************
+
+module Tolliver
+  module Services
+    module Policies
+      class Batch
+
+        def deliver(notification_delivery, batch_size = 10)
+
+          # Input validation
+          return nil if notification_delivery.nil? || notification_delivery.policy != :batch
+
+          # Enqueue
+          Tolliver::Jobs::BatchPolicyJob.perform_later(notification_delivery.id, batch_size)
+        end
+
+        def deliver_batch_and_enqueue(notification_delivery, batch_size = 10)
+
+          # Input validation
+          return nil if notification_delivery.nil? || notification_delivery.policy != :batch
+
+          # Send single batch
+          remaining = deliver_batch(notification_delivery, batch_size)
+
+          # If still some receivers remaining, enqueue next batch
+          if remaining > 0
+
+            # Sleep for a while to prevent SMTP/SMS service overflow
+            sleep 5 # seconds
+
+            # Queue next batch
+            deliver(notification_delivery, batch_size)
+            false
+          else
+            true
+          end
+
+        end
+
+        def deliver_batch(notification_delivery, batch_size = 10)
+
+          # Input validation
+          return nil if notification_delivery.nil? || notification_delivery.policy != :batch
+
+          # Nothing to do
+          return 0 if notification_delivery.sent_count == notification_delivery.receivers_count
+
+          # Get batch of receivers prepared for send
+          notification_receivers = notification_delivery.notification_receivers.where(sent_at: nil).limit(batch_size)
+
+          # Send entire batch
+          sent_counter = 0
+          notification_receivers.each do |notification_receiver|
+            sent_counter += 1 if notification_delivery.method_service.deliver(notification_receiver)
+          end
+
+          # Is postponed
+          notification_delivery.is_postponed = false
+
+          # Update statistics
+          notification_delivery.sent_count += sent_counter
+          notification_delivery.sent_at = Time.current if notification_delivery.sent_count == notification_delivery.receivers_count
+
+          # Save
+          notification_delivery.save
+
+          (notification_delivery.receivers_count - notification_delivery.sent_count)
+        end
+
+      end
+    end
+  end
+end

data/lib/tolliver/services/policies/instantly.rb

@@ -0,0 +1,50 @@
+# *****************************************************************************
+# * Copyright (c) 2019 Matěj Outlý
+# *****************************************************************************
+# *
+# * Notification receiver
+# *
+# * Author: Matěj Outlý
+# * Date  : 21. 1. 2016
+# *
+# *****************************************************************************
+
+module Tolliver
+  module Services
+    module Policies
+      class Instantly
+
+        def deliver(notification_delivery)
+
+          # Input validation
+          return nil if notification_delivery.nil? || notification_delivery.policy != :instantly
+
+          # Nothing to do
+          return 0 if notification_delivery.sent_count == notification_delivery.receivers_count
+
+          # Get batch of receivers prepared for send
+          notification_receivers = notification_delivery.notification_receivers #.where(sent_at: nil)
+
+          # Send entire batch
+          sent_counter = 0
+          notification_receivers.each do |notification_receiver|
+            sent_counter += 1 if notification_delivery.method_service.deliver(notification_receiver)
+          end
+
+          # Is postponed
+          notification_delivery.is_postponed = false
+
+          # Update statistics
+          notification_delivery.sent_count += sent_counter
+          notification_delivery.sent_at = Time.current if notification_delivery.sent_count == notification_delivery.receivers_count
+
+          # Save
+          notification_delivery.save
+
+          (notification_delivery.receivers_count - notification_delivery.sent_count)
+        end
+
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tolliver
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.1.2
 platform: ruby
 authors:
 - Matěj Outlý
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-18 00:00:00.000000000 Z
+date: 2021-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '6.0'
 description: Tolliver is an engine for event notification and distribution among users
   via e-mail, SMS or other 3rd party systems.
 email:
@@ -36,11 +36,12 @@ files:
 - README.md
 - app/mailers/tolliver/notification_mailer.rb
 - app/models/tolliver/notification.rb
+- app/models/tolliver/notification_attachment.rb
 - app/models/tolliver/notification_delivery.rb
 - app/models/tolliver/notification_receiver.rb
 - app/models/tolliver/notification_template.rb
-- app/views/notification_mailer/notify.html.erb
-- app/views/notification_mailer/notify.text.erb
+- app/views/tolliver/notification_mailer/notify.html.erb
+- app/views/tolliver/notification_mailer/notify.text.erb
 - config/locales/cs.yml
 - config/locales/en.yml
 - config/routes.rb
@@ -48,26 +49,36 @@ files:
 - db/migrate/20160121094838_create_notification_receivers.rb
 - db/migrate/20160509144238_create_notification_templates.rb
 - db/migrate/20170630190600_create_notification_deliveries.rb
+- db/migrate/20201027150000_create_notification_attachments.rb
+- db/migrate/20210415120000_add_notification_attachments_url.rb
 - lib/tolliver.rb
 - lib/tolliver/engine.rb
+- lib/tolliver/errors/bad_request.rb
+- lib/tolliver/errors/not_found.rb
+- lib/tolliver/errors/standard_error.rb
+- lib/tolliver/jobs/batch_policy_job.rb
+- lib/tolliver/jobs/delivery_job.rb
 - lib/tolliver/mailers/notification_mailer.rb
 - lib/tolliver/models/notification.rb
+- lib/tolliver/models/notification_attachment.rb
 - lib/tolliver/models/notification_delivery.rb
-- lib/tolliver/models/notification_delivery/batch.rb
-- lib/tolliver/models/notification_delivery/instantly.rb
 - lib/tolliver/models/notification_receiver.rb
-- lib/tolliver/models/notification_receiver/email.rb
-- lib/tolliver/models/notification_receiver/sms.rb
 - lib/tolliver/models/notification_template.rb
-- lib/tolliver/services/delivery.rb
-- lib/tolliver/services/notification.rb
-- lib/tolliver/services/sms/plivo.rb
+- lib/tolliver/services/delivery_service.rb
+- lib/tolliver/services/methods/email.rb
+- lib/tolliver/services/methods/email/mailgun.rb
+- lib/tolliver/services/methods/email/smtp.rb
+- lib/tolliver/services/methods/sms.rb
+- lib/tolliver/services/methods/sms/plivo.rb
+- lib/tolliver/services/notification_service.rb
+- lib/tolliver/services/policies/batch.rb
+- lib/tolliver/services/policies/instantly.rb
 - lib/tolliver/utils/enum.rb
 homepage: https://github.com/matej-outly/tolliver
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -83,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Event notification and distribution
 test_files: []

data/app/views/notification_mailer/notify.html.erb

@@ -1 +0,0 @@
-<%= @notification.message.html_safe %>

data/app/views/notification_mailer/notify.text.erb

@@ -1 +0,0 @@
-<%= @notification.message.to_s.strip_tags %>

data/lib/tolliver/models/notification_delivery/batch.rb

@@ -1,77 +0,0 @@
-# *****************************************************************************
-# * Copyright (c) 2019 Matěj Outlý
-# *****************************************************************************
-# *
-# * Notification receiver
-# *
-# * Author: Matěj Outlý
-# * Date  : 21. 1. 2016
-# *
-# *****************************************************************************
-
-module Tolliver
-  module Models
-    module NotificationDelivery
-      module Batch
-        extend ActiveSupport::Concern
-
-        module ClassMethods
-
-          protected
-
-          def deliver_batch(notification_delivery_id, batch_size = 10)
-
-            # Find notification delivery object
-            notification_delivery = Tolliver.notification_delivery_model.find_by_id(notification_delivery_id)
-            return nil if notification_delivery.nil? || notification_delivery.policy != :batch
-
-            # Nothing to do
-            return 0 if notification_delivery.sent_count == notification_delivery.receivers_count
-
-            # Get batch of receivers prepared for send
-            notification_receivers = notification_delivery.notification_receivers.where(sent_at: nil).limit(batch_size)
-
-            # Send entire batch
-            sent_counter = 0
-            notification_receivers.each do |notification_receiver|
-              sent_counter += 1 if notification_receiver.deliver
-            end
-
-            # Update statistics
-            notification_delivery.sent_count += sent_counter
-            notification_delivery.sent_at = Time.current if notification_delivery.sent_count == notification_delivery.receivers_count
-
-            # Save
-            notification_delivery.save
-
-            return (notification_delivery.receivers_count - notification_delivery.sent_count)
-
-          end
-
-          def deliver_batch_and_enqueue(notification_delivery_id, batch_size = 10)
-
-            # Send single batch
-            remaining = deliver_batch(notification_delivery_id, batch_size)
-            return nil if remaining.nil?
-
-            # If still some receivers remaining, enqueue next batch
-            if remaining > 0
-
-              # Sleep for a while to prevent SMTP/SMS service overflow
-              sleep 5 # seconds
-
-              # Queue next batch
-              QC.enqueue("#{self.to_s}.deliver_batch_and_enqueue", notification_delivery_id, batch_size)
-              return false
-            else
-              return true
-            end
-
-          end
-
-        end
-
-      end
-    end
-  end
-end

data/lib/tolliver/models/notification_delivery/instantly.rb

@@ -1,55 +0,0 @@
-# *****************************************************************************
-# * Copyright (c) 2019 Matěj Outlý
-# *****************************************************************************
-# *
-# * Notification receiver
-# *
-# * Author: Matěj Outlý
-# * Date  : 21. 1. 2016
-# *
-# *****************************************************************************
-
-module Tolliver
-  module Models
-    module NotificationDelivery
-      module Instantly
-        extend ActiveSupport::Concern
-
-        module ClassMethods
-
-          protected
-
-          def deliver_instantly(notification_delivery_id)
-
-            # Find notification delivery object
-            notification_delivery = Tolliver.notification_delivery_model.find_by_id(notification_delivery_id)
-            return nil if notification_delivery.nil? || notification_delivery.policy != :instantly
-
-            # Nothing to do
-            return 0 if notification_delivery.sent_count == notification_delivery.receivers_count
-
-            # Get batch of receivers prepared for send
-            notification_receivers = notification_delivery.notification_receivers #.where(sent_at: nil)
-
-            # Send entire batch
-            sent_counter = 0
-            notification_receivers.each do |notification_receiver|
-              sent_counter += 1 if notification_receiver.deliver
-            end
-
-            # Update statistics
-            notification_delivery.sent_count += sent_counter
-            notification_delivery.sent_at = Time.current if notification_delivery.sent_count == notification_delivery.receivers_count
-
-            # Save
-            notification_delivery.save
-
-            return (notification_delivery.receivers_count - notification_delivery.sent_count)
-          end
-
-        end
-
-      end
-    end
-  end
-end

data/lib/tolliver/models/notification_receiver/email.rb

@@ -1,46 +0,0 @@
-# *****************************************************************************
-# * Copyright (c) 2019 Matěj Outlý
-# *****************************************************************************
-# *
-# * Notification receiver
-# *
-# * Author: Matěj Outlý
-# * Date  : 21. 1. 2016
-# *
-# *****************************************************************************
-
-module Tolliver
-  module Models
-    module NotificationReceiver
-      module Email
-        extend ActiveSupport::Concern
-
-        protected
-
-        # Send notification by e-mail
-        def deliver_by_email
-          notification = self.notification_delivery.notification
-
-          # Send email
-          begin
-            Tolliver::NotificationMailer.notify(notification, self.receiver).deliver_now
-            self.state = "sent"
-              #rescue Net::SMTPFatalError, Net::SMTPSyntaxError
-          rescue StandardError => e
-            self.state = "error"
-            self.error_message = e.message
-          end
-
-          # Mark as sent
-          self.sent_at = Time.current
-
-          # Save
-          self.save
-
-          return true
-        end
-
-      end
-    end
-  end
-end

data/lib/tolliver/models/notification_receiver/sms.rb

@@ -1,45 +0,0 @@
-# *****************************************************************************
-# * Copyright (c) 2019 Matěj Outlý
-# *****************************************************************************
-# *
-# * Notification receiver
-# *
-# * Author: Matěj Outlý
-# * Date  : 21. 1. 2016
-# *
-# *****************************************************************************
-
-module Tolliver
-  module Models
-    module NotificationReceiver
-      module Sms
-        extend ActiveSupport::Concern
-
-        protected
-
-        # Send notification by SMS
-        def deliver_by_sms
-          notification = self.notification_delivery.notification
-
-          # Send SMS
-          begin
-            Tolliver.sms_provider_obj.deliver(self.receiver.phone, notification.message.strip_tags)
-            self.state = "sent"
-          rescue StandardError => e
-            self.state = "error"
-            self.error_message = e.message
-          end
-
-          # Mark as sent
-          self.sent_at = Time.current
-
-          # Save
-          self.save
-
-          return true
-        end
-
-      end
-    end
-  end
-end