wco_models 3.1.0.72 → 3.1.0.74

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 302a2a1a1d3081af93564469f98f0ae71e307be1dfe55f6434e1e8fe91530d6e
-  data.tar.gz: 473811f82c6920371f5739b7bcc5e8914907ac589a08f6dee0babf77fc4c9973
+  metadata.gz: '001333244903db535c3a5a5dcdcb6ed004dade16013fbf4076fe0bf2a2906ac5'
+  data.tar.gz: b32bd3b75f89fac0022b3ac29ffc2ae808840d95c334de2457b44356764d2c7a
 SHA512:
-  metadata.gz: c164f95273599dce14bd7549fbe38b5a3aa0ee4008b2e34ff29f6370af701be4ccf2a3c69485407646465cea79f8c4578b21f5ae3af4e763205110b8bb7cc92e
-  data.tar.gz: 3afb7f8481bd2d87f9e76991347008b70affa6d500d22e4cb0cb82beb3ca5c50aebaeb8521a197306479ba62148a8d6defc1c0b20a8e78c6e1866972cbf68581
+  metadata.gz: 83f6a385a033a7a49e5bc45fd9f3fb5f8e9cbf3bf43167bd43e0444dc0829a656aa229d14bc0b7ac4ff6d67d9ac0f392cdf7d622b281237480786440fb428fce
+  data.tar.gz: e723c180e2445f15ce7e2dc963f01afa0d1033e7521c49d3c2e0f85c14e52ce38474c3fc76b5076c88823d9bdfb75fb1dcf79637fb03b59538c8fbcc0c57f8c7

data/app/mailers/wco_email/application_mailer.rb

@@ -73,9 +73,8 @@ class WcoEmail::ApplicationMailer < ActionMailer::Base
     renderer.instance_variable_set( :@tmpl_config,      @tmpl_config )
 
     rendered_str = renderer.render_to_string("/wco_email/email_templates/_#{@ctx.tmpl.layout}")
-    @ctx.update!({
+    @ctx.update({
       rendered_str: rendered_str,
-      sent_at:      Time.now.to_s,
     })
 
     mail( from:    @ctx.from_email,

data/app/models/wco_email/email_filter.rb

@@ -35,7 +35,7 @@ class WcoEmail::EmailFilter
 
   STATUS_ACTIVE   = 'active'
   STATUS_INACTIVE = 'inactive'
-  STATUSS = [ STATUS_ACTIVE, STATUS_INACTIVE ]
+  STATUSES        = [ STATUS_ACTIVE, STATUS_INACTIVE ]
   field :status, type: :string, default: STATUS_ACTIVE
   scope :active, ->{ where( status: STATUS_ACTIVE ) }
 

data/app/models/wco_email/message_stub.rb

@@ -180,19 +180,19 @@ class WcoEmail::MessageStub
     email_filters = WcoEmail::EmailFilter.active
     email_filters.each do |filter|
       reson = nil
-      if filter.from_regex && @message.from.downcase.match( filter.from_regex )
+      if filter.from_regex.present? && @message.from.downcase.match( filter.from_regex )
         reason = 'from_regex'
       end
-      if filter.from_exact && @message.from.downcase.include?( filter.from_exact.downcase )
+      if filter.from_exact.present? && @message.from.downcase.include?( filter.from_exact.downcase )
         reason = 'from_exact'
       end
-      if filter.body_exact && @message.part_html&.include?( filter.body_exact )
+      if filter.body_exact.present? && @message.part_html&.include?( filter.body_exact )
         reason = 'body_exact'
       end
-      if filter.subject_regex && @message.subject.match( filter.subject_regex )
+      if filter.subject_regex.present? && @message.subject.match( filter.subject_regex )
         reason = 'subject_regex'
       end
-      if filter.subject_exact && @message.subject.downcase.include?( filter.subject_exact.downcase )
+      if filter.subject_exact.present? && @message.subject.downcase.include?( filter.subject_exact.downcase )
         reason = 'subject_exact'
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.72
+  version: 3.1.0.74
 platform: ruby
 authors:
 - Victor Pudeyev