nuntius 1.3.2 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36d46202837a34ff0d400afc96a903aed10b2b46ad7d6bede57498f46f784a33
-  data.tar.gz: 1e7cb04b9662c6e1aa5e12cbee17e2ba0f5fec1c29483b802bd1bb372da67077
+  metadata.gz: bcf2eb3ee110dd40c68860c8b1b1351b77558b269ce1921f7f530230c63762ee
+  data.tar.gz: fe52688abaf148ad6481c66abfec1c22d45335224687f82087f36b5bd995daaf
 SHA512:
-  metadata.gz: 8da8d020db852a34e22b10ef09bae1e1b4f2d99b687ce77d834f769cae723458b0ed251fe0333a8cba9f11484c845d4dc057f292f756761b5c270293203efdc9
-  data.tar.gz: 9548dec8eb79e8d6bffd934b695a9801c5a7692359ab83708f4c2055fc6d01c9fa92c5e0e87165a0e146340a2cbfa16ed6d8aa82c6429734950bf80339894601
+  metadata.gz: 56d4e617138d2868119fbb18302c884e30282d309ad77bcd7cbeccf28b430aff49d5af773fcda03c388fd14dc5c3132584fb715cc62fa750148e9aea55b0ed9b
+  data.tar.gz: 1e91a60fad70aeaade08ae345923340ce0b6d06e2898c4a6abe933c08694d8e32ba6733d72cec63fbc814a36cbc43a831490c1c3ebe20a73fedb081e24e69fd2

data/app/assets/stylesheets/nuntius/application.css

@@ -0,0 +1,14 @@
+
+span.traffic-signal {
+    &-red {
+        @apply text-red-600;
+    }
+
+    &-green {
+        @apply text-green-600;
+    }
+
+    &-orange {
+        @apply text-orange-400;
+    }
+}

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

@@ -12,10 +12,7 @@
         .col-span-2= f.input :allow_unsubscribe, as: :switch
 
         .col-span-12.mt-4.mb-4
-          h4 = t('nuntius.admin.lists.edit.description')
-          p.mb-4 = t('nuntius.admin.lists.edit.description_hint')
-          = f.input :description, as: :hidden
-          trix-editor input="list_description" style="background-color: #fff; height: 400px; margin-bottom: 20px;"
+          = f.rich_text :description, hint: t('nuntius.admin.lists.edit.description_hint')
 
         .col-span-12
           = f.input :metadata_yaml, as: :editor, mode: 'application/yaml'

data/app/views/nuntius/admin/messages/show.html.slim

@@ -3,46 +3,26 @@
     = button_to(t('nuntius.context_menu.resend'), resend_admin_message_path(@message), class: 'button')
 
   - card.with_tab:preview, padding: true
-
-    table.table
-      thead
-        tr
-          th Name
-          th Value
-      tbody
-        tr
-          td To
-          td = @message.to
-
-        - if @message.transport == 'mail'
-          tr
-            td Subject
-            td = @message.subject
-          tr
-            td Attachments
-            td
-              - @message.attachments.each do |attachment|
-                = link_to(main_app.rails_blob_path(attachment, disposition: "attachment"), title: attachment.filename) do
-                  i.far.fa-paperclip
-                  span=attachment.filename
-                br
-
-        - if @message.transport == 'sms'
-          tr
-            td Text
-            td = @message.text
-
-        - if @message.transport == 'slack'
-          tr
-            td Text
-            td = @message.text
-          tr
-            td Payload
-            td
-              pre = YAML.dump(@message.payload)
-
-    - if @message.transport == 'mail' && @message.html.present?
-      iframe.border.rounded-lg.border-gray-200 src=message_path(@message.id) style="width: 100%; height: 600px; border: 0px;"
+    = sts.info class: "grid grid-cols-1 gap-4 sm:grid-cols-3" do |info|
+      = info.with_item :to, content: @message.to, class: "sm:col-span-1"
+      = info.with_item :from, content: @message.from, class: "sm:col-span-1"
+      - if @message.transport == 'mail'
+        = info.with_item :subject, content: @message.subject, class: "sm:col-span-4"
+        = info.with_item :attachments, class: "sm:col-span-4" 
+          - @message.attachments.each do |attachment|
+            = link_to(main_app.rails_blob_path(attachment, disposition: "attachment"), title: attachment.filename) do
+              i.far.fa-paperclip
+              span=attachment.filename
+            br
+      - if @message.transport == 'sms'
+        = info.with_item :text, content: @message.text, class: "sm:col-span-4"
+      - if @message.transport == 'slack'
+        = info.with_item :text, content: @message.text, class: "sm:col-span-4"
+        = info.with_item :payload, content: @message.text, class: "sm:col-span-4"
+          pre = YAML.dump(@message.payload)
+      - if @message.transport == 'mail' && @message.html.present?
+        = info.with_item :html, class: "sm:col-span-4"
+          iframe.border.rounded-lg.border-gray-200 src=message_path(@message.id) style="width: 100%; height: 600px; border: 0px;"
 
   - card.with_tab:details, padding: true
       = sts.info class: "grid grid-cols-1 gap-4 sm:grid-cols-3" do |info|

data/config/locales/en.yml

@@ -1,133 +1,164 @@
 en:
+  activerecord:
+    attributes:
+      nuntius/campaign:
+        from: From
+        layout: Layout
+        list: List
+        name: Name
+        state: Staat
+        subject: Subject
+        transport: Transport
+      nuntius/layout:
+        name: Name
+      nuntius/list:
+        allow_unsubscribe: unsubscribe allowed
+        description: Description
+        name: Name
+        slug: Slug
+        subscribers_count: Subscriber count
+      nuntius/template:
+        description: Description
+        enabled: Enabled
+        event: Event
+        from: From
+        klass: Klass
+        subject: Subject
+        to: To
+        transport: Transport
+    models:
+      campaign: Campaign
+      layout: Layout
+      list: List
+      message: Message
+      subscriber: Subscriber
+      template: Template
   menu:
     nuntius:
-      templates:
-        new: New template
-      layouts:
-        new: New layout
-      locales:
-        new: New locale
       campaigns:
-        new: New campaign
         lists: Lists
+        new: New campaign
+      layouts:
+        new: New layout
       lists:
         new: New list
         new_subscriber: New subscriber
+      locales:
+        new: New locale
+      templates:
+        new: New template
   nuntius:
-    flash:
-      error: There were problems saving the %{model}
-      notice: The %{model} was saved successfully
-    context_menu:
-      root: Root
-      resend: Resend
     admin:
-      messages:
-        resend:
-          resend_success: Resent message
-          resend_error: Failed to resend message
-        index:
-          card:
-            nuntius_admin_messages:
-              title: Messages
-              tab:
-                Nuntius messages: Messages
-        show:
-          message: Message
+      campaigns:
+        edit:
           card:
-            nuntius_admin_messages:
-              tab:
-                preview: Preview
-                details: Details
-          info_item:
-            main:
-              status: Status
-              transport: Transport
-              provider: Provider
-              provider_id: Provider ID
-              request_id: Request ID
-              refreshes: Refreshes
-              last_sent_at: Last Sent At
-              created_at: Created At
-      templates:
+            nuntius_admin_campaigns:
+              title: Campaigns
         index:
           card:
-            nuntius_admin_templates:
-              title: Templates
+            nuntius_admin_campaigns:
               tab:
-                Nuntius templates: Templates
+                Nuntius campaigns: Campaigns
+              title: Campaigns
+      layouts:
         edit:
           card:
-            nuntius_admin_templates:
-              title: Template
+            nuntius_admin_layouts:
+              title: Layouts
+          metadata: Metadata
+          tabs:
+            main:
               tab:
                 edit: Edit
-                messages: Messages
-          metadata: Metadata
-      layouts:
+                media: Media
+                metadata: Metadata
         index:
           card:
             nuntius_admin_layouts:
-              title: Layouts
               tab:
                 Nuntius layouts: Layouts
+              title: Layouts
+      lists:
         edit:
           card:
-            nuntius_admin_layouts:
-              title: Layouts
+            nuntius_admin_lists:
+              title: Lists
+          description_hint: Describe the list in detail for the subscribers, explain if they can unsubscribe, how often they will receive messages, etc.
+          tabs:
+            main:
               tab:
                 edit: Edit
-                metadata: Metadata
-                media: Media
-          metadata: Metadata
-      locales:
+                subscribers: Abonnees
         index:
           card:
-            nuntius_admin_locales:
-              title: Locales
-              tab:
-                Nuntius locales: Locales
+            nuntius_admin_lists:
+              title: Lists
+        subscribers:
+          edit:
+            subscribers: Subscribers
+      locales:
         edit:
           card:
             nuntius_admin_locales:
               title: Locales
           data: Data
           metadata: Metadata
-      campaigns:
         index:
           card:
-            nuntius_admin_campaigns:
-              title: Campaigns
+            nuntius_admin_locales:
               tab:
-                Nuntius campaigns: Campaigns
-        edit:
-          card:
-            nuntius_admin_campaigns:
-              title: Campaigns
-      lists:
-        subscribers:
-          edit:
-            subscribers: Subscribers
+                Nuntius locales: Locales
+              title: Locales
+      messages:
         index:
           card:
-            nuntius_admin_lists:
-              title: Lists
+            nuntius_admin_messages:
+              tab:
+                Nuntius messages: Messages
+              title: Messages
+        resend:
+          resend_error: Failed to resend message
+          resend_success: Resent message
+        show:
+          card:
+            nuntius_admin_messages:
+          info_item:
+            main:
+              created_at: Created At
+              from: From
+              html: HTML
+              last_sent_at: Last Sent At
+              provider: Provider
+              provider_id: Provider ID
+              refreshes: Refreshes
+              request_id: Request ID
+              status: Status
+              subject: Subject
+              to: To
+              transport: Transport
+          message:
+            tabs:
+            main:
               tab:
-                Nuntius lists: Lists
+                details: Details
+                preview: Preview
+      templates:
         edit:
-          description: List description
-          description_hint: Describe the list in detail for the subscribers, explain if they can unsubscribe, how often they will receive messages, etc.
           card:
-            nuntius_admin_lists:
-              title: Lists
+            nuntius_admin_templates:
+              title: Template
+          metadata: Metadata
+          tabs:
+            main:
               tab:
                 edit: Edit
-                nuntius_subscribers: Subscribers
-    breadcrumbs:
-      nuntius: Nuntius
-      dashboard: Dashboard
-      admin:
-        campaigns: Campaigns
-        messages: Messages
-        layouts: Layouts
-        lists: Lists
-        templates: Templates
+                messages: Messages
+        index:
+          card:
+            nuntius_admin_templates:
+              tab:
+                Nuntius templates: Templates
+              title: Templates
+    context_menu:
+      resend: Resend
+      root: Root

data/config/locales/nl.yml

@@ -1,133 +1,164 @@
 nl:
+  activerecord:
+    attributes:
+      nuntius/campaign:
+        from: Van
+        layout: Layout
+        list: Lijst
+        name: Naam
+        state: Staat
+        subject: Onderwerp
+        transport: Transport
+      nuntius/layout:
+        name: Naam
+      nuntius/list:
+        allow_unsubscribe: Uitschrijven toestaan
+        description: Omschrijving
+        name: Naam
+        slug: Slug
+        subscribers_count: Aantal abonnees
+      nuntius/template:
+        description: Omschrijving
+        enabled: Ingeschakeld
+        event: Gebeurtenis
+        from: Van
+        klass: Klasse
+        subject: Onderwerp
+        to: Aan
+        transport: Transport
+    models:
+      campaign: Campagne
+      layout: Layout
+      list: Lijst
+      message: Bericht
+      subscriber: Abonnee
+      template: Template
   menu:
     nuntius:
-      templates:
-        new: Nieuwe template
-      layouts:
-        new: Nieuwe layout
-      locales:
-        new: Nieuwe locale
       campaigns:
-        new: Nieuwe campagne
         lists: Lijsten
+        new: Nieuwe campagne
+      layouts:
+        new: Nieuwe layout
       lists:
         new: Nieuwe lijst
         new_subscriber: Nieuwe abonnee
+      locales:
+        new: Nieuwe locale
+      templates:
+        new: Nieuwe template
   nuntius:
-    flash:
-      error: Er waren problem om %{model} op te slaan
-      notice: De %{model} is sucesvol opgeslagen
-    context_menu:
-      root: Root
-      resend: Verstuur opnieuw
     admin:
-      messages:
-        resend:
-          resend_success: Bericht opnieuw verstuurd
-          resend_error: Het is niet gelukt het bericht opnieuw te sturen
-        index:
-          card:
-            nuntius_admin_messages:
-              title: Berichten
-              tab:
-                Nuntius messages: Berichten
-        show:
-          message: Message
+      campaigns:
+        edit:
           card:
-            nuntius_admin_messages:
-          tabs:
-            main:
-              tab:
-                preview: Preview
-                details: Details
-          info_item:
-            main:
-              status: Status
-              transport: Transport
-              provider: Provider
-              provider_id: Provider ID
-              request_id: Request ID
-              refreshes: Refreshes
-              last_sent_at: Last Sent At
-              created_at: Created At
-      templates:
+            nuntius_admin_campaigns:
+              title: Campagne
         index:
           card:
-            nuntius_admin_templates:
-              title: Templates
+            nuntius_admin_campaigns:
               tab:
-                Nuntius templates: Templates
+                Nuntius campaigns: Campagnes
+              title: Campagnes
+      layouts:
         edit:
           card:
-            nuntius_admin_templates:
-              title: Template
+            nuntius_admin_layouts:
+              title: Layouts
+          metadata: Metadata
           tabs:
             main:
               tab:
-                edit: Bewerk
-                messages: Berichten
-          metadata: Metadata
-      layouts:
+                edit: Edit
+                media: Media
+                metadata: Metadata
         index:
           card:
             nuntius_admin_layouts:
-              title: Layouts
               tab:
                 Nuntius layouts: Layouts
+              title: Layouts
+      lists:
         edit:
           card:
-            nuntius_admin_layouts:
-              title: Layouts
+            nuntius_admin_lists:
+              title: Lijsten
+          description_hint: Omschrijf de list in detail voor abonnees, leg uit of ze kunnen uitschrijven, hoe veel en hoe vaak berichten ze berichten ontvangen, etc.
           tabs:
             main:
               tab:
                 edit: Edit
-                metadata: Metadata
-                media: Media
-
-          metadata: Metadata
-      locales:
+                subscribers: Abonnees
         index:
           card:
-            nuntius_admin_locales:
-              title: Locales
-              tab:
-                Nuntius locales: Locales
+            nuntius_admin_lists:
+              title: Lijsten
+        subscribers:
+          edit:
+            subscribers: Abonnees
+      locales:
         edit:
           card:
             nuntius_admin_locales:
               title: Locales
           data: Data
           metadata: Metadata
-      campaigns:
         index:
           card:
-            nuntius_admin_campaigns:
-              title: Campaigns
+            nuntius_admin_locales:
               tab:
-                Nuntius campaigns: Campaigns
-        edit:
-          card:
-            nuntius_admin_campaigns:
-              title: Campaigns
-      lists:
-        subscribers:
-          edit:
-            subscribers: Subscribers
+                Nuntius locales: Locales
+              title: Locales
+      messages:
         index:
           card:
-            nuntius_admin_lists:
-              title: Lists
+            nuntius_admin_messages:
               tab:
-                Nuntius lists: Lists
+                Nuntius messages: Berichten
+              title: Berichten
+        resend:
+          resend_error: Het is niet gelukt het bericht opnieuw te sturen
+          resend_success: Bericht opnieuw verstuurd
+        show:
+          card:
+            nuntius_admin_messages:
+          info_item:
+            main:
+              created_at: Created At
+              from: Van
+              html: HTML
+              last_sent_at: Last Sent At
+              provider: Provider
+              provider_id: Provider ID
+              refreshes: Refreshes
+              request_id: Request ID
+              status: Status
+              subject: Onderwerp
+              to: Aan
+              transport: Transport
+          message: Message
+          tabs:
+            main:
+              tab:
+                details: Details
+                preview: Preview
+      templates:
         edit:
-          description: List description
-          description_hint: Describe the list in detail for the subscibers, explain if they can unsubscribe, how often they will receive messages, etc.
           card:
-            nuntius_admin_lists:
-              title: Lists
+            nuntius_admin_templates:
+              title: Template
+          metadata: Metadata
           tabs:
             main:
               tab:
-                edit: Edit
-                nuntius_subscribers: Subscribers
+                edit: Bewerk
+                messages: Berichten
+        index:
+          card:
+            nuntius_admin_templates:
+              tab:
+                Nuntius templates: Templates
+              title: Templates
+    context_menu:
+      resend: Verstuur opnieuw
+      root: Root

data/lib/nuntius/life_cycle.rb

@@ -7,16 +7,18 @@ module Nuntius
     included do
       raise "#{name} must be nuntiable" unless nuntiable?
 
-      after_commit do
-        if previously_persisted?
-          Nuntius.event(:destroy, self)
-        elsif previously_new_record?
-          Nuntius.event(:create, self)
-          Nuntius.event(:save, self)
-        else
-          Nuntius.event(:update, self)
-          Nuntius.event(:save, self)
-        end
+      after_create_commit do
+        Nuntius.event(:create, self)
+        Nuntius.event(:save, self)
+      end
+
+      after_update_commit do
+        Nuntius.event(:update, self)
+        Nuntius.event(:save, self)
+      end
+
+      after_destroy_commit do
+        Nuntius.event(:destroy, self)
       end
 
       %i[create destroy update save].each do |event_name|

data/lib/nuntius/state_machine.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 module Nuntius
-
   module StateMachine
     extend ActiveSupport::Concern
 
@@ -9,17 +8,17 @@ module Nuntius
       raise "#{name} must be nuntiable" unless nuntiable?
 
       state_machine.events.map(&:name)
-                   .reject { |event_name| messenger.method_defined?(event_name) }
-                   .each do |event_name|
+        .reject { |event_name| messenger.method_defined?(event_name) }
+        .each do |event_name|
         messenger.send(:define_method, event_name) { |object, options = {}| }
       end
 
       after_commit do
-        Thread.current['___nuntius_state_machine_events']&.each do |event|
+        Thread.current["___nuntius_state_machine_events"]&.each do |event|
           Nuntius.event(event[:event], event[:object])
         end
         # After events are fired we can clear the events
-        Thread.current['___nuntius_state_machine_events'] = []
+        Thread.current["___nuntius_state_machine_events"] = []
       end
 
       state_machine do
@@ -32,8 +31,8 @@ module Nuntius
         end
 
         def ___record__nuntius_state_machine_event(event, object)
-          Thread.current['___nuntius_state_machine_events'] ||= []
-          Thread.current['___nuntius_state_machine_events'] << { event: event, object: object }
+          Thread.current["___nuntius_state_machine_events"] ||= []
+          Thread.current["___nuntius_state_machine_events"] << {event: event, object: object}
         end
       end
     end

data/lib/nuntius/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nuntius
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.4
 platform: ruby
 authors:
 - Tom de Grunt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-17 00:00:00.000000000 Z
+date: 2024-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apnotic