ish_models 0.0.33.31 → 0.0.33.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bc52706ccbe2c0f4eea769079e009ae0b8b12f3
-  data.tar.gz: 7d1b2f63e0a8c7532f5e15a91807b947db5dd47f
+  metadata.gz: 7e747705d526fb9344bdfe6074d0c0c227db0765
+  data.tar.gz: 0ce281f0fc5b26486647ffe524c899d8a1de7595
 SHA512:
-  metadata.gz: 2f4f0a06c7561bbbdae6dc0b1abb194e97318573cb9c9ec02ffa844e552ecbe9e912cfc9aa65289ba3a3b505fa7633508dc7e1a429b8677a0b066e5d100c5e37
-  data.tar.gz: 372c31c04a48c7e2ebf0575d013a5b8335ef35d06df548997719af0ffcb4d1bbe7182eb3bbbdf84c7b9efd61bd86985b0d36b2011e785439ab2d5aa6aca26cd8
+  metadata.gz: 6b2264ef110897e64315e2220326a07c16bb448f6d06da84e550de96d81de877198668342504029256cd721adff0422a071f544ce83f5fbaa1a04d14480c12cd
+  data.tar.gz: 504db5fe120651d41fda715622deb3b72c3dcf7b77526c7db8d97748184a1db3d08617cc131765fe1357f4ae27a6b538284f1f82e0c22a51a165ebb2477ec113

data/lib/app_model2.rb

@@ -2,16 +2,15 @@ class AppModel2
   include ::Mongoid::Document
   include ::Mongoid::Timestamps
 
-  field :is_feature, :type => Boolean, :default => false
-  field :is_public, :type => Boolean, :default => false
-  field :is_done, :type => Boolean, :default => false
-  field :is_trash, :type => Boolean, :default => false
-  field :is_anonymous, :type => Boolean, :default => false
+  field :is_feature,   :type => Boolean, :default => false
+  field :is_public,    :type => Boolean, :default => false
+  field :is_done,      :type => Boolean, :default => false
+  field :is_trash,     :type => Boolean, :default => false
 
-  scope :fresh, ->{ where({ :is_trash => false }) }
-  scope :trash, ->{ where({ :is_trash => true }) }
-  scope :public, ->{ where({ :is_public => true }) }
-  scope :done, ->{ where({ :is_done => true }) }
+  scope :fresh,  ->{ where({ :is_trash  => false }) }
+  scope :trash,  ->{ where({ :is_trash  => true  }) }
+  scope :public, ->{ where({ :is_public => true  }) }
+  scope :done,   ->{ where({ :is_done   => true  }) }
 
   default_scope ->{ where({ :is_public => true, :is_trash => false }).order_by({ :created_at => :desc }) }
   

data/lib/gallery.rb

@@ -1,3 +1,4 @@
+
 class Gallery < AppModel2
 
   belongs_to :site
@@ -11,11 +12,12 @@ class Gallery < AppModel2
   validates :name, :uniqueness => true # , :allow_nil => false
 
   field :galleryname, :type => String
-  validates :galleryname, :uniqueness => true # , :allow_nil => false
+  index({ :galleryname => -1 }, { :unique => true })
+  embeds_many :gallery_names, :class_name => 'Ish::GalleryName'
 
   field :subhead, :type => String
-  field :descr, :type => String
-  field :lang, :type => String, :default => 'en'
+  field :descr,   :type => String, :as => :description
+  field :lang,    :type => String, :default => 'en'
 
   has_many :photos
 
@@ -29,7 +31,7 @@ class Gallery < AppModel2
     if doc.user_profile && doc.user_profile.username
       doc.username = doc.user_profile.username
     end
-    doc.galleryname = doc.id.to_s
+    doc.galleryname ||= doc.id.to_s
 
     #
     # newsitems

data/lib/gallery2.rb

@@ -0,0 +1,101 @@
+
+class Gallery2
+  include ::Mongoid::Document
+  include ::Mongoid::Timestamps
+  store_in :collection => 'galleries'
+
+  field :is_feature,   :type => Boolean, :default => false
+  field :is_public,    :type => Boolean, :default => false
+  field :is_done,      :type => Boolean, :default => false
+  field :is_trash,     :type => Boolean, :default => false
+
+  default_scope ->{ where({ :is_public => true, :is_trash => false }).order_by({ :created_at => :desc }) }
+  index({ :is_public => 1, :is_trash => -1, :order_by => 1 })
+  
+  field :x, :type => Float
+  field :y, :type => Float
+
+  def self.list conditions = { :is_trash => false }
+    out = self.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
+  validates  :site, :presence => true
+
+  belongs_to :user_profile, :optional => true, :class_name => 'IshModels::UserProfile'
+  field :username, :type => String
+  
+  field :name, :type => String
+  validates :name, :uniqueness => true # , :allow_nil => false
+
+  field :galleryname, :type => String
+  index({ :galleryname => -1 }, { :unique => true })
+  embeds_many :gallery_names, :class_name => 'Ish::GalleryName'
+
+  field :subhead, :type => String
+  field :descr,   :type => String, :as => :description
+  field :lang,    :type => String, :default => 'en'
+
+  has_many :photos
+
+  belongs_to :tag,   :optional => true
+  belongs_to :city,  :optional => true
+  belongs_to :venue, :optional => true
+
+  has_many :newsitems
+
+  set_callback(:create, :before) do |doc|
+    if doc.user_profile && doc.user_profile.username
+      doc.username = doc.user_profile.username
+    end
+    doc.galleryname ||= doc.id.to_s
+
+    #
+    # newsitems
+    #
+    if doc.is_public 
+      # for the sites
+      if doc.site
+        sites = Site.where( :domain => doc.site.domain )
+        sites.each do |site|
+          n = Newsitem.new {}
+          n.gallery = doc
+          n.username = doc.username
+          site.newsitems << n
+          flag = site.save
+          if !flag
+            puts! site.errors
+          end
+        end
+      end
+      # for the city
+      if doc.city
+        n = Newsitem.new {}
+        n.gallery = doc
+        n.city = doc.city
+        n.username = doc.username
+        n.save
+      end
+    end
+
+    #
+    # cache
+    #
+    if doc.site
+      doc.site.touch
+    end
+    if doc.city
+      doc.city.touch
+    end
+
+  end
+
+  # @deprecated, use Gallery::ACTIONS
+  def self.actions
+    [ 'show_mini', 'show_long', 'show' ]
+  end
+  ACTIONS = [ 'show_mini', 'show_long', 'show' ]
+
+end
+

data/lib/ish/gallery_name.rb

@@ -0,0 +1,10 @@
+
+module Ish
+  class GalleryName
+    include Mongoid::Document
+    include Mongoid::Timestamps
+    field :text
+    embedded_in :gallery
+  end
+end
+

data/lib/ish_models.rb

@@ -17,6 +17,8 @@ module IshModels
   end
 end
 
+require 'ish/gallery_name.rb'
+
 require 'ish_models/cache_key.rb'
 # require 'ish_models/user.rb'
 require 'ish_models/stock_watch.rb'
@@ -30,6 +32,7 @@ require 'country.rb'
 require 'event.rb'
 require 'feature.rb'
 require 'gallery.rb'
+require 'gallery2.rb'
 require 'manager.rb'
 require 'newsitem.rb'
 require 'photo.rb'

data/lib/photo.rb

@@ -19,7 +19,7 @@ class Photo
   belongs_to :report,   :optional => true
   belongs_to :venue,    :optional => true
   belongs_to :feature,  :optional => true
-  belongs_to :gallery,  :optional => true
+  belongs_to :gallery,  :optional => true # , :class_name => 'Gallery2'
   belongs_to :newsitem, :optional => true
   
   field :name,   :type => String

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.31
+  version: 0.0.33.32
 platform: ruby
 authors:
 - piousbox
@@ -60,6 +60,8 @@ files:
 - lib/event.rb
 - lib/feature.rb
 - lib/gallery.rb
+- lib/gallery2.rb
+- lib/ish/gallery_name.rb
 - lib/ish_models.rb
 - lib/ish_models.rb~
 - lib/ish_models/cache_key.rb