ish_models 0.0.33.180 → 0.0.33.182

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab9ab58fbdd675ba653fecc53922fe73e06f1f8664f96b71b4be65eaff96f937
-  data.tar.gz: b41ae3d27c737d8555666e8bb8a36ba10e24d8ff9fb4f31e1ed490392ad1231b
+  metadata.gz: 2955b69e5c3cb7c88715600adfc9a661d18bc5a244a91d39f16528152d0bbcc5
+  data.tar.gz: 898ce52f6c280db8503702374b64a34f7ecb20b8bcce9dc2d333e468e7577013
 SHA512:
-  metadata.gz: bb011cfb98cd182ff924472416b69a578e70c7c63f48da960b70221ed7d38d32d0611ae6a447f969db087c177b14d7f135f9d276ea98ba651e5d679bcd20eaf7
-  data.tar.gz: 8f64e5052dbca35cfea1ebefc000f712003b92c1a48a096e743ef84b13f891b8bf03ddde64989594407e0574a5fc75a525b56983e8e18c8a82cca633e373734a
+  metadata.gz: 6e3b705030a52fe4a626fc8c666de6b578ae04dc01ae0a5abb44d505fe48be96e567d197848be5462ce291ed6f6419a32ba8d78dae5d5e05d55a2ec42bd400df
+  data.tar.gz: f3f899139297bd7e575a36562014f43df35791b8d0829c2830a19fc2e706adcf09f9c23925b57efafdbe71a59efd408039dcbc9f91bfba3309fcadfd478ccf87

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

@@ -35,7 +35,7 @@ class Video
   field :lang, :type => String, :default => 'en'
 
   field :youtube_id, :type => String
-  validates :youtube_id, :uniqueness => true
+  validates :youtube_id, :uniqueness => true, allow_nil: true
 
 
   belongs_to :user_profile, :optional => true, :class_name => 'Ish::UserProfile', :inverse_of => :videos

metadata

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