ish_models 0.0.33.176 → 0.0.33.178

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a810365ee2634ffbe66e6d14a7f189fd852163998af2c3edde1a57d4b2d68f7d
-  data.tar.gz: 89845a5d0201ec225d6a2a0f645169603a66612f82b4fcb10ba9b5e7e6ebad9e
+  metadata.gz: 9f35bdecdb5099133ac2097a7935b946b4473cf6e72f482a486336343865eae6
+  data.tar.gz: 6a00985a6e441f6122af77a4e23e76345b38921fdd44b3ab95b33b44af9dd4e3
 SHA512:
-  metadata.gz: 0c4a699711808f394354761e45910afafa47efd8e8c6f2e378e680ed5a1edc4c9a6ff36714aa196a93dba4bae0070b0dc817753458d82b67423a11aa5d6aa42d
-  data.tar.gz: f5c50bcfffb3d7d2e130bb64c11b66b6f47297771bb0f68fb1a89df4e09c2b4dc1dd52f62fb9f0f70e37caab3f6bd6098ff4af829bfcb4e99172248a4532c270
+  metadata.gz: 6702e7c746e37c40e7e3044d507f070e9413fa58608aeac5918f61696d33edf5cb8f7985a00825218cde987202dc789fab720e162a79a269bef62fd521fbab0d
+  data.tar.gz: f18baee1bdc64f1701c9cf9bfa37b23294d5c74f6dc4a8451feaee1081cb67054b475d871370d69695cd8a73c74ba230f2c76c5c8cc2638ddca7545c38f627f2

data/lib/gallery.rb

@@ -8,7 +8,9 @@ class Gallery
   PER_PAGE = 6
 
   field :name
-  validates :name, :uniqueness => true # , :allow_nil => false
+  validates :name, :uniqueness => true
+  field :subhead
+  field :descr,   :as => :description
 
   field :is_public,  type: Boolean, default: false
   has_and_belongs_to_many :shared_profiles, :class_name => 'Ish::UserProfile', :inverse_of => :shared_galleries
@@ -27,10 +29,9 @@ class Gallery
 
   field :x,       :type => Float
   field :y,       :type => Float
-  field :subhead
-  field :descr,   :as => :description
+  field :z,       :type => Float
+
   field :lang,    :default => 'en'
-  field :issue
   field :username
 
   field :slug
@@ -43,59 +44,31 @@ class Gallery
     [['', nil]] + out.map { |item| [ "#{item.created_at.strftime('%Y%m%d')} #{item.name}", item.id ] }
   end
 
-  belongs_to :site,         :optional => true
   belongs_to :user_profile, :optional => true, :class_name => 'Ish::UserProfile', :inverse_of => :galleries
 
-  has_and_belongs_to_many :tags
-
   has_many :newsitems # seems correct. _vp_ 2022-03-21
   has_many :photos
 
-  belongs_to :city,  :optional => true
-  belongs_to :venue, :optional => true
-
-
   set_callback(:create, :before) do |doc|
-    if doc.user_profile && doc.user_profile.name
-      doc.username = doc.user_profile.name
-    end
 
     #
     # newsitems
     #
     if doc.is_public
-      # for the sites
-      if doc.site
-        sites = Site.where( :domain => doc.site.domain )
-        sites.each do |site|
-          n = Newsitem.new {}
-          n.gallery = doc
-          n.username = doc.username
-          site.newsitems << n
-          flag = site.save
-          if !flag
-            puts! site.errors
-          end
-        end
-      end
-      # for the city
-      if doc.city
-        n = Newsitem.new {}
-        n.gallery = doc
-        n.city = doc.city
-        n.username = doc.username
-        n.save
-      end
-    end
 
-    #
-    # cache
-    #
-    if doc.site
-      doc.site.touch
-    end
-    if doc.city
-      doc.city.touch
+      # if doc.site
+      #   sites = Site.where( :domain => doc.site.domain )
+      #   sites.each do |site|
+      #     n = Newsitem.new {}
+      #     n.gallery = doc
+      #     n.username = doc.username
+      #     site.newsitems << n
+      #     flag = site.save
+      #     if !flag
+      #       puts! site.errors
+      #     end
+      #   end
+      # end
     end
 
   end
@@ -109,13 +82,8 @@ class Gallery
   RENDER_TITLES = 'index_titles' # view name
   RENDER_THUMBS = 'index_thumbs' # view name
 
-
-  set_callback :update, :after do |doc|
-    Site.update_all updated_at: Time.now
-  end
-
   def export_fields
-    %w| name descr |
+    %w| name subhead descr |
   end
 
 end

data/lib/gameui/map.rb

@@ -32,7 +32,6 @@ class ::Gameui::Map
   belongs_to :creator_profile, class_name: '::Ish::UserProfile', inverse_of: :my_maps
 
   has_and_belongs_to_many :bookmarked_profiles, class_name: '::Ish::UserProfile', inverse_of: :bookmarked_location
-  has_and_belongs_to_many :tags, class_name: 'Tag', inverse_of: :map
 
   # shareable, nonpublic
   field :is_public, type: Boolean, default: true

data/lib/ish/{unsubscribe.rb → email_unsubscribe.rb}

@@ -1,5 +1,5 @@
 
-class Ish::Unsubscribe
+class Ish::EmailUnsubscribe
   include Mongoid::Document
   include Mongoid::Timestamps
 

data/lib/ish/lead.rb

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

data/lib/ish/lead.rb-bk

@@ -0,0 +1,38 @@
+
+#
+# Lead
+# _vp_ 20171204
+#
+class Ish::Lead
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  store_in :collection => 'ish_leads'
+
+  # field :email
+  # field :company_url
+  # field :yelp_url
+
+  # # company name
+  # field :company
+  # validates_uniqueness_of :company
+  # index({ :company => -1 })
+
+  # field :description # comment, actually
+
+  field :is_done,  :type => Boolean, :default => false
+  field :is_trash, :type => Boolean, :default => false
+
+  field :tag, :type => String # 'hired_com_ror', not enumerated for now _vp_ 20180103
+  # field :location
+
+  field :raw_phone, :type => String
+  def phone= which
+    write_attribute :raw_phone, which
+    write_attribute :phone, which.gsub(/\D/, '').to_i
+  end
+  field :phone, :type => Integer
+
+end
+
+

data/lib/ish/lorem_ipsum.rb

@@ -0,0 +1,30 @@
+
+class Ish::LoremIpsum
+
+  ARR = [
+    "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas a diam pretium, pellentesque lorem consequat, tempus lorem. Morbi et augue mattis, mollis enim et, lobortis ipsum. Aenean ultrices efficitur convallis. Aliquam vel tellus eu orci lobortis rhoncus. Proin varius tellus id pellentesque imperdiet. Donec accumsan diam ut tortor hendrerit pharetra. Duis rhoncus sapien leo, nec tempor massa luctus nec. In venenatis, augue ac pharetra malesuada, erat elit aliquam nisi, ac rutrum nunc purus in odio. Nam mattis vehicula finibus. Vivamus porta, massa nec posuere pulvinar, lacus nisl varius tortor, non fermentum ligula sem at odio. Cras viverra ligula quis elementum gravida. Integer interdum, orci quis varius viverra, neque eros tincidunt ex, quis fringilla quam erat in ex.",
+    "Pellentesque consectetur faucibus porta. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque ut orci ut justo rutrum mattis non non turpis. Quisque velit neque, porttitor at lacus quis, ultricies aliquam orci. Morbi finibus neque dolor, vitae convallis leo aliquam in. Nullam posuere urna quis velit mattis, vitae posuere mi elementum. Cras vitae fermentum nisi, sed pretium diam. Donec vestibulum, leo et vehicula pharetra, massa ante vestibulum risus, malesuada pretium metus ipsum eget quam. Nunc feugiat enim elit. Mauris dictum arcu ac nisl placerat, eu cursus tellus malesuada.",
+    "Nullam ultrices neque ut ipsum venenatis, et luctus justo aliquet. Nam laoreet magna eget accumsan ultrices. Quisque ut congue velit. Vivamus tincidunt bibendum tincidunt. Cras at purus eget odio consequat porta. Nullam ultricies dolor non dignissim commodo. Nullam cursus est eu mauris pharetra, sed euismod risus bibendum. Nullam quis luctus ante.",
+    "Suspendisse cursus quis tellus a dictum. Proin tempus metus nec ultrices egestas. Phasellus imperdiet in ante et bibendum. In aliquam nec sapien vel rutrum. Nunc libero velit, bibendum ac dolor non, interdum fringilla nulla. Aliquam nec lectus nibh. Curabitur non scelerisque tellus, eu viverra ligula. Maecenas euismod sem turpis, ac efficitur velit placerat eget.",
+    "Donec faucibus urna a mauris vulputate, quis dignissim turpis venenatis. Phasellus sodales dignissim molestie. Donec ultrices tempor aliquam. Pellentesque sed mi volutpat, euismod erat quis, ultricies enim. Curabitur in nibh eget ipsum fringilla laoreet. Vivamus tincidunt rutrum ullamcorper. Nulla suscipit, libero sit amet blandit venenatis, lorem diam viverra elit, sed egestas elit eros at libero.",
+    "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas a diam pretium, pellentesque lorem consequat, tempus lorem. Morbi et augue mattis, mollis enim et, lobortis ipsum. Aenean ultrices efficitur convallis. Aliquam vel tellus eu orci lobortis rhoncus. Proin varius tellus id pellentesque imperdiet. Donec accumsan diam ut tortor hendrerit pharetra. Duis rhoncus sapien leo, nec tempor massa luctus nec. In venenatis, augue ac pharetra malesuada, erat elit aliquam nisi, ac rutrum nunc purus in odio. Nam mattis vehicula finibus. Vivamus porta, massa nec posuere pulvinar, lacus nisl varius tortor, non fermentum ligula sem at odio. Cras viverra ligula quis elementum gravida. Integer interdum, orci quis varius viverra, neque eros tincidunt ex, quis fringilla quam erat in ex.",
+    "Pellentesque consectetur faucibus porta. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque ut orci ut justo rutrum mattis non non turpis. Quisque velit neque, porttitor at lacus quis, ultricies aliquam orci. Morbi finibus neque dolor, vitae convallis leo aliquam in. Nullam posuere urna quis velit mattis, vitae posuere mi elementum. Cras vitae fermentum nisi, sed pretium diam. Donec vestibulum, leo et vehicula pharetra, massa ante vestibulum risus, malesuada pretium metus ipsum eget quam. Nunc feugiat enim elit. Mauris dictum arcu ac nisl placerat, eu cursus tellus malesuada.",
+    "Nullam ultrices neque ut ipsum venenatis, et luctus justo aliquet. Nam laoreet magna eget accumsan ultrices. Quisque ut congue velit. Vivamus tincidunt bibendum tincidunt. Cras at purus eget odio consequat porta. Nullam ultricies dolor non dignissim commodo. Nullam cursus est eu mauris pharetra, sed euismod risus bibendum. Nullam quis luctus ante.",
+    "Suspendisse cursus quis tellus a dictum. Proin tempus metus nec ultrices egestas. Phasellus imperdiet in ante et bibendum. In aliquam nec sapien vel rutrum. Nunc libero velit, bibendum ac dolor non, interdum fringilla nulla. Aliquam nec lectus nibh. Curabitur non scelerisque tellus, eu viverra ligula. Maecenas euismod sem turpis, ac efficitur velit placerat eget.",
+    "Donec faucibus urna a mauris vulputate, quis dignissim turpis venenatis. Phasellus sodales dignissim molestie. Donec ultrices tempor aliquam. Pellentesque sed mi volutpat, euismod erat quis, ultricies enim. Curabitur in nibh eget ipsum fringilla laoreet. Vivamus tincidunt rutrum ullamcorper. Nulla suscipit, libero sit amet blandit venenatis, lorem diam viverra elit, sed egestas elit eros at libero.",
+  ]
+
+
+  def self.txt n=3
+    ARR[0...3].join("\n\n")
+  end
+
+  private
+
+  def self.html n=3
+    "<p>#{ARR[0...n].join("</p><p>")}</p>"
+  end
+
+
+end
+

data/lib/ish/user_profile.rb

@@ -40,8 +40,8 @@ class Ish::UserProfile
 
   has_one :profile_photo, :class_name => 'Photo', :inverse_of => :profile_city
 
-  belongs_to :user
-  validates_presence_of :user
+  # belongs_to :user
+  # validates_presence_of :user
 
   belongs_to :current_city, :class_name => 'City', :inverse_of => :current_users, :optional => true
   belongs_to :guide_city,   :class_name => 'City', :inverse_of => :guide,         :optional => true
@@ -82,9 +82,8 @@ 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?( email )
+    %w( piousbox@gmail.com victor@wasya.co ).include?( self.email )
   end
 
   ## manager uses it.
@@ -126,7 +125,6 @@ class Ish::UserProfile
     profile = Ish::UserProfile.new({
       email: email,
       role_name: role_name,
-      user: user,
     })
     profile.save
 

data/lib/ish_models.rb

@@ -45,31 +45,23 @@ require 'ish/campaign'
 require 'ish/crawler'
 require 'ish/email_context'
 require 'ish/email_template'
+require 'ish/email_unsubscribe'
 require 'ish/gallery_name'
 require 'ish/image_asset'
 require 'ish/input_error'
 require 'ish/invoice'
 require 'ish/issue'
 require 'ish/lead'
+require 'ish/lorem_ipsum'
 require 'ish/meeting'
 require 'ish/payment'
 require 'ish/premium_item'
-require 'ish/unsubscribe'
 require 'ish/user_profile'
 
-
-require 'city'
-require 'cities_user'
-require 'country'
-require 'event'
-require 'feature'
 require 'gallery'
 require 'newsitem'
 require 'photo'
 require 'report'
-require 'site'
-require 'tag'
-require 'venue'
 require 'video'
 
 

data/lib/photo.rb

@@ -7,20 +7,13 @@ class Photo
   include Mongoid::Paperclip
   include Ish::Utils
 
-  has_and_belongs_to_many :viewers, :class_name => 'User', :inverse_of => :viewable_photos
-
   belongs_to :user_profile,  :class_name => 'Ish::UserProfile',               :optional => true
   def user
     user_profile
   end
-  belongs_to :profile_city,  :class_name => 'City',                    :inverse_of => :profile_photo, :optional => true
   belongs_to :user_profile,  :class_name => 'Ish::UserProfile',  :inverse_of => :profile_photo, :optional => true
-  belongs_to :profile_venue, :class_name => 'Venue',                   :inverse_of => :profile_photo, :optional => true
-  belongs_to :profile_event, :class_name => 'Event',                   :inverse_of => :profile_photo, :optional => true
 
   belongs_to :report,   :optional => true
-  belongs_to :venue,    :optional => true
-  belongs_to :event,    :optional => true
   belongs_to :feature,  :optional => true
   belongs_to :gallery,  :optional => true
   belongs_to :newsitem, :optional => true

data/lib/report.rb

@@ -52,13 +52,6 @@ class Report
   field :issue
   field :subhead
 
-  belongs_to :city,        :optional => true
-  belongs_to :site,        :optional => true
-  belongs_to :cities_user, :optional => true
-
-  has_and_belongs_to_many :tags
-  has_and_belongs_to_many :venues
-
   has_one :photo
 
   field :n_upvotes, :default => 0
@@ -80,62 +73,43 @@ class Report
     self::PER_PAGE
   end
 
-  def venue
-    return self.venues[0] || nil
-  end
-
   def self.all
     self.where( :is_public => true, :is_trash => false ).order_by( :created_at => :desc )
   end
 
-  def self.not_tagged
-    Report.where( :tag_ids => nil, :city => nil )
-  end
-
-  def self.for_homepage args
-    begin
-      tag_ids = args[:main_tag].children_tags.map { |tag| tag._id } + [ args[:main_tag]._id ]
-      return Report.where( :tag_ids.in => tag_ids ).page args[:page]
-    rescue
-      return Report.page args[:page]
-    end
-  end
-
-
-
   set_callback :update, :after do |doc|
     Site.update_all updated_at: Time.now
   end
 
-  set_callback :create, :after do |doc|
-    if doc.is_public
-
-      if !doc.venue_ids.blank?
-        ( doc.venue_ids || [] ).each do |venue_id|
-          v = Venue.find venue_id
-          u = ::IshModels::User.find doc.user_id
-          n = Newsitem.new
-          n.username = u.username unless u.blank?
-          n.report = doc
-          v.newsitems << n
-          v.save
-        end
-      end
-
-      unless doc.city.blank?
-        city = City.find doc.city.id
-        if defined?( doc.profile ) && doc.profile
-          username = doc.profile.username || 'anon'
-        else
-          username = '<username>'
-        end
-        n = Newsitem.new :report => doc, :username => username
-        city.newsitems << n
-        city.save
-        city.touch
-      end
-    end
-  end
+  # set_callback :create, :after do |doc|
+  #   if doc.is_public
+
+  #     if !doc.venue_ids.blank?
+  #       ( doc.venue_ids || [] ).each do |venue_id|
+  #         v = Venue.find venue_id
+  #         u = ::IshModels::User.find doc.user_id
+  #         n = Newsitem.new
+  #         n.username = u.username unless u.blank?
+  #         n.report = doc
+  #         v.newsitems << n
+  #         v.save
+  #       end
+  #     end
+
+  #     unless doc.city.blank?
+  #       city = City.find doc.city.id
+  #       if defined?( doc.profile ) && doc.profile
+  #         username = doc.profile.username || 'anon'
+  #       else
+  #         username = '<username>'
+  #       end
+  #       n = Newsitem.new :report => doc, :username => username
+  #       city.newsitems << n
+  #       city.save
+  #       city.touch
+  #     end
+  #   end
+  # end
 
   def self.clear
     if Rails.env.test?
@@ -143,10 +117,6 @@ class Report
     end
   end
 
-  def venue
-    self.venues[0] || nil
-  end
-
   ## copy-paste
   field :premium_tier, type: Integer, default: 0 # how many stars need to spend, to get access? 0 = free
   def is_premium

data/lib/video.rb

@@ -34,17 +34,11 @@ class Video
   field :lang, :type => String, :default => 'en'
 
   field :youtube_id, :type => String
-  # validates :youtube_id, :uniqueness => true, :presence => true
+  validates :youtube_id, :uniqueness => true
 
-  has_and_belongs_to_many :tags
-  belongs_to :city, :optional => true
-  belongs_to :site, :optional => true
-  # has_many :newsitems # unnecessary, right? _vp_ 20200412
 
   belongs_to :user_profile, :optional => true, :class_name => 'Ish::UserProfile', :inverse_of => :videos
 
-  accepts_nested_attributes_for :site, :tags, :city
-
   def self.list
     [['', nil]] + Video.unscoped.order_by( :created_at => :desc ).map { |item| [ "#{item.created_at.strftime('%Y%m%d')} #{item.name}", item.id ] }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.176
+  version: 0.0.33.178
 platform: ruby
 authors:
 - piousbox
@@ -115,10 +115,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/address.rb
-- lib/cities_user.rb
-- lib/city.rb
-- lib/country.rb
-- lib/event.rb
 - lib/feature.rb
 - lib/gallery.rb
 - lib/gameui/asset3d.rb
@@ -126,24 +122,25 @@ files:
 - lib/gameui/map_bookmark.rb
 - lib/gameui/marker.rb
 - lib/gameui/premium_purchase.rb
-- lib/ish/app_model2.rb
 - lib/ish/cache_key.rb
 - lib/ish/campaign.rb
 - lib/ish/configuration.rb
 - lib/ish/crawler.rb
 - lib/ish/email_context.rb
 - lib/ish/email_template.rb
+- lib/ish/email_unsubscribe.rb
 - lib/ish/gallery_name.rb
 - lib/ish/image_asset.rb
 - lib/ish/input_error.rb
 - lib/ish/invoice.rb
 - lib/ish/issue.rb
 - lib/ish/lead.rb
+- lib/ish/lead.rb-bk
+- lib/ish/lorem_ipsum.rb
 - lib/ish/meeting.rb
 - lib/ish/payment.rb
 - lib/ish/premium_item.rb
 - lib/ish/railtie.rb
-- lib/ish/unsubscribe.rb
 - lib/ish/user_profile.rb
 - lib/ish/utils.rb
 - lib/ish_models.rb
@@ -152,15 +149,12 @@ files:
 - lib/newsitem.rb
 - lib/photo.rb
 - 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
 licenses:

data/lib/cities_user.rb

@@ -1,17 +0,0 @@
-
-class CitiesUser
-  
-  include Mongoid::Document
-  include Mongoid::Timestamps
-  
-  field :date, :type => Time
-  field :name, :type => String
-  field :descr, :type => String
-
-  belongs_to :city
-  belongs_to :user
-  
-  has_many :reports
-  has_many :galleries
-  
-end

data/lib/city.rb

@@ -1,100 +0,0 @@
-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/country.rb

@@ -1,13 +0,0 @@
-
-
-class Country
-  
-  include Mongoid::Document
-  include Mongoid::Timestamps
-  
-  field :name, :type => String
-  field :countryname, :type => String
-  
-  has_many :cities
-  
-end

data/lib/event.rb

@@ -1,28 +0,0 @@
-
-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/ish/app_model2.rb

@@ -1,21 +0,0 @@
-
-# @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/site.rb

@@ -1,99 +0,0 @@
-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/tag.rb

@@ -1,73 +0,0 @@
-class Tag
-  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/venue.rb

@@ -1,77 +0,0 @@
-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