ish_models 0.0.33.52 → 0.0.33.53

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7d20be996fecd2563a6b86d5ebd78f253b8e8f3
-  data.tar.gz: 4c0578efb741abcbf11d58ed65a20e2d5cd6fcac
+  metadata.gz: 7b83dc75d18c75d7d83b8644f5511bf03766303c
+  data.tar.gz: c6c2910938f5d396ea82e2e0a156bad42373b24e
 SHA512:
-  metadata.gz: bb6c6c31b12ef723dba11c909de33a0bdf8c2cfd14995e1826ac79debb4cc24b9aa49f2ac3f50e55a28dfe5c66428779bea553a7945c5999ceb5915387c76708
-  data.tar.gz: 5859e0377c1e81e6629f5f7added400598a8e79193723667b683119ce7e621c09400dc7ab3ad78c5fe4db814c5782f9293be174ed4c275361227aa110e4d91e0
+  metadata.gz: 56afea3d4a6e9a3add2559a08a77c7044a9d7467da059e6010e97a5e90a46647736d1e0921efad92b815bf0943857bd101e5588296db9cdfc3511858a65ff354
+  data.tar.gz: a5315848ffb25d28c0702931dc37b969eceff04f8a591ec5fe9722bc46bd3811f8ac432b8754c5d523fbb4bca91bb0b3810a4d43c8c87b3076c2c9d61f398652

data/lib/newsitem.rb

@@ -2,35 +2,28 @@ class Newsitem
   include Mongoid::Document
   include Mongoid::Timestamps
 
-=begin  
-  embedded_in :user
-  embedded_in :site
-  embedded_in :city
-  embedded_in :tag
-=end
-
-  belongs_to :site, :optional => true
-  belongs_to :city, :optional => true
-
-  belongs_to :report, :optional => true
+  belongs_to :site,    :optional => true
+  belongs_to :tag,     :optional => true
+  belongs_to :city,    :optional => true
+  belongs_to :report,  :optional => true
   belongs_to :gallery, :optional => true
-  belongs_to :video, :optional => true
+  belongs_to :video,   :optional => true
 
   has_one :photo
 
-  field :name, :type => String
-  field :descr, :type => String
-  field :image_path, :type => String
-  field :link_path, :type => String
-  field :username, :type => String # @TODO do I use this???
-  field :partial_name, :type => String, :default => nil  # @deprecated, but let's not remove it.
-
-  field :weight, :type => Integer, :default => 10
-  field :n_upvotes, :type => Integer, :default => 0
-  field :n_downvotes, :type => Integer, :default => 0
-  field :upvoting_users, :type => Array, :default => []
+  field :name
+  field :descr
+  field :image_path
+  field :link_path
+  field :username
+  field :partial_name
+
+  field :weight,           :type => Integer, :default => 10
+  field :n_upvotes,        :type => Integer, :default => 0
+  field :n_downvotes,      :type => Integer, :default => 0
+  field :upvoting_users,   :type => Array, :default => []
   field :downvoting_users, :type => Array, :default => []
-  field :is_feature, :type => Boolean, :default => false
+  field :is_feature,       :type => Boolean, :default => false
 
   default_scope ->{ order_by({ :created_at => :desc }) }
 

data/lib/site.rb

@@ -9,9 +9,10 @@ class Site
   field :lang, :type => String, :default => 'en'
   # validates :lang, { :uniqueness => :true, :scope => :domain }
 
-  field :title, :type => String
-  field :subhead, :type => String
-  field :home_redirect_path, :type => String, :default => nil
+  field :title
+  field :subhead
+  field :description
+  field :home_redirect_path
 
   field :n_features,             :type => Integer, :default => 4
   field :n_newsitems,            :type => Integer, :default => 20

data/lib/tag.rb

@@ -5,9 +5,9 @@ class Tag
   field :name, :type => String
   validates :name, :uniqueness => true, :allow_nil => false
   
-  field :name_seo, :type => String
+  field :name_seo, :as => :tagname
   validates :name_seo, :uniqueness => true, :allow_nil => false
-
+  
   field :descr, :type => String, :default => ''
   
   field :is_public, :type => Boolean, :default => true
@@ -24,7 +24,8 @@ class Tag
   belongs_to :parent_tag, :class_name => 'Tag', :inverse_of => :children_tags, :optional => true
 
   embeds_many :features
-  embeds_many :newsitems
+  # embeds_many :newsitems
+  has_many :newsitems
 
   belongs_to :site, :optional => true
 

metadata

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