ish_models 0.0.33.203 → 0.0.33.205

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d743720d7da4d999732d7d28b69fe0697eaa73423d8fbb8f00866409eb857ed6
-  data.tar.gz: da958d68e0f40daedef7356725afba4a063713315e5ef756396355700f49f710
+  metadata.gz: 35fec87554c6b3a0cd0dd1ade92dca464df390c4d3a718d09744d621f7619541
+  data.tar.gz: 0b6ac843524f389c07653b4ab5897953e5db6a26eba4d53f3ab16dff559fcd4d
 SHA512:
-  metadata.gz: 210e40b9e0033207fb621b7d999227b638187f62937836885691b96206b4950ef01c5818d67fbef9fa5b456d5cf41a83b0f9974beda2e677662677315ba46b71
-  data.tar.gz: 6e0519979624398d04c9406f8ade0df6be50fa062f6dc8aafdf1cec5cd4a278efa4a57b7101f0b9023e849f51268da2274d1a188ddff61ad26752dfaadceed2f
+  metadata.gz: 90d7ae686679c20bdf871ead96a7e1268f1adac15f90427fdc414641e433dfe8102663354db4d9149610a3d8fff3d3f5b8eb656961e3a6b49f6a4750ef2fdc06
+  data.tar.gz: f5df4f1ee219aafbe30ed50e3a845c8be3063250e6749756bc7686da66d76c5df41009af9036c17d4dc822c817fb0f8fc93e46e1bb2ec6fc5bcf91cfa0e94b1d

data/lib/ish/email_context.rb

@@ -1,13 +1,11 @@
-
-#
-# Sends a single email
-#
+##
+## Send a single email
+##
 
 class ::Ish::EmailContext
   include Mongoid::Document
   include Mongoid::Timestamps
 
-  ## @TODO: probably rename it to slug
   field :slug
   validates_uniqueness_of :slug, allow_nil: true
 
@@ -22,34 +20,19 @@ class ::Ish::EmailContext
 
   PAGE_PARAM_NAME = 'email_contexts_page'
 
-  FROM_EMAILS = [
-    'Infinite Shelter <hello@infiniteshelter.com>',
-    'Infinite Shelter <no-reply@infiniteshelter.com>',
-    'Victor Piousbox <piousbox@gmail.com>',
-    'Victor Piousbox <victor@piousbox.com>',
-    'Victor Piousbox <no-reply@piousbox.com>',
-    'Victor Piousbox <admin@wasya.co>',
-    'WasyaCo Consulting <hello@wasya.co>',
-    'WasyaCo Consulting <no-reply@wasya.co>',
-    'Victor Piousbox <victor@wasya.co>',
-  ];
   field :from_email
-  validates_presence_of :from_email
-  def self.from_email_list
-    [ [nil, nil] ] + FROM_EMAILS.map { |i| [i, i] }
-  end
+  # validates_presence_of :from_email
 
   field :subject
-  validates_presence_of :subject
+  # validates_presence_of :subject
 
   field :body
 
   belongs_to :email_template
-  def tmpl
-    email_template
-  end
+  def tmpl; email_template; end
 
   belongs_to :scheduled_email_action, class_name: '::Office::ScheduledEmailAction', optional: true
+  def sch; scheduled_email_action; end
 
   field :rendered_str
 
@@ -57,16 +40,10 @@ class ::Ish::EmailContext
   field :send_at, type: DateTime
 
 
-  def self.unsent
-    new.unsent
-  end
-  def unsent
-    Ish::EmailContext.where( sent_at: nil )
-  end
+  def self.unsent; new.unsent; end
+  def unsent; Ish::EmailContext.where( sent_at: nil ); end
 
-  def self.scheduled
-    new.scheduled
-  end
+  def self.scheduled; new.scheduled; end
   def scheduled
     # or({ :send_at.lte => Time.now }, { :send_at => nil }) ## This won't work b/c I need draft state!
     Ish::EmailContext.where({ :send_at.lte => Time.now  })
@@ -74,12 +51,8 @@ class ::Ish::EmailContext
 
 
   field :lead_id, type: :integer
-  def lead
-    Lead.find lead_id
-  end
-  def to_email
-    return lead[:email]
-  end
+  def lead; Lead.find( lead_id ); end
+  def to_email; lead[:email]; end
 
 
   ##

data/lib/ish/email_template.rb

@@ -21,7 +21,22 @@ class ::Ish::EmailTemplate
 
   field :subject
   field :body
+
+  FROM_EMAILS = [
+    'Infinite Shelter <hello@infiniteshelter.com>',
+    'Infinite Shelter <no-reply@infiniteshelter.com>',
+    'Victor Piousbox <piousbox@gmail.com>',
+    'Victor Piousbox <victor@piousbox.com>',
+    'Victor Piousbox <no-reply@piousbox.com>',
+    'Victor Piousbox <admin@wasya.co>',
+    'WasyaCo Consulting <hello@wasya.co>',
+    'WasyaCo Consulting <no-reply@wasya.co>',
+    'Victor Piousbox <victor@wasya.co>',
+  ];
   field :from_email
+  def self.from_email_list
+    [ [nil, nil] ] + FROM_EMAILS.map { |i| [i, i] }
+  end
 
   ## 2023-03-04 _vp_ This works!
   def get_binding

data/lib/ish_models.rb

@@ -8,9 +8,11 @@ require 'kaminari/mongoid'
 
 class Gameui; end
 
-# module Iro; end
-class Ish::InputError < RuntimeError; end
+module Iro; end
+
+
 module Ish; end
+class Ish::InputError < RuntimeError; end
 
 # I need this thing for permissions???
 class Manager; end

data/lib/office/email_action.rb

@@ -13,13 +13,17 @@ class Office::EmailAction
   field :descr, type: :string
 
   belongs_to :email_template, class_name: '::Ish::EmailTemplate'
+  def tmpl; email_template; end
 
-  field :next_in_days, type: :string
-  field :next_at_time, type: :string
+  # field :next_in_days, type: :string
+  # field :next_at_time, type: :string
+  field :next_at_exe, type: :string
 
   belongs_to :prev_email_action, class_name: '::Office::EmailAction', optional: true, inverse_of: :next_email_actions
   has_many :next_email_actions, class_name: '::Office::EmailAction', inverse_of: :prev_email_action
 
   has_many :scheduled_email_actions, class_name: '::Office::ScheduledEmailAction'
+  def schs; scheduled_email_actions; end
+
 end
 

data/lib/office/email_conversation.rb

@@ -41,18 +41,21 @@ class Office::EmailConversation
     else
       throw "#add_tag expects a WpTag or string (eg WpTag::EMAILTAG_INBOX) as the only parameter."
     end
-    puts! tag, 'tag'
     self[:wp_term_ids] = ( [ tag.id ] + self[:wp_term_ids] ).uniq
     self.save!
   end
 
   def remove_tag tag
-    if WpTag == tag.class
-      self[:wp_term_ids].delete( tag.id )
-      self.save!
+    case tag.class.name
+    when 'WpTag'
+      ;
+    when 'String'
+      tag = WpTag.emailtag(tag)
     else
-      throw "#remove_tag expects a WpTag as the only parameter."
+      throw "#remove_tag expects a WpTag or string (eg WpTag::EMAILTAG_INBOX) as the only parameter."
     end
+    self[:wp_term_ids].delete( tag.id )
+    self.save!
   end
 
   def self.in_inbox

data/lib/office/scheduled_email_action.rb

@@ -19,9 +19,13 @@ class Office::ScheduledEmailAction
   scope :active, ->{ where( state: STATE_ACTIVE ) }
 
   belongs_to :email_action, class_name: '::Office::EmailAction'
+  def act; email_action; end
+
   has_many :email_contexts, class_name: '::Ish::EmailContext'
+  def ctxs; email_contexts; end
+
+  field :perform_at, type: :time
 
-  field :perform_at, type: :timestamp
 
 end
 ::Sch = Office::ScheduledEmailAction

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.203
+  version: 0.0.33.205
 platform: ruby
 authors:
 - piousbox