nuntius 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79443fa45e4f41933706a15077cd652aa9bbb323a217f608e594380a7c8c8759
-  data.tar.gz: 84f7d913569bf6dff0f2ee2cecb9e61119972082adea8b944a52b726799265d1
+  metadata.gz: 45c8d99016b685aa17d9ed3e98f034819aa1f99e26417c46e1c63f9d3e8820e0
+  data.tar.gz: 8c436f17b211a62558e995f00602fcc58f567044d1d9be87bca2196b807be3d2
 SHA512:
-  metadata.gz: fcb1f10966488947cbf7e6d7dcbaa53485f04174eab8abccfeef8cdec135838245775e6c0101068996f9189d13d11893718ee0545a5aa309695cce9718ffab45
-  data.tar.gz: 8a2d19bc4fc4834ca57021da55f1dfdece9bc6dda9fd538b1b0bc37b9fc62e116cde27814f34ea9ea2fc75835dc2dd45ea3a3edc5d389aeb1cfde8be92d1f19c
+  metadata.gz: 60988a352c0b051f24ca087e6e78c0ce14822b46a19bce77518551a8fb2eb02dc1edbe1dcedc761fb0f8f6a76457875542c10fa52c0d6399445fa1dcf008ef87
+  data.tar.gz: 424c5204cc8f11d56c62e0518a90a06be373155824965ea386edceb461cbd19fb09c1e2e0ed6364c83ccdc7448a9f0c06965cd4374a3b3936667d3b156b9538e

data/app/helpers/nuntius/application_helper.rb

@@ -14,38 +14,38 @@ module Nuntius
     end
 
     def nuntius_templates_menu
-      Satis::Menus::Builder.build(:templates) do |m|
+      Satis::Menus::Builder.build([:nuntius, :templates]) do |m|
         m.item :new, link: nuntius.new_admin_template_path
       end
     end
 
     def nuntius_layouts_menu
-      Satis::Menus::Builder.build(:layouts) do |m|
+      Satis::Menus::Builder.build([:nuntius, :layouts]) do |m|
         m.item :new, link: nuntius.new_admin_layout_path
       end
     end
 
     def nuntius_locales_menu
-      Satis::Menus::Builder.build(:locales) do |m|
+      Satis::Menus::Builder.build([:nuntius, :locales]) do |m|
         m.item :new, link: nuntius.new_admin_locale_path
       end
     end
 
     def nuntius_campaigns_menu
-      Satis::Menus::Builder.build(:campaign) do |m|
+      Satis::Menus::Builder.build([:nuntius, :campaigns]) do |m|
         m.item :new, link: nuntius.new_admin_campaign_path
         m.item :lists, link: nuntius.admin_lists_path
       end
     end
 
     def nuntius_lists_menu
-      Satis::Menus::Builder.build(:lists) do |m|
+      Satis::Menus::Builder.build([:nuntius, :lists]) do |m|
         m.item :new, link: nuntius.new_admin_list_path
       end
     end
 
     def nuntius_list_menu
-      Satis::Menus::Builder.build(:lists) do |m|
+      Satis::Menus::Builder.build([:nuntius, :lists]) do |m|
         m.item :new_subscriber, link: nuntius.new_admin_list_subscriber_path(@list) if @list.persisted?
       end
     end

data/app/models/nuntius/list.rb

@@ -5,7 +5,7 @@ module Nuntius
     include Nuntius::Concerns::MetadataScoped
     include Nuntius::Concerns::Yamlify
 
-    has_many :subscribers, counter_cache: :subscribers_count, dependent: :delete_all
+    has_many :subscribers, dependent: :delete_all
 
     validates :name, presence: true
     validates :slug, presence: true, uniqueness: true

data/app/models/nuntius/subscriber.rb

@@ -2,7 +2,7 @@
 
 module Nuntius
   class Subscriber < ApplicationRecord
-    belongs_to :list
+    belongs_to :list, counter_cache: :subscribers_count
     belongs_to :nuntiable, polymorphic: true, optional: true
 
     scope :subscribed, -> { where(unsubscribed_at: nil) }

data/app/tables/nuntius/application_table.rb

@@ -0,0 +1,4 @@
+module Nuntius
+  class ApplicationTable < Mensa::Base
+  end
+end

data/app/tables/nuntius/campaigns_table.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Nuntius
+  class CampaignsTable < Nuntius::ApplicationTable
+    definition do
+      model Nuntius::Campaign
+
+      column(:name)
+      column(:metadata) do
+        render do
+          html do |template|
+            Nuntius.config.metadata_humanize(template.metadata)
+          end
+        end
+      end
+      column(:transport)
+      column(:state)
+
+      column(:list_name) do
+        attribute "nuntius_lists.name"
+      end
+
+      action :publish do
+        # FIXME: next unless campaign.can_publish?
+        show ->(campaign) { campaign.transport != "sms" && campaign.can_publish? }
+        link { |campaign| campaign.can_publish? ? nuntius.publish_admin_campaign_path(campaign) : nil }
+        icon "fa fa-paper-plane"
+        link_attributes data: {"turbo-confirm": "Are you sure you want to send out this campaign?", "turbo-method": :post}
+      end
+
+      order name: :asc
+
+      link { |campaign| nuntius.edit_admin_campaign_path(campaign) }
+    end
+
+    private
+
+    def scope
+      @scope = Nuntius::Campaign.visible.joins(:list)
+    end
+  end
+end

data/app/tables/nuntius/layouts_table.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Nuntius
+  class LayoutsTable < Nuntius::ApplicationTable
+    definition do
+      model Nuntius::Layout
+
+      column(:name)
+      column(:metadata) do
+        render do
+          html do |template|
+            Nuntius.config.metadata_humanize(template.metadata)
+          end
+        end
+      end
+
+      action :delete do
+        link { |layout| nuntius.admin_layout_url(layout) }
+        icon "fa fa-trash"
+        link_attributes data: {"turbo-confirm": "Are you sure you want to delete the layout?", "turbo-method": :delete}
+      end
+
+      order name: :asc
+
+      link { |layout| nuntius.edit_admin_layout_path(layout) }
+    end
+
+    private
+
+    def scope
+      @scope = Nuntius::Layout.visible
+    end
+  end
+end

data/app/tables/nuntius/lists_table.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Nuntius
+  class ListsTable < Nuntius::ApplicationTable
+    definition do
+      model Nuntius::List
+
+      column(:name)
+      column(:metadata) do
+        render do
+          html do |template|
+            Nuntius.config.metadata_humanize(template.metadata)
+          end
+        end
+      end
+      column(:subscribers_count) do
+        attribute "subscribers_count"
+      end
+
+      order name: :asc
+
+      link { |list| nuntius.edit_admin_list_path(list) }
+    end
+
+    private
+
+    def scope
+      @scope = Nuntius::List.visible
+    end
+  end
+end

data/app/tables/nuntius/locales_table.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Nuntius
+  class LocalesTable < Nuntius::ApplicationTable
+    definition do
+      model Nuntius::Locale
+
+      column(:key)
+      column(:metadata) do
+        render do
+          html do |template|
+            Nuntius.config.metadata_humanize(template.metadata)
+          end
+        end
+      end
+
+      order key: :asc
+
+      link { |locale| nuntius.edit_admin_locale_path(locale) }
+    end
+
+    private
+
+    def scope
+      @scope = Nuntius::Locale.visible
+    end
+  end
+end

data/app/tables/nuntius/messages_table.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module Nuntius
+  class MessagesTable < Nuntius::ApplicationTable
+    definition do
+      model Nuntius::Message
+
+      column(:to)
+      column(:created_at)
+      column(:last_sent_at)
+      column(:campaign_id) do
+        render do
+          html do |message|
+            link_to message.campaign&.name, nuntius.edit_admin_campaign_path(message.campaign) if message.campaign
+          end
+        end
+      end
+      column(:template_id) do
+        render do
+          html do |message|
+            link_to message.template&.description, nuntius.edit_admin_template_path(message.template) if message.template
+          end
+        end
+      end
+      column :nuntiable_type do
+        internal true # Needed for related_object below
+      end
+      column :nuntiable_id do
+        internal true # Needed for related_object below
+      end
+      column(:object) do # do |message|
+        render do
+          html do |message|
+            if message.nuntiable
+              link_to "#{message.nuntiable} (#{message.nuntiable_type})", begin
+                url_for(message.nuntiable)
+              rescue
+                ""
+              end
+            end
+          end
+        end
+      end
+      column(:status)
+
+      order created_at: :desc
+
+      link { |message| nuntius.admin_message_path(message) }
+    end
+
+    private
+
+    def scope
+      @scope = Nuntius::Message.visible
+      @scope = @scope.where(nuntiable_id: params[:nuntiable_id], nuntiable_type: params[:nuntiable_type]) if params[:nuntiable_id]
+      @scope = @scope.where(template_id: params[:template_id]) if params[:template_id]
+      @scope
+    end
+  end
+end

data/app/tables/nuntius/subscribers_table.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+module Nuntius
+  class SubscribersTable < Nuntius::ApplicationTable
+    definition do
+      model Nuntius::Subscriber
+
+      column(:list_id) do
+        internal true
+        filter
+      end
+
+      column :first_name do
+        internal true
+      end
+      column :last_name do
+        internal true
+      end
+      column :nuntiable_type do
+        internal true # Needed for related_object below
+      end
+      column :nuntiable_id do
+        internal true # Needed for related_object below
+      end
+      column(:name) do
+        render do
+          html do |subscriber|
+            subscriber.name
+          end
+        end
+      end
+      column(:email)
+      column(:phone_number)
+      column(:unsubscribed_at)
+      column(:tags) do
+        render do
+          html do |subscriber|
+            subscriber.tags&.join(",")
+          end
+        end
+      end
+
+      column(:object) do # do |message|
+        render do
+          html do |message|
+            if message.nuntiable
+              link_to "#{message.nuntiable} (#{message.nuntiable_type})", begin
+                url_for(message.nuntiable)
+              rescue
+                ""
+              end
+            end
+          end
+        end
+      end
+
+      link { |subscriber| nuntius.edit_admin_list_subscriber_path(subscriber, list_id: subscriber.list) }
+    end
+
+    private
+
+    def scope
+      @scope = Nuntius::Subscriber.all
+    end
+  end
+end

data/app/tables/nuntius/templates_table.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module Nuntius
+  class TemplatesTable < Nuntius::ApplicationTable
+    definition do
+      model Nuntius::Template
+
+      column(:description)
+      column(:enabled)
+      column(:klass)
+      column(:event)
+      column(:messages_count) do
+        attribute "(select count(id) from nuntius_messages where nuntius_messages.template_id = nuntius_templates.id)"
+        render do
+          html do |template|
+            link_to(template.messages_count, nuntius.admin_messages_path(template_id: template.id))
+          end
+        end
+      end
+
+      column(:metadata) do
+        render do
+          html do |template|
+            Nuntius.config.metadata_humanize(template.metadata)
+          end
+        end
+      end
+
+      column(:traffic_light) do # , sortable: false) do |template|
+        render do
+          html do |template|
+            color = Nuntius.config.flow_color(template.id)&.light_color || "green"
+            content_tag(:span, class: "traffic-signal-#{color.downcase}") do
+              content_tag(:i, nil, class: "fa fa-circle fa-xl")
+            end
+          end
+        end
+      end
+
+      action :delete do
+        link { |template| nuntius.admin_template_path(template) }
+        icon "fa fa-trash"
+        link_attributes data: {"turbo-confirm": "Are you sure you want to delete the template?", "turbo-method": :delete}
+      end
+
+      order description: :asc
+
+      link { |template| nuntius.edit_admin_template_path(template) }
+    end
+
+    private
+
+    def scope
+      @scope = Nuntius::Template.visible
+      # @scope = Nuntius::Template.visible.select("nuntius_templates.*, (select count(id) from nuntius_messages where nuntius_messages.template_id = nuntius_templates.id) as message_count")
+    end
+  end
+end

data/app/views/nuntius/admin/campaigns/index.html.slim

@@ -1,2 +1,2 @@
 = sts.card :nuntius_admin_campaigns, icon: 'fad fa-megaphone', content_padding: false, menu: nuntius_campaigns_menu do |card|
-  = card.table :nuntius_campaigns, custom_views: true
+  = sts.table :"nuntius/campaigns"

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

@@ -19,5 +19,6 @@
       - card.with_tab:media, padding: true
         = render partial: 'nuntius/admin/layouts/attachments/index', locals: { attachments: @layout.attachments, upload_url: nuntius.admin_layout_attachments_path(@layout) }
 
-    - if @layout.templates.size.positive?
-      = card.table :nuntius_templates, parameters: { layout_id: @layout.id }, custom_views: false, tab: :templates
+    - if @layout.templates.exists?
+      - card.with_tab :templates, padding: false
+        = sts.table :"nuntius/templates", filters: { layout_id: @layout.id }

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

@@ -1,2 +1,2 @@
 = sts.card :nuntius_admin_layouts, icon: 'fad fa-table-layout', content_padding: false, menu: nuntius_layouts_menu do |card|
-  = card.table :nuntius_layouts, custom_views: true
+  = sts.table :"nuntius/layouts", custom_views: true

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

@@ -20,5 +20,6 @@
         .col-span-12
           = f.input :metadata_yaml, as: :editor, mode: 'application/yaml'
 
-    - if @list.subscribers.present?
-      = card.table :nuntius_subscribers, parameters: { list_id: @list.id }, custom_views: false, tab: :nuntius_subscribers
+    - if @list.subscribers.exists?
+      - card.with_tab :subscribers, padding: false
+        = sts.table :"nuntius/subscribers", filters: { list_id: @list.id }

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

@@ -1,2 +1,2 @@
 = sts.card :nuntius_admin_lists, icon: 'fad fa-address-book', content_padding: false, menu: nuntius_lists_menu do |card|
-  = card.table :nuntius_lists, custom_views: true
+  = sts.table :"nuntius/lists"

data/app/views/nuntius/admin/locales/index.html.slim

@@ -1,2 +1,2 @@
 = sts.card :nuntius_admin_locales, icon: 'fad fa-language', content_padding: false, menu: nuntius_locales_menu do |card|
-  = card.table :nuntius_locales, custom_views: true
+  = sts.table :nuntius_locales

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

@@ -1,2 +1,2 @@
 = sts.card :nuntius_admin_messages, icon: 'fad fa-envelope', content_padding: false do |card|
-  = card.table :nuntius_messages, custom_views: true
+  = sts.table :"nuntius/messages"

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

@@ -7,7 +7,7 @@
       - card.with_action
         = f.submit
 
-      - card.with_tab:edit, padding: true
+      - card.with_tab :edit, padding: true
         .grid.grid-cols-12.gap-4
           .col-span-1
             = f.input :enabled, as: :switch
@@ -75,5 +75,6 @@
           template data-toggle-target='toggleable' data-toggle-value='slack'
 
 
-      - if @template.messages.size.positive?
-        = card.table :nuntius_messages, parameters: { template_id: @template.id }, custom_views: false, tab: :nuntius_messages
+      - if @template.messages.exists?
+        - card.with_tab :messages, padding: false
+          = sts.table :"nuntius/messages", filters: { template_id: @template.id }

data/app/views/nuntius/admin/templates/index.html.slim

@@ -1,2 +1,2 @@
-= sts.card :nuntius_admin_templates, icon: 'fad fa-language', content_padding: false, menu: nuntius_templates_menu do |card|
-  = card.table :nuntius_templates, custom_views: true
+= sts.card :nuntius_admin_templates, icon: 'fad fa-file', content_padding: false, menu: nuntius_templates_menu do |card|
+  = sts.table :"nuntius/templates", custom_views: true

data/config/locales/en.yml

@@ -1,3 +1,18 @@
+en:
+  menu:
+    nuntius:
+      templates:
+        new: New template
+      layouts:
+        new: New layout
+      locales:
+        new: New locale
+      campaigns:
+        new: New campaign
+        lists: Lists
+      lists:
+        new: New list
+        new_subscriber: New subscriber
   nuntius:
     flash:
       error: There were problems saving the %{model}
@@ -43,10 +58,10 @@
         edit:
           card:
             nuntius_admin_templates:
-              title: Templates
+              title: Template
               tab:
                 edit: Edit
-                nuntius_messages: Messages
+                messages: Messages
           metadata: Metadata
       layouts:
         index:
@@ -100,7 +115,7 @@
                 Nuntius lists: Lists
         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.
+          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

data/config/locales/nl.yml

@@ -1,4 +1,18 @@
 nl:
+  menu:
+    nuntius:
+      templates:
+        new: Nieuwe template
+      layouts:
+        new: Nieuwe layout
+      locales:
+        new: Nieuwe locale
+      campaigns:
+        new: Nieuwe campagne
+        lists: Lijsten
+      lists:
+        new: Nieuwe lijst
+        new_subscriber: Nieuwe abonnee
   nuntius:
     flash:
       error: Er waren problem om %{model} op te slaan
@@ -11,12 +25,109 @@ nl:
         resend:
           resend_success: Bericht opnieuw verstuurd
           resend_error: Het is niet gelukt het bericht opnieuw te sturen
-    breadcrumbs:
-      nuntius: Nuntius
-      dashboard: Dashboard
-      admin:
-        campaigns: Campagnes
-        messages: Berichten
-        layouts: Layouts
-        lists: Lijsten
-        templates: Templates
+        index:
+          card:
+            nuntius_admin_messages:
+              title: Berichten
+              tab:
+                Nuntius messages: Berichten
+        show:
+          message: Message
+          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:
+        index:
+          card:
+            nuntius_admin_templates:
+              title: Templates
+              tab:
+                Nuntius templates: Templates
+        edit:
+          card:
+            nuntius_admin_templates:
+              title: Template
+          tabs:
+            main:
+              tab:
+                edit: Bewerk
+                messages: Berichten
+          metadata: Metadata
+      layouts:
+        index:
+          card:
+            nuntius_admin_layouts:
+              title: Layouts
+              tab:
+                Nuntius layouts: Layouts
+        edit:
+          card:
+            nuntius_admin_layouts:
+              title: Layouts
+          tabs:
+            main:
+              tab:
+                edit: Edit
+                metadata: Metadata
+                media: Media
+
+          metadata: Metadata
+      locales:
+        index:
+          card:
+            nuntius_admin_locales:
+              title: Locales
+              tab:
+                Nuntius locales: Locales
+        edit:
+          card:
+            nuntius_admin_locales:
+              title: Locales
+          data: Data
+          metadata: Metadata
+      campaigns:
+        index:
+          card:
+            nuntius_admin_campaigns:
+              title: Campaigns
+              tab:
+                Nuntius campaigns: Campaigns
+        edit:
+          card:
+            nuntius_admin_campaigns:
+              title: Campaigns
+      lists:
+        subscribers:
+          edit:
+            subscribers: Subscribers
+        index:
+          card:
+            nuntius_admin_lists:
+              title: Lists
+              tab:
+                Nuntius lists: Lists
+        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
+          tabs:
+            main:
+              tab:
+                edit: Edit
+                nuntius_subscribers: Subscribers

data/lib/generators/nuntius/install_generator.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Nuntius
+  class InstallGenerator < Rails::Generators::Base
+    source_root File.expand_path("../templates", __FILE__)
+
+    def create_initializer_file
+      template "config/initializers/nuntius.rb"
+    end
+
+    def add_route
+      return if Rails.application.routes.routes.detect { |route| route.app.app == Nuntius::Engine }
+      route %(mount Nuntius::Engine => "/nuntius")
+    end
+
+    def copy_migrations
+      rake "nuntius:install:migrations"
+    end
+
+    def tailwindcss_config
+      rake "nuntius:tailwindcss:config"
+    end
+  end
+end

data/lib/generators/nuntius/tailwind_config_generator.rb

@@ -0,0 +1,24 @@
+require "rails/generators/base"
+
+module Nuntius
+  module Generators
+    class TailwindConfigGenerator < Rails::Generators::Base
+      source_root File.expand_path("../templates", __dir__)
+      desc "Configures tailwind.config.js and application.tailwindcss.css"
+
+      def add_content_to_tailwind_config
+        inject_into_file "config/tailwind.config.js", before: "],\n  theme: {" do
+          "  // Nuntius content\n" +
+            %w[/app/views/**/* /app/helpers/**/* /app/controllers/**/* /app/components/**/* /app/javascript/**/*.js /app/assets/**/*.css].map { |path| "    \"#{Nuntius::Engine.root}#{path}\"" }.join(",\n") +
+            ",\n  "
+        end
+      end
+
+      def add_content_application_tailwind_css
+        inject_into_file "app/assets/stylesheets/application.tailwind.css", before: "@tailwind base;" do
+          "@import '#{Nuntius::Engine.root}/app/assets/stylesheets/nuntius/application.css';\n"
+        end
+      end
+    end
+  end
+end

data/lib/generators/nuntius/templates/config/initializers/nuntius.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+Nuntius.setup do |config|
+  config.base_controller = "::ApplicationController"
+  config.logger = -> { Rails.logger }
+
+  config.transport :mail
+  config.transport :push
+  config.transport :sms
+  config.transport :voice
+  config.allow_custom_events = true
+
+  config.provider :smtp, transport: :mail, settings: lambda { |_message|
+    {
+      from_header: "Example <example@example.com>",
+      host: "",
+      port: "",
+      username: "",
+      password: "",
+      allow_list: ["example.com"]
+    }
+  }
+
+  config.provider :houston, transport: :push, settings: {certificate: ""}
+  config.provider :firebase, transport: :push, settings: {server_key: ""}
+
+  config.provider :message_bird, transport: :sms, priority: 1, timeout: 20, settings: {from: "YourApp", auth_token: ""}
+  config.provider :twilio, transport: :sms, priority: 2, settings: {sid: "", auth_token: "", from: ""}
+
+  config.provider :twilio, transport: :voice, settings: {sid: "", auth_token: "", from: ""}
+end

data/lib/nuntius/configuration.rb

@@ -3,9 +3,20 @@
 module Nuntius
   module Options
     module ClassMethods
-      def option(name, default: nil)
-        attr_accessor(name)
-        schema[name] = default
+      def option(name, default: nil, proc: false)
+        attr_writer(name)
+        schema[name] = {default: default, proc: proc}
+
+        if schema[name][:proc]
+          define_method(name) do |*params|
+            value = instance_variable_get(:"@#{name}")
+            instance_exec(*params, &value)
+          end
+        else
+          define_method(name) do
+            instance_variable_get(:"@#{name}")
+          end
+        end
       end
 
       def schema
@@ -14,8 +25,8 @@ module Nuntius
     end
 
     def set_defaults!
-      self.class.schema.each do |name, default|
-        instance_variable_set(:"@#{name}", default)
+      self.class.schema.each do |name, options|
+        instance_variable_set(:"@#{name}", options[:default])
       end
     end
 
@@ -27,7 +38,7 @@ module Nuntius
   class Configuration
     include Options
 
-    option :logger, default: -> { Rails.logger }
+    option :logger, default: -> { Rails.logger }, proc: true
     option :admin_authentication_module, default: "Auxilium::Concerns::AdminAuthenticated"
     option :base_controller, default: "::ApplicationController"
     option :base_runner, default: "Nuntius::BasicApplicationRunner"
@@ -36,7 +47,7 @@ module Nuntius
     option :jobs_queue_name, default: "message"
     option :allow_custom_events, default: false
     option :active_storage_service
-    option :host, default: ->(message) {}
+    option :host, default: ->(message) {}, proc: true
 
     attr_accessor :visible_scope, :add_metadata, :metadata_fields, :default_template_scope
     attr_writer :metadata_humanize, :default_params, :flow_color

data/lib/nuntius/version.rb

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

data/lib/tasks/nuntius_tasks.rake

@@ -1,27 +1,13 @@
-# frozen_string_literal: true
-
-desc "Release a new version"
 namespace :nuntius do
-  task :release do
-    version_file = "./lib/nuntius/version.rb"
-    File.open(version_file, "w") do |file|
-      file.puts <<~EOVERSION
-        # frozen_string_literal: true
-
-        module Nuntius
-          VERSION = '#{Nuntius::VERSION.split(".").map(&:to_i).tap { |parts| parts[2] += 1 }.join(".")}'
-        end
-      EOVERSION
-    end
-    module Nuntius
-      remove_const :VERSION
+  namespace :tailwindcss do
+    desc "Configure your Tailwind CSS"
+    task :config do
+      Rails::Generators.invoke("nuntius:tailwind_config", ["--force"])
     end
-    load version_file
-    puts "Updated version to #{Nuntius::VERSION}"
-
-    `git commit lib/nuntius/version.rb -m "Version #{Nuntius::VERSION}"`
-    `git push`
-    `git tag #{Nuntius::VERSION}`
-    `git push --tags`
   end
 end
+
+if Rake::Task.task_defined?("tailwindcss:build")
+  Rake::Task["tailwindcss:build"].enhance(["nuntius:tailwindcss:config"])
+  Rake::Task["tailwindcss:watch"].enhance(["nuntius:tailwindcss:config"])
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nuntius
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Tom de Grunt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-05 00:00:00.000000000 Z
+date: 2024-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apnotic
@@ -374,6 +374,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: debug
+  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: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: standard
   requirement: !ruby/object:Gem::Requirement
@@ -398,6 +426,7 @@ files:
 - MIT-LICENSE
 - README.md
 - 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
@@ -467,13 +496,14 @@ files:
 - app/services/nuntius/deliver_campaign_service.rb
 - app/services/nuntius/deliver_inbound_message_service.rb
 - app/services/nuntius/retrieve_inbound_mail_service.rb
-- app/tables/nuntius_campaigns_table.rb
-- app/tables/nuntius_layouts_table.rb
-- app/tables/nuntius_lists_table.rb
-- app/tables/nuntius_locales_table.rb
-- app/tables/nuntius_messages_table.rb
-- app/tables/nuntius_subscribers_table.rb
-- app/tables/nuntius_templates_table.rb
+- app/tables/nuntius/application_table.rb
+- app/tables/nuntius/campaigns_table.rb
+- app/tables/nuntius/layouts_table.rb
+- app/tables/nuntius/lists_table.rb
+- app/tables/nuntius/locales_table.rb
+- app/tables/nuntius/messages_table.rb
+- app/tables/nuntius/subscribers_table.rb
+- app/tables/nuntius/templates_table.rb
 - app/transports/nuntius/base_transport.rb
 - app/transports/nuntius/mail_transport.rb
 - app/transports/nuntius/push_transport.rb
@@ -529,6 +559,9 @@ files:
 - db/migrate/20220412114148_add_last_sent_to_message.rb
 - db/migrate/20240205204719_add_description_to_list.rb
 - db/migrate/20240206203019_add_slug_to_nuntius_list.rb
+- lib/generators/nuntius/install_generator.rb
+- lib/generators/nuntius/tailwind_config_generator.rb
+- lib/generators/nuntius/templates/config/initializers/nuntius.rb
 - lib/nuntius.rb
 - lib/nuntius/active_record_helpers.rb
 - lib/nuntius/active_storage_helpers.rb

data/app/tables/nuntius_campaigns_table.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-class NuntiusCampaignsTable < ActionTable::ActionTable
-  model Nuntius::Campaign
-
-  column(:name)
-  column(:metadata) { |campaign| Nuntius.config.metadata_humanize(campaign.metadata) }
-  column(:transport)
-  column(:state)
-  column(:list, sort_field: "nuntius_lists.name") { |campaign| campaign.list.name }
-
-  column :actions, title: "", sortable: false do |campaign|
-    next unless campaign.can_publish?
-
-    content_tag(:span, class: "btn-group btn-group-xs") do
-      concat link_to(content_tag(:i, nil, class: "fa fa-paper-plane"), nuntius.publish_admin_campaign_path(campaign), data: {turbo_confirm: "Are you sure you want to send out this campaign?", turbo_method: :post}, class: "btn btn-xs btn-danger")
-    end
-  end
-
-  initial_order :name, :asc
-
-  row_link { |campaign| nuntius.edit_admin_campaign_path(campaign) }
-
-  private
-
-  def scope
-    @scope = Nuntius::Campaign.visible
-    @scope = Nuntius::Campaign.joins(:list)
-  end
-end

data/app/tables/nuntius_layouts_table.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-class NuntiusLayoutsTable < ActionTable::ActionTable
-  model Nuntius::Layout
-
-  column(:name)
-  column(:metadata) { |layout| Nuntius.config.metadata_humanize(layout.metadata) }
-
-  column :actions, title: "", sortable: false do |layout|
-    content_tag(:span, class: "btn-group btn-group-xs") do
-      concat link_to(content_tag(:i, nil, class: "fa fa-trash"), nuntius.admin_layout_url(layout), data: {turbo_confirm: "Are you sure you want to delete the layout?", turbo_method: :delete}, class: "btn btn-xs btn-danger")
-    end
-  end
-
-  initial_order :name, :asc
-
-  row_link { |layout| nuntius.edit_admin_layout_path(layout) }
-
-  private
-
-  def scope
-    @scope = Nuntius::Layout.visible
-  end
-end

data/app/tables/nuntius_lists_table.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-class NuntiusListsTable < ActionTable::ActionTable
-  model Nuntius::List
-
-  column(:name)
-  column(:metadata) { |list| Nuntius.config.metadata_humanize(list.metadata) }
-  column(:subscribers, sort_field: "subscribers_count") { |list| list.subscribers.count || "-" }
-
-  initial_order :name, :asc
-
-  row_link { |list| nuntius.edit_admin_list_path(list) }
-
-  private
-
-  def scope
-    @scope = Nuntius::List.visible
-  end
-end

data/app/tables/nuntius_locales_table.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-class NuntiusLocalesTable < ActionTable::ActionTable
-  model Nuntius::Locale
-
-  column(:key)
-  column(:metadata) { |locale| Nuntius.config.metadata_humanize(locale.metadata) }
-
-  initial_order :key
-
-  row_link { |locale| nuntius.edit_admin_locale_path(locale) }
-
-  private
-
-  def scope
-    @scope = Nuntius::Locale.visible
-  end
-end

data/app/tables/nuntius_messages_table.rb

@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-class NuntiusMessagesTable < ActionTable::ActionTable
-  model Nuntius::Message
-
-  column(:to)
-  column(:created_at, html_value: proc { |message| ln(message.created_at) })
-  column(:last_sent_at, html_value: proc { |message| ln(message.last_sent_at) })
-  column(:origin, sort_field: "nuntius_messages.campaign_id, nuntius_messages.template_id") do |message|
-    link_to message.campaign&.name, nuntius.edit_admin_campaign_path(message.campaign) if message.campaign
-    link_to message.template&.description, nuntius.edit_admin_template_path(message.template) if message.template
-  end
-  column(:subject) do |message|
-    if message.nuntiable
-      link_to "#{message.nuntiable_type} [#{message.nuntiable}]", begin
-        url_for(message.nuntiable)
-      rescue
-        "#"
-      end
-    end
-  end
-  column(:status)
-
-  initial_order :created_at, :desc
-
-  row_link { |message| nuntius.admin_message_path(message) }
-
-  private
-
-  def scope
-    @scope = Nuntius::Message.visible
-    @scope = @scope.where(nuntiable_id: params[:nuntiable_id], nuntiable_type: params[:nuntiable_type]) if params[:nuntiable_id]
-    @scope = @scope.where(template_id: params[:template_id]) if params[:template_id]
-    @scope
-  end
-end

data/app/tables/nuntius_subscribers_table.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-class NuntiusSubscribersTable < ActionTable::ActionTable
-  model Nuntius::Subscriber
-
-  column(:name, sortable: false)
-  column(:email)
-  column(:phonenumber)
-  column(:unsubscribed_at) { |subscriber| ln(subscriber.unsubscribed_at) }
-
-  initial_order :name, :asc
-
-  row_link { |subscriber| nuntius.edit_admin_list_subscriber_path(subscriber, list_id: subscriber.list) }
-
-  private
-
-  def scope
-    @scope = Nuntius::Subscriber.where(list_id: params[:list_id])
-  end
-end

data/app/tables/nuntius_templates_table.rb

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-class NuntiusTemplatesTable < ActionTable::ActionTable
-  model Nuntius::Template
-
-  column(:description)
-  column(:enabled, as: :boolean)
-  column(:klass)
-  column(:event)
-  column(:messages, sort_field: "message_count") { |template| link_to template.messages.count, nuntius.admin_messages_path(template_id: template.id) }
-
-  column(:metadata) { |template| Nuntius.config.metadata_humanize(template.metadata) }
-  column(:created_at, html_value: proc { |flow| ln(flow.created_at) })
-
-  column(:traffic_light, sortable: false) do |template|
-    color = Nuntius.config.flow_color(template.id).light_color || "green"
-
-    "<span class='traffic-signal-#{color.downcase}'><i class='fa fa-circle fa-xl'></i></span>"
-  end
-
-  column :actions, title: "", sortable: false do |template|
-    content_tag(:span, class: "btn-group btn-group-xs") do
-      concat link_to(content_tag(:i, nil, class: "fa fa-trash"), nuntius.admin_template_path(template), data: {turbo_confirm: "Are you sure you want to delete the template?", turbo_method: :delete}, class: "btn btn-xs btn-danger")
-    end
-  end
-
-  initial_order :description, :asc
-
-  row_link { |template| nuntius.edit_admin_template_path(template) }
-
-  private
-
-  def scope
-    @scope = Nuntius::Template.visible
-    @scope = Nuntius::Template.visible.select("nuntius_templates.*, (select count(id) from nuntius_messages where nuntius_messages.template_id = nuntius_templates.id) as message_count")
-  end
-end