nuntius 1.3.12 → 1.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 905f2e66b5e0ba5115194a596cdabd4a789bd562056e8cd74c0682a75ca03a16
-  data.tar.gz: b8e7f0d4f02a7dcd21ca5478fbd16f81e0e7dee5a5fe941c0c701eeadbc882b2
+  metadata.gz: d5f1f8dfbe981e6b050defc2deab5bf5b6f3e90723c3225796dceea835a35628
+  data.tar.gz: 0064b3c9ed18fd4f52c5c3eb3376126618e462a826c5d61d122435e071f7dc80
 SHA512:
-  metadata.gz: aa8589b5ecaea6bac7334e911afe7fa24a0a09ecf2d499178ef1e7dec6393f3d6ecbac898e0c52d669a448e68f99d8d40072b6081d64b4bfe527ee13bca80ad6
-  data.tar.gz: a89f739a86358e2df8203a1a07201e807656b811adc5d59aa25b1c36697cf6e5008c081bc821b6735d64dc8d3b9f3a0a1539581a4aa629e64a3bee07d2ea117b
+  metadata.gz: 2f78bbb4356a2e6bff3c94ae7d06881277c78d7b9abe3f94ffd7ff5d030cfbc3d415c4da396809983a4da76ff4436fc5e24333ec963d2c509aeb0fe478583047
+  data.tar.gz: f5134e2020e4c1c89790b1cf02d1b1a8bae1f7988d4833384257051e48ba15bee17062a2ca812162c74ecf95a300c7639b953c0d83849b7242c54a0ac6fc9df2

data/app/jobs/nuntius/timebased_events_job.rb

@@ -4,10 +4,13 @@ module Nuntius
   class TimebasedEventsJob < ApplicationJob
     def perform
       Nuntius::Template.where.not(interval: nil).each do |template|
-        messenger = Nuntius::BaseMessenger.messenger_for_class(template.klass)
+        messenger_class = Nuntius::BaseMessenger.messenger_for_class(template.klass)
 
-        messenger.timebased_scope_for(template).each do |object|
-          Nuntius.event(template.event, object)
+        messenger_class.timebased_scope_for(template).each do |object|
+          messenger = messenger_class.new(object, template.event)
+          next unless messenger.is_a?(Nuntius::CustomMessenger) || messenger.respond_to?(template.event.to_sym)
+
+          messenger.dispatch([template])
         end
       end
     end

data/app/jobs/nuntius/transport_delivery_job.rb

@@ -24,8 +24,8 @@ module Nuntius
       # First refresh check is after 5 seconds
       if message.delivered_or_blocked?
         message.cleanup!
-      else
-        Nuntius::TransportRefreshJob.set(wait: 5).perform_later(provider_name, message) unless Rails.env.development?
+      elsif !Rails.env.development? && !Rails.env.test?
+        Nuntius::TransportRefreshJob.set(wait: 5).perform_later(provider_name, message)
       end
     end
   end

data/app/models/nuntius/message.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "pry"
 module Nuntius
   # Stores individual messages to individual recipients
   #

data/app/transports/nuntius/base_transport.rb

@@ -15,7 +15,7 @@ module Nuntius
         providers_for_priority.each do |hash|
           message.update(provider: hash[:provider].to_s) if message.provider.blank?
 
-          Nuntius::TransportDeliveryJob.set(wait: !Rails.env.development? && wait_time).perform_later(hash[:provider].to_s, message)
+          Nuntius::TransportDeliveryJob.set(wait: !Rails.env.development? && !Rails.env.test? && wait_time).perform_later(hash[:provider].to_s, message)
           time_out += hash[:timeout].seconds if hash[:timeout].positive?
         end
         wait_time += time_out

data/app/views/nuntius/admin/layouts/edit.html.slim

@@ -21,22 +21,7 @@
       - card.with_tab:media, padding: true
         .grid.grid-cols-4.gap-4
           .col-span-4 
-            = f.input :attachments, as: :file, multiple: true
-          ul.col-span-4 
-            - @layout.attachments.each do |attachment|
-              li.col-span-1
-                - if attachment.previewable?
-                  = image_tag attachment.preview(resize_to_limit: [500, 500]).url, class: 'object-cover pointer-events-none'
-                - elsif attachment.image?
-                  = image_tag main_app.url_for(attachment.variant(resize_to_limit: [500, 500])), class: 'object-cover pointer-events-none'
-                = (attachment.blob.byte_size / 1048576.0).round(2)
-                ' MB
-                = link_to admin_layout_attachment_path(@layout, attachment.id), data: { controller: 'attachment-delete', 'action': 'attachment-delete#delete' } do
-                    i.fas.fa-xmark
-                =< link_to(main_app.rails_blob_path(attachment, disposition: 'attachment'),
-                      title: attachment.filename)
-                    i.fas.fa-download
-                code.text-xs = sts.copyable main_app.rails_blob_url(attachment)
+            = f.attachments :layout
 
     - if @layout.templates.exists?
       - card.with_tab :templates, padding: false

data/config/routes.rb

@@ -30,7 +30,7 @@ Nuntius::Engine.routes.draw do
       end
     end
     resources :layouts do
-      resources :attachments, controller: "layouts/attachments"
+      resources :attachments, controller: "satis/attachments"
     end
     resources :lists do
       resources :subscribers, controller: "lists/subscribers"

data/lib/nuntius/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Nuntius
-  VERSION = "1.3.12"
+  VERSION = "1.3.14"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: nuntius
 version: !ruby/object:Gem::Version
-  version: 1.3.12
+  version: 1.3.14
 platform: ruby
 authors:
 - Tom de Grunt
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-10 00:00:00.000000000 Z
+date: 2025-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apnotic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: auxilium
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.56'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.56'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: fcm
   requirement: !ruby/object:Gem::Requirement
@@ -220,6 +220,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: parse-cron
   requirement: !ruby/object:Gem::Requirement
@@ -374,34 +388,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.6'
-- !ruby/object:Gem::Dependency
-  name: pry
-  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: debug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -442,7 +442,6 @@ files:
 - Rakefile
 - app/assets/stylesheets/nuntius/application.css
 - app/controllers/nuntius/admin/campaigns_controller.rb
-- app/controllers/nuntius/admin/layouts/attachments_controller.rb
 - app/controllers/nuntius/admin/layouts_controller.rb
 - app/controllers/nuntius/admin/lists/subscribers_controller.rb
 - app/controllers/nuntius/admin/lists_controller.rb
@@ -593,7 +592,7 @@ homepage: https://github.com/entdec/nuntius
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -609,7 +608,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.4.10
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Messaging and notification for Ruby on Rails
 test_files: []

data/app/controllers/nuntius/admin/layouts/attachments_controller.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-module Nuntius
-  module Admin
-    module Layouts
-      class AttachmentsController < ApplicationController
-        before_action :set_objects
-
-        def index
-        end
-
-        def create
-          params[:attachments].each do |file|
-            @layout.attachments.attach(file)
-          end
-        end
-
-        def destroy
-          attachment = @layout.attachments.find_by(id: params[:id])
-          attachment&.purge
-
-          render :create
-        end
-
-        private
-
-        def set_objects
-          @layout = Nuntius::Layout.visible.find(params[:layout_id]) if params[:layout_id]
-        end
-      end
-    end
-  end
-end