ish_models 0.0.33.130 → 0.0.33.134

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c34bbd347229cb392198bb194abc4c7d2902cb478aaac34b43b89c2014ab2d3
-  data.tar.gz: 83c55591061a4ed85905e50f3aaf6fdcae9eed57d25fb4f0f36dd1cbe4d16bbe
+  metadata.gz: 3d922df26e696ac770c512266ee8b46206cb27068acba43df008250e3d1f3a62
+  data.tar.gz: 3fbc130546d38392d78fef959448eea0642a70cb76cdd9194f3924867877d204
 SHA512:
-  metadata.gz: a2e9dc8ad1cd2f1236963b23d8c957c586e9b6736c8477001e393d4cff2fe9033c420752a5ce73e0ff3b18fe8881c647aa15ca447a9b899f3e3fd062aacb588b
-  data.tar.gz: e4337aed790fc7190cf0341dc158443d459b4aa0b85580594971362d38bef285fa8a6b9cae97e175a0d5f344964bc01a84778c34a042bb67bc364bde586f886e
+  metadata.gz: 98cebce56b2f8a979808d1e1e2bff952601fb7322bcbde228d8ec643656da4b665849782a4a1a5e30eabc36c747b70b57d9d950b1cd544d63444bf93ca5d79e9
+  data.tar.gz: 73c95a9da8539641a6f5f9d14a2d0c27721f713cad23223727927aa5eb2e422b464007a277810262b20fd6a052882ecd4f79fe1faaf24c83093a7152af198ad2

data/lib/gallery.rb

@@ -39,6 +39,9 @@ class Gallery
 
   field :galleryname
   index({ :galleryname => -1 }, { :unique => true })
+  def slug
+    galleryname
+  end
   embeds_many :gallery_names, :class_name => '::Ish::GalleryName'
   def self.find_by_slug slug
     ::Gallery.where( galleryname: slug ).first

data/lib/gameui/map.rb

@@ -8,20 +8,37 @@ class ::Gameui::Map
 
   field :slug
   validates :slug, uniqueness: true, presence: true
+
   field :parent_slug
-  def name
-    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
+
+  has_and_belongs_to_many :bookmarked_profiles, class_name: '::IshModels::UserProfile', inverse_of: :bookmarked_location
+
+  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
 
-  field :description
-
-  field :img_path
+  # @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'
@@ -32,7 +49,17 @@ class ::Gameui::Map
 
   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 ] }
+    [[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,6 +36,11 @@ 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
 

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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.130
+  version: 0.0.33.134
 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