ish_models 0.0.33.117 → 0.0.33.122

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef4f46d4145fd56550698161657af3b3cf77e907536157eddccd58133c6d12d1
-  data.tar.gz: 2fcc853c11188b83ccd9af5a0895cb50d3c16672616b12eee7ef280c00c77d2b
+  metadata.gz: 6b4d660c8ce0a475ac217dff07cb2a71c5d9f6c69793a831e4ba20945fd0f948
+  data.tar.gz: acb5c4910ca16aaaacd7c346188892b2469e0570111077f63906972d06bcf324
 SHA512:
-  metadata.gz: f141fe8dccd35cc165fac199bff8516cb26660fb2c811dc1f69c3b98d2e81235d435e5827d519b936bc8ae1dd891bdc96296219c63e9b61ffa3055bea3c12eaf
-  data.tar.gz: 8aa13dde8022284a104458002cd404cec31ea5181656256bdb08cf186892dc09b48ee985239e32b66ce668c313951d32dd574577cf40c07f466544f6abce01c0
+  metadata.gz: cc7a8c601704bd3648d18782d443ee306f42e1964110bb3636674bc6daa04c12147317511547e4d56dc42c9607ddcf3f70f8ae96b4aff56b07d8deb2bd11a36f
+  data.tar.gz: 1b3337866b8130be30e58b03c8451a507c7807fd04f8a1f47a1576865ba5ad44c23f6cbb34ba9abd5673b7ef4aead067b49be6c9bfaf31585f7a9aaf373e19f3

data/lib/city.rb

@@ -2,7 +2,7 @@ class City
   include ::Mongoid::Document
   include ::Mongoid::Timestamps
   include AuxModel
-  
+
   field :name, :type => String
   field :description, :type => String, :default => 'The description of this city'
 
@@ -21,8 +21,8 @@ class City
 
   belongs_to :country, :optional => true
 
-  has_many :events 
-  has_many :galleries 
+  has_many :events
+  has_many :galleries
   has_many :photos
   has_many :reports
   has_many :venues

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
 
@@ -15,7 +17,7 @@ class Gallery
   has_many :premium_purchases, class_name: '::Gameui::PremiumPurchase', as: :item
 
   default_scope ->{ where({ :is_public => true, :is_trash => false }).order_by({ :created_at => :desc }) }
-  
+
   field :x, :type => Float
   field :y, :type => Float
 
@@ -30,11 +32,11 @@ class Gallery
   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, :type => String
+
+  field :name
   validates :name, :uniqueness => true # , :allow_nil => false
 
-  field :galleryname, :type => String
+  field :galleryname
   index({ :galleryname => -1 }, { :unique => true })
   embeds_many :gallery_names, :class_name => '::Ish::GalleryName'
   def self.find_by_slug slug
@@ -62,7 +64,7 @@ class Gallery
     #
     # newsitems
     #
-    if doc.is_public 
+    if doc.is_public
       # for the sites
       if doc.site
         sites = Site.where( :domain => doc.site.domain )
@@ -107,14 +109,14 @@ 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
 
   set_callback :update, :after do |doc|
     Site.update_all updated_at: Time.now
   end
-  
+
 end
 

data/lib/gameui/premium_purchase.rb

@@ -4,11 +4,8 @@ class ::Gameui::PremiumPurchase
   include Mongoid::Timestamps
 
   belongs_to :user_profile, :class_name => '::IshModels::UserProfile'
-
-  field :purchased_class
-  field :purchased_id
-
   belongs_to :item, polymorphic: true
 
 end
 
+::Purchase = ::Gameui::PremiumPurchase

data/lib/ish/payment.rb

@@ -8,7 +8,12 @@ class Ish::Payment
   field :amount, :type => Integer # in cents
   field :charge, :type => Hash
   field :email,  :type => String
-  
+
+  field :client_secret
+  field :payment_intent_id
+
+  field :status, type: Symbol
+
   after_create :compute_paid_invoice_amount
 
   protected

data/lib/ish_models/user_profile.rb

@@ -1,12 +1,12 @@
-class IshModels::UserProfile  
+class IshModels::UserProfile
   include Mongoid::Document
   include Mongoid::Timestamps
-  
+
   field :name
   validates_presence_of :name
 
   field :username
-  
+
   field :email
   # validates_format_of :email, :with => ::Devise::email_regexp
   validates_format_of :email,:with => /\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/
@@ -14,16 +14,16 @@ class IshModels::UserProfile
   field :fb_access_token
   field :fb_long_access_token
   field :fb_expires_in
-  
+
   field :lang, :type => String, :default => :en
 
-  ROLES = [ :admin, :manager, :guy ] 
+  ROLES = [ :admin, :manager, :guy ]
   field :role_name, :type => Symbol
 
   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
- 
+
   has_many :galleries, :inverse_of => :user_profile
   has_and_belongs_to_many :shared_galleries, :class_name => 'Gallery', :inverse_of => :shared_profiles
 
@@ -38,6 +38,8 @@ class IshModels::UserProfile
   has_and_belongs_to_many :friends,   :class_name => 'IshModels::UserProfile', :inverse_of => :friendeds
   has_and_belongs_to_many :friendeds, :class_name => 'IshModels::UserProfile', :inverse_of => :friends
 
+  field :n_unlocks, type: Integer, default: 0
+
   #
   # preferences
   #
@@ -75,12 +77,14 @@ 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 :past_employment, :type => String
   field :pdf_resume_path, :type => String
   field :doc_resume_path, :type => String
 

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

@@ -1,19 +1,19 @@
-class Tag  
+class Tag
   include Mongoid::Document
   include Mongoid::Timestamps
 
   field :name, :type => String
   # validates :name, :uniqueness => true, :allow_nil => false
-  
+
   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
   field :is_trash, :type => Boolean, :default => false
   field :is_feature, :type => Boolean, :default => false
-  
+
   field :weight, :type => Integer, :default => 10
 
   has_many :children_tags, :class_name => 'Tag', :inverse_of => :parent_tag
@@ -47,7 +47,7 @@ class Tag
       Tag.each { |r| r.remove }
     end
   end
-  
+
   def self.no_parent
     Tag.where( :parent_tag_id => nil )
   end
@@ -71,10 +71,10 @@ class Tag
   def self.n_videos
     4
   end
-  
+
   # @deprecated I don't even know why I have this. Should be simplified into non-being.
   def self.n_features
     4
   end
-  
+
 end

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 ] }
@@ -56,7 +56,7 @@ class Video
     :validate_media_type => false
   validates_attachment_content_type :video, content_type: /\Avideo\/.*\Z/
 
-  has_mongoid_attached_file :thumb, 
+  has_mongoid_attached_file :thumb,
     :styles => {
       :mini   => '20x20#',
       :thumb  => "100x100#",
@@ -72,7 +72,7 @@ class Video
     :s3_protocol => 'https',
     :validate_media_type => false
   validates_attachment_content_type :thumb, :content_type => ["image/jpg", "image/jpeg", "image/png", "image/gif", 'application/octet-stream' ]
-  
+
   set_callback :update, :after do |doc|
     Site.update_all updated_at: Time.now
   end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.117
+  version: 0.0.33.122
 platform: ruby
 authors:
 - piousbox
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2017-05-10 00:00:00.000000000 Z
@@ -154,7 +154,7 @@ homepage: http://wasya.co
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -170,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: models of ish
 test_files: []