ish_models 0.0.33.173 → 0.0.33.175

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20bd871ec7315d71ec6071376bc4dcffedb1910a21998a08e734ba426dbc8326
-  data.tar.gz: 245cec4e7835f4929fad40aa513036aed8f825890c01941a708dd05353b0897f
+  metadata.gz: 5349fd582ae245c9fc34c05cb1e72cca9868c2a3ae2012b19043e152ed5db0c7
+  data.tar.gz: 9ef7b974e6c2995e69a94ed68d6d16044c55b923630a02fb72ddac125f0d17c9
 SHA512:
-  metadata.gz: 77a2e7a7ec0a3025fb3e6ff0a08653dd28d4b7eff00000231a96d717eb88b875610796b82eb7438b8513c6bd3ce4e39f04a3c2171ccfaee165f1b28725b426af
-  data.tar.gz: 2bd5285789c8cdc07e398834a83cc586c45c0eb8a7c79c5320e2d21d835eabc7620fa5e48b1c8a7dc3d424c83507c4d23c93b82765cabb3de7bf3b3b8b49d303
+  metadata.gz: 383dcf0cdce386bc597cdbd64baad28d00d6647482fd23775032acf040dfb22e448f3602a1cb64132f3a18ba889a48e0799e2198356287e709b5712f1069aabc
+  data.tar.gz: ad082ecd825e7264a147a0dec3b7f74dac3702110e41ca77783491a67d50ed4c55d139f0d7727e48c905a74bad40d88c66f8723cdbb3897d10e2720fbf52db86

data/lib/gameui/marker.rb

@@ -8,13 +8,6 @@ class ::Gameui::Marker
   validates_uniqueness_of :name, scope: :map_id
   validates_presence_of :name
 
-  ## This is not a map, I don't need a slug.
-  ## @TODO: remove it. _vp_ 2022-06-17
-  field :slug
-  def slug
-    return self[:slug] || id.to_s
-  end
-
   field :ordering, type: String, default: 'jjj'
 
   ITEM_TYPE_LOCATION = '::Gameui::Map' # @TODO: this used to be gameui-location . How is this different from gameui-map ?
@@ -104,7 +97,6 @@ class ::Gameui::Marker
       map_id
       name
       ordering
-      slug
       url
       version
       w
@@ -114,8 +106,6 @@ class ::Gameui::Marker
   end
 
   def collect export_object
-    puts! export_object, "collecting in marker: |#{slug}|."
-
     if image
       export_object[:image_assets][image.id.to_s] = image.id.to_s
     end

data/lib/ish/email_context.rb

@@ -1,15 +1,26 @@
 
-##
-## This shouldn't really be in Ish namespace... but oh well
-##
+#
+# This looks like it sends a single email?
+#
 
 class Ish::EmailContext
   include Mongoid::Document
   include Mongoid::Timestamps
 
   field :to_email
+  validates_presence_of :to_email
+
   field :subject
-  field :template_name
+  validates_presence_of :subject
+
+  field :body
+  validates_presence_of :body
+
+  belongs_to :email_template
+
+  field :rendered_str
+
+  field :sent_at, type: DateTime
 
 end
 EmailContext = Ish::EmailContext

data/lib/ish/email_template.rb

@@ -0,0 +1,13 @@
+
+class ::Ish::EmailTemplate
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  field :slug
+  validates_uniqueness_of :slug, scope: [ :version ]
+  validates_presence_of :slug
+
+  field :version, default: '0.0.0'
+
+end
+EmailTemplate = ::Ish::EmailTemplate

data/lib/ish_models.rb

@@ -44,6 +44,7 @@ require 'ish/cache_key'
 require 'ish/campaign'
 require 'ish/crawler'
 require 'ish/email_context'
+require 'ish/email_template'
 require 'ish/gallery_name'
 require 'ish/image_asset'
 require 'ish/input_error'
@@ -56,6 +57,7 @@ require 'ish/premium_item'
 require 'ish/unsubscribe'
 require 'ish/user_profile'
 
+
 require 'city'
 require 'cities_user'
 require 'country'

data/lib/newsitem.rb

@@ -29,6 +29,7 @@ class Newsitem
   def description
     descr
   end
+  field :subhead
 
   field :image_path
   field :link_path

data/lib/photo.rb

@@ -27,6 +27,7 @@ class Photo
 
   field :name,   :type => String
   field :descr,  :type => String
+  field :subhead
   field :weight, :type => Integer, :default => 10
 
   field :is_public, :type => Boolean, :default => true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.173
+  version: 0.0.33.175
 platform: ruby
 authors:
 - piousbox
@@ -132,6 +132,7 @@ files:
 - lib/ish/configuration.rb
 - lib/ish/crawler.rb
 - lib/ish/email_context.rb
+- lib/ish/email_template.rb
 - lib/ish/gallery_name.rb
 - lib/ish/image_asset.rb
 - lib/ish/input_error.rb