ish_models 0.0.33.159 → 0.0.33.162

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4818a5c5ecf9cc130dc740dbfb83814696043157259c9230003c797fcf655097
-  data.tar.gz: 4ef6186e998a49f0700fe6e1b277943b2ada98d20d9b4cc93ad6dbc3bb668c92
+  metadata.gz: 5f93305110da30b0f8b78818b77270ecca79a14df58025c32b0c9e43869e40ca
+  data.tar.gz: 2e1192839965a31e65256cc0bdee33cfbb0e71c8904c6a2fc1c3ea219e7f96ff
 SHA512:
-  metadata.gz: e99049e74cbf10218f4640fbe9fa47430a87433561ddce5aa6e3ada55a563d1aa7e0b5378bb1f3a1ba05fd63f13b892b956aaa920932378fab11467089697c3a
-  data.tar.gz: c33bd4286fb568296e618c3882db078f0dc4f2239fcf2307368c4431640c15d74733cd66c6d93a5c1f4b5da9663aecb32a05a2dd1345af35ad3b19083f1d742c
+  metadata.gz: ed34572c3501670602c0af9eced18229f2bd372c1471511eebd856b48ec05df17e7398772d162d9922ba3a1ba530eb9982714633ef730cb3823abc94a689678a
+  data.tar.gz: e68451247021b5f7b94eed4e71e4845d124dec0dfc0ac0f6ce0b750f9294edda29bca1d11abf83baf6f46b34894239f9ca0bb2d37b5a61ccc8b68640621d25cc

data/lib/gallery.rb

@@ -48,7 +48,7 @@ class Gallery
 
   has_and_belongs_to_many :tags
 
-  has_many :newsitems
+  has_many :newsitems # seems correct. _vp_ 2022-03-21
   has_many :photos
 
   belongs_to :city,  :optional => true

data/lib/gameui/map.rb

@@ -25,6 +25,7 @@ class ::Gameui::Map
   belongs_to :creator_profile, class_name: '::Ish::UserProfile', inverse_of: :my_maps
 
   has_and_belongs_to_many :bookmarked_profiles, class_name: '::Ish::UserProfile', inverse_of: :bookmarked_location
+  has_and_belongs_to_many :tags, class_name: 'Tag', inverse_of: :map
 
   # shareable, nonpublic
   field :is_public, type: Boolean, default: true

data/lib/gameui/marker.rb

@@ -49,7 +49,21 @@ class ::Gameui::Marker
   has_and_belongs_to_many :shared_profiles, :class_name => 'Ish::UserProfile', :inverse_of => :shared_markers
 
   belongs_to :map,             class_name: '::Gameui::Map',    inverse_of: :markers
+
   belongs_to :destination,     class_name: '::Gameui::Map',    inverse_of: :from_markers
+  before_validation :set_destination
+  def set_destination
+    d = Map.where({ slug: slug }).first
+
+    puts! self, '#set_destination'
+
+    if !d
+      self.errors.add( "Cannot save marker, destination |#{slug}| not found." )
+      return
+    end
+    self.destination_id = d.id
+  end
+
   belongs_to :creator_profile, class_name: 'Ish::UserProfile', inverse_of: :my_markers
 
   # # @deprecated, don't use!
@@ -61,22 +75,8 @@ class ::Gameui::Marker
 
   field :w, type: Integer
   validates :w, presence: true
-
   field :h, type: Integer
   validates :h, presence: true
-
-  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
-
   # @TODO: this is shared between map and marker, move to a concern.
   before_validation :compute_w_h
   def compute_w_h
@@ -84,7 +84,6 @@ class ::Gameui::Marker
       self.h = self.w = 0
       return
     end
-
     begin
       geo = Paperclip::Geometry.from_file(Paperclip.io_adapters.for(image.image))
       self.w = geo.width
@@ -95,6 +94,20 @@ class ::Gameui::Marker
     end
   end
 
+  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
+
+
+
   def export_fields
     %w|
       centerOffsetX centerOffsetY creator_profile_id

data/lib/ish/user_profile.rb

@@ -13,10 +13,7 @@ class Ish::UserProfile
   validates_format_of :email,:with => /\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/
   validates_uniqueness_of :email
 
-  ## @TODO: remove this alias
-  def name
-    email
-  end
+  field :name
 
   def export_fields
     %w|
@@ -25,7 +22,7 @@ class Ish::UserProfile
     |
   end
 
-  field :scratchpad
+  field :scratchpad, default: ''
 
   field :fb_access_token
   field :fb_long_access_token
@@ -59,7 +56,7 @@ class Ish::UserProfile
   # has_many :option_watches, class_name: 'IronWarbler::OptionWatch'
 
   has_many :videos,    inverse_of: :user_profile
-  has_many :newsitems, inverse_of: :user_profile ## @TODO: remove?!
+  has_many :newsitems, inverse_of: :profile # @TODO: remove? denorm handle over here?
 
   has_and_belongs_to_many :bookmarked_locations, class_name: '::Gameui::Map', inverse_of: :bookmarked_profile
   def bookmarks

data/lib/newsitem.rb

@@ -6,22 +6,19 @@ class Newsitem
   include Mongoid::Timestamps
   include Ish::Utils
 
-  belongs_to :site,    optional: true
-  belongs_to :tag,     optional: true
   belongs_to :city,    optional: true
-  belongs_to :report,  optional: true
-  belongs_to :user_profile, class_name: 'Ish::UserProfile', optional: true
-  belongs_to :map,          class_name: '::Gameui::Map',    optional: true
-
-  belongs_to :gallery, optional: true
+  belongs_to :gallery, optional: true  # seems correct. _vp_ 2022-03-21
   def gallery
     self.gallery_id ? Gallery.unscoped.find( self.gallery_id ) : nil
   end
-
+  belongs_to :map,     optional: true, class_name: '::Gameui::Map'
+  belongs_to :profile, optional: true, class_name: 'Ish::UserProfile'
+  belongs_to :photo,   optional: true
+  belongs_to :report,  optional: true
+  belongs_to :site,    optional: true
+  belongs_to :tag,     optional: true
   belongs_to :video,   optional: true
 
-  has_one :photo
-
   field :name
   field :descr
   def description
@@ -40,6 +37,18 @@ class Newsitem
   field :downvoting_users, :type => Array, :default => []
   field :is_feature,       :type => Boolean, :default => false
 
+  TYPE_GALLERY = :type_gallery
+  TYPE_PHOTO   = :type_photo
+  TYPE_REPORT  = :type_report
+  TYPE_VIDEO   = :type_video
+  def item_type
+    return TYPE_GALLERY if gallery_id
+    return TYPE_PHOTO   if photo_id
+    return TYPE_REPORT  if report_id
+    return TYPE_VIDEO   if video_id
+  end
+
+
   PER_PAGE = 6
 
   default_scope ->{ order_by({ :created_at => :desc }) }

data/lib/photo.rb

@@ -62,7 +62,7 @@ class Photo
     |
   end
 
-  validates_attachment_content_type :photo, :content_type => ["image/jpg", "image/jpeg", "image/png", "image/gif", 'application/octet-stream' ]
+  validates_attachment_content_type :photo, :content_type => ["image/webp", "image/jpg", "image/jpeg", "image/png", "image/gif", 'application/octet-stream' ]
 
 end
 

data/lib/tag.rb

@@ -4,15 +4,15 @@ class Tag
   include Ish::Utils
 
   field :name, :type => String
-  # validates :name, :uniqueness => true, :allow_nil => false
+  validates :name, :uniqueness => true, :allow_nil => false
 
   field :slug
   validates :slug, :uniqueness => true, presence: 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_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
@@ -31,10 +31,7 @@ class Tag
   has_and_belongs_to_many :galleries
   has_and_belongs_to_many :reports
   has_and_belongs_to_many :videos
-
-  default_scope ->{
-    where({ :is_public => true, :is_trash => false }).order_by({ :name => :asc })
-  }
+  has_and_belongs_to_many :maps, class_name: 'Gameui::Map'
 
   before_validation :set_slug
 

metadata

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