ish_models 0.0.33.129 → 0.0.33.133

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ddb473d3919f9fbd1f3776bac2dbee971c7191428d5bc18fb31c3a3412a73eb
-  data.tar.gz: 52aea5b794ff6a8f9dae484a7b364aa72df71bcbfb012ab43492d743d4a4badd
+  metadata.gz: 2d50f29ed3d0a85e7d16177bd79b9fe6c3271ad17b4cb888c81c44b451a1f28d
+  data.tar.gz: 8ab4c58c78a5967a2096d9aacc58a0568442ea1ff3477d353cbe8a42f3ce5ded
 SHA512:
-  metadata.gz: cd05ef3be3aa54a2bf92e33aa9404dc654ecb25c288ed728836184d68a53adee5ecc9dc279a3c35b771fa0178f2ae10a9f89006a18c7dd9a50154c332fa34034
-  data.tar.gz: 9cb96337052e622e4ea2545724fe32241d0949849dd3e09ad79186f3ba3c46bb1df328ec4c8acb5d6a5fc00ed4ec2f7d3390783edcba5a5e0792f0d1506db707
+  metadata.gz: 1e53ea5ade3eaec46a41f2469c27ff60bf4feaf8e989cc1091173e16d4788e4f262150f5b84045c3d717fadd4f4fad09e982474d11fddd0b2f7bf5b1a0abeffc
+  data.tar.gz: 6c618c59a51c4a05dec7725cf21211bf5ce9b5f35dea634ed83f1f1db98a5252f00199096de651ae75ec1199ae36a0295d2a993fcc564c0a80c8ee3d2ba66d27

data/lib/gameui/map.rb

@@ -4,21 +4,42 @@ 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
+  belongs_to :parent, class_name: '::Gameui::Map', inverse_of: :childs, optional: true
+  has_many :childs, class_name: '::Gameui::Map', inverse_of: :parent
+  has_one :image, class_name: '::Ish::ImageAsset', inverse_of: :location
 
-  field :w, type: Integer
-  validates :w, presence: true
+  has_and_belongs_to_many :bookmarked_profiles, class_name: '::IshModels::UserProfile', inverse_of: :bookmarked_location
 
-  field :h, type: Integer
-  validates :h, presence: true
+  field :map_slug
+  def map
+    ::Gameui::Map.where( slug: map_slug ).first
+  end
 
+  field :name
   field :description
 
+  # @deprecated, dont use!
   field :img_path
 
+  field :w, type: Integer
+  validates :w, presence: true
+  field :h, type: Integer
+  validates :h, presence: true
+
+  # @TODO: this is shared between map and marker, move to a concern.
+  before_validation :compute_w_h
+  def compute_w_h
+    geo = Paperclip::Geometry.from_file(Paperclip.io_adapters.for(image.image))
+    self.w = geo.width
+    self.h = geo.height
+  end
+
   ORDERING_TYPE_ALPHABETIC = 'alphabetic'
   ORDERING_TYPE_CUSTOM     = 'custom'
   ORDERING_TYPE_TIMESTAMP  = 'timestamp'
@@ -26,5 +47,19 @@ 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, nil]] + out.map { |item| [ item.name, item.id ] }
+  end
+
+  def breadcrumbs
+    out = [{ name: self.name, slug: self.slug, link: false }]
+    p = self.parent
+    while p
+      out.push({ name: p.name, slug: p.slug })
+      p = p.parent
+    end
+    out.reverse
+  end
+
 end

data/lib/gameui/map_bookmark.rb

@@ -0,0 +1,9 @@
+
+class ::Gameui::MapBookmark
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  belongs_to :profile, class_name: 'IshModels::UserProfile'
+  belongs_to :location, class_name: '::Gameui::Map'
+
+end

data/lib/gameui/marker.rb

@@ -8,21 +8,37 @@ class ::Gameui::Marker
   field :slug
   validates :slug, uniqueness: true, presence: true
 
+  field :description
+
+  has_one :image,       class_name: '::Ish::ImageAsset', inverse_of: :marker_image
+  has_one :title_image, class_name: '::Ish::ImageAsset', inverse_of: :marker_title_image
+
+
+  # @deprecated, don't use!
+  # _vp_ 2021-09-23
+  field :img_path
+  # validates :img_path, presence: true
+  field :title_img_path
+  # validates :title_img_path, presence: true
   field :w, type: Integer
   validates :w, presence: true
   field :h, type: Integer
   validates :h, presence: true
-  field :x, type: Integer
-  validates :x, presence: true
-  field :y, type: Integer
-  validates :y, presence: true
-
-  field :img_path
-  validates :img_path, presence: true
-  field :title_img_path
-  validates :title_img_path, presence: true
-
-  field :description
+  field :x, type: Integer, default: 0
+  # validates :x, presence: true
+  field :y, type: Integer, default: 0
+  # validates :y, presence: true
+  field :centerOffsetX, type: Integer, default: 0
+  # validates :centerXOffset, presence: true
+  field :centerOffsetY, type: Integer, default: 0
+  # validates :centerYOffset, presence: true
+
+  before_validation :compute_w_h
+  def compute_w_h
+    geo = Paperclip::Geometry.from_file(Paperclip.io_adapters.for(image.image))
+    self.w = geo.width
+    self.h = geo.height
+  end
 
   field :is_active, type: Boolean, default: true
   field :deleted_at, type: Time, default: nil
@@ -38,6 +54,7 @@ class ::Gameui::Marker
   field :item_type, type: String
   validates :item_type, presence: true
 
+  field :url
 
 end
 

data/lib/ish/image_asset.rb

@@ -0,0 +1,27 @@
+class Ish::ImageAsset
+  require 'aws-sdk'
+
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  include Mongoid::Paperclip
+
+  belongs_to :location,           class_name: 'Gameui::Map', inverse_of: :image,       optional: true
+  belongs_to :marker_image,       class_name: 'Gameui::Map', inverse_of: :image,       optional: true
+  belongs_to :marker_title_image, class_name: 'Gameui::Map', inverse_of: :title_image, optional: true
+
+  has_mongoid_attached_file :image,
+                            :styles => {
+                              :thumb  => "100x100#",
+                            },
+                            :storage => :s3,
+                            :s3_credentials => ::S3_CREDENTIALS,
+                            :path => "image_assets/:style/:id/:filename",
+                            :s3_protocol => 'https',
+                            :validate_media_type => false,
+                            s3_region: ::S3_CREDENTIALS[:region]
+
+  validates_attachment_content_type :image, :content_type => ["image/jpg", "image/jpeg", "image/png", "image/gif", 'application/octet-stream' ]
+
+end
+
+

data/lib/ish_models/user_profile.rb

@@ -10,6 +10,7 @@ class IshModels::UserProfile
   field :email
   # validates_format_of :email, :with => ::Devise::email_regexp
   validates_format_of :email,:with => /\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/
+  validates_uniqueness_of :email
 
   field :fb_access_token
   field :fb_long_access_token
@@ -35,10 +36,18 @@ class IshModels::UserProfile
   has_many :videos, :inverse_of => :user_profile
   has_many :newsitems, inverse_of: :user_profile
 
+  has_and_belongs_to_many :bookmarked_locations, class_name: '::Gameui::Map', inverse_of: :bookmarked_profile
+  def bookmarks
+    bookmarked_locations
+  end
+
   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
+  def n_coins
+    n_unlocks
+  end
 
   #
   # preferences
@@ -72,7 +81,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/ish_models.rb

@@ -30,6 +30,7 @@ require 'co_tailors/address.rb'
 
 require 'gameui'
 require 'gameui/map.rb'
+require 'gameui/map_bookmark.rb'
 require 'gameui/marker.rb'
 require 'gameui/premium_purchase.rb'
 
@@ -37,6 +38,7 @@ require 'ish/ameritrade'
 require 'ish/covered_call'
 require 'ish/crawler.rb'
 require 'ish/gallery_name.rb'
+require 'ish/image_asset.rb'
 require 'ish/input_error.rb'
 require 'ish/iron_condor.rb'
 require 'ish/iron_condor_watcher.rb'

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.133
 platform: ruby
 authors:
 - piousbox
@@ -116,6 +116,7 @@ files:
 - lib/gallery.rb
 - lib/gameui.rb
 - lib/gameui/map.rb
+- lib/gameui/map_bookmark.rb
 - lib/gameui/marker.rb
 - lib/gameui/premium_purchase.rb
 - lib/ish/alphavantage_stockwatcher.rb
@@ -125,6 +126,7 @@ files:
 - lib/ish/covered_call_watcher.rb
 - lib/ish/crawler.rb
 - lib/ish/gallery_name.rb
+- lib/ish/image_asset.rb
 - lib/ish/input_error.rb
 - lib/ish/invoice.rb
 - lib/ish/iron_condor.rb