tolliver 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 652fa21e199c69608d3a5bccec4a1702b4ffb547950cc0a4cdecede13100398d
-  data.tar.gz: 10d9e9b2b207ef9d7af899115b1703794fd5821249bb232fb1fc1e51f29d14fe
+  metadata.gz: 5a1110eda739a5bb9763c51608a6a251c356962bc02690b2b5b81d06239d0893
+  data.tar.gz: 4ab466afccc3086a66c4d50ecc7c87214b89aa734553f64b8e7f73c93ec491a5
 SHA512:
-  metadata.gz: cf3765a95bde23c800142e846a64548dc6fbf293c9bc65027eccddfe24b0f88505ec9310b57821c7268711e1ba8fe0b81ed352a60565ccee6375a797bfb27895
-  data.tar.gz: '08c5fcda8093414dc792608fa8d21cff313862f054b21e65efc21c4c4045fb5d854dfc4fc296829ad95874b7b9f35f6439d83b601d391bc62c59d0cb0ad72348'
+  metadata.gz: 5901317de7117ceca9fcc6396706d018d62d99ebaf69b7361fe2118766c9bf87a6ac684c8169815818b9ac66fe06e9cd6c0326d86ea6f46202abc6352f7d9365
+  data.tar.gz: 65913171587f3632ed28e43a00827b109a84b8497ffd39651f1002da4ce7cc0a57a8ccaa43982ecf1ef949e3e0e45f7b9fc85328009784c2b88e51a29d2a6d3f

data/db/migrate/20210415120000_add_notification_attachments_url.rb

@@ -0,0 +1,6 @@
+class AddNotificationAttachmentsUrl < ActiveRecord::Migration[6.0]
+  def change
+    change_column :notification_attachments, :attachment, :text
+    add_column :notification_attachments, :url, :string
+  end
+end

data/lib/tolliver/mailers/notification_mailer.rb

@@ -29,7 +29,7 @@ module Tolliver
 
         # Attachments
         notification.notification_attachments.each do |notification_attachment|
-          attachments[notification_attachment.name] = notification_attachment.attachment
+          attachments[notification_attachment.name] = notification_attachment.read if notification_attachment.read
         end
 
         # Mail

data/lib/tolliver/models/notification_attachment.rb

@@ -30,6 +30,18 @@ module Tolliver
 
       end
 
+      def read
+        if @data.nil?
+          unless notification_attachment.attachment.blank?
+            @data = Base64.strict_decode64(notification_attachment.attachment) rescue nil
+          end
+          unless notification_attachment.url.blank?
+            @data = open(notification_attachment.url) { |f| f.read }
+          end
+        end
+        @data
+      end
+
     end
   end
 end

data/lib/tolliver/services/methods/email/mailgun.rb

@@ -38,7 +38,7 @@ module Tolliver
             message.body_text(ActionController::Base.helpers.strip_tags(notification.message.to_s))
             message.body_html(notification.message)
             notification.notification_attachments.each do |notification_attachment|
-              message.add_attachment(StringIO.new(notification_attachment.attachment), notification_attachment.name)
+              message.add_attachment(StringIO.new(notification_attachment.read), notification_attachment.name) if notification_attachment.read
             end
             response = @client.send_message(@domain, message)
             if response.code != 200

data/lib/tolliver/services/notification_service.rb

@@ -55,8 +55,10 @@ module Tolliver
               attachments = [attachments] unless attachments.is_a?(Array)
               attachments.each do |attachment|
                 raise Tolliver::Errors::BadRequest.new('Missing attachment name.') if attachment[:name].blank?
-                raise Tolliver::Errors::BadRequest.new('Missing attachment data.') if attachment[:attachment].blank?
-                notification.notification_attachments.create(name: attachment[:name], attachment: attachment[:attachment])
+                if attachment[:attachment].blank? && attachment[:url].blank?
+                  raise Tolliver::Errors::BadRequest.new('Missing attachment data or URL.')
+                end
+                notification.notification_attachments.create(name: attachment[:name], attachment: attachment[:attachment], url: attachment[:url])
               end
             end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tolliver
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Matěj Outlý
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-05 00:00:00.000000000 Z
+date: 2021-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -50,6 +50,7 @@ files:
 - 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