ish_models 0.0.33.164 → 0.0.33.168

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a783500814f32b8c34ef3feade0aef48169ea390eb033422518593edef4cf67b
-  data.tar.gz: ae18235c6b0862be5e0d09b53c86002d1bf76824d17391b2a4507749f358d911
+  metadata.gz: f231fd1652da3cd2e8113a7963919aa0148becd53e53efc85d4cb8c2d45eddd0
+  data.tar.gz: 77ef4b9331ef224679c2c3000e0738bba4e51be462bbddf854dc4c04c9338f80
 SHA512:
-  metadata.gz: 4522756a1cedf0b0a570e13ad1a35dda926930aadbb7dbe5112de03923b3c5f133ee1e0c569639bf01fccb4be7926a82d406523c8ef1fe2c18705c9bc93e70be
-  data.tar.gz: 45b1305bdb9395f37325d78183d746ff7c9c2f6a9bb01ca533dc56b11ac176816cf9ad01b612d58514ff43e7ea0395b126b7fe682ae4a81fcd4091420493d591
+  metadata.gz: a26b8edb378762eb22caca40ebe5ee895dc16cb563332431b964769d94c87bb0873312c153a40cc162e779daf60db0085452ce46a6459c0c81f3a9dafe24dc77
+  data.tar.gz: 2c6ebe91cefc06019d5090ded6f04bd95389002dc765cb359f3efdb46ab5092a72cbfd3202d6987283ae0a7aaa0590697976f0cae9d0abe1ecc87d3142970905

data/lib/gameui/asset3d.rb

@@ -0,0 +1,29 @@
+
+require 'aws-sdk'
+
+class ::Gameui::Asset3d
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  include Mongoid::Paperclip
+  include Ish::Utils
+
+  belongs_to :marker,       class_name: 'Gameui::Marker', optional: true
+
+  has_mongoid_attached_file :object,
+                            :storage => :s3,
+                            :s3_credentials => ::S3_CREDENTIALS,
+                            :path => "assets3d/:id/:filename",
+                            :s3_protocol => 'https',
+                            :validate_media_type => false,
+                            s3_region: ::S3_CREDENTIALS[:region]
+
+  do_not_validate_attachment_file_type :object
+
+  def export_fields
+    %w|
+      marker_id
+      asset3d_file_name asset3d_content_type asset3d_file_size asset3d_updated_at asset3d_fingerprint
+    |;
+  end
+
+end

data/lib/gameui/marker.rb

@@ -7,8 +7,12 @@ class ::Gameui::Marker
   field :name, type: String
   validates_uniqueness_of :name, scope: :map_id
   validates_presence_of :name
+
+  ## This is not a map, I don't need a slug.
+  ## @TODO: remove it. _vp_ 2022-06-17
+  field :slug
   def slug
-    id.to_s
+    return self[:slug] || id.to_s
   end
 
   field :ordering, type: String, default: 'jjj'
@@ -26,6 +30,7 @@ class ::Gameui::Marker
 
   has_one :image,       class_name: '::Ish::ImageAsset', inverse_of: :marker
   has_one :title_image, class_name: '::Ish::ImageAsset', inverse_of: :marker_title
+  has_one :asset3d,     class_name: '::Gameui::Asset3d'
 
   field :deleted_at, type: Time, default: nil # @TODO: replace with paranoia
 

data/lib/ish/unsubscribe.rb

@@ -0,0 +1,11 @@
+
+class Ish::Unsubscribe
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  field :email
+  field :unsubscribed_at
+  field :reason
+
+end
+

data/lib/ish/user_profile.rb

@@ -31,6 +31,9 @@ class Ish::UserProfile
   field :lang, default: 'en'
 
   ROLES = [ :admin, :manager, :guy ]
+  ROLE_ADMIN   = :admin
+  ROLE_MANAGER = :manager
+  ROLE_GUY     = :guy
   field :role_name, :type => Symbol
 
   has_one :profile_photo, :class_name => 'Photo', :inverse_of => :profile_city

data/lib/ish_models.rb

@@ -26,6 +26,10 @@ module IshModels
   end
 end
 
+# Needs to be before gameui/asset3d
+require 'ish/utils'
+
+require 'gameui/asset3d'
 require 'gameui/map'
 require 'gameui/map_bookmark'
 require 'gameui/marker'
@@ -42,7 +46,7 @@ require 'ish/issue'
 require 'ish/lead'
 require 'ish/payment'
 require 'ish/premium_item'
-require 'ish/utils'
+require 'ish/unsubscribe'
 require 'ish/user_profile'
 
 require 'city'

data/lib/tag.rb

@@ -4,10 +4,10 @@ class Tag
   include Ish::Utils
 
   field :name, :type => String
-  validates :name, :uniqueness => true, :allow_nil => false
+  validates :name, uniqueness: true, presence: true, allow_nil: false # @TODO: tags should only be unique globally, and per-user.
 
   field :slug
-  validates :slug, :uniqueness => true, presence: true, allow_nil: false
+  validates :slug, uniqueness: true, presence: true, allow_nil: false
 
   field :descr, :type => String, :default => ''
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.164
+  version: 0.0.33.168
 platform: ruby
 authors:
 - piousbox
@@ -121,6 +121,7 @@ files:
 - lib/event.rb
 - lib/feature.rb
 - lib/gallery.rb
+- lib/gameui/asset3d.rb
 - lib/gameui/map.rb
 - lib/gameui/map_bookmark.rb
 - lib/gameui/marker.rb
@@ -139,6 +140,7 @@ files:
 - lib/ish/payment.rb
 - lib/ish/premium_item.rb
 - lib/ish/railtie.rb
+- lib/ish/unsubscribe.rb
 - lib/ish/user_profile.rb
 - lib/ish/utils.rb
 - lib/ish_models.rb