ish_models 0.0.33.174 → 0.0.33.176

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e193de4eeef224f54fcf57c898a9bc3b6a6442a3fdb92ebc39bbe631e884c760
-  data.tar.gz: be392236fdc22f242252992c4f473623798b1d837fb036be850f54dd6a26a32d
+  metadata.gz: a810365ee2634ffbe66e6d14a7f189fd852163998af2c3edde1a57d4b2d68f7d
+  data.tar.gz: 89845a5d0201ec225d6a2a0f645169603a66612f82b4fcb10ba9b5e7e6ebad9e
 SHA512:
-  metadata.gz: c9e4729d7c569a6fe830403583e95552f2bf96b16d0d73601059e9680eb67ec8f526b9a5c655ebdc7f23312cd9608aafd44de088cb435f8b579ddfc2da514b7d
-  data.tar.gz: e74ca05bc40aa65fdf65b31b228e5410bd9be2299664261404eb4e1e98b4f6af3632cd08445d9c6e23c33b89638b15a7540270cef023972c04c8d2e0c282d229
+  metadata.gz: 0c4a699711808f394354761e45910afafa47efd8e8c6f2e378e680ed5a1edc4c9a6ff36714aa196a93dba4bae0070b0dc817753458d82b67423a11aa5d6aa42d
+  data.tar.gz: f5c50bcfffb3d7d2e130bb64c11b66b6f47297771bb0f68fb1a89df4e09c2b4dc1dd52f62fb9f0f70e37caab3f6bd6098ff4af829bfcb4e99172248a4532c270

data/lib/gameui/marker.rb

@@ -97,7 +97,6 @@ class ::Gameui::Marker
       map_id
       name
       ordering
-      slug
       url
       version
       w
@@ -107,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/lead.rb

@@ -49,6 +49,3 @@ class Ish::Lead
   field :extra, :type => Array, :default => []
 
 end
-
-Lead = Ish::Lead
-

data/lib/ish/user_profile.rb

@@ -82,8 +82,9 @@ class Ish::UserProfile
   ## @TODO: better naming convention, or remove this
   field :videos_embed, :type => Boolean, :default => false
 
+  ## @TODO: remove _vp_ 2022-10-04
   def sudoer?
-    %w( piousbox@gmail.com victor@wasya.co ).include?( self.user.email ) ? true : false
+    %w( piousbox@gmail.com victor@wasya.co ).include?( email )
   end
 
   ## manager uses it.

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

data/lib/trash/app_model2.rb

@@ -0,0 +1,21 @@
+
+# @deprecated, remove
+class Ish::AppModel2
+  include ::Mongoid::Document
+  include ::Mongoid::Timestamps
+
+  field :is_public,    :type => Boolean, :default => false
+  field :is_trash,     :type => Boolean, :default => false
+
+  default_scope ->{ where({ :is_public => true, :is_trash => false }).order_by({ :created_at => :desc }) }
+
+  field :x, :type => Float
+  field :y, :type => Float
+
+  def self.list conditions = { :is_trash => false }
+    out = self.where( conditions ).order_by( :created_at => :desc )
+    [['', nil]] + out.map { |item| [ "#{item.created_at.strftime('%Y%m%d')} #{item.name}", item.id ] }
+  end
+
+
+end

data/lib/trash/city.rb-bk

@@ -0,0 +1,100 @@
+class City
+  include ::Mongoid::Document
+  include ::Mongoid::Timestamps
+
+  field :name, :type => String
+  field :description, :type => String, :default => 'The description of this city'
+
+  field :cityname, :type => String
+  validates :cityname, :uniqueness => true, :allow_nil => false, :presence => true
+  def slug; cityname; end
+  def slug= s; cityname = s; end
+
+  field :x, :type => Float
+  field :y, :type => Float
+
+  field :deleted_at, type: Time
+  def self.all
+    self.where( deleted_at: nil, is_active: true ).order_by( name: :desc )
+  end
+
+  belongs_to :country, :optional => true
+
+  has_many :events
+  has_many :galleries
+  has_many :photos
+  has_many :reports
+  has_many :venues
+  has_many :videos
+  has_and_belongs_to_many :tags
+
+  has_many :current_users, :class_name => '::Ish::UserProfile', :inverse_of => :current_city
+  has_many :newsitems
+
+  has_many :current_users, :class_name => '::Ish::UserProfile', :inverse_of => :current_city
+  has_one :profile_photo, :class_name => 'Photo', :inverse_of => :profile_city
+  has_one :guide, :class_name => '::Ish::UserProfile', :inverse_of => :guide_city
+
+  has_many :features
+
+  field :calendar_frame, :type => String
+  field :is_active, type: Boolean, default: true
+
+  default_scope ->{ order_by({ :name => :asc }) }
+
+  def self.list
+    out = self.order_by( :name => :asc )
+    # no_city = City.where( :cityname => 'no_city' ).first || City.create( :cityname => 'no_city', :name => 'No City' )
+    [['', nil]] + out.map { |item| [ item.name, item.id ] }
+  end
+
+  def self.list_citynames lang = 'en'
+    out = self.order_by( :name => :asc )
+    [['', nil]] + out.map { |item| [ item['name_'+lang], item.cityname ] }
+  end
+
+  def self.clear
+    if Rails.env.test?
+      City.all.each { |r| r.remove }
+    end
+  end
+
+  def self.n_features
+    4
+  end
+  def n_features
+    4
+  end
+
+
+  def j_reports args = {}
+    out =  []
+    self.reports.each do |r|
+      rr = r.clone
+      rr[:username] = r.user.username
+      rr.created_at = r.created_at # pretty_date( r.created_at )
+      rr[:tag_name] = r.tag.name unless r.tag.blank?
+      rr[:tag_name] ||= ''
+      out << rr
+    end
+    return out
+  end
+
+  def self.for_homepage
+    cities = City.all.order_by( :name => :asc )
+    cities = cities.delete_if do |c|
+      ( false == c.is_feature ) && ( 0 == c.galleries.length ) && ( 0 == c.reports.length )
+    end
+    return cities
+  end
+
+  def self.method_missing name, *args, &block
+    city = City.where( :cityname => name ).first
+    return city if city
+    super
+  end
+
+end
+
+
+

data/lib/trash/event.rb

@@ -0,0 +1,28 @@
+
+class Event
+  
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  
+  field :name, :type => String
+  validates :name, :presence => true, :uniqueness => true
+
+  field :eventname, :type => String
+  validates :eventname, :presence => true, :uniqueness => true
+
+  field :description, :type => String
+
+  field :date, :type => DateTime
+  validates :date, :presence => true
+  
+  belongs_to :city
+  validates :city, :presence => true
+
+  field :x, :type => Float
+  field :y, :type => Float
+
+  has_one :profile_photo, :class_name => 'Photo', :inverse_of => :profile_event
+  has_many :photos
+
+end
+

data/lib/trash/site.rb

@@ -0,0 +1,99 @@
+class Site
+
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  field :domain, :type => String
+  validates_presence_of :domain
+
+  field :lang, :type => String, :default => 'en'
+  # validates :lang, { :uniqueness => :true, :scope => :domain }
+
+  field :title
+  field :subhead
+  field :description
+  field :home_redirect_path
+
+  field :n_features,             :type => Integer, :default => 4
+  field :n_newsitems,            :type => Integer, :default => 20
+  field :newsitems_per_page,     :type => Integer, :default => 10 # this is used. _vp_ 20171025
+  field :play_videos_in_preview, :type => Boolean, :default => true
+
+  # denormalized
+  field :n_reports, :type => Integer
+  field :n_galleries, :type => Integer
+
+  field :is_video_enabled, :type => Boolean, :default => false
+  field :is_resume_enabled, :type => Boolean, :default => false
+  field :is_ads_enabled, :type => Boolean, :default => true
+  field :is_trash, :type => Boolean, :default => false
+  field :is_primary, :type => Boolean, :default => false
+  field :is_private, :type => Boolean, :default => false
+  field :private_user_emails, :type => Array, :default => []
+
+  field :homepage_layout, :type => String, :default => 'show'
+  field :layout, :type => String, :default => 'application'
+
+  has_many :reports
+  has_many :galleries
+  has_many :tags
+  has_many :videos
+  has_many :newsitems, :order => :created_at.desc
+  has_many :issues, :class_name => 'Ish::Issue'
+  has_many :features, :order => :created_at.desc
+
+  default_scope ->{ where({ :is_trash => false }).order_by({ :domain => :asc, :lang => :asc }) }
+
+  set_callback :create, :before do |doc|
+    if Site.where( :lang => doc.lang, :domain => doc.domain ).length > 0
+      false
+    end
+  end
+
+  set_callback :update, :before do |doc|
+    possible_duplicate = Site.where( :lang => doc.lang, :domain => doc.domain ).first
+    if possible_duplicate.blank?
+      true
+    elsif doc.id != possible_duplicate.id
+      false
+    end
+  end
+
+  LANGUAGES = [ 'en', 'ru', 'pt' ]
+
+  # manager uses it.
+  def self.list
+    out = self.all.order_by( :domain => :asc, :lang => :asc )
+    [['Select Site', nil]] + out.map { |item| [ "#{item.domain} #{item.lang}", item.id ] }
+  end
+
+  def self.mobi
+    Site.where( :domain => 'travel-guide.mobi', :lang => 'en' ).first
+  end
+
+  def n_reports
+    self.reports.unscoped.where( :is_trash => false ).length
+  end
+
+  def n_private_reports
+    self.reports.unscoped.where( :is_public => false, :is_trash => false ).length
+  end
+
+  def its_locales
+    Site.where( :domain => self.domain ).map { |s| s.lang.to_sym }
+  end
+
+  def self.Tgm
+    Site.find_by( :domain => 'travel-guide.mobi', :lang => :en )
+  end
+  def self.sedux
+    site   = Site.where( :domain => 'sedux.local' ).first
+    site ||= Site.where( :domain => 'sedux.net'   ).first
+    site
+  end
+
+  def name
+    "#{domain}/#{lang}"
+  end
+
+end

data/lib/trash/tag_trash.rb

@@ -0,0 +1,73 @@
+class TagTrash
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  include Ish::Utils
+
+  field :name, :type => String
+  validates :name, uniqueness: true, presence: true, allow_nil: false # @TODO: tags should only be unique globally, and per-user.
+
+  field :slug
+  validates :slug, uniqueness: true, presence: true, allow_nil: false
+
+  field :descr, :type => String, :default => ''
+
+  field :is_public,  :type => Boolean, :default => true
+  field :is_trash,   :type => Boolean, :default => false
+  field :is_feature, :type => Boolean, :default => false
+
+  field :weight, :type => Integer, :default => 10
+
+  has_many :children_tags, :class_name => 'Tag', :inverse_of => :parent_tag
+  belongs_to :parent_tag, :class_name => 'Tag', :inverse_of => :children_tags, :optional => true
+
+  has_many :features
+  has_many :newsitems
+
+  belongs_to :site, :optional => true
+  belongs_to :city, :optional => true
+
+  has_and_belongs_to_many :venues
+  has_and_belongs_to_many :cities
+  has_and_belongs_to_many :galleries
+  has_and_belongs_to_many :reports
+  has_and_belongs_to_many :videos
+  has_and_belongs_to_many :maps, class_name: 'Gameui::Map'
+
+  before_validation :set_slug
+
+  def self.clear
+    if Rails.env.test?
+      Tag.each { |r| r.remove }
+    end
+  end
+
+  def self.no_parent
+    Tag.where( :parent_tag_id => nil )
+  end
+
+  # the first blank used to be disabled, not anymore _vp_ 20180418
+  def self.list
+    out = Tag.unscoped.order_by( :name => :asc )
+    return( [['', nil]] + out.map { |item| [ item.name, item.id ] } )
+  end
+
+  # @deprecated, there will be no reports or galleries in tags. There will be only features and newsitems
+  def self.n_items
+    10
+  end
+  def self.n_reports
+    4
+  end
+  def self.n_galleries
+    4
+  end
+  def self.n_videos
+    4
+  end
+
+  def self.n_features
+    4
+  end
+  field :n_features, type: Integer, default: 4
+
+end

data/lib/trash/venue.rb

@@ -0,0 +1,77 @@
+class Venue
+  include ::Mongoid::Document
+  include ::Mongoid::Timestamps
+  include Ish::Utils
+
+  field :address
+
+  field :name, :type => String
+  validates :name, :uniqueness => true, :allow_nil => false
+
+  field :slug
+  validates :slug, :uniqueness => true, :allow_nil => false
+  before_validation :set_slug
+
+  field :subhead
+  field :descr
+
+  field :is_trash, :type => Boolean, :default => false
+  scope :fresh, ->{ where({ :is_trash => false }) }
+  scope :trash, ->{ where({ :is_trash => true }) }
+
+  field :is_public, :type => Boolean, :default => true
+  scope :public,     ->{ where({ :is_public => true }) }
+  scope :not_public, ->{ where({ :is_public => false }) }
+
+  field :is_feature, :type => Boolean, :default => false
+
+  field :x, :type => Float
+  field :y, :type => Float
+
+  field :lang, :type => String, :default => 'en'
+
+  belongs_to :city
+  # belongs_to :owner, :class_name => 'User', :inverse_of => :owned_venue
+  validates :city, :allow_nil => false, :presence => true
+
+  has_and_belongs_to_many :tags
+
+  has_and_belongs_to_many :users
+
+  has_one :profile_photo, :class_name => 'Photo', :inverse_of => :profile_venue
+
+  has_many :reports
+  has_many :galleries
+  has_many :photos
+  has_many :newsitems
+  has_many :features
+
+  PER_PAGE = 6
+
+  def self.list conditions = { :is_trash => false }
+    out = self.where( conditions).order_by( :name => :asc )
+    [['', nil]] + out.map { |item| [ item.name, item.id ] }
+  end
+
+
+
+  set_callback :save, :before do |doc|
+    if doc.city
+      city.touch
+    end
+  end
+
+  def self.types
+    return []
+#    if 'en' == @locale
+#      [ 'Hotels', 'Restaurants', 'Bars' ]
+#    else
+#      [ 'Hotels', 'Restaurants', 'Bars' ]
+#    end
+  end
+
+  def self.n_features
+    6
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.174
+  version: 0.0.33.176
 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
@@ -153,6 +154,12 @@ files:
 - lib/report.rb
 - lib/site.rb
 - lib/tag.rb
+- lib/trash/app_model2.rb
+- lib/trash/city.rb-bk
+- lib/trash/event.rb
+- lib/trash/site.rb
+- lib/trash/tag_trash.rb
+- lib/trash/venue.rb
 - lib/venue.rb
 - lib/video.rb
 homepage: https://wasya.co