ish_models 0.0.33.134 → 0.0.33.138

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d922df26e696ac770c512266ee8b46206cb27068acba43df008250e3d1f3a62
-  data.tar.gz: 3fbc130546d38392d78fef959448eea0642a70cb76cdd9194f3924867877d204
+  metadata.gz: fae967dffb3be2dfc17016af14b8b86e7f3c15e71c042ef6616c03fa7fc1a823
+  data.tar.gz: d4f56b950da547e32832d92c5366bdb352ce88930359253077d7cde3bcc8bd4d
 SHA512:
-  metadata.gz: 98cebce56b2f8a979808d1e1e2bff952601fb7322bcbde228d8ec643656da4b665849782a4a1a5e30eabc36c747b70b57d9d950b1cd544d63444bf93ca5d79e9
-  data.tar.gz: 73c95a9da8539641a6f5f9d14a2d0c27721f713cad23223727927aa5eb2e422b464007a277810262b20fd6a052882ecd4f79fe1faaf24c83093a7152af198ad2
+  metadata.gz: 5c93000c2c58774c2c29e1eef2e7d835778ffe13c9d75e5c1bf1536db481500e315e1975a8c73449da96f933751ff8e3b5d8ae35d07d74f4626084eec745a527
+  data.tar.gz: 15f58894be9232aa874a06b1f62eecb53a8d0edb1da34360f63f98d9e100e0a2fefec36092d3b15de32142ce06ddd13d2f2500193ebed8d2595af5446b413790

data/lib/city.rb

@@ -36,7 +36,7 @@ class City
   has_one :profile_photo, :class_name => 'Photo', :inverse_of => :profile_city
   has_one :guide, :class_name => '::IshModels::UserProfile', :inverse_of => :guide_city
 
-  embeds_many :features
+  has_many :features
 
   field :calendar_frame, :type => String
   field :is_active, type: Boolean, default: true

data/lib/feature.rb

@@ -1,31 +1,25 @@
 
-class Feature  
-
+class Feature
   include Mongoid::Document
   include Mongoid::Timestamps
 
-  field :name,    :type => String
-  field :subhead, :type => String
+  field :name
+  field :subhead
 
-  field :image_path,   :type => String
-  field :link_path,    :type => String
-  field :partial_name, :type => String
-  field :inner_html,   :type => String
-  field :weight,       :type => Integer, :default => 10
-  
-  belongs_to :photo, :optional => true
-  belongs_to :report, :optional => true
-  belongs_to :gallery, :optional => true
-  belongs_to :video, :optional => true
-  # has_one :photo
-  # has_one :report
-  # has_one :gallery
-  # has_one :video
+  field :image_path
+  field :link_path
+  field :partial_name
+  field :inner_html
+  field :weight, type: Integer, default: 10
 
-  embedded_in :venue
-  embedded_in :site
-  embedded_in :city
-  embedded_in :tag
+  belongs_to :city, optional: true
+  belongs_to :gallery, optional: true
+  belongs_to :photo, optional: true
+  belongs_to :report, optional: true
+  belongs_to :site, optional: true
+  belongs_to :tag, optional: true
+  belongs_to :video, optional: true
+  belongs_to :venue, optional: true
 
   def self.all
     self.order_by( :created_at => :desc )
@@ -34,5 +28,5 @@ class Feature
   def self.n_features
     4
   end
-  
+
 end

data/lib/gallery.rb

@@ -3,9 +3,13 @@ require 'kaminari/mongoid'
 class Gallery
   include ::Mongoid::Document
   include ::Mongoid::Timestamps
+  include Ish::Utils
 
   PER_PAGE = 6
 
+  field :name
+  validates :name, :uniqueness => true # , :allow_nil => false
+
   field :is_public,  type: Boolean, default: false
   field :is_trash,   type: Boolean, default: false
   field :is_done,    type: Boolean, default: false
@@ -19,51 +23,47 @@ class Gallery
 
   default_scope ->{ where({ :is_public => true, :is_trash => false }).order_by({ :created_at => :desc }) }
 
-  field :x, :type => Float
-  field :y, :type => Float
+  field :x,       :type => Float
+  field :y,       :type => Float
+  field :subhead
+  field :descr,   :as => :description
+  field :lang,    :default => 'en'
+  field :issue
+  field :username
+
+  ## @TODO: this is still not autogenerated
+  field :slug
+  index({ :slug => -1 }, { :unique => true })
+  validates :slug, presence: true, uniqueness: true
+  before_validation :set_slug, :on => :create
+
+  ## @TODO: I should have a redirect service, instead of this specific thing. But only after making $50.
+  # embeds_many :gallery_names, :class_name => '::Ish::GalleryName'
+
 
   def self.list conditions = { :is_trash => false }
     out = self.unscoped.where( conditions ).order_by( :created_at => :desc )
     [['', nil]] + out.map { |item| [ "#{item.created_at.strftime('%Y%m%d')} #{item.name}", item.id ] }
   end
 
-  belongs_to :site, :optional => true
-  # validates :site, :presence => true
-
+  belongs_to :site,         :optional => true
   belongs_to :user_profile, :optional => true, :class_name => 'IshModels::UserProfile', :inverse_of => :galleries
-  field :username, :type => String
-  has_and_belongs_to_many :shared_profiles, :class_name => 'IshModels::UserProfile', :inverse_of => :shared_galleries
-
-  field :name
-  validates :name, :uniqueness => true # , :allow_nil => false
 
-  field :galleryname
-  index({ :galleryname => -1 }, { :unique => true })
-  def slug
-    galleryname
-  end
-  embeds_many :gallery_names, :class_name => '::Ish::GalleryName'
-  def self.find_by_slug slug
-    ::Gallery.where( galleryname: slug ).first
-  end
-
-  field :subhead, :type => String
-  field :descr,   :type => String, :as => :description
-  field :lang,    :type => String, :default => 'en'
+  has_and_belongs_to_many :shared_profiles, :class_name => 'IshModels::UserProfile', :inverse_of => :shared_galleries
+  has_and_belongs_to_many :tags
 
+  has_many :newsitems
   has_many :photos
 
-  has_and_belongs_to_many :tags
   belongs_to :city,  :optional => true
   belongs_to :venue, :optional => true
+  belongs_to :newsparent, polymorphic: true, optional: true
 
-  has_many :newsitems
 
   set_callback(:create, :before) do |doc|
     if doc.user_profile && doc.user_profile.name
       doc.username = doc.user_profile.name
     end
-    doc.galleryname ||= doc.id.to_s
 
     #
     # newsitems
@@ -107,16 +107,13 @@ class Gallery
 
   # @deprecated, use Gallery::ACTIONS
   def self.actions
-    [ 'show_mini', 'show_long', 'show' ]
+    ACTIONS
   end
   ACTIONS = [ 'show_mini', 'show_long', 'show' ]
 
-  field :issue
-
   RENDER_TITLES = 'index_titles' # view name
   RENDER_THUMBS = 'index_thumbs' # view name
 
-  belongs_to :newsparent, polymorphic: true, optional: true
 
   set_callback :update, :after do |doc|
     Site.update_all updated_at: Time.now

data/lib/gameui/map.rb

@@ -4,7 +4,7 @@ class ::Gameui::Map
   include Mongoid::Timestamps
 
   has_many :markers, :class_name => '::Gameui::Marker', inverse_of: :map
-  has_many :newsitems, inverse_of: :map
+  has_many :newsitems, inverse_of: :map, order: :created_at.desc
 
   field :slug
   validates :slug, uniqueness: true, presence: true
@@ -24,6 +24,12 @@ class ::Gameui::Map
   field :name
   field :description
 
+  ## Possible keys: description, map, markers, newsitems,
+  field :labels, type: Object, default: {}
+  ## Possible keys:
+  ## config.description.collapsible
+  field :config, type: Object, default: {}
+
   # @deprecated, dont use!
   field :img_path
 

data/lib/gameui/marker.rb

@@ -6,7 +6,8 @@ class ::Gameui::Marker
   belongs_to :map, :class_name => '::Gameui::Map'
 
   field :slug
-  validates :slug, uniqueness: true, presence: true
+  validates_uniqueness_of :slug, scope: :map_id
+  validates_presence_of :slug
 
   field :description
 

data/lib/ish/utils.rb

@@ -0,0 +1,25 @@
+
+module Ish::Utils
+
+  private
+
+  def set_slug
+    return if slug
+    new_slug = name.downcase.gsub(/[^a-z0-9\s]/i, '').gsub(' ', '-')
+    if self.class.where( slug: new_slug ).first
+      loop do
+        if new_slug[new_slug.length-1].to_i != 0
+          # inrement last digit
+          last_digit = new_slug[new_slug.length-1].to_i
+          new_slug = "#{new_slug[0...new_slug.length-1]}#{last_digit+1}"
+        else
+          # add '-1' to the end
+          new_slug = "#{new_slug}-1"
+        end
+        break if !self.class.where( slug: new_slug ).first
+      end
+    end
+    self.slug = new_slug
+  end
+
+end

data/lib/ish_models/user_profile.rb

@@ -16,11 +16,13 @@ class IshModels::UserProfile
   field :fb_long_access_token
   field :fb_expires_in
 
-  field :lang, :type => String, :default => :en
+  field :lang, default: 'en'
 
   ROLES = [ :admin, :manager, :guy ]
   field :role_name, :type => Symbol
 
+  has_one :profile_photo, :class_name => 'Photo', :inverse_of => :profile_city
+
   belongs_to :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
@@ -90,16 +92,3 @@ class IshModels::UserProfile
 end
 
 Profile = IshModels::UserProfile
-
-=begin
-  field :about, :type => String
-  field :education, :type => String
-  field :objectives, :type => String
-  field :current_employment, :type => String
-  field :past_employment, :type => String
-  field :pdf_resume_path, :type => String
-  field :doc_resume_path, :type => String
-
-  TAGS = [ :social, :professional ]
-  field :tag, :type => Symbol
-=end

data/lib/ish_models.rb

@@ -34,23 +34,24 @@ require 'gameui/map_bookmark.rb'
 require 'gameui/marker.rb'
 require 'gameui/premium_purchase.rb'
 
+# require 'ish/alphavantage_stockwatcher.rb'
 require 'ish/ameritrade'
+require 'ish/campaign.rb'
 require 'ish/covered_call'
 require 'ish/crawler.rb'
 require 'ish/gallery_name.rb'
 require 'ish/image_asset.rb'
 require 'ish/input_error.rb'
+require 'ish/invoice.rb'
 require 'ish/iron_condor.rb'
 require 'ish/iron_condor_watcher.rb'
+require 'ish/issue.rb'
+require 'ish/lead.rb'
 require 'ish/payment.rb'
 require 'ish/stock_action.rb'
 require 'ish/stock_option.rb'
 require 'ish/stock_watch.rb'
-# require 'ish/alphavantage_stockwatcher.rb'
-require 'ish/invoice.rb'
-require 'ish/lead.rb'
-require 'ish/campaign.rb'
-require 'ish/issue.rb'
+require 'ish/utils.rb'
 require 'ish/yahoo_stockwatcher.rb'
 
 # obsolete, use `ish` namespace now

data/lib/newsitem.rb

@@ -20,6 +20,10 @@ class Newsitem
 
   field :name
   field :descr
+  def description
+    descr
+  end
+
   field :image_path
   field :link_path
   field :username

data/lib/photo.rb

@@ -5,17 +5,16 @@ class Photo
   include Mongoid::Timestamps
   include Mongoid::Paperclip
 
-  # belongs_to :user,     :inverse_of => :photos
-  # validates  :user,     :presence => true
-  # field      :username, :type => String
-
   has_and_belongs_to_many :viewers, :class_name => 'User', :inverse_of => :viewable_photos
 
   belongs_to :user_profile,  :class_name => 'IshModels::UserProfile',               :optional => true
-  def user; user_profile; end
-  belongs_to :profile_city,  :class_name => 'City',  :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
+  def user
+    user_profile
+  end
+  belongs_to :profile_city,  :class_name => 'City',                    :inverse_of => :profile_photo, :optional => true
+  belongs_to :user_profile,  :class_name => 'IshModels::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

data/lib/report.rb

@@ -1,20 +1,25 @@
 class Report
   include ::Mongoid::Document
   include ::Mongoid::Timestamps
+  include Ish::Utils
 
   field :name, :type => String
   validates :name, :presence => true
   # index({ :name => 1 }, { :unique => true })
   index({ :name => 1, :is_trash => 1 })
 
-  field :name_seo, :type => String
-  validates :name_seo, :uniqueness => true, :presence => true
-  index({ :name_seo => 1 }, { :unique => true })
+  field :slug
+  validates :slug, :uniqueness => true, :presence => true
+  index({ :slug => 1 }, { :unique => true })
+  before_validation :set_slug, :on => :create
 
-  field :descr, :type => String 
+  ## Can be one of: default (nil), longscroll
+  field :item_type, type: String
+
+  field :descr, :type => String
 
   field :is_trash, :type => Boolean, :default => false
-  index :is_trash => 1, :is_public => 1 
+  index :is_trash => 1, :is_public => 1
 
   field :is_public, :type => Boolean, :default => true
   index({ :is_public => 1 })
@@ -27,13 +32,13 @@ class Report
 
   field :is_done, :type => Boolean, :default => true
   index({ :is_done => 1 })
-  
+
   field :x, :type => Float
   field :y, :type => Float
 
   field :lang, :type => String, :default => 'en'
   index({ :lang => 1 })
-   
+
   belongs_to :user_profile, :optional => true, :class_name => 'IshModels::UserProfile'
 
   # validates :user, :presence => true, :allow_nil => false
@@ -43,14 +48,14 @@ 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
@@ -59,15 +64,15 @@ class Report
   default_scope ->{
     where({ is_public: true, is_trash: false }).order_by({ created_at: :desc })
   }
-  
+
   has_many :newsitems
 
   def self.list conditions = { :is_trash => false }
     out = self.where( conditions ).order_by( :name => :asc ).limit( 100 )
     [['', nil]] + out.map { |item| [ item.name, item.id ] }
   end
-  
-  PER_PAGE = 20  
+
+  PER_PAGE = 20
   def self.paginates_per
     self::PER_PAGE
   end
@@ -75,33 +80,30 @@ class Report
   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]  
+      return Report.page args[:page]
     end
   end
 
-  before_validation :set_name_seo, :on => :create
-  def set_name_seo
-    self.name_seo ||= self.name.gsub(' ', '-').gsub('.', '')
-  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
 
@@ -115,7 +117,7 @@ class Report
           v.newsitems << n
           v.save
         end
-      end 
+      end
 
       unless doc.city.blank?
         city = City.find doc.city.id
@@ -131,7 +133,7 @@ class Report
       end
     end
   end
-  
+
   def self.clear
     if Rails.env.test?
       self.unscoped.each { |r| r.remove }
@@ -149,5 +151,5 @@ class Report
   end
   def premium?; is_premium; end
   has_many :premium_purchases, class_name: '::Gameui::PremiumPurchase', as: :item
-  
+
 end

data/lib/site.rb

@@ -30,7 +30,7 @@ class Site
   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'
 
@@ -40,9 +40,8 @@ class Site
   has_many :videos
   has_many :newsitems, :order => :created_at.desc
   has_many :issues, :class_name => 'Ish::Issue'
+  has_many :features, :order => :created_at.desc
 
-  embeds_many :features, :order => :created_at.desc
-  
   default_scope ->{ where({ :is_trash => false }).order_by({ :domain => :asc, :lang => :asc }) }
 
   set_callback :create, :before do |doc|
@@ -61,7 +60,7 @@ class Site
   end
 
   LANGUAGES = [ 'en', 'ru', 'pt' ]
-  
+
   # manager uses it.
   def self.list
     out = self.all.order_by( :domain => :asc, :lang => :asc )
@@ -79,7 +78,7 @@ class Site
   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

data/lib/tag.rb

@@ -1,12 +1,13 @@
 class Tag
   include Mongoid::Document
   include Mongoid::Timestamps
+  include Ish::Utils
 
   field :name, :type => String
   # validates :name, :uniqueness => true, :allow_nil => false
 
-  field :name_seo, :as => :tagname
-  validates :name_seo, :uniqueness => true, :allow_nil => false
+  field :slug
+  validates :slug, :uniqueness => true, presence: true, allow_nil: false
 
   field :descr, :type => String, :default => ''
 
@@ -19,8 +20,7 @@ class Tag
   has_many :children_tags, :class_name => 'Tag', :inverse_of => :parent_tag
   belongs_to :parent_tag, :class_name => 'Tag', :inverse_of => :children_tags, :optional => true
 
-  embeds_many :features
-  # embeds_many :newsitems
+  has_many :features
   has_many :newsitems
 
   belongs_to :site, :optional => true
@@ -36,11 +36,7 @@ class Tag
     where({ :is_public => true, :is_trash => false }).order_by({ :name => :asc })
   }
 
-  before_create do |d|
-    if d.name_seo.blank?
-      d.name_seo = d.name.gsub(' ', '-')
-    end
-  end
+  before_validation :set_slug
 
   def self.clear
     if Rails.env.test?
@@ -72,9 +68,9 @@ class Tag
     4
   end
 
-  # @deprecated I don't even know why I have this. Should be simplified into non-being.
   def self.n_features
     4
   end
+  field :n_features, type: Integer, default: 4
 
 end

data/lib/venue.rb

@@ -1,16 +1,20 @@
 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 :name_seo, :type => String
-  validates :name_seo, :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 }) }
@@ -39,9 +43,8 @@ class Venue
   has_many :reports
   has_many :galleries
   has_many :photos
-
-  embeds_many :newsitems
-  embeds_many :features
+  has_many :newsitems
+  has_many :features
 
   PER_PAGE = 6
 
@@ -50,9 +53,7 @@ class Venue
     [['', nil]] + out.map { |item| [ item.name, item.id ] }
   end
 
-  set_callback :create, :before do |doc|
-    doc.name_seo = doc.name.gsub(' ', '-')
-  end
+
 
   set_callback :save, :before do |doc|
     if doc.city

data/lib/video.rb

@@ -53,7 +53,8 @@ class Video
     :path => "videos/:style/:id/:filename",
     :s3_protocol => 'https',
     :s3_permissions => 'public-read',
-    :validate_media_type => false
+    :validate_media_type => false,
+    s3_region: ::S3_CREDENTIALS[:region]
   validates_attachment_content_type :video, content_type: /\Avideo\/.*\Z/
 
   has_mongoid_attached_file :thumb,
@@ -70,7 +71,8 @@ class Video
     :s3_credentials => ::S3_CREDENTIALS,
     :path => "videos/:style/:id/thumb_:filename",
     :s3_protocol => 'https',
-    :validate_media_type => false
+    :validate_media_type => false,
+    s3_region: ::S3_CREDENTIALS[:region]
   validates_attachment_content_type :thumb, :content_type => ["image/jpg", "image/jpeg", "image/png", "image/gif", 'application/octet-stream' ]
 
   set_callback :update, :after do |doc|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.134
+  version: 0.0.33.138
 platform: ruby
 authors:
 - piousbox
@@ -137,6 +137,7 @@ files:
 - lib/ish/stock_action.rb
 - lib/ish/stock_option.rb
 - lib/ish/stock_watch.rb
+- lib/ish/utils.rb
 - lib/ish/yahoo_stockwatcher.rb
 - lib/ish_models.rb
 - lib/ish_models/cache_key.rb