effective_classifieds 0.2.2 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 146fbc6ffd7a14236e799e1b49d51bc7da24f63d15f20757b65e67ce6c693c18
-  data.tar.gz: e9db23a72717732922f58ea3ea819b13221b4a44da3142a4482536b460f4e78e
+  metadata.gz: 68e3527fba69fa6c8b8c487d99738c1d45f20b4b12fd8daa9ba425a977805015
+  data.tar.gz: a8f587d9a36bd2a37eae7629d0ba9586de7c94ad189e3f8f5d740b766941d950
 SHA512:
-  metadata.gz: 859ca4688636948f42ca2dccd5c9d11d34cbc1bbaadee3ee215b93b6f36650a8451d9499eb8ed47014370bc8cd6708ee58c503ae4b63414c5419f0ef032f07e3
-  data.tar.gz: e4e78bca481105c20a677e1a57868450ef6ed0e40b611c3fb17259d62d8a462e67cefbcebac30535979285989bcee19002143761ef30dcb86bb4a8b7209e6153
+  metadata.gz: 5ed6350f3d0e6dc2244cf30ccfa0ebcc0aa14f10fe5665ce9f4d993d718169ca3bd9ec6f7eba347803fd14cfecc6fb2ca9d0c4932f6bfa587cb7b370f9bc2e22
+  data.tar.gz: 26d6d75e322bfd4d5e30b635266012e229b2136cfa5a8feac4291fbfcf0280c8d0d352c74babdb5c247ed94c7c4101971ca480a4efb821c9018d87ace94a18bc

data/app/mailers/effective/classifieds_mailer.rb

@@ -1,21 +1,16 @@
 module Effective
   class ClassifiedsMailer < EffectiveClassifieds.parent_mailer_class
 
-    default from: -> { EffectiveClassifieds.mailer_sender }
-    layout -> { EffectiveClassifieds.mailer_layout || 'effective_classifieds_mailer_layout' }
+    include EffectiveMailer
 
     def classified_submitted(resource, opts = {})
-      raise('expected an Effective::Classification') unless resource.kind_of?(Effective::Classified)
+      raise('expected an Effective::Classified') unless resource.kind_of?(Effective::Classified)
 
       @classified = resource
+      subject = subject_for(:classified_submitted, 'Classified Submitted', resource, opts)
+      headers = headers_for(resource, opts)
 
-      mail(to: EffectiveClassifieds.mailer_admin, **headers_for(resource, opts))
-    end
-
-    protected
-
-    def headers_for(resource, opts = {})
-      resource.respond_to?(:log_changes_datatable) ? opts.merge(log: resource) : opts
+      mail(to: mailer_admin, subject: subject, **headers)
     end
 
   end

data/app/views/effective/classifieds_mailer/classified_submitted.html.haml

@@ -12,7 +12,7 @@
 
 %hr
 
-- if !@classified.published?
+- unless @classified.approved?
   %p= link_to('Approve Classified Ad', effective_classifieds.edit_admin_classified_path(@classified))
 
 %p= link_to('View Classified Ad', effective_classifieds.classified_path(@classified))

data/config/effective_classifieds.rb

@@ -24,22 +24,18 @@ EffectiveClassifieds.setup do |config|
   # Automatically approve classified ad submissions, otherwise require admin approval
   config.auto_approve = false
 
-  # Mailer Configuration
+  # Mailer Settings
+  # Please see config/initializers/effective_resources.rb for default effective_* gem mailer settings
+  #
   # Configure the class responsible to send e-mails.
   # config.mailer = 'Effective::ClassifiedsMailer'
-
-  # Configure the parent class responsible to send e-mails.
-  # config.parent_mailer = 'ActionMailer::Base'
-
-  # Default deliver method
-  # config.deliver_method = :deliver_later
-
-  # Default layout
-  # config.mailer_layout = 'effective_classifieds_mailer_layout'
-
-  # Default From
-  config.mailer_sender = "no-reply@example.com"
-
-  # Send Admin correspondence To
-  config.mailer_admin = "admin@example.com"
+  #
+  # Override effective_resource mailer defaults
+  #
+  # config.parent_mailer = nil      # The parent class responsible for sending emails
+  # config.deliver_method = nil     # The deliver method, deliver_later or deliver_now
+  # config.mailer_layout = nil      # Default mailer layout
+  # config.mailer_sender = nil      # Default From value
+  # config.mailer_admin = nil       # Default To value for Admin correspondence
+  # config.mailer_subject = nil     # Proc.new method used to customize Subject
 end

data/db/migrate/01_create_effective_classifieds.rb.erb

@@ -33,8 +33,8 @@ class CreateEffectiveClassifieds < ActiveRecord::Migration[6.1]
       t.timestamps
     end
 
-    add_index :classifieds, [:owner_id, :owner_type]
-    add_index :classifieds, :slug
+    add_index <%= @classifieds_table_name %>, [:owner_id, :owner_type]
+    add_index <%= @classifieds_table_name %>, :slug
 
     create_table <%= @classified_wizards_table_name %> do |t|
       t.string :token
@@ -56,7 +56,7 @@ class CreateEffectiveClassifieds < ActiveRecord::Migration[6.1]
       t.datetime :created_at
     end
 
-    add_index :classified_wizards, [:owner_id, :owner_type]
-    add_index :classified_wizards, :token
+    add_index <%= @classified_wizards_table_name %>, [:owner_id, :owner_type]
+    add_index <%= @classified_wizards_table_name %>, :token
   end
 end

data/lib/effective_classifieds/version.rb

@@ -1,3 +1,3 @@
 module EffectiveClassifieds
-  VERSION = '0.2.2'.freeze
+  VERSION = '0.2.5'.freeze
 end

data/lib/effective_classifieds.rb

@@ -8,9 +8,9 @@ module EffectiveClassifieds
   def self.config_keys
     [
       :classifieds_table_name, :classified_wizards_table_name,
+      :mailer, :parent_mailer, :deliver_method, :mailer_layout, :mailer_sender, :mailer_admin, :mailer_subject,
       :layout, :categories, :per_page, :use_effective_roles, :max_duration, :auto_approve,
-      :classified_wizard_class_name,
-      :mailer, :parent_mailer, :deliver_method, :mailer_layout, :mailer_sender, :mailer_admin
+      :classified_wizard_class_name
     ]
   end
 
@@ -24,22 +24,4 @@ module EffectiveClassifieds
     mailer&.constantize || Effective::ClassifiedsMailer
   end
 
-  def self.parent_mailer_class
-    return parent_mailer.constantize if parent_mailer.present?
-    ActionMailer::Base
-  end
-
-  def self.send_email(email, *args)
-    raise('expected args to be an Array') unless args.kind_of?(Array)
-
-    if defined?(Tenant)
-      tenant = Tenant.current || raise('expected a current tenant')
-      args.last.kind_of?(Hash) ? args.last.merge!(tenant: tenant) : args << { tenant: tenant }
-    end
-
-    deliver_method = EffectiveClassifieds.deliver_method || EffectiveResources.deliver_method
-
-    EffectiveClassifieds.mailer_class.send(email, *args).send(deliver_method)
-  end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_classifieds
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-01 00:00:00.000000000 Z
+date: 2022-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -213,7 +213,6 @@ files:
 - app/views/effective/classifieds/index.html.haml
 - app/views/effective/classifieds/show.html.haml
 - app/views/effective/classifieds_mailer/classified_submitted.html.haml
-- app/views/layouts/effective_classifieds_mailer_layout.html.haml
 - config/effective_classifieds.rb
 - config/routes.rb
 - db/migrate/01_create_effective_classifieds.rb.erb

data/app/views/layouts/effective_classifieds_mailer_layout.html.haml

@@ -1,7 +0,0 @@
-!!!
-%html{style: 'background: #fff;'}
-  %head
-    %meta{:content => 'text/html; charset=UTF-8', 'http-equiv' => 'Content-Type'}
-
-  %body{style: 'background: #fff;'}
-    = yield