ish_models 0.0.33.129 → 0.0.33.130

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ddb473d3919f9fbd1f3776bac2dbee971c7191428d5bc18fb31c3a3412a73eb
-  data.tar.gz: 52aea5b794ff6a8f9dae484a7b364aa72df71bcbfb012ab43492d743d4a4badd
+  metadata.gz: 8c34bbd347229cb392198bb194abc4c7d2902cb478aaac34b43b89c2014ab2d3
+  data.tar.gz: 83c55591061a4ed85905e50f3aaf6fdcae9eed57d25fb4f0f36dd1cbe4d16bbe
 SHA512:
-  metadata.gz: cd05ef3be3aa54a2bf92e33aa9404dc654ecb25c288ed728836184d68a53adee5ecc9dc279a3c35b771fa0178f2ae10a9f89006a18c7dd9a50154c332fa34034
-  data.tar.gz: 9cb96337052e622e4ea2545724fe32241d0949849dd3e09ad79186f3ba3c46bb1df328ec4c8acb5d6a5fc00ed4ec2f7d3390783edcba5a5e0792f0d1506db707
+  metadata.gz: a2e9dc8ad1cd2f1236963b23d8c957c586e9b6736c8477001e393d4cff2fe9033c420752a5ce73e0ff3b18fe8881c647aa15ca447a9b899f3e3fd062aacb588b
+  data.tar.gz: e4337aed790fc7190cf0341dc158443d459b4aa0b85580594971362d38bef285fa8a6b9cae97e175a0d5f344964bc01a84778c34a042bb67bc364bde586f886e

data/lib/gameui/map.rb

@@ -4,10 +4,14 @@ class ::Gameui::Map
   include Mongoid::Timestamps
 
   has_many :markers, :class_name => '::Gameui::Marker', inverse_of: :map
+  has_many :newsitems, inverse_of: :map
 
   field :slug
   validates :slug, uniqueness: true, presence: true
   field :parent_slug
+  def name
+    slug
+  end
 
   field :w, type: Integer
   validates :w, presence: true
@@ -26,5 +30,9 @@ class ::Gameui::Map
   field :ordering_type, type: String, default: 'custom' # timestamp, alphabetic, custom
   validates :ordering_type, presence: true
 
-  
+  def self.list conditions = { is_trash: false }
+    out = self.order_by( created_at: :desc )
+    [['', nil]] + out.map { |item| [ "#{item.created_at.strftime('%Y%m%d')} #{item.name}", item.id ] }
+  end
+
 end

data/lib/ish_models/user_profile.rb

@@ -39,6 +39,9 @@ class IshModels::UserProfile
   has_and_belongs_to_many :friendeds, :class_name => 'IshModels::UserProfile', :inverse_of => :friends
 
   field :n_unlocks, type: Integer, default: 0
+  def n_coins
+    n_unlocks
+  end
 
   #
   # preferences
@@ -72,7 +75,10 @@ class IshModels::UserProfile
   field :n_stars, type: Integer, default: 0
   has_many :premium_purchases, :class_name => '::Gameui::PremiumPurchase'
   def has_premium_purchase item
-    item.premium_purchases.where( user_profile: self ).exists?
+    item.premium_purchases.where( user_profile_id: self.id ).exists?
+  end
+  def premium_purchases
+    ::Gameui::PremiumPurchase.where( user_profile_id: self.id )
   end
 
 end

data/lib/newsitem.rb

@@ -7,7 +7,8 @@ class Newsitem
   belongs_to :city,    :optional => true
   belongs_to :report,  :optional => true
   belongs_to :user_profile, class_name: 'IshModels::UserProfile', optional: true
-  
+  belongs_to :map, class_name: '::Gameui::Map', optional: true
+
   belongs_to :gallery, :optional => true
   def gallery
     self.gallery_id ? Gallery.unscoped.find( self.gallery_id ) : nil
@@ -43,7 +44,7 @@ class Newsitem
     unless item[:report_id].blank?
       n.report = Report.find item[:report_id]
     end
-    
+
     unless item[:gallery_id].blank?
       n.gallery = Gallery.find item[:gallery_id]
     end
@@ -52,5 +53,5 @@ class Newsitem
 
     return n
   end
-  
+
 end

data/lib/photo.rb

@@ -10,37 +10,36 @@ class Photo
   # field      :username, :type => String
 
   has_and_belongs_to_many :viewers, :class_name => 'User', :inverse_of => :viewable_photos
-  
+
   belongs_to :user_profile,  :class_name => 'IshModels::UserProfile',               :optional => true
   def user; user_profile; end
   belongs_to :profile_city,  :class_name => 'City',  :inverse_of => :profile_photo, :optional => true
   belongs_to :profile_venue, :class_name => 'Venue', :inverse_of => :profile_photo, :optional => true
   belongs_to :profile_event, :class_name => 'Event', :inverse_of => :profile_photo, :optional => true
-  
+
   belongs_to :report,   :optional => true
   belongs_to :venue,    :optional => true
   belongs_to :event,    :optional => true
   belongs_to :feature,  :optional => true
   belongs_to :gallery,  :optional => true
   belongs_to :newsitem, :optional => true
-  
+
   field :name,   :type => String
   field :descr,  :type => String
   field :weight, :type => Integer, :default => 10
-  
+
   field :is_public, :type => Boolean, :default => true
 
   # @TODO: nuke this boolean _vp_ 20170515
   field :is_trash,  :type => Boolean, :default => false
   default_scope ->{ where({ :is_trash => false }) }
 
-  has_mongoid_attached_file :photo, 
+  has_mongoid_attached_file :photo,
                             :styles => {
                               :mini   => '20x20#',
                               :thumb  => "100x100#",
                               :thumb2  => "200x200#",
                               :s169 => "640x360#",
-                              # :s43 => "640x480#",
                               :small  => "400x400>",
                               :large  => '950x650>',
                             },
@@ -48,14 +47,15 @@ class Photo
                             :s3_credentials => ::S3_CREDENTIALS,
                             :path => "photos/:style/:id/:filename",
                             :s3_protocol => 'https',
-                            :validate_media_type => false
-  
+                            :validate_media_type => false,
+                            s3_region: ::S3_CREDENTIALS[:region]
+
   def self.n_per_manager_gallery
     25
   end
 
   validates_attachment_content_type :photo, :content_type => ["image/jpg", "image/jpeg", "image/png", "image/gif", 'application/octet-stream' ]
-  
+
 end
 
 

metadata

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