ish_models 0.0.33.136 → 0.0.33.140

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 172ea3b5881a62b2d1c4ef8bed4360782c6f9676eaa39c1be7e9febab7e8937b
-  data.tar.gz: ba242d1b5cc551a2257a0c2183413f1a9cebd5448cc570629761cb69e9e99863
+  metadata.gz: 35a17d0129c4e975bf32ae05423340b47ed47a2ddd6a807df9aec2e525547adf
+  data.tar.gz: 28bcbbd16948cafa7e42ba80eefb87f85223c86c6363a798e21b0f32eb441676
 SHA512:
-  metadata.gz: c849a3a2b774e4290e10e28b83561f11d85eb0ed316acc2118ad8ff6188d2d7c902b7bab1e0e192f4010a6ab9f1bafafec3ecaaecf47029084c9fcce43da2c34
-  data.tar.gz: 5c8641248d523733c55643e8fe3ee95c4aa75cd4b7257684b60d4d48735e1a68187015abd7dbbda3558964f6c97c090a12fba4de3deab8081e952501bcec3e1d
+  metadata.gz: a0021a55de96d807f76330128fb49487c8bb7f571b6d586296971023d2030987226b1d7dd4e5adccba529176a6a0dfe7d5b35bea3ba93f653eeb57bd6e63e8e7
+  data.tar.gz: d367ce9ee126d77e7d87ee2dd7c58934256a1d546764bb4a8dbecd75717222d55d22fe7f77a7c91288423492248b7a69c5f139696cea43ff2cc2564fc5b7cb71

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,46 @@ 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
+
+  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 +106,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/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

@@ -5,7 +5,11 @@ module Ish::Utils
 
   def set_slug
     return if slug
-    new_slug = name.downcase.gsub(/[^a-z0-9\s]/i, '').gsub(' ', '-')
+    if name
+      new_slug = name.downcase.gsub(/[^a-z0-9\s]/i, '').gsub(' ', '-')
+    else
+      new_slug = '1'
+    end
     if self.class.where( slug: new_slug ).first
       loop do
         if new_slug[new_slug.length-1].to_i != 0

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/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

@@ -11,6 +11,7 @@ class Report
   field :slug
   validates :slug, :uniqueness => true, :presence => true
   index({ :slug => 1 }, { :unique => true })
+  before_validation :set_slug, :on => :create
 
   ## Can be one of: default (nil), longscroll
   field :item_type, type: String
@@ -18,7 +19,7 @@ class Report
   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 }, { name: 'default_index' })
 
   field :is_public, :type => Boolean, :default => true
   index({ :is_public => 1 })
@@ -97,7 +98,7 @@ class Report
     end
   end
 
-  before_validation :set_slug, :on => :create
+
 
   set_callback :update, :after do |doc|
     Site.update_all updated_at: Time.now

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.136
+  version: 0.0.33.140
 platform: ruby
 authors:
 - piousbox