nuntius 1.0.27 → 1.1.4

data/lib/nuntius/mail_allow_list.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'mail'
+require "mail"
 
 module Nuntius
   class MailAllowList
@@ -14,7 +14,7 @@ module Nuntius
 
       mail_to = Mail::Address.new(email.downcase)
       allow_list_match = @allow_list.detect do |allow|
-        allow == (allow.include?('@') ? mail_to.to_s : mail_to.domain)
+        allow == (allow.include?("@") ? mail_to.to_s : mail_to.domain)
       end
 
       allow_list_match.present?

data/lib/nuntius/nuntiable.rb

@@ -18,7 +18,9 @@ module Nuntius
       raise "Nuntius Messenger has not been implemented for class #{name}" unless messenger
 
       Nuntius.config.add_nuntiable_class(self)
-      has_many :messages, as: :nuntiable, class_name: 'Nuntius::Message'
+      has_many :messages, as: :nuntiable, class_name: "Nuntius::Message", dependent: :delete_all
+      has_many :nuntius_subscriptions, as: :nuntiable, class_name: "Nuntius::Subscriber", dependent: :delete_all
+      has_many :nuntius_lists, through: :nuntius_subscriptions, class_name: "Nuntius::List", source: :list
     end
   end
 end

data/lib/nuntius/transactio.rb

@@ -22,7 +22,7 @@ module Nuntius
           params = Nuntius.config.default_params(transaction_log_entry)
 
           Nuntius.event(event, resource, params)
-          Nuntius.event('save', resource, params) if %w[create update].include?(event)
+          Nuntius.event("save", resource, params) if %w[create update].include?(event)
         end
       end
     end

data/lib/nuntius/version.rb

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

data/lib/nuntius.rb

@@ -1,34 +1,20 @@
 # frozen_string_literal: true
 
-require 'auxilium'
-require 'inky'
-require 'httpclient'
-require 'liquidum'
-require 'premailer'
-require 'state_machines-activerecord'
-require 'servitium'
-
-require 'nuntius/deprecator'
-require 'nuntius/engine'
-require 'nuntius/configuration'
-require 'nuntius/active_record_helpers'
-require 'nuntius/active_storage_helpers'
-require 'nuntius/i18n_store'
-require 'nuntius/mail_allow_list'
+require "nuntius/deprecator"
+require "nuntius/engine"
+require "nuntius/configuration"
+require "nuntius/active_record_helpers"
+require "nuntius/active_storage_helpers"
+require "nuntius/i18n_store"
+require "nuntius/mail_allow_list"
 
 module Nuntius
-  ROOT_PATH = Pathname.new(File.join(__dir__, '..'))
+  extend Configurable
+  ROOT_PATH = Pathname.new(File.join(__dir__, ".."))
 
   class Error < StandardError; end
 
   class << self
-    attr_reader :config
-
-    def setup
-      @config = Configuration.new
-      yield config
-    end
-
     def i18n_store
       @i18n_store ||= Nuntius::I18nStore.new
     end
@@ -59,14 +45,14 @@ module Nuntius
     end
 
     def active_storage_enabled?
-      ActiveRecord::Base.connection.table_exists? 'active_storage_attachments'
+      ActiveRecord::Base.connection.table_exists? "active_storage_attachments"
     end
 
     def templates?(obj, event)
       Nuntius::Template.where(klass: Nuntius::BaseMessenger.class_names_for(obj),
-                              event: Nuntius::BaseMessenger.event_name_for(
-                                obj, event
-                              )).where(enabled: true).count.positive?
+        event: Nuntius::BaseMessenger.event_name_for(
+          obj, event
+        )).where(enabled: true).count.positive?
     end
   end
 

data/lib/preamble.rb

@@ -9,11 +9,11 @@ class Preamble
 
   def initialize(metadata, content)
     @metadata = metadata
-    @content  = content
+    @content = content
   end
 
   def metadata_with_content
-    @metadata.to_yaml + "---\n" + @content
+    "#{@metadata.to_yaml}---\n#{@content}"
   end
 
   def dump
@@ -29,8 +29,8 @@ class Preamble
   end
 
   def self.parse(data)
-    preamble_lines = +''
-    content_lines  = +''
+    preamble_lines = +""
+    content_lines = +""
 
     state = :before_preamble
 
@@ -42,24 +42,24 @@ class Preamble
       when :before_preamble
 
         new_state = case stripped
-                    when '---'
-                      :preamble
-                    when ''
-                      :before_preamble
-                    else
-                      content_lines << line
-                      :after_preamble
-                    end
+        when "---"
+          :preamble
+        when ""
+          :before_preamble
+        else
+          content_lines << line
+          :after_preamble
+        end
 
       when :preamble
 
         new_state = case stripped
-                    when '---'
-                      :after_preamble
-                    else
-                      preamble_lines << line
-                      :preamble
-                    end
+        when "---"
+          :after_preamble
+        else
+          preamble_lines << line
+          :preamble
+        end
 
       when :after_preamble
         new_state = :after_preamble

data/lib/tasks/nuntius_tasks.rake

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-desc 'Release a new version'
+desc "Release a new version"
 namespace :nuntius do
   task :release do
-    version_file = './lib/nuntius/version.rb'
-    File.open(version_file, 'w') do |file|
+    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('.')}'
+          VERSION = '#{Nuntius::VERSION.split(".").map(&:to_i).tap { |parts| parts[2] += 1 }.join(".")}'
         end
       EOVERSION
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nuntius
 version: !ruby/object:Gem::Version
-  version: 1.0.27
+  version: 1.1.4
 platform: ruby
 authors:
 - Tom de Grunt
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-21 00:00:00.000000000 Z
+date: 2024-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apnotic
@@ -95,31 +95,45 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.4'
 - !ruby/object:Gem::Dependency
-  name: httpclient
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.9'
+- !ruby/object:Gem::Dependency
+  name: faraday-follow_redirects
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.5
 - !ruby/object:Gem::Dependency
@@ -154,16 +168,16 @@ dependencies:
   name: liquidum
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -268,14 +282,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -347,35 +361,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5'
 - !ruby/object:Gem::Dependency
-  name: webpacker
+  name: slim-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '3.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: standard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -414,10 +428,13 @@ files:
 - app/controllers/nuntius/feedback_controller.rb
 - app/controllers/nuntius/inbound_messages/twilio_inbound_smses_controller.rb
 - app/controllers/nuntius/messages_controller.rb
+- app/controllers/nuntius/subscribers_controller.rb
 - app/drops/nuntius/application_drop.rb
 - app/drops/nuntius/campaign_drop.rb
 - app/drops/nuntius/layout_drop.rb
+- app/drops/nuntius/list_drop.rb
 - app/drops/nuntius/message_drop.rb
+- app/drops/nuntius/subscriber_drop.rb
 - app/drops/nuntius/template_drop.rb
 - app/exceptions/nuntius/base_exception.rb
 - app/exceptions/nuntius/missing_messenger_exception.rb
@@ -425,7 +442,6 @@ files:
 - app/jobs/nuntius/application_job.rb
 - app/jobs/nuntius/deliver_inbound_message_job.rb
 - app/jobs/nuntius/messenger_job.rb
-- app/jobs/nuntius/process_inbound_message_job.rb
 - app/jobs/nuntius/purge_message_job.rb
 - app/jobs/nuntius/retrieve_mail_job.rb
 - app/jobs/nuntius/transport_delivery_job.rb
@@ -454,15 +470,15 @@ files:
 - app/providers/nuntius/message_bird_sms_provider.rb
 - app/providers/nuntius/slack_slack_provider.rb
 - app/providers/nuntius/smtp_mail_provider.rb
+- app/providers/nuntius/teams_teams_provider.rb
 - app/providers/nuntius/twilio_sms_provider.rb
 - app/providers/nuntius/twilio_voice_provider.rb
-- app/reportlets/nuntius/application_reportlet.rb
-- app/reportlets/nuntius/daily_messages_per_template_reportlet.rb
 - app/runners/nuntius/application_runner.rb
 - app/runners/nuntius/basic_application_runner.rb
 - app/runners/nuntius/timebased_events_runner.rb
 - app/services/nuntius/application_service.rb
 - app/services/nuntius/aws_sns_processor_service.rb
+- 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
@@ -477,6 +493,7 @@ files:
 - app/transports/nuntius/push_transport.rb
 - app/transports/nuntius/slack_transport.rb
 - app/transports/nuntius/sms_transport.rb
+- app/transports/nuntius/teams_transport.rb
 - app/transports/nuntius/voice_transport.rb
 - app/validators/liquid_validator.rb
 - app/views/nuntius/admin/campaigns/edit.html.slim
@@ -497,14 +514,10 @@ files:
 - app/views/nuntius/admin/templates/index.html.slim
 - app/views/nuntius/dashboard/show.html.slim
 - app/views/nuntius/messages/show.html.slim
+- app/views/nuntius/subscribers/show.html.slim
 - config/locales/en.yml
 - config/locales/nl.yml
 - config/routes.rb
-- config/webpack/development.js
-- config/webpack/environment.js
-- config/webpack/production.js
-- config/webpack/test.js
-- config/webpacker.yml
 - db/migrate/20190301201541_create_nuntius_templates.rb
 - db/migrate/20190301202436_create_nuntius_messages.rb
 - db/migrate/20190322112815_create_nuntius_lists.rb
@@ -528,6 +541,8 @@ files:
 - db/migrate/20200430154032_make_html_processing_optional_revert.rb
 - db/migrate/20201121185718_create_nuntius_inbound_messages.rb
 - 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/nuntius.rb
 - lib/nuntius/active_record_helpers.rb
 - lib/nuntius/active_storage_helpers.rb
@@ -548,7 +563,7 @@ homepage: https://github.com/entdec/nuntius
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -563,8 +578,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.4.10
+signing_key: 
 specification_version: 4
 summary: Messaging and notification for Ruby on Rails
 test_files: []

data/app/jobs/nuntius/process_inbound_message_job.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-# Initializes the appropriate Messenger class and calls the event method
-module Nuntius
-  class ProcessInboundMessageJob < ApplicationJob
-    def perform(inbound_message)
-      Nuntius::DeliverInboundMessageService.perform(inbound_message: inbound_message)
-    end
-  end
-end

data/app/reportlets/nuntius/application_reportlet.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-module Nuntius
-  class ApplicationReportlet < Trado::Reportlet
-    attr_reader :template_ids
-
-    def initialize(params)
-      @template_ids = params[:template_ids]
-    end
-
-    private
-
-    def ymds(_for_display = false)
-      results.map { |r| r['ymd'] }.uniq.sort_by { |w| Date.strptime(w, '%F') }
-    end
-
-    def all_templates
-      map_items(results, :template_id)
-    end
-
-    # Helper to get item for ymd, template_id
-    def ymd_template_id(ymd, template_id, what)
-      find_item(results, { ymd: ymd, template_id: template_id }, what)
-    end
-
-    # Arel helpers
-    def templates
-      Nuntius::Template.arel_table
-    end
-
-    def messages
-      Nuntius::Message.arel_table
-    end
-  end
-end

data/app/reportlets/nuntius/daily_messages_per_template_reportlet.rb

@@ -1,50 +0,0 @@
-# frozen_string_literal: true
-
-require_dependency 'nuntius/application_reportlet'
-
-module Nuntius
-  class DailyMessagesPerTemplateReportlet < ApplicationReportlet
-    title 'Daily messages per template'
-    cache 1.minute
-
-    def table_data
-      data = [[''] + ymds(true)]
-
-      matrix = all_templates.map do |template|
-        tmpl = Nuntius::Template.find(template)
-        if tmpl
-          template_ymd_totals = ymds.map { |ymd| h.link_to(ymd_template_id(ymd, template, :count), Nuntius::Engine.routes.url_helpers.admin_messages_path(template_id: template)) }
-          [h.link_to(tmpl.description, Nuntius::Engine.routes.url_helpers.edit_admin_template_path(tmpl))] + template_ymd_totals
-        end
-      end
-
-      if matrix.present?
-        data += matrix
-      else
-        data = []
-      end
-      data
-    end
-
-    private
-
-    def results
-      return @results if @results
-
-      select_manager = messages.project(
-        :template_id,
-        Arel.sql("CONCAT(EXTRACT(YEAR FROM created_at :: DATE) :: VARCHAR, '-', EXTRACT(MONTH FROM created_at :: DATE) :: VARCHAR, '-', EXTRACT(DAY FROM created_at :: DATE) :: VARCHAR) AS ymd"),
-        Arel.star.count
-      )
-
-      select_manager = select_manager.where(messages[:template_id].in(template_ids))
-      select_manager = select_manager.where(messages[:created_at].between(7.days.ago..Time.now))
-
-      select_manager = select_manager.group(:template_id, :ymd)
-      select_manager = select_manager.order(:template_id, :ymd)
-
-      Rails.logger.info select_manager.to_sql
-      @results = ActiveRecord::Base.connection.execute(select_manager.to_sql)
-    end
-  end
-end

data/config/webpack/development.js

@@ -1,5 +0,0 @@
-process.env.NODE_ENV = process.env.NODE_ENV || 'development'
-
-const environment = require('./environment')
-
-module.exports = environment.toWebpackConfig()

data/config/webpack/environment.js

@@ -1,4 +0,0 @@
-const { environment } = require('@rails/webpacker')
-
-module.exports = environment
-

data/config/webpack/production.js

@@ -1,5 +0,0 @@
-process.env.NODE_ENV = process.env.NODE_ENV || 'production'
-
-const environment = require('./environment')
-
-module.exports = environment.toWebpackConfig()

data/config/webpack/test.js

@@ -1,5 +0,0 @@
-process.env.NODE_ENV = process.env.NODE_ENV || 'development'
-
-const environment = require('./environment')
-
-module.exports = environment.toWebpackConfig()

data/config/webpacker.yml

@@ -1,119 +0,0 @@
-# Note: You must restart bin/webpack-dev-server for changes to take effect
-
-default: &default
-  source_path: app/javascript
-  source_entry_path: packs
-  public_root_path: public
-  public_output_path: packs
-  cache_path: tmp/cache/webpacker
-  check_yarn_integrity: false
-  webpack_compile_output: false
-
-  # Additional paths webpack should lookup modules
-  # ['app/assets', 'engine/foo/app/assets']
-  resolved_paths: []
-
-  # Reload manifest.json on all requests so we reload latest compiled packs
-  cache_manifest: false
-
-  # Extract and emit a css file
-  extract_css: true
-
-  static_assets_extensions:
-    - .jpg
-    - .jpeg
-    - .png
-    - .gif
-    - .tiff
-    - .ico
-    - .svg
-    - .eot
-    - .otf
-    - .ttf
-    - .woff
-    - .woff2
-
-  extensions:
-    - .mjs
-    - .js
-    - .sass
-    - .scss
-    - .css
-    - .module.sass
-    - .module.scss
-    - .module.css
-    - .png
-    - .svg
-    - .gif
-    - .jpeg
-    - .jpg
-
-development:
-  <<: *default
-  compile: true
-
-  # Verifies that versions and hashed value of the package contents in the project's package.json
-  check_yarn_integrity: true
-
-  # Reference: https://webpack.js.org/configuration/dev-server/
-  dev_server:
-    https: false
-    host: localhost
-    port: 3035
-    public: localexpress.dev
-    hmr: true
-    # Inline should be set to true if using HMR
-    inline: true
-    overlay: true
-    compress: true
-    disable_host_check: true
-    use_local_ip: false
-    quiet: false
-    headers:
-      'Access-Control-Allow-Origin': '*'
-    watch_options:
-      ignored: '**/node_modules/**'
-
-
-test:
-  <<: *default
-  compile: true
-
-  # Compile test packs to a separate directory
-  public_output_path: packs-test
-
-testing:
-  <<: *default
-
-  # Production depends on precompilation of packs prior to booting for performance.
-  compile: false
-
-  # Extract and emit a css file
-  extract_css: true
-
-  # Cache manifest.json for performance
-  cache_manifest: true
-
-staging:
-  <<: *default
-
-  # Production depends on precompilation of packs prior to booting for performance.
-  compile: false
-
-  # Extract and emit a css file
-  extract_css: true
-
-  # Cache manifest.json for performance
-  cache_manifest: true
-
-production:
-  <<: *default
-
-  # Production depends on precompilation of packs prior to booting for performance.
-  compile: false
-
-  # Extract and emit a css file
-  extract_css: true
-
-  # Cache manifest.json for performance
-  cache_manifest: true