ish_models 0.0.33.170 → 0.0.33.173

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 411adafeb7c2632e78c97d10b851b9b957161ebb5626c95e451d86db86ca2a5b
-  data.tar.gz: 562dd7d7ba8db2acc414096ef8b1ab9c3b93e9f915b1aa1e650340b12054df02
+  metadata.gz: 20bd871ec7315d71ec6071376bc4dcffedb1910a21998a08e734ba426dbc8326
+  data.tar.gz: 245cec4e7835f4929fad40aa513036aed8f825890c01941a708dd05353b0897f
 SHA512:
-  metadata.gz: 2367b28798662b398d6be6e73a11ff0c1866b631e4208d8c97ccbe88d29b5b873850a10706be4672378de9178267d6314a52c46107932e56658bea4b6f8267ac
-  data.tar.gz: 7b17156567dcd8ffe6920782ecbc05c6bdadc20518e4752dbdcc0fd05eaaf645bcb8221503e1f1fd778dac0fa52ce7ebc181d5418fe8f1edc0c24db3c1d08ea5
+  metadata.gz: 77a2e7a7ec0a3025fb3e6ff0a08653dd28d4b7eff00000231a96d717eb88b875610796b82eb7438b8513c6bd3ce4e39f04a3c2171ccfaee165f1b28725b426af
+  data.tar.gz: 2bd5285789c8cdc07e398834a83cc586c45c0eb8a7c79c5320e2d21d835eabc7620fa5e48b1c8a7dc3d424c83507c4d23c93b82765cabb3de7bf3b3b8b49d303

data/lib/gameui/map.rb

@@ -1,3 +1,4 @@
+
 require 'ish/premium_item'
 require 'ish/utils'
 
@@ -7,20 +8,26 @@ class ::Gameui::Map
   include Ish::PremiumItem
   include Ish::Utils
 
-  has_many :markers,      :class_name => '::Gameui::Marker', inverse_of: :map
-  has_many :from_markers, :class_name => '::Gameui::Marker', inverse_of: :destination
+  field :name
 
-  has_many :newsitems, inverse_of: :map, order: :created_at.desc
+  field :slug
+  validates :slug, uniqueness: true, presence: true
 
+  field :description
+
+  ## @TODO: probably, abstract this. _vp_ 2022-09-20
   field :deleted_at, type: Time, default: nil
 
-  field :slug
-  validates :slug, uniqueness: true, presence: true
+  has_many :markers,      :class_name => '::Gameui::Marker', inverse_of: :map
+  has_many :from_markers, :class_name => '::Gameui::Marker', inverse_of: :destination
 
-  field :parent_slug
+  has_many :newsitems, inverse_of: :map, order: :created_at.desc
 
+  # @TODO: remove field, replace with relation. _vp_ 2022-09-13
+  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
   belongs_to :creator_profile, class_name: '::Ish::UserProfile', inverse_of: :my_maps
 
@@ -33,15 +40,12 @@ class ::Gameui::Map
 
   field :version, type: String, default: '0.0.0'
 
-  ## @TODO: what is this?
+  ## @TODO: or self, right? and refactor this, seems N+1. _vp_ 2022-09-13
   field :map_slug
   def map
     ::Gameui::Map.where( slug: map_slug ).first
   end
 
-  field :name
-  field :description
-
   RATED_OPTIONS = [ 'pg-13', 'r', 'nc-17' ]
   field :rated, default: 'pg-13' # 'r', 'nc-17'
 
@@ -54,15 +58,21 @@ class ::Gameui::Map
   # @deprecated, dont use!
   field :img_path
 
+  ## Not used! See config.map_panel_type instead.
+  # MAP_TYPES = [ :map_2d, :map_3d, :map_geospatial, :map_gallery, :map_toc ] ## Mostly not implemented. _vp_ 2022-09-06
+  # field :map_type, default: :map_2d
+
+  ## Make sure to use x,y,z and w,h as appropriate.
+  ## @TODO: abstract this into a module
+  field :x, type: Float
+  field :y, type: Float
+  field :z, type: Float
+
+  ## Make sure to use x,y,z and w,h as appropriate.
   field :w, type: Integer
   validates :w, presence: true
   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
@@ -100,6 +110,10 @@ class ::Gameui::Map
     out.reverse
   end
 
+  ##
+  ## @TODO: move the export func, below, to a module. _vp_ 2022-09-20
+  ##
+
   def empty_export
     return {
       galleries: {},
@@ -124,9 +138,7 @@ class ::Gameui::Map
       videos: [],
     }
   end
-  def self.export_key_to_class
-    Map.new.export_key_to_class
-  end
+
   def export_key_to_class
     return {
       galleries: 'Gallery',
@@ -149,6 +161,9 @@ class ::Gameui::Map
       # 'videos' => 'Video',
     }.with_indifferent_access
   end
+  def self.export_key_to_class
+    Map.new.export_key_to_class
+  end
 
   def export_fields
     %w|
@@ -227,6 +242,10 @@ class ::Gameui::Map
     export_object
   end
 
+  ## endExport
+
+  field :newsitems_page_size, default: 25
+
 end
 
 Location = ::Gameui::Map

data/lib/gameui/marker.rb

@@ -58,7 +58,7 @@ class ::Gameui::Marker
 
   belongs_to :map,             class_name: '::Gameui::Map',    inverse_of: :markers
 
-  belongs_to :destination, class_name: '::Gameui::Map', inverse_of: :from_markers
+  belongs_to :destination, class_name: '::Gameui::Map', inverse_of: :from_markers, optional: true
 
   belongs_to :creator_profile, class_name: 'Ish::UserProfile', inverse_of: :my_markers
 

data/lib/mongoid/votable.rb

@@ -190,7 +190,8 @@ module Mongoid
     #
     # @param [Mongoid Object, BSON::ObjectId] voter is Mongoid object the id of the voter who made the vote
     def vote_value(voter)
-      voter_id = voter.is_a?(BSON::ObjectId) ? voter.to_s : voter.is_a?(String) ? voter : voter.id.to_s
+      ## The last last one, voter.id not voter.id.to_s _vp_ 2022-09-19
+      voter_id = voter.is_a?(BSON::ObjectId) ? voter : voter.is_a?(String) ? voter : voter.id
 
       return :up if up_voter_ids.try(:include?, voter_id)
       return :down if down_voter_ids.try(:include?, voter_id)

data/lib/newsitem.rb

@@ -1,5 +1,6 @@
 
 require 'ish/utils'
+
 # require_relative './mongoid/votable.rb'
 
 class Newsitem

data/lib/report.rb

@@ -13,11 +13,13 @@ class Report
   index({ :slug => 1 }, { :unique => true })
   before_validation :set_slug, :on => :create
 
-  ## @TODO: then constantize this.
-  ## Can be one of: default (nil), longscroll
+  ## Can be one of: default (nil), longscroll,
+  ##   wordpress e.g. https://piousbox.com/wp-json/wp/v2/posts?slug=intro
+  # ITEM_TYPES = %w| longscroll wordpress |
   field :item_type, type: String
 
   field :descr, :type => String
+  field :raw_json
 
   field :is_trash, :type => Boolean, :default => false
   index({ :is_trash => 1, :is_public => 1 }, { name: 'default_index' })

metadata

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