effective_classifieds 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3800f94dc914a5451621ba31e2a791ceb1bfb0be11ccb27cfab08161368a84ab
-  data.tar.gz: d16ab09d94918e0a5133127bfcd6f62366081baf46918894a69369b45ca52b1b
+  metadata.gz: 68e3527fba69fa6c8b8c487d99738c1d45f20b4b12fd8daa9ba425a977805015
+  data.tar.gz: a8f587d9a36bd2a37eae7629d0ba9586de7c94ad189e3f8f5d740b766941d950
 SHA512:
-  metadata.gz: bba4c7426535e984578c7649d026d757f1c49a7599020935449dd5d2f68aeec745b1e795b246a48e63b03156ef55eeff351d055940ceee27180f1320bd518890
-  data.tar.gz: 7f65ddfe36db6731bdc1d21e001a107ec7fd52d204a3c0c71f29bbea109e7d01719a57d0527b154ce7fdb2af5a1a1dda6a4b37fb9372b2576b84fec271c18cba
+  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 }
+    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/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.to_date < start_on)
-      return false if end_on.present? && (Time.zone.now.to_date >= end_on)
+      return false if start_on.blank? || (Time.zone.now < start_on)
+      return false if end_on.present? && (Time.zone.now >= end_on)
       true
     end
 

data/config/effective_classifieds.rb

@@ -37,5 +37,5 @@ EffectiveClassifieds.setup do |config|
   # 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/lib/effective_classifieds/version.rb

@@ -1,3 +1,3 @@
 module EffectiveClassifieds
-  VERSION = '0.2.4'.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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_classifieds
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Code and Effect