ish_models 0.0.33.8 → 0.0.33.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5e17a67ebc32d4a8e87920c29938f7e1e20fb6c
-  data.tar.gz: cf59f01cb03dff491afe50d3e1c3fe85a3c9feb0
+  metadata.gz: fb4f14c168d2c1cf2ceb0c391b6e0b3c819b821c
+  data.tar.gz: da7f19fbab2cc5b70b820d198a978a8bc78ee7cb
 SHA512:
-  metadata.gz: f2c9b9e2bc58179682c94c785ac97cdb74a1b0896c835c7059c3be50628f3b2f4aa2c28eb9a8178c2618ad3f123c6a202356ed1fb0ec3d95531fc0bae6148fc4
-  data.tar.gz: 6942979a180e7c202ec4c06c8d63188841eb97d017c9b8daf30a3253d0508a44e1531ce8bf35d96acdd1e7d0e6bab66b1b0ce2ea392c4299e20d46262682b438
+  metadata.gz: 97e8e603a109a01f58333d817a32f459d2e8467618848ff6b31716ac518b4a4f62812975f1750365a4cb6b231ecfa0ad8bc655aedc2e8648fe7c8962cbe88f0c
+  data.tar.gz: 5402c71cdf0c6b7a813b37f1872d940333cb0cf5a262cebdbc911d78573616a3eaab74c942e42628b4ef8d119013456b9e5a8debbcdd64e57967ba78ee8ea8bf

data/lib/gallery.rb

@@ -17,13 +17,10 @@ class Gallery < AppModel2
   field :descr, :type => String
   field :lang, :type => String, :default => 'en'
 
-  # not necessary because AppModel2
-  # default_scope ->{ where( :is_public => true, :is_trash => false ).order_by( :created_at => :desc ) }
-
   has_many :photos
 
-  belongs_to :tag, :optional => true
-  belongs_to :city, :optional => true
+  belongs_to :tag,   :optional => true
+  belongs_to :city,  :optional => true
   belongs_to :venue, :optional => true
 
   has_many :newsitems
@@ -34,6 +31,9 @@ class Gallery < AppModel2
     end
     doc.galleryname = doc.id.to_s
 
+    #
+    # newsitems
+    #
     if doc.is_public 
       # for the sites
       if doc.site
@@ -49,7 +49,6 @@ class Gallery < AppModel2
           end
         end
       end
-
       # for the city
       if doc.city
         n = Newsitem.new {}
@@ -59,6 +58,17 @@ class Gallery < AppModel2
         n.save
       end
     end
+
+    #
+    # cache
+    #
+    if doc.site
+      doc.site.touch
+    end
+    if doc.city
+      doc.city.touch
+    end
+
   end
 
   # @deprecated, use Gallery::ACTIONS

data/lib/ish_models/user.rb

@@ -74,7 +74,7 @@ class IshModels::User
   
   has_many :reports
   has_many :photos
-  has_many :user_profiles
+  # has_many :user_profiles
   has_many :galleries
   has_many :videos
 

data/lib/{user_profile.rb → ish_models/user_profile.rb}

@@ -1,4 +1,4 @@
-class UserProfile  
+class IshModels::UserProfile  
   include Mongoid::Document
   include Mongoid::Timestamps
   

data/lib/ish_models.rb

@@ -19,6 +19,7 @@ end
 
 require 'ish_models/cache_key.rb'
 require 'ish_models/user.rb'
+require 'ish_models/user_profile.rb'
 
 require 'app_model2.rb'
 require 'aux_model.rb'
@@ -35,6 +36,5 @@ require 'public_item.rb'
 require 'report.rb'
 require 'site.rb'
 require 'tag.rb'
-require 'user_profile.rb'
 require 'venue.rb'
 require 'video.rb'

data/lib/tag.rb

@@ -1,6 +1,4 @@
-
-class Tag
-  
+class Tag  
   include Mongoid::Document
   include Mongoid::Timestamps
 
@@ -23,13 +21,12 @@ class Tag
   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
+  belongs_to :parent_tag, :class_name => 'Tag', :inverse_of => :children_tags, :optional => true
 
   embeds_many :features
   embeds_many :newsitems
 
-  belongs_to :site
-  validates :site, :presence => true
+  belongs_to :site, :optional => true
 
   default_scope ->{
     where({ :is_public => true, :is_trash => false }).order_by({ :name => :asc })

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.8
+  version: 0.0.33.10
 platform: ruby
 authors:
 - piousbox
@@ -72,6 +72,7 @@ files:
 - lib/ish_models/railtie.rb~
 - lib/ish_models/user.rb
 - lib/ish_models/user.rb~
+- lib/ish_models/user_profile.rb
 - lib/manager.rb
 - lib/newsitem.rb
 - lib/photo.rb
@@ -79,7 +80,6 @@ files:
 - lib/report.rb
 - lib/site.rb
 - lib/tag.rb
-- lib/user_profile.rb
 - lib/venue.rb
 - lib/video.rb
 homepage: http://wasya.co