ish_models 0.0.33.160 → 0.0.33.163

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9357739f510cad92b5496ec766b721e5dc1a621855ad3d43aa17d95715415b02
-  data.tar.gz: a1e7f1e1e0687d944313996bf0684977706f3340dbf85a76463616453a988521
+  metadata.gz: 68d413825a0a694b0bdfd1a6fee4a85812bb2f3d34e0f431d2b0a30c27b29304
+  data.tar.gz: 3a5a7db6ce515ba7e9711839ab4c10b8f74387abd0e6d38c7bf0510d5e86094b
 SHA512:
-  metadata.gz: a23fdd757857717baa7e99b0ffb5d01d3a32dda773ba6655a3c525f65e31a10185e4918788804a2ddabbb926b633a1538f2e6fc20dba46d60bd16e427e467bc6
-  data.tar.gz: 794c26976f05052b423499feb31cdf2f801b5d0e55dd8aacdd51dd41d315f11cdd4c4ed92b14e0a79618214133e3a5c33fd9f3a8e8adc6a8f50f7d645caef1b0
+  metadata.gz: c6b20eb004d674c488b459c23c12ca284bacefb558e1dfcdf03ce2e9b9548fb92ee7ba0c7452dbefb785b05e908a00f4ebdbda6548db7ae9a59df327944032b1
+  data.tar.gz: 2de807a995e6523d7ff0251f26a24daa127b3b13c1a00279baa69f72b78f708ff0e4cf5317255b19b8cc1f4b98fc629b4aede0321342b2baa6ab4b6d454f0596

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
@@ -58,6 +59,10 @@ class ::Gameui::Map
   field :h, type: Integer
   validates :h, presence: true
 
+  ## @TODO: abstract this into a module
+  field :x, :type => Float
+  field :y, :type => Float
+
   # @TODO: this is shared between map and marker, move to a concern.
   before_validation :compute_w_h
   def compute_w_h

data/lib/gameui/marker.rb

@@ -30,6 +30,10 @@ class ::Gameui::Marker
 
   field :deleted_at, type: Time, default: nil # @TODO: replace with paranoia
 
+  ## @TODO: abstract this into a module
+  field :x, :type => Float
+  field :y, :type => Float
+
   field :is_public, type: Boolean, default: true
   def self.public
     where( is_public: true )
@@ -49,7 +53,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 +79,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 +88,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 +98,14 @@ class ::Gameui::Marker
     end
   end
 
+  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

@@ -22,7 +22,7 @@ class Ish::UserProfile
     |
   end
 
-  field :scratchpad
+  field :scratchpad, default: ''
 
   field :fb_access_token
   field :fb_long_access_token

data/lib/newsitem.rb

@@ -11,7 +11,7 @@ class Newsitem
   def gallery
     self.gallery_id ? Gallery.unscoped.find( self.gallery_id ) : nil
   end
-  belongs_to :map,     optional: true,     class_name: '::Gameui::Map'
+  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
@@ -37,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.160
+  version: 0.0.33.163
 platform: ruby
 authors:
 - piousbox