ish_models 0.0.33.182 → 0.0.33.184

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2955b69e5c3cb7c88715600adfc9a661d18bc5a244a91d39f16528152d0bbcc5
-  data.tar.gz: 898ce52f6c280db8503702374b64a34f7ecb20b8bcce9dc2d333e468e7577013
+  metadata.gz: 3e6eff98102df0e1c876a6efbead562210b0d6863d9a75574aef191c778a011b
+  data.tar.gz: 5a5b1eaab82f0ccb24304b8ee61821504c3940e8cca6e54ef4ec161c5394dc7d
 SHA512:
-  metadata.gz: 6e3b705030a52fe4a626fc8c666de6b578ae04dc01ae0a5abb44d505fe48be96e567d197848be5462ce291ed6f6419a32ba8d78dae5d5e05d55a2ec42bd400df
-  data.tar.gz: f3f899139297bd7e575a36562014f43df35791b8d0829c2830a19fc2e706adcf09f9c23925b57efafdbe71a59efd408039dcbc9f91bfba3309fcadfd478ccf87
+  metadata.gz: d35fb3fc9226c8720e083090b86bca77399bfa62a99cc4c1e3650688a25a4f9f9ab1dc59c825f258f6e25016cf7c5fafb6b223d1b16553555858783b9b7c11f2
+  data.tar.gz: af86d30206881902dc9654d38a903f6b1a7fbd41f81c1719b959478ddcf2ab691ae03d83edbec538098137bc4812427ab3d08326052fc4da4821f426ef878025

data/lib/ish/email_context.rb

@@ -1,12 +1,14 @@
 
 #
-# This looks like it sends a single email?
+# Sends a single email, or a campaign.
 #
 
 class Ish::EmailContext
   include Mongoid::Document
   include Mongoid::Timestamps
 
+  field :title
+
   PAGE_PARAM_NAME = 'email_contexts_page'
 
   FROM_EMAILS = %w| piousbox@gmail.com victor@piousbox.com victor@wasya.co no-reply@piousbox.com |
@@ -16,8 +18,13 @@ class Ish::EmailContext
     [ [nil, nil] ] + FROM_EMAILS.map { |i| [i, i] }
   end
 
-  field :to_email
-  validates_presence_of :to_email
+  TYPE_SINGLE = 'TYPE_SINGLE'
+  TYPE_CAMPAIGN = 'TYPE_CAMPAIGN'
+  field :type, default: TYPE_SINGLE
+  def self.types_list
+    [ [TYPE_SINGLE, TYPE_SINGLE], [TYPE_CAMPAIGN, TYPE_CAMPAIGN] ]
+  end
+
 
   field :subject
   validates_presence_of :subject
@@ -30,11 +37,27 @@ class Ish::EmailContext
   field :rendered_str
 
   field :sent_at, type: DateTime
+  field :scheduled_at, type: DateTime
+
+  def leads
+    if self.type == TYPE_CAMPAIGN
+      return ::EmailCampaignLead.where( email_campaign_id: self.id.to_s ).includes( :lead ).map { |p| p.lead }
+    end
+  end
+
 
   #
   # For templating:
   #
-  field :name
+  field :tmpl_name
+
+  field :to_email
+  validates_presence_of :to_email, if: -> { type == TYPE_SINGLE }
+
+  #
+  # For tracking
+  #
+  attr_reader :tid
 
 end
 EmailContext = Ish::EmailContext

data/lib/ish/{campaign.rb → trash/email_campaign.rb}

@@ -1,4 +1,5 @@
-class Ish::Campaign
+
+class Ish::EmailCampaign
   include Mongoid::Document
   include Mongoid::Timestamps
 
@@ -12,12 +13,16 @@ class Ish::Campaign
   field :subject
   field :body
 
+  ## @TODO: tags instead?
   field :is_done,  :type => Boolean, :default => false
   field :is_trash, :type => Boolean, :default => false
+  field :tag # 'hired_com_ror', not enumerated for now _vp_ 20180103
 
+  ## @TODO: sent on, scheduled_on, ...
   field :applied_on, :type => Time
 
-  field :tag # 'hired_com_ror', not enumerated for now _vp_ 20180103
-  field :location
+  ## Need tracking!
+
+  ## this looks like an email_context, copy from there.
 
 end

data/lib/ish_models.rb

@@ -43,8 +43,8 @@ require 'gameui/marker'
 require 'gameui/premium_purchase'
 
 require 'ish/cache_key'
-require 'ish/campaign'
 require 'ish/crawler'
+# require 'ish/email_campaign' ## context + leadset is a campaign.
 require 'ish/email_context'
 require 'ish/email_template'
 require 'ish/email_unsubscribe'

data/lib/video.rb

@@ -29,14 +29,15 @@ class Video
   field :is_public, :type => Boolean, :default => false
   field :is_feature, :type => Boolean, :default => false
 
-  field :x, :type => Float
-  field :y, :type => Float
+  field :x, type: Float
+  field :y, type: Float
+  field :z, type: Float
 
   field :lang, :type => String, :default => 'en'
 
-  field :youtube_id, :type => String
-  validates :youtube_id, :uniqueness => true, allow_nil: true
-
+  field :youtube_id
+  validates_uniqueness_of :youtube_id, allow_blank: true, case_sensitive: false
+  before_save { youtube_id.present? || youtube_id = nil }
 
   belongs_to :user_profile, :optional => true, :class_name => 'Ish::UserProfile', :inverse_of => :videos
 
@@ -44,12 +45,6 @@ class Video
     [['', nil]] + Video.unscoped.order_by( :created_at => :desc ).map { |item| [ "#{item.created_at.strftime('%Y%m%d')} #{item.name}", item.id ] }
   end
 
-  set_callback( :create, :before ) do |doc|
-    if doc.is_public
-      doc.city.add_newsitem( doc ) unless doc.city.blank?
-      doc.site.add_newsitem( doc ) unless doc.site.blank?
-    end
-  end
 
   field :issue
   field :subhead
@@ -84,10 +79,6 @@ class Video
     s3_region: ::S3_CREDENTIALS[:region]
   validates_attachment_content_type :thumb, :content_type => ["image/jpg", "image/jpeg", "image/png", "image/gif", 'application/octet-stream' ]
 
-  set_callback :update, :after do |doc|
-    Site.update_all updated_at: Time.now
-  end
-
   ## copy-paste
   field :premium_tier, type: Integer, default: 0 # how many stars need to spend, to get access? 0 = free
   def is_premium

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.182
+  version: 0.0.33.184
 platform: ruby
 authors:
 - piousbox
@@ -123,7 +123,6 @@ files:
 - lib/gameui/marker.rb
 - lib/gameui/premium_purchase.rb
 - lib/ish/cache_key.rb
-- lib/ish/campaign.rb
 - lib/ish/configuration.rb
 - lib/ish/crawler.rb
 - lib/ish/email_context.rb
@@ -141,6 +140,7 @@ files:
 - lib/ish/payment.rb
 - lib/ish/premium_item.rb
 - lib/ish/railtie.rb
+- lib/ish/trash/email_campaign.rb
 - lib/ish/user_profile.rb
 - lib/ish/utils.rb
 - lib/ish_models.rb