ish_models 0.0.33.195 → 0.0.33.197

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b70a61ff2f74f6f8660cd7b745fafb8ee48107d58e1657fbaa4cbafede5dc5cc
-  data.tar.gz: 3830845cb028c10381b18c1d9ed2088d62363193ec87f0b3935a5765c40067ba
+  metadata.gz: 870f3ee936551c8e5369ba7669b3acffc26cf1ad20dfa391e225b792c5150cb1
+  data.tar.gz: 80e60e102548a32aefa3f31297c1bd9e73ada07bd495a81114c0f7f8bb81fd44
 SHA512:
-  metadata.gz: 5386670c8bde4fab552ce911b51bdc8e2afcbfce9f70acf8a14d411d64fd9a546d5fb1c6e506e4d279be2b07f35e36a3ab9c20812a899cded954411ffcf61cb2
-  data.tar.gz: d868d099370aa28c5b082ea6a1235732f281220ac197ef8cd994e73f7e87eac7dea2c6e6bad405d9be369b441a9e15e7478b35959f4acbda44e94c66a39062a1
+  metadata.gz: 756ceae86e3e087ecb3fc57519b92a2491d52c483d5a2f2485a9942bc3ff56d35d51197515686d490c04f254cb0c1ef50d437234b3ff0cd80495d7436928de2b
+  data.tar.gz: f75395a66a15b6db1f47f2bf33dd9a4842b6bbe5cf4b448e394afefa7584209a7b1ab3c7daee361c464f468df8caf7a6053d9033e9ba16821cea2d7939e21d44

data/lib/gallery.rb

@@ -45,15 +45,16 @@ class Gallery
 
   belongs_to :user_profile, :optional => true, :class_name => 'Ish::UserProfile', :inverse_of => :galleries
 
-  has_many :newsitems # seems correct. _vp_ 2022-03-21
-  has_many :photos
+  has_many :newsitems # Seems correct. _vp_ 2022-03-21
 
+  has_many :photos, order: { ordering: :asc }
 
+  ACTIONS = [ 'show_mini', 'show_long', 'show' ]
   # @deprecated, use Gallery::ACTIONS
   def self.actions
     ACTIONS
   end
-  ACTIONS = [ 'show_mini', 'show_long', 'show' ]
+
 
   RENDER_TITLES = 'index_titles' # view name
   RENDER_THUMBS = 'index_thumbs' # view name

data/lib/ish/email_context.rb

@@ -3,7 +3,7 @@
 # Sends a single email
 #
 
-class Ish::EmailContext
+class ::Ish::EmailContext
   include Mongoid::Document
   include Mongoid::Timestamps
 
@@ -11,14 +11,28 @@ class Ish::EmailContext
   field :slug
   validates_uniqueness_of :slug, allow_nil: true
 
+  field :preview_str, type: :string
+  def preview_str
+    if self[:preview_str].presence?
+      return self[:preview_str]
+    else
+      return tmpl.preview_str
+    end
+  end
+
   PAGE_PARAM_NAME = 'email_contexts_page'
 
-  FROM_EMAILS = %w|
-    hello@infiniteshelter.com no-reply@infiniteshelter.com
-    piousbox@gmail.com
-    victor@piousbox.com no-reply@piousbox.com
-    admin@wasya.co hello@wasya.co no-reply@wasya.co victor@wasya.co
-  |;
+  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
@@ -31,6 +45,10 @@ class Ish::EmailContext
   field :body
 
   belongs_to :email_template
+  def tmpl
+    email_template
+  end
+
   belongs_to :scheduled_email_action, class_name: '::Office::ScheduledEmailAction', optional: true
 
   field :rendered_str
@@ -54,14 +72,21 @@ class Ish::EmailContext
     Ish::EmailContext.where({ :send_at.lte => Time.now  })
   end
 
-  ## @deprecated: use self.lead
-  # field :to_email
-  # validates_presence_of :to_email
 
   field :lead_id
   def lead
     Lead.find lead_id
   end
+  ## @deprecated: use self.lead
+  field :to_email
+  def to_email
+    if self[:lead_id]
+      return lead[:email]
+    else
+      return self[:to_email]
+    end
+  end
+
 
   ##
   ## For tracking / utm

data/lib/ish/email_template.rb

@@ -7,6 +7,8 @@ class ::Ish::EmailTemplate
   validates_uniqueness_of :slug
   validates_presence_of :slug
 
+  field :preview_str, type: :string
+
   field :layout, type: :string, default: 'plain'
   LAYOUTS = %w| plain
     m20221201react m20221222merryxmas
@@ -27,7 +29,8 @@ class ::Ish::EmailTemplate
     binding()
   end
 
-  has_many :email_actions
+  has_many :email_actions, class_name: '::Office::EmailAction'
+  has_many :email_contexts, class_name: '::Ish::EmailContext'
 
 end
 ::Tmpl = ::Ish::EmailTemplate

data/lib/office/email_action.rb

@@ -10,6 +10,8 @@ class Office::EmailAction
   field :slug, type: :string
   validates :slug, uniqueness: true, allow_nil: true
 
+  field :descr, type: :string
+
   belongs_to :email_template, class_name: '::Ish::EmailTemplate'
 
   field :next_in_days, type: :string

data/lib/photo.rb

@@ -19,7 +19,17 @@ class Photo
   belongs_to :gallery,  :optional => true
   belongs_to :newsitem, :optional => true
 
+  # photo.photo.to_s.split('/').last.split('?').first
   field :name,   :type => String
+  def name
+    return self[:name] if self[:name]
+    update_attribute(:name, self.photo.to_s.split('/').last.split('?').first)
+    name
+  end
+
+  field :ordering, type: :integer
+  index({ ordering: -1 })
+
   field :descr,  :type => String
   field :subhead
   field :weight, :type => Integer, :default => 10

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.195
+  version: 0.0.33.197
 platform: ruby
 authors:
 - piousbox
@@ -122,7 +122,6 @@ files:
 - lib/gameui/map_bookmark.rb
 - lib/gameui/marker.rb
 - lib/gameui/premium_purchase.rb
-- lib/iro/option_price_item.rb-trash
 - lib/ish/cache_key.rb
 - lib/ish/configuration.rb
 - lib/ish/crawler.rb

data/lib/iro/option_price_item.rb-trash

@@ -1,8 +0,0 @@
-
-require 'active_record'
-
-class ::Iro::OptionPriceItem < ActiveRecord::Base
-
-  self.table_name = 'iro_option_price_items'
-
-end