ish_models 0.0.33.116 → 0.0.33.121

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f09269340d4d6c43b23eb5a247f31f95e10290cfee4e9a981b126cd7e7cddaee
-  data.tar.gz: 6715248105e5d4ba8d9e6ef974a0100fa652bfb1535255ed1d3aa917697106aa
+  metadata.gz: 4b574fae4d9d623f6a4c607caf3282693b8eab0b4e1c1a96680b96f5c1c9596f
+  data.tar.gz: 9f02341af99ebd3a6c3cd94e30b4241a8d67ca77e73db7514d72a300dd635e52
 SHA512:
-  metadata.gz: 7339a428e96136098e4be1555a0e9165b63da47dec007eeac7ed5dd42da54446d86c432cdf4b942112f47269b8ddb217fc4116ebdeefbf67b0f5eb86b7f53f8e
-  data.tar.gz: 217a2df35598decbe933e7eb6485db97fb792f76061f271682007d02d6616ebccac87eb4dbaa2b58fa6ac6183b7112dd7d28e12a59550e6b07372a3f3d2cdcf0
+  metadata.gz: fd264b75c5a2c013bb028005c1bfb3e0440837c36248cb4c5902b440010bfc4f92e92c6983c7896557fd9570513f8c7993f7dff200049eb527f5b13aa879877d
+  data.tar.gz: 879928f0e97a2db21dc54ce929e273a77cc0eeec515122256479f9c505b9dc66599dfce118489c77f2f5dcf29025f41fed5e3ad73fa7d4a57b1250bfa51153c6

data/lib/city.rb

@@ -27,7 +27,7 @@ class City
   has_many :reports
   has_many :venues
   has_many :videos
-  has_many :tags
+  has_and_belongs_to_many :tags
 
   has_many :current_users, :class_name => '::IshModels::UserProfile', :inverse_of => :current_city
   has_many :newsitems

data/lib/gallery.rb

@@ -4,6 +4,8 @@ class Gallery
   include ::Mongoid::Document
   include ::Mongoid::Timestamps
 
+  PER_PAGE = 6
+
   field :is_public,  type: Boolean, default: false
   field :is_trash,   type: Boolean, default: false
 
@@ -47,7 +49,7 @@ class Gallery
 
   has_many :photos
 
-  belongs_to :tag,   :optional => true
+  has_and_belongs_to_many :tags
   belongs_to :city,  :optional => true
   belongs_to :venue, :optional => true
 
@@ -107,8 +109,8 @@ class Gallery
 
   field :issue
 
-  RENDER_TITLES = 'gallery_render_titles_const' # string b/c transmited over http
-  RENDER_THUMBS = 'gallery_render_thumbs_const' # string b/c transmited over http
+  RENDER_TITLES = 'index_titles' # view name
+  RENDER_THUMBS = 'index_thumbs' # view name
 
   belongs_to :newsparent, polymorphic: true, optional: true
 

data/lib/newsitem.rb

@@ -31,6 +31,8 @@ class Newsitem
   field :downvoting_users, :type => Array, :default => []
   field :is_feature,       :type => Boolean, :default => false
 
+  PER_PAGE = 6
+
   default_scope ->{ order_by({ :created_at => :desc }) }
 
   def self.from_params item

data/lib/tag.rb

@@ -16,10 +16,6 @@ class Tag
   
   field :weight, :type => Integer, :default => 10
 
-  has_and_belongs_to_many :reports
-  has_many :galleries
-  has_many :videos
-
   has_many :children_tags, :class_name => 'Tag', :inverse_of => :parent_tag
   belongs_to :parent_tag, :class_name => 'Tag', :inverse_of => :children_tags, :optional => true
 
@@ -31,6 +27,10 @@ class Tag
   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
 
   default_scope ->{
     where({ :is_public => true, :is_trash => false }).order_by({ :name => :asc })

data/lib/venue.rb

@@ -43,6 +43,8 @@ class Venue
   embeds_many :newsitems
   embeds_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 ] }

data/lib/video.rb

@@ -22,14 +22,14 @@ class Video
   field :youtube_id, :type => String
   # validates :youtube_id, :uniqueness => true, :presence => true
 
-  belongs_to :tag,  :optional => true
+  has_and_belongs_to_many :tags
   belongs_to :city, :optional => true
   belongs_to :site, :optional => true
-  has_many :newsitems
+  # has_many :newsitems # unnecessary, right? _vp_ 20200412
 
   belongs_to :user_profile, :optional => true, :class_name => 'IshModels::UserProfile', :inverse_of => :videos
 
-  accepts_nested_attributes_for :site, :tag, :city
+  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 ] }

metadata

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