ish_models 0.0.33.228 → 0.0.33.230

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72c17273c98a213fb3173169bf9cf80ac5679d575cf1c0eba0b52862a5a2bf60
-  data.tar.gz: ab4da31fe3114aba80c648b51cf58eef1a9e2f6a78649d37f99f944806596196
+  metadata.gz: 9b6e8cdb5d6318f3571949e0b6bd148bf3bfba895c0f7c53f2744caf060876e0
+  data.tar.gz: 4c8ff28513a7c4deb978a39ac728729b6b5a10a43ea2e7e13553905655bdf423
 SHA512:
-  metadata.gz: b7070edc5d664690a478d7c767e742b8881b49c5670474dd5314a6cf85b44b46a2b04132bcc7e0a4de6d036c1168a62e40aecaf7c5d26d091134daf622c5b7b5
-  data.tar.gz: a9eb167806f67e420a6638a1d951a851dc10b22f4975b450bc7b42c015981e2c0d160f9dc47f7830d85e35f088a6d4bb5acd573610e807a59b2c7cd2eee3dadb
+  metadata.gz: 2f6c720885cd4e0b322ee54862fefba63a9d7af7e993c455dd942ec0b1f8aabfcbd9599362e5887bb0e325fd18cfad0c47f193ee7db8f31f7a5f1dae98ba6afd
+  data.tar.gz: 3e906a2d06e5b4ba91f7cf194cec788c8161d36930bab21fc516a6a47a100e142011ab6609f2fefbd1d17ffdfaa388845793e28ebee3b88e67af8131dd096e1b

data/lib/iro/option_watch.rb

@@ -1,6 +1,8 @@
 
+##
+## for alerting
+##
 class Iro::OptionWatch
-
   include Mongoid::Document
   include Mongoid::Timestamps
   store_in collection: 'iro_option_watches'

data/lib/ish/email_context.rb

@@ -49,14 +49,18 @@ class ::Ish::EmailContext
   field :send_at, type: DateTime
 
 
-  def self.unsent; new.unsent; end
-  def unsent; Ish::EmailContext.where( sent_at: nil ); end
+  def notsent
+    Ish::EmailContext.where( sent_at: nil )
+  end
+  def self.notsent; new.notsent; 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  })
   end
+  def self.scheduled; new.scheduled; end
+
 
   def self.from_email_list
     Ish::EmailCampaign.from_email_list

data/lib/office/scheduled_email_action.rb

@@ -28,6 +28,33 @@ class Office::ScheduledEmailAction
 
   field :perform_at, type: :time
 
+  def send_and_roll
+    sch = self
+    sch.update_attributes({ state: Sch::STATE_INACTIVE })
+
+    # send now
+    ctx = Ctx.create!({
+      email_template_id: sch.act.tmpl.id,
+      lead_id: sch.lead.id,
+      send_at: Time.now,
+      subject: sch.act.tmpl.subject,
+      from_email: sch.act.tmpl.from_email,
+      scheduled_email_action_id: sch.act.id,
+    })
+
+    # schedule next actions & update the action
+    sch.act.ties.each do |tie|
+      next_act = tie.next_email_action
+      next_at  = eval(tie.next_at_exe)
+      next_sch = Sch.find_or_initialize_by({
+        lead_id: sch.lead_id,
+        email_action_id: next_act.id,
+      })
+      next_sch.perform_at = next_at
+      next_sch.state      = Sch::STATE_ACTIVE
+      next_sch.save!
+    end
+  end
 
 end
 ::Sch = Office::ScheduledEmailAction

data/lib/report.rb

@@ -27,9 +27,7 @@ class Report
 
   field :is_public, :type => Boolean, :default => true
   index({ :is_public => 1 })
-  scope :public, ->{
-    where({ is_public: true })
-  }
+  scope :public, ->{ where({ is_public: true }) }
 
   field :is_feature, :type => Boolean, :default => false
   index({ :is_feature => 1 })
@@ -58,10 +56,6 @@ class Report
   field :n_upvotes, :default => 0
   field :n_spamvotes, :default => 0
 
-  default_scope ->{
-    where({ is_public: true, is_trash: false }).order_by({ created_at: :desc })
-  }
-
   has_many :newsitems
 
   def self.list conditions = { :is_trash => false }
@@ -74,10 +68,6 @@ class Report
     self::PER_PAGE
   end
 
-  def self.all
-    self.where( :is_public => true, :is_trash => false ).order_by( :created_at => :desc )
-  end
-
   def self.clear
     if Rails.env.test?
       self.unscoped.each { |r| r.remove }

metadata

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