ish_models 0.0.33.181 → 0.0.33.183

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35c779eec7fc64840dfadc7ca7d585f6c4a583295e85c278580b53c3c0c0775a
-  data.tar.gz: 86dc21c7dca66c81652521a0d4ff86ab110bdbe819351835763f2bd40cdc320c
+  metadata.gz: 85f8fca5beb0c5b47064b21cc701211337dc0958413042fe7a0d06760bf37b6d
+  data.tar.gz: 401e647a0822369046967e7a89f1f5e8171a39788c13c599641855497b955532
 SHA512:
-  metadata.gz: be8bc0b1e9e652f25308acb2c6c90ab0703e310bab8e51ad2f86404897444c6502d2910d1a5eae7862e5c6147a6716af1987f53cffcb0736b8f2974e9dde10db
-  data.tar.gz: a1bd576a1ef3d754f3216c0c6de25199872171783932ee8ad1628475dc1688f28c236ef86c078227ca7040ae42141622f028f1aecb8317726274b1c4d9370a91
+  metadata.gz: 64946732013186fc3677c73c907a089165534e57b3fbaa064ecd6a4194acf8d9e263b4fd5736f4aab5e726105f76fa960cf396487bf75bf88dce5dec6708acb4
+  data.tar.gz: 299a36f616f7e436f650071604ae9fdc7ae20e23269579b9cb06904be845bfc8516b849022091dfed625bf7eb657f04cb086ca4ff63b92168d27bfcc33632fbe

data/lib/ish/email_context.rb

@@ -9,6 +9,13 @@ class Ish::EmailContext
 
   PAGE_PARAM_NAME = 'email_contexts_page'
 
+  FROM_EMAILS = %w| piousbox@gmail.com victor@piousbox.com victor@wasya.co no-reply@piousbox.com |
+  field :from_email
+  validates_presence_of :from_email
+  def self.from_email_list
+    [ [nil, nil] ] + FROM_EMAILS.map { |i| [i, i] }
+  end
+
   field :to_email
   validates_presence_of :to_email
 
@@ -16,7 +23,7 @@ class Ish::EmailContext
   validates_presence_of :subject
 
   field :body
-  validates_presence_of :body
+  # validates_presence_of :body ## With plain type, there is no body but there are variables for templating.
 
   belongs_to :email_template
 
@@ -24,5 +31,10 @@ class Ish::EmailContext
 
   field :sent_at, type: DateTime
 
+  #
+  # For templating:
+  #
+  field :name
+
 end
 EmailContext = Ish::EmailContext

data/lib/ish/email_template.rb

@@ -9,5 +9,15 @@ class ::Ish::EmailTemplate
 
   field :version, default: '0.0.0'
 
+  TYPES = %w| partial plain |
+  field :type
+  def self.type_list
+    [ [nil,nil] ] + TYPES.map { |i| [i, i] }
+  end
+
+  field :subject
+  field :body
+  field :from_email
+
 end
 EmailTemplate = ::Ish::EmailTemplate

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.181
+  version: 0.0.33.183
 platform: ruby
 authors:
 - piousbox