effective_classifieds 0.2.1 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b86483009f7d9be8e80a451b7b957bbfe1ac9ec2d88d7a11e13f36a97a261a6e
-  data.tar.gz: bd9cd48a34bd463f87c12cb3353f9a474f4de95645c4999f9188d10fd2f52d76
+  metadata.gz: 3800f94dc914a5451621ba31e2a791ceb1bfb0be11ccb27cfab08161368a84ab
+  data.tar.gz: d16ab09d94918e0a5133127bfcd6f62366081baf46918894a69369b45ca52b1b
 SHA512:
-  metadata.gz: 820fd500352d1a4b20cc7ed71f0f9569a25d27ca3d2e6a91befc4d8ccfc3244d882e77dcdbb240e73634b419fb90b5b7abfe0ce5abf09d63c11945f90f690f57
-  data.tar.gz: 5f2c5ea34d257e972c9f3f2e4e30216537a3f899a8c4778af8c578485653b0d134f6e7c4e44146c456efd2cd7cdde55f85e87f5f96b0c0c972ca37c75d6cb924
+  metadata.gz: bba4c7426535e984578c7649d026d757f1c49a7599020935449dd5d2f68aeec745b1e795b246a48e63b03156ef55eeff351d055940ceee27180f1320bd518890
+  data.tar.gz: 7f65ddfe36db6731bdc1d21e001a107ec7fd52d204a3c0c71f29bbea109e7d01719a57d0527b154ce7fdb2af5a1a1dda6a4b37fb9372b2576b84fec271c18cba

data/app/datatables/admin/effective_classified_wizards_datatable.rb

@@ -16,7 +16,7 @@ class Admin::EffectiveClassifiedWizardsDatatable < Effective::Datatable
   end
 
   collection do
-    EffectiveSubmissions.ClassifiedWizard.all.deep.done.joins(:classified)
+    EffectiveClassifieds.ClassifiedWizard.all.deep.done.joins(:classified)
   end
 
 end

data/app/mailers/effective/classifieds_mailer.rb

@@ -2,7 +2,7 @@ module Effective
   class ClassifiedsMailer < EffectiveClassifieds.parent_mailer_class
 
     default from: -> { EffectiveClassifieds.mailer_sender }
-    layout -> { EffectiveClassifieds.mailer_layout || 'effective_classifieds_mailer_layout' }
+    layout -> { EffectiveClassifieds.mailer_layout }
 
     def classified_submitted(resource, opts = {})
       raise('expected an Effective::Classification') unless resource.kind_of?(Effective::Classified)

data/app/models/effective/classified.rb

@@ -140,8 +140,8 @@ module Effective
     def published?
       return false unless approved?
       return false if archived?
-      return false if start_on.blank? || (Time.zone.now < start_on)
-      return false if end_on.present? && (Time.zone.now >= end_on)
+      return false if start_on.blank? || (Time.zone.now.to_date < start_on)
+      return false if end_on.present? && (Time.zone.now.to_date >= end_on)
       true
     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'
+  #
+  # 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
 
-  # 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"
 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.1'.freeze
+  VERSION = '0.2.4'.freeze
 end

data/lib/effective_classifieds.rb

@@ -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.1
+  version: 0.2.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-31 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