ish_models 0.0.33.131 → 0.0.33.135

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6af77beacdc645fcf83ca862c625d2f689279acfe94cc40cc83527f4836578ed
-  data.tar.gz: 5860e90c3029f55d92ab8ff703e21fb5fe2d9bc1d355c68fe1e06be3cc8788c3
+  metadata.gz: 6c5a6043e8144f6fae57963f58a0880eb171044ae3bbc62d36ae013c0db3be04
+  data.tar.gz: e3414aeaba21e5273054e14d8bf037ec798418c1a97a894e5861d8811ef2d224
 SHA512:
-  metadata.gz: e88f2506f075b91fd496ce353358123486f9c968abb9e8837e89ef864846b2f054615732222ed4156578c012ab612df31b42d80219c14957f8167c48ad40d386
-  data.tar.gz: f0482b89daa1a5c15569a780ab80f74f07a7504b08cdd13b8844ef4a9a03b0a3927b7e4b5c300e6f19468b6c2f1006e961f041b8eb174a798850faf59593eedf
+  metadata.gz: b2154545c111a45447bfa2bd1421e65afe4b68b17368fedf0de098e4cace9ea03cc9db25e3c0e7cd9f8b380a270fe7ce75b0544d8fa66d233ca4800e19046ee2
+  data.tar.gz: 99a571b6c35ed885e7b204dc922f5289451d0d4dc3d01ce1dd6f03a970dddf9b1c297d815353853c85c319c0ca60f0c22bff36ca37d3ef60a20476a926c6c16a

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

@@ -12,18 +12,33 @@ class ::Gameui::Map
   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
+
+  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'
@@ -34,7 +49,7 @@ 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

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'

data/lib/venue.rb

@@ -2,15 +2,17 @@ class Venue
   include ::Mongoid::Document
   include ::Mongoid::Timestamps
 
+  field :address
+
   field :name, :type => String
   validates :name, :uniqueness => true, :allow_nil => false
 
   field :name_seo, :type => String
   validates :name_seo, :uniqueness => true, :allow_nil => false
-  
+
   field :subhead
   field :descr
-  
+
   field :is_trash, :type => Boolean, :default => false
   scope :fresh, ->{ where({ :is_trash => false }) }
   scope :trash, ->{ where({ :is_trash => true }) }

data/lib/video.rb

@@ -53,7 +53,8 @@ class Video
     :path => "videos/:style/:id/:filename",
     :s3_protocol => 'https',
     :s3_permissions => 'public-read',
-    :validate_media_type => false
+    :validate_media_type => false,
+    s3_region: ::S3_CREDENTIALS[:region]
   validates_attachment_content_type :video, content_type: /\Avideo\/.*\Z/
 
   has_mongoid_attached_file :thumb,
@@ -70,7 +71,8 @@ class Video
     :s3_credentials => ::S3_CREDENTIALS,
     :path => "videos/:style/:id/thumb_:filename",
     :s3_protocol => 'https',
-    :validate_media_type => false
+    :validate_media_type => false,
+    s3_region: ::S3_CREDENTIALS[:region]
   validates_attachment_content_type :thumb, :content_type => ["image/jpg", "image/jpeg", "image/png", "image/gif", 'application/octet-stream' ]
 
   set_callback :update, :after do |doc|

metadata

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